Merge remote-tracking branch 'origin/master'

src/config/router.config.js

@@ -27,19 +27,20 @@ export const asyncRouterMap = [{
         }
         }
     ]
     ]
   }, {
   }, {
-    path: '/test',
+    path: '/404',
+    component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')
+  }
+    , {
+        path: '/hhr',
         component: BlankLayout,
         component: BlankLayout,
-    redirect: '/test/home',
+        redirect: '/hhr/home',
         children: [
         children: [
             {
             {
                 path: 'home',
                 path: 'home',
                 name: 'TestHome',
                 name: 'TestHome',
-        component: () => import('@/views/user/Test')
+                component: () => import('@/views/hhr-view/hhrCustomer.vue')
             }
             }
         ]
         ]
-  }, {
-    path: '/404',
-    component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')
     }
     }
 ]
 ]
 
 
@@ -60,18 +61,19 @@ export const constantRouterMap = [{
       }
       }
     ]
     ]
   }, {
   }, {
-    path: '/test',
+    path: '/404',
+    component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')
+  }
+    , {
+        path: '/hhr',
         component: BlankLayout,
         component: BlankLayout,
-    redirect: '/test/home',
+        redirect: '/hhr/home',
         children: [
         children: [
             {
             {
                 path: 'home',
                 path: 'home',
                 name: 'TestHome',
                 name: 'TestHome',
-        component: () => import('@/views/user/Test')
+                component: () => import('@/views/hhr-view/hhrCustomer.vue')
             }
             }
         ]
         ]
-  }, {
-    path: '/404',
-    component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')
     }
     }
 ]
 ]

src/permission.js

@@ -15,7 +15,7 @@ NProgress.configure({
   showSpinner: false
   showSpinner: false
 }) // NProgress Configuration
 }) // NProgress Configuration
 
 
-const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration', '/user/ueditor2','/user/Test'] // no redirect whitelist
+const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration', '/user/ueditor2'] // no redirect whitelist
 
 
 router.beforeEach((to, from, next) => {
 router.beforeEach((to, from, next) => {
 
 

src/views/user/Test.vue → src/views/hhr-view/hhrCustomer.vue

@@ -4,7 +4,8 @@
     background-size: 100%;
     background-size: 100%;
     width: 100%;
     width: 100%;
     height: 150%;">
     height: 150%;">
-        <div style="height: 40px"></div>
+        <img src="/picture/hhr/kefu.png"  style="width: 10%;float: right;margin-top: 20px;margin-right: 20px" @click="showPopup">
+        <div style="height:40px"></div>
         <div style="background-image: url('./picture/hhr/02.png');background-repeat: no-repeat;background-position: center;background-size: 100%;width: 77%;height: 280px;margin: auto;">
         <div style="background-image: url('./picture/hhr/02.png');background-repeat: no-repeat;background-position: center;background-size: 100%;width: 77%;height: 280px;margin: auto;">
         </div>
         </div>
         <div v-show="!newcar">
         <div v-show="!newcar">
@@ -31,9 +32,12 @@
         </div>
         </div>
         <div  v-show="newcar">
         <div  v-show="newcar">
             <div style="background-image: url('./picture/hhr/06.png'); width: 256px; height: 64px;margin: 20px auto; background-repeat: no-repeat;background-size: 100%;"></div>
             <div style="background-image: url('./picture/hhr/06.png'); width: 256px; height: 64px;margin: 20px auto; background-repeat: no-repeat;background-size: 100%;"></div>
-            <van-button type="info" :round="true" size="large" >返回</van-button>
+            <van-button type="info" @click="newcargoback" :round="true" style="width: 256px; margin:auto 100%" >返回</van-button>
             <div style="height: 250px"></div>
             <div style="height: 250px"></div>
         </div>
         </div>
+        <van-popup v-model="kefushow">
+            <img src="/picture/hhr/service-qrcode.jpg" style="width:100%;height: 100%" @click="newPackage">
+        </van-popup>
     </div>
     </div>
 
 
 
 
@@ -41,10 +45,11 @@
 
 
 <script>
 <script>
     export default {
     export default {
-       name:"Test",
+       name:"hhrCustomer",
         data(){
         data(){
            return{
            return{
                newcar:false,
                newcar:false,
+               kefushow: false
            }
            }
         }
         }
         ,
         ,
@@ -52,6 +57,15 @@
         methods: {
         methods: {
             newcartouch(){
             newcartouch(){
                 this.newcar=true
                 this.newcar=true
+            },
+            newcargoback(){
+                this.newcar=false
+            },
+            showPopup() {
+                this.kefushow = true;
+            },
+            newPackage(){
+                newPackage
             }
             }
         }
         }
     }
     }

src/views/hhr-view/newPackage.vue

+<template>
+    
+</template>
+
+<script>
+    export default {
+        name: "newPackage"
+    }
+</script>
+
+<style scoped>
+
+</style>