H5：商品下单

htmldev/dashboard/src/router/index.js

@@ -145,7 +145,7 @@ const routes = [
     meta: {
       title: '点单',
       isUseCache: false,
-      keepAlive: true,
+      keepAlive: false,
       isUseVanTabbar: false
     }
   },

htmldev/dashboard/src/views/sell/food/food.vue

@@ -203,7 +203,7 @@ export default {
 
         if (idx > -1) {
           curAttach.splice(idx, 1)
-        } else {
+        } else if (max > 0) {
           if (curAttach.length >= max) {
             curAttach.pop()
           }

htmldev/dashboard/src/views/sell/goods/index.vue

@@ -225,7 +225,7 @@ export default {
             setTimeout(() => {
               this._initScroll()
               this._calculateHeight()
-            }, 1000)
+            }, 500)
           }
         } else {
           Toast(msg)

htmldev/dashboard/src/views/sell/pay/index.vue

@@ -10,8 +10,8 @@
     </div>
     <ul class="goods-list">
       <li
-        v-for="(food, index) in selectFoods"
-        :key="index">
+        v-for="food in _selectFoods"
+        :key="food.id">
         <div class="goods-cover">
           <img
             :src="food.product_img_url"
@@ -30,8 +30,10 @@
           </p>
         </div>
       </li>
-      <li>
-        <p class="more">展开（共8件）</p>
+      <li
+        v-show="selectFoods.length > 2"
+        @click="isHideGoods = !isHideGoods">
+        <p class="more">{{ isHideGoods ? '展开' : '收起'}}（共{{ totaoNum }}件）</p>
       </li>
     </ul>
     <ul class="amount-detail">
@@ -149,6 +151,7 @@ export default {
   },
   data () {
     return {
+      isHideGoods: true,
       advancePopup: false, // 选择预约款弹窗
       advanceList: [], // 预付款列表
       curAdvance: {}, // 当前选择的预付款
@@ -163,6 +166,15 @@ export default {
     ...mapGetters({
       objCurrentBarInfo: 'common/objCurrentBarInfo'
     }),
+    _selectFoods () {
+      let result = []
+      if (!this.isHideGoods || this.selectFoods.length <= 2) {
+        result = this.selectFoods
+      } else if (this.selectFoods.length > 2) {
+        result = [this.selectFoods[0], this.selectFoods[1]]
+      }
+      return result
+    },
     selectFoods: {
       get () {
         return this.$store.getters['shopcart/selectFoods']
@@ -193,6 +205,13 @@ export default {
         total += food.product_price * food.product_num
       })
       return total > 0 ? total : 0
+    },
+    totaoNum () {
+      let total = 0
+      this.selectFoods.forEach((food) => {
+        total += food.product_num
+      })
+      return total
     }
   },
   watch: {

htmldev/dashboard/src/views/sell/shopcart/shopcart.vue

@@ -138,7 +138,6 @@ export default {
       dropBalls: [],
       fold: true,
       scroll: null,
-      selectFoods: [],
       pagenum: 1,
       pagesize: 20,
       numFetchStatus: 0, // 购物车列表加载状态
@@ -177,20 +176,21 @@ export default {
         return false
       }
       return !this.fold
+    },
+    selectFoods: {
+      get () {
+        return this.$store.getters['shopcart/selectFoods']
+      },
+      set (val) {
+        this.$store.commit('shopcart/UPDATE_SELECTFOODS', val)
+      }
     }
   },
   watch: {
     'objCurrentBarInfo.id': {
       immediate: true,
       handler: function (newVal) {
-        newVal && this.fetchCartList()
-      }
-    },
-    selectFoods: {
-      immediate: true,
-      deep: true,
-      handler: function (newVal) {
-        this.$store.commit('shopcart/UPDATE_SELECTFOODS', JSON.parse(JSON.stringify(this.selectFoods)))
+        newVal && this.init()
       }
     }
   },