diff --git a/package.json b/package.json
index 6e0353f..58c495e 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
"view-design": "^4.7.0",
"vue": "2.6.10",
"vue-count-to": "^1.0.13",
+ "vue-qrcode-reader": "^3.1.0",
"vue-router": "3.0.6",
"vuex": "3.1.0"
},
diff --git a/src/components/QrCode/QrCode.vue b/src/components/QrCode/QrCode.vue
new file mode 100644
index 0000000..1e40ea1
--- /dev/null
+++ b/src/components/QrCode/QrCode.vue
@@ -0,0 +1,295 @@
+// qrcode.vue
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 将二维码放入框内,即自动扫描
+
+
+
+
+
+
+
+ 确认核销
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue
index 0ebdf65..bcd4633 100644
--- a/src/components/Tinymce/index.vue
+++ b/src/components/Tinymce/index.vue
@@ -18,7 +18,7 @@
import load from './dynamicLoadScript'
// why use this cdn, detail see https://github.com/PanJiaChen/tinymce-all-in-one
- const tinymceCDN = '/tinymce/tinymce.min.js'
+ const tinymceCDN = '/admin/tinymce/tinymce.min.js'
export default {
name: 'Tinymce',
diff --git a/src/permission.js b/src/permission.js
index 309a594..85ecad4 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@ import getPageTitle from '@/utils/get-page-title'
NProgress.configure({ showSpinner: false }) // NProgress Configuration
-const whiteList = ['/login'] // no redirect whitelist
+const whiteList = ['/login','/check'] // no redirect whitelist
router.beforeEach(async(to, from, next) => {
// start progress bar
diff --git a/src/router/index.js b/src/router/index.js
index d16e88f..46e8056 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -34,6 +34,10 @@ export const constantRoutes = [{
path: '/login',
component: () => import('@/views/login/index'),
hidden: true
+ }, {
+ path: '/check',
+ component: () => import('@/views/active/checkOrder'),
+ hidden: true
},
{
diff --git a/src/views/active/checkOrder.vue b/src/views/active/checkOrder.vue
new file mode 100644
index 0000000..8cd9fc6
--- /dev/null
+++ b/src/views/active/checkOrder.vue
@@ -0,0 +1,296 @@
+// qrcode.vue
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 将二维码放入框内,即自动扫描
+
+
+
+
+
+
+
+ 确认核销
+
+
+
+
+
+
+
+
+
+
+
+
+