Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev

src/pages/sales/salesRecord/index.vue

@@ -64,7 +64,7 @@ export default {
     ]),
     fibdata (item) {
       const couponfib = this.forbidList.filter(x => x.UserId === item.UserId && x.ForbidType === 'coupon').length > 0 ? true : false
-      const orderfib = this.forbidList.filter(x => x.UserId === item.UserId && x.ForbidType === 'order').length > 0 ? true : false
+      const orderfib = this.forbidList.filter(x => x.UserId === item.UserId && x.ForbidType === 'goods').length > 0 ? true : false
       return {
         'coupon': couponfib,
         'order': orderfib
@@ -94,9 +94,9 @@ export default {
     triggerDrink (val) { // 切换饮品状态 type='close'：关闭；type='open'：开启；
       console.log(val)
       if (val.type === 'open') {
-        this.putForbid({ userid: val.data.UserId, type: 'order' })
+        this.putForbid({ userid: val.data.UserId, type: 'goods' })
       } else {
-        this.putForbidOpen({ userid: val.data.UserId, type: 'order' })
+        this.putForbidOpen({ userid: val.data.UserId, type: 'goods' })
       }
       this.init()
     },

src/pages/user/mainPage/coffeeIndex/index.vue

@@ -34,9 +34,12 @@
                           <span>{{item.AreaName}}</span>
                         </div>
                         <ul class="subAreaList flex-h">
-                          <router-link tag="li" class="flex-item flex-h" v-for="(subItem,subIndex) in item.Tables" :key="subIndex" :to="{name: 'placeOrder', query: { tableid: encodeURI(subItem.TableId), tableno: encodeURI(subItem.TableNo), caseid: encodeURI(subItem.CaseId), casename: encodeURI(topCaseInfoData.caseName), areaid: encodeURI(subItem.AreaId), areaname: encodeURI(item.AreaName)}}">
+                          <!-- <router-link tag="li" class="flex-item flex-h" v-for="(subItem,subIndex) in item.Tables" :key="subIndex" :to="{name: 'placeOrder', query: { tableid: encodeURI(subItem.TableId), tableno: encodeURI(subItem.TableNo), caseid: encodeURI(subItem.CaseId), casename: encodeURI(topCaseInfoData.caseName), areaid: encodeURI(subItem.AreaId), areaname: encodeURI(item.AreaName)}}">
                             <caseTableItem :icon="item.AreaIcon" :item="subItem" :index="subIndex"></caseTableItem>
-                          </router-link>
+                          </router-link> -->
+                          <li class="flex-item flex-h" v-for="(subItem,subIndex) in item.Tables" :key="subIndex" @click="toOrders(subItem, item)">
+                            <caseTableItem :icon="item.AreaIcon" :item="subItem" :index="subIndex"></caseTableItem>
+                          </li>
                           <li class="flex-item noData" v-if="(item.Tables || []).length % 2 != 0"></li>
                         </ul>
                       </li>
@@ -343,6 +346,7 @@ export default {
     ]),
     ...mapCaseActions([
       'getCaseTotal',
+      'getCaseConf',
     ]),
     ...mapCardActions(['getCardList']),
     returnInvalid (item, type) {
@@ -494,7 +498,13 @@ export default {
       } else {
         done()
       }
-    }
+    },
+    toOrders (subItem, item) {
+
+
+
+      this.$router.push({name: 'placeOrder', query: { tableid: encodeURI(subItem.TableId), tableno: encodeURI(subItem.TableNo), caseid: encodeURI(subItem.CaseId), casename: encodeURI(this.topCaseInfoData.caseName), areaid: encodeURI(subItem.AreaId), areaname: encodeURI(item.AreaName)}})
+    },
   }
 }
 </script>

src/store/case/case.js

@@ -6,11 +6,15 @@ export default {
   namespaced: true,
   state: {
     caseTotal: {},
+    caseConf: {},
   },
   mutations: {
     setCaseTotal (state, data) { // 获取案场下单数量信息
       state.caseTotal = data
     },
+    setCaseConf (state, data) { // 获取案场下单数量信息
+      state.caseConf = data
+    },
   },
   actions: {
     getCaseTotal ({ commit }, { caseid }) {
@@ -28,5 +32,20 @@ export default {
         })
       })
     },
+    getCaseConf ({ commit },{ caseid }) {
+      return new Promise((resolve, reject) => {
+        Ajax(api.case.conf.url, {
+          method: api.case.conf.method,
+          urlData: {
+            caseid
+          }
+        }).then(res => {
+          commit("setCaseConf", res)
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    }
   }
 }

src/util/api.js

@@ -1,5 +1,5 @@
-const baseUrl = '/api-v2'
-// const baseUrl = '/api'
+// const baseUrl = '/api-v2'
+const baseUrl = '/api'
 const wechat = '/wechat/:org'
 const guest = '/guest/:org'
 
@@ -201,6 +201,10 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${wechat}/goods/case/:caseid`
     },
+    conf: {
+      method: 'get',
+      url: `${baseUrl}${wechat}/case/conf/:caseid`
+    },
   },
   goods: {
     getCustOrders: {