Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz

src/views/product/add_shop.vue

@@ -666,8 +666,8 @@ export default {
         singlePeopleLimit: 0,
         weight: '',
         days: couponEnum.cycle.map(item => item.value),
-        startTime: '',
-        endTime: ''
+        startTime: '00:00',
+        endTime: '23:59'
       },
       useTime: ['00:00', '23:59'],
       imgList: [],

src/views/tool/Instead/components/transfertoPinpin.vue

@@ -123,14 +123,14 @@ export default {
                 return false;
             }
             // 判断全选增加课桌费
-            var tzf = []
-            try {
-                let one = this.itemdata.old.list.every((i, index) => i.info.length == this.multipleSelection[index].length)
-                let tow = this.itemdata.list.every((icon) => icon.length == this.refcartSelection.length)
-                if (one && tow) {
-                    tzf = [999]
-                }
-            } catch (error) { }
+            // var tzf = []
+            // try {
+            //     let one = this.itemdata.old.list.every((i, index) => i.info.length == this.multipleSelection[index].length)
+            //     let tow = this.itemdata.list.every((icon) => icon.length == this.refcartSelection.length)
+            //     if (one && tow) {
+            //         tzf = [999]
+            //     }
+            // } catch (error) { }
             // 数据处理  增加cartId方便判断
             if (this.refcartSelection.length) {
                 this.refcartSelection.forEach((i) => {
@@ -141,7 +141,7 @@ export default {
             await placeswitch({
                 masterId: this.masterId,
                 orderId: this.itemdata.orderId, //当前台桌订单id 可选
-                cartIds: this.isFull ? "" : [...cartIds.flatMap((subArray) => subArray.map((item) => item.cartId)), ...tzf], //转单的购物车商品  并桌时可不传 可选
+                cartIds: this.isFull ? "" : cartIds.flatMap((subArray) => subArray.map((item) => item.cartId)), //转单的购物车商品  并桌时可不传 可选
                 isFull: this.isFull, //并台会将全部购物车商品转入，默认为false 可选
                 currentTableId: this.currentTableId,
                 targetTableId: this.targetTableId,