Merge branch 'master' of http://192.168.31.40:10101/r/Demay_New

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",

src/pages/discount-coupon/issue/components/qrCode.vue

@@ -35,9 +35,9 @@ export default {
       this.openid = ''
       this.dialogFormVisible = true
       this.handleDeleteJavaOpenid()
-      setTimeout(() => {
+      // setTimeout(() => {
-        that.codeNumber = 3
+      //   that.codeNumber = 3
-      }, 600000);
+      // }, 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;
 }
 </style>

src/pages/discount-coupon/record/index.vue

@@ -30,16 +30,17 @@
             <el-input v-model="queryForm.name" placeholder="分享人" clearable size="small" style="width: 150px"></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button icon="el-icon-search" type="primary" @click="queryData">查询</el-button>
+            <el-button icon="el-icon-search" type="primary" size="small" @click="queryData">查询</el-button>
           </el-form-item>
         </el-form>
       </div>
     </div>
-    <el-table style="width: 100%;margin-top:5px" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)' ,color:'#eeeeee'}" ref="list" class="custom-table" highlight-current-row border v-loading="listLoading" :data="list" max-height="600px" :element-loading-text="elementLoadingText" @row-dblclick="handleGot">
+    <!-- <el-table style="width: 100%;margin-top:5px" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)' ,color:'#eeeeee'}" ref="list" class="custom-table" highlight-current-row border v-loading="listLoading" :data="list" max-height="600px" :element-loading-text="elementLoadingText" @row-dblclick="handleGot"> -->
+    <el-table style="width: 100%;margin-top:5px" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)' ,color:'#eeeeee'}" ref="list" class="custom-table" highlight-current-row border v-loading="listLoading" :data="list" max-height="600px" :element-loading-text="elementLoadingText">
       <template slot="empty"></template>
-      <el-table-column show-overflow-tooltip align="center" min-width="100" prop="share" label="分享人"></el-table-column>
+      <!-- <el-table-column show-overflow-tooltip align="center" min-width="100" prop="share" label="分享人"></el-table-column> -->
       <el-table-column show-overflow-tooltip align="center" min-width="100" prop="sharePhone" label="分享人手机号码"></el-table-column>
-      <el-table-column show-overflow-tooltip align="center" min-width="100" prop="got" label="领取人"></el-table-column>
+      <!-- <el-table-column show-overflow-tooltip align="center" min-width="100" prop="got" label="领取人"></el-table-column> -->
       <el-table-column show-overflow-tooltip align="center" min-width="100" prop="getPhone" label="领取人手机号码"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" min-width="100" prop="getDate" label="领取时间"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" min-width="100" prop="docDate" label="核销时间"></el-table-column>

src/pages/storeManage/tencentAccount/index.vue

@@ -0,0 +1,22 @@
+<template>
+  <div class="container">
+
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+
+    };
+  },
+  methods: {
+
+  },
+  created() {
+  },
+};
+</script>
+
+<style>
+</style>

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",