Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

src/components/Top/index.vue

@@ -4,13 +4,16 @@
       <img class="icon16" src="../../assets/images/icon_tel2.png"/>
       <span class="pl8">服务热线：400-1797-985</span>
       <img class="icon16 ml20" src="../../assets/images/icon_phone.png"/>
-      <span class="relative" id="app_download" @mouseover="app=true" @mouseleave="app=false">
-          <a href="javascript:void(0);">APP下载</a>
-          <div id="appQrcode" v-show="app">
-            <img style="width:110px;height:110px;" src="../../assets/images/app.png"/>
-            <p style="width:110px;color:#000;font-size:12px;margin-top:5px;">扫描下载APP</p>
-          </div>
-        </span>
+      <div class="relative" id="app_download" @mouseover="app=true" @mouseleave="app=false">
+        <a href="javascript:void(0);">APP下载</a>
+        <div id="appQrcode" v-show="app">
+          <img style="width:110px;height:110px;" src="../../assets/images/app.png"/>
+          <p style="width:110px;color:#000;font-size:12px;margin-top:5px;">扫描下载APP</p>
+        </div>
+      </div>
+      <el-link v-if="!userInfo" href="/pay" type="warning" class="ml20" underline style="font-size: 16px;">
+        在线购卡
+      </el-link>
     </div>
     <div v-else class="fx-row fx-sta-cen">
       <span @click="to('/login')" class="mr20 pointer">首页</span>

src/permission.js

@@ -9,7 +9,7 @@ NProgress.configure({
   showSpinner: false
 })
 
-const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/question/preview']
+const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/pay', '/question/preview']
 const uaWhiteList = ['/question/preview']
 
 router.beforeEach((to, from, next) => {

src/router/index.js

@@ -55,6 +55,11 @@ export const constantRoutes = [{
     component: (resolve) => require(['@/views/error/401'], resolve),
     hidden: true
   },
+  {
+    path: '/pay',
+    component: (resolve) => require(['@/views/pay/index'], resolve),
+    hidden: true
+  },
   {
     path: '/question/preview',
     hidden: true,
@@ -795,8 +800,8 @@ export const constantRoutes = [{
       },
       {
         path: '/zhiyuan/apply',
-        component: (resolve) => require(['@/views/career/zhiyuan/NewSimulatedVolunteer'], resolve),
-      },
+        component: (resolve) => require(['@/views/career/zhiyuan/NewSimulatedVolunteer'], resolve)
+      }
     ]
   }
 ]

src/views/pay/index.vue

@@ -0,0 +1,13 @@
+<template>
+  <h1>支付</h1>
+</template>
+
+<script>
+export default {
+  name: 'PayIndex'
+}
+</script>
+
+<style scoped>
+
+</style>