diff --git a/src/layout/components/asider.vue b/src/layout/components/asider.vue index 60c772f..877f01d 100644 --- a/src/layout/components/asider.vue +++ b/src/layout/components/asider.vue @@ -66,6 +66,13 @@ export default { index: "storeParameters", number: "400100", }, + { + name: "微信公众号", + icon: "el-icon-s-data", + route: "/tencentAccount", + index: "tencentAccount", + number: "400110", + }, { name: "角色档案", icon: "el-icon-user", diff --git a/src/pages/discount-coupon/issue/components/qrCode.vue b/src/pages/discount-coupon/issue/components/qrCode.vue index ec53bac..9524d0d 100644 --- a/src/pages/discount-coupon/issue/components/qrCode.vue +++ b/src/pages/discount-coupon/issue/components/qrCode.vue @@ -35,9 +35,9 @@ export default { this.openid = '' this.dialogFormVisible = true this.handleDeleteJavaOpenid() - setTimeout(() => { - that.codeNumber = 3 - }, 600000); + // setTimeout(() => { + // that.codeNumber = 3 + // }, 60000); }, close() { this.qrCode = '' @@ -52,7 +52,11 @@ export default { this.qrCode = window.URL.createObjectURL(res) getOpenid = setInterval(() => { that.fetchJavaOpenid() - }, 5000); + }, 2000); + setTimeout(() => { + clearInterval(getOpenid) + that.codeNumber = 3 + }, 60000); }) }, // 通过后台获取用户扫描的openid @@ -112,7 +116,7 @@ export default { left: 27px; width: 346px; height: 346px; - background-color: #808080; + background-color: #fff; display: flex; align-items: center; justify-content: center; @@ -120,7 +124,7 @@ export default { } .title { font-size: 28px; - color: #fff; + /* color: #fff; */ margin-top: 30px; } diff --git a/src/pages/discount-coupon/record/index.vue b/src/pages/discount-coupon/record/index.vue index 051b916..591deaf 100644 --- a/src/pages/discount-coupon/record/index.vue +++ b/src/pages/discount-coupon/record/index.vue @@ -30,16 +30,17 @@ - 查询 + 查询 - + + - + - + diff --git a/src/pages/storeManage/tencentAccount/index.vue b/src/pages/storeManage/tencentAccount/index.vue new file mode 100644 index 0000000..52d662f --- /dev/null +++ b/src/pages/storeManage/tencentAccount/index.vue @@ -0,0 +1,22 @@ + + + + diff --git a/src/router/index.js b/src/router/index.js index a0fda13..52d4803 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4,8 +4,7 @@ import Layout from "../layout/layout.vue"; Vue.use(VueRouter); const router = new VueRouter({ - routes: [ - { + routes: [{ path: "/", redirect: "/login" }, @@ -40,6 +39,16 @@ const router = new VueRouter({ index: "storeParameters" } }, + //微信公众号 + { + path: "/tencentAccount", + component: () => + import("../pages/storeManage/tencentAccount/index.vue"), + meta: { + title: "微信公众号", + index: "tencentAccount" + } + }, //职务档案 { path: "/gradeList",