ytj

src/components/caseTableItem/index.vue

@@ -11,8 +11,8 @@
     </div>
     <div class="flex-item">
       <div>
-        <span>案场一号桌</span>
-        <router-link :to="{name: 'placeOrder', query: {}}">选择点单</router-link>
+        <span>{{item.TableNo}}</span>
+        <a>选择点单</a>
       </div>
     </div>
   </div>

src/components/orderPopup/index.vue

@@ -99,11 +99,11 @@ export default {
       this.resetData()
     },
     resetData () { // 重置状态
-      this.activeIndex = ''
-      this.price = 0
-      this.num = 1
-      this.specName = ''
-      this.specId = ''
+      // this.activeIndex = ''
+      // this.price = 0
+      // this.num = 1
+      // this.specName = ''
+      // this.specId = ''
     },
   }
 }

src/components/topCaseInfo/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="topCaseInfo flex-h">
     <i class="iconfont icon-dingwei"></i>
-      <span>{{data.caseName}}</span>
-      <a v-if="data.showSelect" @click="selectCase">请选择</a>
+      <span>{{data.CaseName}}</span>
+      <a v-if="data.ShowSelect" @click="selectCase">请选择</a>
       <div class="flex-item">
-        <span>{{data.userName}}您好！</span>
+        <span>{{userName}}您好！</span>
       </div>
   </div>
 </template>
@@ -13,7 +13,7 @@
 
 export default {
   name: '',
-  props: ['data'],
+  props: ['data','userName'],
   data () {
     return {
 

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

@@ -1,23 +1,23 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" @selectCase="showSelect = true"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer != undefined ? userInfo.customer.CustomerName : ''" @selectCase="ShowSelect = true"></topCaseInfo>
     </div>
     <div class="content flex-item">
       <div>
         <div class="flex-h">
           <div class="flex-item">
             <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>
@@ -25,19 +25,22 @@
         </div>
       </div>
     </div>
-    <div class="selectCase" :hidden="!showSelect"></div>
-    <van-picker :hidden="!showSelect"
+    <div class="selectCase" :hidden="!ShowSelect"></div>
+    <van-picker :hidden="!ShowSelect"
       show-toolbar
       title="选择案场"
-      :columns="caseList"
-      @cancel="showSelect = false"
+      :columns="CaseList"
+      @cancel="ShowSelect = false"
       @confirm="selectCase"
-      value-key="value"
+      value-key="CaseName"
     />
   </div>
 </template>
 
 <script>
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapActions: actions } = createNamespacedHelpers('app')
+const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
 import caseTableItem from '../../../../components/caseTableItem/index'
 import topCaseInfo from '../../../../components/topCaseInfo/index'
 
@@ -46,29 +49,11 @@ export default {
   data () {
     return {
       topCaseInfoData: {
-        caseName: '',
-        caseId: '',
-        showSelect: true,
-        userName: 'xxx'
+        CaseName: '',
+        CaseId: '',
+        ShowSelect: true,
       },
-      caseInfo: {
-        value: '',
-        id: ''
-      },
-      showSelect: false,
-      caseList: [{
-        value: '案场一',
-        id: ''
-      }, {
-        value: '案场二',
-        id: ''
-      }, {
-        value: '案场三',
-        id: ''
-      }, {
-        value: '案场四',
-        id: ''
-      }],
+      ShowSelect: false,
       list: [{
         name: '案场名称1',
         list: [{}, {}, {}, {}, {}],
@@ -79,21 +64,39 @@ export default {
     }
   },
   computed: {
-
+    ...mapState({
+      userInfo: x => x.userCenter.userInfo,
+      CaseList: x => x.app.CaseList,
+      CaseTableList: x => x.placeOrderForCoffee.CaseTableList,
+    })
   },
   components: {
     topCaseInfo,
     caseTableItem,
   },
   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.caseInfo = val
-      this.topCaseInfoData.caseName = val.value
-      this.topCaseInfoData.caseId = val.id
-      this.showSelect = false
+      this.topCaseInfoData.CaseName = val.CaseName
+      this.topCaseInfoData.CaseId = val.CaseId
+      this.getCaseTableList({
+        caseid: this.topCaseInfoData.CaseId
+      })
+      this.ShowSelect = false
     },
   }
 }

src/pages/user/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,7 +66,7 @@
           <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>
+      <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>
@@ -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

@@ -5,18 +5,18 @@
       <div class="list flex-h">
         <div class="flex-item">
           <ul>
-            <li class="flex-h" v-for="(item,index) in 10" :key="index">
+            <li class="flex-h" v-for="(item,index) in orderInfo" :key="index">
               <div class="flex-item">
-                <div><span>美式特浓</span></div>
+                <div><span>{{item.name}}</span></div>
               </div>
               <div class="flex-item">
-                <div><span>加冰</span></div>
+                <div><span>{{item.specName}}</span></div>
               </div>
               <div class="flex-item">
-                <div><span>x1</span></div>
+                <div><span>x{{item.defaultNum === null ? item.num : item.defaultNum}}</span></div>
               </div>
               <div class="flex-item">
-                <div><span>￥20</span></div>
+                <div><span>￥{{item.defaultPrice === null ? item.price : item.defaultPrice}}</span></div>
               </div>
             </li>
             <li class="flex-h">
@@ -35,14 +35,14 @@
       <div class="remark flex-h">
         <div class="flex-item flex-h">
           <div class="flex-h">
-            <textarea class="flex-item" cols="30" rows="10"></textarea>
+            <textarea class="flex-item" cols="30" rows="10" v-model="postData.info.Remark"></textarea>
           </div>
         </div>
       </div>
-      <span>下单人：小五子 18267901393</span>
+      <span>下单人：{{userInfo.CustomerName}} {{userInfo.Phone}}</span>
       <div class="bottom">
         <a>取消</a>
-        <a>确定</a>
+        <a @click="toPayer">确定</a>
       </div>
     </div>
     <div class="selectLayer" :class="{'show': showSelect}">
@@ -61,14 +61,42 @@
 </template>
 
 <script>
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
 
 export default {
   name: '',
   data () {
+    var _self = this
     return {
       postData: {
-        ticketId: '',
-        ticketName: '',
+        info: {
+          CaseId: decodeURI(_self.$route.query.caseid),
+          AreaId: decodeURI(_self.$route.query.areaid),
+          AreaName: decodeURI(_self.$route.query.areaname),
+          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: '',
+        },
+        detail: [],
+        coupon: [
+        //   {
+        //   OrdersCouponId: '',
+        //   OrdersId: '',
+        //   OrdersNo: '',
+        //   CouponId: '',
+        //   CouponName: '',
+        //   OrgId: '',
+        //   GoodsId: '',
+        //   GoodsName: '',
+        //   UsedAmount: '',
+        //   Status: '',
+        //   CreateDate: '',
+        // }
+        ],
       },
       ticketList: [{
         value: '优惠券1',
@@ -81,23 +109,75 @@ export default {
         id: '3',
       }],
       showSelect: false,
-      orderInfo: JSON.parse(this.$route.query.info)
+      orderInfo: JSON.parse(_self.$route.query.info) || []
     }
   },
+  computed: {
+    ...mapState({
+      userInfo: x => x.userCenter.userInfo,
+      orgId: x => x.app.orgId,
+    })
+  },
   created () {
-
+    // console.log(this.$route.query.info)
+    // console.log(JSON.stringify(this.postData))
   },
   methods: {
+    ...caseTableActions([
+      'toPay',
+    ]),
+    returnAmount () { // 返回总金额  
+      var amount = 0, num = 0, info = JSON.parse(this.$route.query.info)
+      for (var n = 0; n < info.length; n++) {
+        if (info[n].defaultPrice === null) {
+          amount += info[n].price * info[n].num
+          num += info[n].num
+        } else {
+          amount += info[n].defaultPrice * info[n].defaultNum
+          num += info[n].defaultNum
+        }
+      }
+      return [amount, num]
+    },
     onConfirm (value, index) {
-      this.postData.ticketName = value.value
-      this.postData.ticketId = value.id
+      this.postData.coupon.CouponName = value.value
+      this.postData.coupon.CouponId = value.id
       this.showSelect = false
     },
+    toPayer () { // 下单
+      this.postData.info.OrgId = this.orgId
+      this.postData.info.UserId = this.userInfo.CustomerId
+      this.postData.info.UserName = this.userInfo.CustomerName
+      this.postData.info.PayType = this.postData.coupon.length ? 'coupon' : 'vip'
+      var orderInfo = JSON.parse(this.$route.query.info)
+      for (var n = 0; n < orderInfo.length; n++) {
+        this.postData.detail.push({
+          GoodsId: orderInfo[n].id,
+          GoodsName: orderInfo[n].name,
+          SpecId: orderInfo[n].specId,
+          SpecName: orderInfo[n].specName,
+          Number: orderInfo[n].defaultNum === null ? orderInfo[n].num - 0 : orderInfo[n].defaultNum - 0,
+          Price: orderInfo[n].defaultNum === null ? String(orderInfo[n].price) : String(orderInfo[n].defaultPrice),
+        })
+      }
+      console.log(JSON.stringify(this.postData))
+      this.toPay({
+        info: JSON.stringify(this.postData.info),
+        detail: JSON.stringify(this.postData.detail),
+        coupon: JSON.stringify(this.postData.coupon)
+      }).then((res) => {
+        this.$dialog.alert({
+          message: '下单成功！'
+        }).then(() => {
+          window.history.go(-2)
+        })
+      })
+    },
   }
 }
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

src/store/app/app.js

@@ -1,24 +1,40 @@
+import Ajax from '../../util/ajax'
+import api from '../../util/api'
 
 export default {
   namespaced: true,
   state: {
-    orgId: '1'
+    orgId: '1',
+    CaseList: []
   },
   mutations: {
     init (state, data) { // 这里的state对应着上面这个state
       state.orgId = '2'
-    }
+    },
+    setCaseList (state, data) { // 设置案场信息
+      state.CaseList = data
+    },
   },
   actions: {
     updateLocationInfo (context) { // 这里的context和我们使用的$store拥有相同的对象和方法
       return new Promise((resolve) => {
-        this.$ajax(this.$api.cms.location.url, {
-          method: this.$api.cms.location.method
+        Ajax(api.index.cms.location.url, {
+          method: api.index.cms.location.method
         }).then(res => {
           context.commit('init', res)
           resolve()
         })
       })
+    },
+    getCaseList (context) { // 获取案场信息
+      return new Promise((resolve) => {
+        Ajax(api.user.getCaseList.url, {
+          method: api.user.getCaseList.method
+        }).then(res => {
+          context.commit('setCaseList', res.cases)
+          resolve(res)
+        })
+      })
     }
   }
 }

src/store/index.js

@@ -15,6 +15,7 @@ export const modules = {
   fiveA: () => require('./fiveA/fiveA').default,
   userCenter: () => require('./userCenter/userCenter').default,
   majorProjects: () => require('./majorProjects/majorProjects').default,
+  placeOrderForCoffee: () => require('./placeOrderForCoffee/index').default,
 }
 
 Object.keys(modules).forEach((modKey) => {

src/store/majorProjects/majorProjects.js

@@ -17,6 +17,21 @@ export default {
     }
   },
   actions: {
+    placeOrderForCourse (context, { order, coupons = [] }) { // 课程下单
+      return new Promise((resolve, reject) => {
+        Ajax(api.majorProjects.placeCourseOrder.url, {
+          method: api.majorProjects.placeCourseOrder.method,
+          data: {
+            info: window.JSON.stringify(order),
+            coupons: window.JSON.stringify(coupons),
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
     getProjectInfo (context, { id }) { // 获取课程列表
       return new Promise((resolve) => {
         Ajax(api.majorProjects.getCourseList.url, {

src/store/placeOrderForCoffee/index.js

@@ -0,0 +1,81 @@
+import Ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    CaseTableList: [],
+    goodsTypeList: [],
+    goodsList: [],
+  },
+  mutations: {
+    emptyCaseTableList (state, data) { // 清空案场桌位信息
+      state.CaseTableList = []
+    },
+    setCaseTableList (state, data) { // 设置案场桌位信息
+      state.CaseTableList = data
+    },
+    setGoodsTypeList (state, data) { // 设置商品分类列表信息
+      state.goodsTypeList = data
+    },
+    setGoodsList (state, data) { // 设置商品列表信息
+      state.goodsList = data
+    },
+  },
+  actions: {
+    getCaseTableList (context, { caseid }) { // 获取案场桌位信息
+      return new Promise((resolve) => {
+        context.commit('emptyCaseTableList')
+        Ajax(api.caseForCoffee.getCaseTableList.url, {
+          method: api.caseForCoffee.getCaseTableList.method,
+          queryData: {
+            caseid,
+          },
+        }).then(res => {
+          context.commit('setCaseTableList', res)
+          resolve(res)
+        })
+      })
+    },
+    getGoodsTypeList (context, { caseid }) { // 获取商品分类列表信息
+      return new Promise((resolve) => {
+        Ajax(api.caseForCoffee.getGoodsTypeList.url, {
+          method: api.caseForCoffee.getGoodsTypeList.method,
+          queryData: {
+            caseid,
+          },
+        }).then(res => {
+          context.commit('setGoodsTypeList', res)
+          resolve(res)
+        })
+      })
+    },
+    getGoodsList (context, { caseid }) { // 获取商品列表信息
+      return new Promise((resolve) => {
+        Ajax(api.caseForCoffee.getGoodsList.url, {
+          method: api.caseForCoffee.getGoodsList.method,
+          queryData: {
+            caseid,
+          },
+        }).then(res => {
+          context.commit('setGoodsList', res.list)
+          resolve(res)
+        })
+      })
+    },
+    toPay (context, { info, detail, coupon }) { // 下单
+      return new Promise((resolve) => {
+        Ajax(api.caseForCoffee.placeGoodsOrder.url, {
+          method: api.caseForCoffee.placeGoodsOrder.method,
+          data: {
+            info,
+            detail,
+            coupon,
+          },
+        }).then(res => {
+          resolve(res)
+        })
+      })
+    },
+  }
+}

src/store/userCenter/userCenter.js

@@ -72,7 +72,37 @@ http.submitData = (data) => { // 绑定手机号
 export default {
   namespaced: true,
   state: {
-    userInfo: {},
+    userInfo: {
+      AccountInfo: {
+        "city": "CITY",
+        "country": "COUNTRY",
+        "headimgurl": "http://thirdwx.qlogo.cn/mmopen/g3MonUZtNHkdmzicIlibx6iaFqAc56vxLSUfpb6n5WKSYVY0ChQKkiaJSgQ1dZuTOgvLLrhJbERQQ4eMsv84eavHiaiceqxibJxCfHe/46",
+        "nickname": "NICKNAME",
+        "openid": "OPENID",
+        "province": "PROVINCE",
+        "sex": "1",
+        "unionid": "o6_bmasdasdsad6_2sgVt7hMZOPfL"
+      },
+      AccountType: "wechat",
+      CreateDate: "0001-01-01T00:00:00Z",
+      CustomerId: "1",
+      CustomerName: "测试",
+      Headimgurl: "",
+      MapUser: "",
+      MappingId: "1",
+      Name: "测试",
+      Openid: "OPENID",
+      OrgId: "1",
+      Phone: "13823838438",
+      Points: 0,
+      RecommendCase: "1",
+      RecommendId: "0",
+      RecommendName: "",
+      Sex: 1,
+      Status: 1,
+      UserType: "customer",
+      Uuid: "",
+    },
     caseInfo: {}
   },
   mutations: {

src/util/ajax.js

@@ -1,6 +1,7 @@
 import axios from 'axios'
 import qs from 'qs'
 import toolClass from './util'
+import { Toast } from '../../node_modules/vant';
 
 const Axios = axios.create({
   timeout: 60000,
@@ -15,7 +16,7 @@ const Axios = axios.create({
 
 Axios.interceptors.request.use((config) => {
   // 处理请求data,若为get请求，拼到url后面，若为post请求，直接添加到body中
-  config.urlData = {...config.urlData, org: 1}
+  config.urlData = {...config.urlData, org: 'MQ'}
   let urlData = qs.stringify(config.urlData)
   let queryData = qs.stringify(config.queryData)
   // 判断是通过斜杠传参还是通过query传参
@@ -55,7 +56,7 @@ const ajax = (...args) => {
         // reject(code)
         toolClass.getCode()
       } else {
-        Message({
+        Toast({
           message: message,
           type: 'error'
         })

src/util/api.js

@@ -26,6 +26,24 @@ const $api = {
       url: `${baseUrl}${guest}/cms/news`
     }
   },
+  caseForCoffee: {
+    getCaseTableList: { // 获取案场桌位列表
+      method: 'get',
+      url: `${baseUrl}${guest}/cms/area`
+    },
+    getGoodsTypeList: { // 获取商品分类列表
+      method: 'get',
+      url: `${baseUrl}${guest}/type/goods`
+    },
+    getGoodsList: { // 获取商品列表
+      method: 'get',
+      url: `${baseUrl}${guest}/goods`
+    },
+    placeGoodsOrder: { // 商品下单
+      method: 'post',
+      url: `${baseUrl}${wechat}/order/goods`
+    }
+  },
   majorProjects: { // 项目专题
     getCourseList: { // 获取课程列表
       method: 'get',
@@ -35,6 +53,10 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${guest}/course/:id`
     },
+    placeCourseOrder: { // 课程下单
+      method: 'post',
+      url: `${baseUrl}${wechat}/order/course`
+    },
   },
   user: {
     info: { // 获取用户信息
@@ -52,7 +74,11 @@ const $api = {
     captcha: { // 获取手机验证码
       method: 'get',
       url: `${baseUrl}${guest}/captcha`
-    }
+    },
+    getCaseList: { // 获取案场信息
+      method: 'get',
+      url: `${baseUrl}${guest}/case`
+    },
   },
   login:{ // 主管、销售端登陆
     login: {