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

src/api/storeManage.js

@@ -1,5 +1,9 @@
-import { service } from "../utils/service";
-import { localPath } from "./api.js";
+import {
+  service
+} from "../utils/service";
+import {
+  localPath
+} from "./api.js";
 
 // 添加门店参数
 export function addstorePara(params) {
@@ -1268,3 +1272,28 @@ export function rolepower(params) {
     data: params
   });
 }
+// ================================================= 微信公众号 ================================================= //
+// 查询设置的微信公众号
+export function getWXAccount(params) {
+  return service({
+    url: "/api" + "/storeWechat",
+    method: "get",
+    params
+  });
+}
+// 设置微信公众号
+export function doSetWXAccount(data) {
+  return service({
+    url: "/api" + "/storeWechat/add",
+    method: "post",
+    data
+  });
+}
+// 修改微信公众号
+export function doEditWXAccount(data) {
+  return service({
+    url: "/api" + "/storeWechat",
+    method: "put",
+    data
+  });
+}

src/layout/components/asider.vue

@@ -827,7 +827,7 @@ export default {
           number: "1000",
           menuLists: [
             {
-              name: "发布",
+              name: "建立",
               icon: "el-icon-s-promotion",
               route: "/couponIssue",
               index: "couponIssue",

src/layout/layout.vue

@@ -39,6 +39,7 @@
 								<i class="el-icon-question icon-store"></i>
 							</router-link>
 						</el-tooltip> -->
+            <el-button size="mini" type="primary" class="butlog" plain>关注公众号</el-button>
             <el-tooltip effect="dark" content="点击刷新页面" placement="bottom">
               <i class="el-icon-refresh icon-store" @click="refresh"></i>
             </el-tooltip>
@@ -220,7 +221,7 @@ export default {
             confirmButtonClass: "confirmbtnFalses",
             type: "warning",
             center: true,
-            callback: (action) => {},
+            callback: (action) => { },
           });
         }
       });
@@ -249,7 +250,7 @@ export default {
                   confirmButtonClass: "confirmbtnFalses",
                   type: "warning",
                   center: true,
-                  callback: (action) => {},
+                  callback: (action) => { },
                 });
               }
             });
@@ -288,7 +289,7 @@ export default {
       }
     }, 800);
   },
-  mounted() {},
+  mounted() { },
   destroyed() {
     window.removeEventListener("resize", this.getHeight);
   },

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

@@ -2,7 +2,7 @@
   <div class="container">
     <div class="query-form">
       <div class="query-form-left-panel">
-        <el-button icon="el-icon-s-promotion" type="primary" size="mini" @click="handleIssue">发布</el-button>
+        <el-button icon="el-icon-s-promotion" type="primary" size="mini" @click="handleIssue">建立优惠券</el-button>
         <!-- <el-button icon="el-icon-full-screen" type="warning" size="mini" @click="handleVerification">核销</el-button> -->
       </div>
       <div class="query-form-right-panel">
@@ -16,7 +16,7 @@
         </el-form>
       </div>
     </div>
-    <el-table style="width: 100%;margin-top:5px" max-height="650" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)' ,color:'#eeeeee'}" ref="list" class="custom-table" highlight-current-row border v-loading="listLoading" :data="list" :element-loading-text="elementLoadingText" @row-dblclick="handleGoter">
+    <el-table style="width: 100%;margin-top:5px" max-height="650" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)' ,color:'#eeeeee'}" ref="list" class="custom-table" highlight-current-row border v-loading="listLoading" :data="list" :element-loading-text="elementLoadingText">
       <el-table-column align="center" width="50" type="index" label="序号"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" min-width="100" prop="state" label="状态">
         <template #default="{row}">

src/pages/storeManage/tencentAccount/index.vue

@@ -1,22 +1,83 @@
 <template>
   <div class="container">
-
+    <el-form :model="formData" :rules="rules" ref="formData" label-width="auto" label-position="top" style="width:500px">
+      <el-form-item style="margin-bottom:20px;">
+        <el-button size="small" type="primary" @click="save">保存</el-button>
+        <el-button size="small" @click="resetForm">重置</el-button>
+        <el-button size="small" type="primary" @click="fetchData">刷新</el-button>
+      </el-form-item>
+      <el-form-item label="开发者ID(AppID)" prop="appid" style="margin-bottom:15px">
+        <el-input v-model="formData.appid"></el-input>
+      </el-form-item>
+      <el-form-item label="开发者密码(AppSecret)" prop="appEcret" style="margin-bottom:15px">
+        <el-input v-model="formData.appEcret"></el-input>
+      </el-form-item>
+      <el-form-item label="微信公众号管理员手机号码" prop="iphone" style="margin-bottom:15px">
+        <el-input v-model="formData.iphone"></el-input>
+      </el-form-item>
+      <el-form-item label="令牌(Token)" prop="token">
+        <el-input v-model="formData.token"></el-input>
+      </el-form-item>
+    </el-form>
   </div>
 </template>
 <script>
+import { getWXAccount, doSetWXAccount, doEditWXAccount } from "../../../api/storeManage";
 export default {
   data() {
     return {
-
+      formData: {},
+      rules: {
+        appid: [{ required: true, message: '请输入开发者ID(AppID)', trigger: 'blur' }],
+        appEcret: [{ required: true, message: '请输入开发者密码(AppSecret)', trigger: 'blur' }],
+        iphone: [{ required: true, message: '请输入微信公众号管理员手机号码', trigger: 'blur' }],
+        token: [{ required: true, message: '请输入令牌(Token)', trigger: 'blur' }],
+      }
     };
   },
+  created() {
+    this.fetchData()
+  },
   methods: {
-
+    async fetchData() {
+      let { code, pageInfo } = await getWXAccount({ storeId: sessionStorage.getItem('storeId') })
+      if (code == '000000') {
+        this.formData = Object.assign({}, pageInfo.list[0]);
+      }
+    },
+    // 重置
+    resetForm(formName) {
+      this.$refs.formData.resetFields();
+    },
+    // 新增/修改
+    save() {
+      this.$refs.formData.validate((valid) => {
+        if (valid) {
+          if (this.formData.id) {
+            doEditWXAccount(this.formData).then(res => { this.callbackFun(res) })
+          } else {
+            let formData = Object.assign({}, this.formData);
+            formData.storeId = sessionStorage.getItem('storeId')
+            doSetWXAccount(formData).then(res => { this.callbackFun(res) })
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    callbackFun(res) {
+      if (res.code == '000000') {
+        this.$message.success({ message: res.message });
+      } else {
+        this.$message.error({ message: res.message });
+      }
     },
-  created() {
   },
 };
 </script>
 
 <style>
+.el-form--label-top .el-form-item__label {
+  padding: 0px;
+}
 </style>

src/router/index.js

@@ -800,7 +800,7 @@ const router = new VueRouter({
           name: "CouponIssue",
           component: () => import("../pages/discount-coupon/issue/index.vue"),
           meta: {
-            title: "发布",
+            title: "建立优惠券",
             index: "couponIssue"
           }
         },