修改下單

src/components/calcMenu/index.vue

@@ -12,10 +12,10 @@
             <ul>
               <li class="flex-h" v-for="(item,index) in data" :key="index">
                 <span>{{item.name}}</span>
-                <span v-if="item.specName !== null">（{{item.specName}}）</span>
+                <span v-if="item.specname !== null && item.specname!=''">（{{item.specname}}）</span>
                 <div class="flex-item">
                   <div>
-                    <span>x{{item.defaultNum === null ? item.num : item.defaultNum}}</span>
+                    <span>x{{item.num}}</span>
                   </div>
                 </div>
               </li>

src/components/orderPopup/index.vue

@@ -18,7 +18,7 @@
       <div class="bottom flex-h">
         <div class="flex-item">
           <div>
-            <span>￥{{price * num}}</span>
+            <span>￥{{data.spec[activeIndex].price}}</span>
           </div>
         </div>
         <i class="iconfont icon-jian" @click="subtract"></i>
@@ -38,15 +38,31 @@ export default {
   props: ['show', 'data'],
   data () {
     return {
-      activeIndex: '',
-      price: 0,
-      num: 1,
-      specId: '',
-      specName: '',
+      activeIndex: 0,
+      // price: 0,
+      // num: 0,
+      // specId: '',
+      // specName: '',
     }
   },
   computed: {
-
+    num: {
+      get () {
+        return this.data.spec[this.activeIndex].num
+      },
+      set (val) {
+        console.log(this.data)
+        this.data.spec[this.activeIndex].num = val
+        this.$emit('returnData', {
+          id: this.data.id,
+          name: this.data.name,
+          spec: this.data.spec[this.activeIndex].id,
+          specname: this.data.spec[this.activeIndex].value,
+          defaultNum: val,
+          defaultPrice: this.data.spec[this.activeIndex].price,
+        })
+      }
+    },
   },
   components: {
 
@@ -56,23 +72,11 @@ export default {
   },
   methods: {
     sure () { // 确定
-      if (this.activeIndex === '' || this.price === 0 || this.num < 1) {
-        return false
-      }
-      this.$emit('returnData', {
-        name: this.data.name,
-        id: this.data.id,
-        specId: this.specId,
-        specName: this.specName,
-        num: this.num,
-        defaultNum: null,
-        price: this.price,
-        defaultPrice: null,
-      })
+      // this.$emit('returnData', this.data)
       this.close()
     },
     subtract () { // 减
-      if (this.num > 1) {
+      if (this.num > 0) {
         this.num -= 1
       }
     },
@@ -80,18 +84,19 @@ export default {
       this.num += 1
     },
     selectItem (item, index) { // 选择规格
+      console.log(item)
       if (item.status === 1) {
-        if (this.activeIndex === index) {
-          this.activeIndex = ''
-          this.price = 0
-          this.specId = ''
-          this.specName = ''
-        } else {
-          this.activeIndex = index
-          this.price = item.price
-          this.specId = item.id
-          this.specName = item.value
-        }
+        // if (this.activeIndex === index) {
+        //   this.activeIndex = ''
+        //   this.price = 0
+        //   this.specId = ''
+        //   this.specName = ''
+        // } else {
+        this.activeIndex = index
+          // this.price = item.price
+          // this.specId = item.id
+          // this.specName = item.value
+        // }
       }
     },
     close () { // 关闭弹窗

src/pages/user/placeOrder/index.vue

@@ -59,10 +59,10 @@
       <div class="flex-item">
         <div>
           <span>总计</span>
-          <span>{{totalNum}}</span>
+          <span>{{sumNum}}</span>
           <span>杯</span>
           <span>共</span>
-          <span>{{totalPrice}}</span>
+          <span>{{sumPrice}}</span>
           <span>元</span>
           <i class="iconfont" :class="{'icon-jiantou-up': !showCalcMenu,'icon-jiantou-down': showCalcMenu}" @click="showCalcMenu = true"></i>
         </div>
@@ -71,7 +71,7 @@
       <a @click="toPlaceOrder">下单</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>
+    <calcMenu :show="showCalcMenu" :totalNum="sumNum" :data="selGoods" @returnData="calcMenus" @emptyMenus="emptyMenus" @closeCalcMenu="closeCalcMenu" @placeOrder="placeOrder"></calcMenu>
   </div>
 </template>
 
@@ -122,6 +122,7 @@ export default {
         freeMode: true,
         freeModeMomentumVelocityRatio: 2,
       },
+      selGoods: [],
     }
   },
   computed: {
@@ -136,6 +137,20 @@ export default {
     MySubSwiper () {
       return this.$refs.mySubSwiper.swiper
     },
+    sumNum () {
+      let num = 0
+      this.selGoods.map(x => {
+        num += x.num
+      })
+      return num
+    },
+    sumPrice () {
+      let price = 0
+      this.selGoods.map(x => {
+        price += x.price*x.num - 0
+      })
+      return price
+    }
   },
   components: {
     swiper,
@@ -163,8 +178,8 @@ export default {
       'getGoodsList',
     ]),
     toPlaceOrder () { // 下单 
-      if(this.settlementList.length){
-        this.$router.push({name: 'placeOrderDetail', query: {info: JSON.stringify(this.settlementList), caseid: encodeURI(this.caseId), areaid: encodeURI(this.areaId), areaname: encodeURI(this.areaName), areaid: encodeURI(this.areaId), tableid: encodeURI(this.tableId), tableno: encodeURI(this.tableNo)}})
+      if(this.selGoods.length){
+        this.$router.push({name: 'placeOrderDetail', query: {info: JSON.stringify(this.selGoods), caseid: encodeURI(this.caseId), areaid: encodeURI(this.areaId), areaname: encodeURI(this.areaName), areaid: encodeURI(this.areaId), tableid: encodeURI(this.tableId), tableno: encodeURI(this.tableNo)}})
       }else{
         this.$toast('您还没有选择商品哦~')
       }
@@ -210,7 +225,6 @@ export default {
           }
         }
       }
-      // console.log(JSON.stringify(this.menuList))
     },
     reback () { // 返回桌位选择
       this.$dialog.confirm({
@@ -234,6 +248,7 @@ export default {
       this.currentSpec = null
     },
     selectSpec (val) { // 选规格
+      console.log(val)
       this.currentSpec = val
       this.showPopup = true
     },
@@ -241,36 +256,61 @@ export default {
       this.MySwiper.slideTo(index, 300)
     },
     calcMenus (val) { // 计算清单
-      var bool = true, arr = this.settlementList.slice()
-      if (val.specId === null) {
-        for (var n = 0; n < arr.length; n++) {
-          if (arr[n].id === val.id && arr[n].specId === null) {
-            bool = false
-            arr[n] = val
-          }
-        }
-        if (bool) {
-          arr.push(val)
-        }
-      } else {
-        for (var n = 0; n < arr.length; n++) {
-          if (arr[n].specId === val.specId) {
-            bool = false
-            arr[n] = val
-          }
-        }
-        if (bool) {
-          arr.push(val)
-        }
-      }
-      for (var n = 0; n < arr.length; n++) {
-        if (arr[n].num === 0 || arr[n].defaultNum === 0) {
-          arr.splice(n, 1)
+      var ishas = false
+      const _that = this
+      this.selGoods.map((goods,inx) => {
+        if(goods.id === val.id && goods.spec === (val.spec || '')){
+          ishas = true
+          _that.selGoods[inx].num = val.defaultNum
         }
+      })
+      if (!ishas) {
+        this.selGoods.push({
+          id: val.id,
+          price: val.defaultPrice,
+          num: val.defaultNum,
+          name: val.name,
+          spec: (val.spec || ''),
+          specname: (val.specname || ''),
+        })
       }
-      this.settlementList = arr
+      console.log(this.selGoods)
+      // var settlementList = this.settlementList
+      // val.spec.map(spec => {
+      //   settlementList.filter
+      // })
+
+
+      // var bool = true, arr = this.settlementList.slice()
+      // if (val.specId === null) {
+      //   for (var n = 0; n < arr.length; n++) {
+      //     if (arr[n].id === val.id && arr[n].specId === null) {
+      //       bool = false
+      //       arr[n] = val
+      //     }
+      //   }
+      //   if (bool) {
+      //     arr.push(val)
+      //   }
+      // } else {
+      //   for (var n = 0; n < arr.length; n++) {
+      //     if (arr[n].specId === val.specId) {
+      //       bool = false
+      //       arr[n] = val
+      //     }
+      //   }
+      //   if (bool) {
+      //     arr.push(val)
+      //   }
+      // }
+      // for (var n = 0; n < arr.length; n++) {
+      //   if (arr[n].num === 0 || arr[n].defaultNum === 0) {
+      //     arr.splice(n, 1)
+      //   }
+      // }
+      // this.settlementList = arr
       // console.log(JSON.stringify(this.settlementList))
-      this.calcTotalNum()
+      // this.calcTotalNum()
     },
     calcTotalNum () { // 计算总数量、价格
       var num = 0, price = 0

src/pages/user/placeOrderDetail/index.vue

@@ -10,13 +10,13 @@
                 <div><span>{{item.name}}</span></div>
               </div>
               <div class="flex-item">
-                <div><span>{{item.specName}}</span></div>
+                <div><span>{{item.specname}}</span></div>
               </div>
               <div class="flex-item">
-                <div><span>x{{item.defaultNum === null ? item.num : item.defaultNum}}</span></div>
+                <div><span>x{{item.num}}</span></div>
               </div>
               <div class="flex-item">
-                <div><span>￥{{item.defaultPrice === null ? item.price : item.defaultPrice}}</span></div>
+                <div><span>￥{{item.price * item.num}}</span></div>
               </div>
             </li>
             <li class="flex-h">
@@ -76,8 +76,8 @@ export default {
           AreaName: decodeURI(_self.$route.query.areaname),
           TableId: decodeURI(_self.$route.query.tableid),
           TableNo: decodeURI(_self.$route.query.tableno),
-          Amount: String(_self.returnAmount()[0]), // 订单金额
-          OrdersNum: Number(_self.returnAmount()[1]),
+          Amount: 0, // 订单金额
+          OrdersNum: 0,
           Remark: '',
         },
         detail: [],
@@ -150,16 +150,22 @@ export default {
       this.postData.info.PayType = this.postData.coupon.length ? 'coupon' : 'vip'
       var orderInfo = JSON.parse(this.$route.query.info)
       this.postData.detail = []
+      var amount = 0
+      var num = 0
       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),
+          SpecId: orderInfo[n].spec,
+          SpecName: orderInfo[n].specname,
+          Number: orderInfo[n].num - 0,
+          Price: String(orderInfo[n].price-0),
         })
+        amount += (orderInfo[n].price-0) * orderInfo[n].num
+        num += orderInfo[n].num-0
       }
+      this.postData.info.Amount = String(amount)
+      this.postData.info.OrdersNum = num
       console.log(JSON.stringify(this.postData))
       this.toPay({
         info: JSON.stringify(this.postData.info),