xcx

src/pages/sales/coffeeIndex/index.vue

@@ -27,16 +27,16 @@
               <div class="flex-item">
                 <div>
                   <ul class="areaList">
-                    <li v-for="(item,index) in list" :key="index">
+                    <li v-for="(item,index) in CaseTableList" :key="index">
                       <div class="title">
                         <i class="iconfont icon-yinchenglogo"></i>
-                        <span>{{item.name}}</span>
+                        <span>{{item.AreaName}}</span>
                       </div>
                       <ul class="subAreaList flex-h">
-                        <li class="flex-item flex-h" v-for="(subItem,subIndex) in item.list" :key="subIndex">
+                        <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 :item="subItem" :index="subIndex"></caseTableItem>
-                        </li>
-                        <li class="flex-item noData" v-if="item.list.length % 2 != 0"></li>
+                        </router-link>
+                        <li class="flex-item noData" v-if="item.Tables.length % 2 != 0"></li>
                       </ul>
                     </li>
                   </ul>
@@ -84,6 +84,8 @@ import caseTableItem from '../../../components/caseTableItem/index'
 import topCaseInfo from '../../../components/topCaseInfo/index'
 import myCard from '../../../components/myCard/myCard'
 import customerCard from '../../../components/customerCard/customerCard'
+const { mapActions: actions } = createNamespacedHelpers('app')
+const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
 
 export default {
   name: '',
@@ -145,7 +147,11 @@ export default {
     }
   },
   computed: {
-
+    ...mapState({
+      userInfo: x => x.userCenter.userInfo,
+      CaseList: x => x.app.CaseList,
+      CaseTableList: x => x.placeOrderForCoffee.CaseTableList,
+    })
   },
   components: {
     topCaseInfo,
@@ -154,18 +160,32 @@ export default {
     customerCard
   },
   created () {
-
+    this.getCaseList().then((res) => {
+      this.topCaseInfoData.CaseName = res.cases[0].CaseName
+      this.topCaseInfoData.CaseId = res.cases[0].CaseId
+      this.getCaseTableList({
+        caseid: this.topCaseInfoData.CaseId
+      })
+    })
   },
   methods: {
+    ...actions([
+      'getCaseList',
+    ]),
+    ...caseTableActions([
+      'getCaseTableList',
+    ]),
+    selectCase (val) { // 选择案场
+      this.topCaseInfoData.CaseName = val.CaseName
+      this.topCaseInfoData.CaseId = val.CaseId
+      this.getCaseTableList({
+        caseid: this.topCaseInfoData.CaseId
+      })
+      this.ShowSelect = false
+    },
     cutNav (index) { // 切换nav
       this.navActive = index
     },
-    selectCase (val) { // 选择案场
-      this.caseInfo = val
-      this.topCaseInfoData.caseName = val.value
-      this.topCaseInfoData.caseId = val.id
-      this.showSelect = false
-    },
     share (item) {
       console.log(item)
     }

src/pages/sales/placeOrder/index.vue

@@ -6,17 +6,17 @@
         <div class="bannerInfo flex-h">
           <div class="flex-item">
             <div>
-              <span>项目名称：xxxx</span>
+              <span>项目名称：{{caseName}}</span>
             </div>
           </div>
-          <span>xxx您好！</span>
+          <span>{{userInfo.customer != undefined ? userInfo.customer.CustomerName : ''}}您好！</span>
         </div>
       </div>
       <div class="tableInfo flex-h">
         <div class="flex-item">
           <div>
-            <span>桌号：案场11号桌</span>
-            <span>本月已用：150杯</span>
+            <span>桌号：{{tableNo}}</span>
+            <!-- <span>本月已用：150杯</span> -->
           </div>
         </div>
         <router-link :to="{name: 'coffeeIndex', query: {}}">返回选择桌号</router-link>
@@ -66,8 +66,8 @@
           <i class="iconfont" :class="{'icon-jiantou-up': !showCalcMenu,'icon-jiantou-down': showCalcMenu}" @click="showCalcMenu = true"></i>
         </div>
       </div>
-      <!-- <router-link :to="{name: 'placeOrderDetail', query: {info: JSON.stringify(settlementList)}}">下单</router-link> -->
-      <a @click="showCalcMenu = true">下单</a>
+      <router-link :to="{name: 'placeOrderDetail', query: {info: JSON.stringify(settlementList), caseid: encodeURI(caseId), areaid: encodeURI(areaId), areaname: encodeURI(areaName), areaid: encodeURI(areaId), tableid: encodeURI(tableId), tableno: encodeURI(tableNo)}}">下单</router-link>
+      <!-- <a @click="showCalcMenu = true">下单</a> -->
     </div>
     <orderPopup :show="showPopup" :data="currentSpec" @closePopup="closePopup" @returnData="calcMenus"></orderPopup>
     <calcMenu :show="showCalcMenu" :totalNum="totalCupNum" :data="settlementList" @returnData="calcMenus" @emptyMenus="emptyMenus" @closeCalcMenu="closeCalcMenu" @placeOrder="placeOrder"></calcMenu>
@@ -75,6 +75,8 @@
 </template>
 
 <script>
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
 import orderItem from '../../../components/orderItem/index'
 import orderPopup from '../../../components/orderPopup/index'
 import calcMenu from '../../../components/calcMenu/index'
@@ -86,6 +88,12 @@ export default {
   data () {
     const _self = this
     return {
+      tableNo: decodeURI(this.$route.query.tableno),
+      tableId: decodeURI(this.$route.query.tableid),
+      areaId: decodeURI(this.$route.query.areaid),
+      areaName: decodeURI(this.$route.query.areaname),
+      caseName: decodeURI(this.$route.query.casename),
+      caseId: decodeURI(this.$route.query.caseid),
       totalCupNum: 0, // 共计使用杯数
       showCalcMenu: false, // 显隐已点菜单弹窗
       currentSpec: null, // 当前选择规格
@@ -94,103 +102,105 @@ export default {
       totalPrice: 0, // 总价格
       settlementList: [], // 商品选择清单
       slideMenusActive: 0, // 左侧菜单选中索引值
-      menuList: [{ // 商品数据
-        value: '咖啡',
-        eValue: 'Coffee',
-        id: '1',
-        status: 1,
-        list: [{
-          img: '',
-          name: '商品名称',
-          id: '1-1',
-          status: 1,
-          spec: [{
-            value: '去冰',
-            id: '1-1-1',
-            num: 0,
-            status: 0,
-            price: '10',
-          }, {
-            value: '少冰',
-            id: '1-1-2',
-            num: 0,
-            status: 1,
-            price: '15',
-          }, {
-            value: '正常',
-            id: '1-1-3',
-            num: 0,
-            status: 1,
-            price: '20',
-          }, {
-            value: '多冰',
-            id: '1-1-4',
-            num: 0,
-            status: 1,
-            price: '25',
-          }],
-          price: '100',
-        }, {
-          img: '',
-          name: '商品名称',
-          id: '1-2',
-          spec: [],
-          status: 0,
-          price: '100',
-        }, {
-          img: '',
-          name: '商品名称',
-          id: '1-3',
-          spec: [],
-          status: 1,
-          price: '100',
-        }, {
-          img: '',
-          name: '商品名称',
-          id: '1-4',
-          spec: [],
-          status: 1,
-          price: '100',
-        }, {
-          img: '',
-          name: '商品名称',
-          id: '1-5',
-          spec: [],
-          status: 1,
-          price: '100',
-        }, {
-          img: '',
-          name: '商品名称',
-          id: '1-6',
-          spec: [],
-          status: 1,
-          price: '100',
-        }],
-      }, {
-        value: '咖啡一',
-        eValue: 'Coffee',
-        id: '2',
-        status: 1,
-        list: [],
-      }, {
-        value: '咖啡二',
-        eValue: 'Coffee',
-        id: '3',
-        status: 1,
-        list: [],
-      }, {
-        value: '咖啡三',
-        eValue: 'Coffee',
-        id: '4',
-        status: 1,
-        list: [],
-      }, {
-        value: '咖啡四',
-        eValue: 'Coffee',
-        id: '5',
-        status: 1,
-        list: [],
-      }],
+      menuList: [ // 商品数据
+      //   {
+      //   value: '咖啡',
+      //   eValue: 'Coffee',
+      //   id: '1',
+      //   status: 1,
+      //   list: [{
+      //     img: '',
+      //     name: '商品名称',
+      //     id: '1-1',
+      //     status: 1,
+      //     spec: [{
+      //       value: '去冰',
+      //       id: '1-1-1',
+      //       num: 0,
+      //       status: 0,
+      //       price: '10',
+      //     }, {
+      //       value: '少冰',
+      //       id: '1-1-2',
+      //       num: 0,
+      //       status: 1,
+      //       price: '15',
+      //     }, {
+      //       value: '正常',
+      //       id: '1-1-3',
+      //       num: 0,
+      //       status: 1,
+      //       price: '20',
+      //     }, {
+      //       value: '多冰',
+      //       id: '1-1-4',
+      //       num: 0,
+      //       status: 1,
+      //       price: '25',
+      //     }],
+      //     price: '100',
+      //   }, {
+      //     img: '',
+      //     name: '商品名称',
+      //     id: '1-2',
+      //     spec: [],
+      //     status: 0,
+      //     price: '100',
+      //   }, {
+      //     img: '',
+      //     name: '商品名称',
+      //     id: '1-3',
+      //     spec: [],
+      //     status: 1,
+      //     price: '100',
+      //   }, {
+      //     img: '',
+      //     name: '商品名称',
+      //     id: '1-4',
+      //     spec: [],
+      //     status: 1,
+      //     price: '100',
+      //   }, {
+      //     img: '',
+      //     name: '商品名称',
+      //     id: '1-5',
+      //     spec: [],
+      //     status: 1,
+      //     price: '100',
+      //   }, {
+      //     img: '',
+      //     name: '商品名称',
+      //     id: '1-6',
+      //     spec: [],
+      //     status: 1,
+      //     price: '100',
+      //   }],
+      // }, {
+      //   value: '咖啡一',
+      //   eValue: 'Coffee',
+      //   id: '2',
+      //   status: 1,
+      //   list: [],
+      // }, {
+      //   value: '咖啡二',
+      //   eValue: 'Coffee',
+      //   id: '3',
+      //   status: 1,
+      //   list: [],
+      // }, {
+      //   value: '咖啡三',
+      //   eValue: 'Coffee',
+      //   id: '4',
+      //   status: 1,
+      //   list: [],
+      // }, {
+      //   value: '咖啡四',
+      //   eValue: 'Coffee',
+      //   id: '5',
+      //   status: 1,
+      //   list: [],
+      // }
+      ],
       swiperOption: {
         observer: true,
         direction: 'vertical',
@@ -211,6 +221,11 @@ export default {
     }
   },
   computed: {
+    ...mapState({
+      userInfo: x => x.userCenter.userInfo,
+      goodsTypeList: x => x.placeOrderForCoffee.goodsTypeList,
+      goodsList: x => x.placeOrderForCoffee.goodsList
+    }),
     MySwiper () {
       return this.$refs.mySwiper.swiper
     },
@@ -225,10 +240,69 @@ export default {
     orderPopup,
     calcMenu,
   },
-  created () { },
+  created () {
+    this.getGoodsTypeList({
+      caseid: this.caseId,
+    }).then((res) => {
+      // console.log(JSON.stringify(res))
+      this.getGoodsList({
+        caseid: this.caseId,
+      }).then((res) => {
+        // console.log(JSON.stringify(res))
+        this.mapArr()
+      })
+    })
+  },
   methods: {
+    ...caseTableActions([
+      'getGoodsTypeList',
+      'getGoodsList',
+    ]),
+    mapArr () { // 匹配商品规格
+      var aArr = this.goodsTypeList, bArr = this.goodsList
+      for (var n = 0; n < aArr.length; n++) {
+        aArr[n].list = []
+        for (var a = 0; a < bArr.length; a++) {
+          if (aArr[n].TypeId === bArr[a].TypeId) {
+            aArr[n].list.push(bArr[a])
+          }
+        }
+      }
+      this.menuList = []
+      for (var x = 0; x < aArr.length; x++) {
+        this.menuList.push({
+          value: aArr[x].TypeName,
+          eValue: aArr[x].EnglishName,
+          id: aArr[x].TypeId,
+          status: aArr[x].Status,
+          list: []
+        })
+        for (var y = 0; y < aArr[x].list.length; y++) {
+          this.menuList[x].list.push({
+            img: aArr[x].list[y].Images,
+            name: aArr[x].list[y].GoodsName,
+            id: aArr[x].list[y].GoodsId,
+            spec: [],
+            status: aArr[x].list[y].Status,
+            price: aArr[x].list[y].Price,
+          })
+          if(aArr[x].list[y].Specs !== null){
+            for (var z = 0; z < aArr[x].list[y].Specs.length; z++) {
+              this.menuList[x].list[y].spec.push({
+                value: aArr[x].list[y].Specs[z].SpecName,
+                id: aArr[x].list[y].Specs[z].SpecId,
+                num: 0,
+                status: aArr[x].list[y].Specs[z].Status,
+                price: aArr[x].list[y].Specs[z].GoodsPrice,
+              })
+            }
+          }
+        }
+      }
+      // console.log(JSON.stringify(this.menuList))
+    },
     placeOrder () { // 下单
-      this.$router.push({name: 'orderList', query: {}})
+      this.$router.push({ name: 'orderList', query: {} })
     },
     closeCalcMenu () { // 关闭已选菜单
       this.showCalcMenu = false
@@ -304,5 +378,5 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

src/pages/user/placeOrderDetail/index.vue

@@ -77,7 +77,6 @@ export default {
           TableId: decodeURI(_self.$route.query.tableid),
           TableNo: decodeURI(_self.$route.query.tableno),
           Amount: String(_self.returnAmount()[0]), // 订单金额
-          UserType: 'customer',
           OrdersNum: Number(_self.returnAmount()[1]),
           Remark: '',
         },

vue.config.js

@@ -24,8 +24,8 @@ module.exports = {
       '/api-v2': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
         // target: 'http://192.168.0.62:8080', //wf
-        // target: 'http://192.168.0.11:8080', //ys
-        target: 'http://dev.ycjcjy.com', //frp
+        target: 'http://192.168.0.11:8080', //ys
+        // target: 'http://dev.ycjcjy.com', //frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {
         //   '^/api': '/api-v2/api'