Merge branch 'dev' into 'test'

跳转微信小程序

See merge request quanshu/mp-ui-pc!38

public/jump.html

@@ -171,7 +171,7 @@
     <div class="skip-theme" id="container-tip"></div>
     <div class="skip-btn">
       <p onclick="openWeapp()" id="container"></p>
-      <p onclick="openWx()" id="container-wx"></p>
+      <p onclick="openWeapp()" id="container-wx"></p>
     </div>
   </div>
 </body>

src/permission.js

@@ -7,7 +7,7 @@ import { getToken } from '@/utils/auth'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/skip']
+const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/skip', '/jump']
 
 router.beforeEach((to, from, next) => {
   NProgress.start()

src/views/business/ticket/index.vue

@@ -81,7 +81,7 @@
           icon="el-icon-upload2"
           size="mini"
           @click="handleImport"
-          v-hasPermi="['admin:ticket:import']"
+          v-hasPermi="['business:ticket:import']"
         >导入</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -92,7 +92,7 @@
           size="mini"
           :loading="exportLoading"
           @click="handleExport"
-          v-hasPermi="['admin:ticket:export']"
+          v-hasPermi="['business:ticket:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar