xcx

src/pages/sales/coffeeIndex/index.vue

@@ -84,6 +84,7 @@ import caseTableItem from '../../../components/caseTableItem/index'
 import topCaseInfo from '../../../components/topCaseInfo/index'
 import myCard from '../../../components/myCard/myCard'
 import customerCard from '../../../components/customerCard/customerCard'
+import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('app')
 const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
 

src/pages/sales/placeOrder/index.vue

@@ -15,7 +15,7 @@
       <div class="tableInfo flex-h">
         <div class="flex-item">
           <div>
-            <span>桌号：{{tableNo}}</span>
+            <span>桌号：{{postData.info.TableNo}}</span>
             <!-- <span>本月已用：150杯</span> -->
           </div>
         </div>
@@ -66,8 +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), 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> -->
+      <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>
@@ -88,12 +87,7 @@ 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, // 当前选择规格
@@ -102,105 +96,21 @@ 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: [],
+      postData: {
+        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: 0,// String(_self.returnAmount()[0]), // 订单金额
+          OrdersNum: 0, // Number(_self.returnAmount()[1]),
+          Remark: '',
+        },
+        detail: [],
+        coupon: [],
+      },
       swiperOption: {
         observer: true,
         direction: 'vertical',
@@ -242,11 +152,11 @@ export default {
   },
   created () {
     this.getGoodsTypeList({
-      caseid: this.caseId,
+      caseid: this.postData.info.CaseId,
     }).then((res) => {
       // console.log(JSON.stringify(res))
       this.getGoodsList({
-        caseid: this.caseId,
+        caseid: this.postData.info.CaseId,
       }).then((res) => {
         // console.log(JSON.stringify(res))
         this.mapArr()
@@ -257,7 +167,53 @@ export default {
     ...caseTableActions([
       'getGoodsTypeList',
       'getGoodsList',
+      'toPay',
     ]),
+    toPayer () { // 下单
+      this.postData.info.Amount = String(this.returnAmount()[0])
+      this.postData.info.OrdersNum = Number(this.returnAmount()[1])
+      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 = this.settlementList
+      this.postData.detail = []
+      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)
+        })
+      })
+    },
+    returnAmount () { // 返回总金额  
+      var amount = 0, num = 0
+      for (var n = 0; n < this.settlementList.length; n++) {
+        if (this.settlementList[n].defaultPrice === null) {
+          amount += this.settlementList[n].price * this.settlementList[n].num
+          num += this.settlementList[n].num
+        } else {
+          amount += this.settlementList[n].defaultPrice * this.settlementList[n].defaultNum
+          num += this.settlementList[n].defaultNum
+        }
+      }
+      return [amount, num]
+    },
     mapArr () { // 匹配商品规格
       var aArr = this.goodsTypeList, bArr = this.goodsList
       for (var n = 0; n < aArr.length; n++) {
@@ -302,7 +258,7 @@ export default {
       // console.log(JSON.stringify(this.menuList))
     },
     placeOrder () { // 下单
-      this.$router.push({ name: 'orderList', query: {} })
+      this.toPayer()
     },
     closeCalcMenu () { // 关闭已选菜单
       this.showCalcMenu = false