Merge branch 'master' of http://114.67.93.201/xulili/ybf

ybf_admin/src/pages/goods/main/index.vue

@@ -107,34 +107,34 @@ export default {
         {
           imgUrl:
             "http://wework.qpic.cn/bizmail/FLjpJB8Od58W5ULAIYTRstTvFOJEFUnKQ3tRCdkicxorh6dEHcpNqVw/100",
-          goodName: "膳魔师",
-          goodPrice: "200元",
-          goodNum: "44",
-          goodBackMoney: "20元",
+          goodName: "象印",
+          goodPrice: "180元",
+          goodNum: "14",
+          goodBackMoney: "18元",
           goodStatus: "down"
         },
         {
           imgUrl:
             "http://wework.qpic.cn/bizmail/FLjpJB8Od58W5ULAIYTRstTvFOJEFUnKQ3tRCdkicxorh6dEHcpNqVw/100",
-          goodName: "膳魔师",
-          goodPrice: "200元",
-          goodNum: "44",
-          goodBackMoney: "20元",
+          goodName: "Dior",
+          goodPrice: "240元",
+          goodNum: "60",
+          goodBackMoney: "40元",
           goodStatus: "down"
         },
         {
           imgUrl:
             "http://wework.qpic.cn/bizmail/FLjpJB8Od58W5ULAIYTRstTvFOJEFUnKQ3tRCdkicxorh6dEHcpNqVw/100",
-          goodName: "膳魔师",
-          goodPrice: "200元",
-          goodNum: "44",
+          goodName: "ASICS",
+          goodPrice: "450元",
+          goodNum: "120",
           goodBackMoney: "20元",
           goodStatus: "up"
         },
         {
           imgUrl:
             "http://wework.qpic.cn/bizmail/FLjpJB8Od58W5ULAIYTRstTvFOJEFUnKQ3tRCdkicxorh6dEHcpNqVw/100",
-          goodName: "膳魔师",
+          goodName: "NIKE",
           goodPrice: "200元",
           goodNum: "44",
           goodBackMoney: "20元",
@@ -143,10 +143,10 @@ export default {
         {
           imgUrl:
             "http://wework.qpic.cn/bizmail/FLjpJB8Od58W5ULAIYTRstTvFOJEFUnKQ3tRCdkicxorh6dEHcpNqVw/100",
-          goodName: "膳魔师",
-          goodPrice: "200元",
-          goodNum: "44",
-          goodBackMoney: "20元",
+          goodName: "Adidas",
+          goodPrice: "540元",
+          goodNum: "210",
+          goodBackMoney: "30元",
           goodStatus: "down"
         },
         {

ybf_admin/src/pages/in/contact/components/counterDetail.vue

@@ -144,6 +144,7 @@ export default {
         this.tableData = data.stall_unselected
       })
     },
+
     handleClose(done) {
       this.$confirm("确认关闭？")
         .then(_ => {

ybf_admin/src/pages/in/contact/components/storeDetail.vue

 <template>
   <div class="ct">
-    <el-dialog
-      :visible.sync="detailDialog"
-      width="65%"
-      :show-close="false"
-    >
+    <el-dialog :visible.sync="detailDialog" width="65%" :show-close="false">
       <div class="choose">
         <div class="title">
           <div class="cg">门店详情</div>
@@ -13,12 +9,7 @@
           </div>
         </div>
         <div class="br">
-          <el-form
-            class="searchzone"
-            :model="formData"
-            label-width="auto"
-            disabled
-          >
+          <el-form class="searchzone" :model="formData" label-width="auto" disabled>
             <el-form-item label="门店名称:">
               <el-input
                 size="small"
@@ -89,7 +80,7 @@
               />
             </el-form-item>
             <div class="tb">
-              <el-form-item label="绑定店员:"> </el-form-item>
+              <el-form-item label="绑定店员:"></el-form-item>
               <el-table
                 stripe
                 class="list"
@@ -98,21 +89,9 @@
                 tooltip-effect="dark"
                 style="width: 100%"
               >
-                <el-table-column
-                  type="index"
-                  label="序号"
-                  width="60"
-                ></el-table-column>
-                <el-table-column
-                  prop="taskName"
-                  label="门店名称"
-                  align="center"
-                ></el-table-column>
-                <el-table-column
-                  prop="number"
-                  label="门牌号"
-                  align="center"
-                ></el-table-column>
+                <el-table-column type="index" label="序号" width="60"></el-table-column>
+                <el-table-column prop="taskName" label="门店名称" align="center"></el-table-column>
+                <el-table-column prop="number" label="门牌号" align="center"></el-table-column>
               </el-table>
             </div>
           </el-form>
@@ -124,16 +103,24 @@
 
 <script>
 export default {
+  props: {
+    msgId: {
+      type: String,
+      default: ""
+    }
+  },
+
   data() {
     const nameValidate = (rule, value, callback) => {
-      let reg = /^[a-zA-Z\u4e00-\u9fa5]+$/  
+      let reg = /^[a-zA-Z\u4e00-\u9fa5]+$/;
       if (!reg.test(value)) {
-          callback(new Error('含有非法字符(只能输入字母、汉字)!'))
+        callback(new Error("含有非法字符(只能输入字母、汉字)!"));
       } else {
-          callback()
-        }  
+        callback();
       }
+    };
     return {
+      
       formData: {
         name: "",
         code: "",
@@ -142,6 +129,7 @@ export default {
         number: "",
         area: ""
       },
+
       personList: [
         {
           id: "1",
@@ -152,6 +140,7 @@ export default {
           name: "李四"
         }
       ],
+
       counter: [
         {
           id: "1",
@@ -162,13 +151,35 @@ export default {
           name: "李四"
         }
       ],
+
       tableData: [],
+
       detailDialog: false
     };
   },
+  created() {
+    this.getDetail();
+  },
   methods: {
-    handleClose() {
+    getDetail() {
       this.detailDialog = false
+      // let params = {
+      //   isDetail: true,
+      //   shopId: this.msgId
+      // }
+      // getDetail(params).then(res => {
+      //   console.log(res,"详情");
+      //   let data = res.data
+      //   this.formData.name = data.shop.name
+      //   this.formData.code = data.shop.num
+      //   this.formData.people = data.shop.principal
+      //   this.formData.area = data.shop.area
+      //   this.tableData = data.stall_unselected
+      // })
+    },
+
+    handleClose() {
+      this.detailDialog = false;
     }
   }
 };

ybf_admin/src/pages/in/contact/counter.vue

@@ -95,6 +95,11 @@
     <edit-counter ref="editCounter" :msgId="editId" v-if="editDialog" @handleEditClose="handleEditClose"></edit-counter>
   </div>
 </template>
+
+
+
+
+
 <script>
 import CounterDetail from "./components/counterDetail"
 import AddCounter from "./components/addCounter"

ybf_admin/src/pages/in/contact/store.vue

@@ -74,6 +74,7 @@
         </el-table-column>
       </el-table>
     </div>
+
     <div class="pages">
       <el-pagination
         @current-change="handleCurrentChange"
@@ -83,6 +84,7 @@
         :total="page.total"
       ></el-pagination>
     </div>
+
     <add-store ref="addStore"></add-store>
     <store-detail ref="storeDetail"></store-detail>
   </div>
@@ -95,6 +97,7 @@ import {
   ApiStoreGetStoreDetail,
   ApiStoreDelStore
 } from "@api/in/store";
+import axios from "axios";
 const zlog = console.log.bind(console);
 
 export default {
@@ -203,7 +206,9 @@ export default {
         page: {
           nowPageNum: 4
         }
-      }
+      },
+      msgId: "",
+      detailDialog: false,
     };
   },
 
@@ -213,7 +218,6 @@ export default {
   // },
   mounted() {
     this.storeGetMainList();
-    zlog("--->Mounted!");
   },
   methods: {
     storeGetMainList() {
@@ -223,22 +227,23 @@ export default {
       });
     },
     storeGetStoreDetail(inData) {
-      zlog("--->id:", inData);
-      let postData = {
-        inDetail: true,
-        stallId: inData
-      };
+      // let postData = {
+      //   isDetail: true,
+      //   stallId: inData
+      // };
 
-      zlog('--->type: stallId:', typeof(Number(postData.stallId)))
+      this.msgId = id;
+      this.detailDialog = true;
+      this.$refs.storeDetail.detailDialog = true;
 
-      ApiStoreGetStoreDetail(postData).then(res => {
-        zlog("--->detail: res:", res);
-      });
+      // ApiStoreGetStoreDetail(postData).then(res => {
+      // });
     },
     storeDelStore(inData) {
       let postData = {
         stallId: 123456
       };
+
       ApiStoreDelStore(inData).then(res => {});
     },