问题修复

pagesCreateOrder/index/components/car.vue

@@ -94,7 +94,7 @@
               <view class="u-p-l-30 u-p-r-30 color-333" style="">
                 {{ item.number }}
               </view>
-              <template v-if="item.type != 'package'">
+              <template v-if="item.type != 'package' ||  (item.type == 'package'&&item.groupType==0)">
                 <view class="u-flex" @tap="updateNumber(true, index, item)">
                   <image
                     src="/pagesCreateOrder/static/images/icon-add-black.svg"
@@ -199,6 +199,9 @@
             </view>
           </view>
         </view>
+
+        <view style="height: 100px;"></view>
+
       </scroll-view>
 
       <view
@@ -286,12 +289,14 @@
 
     <ServingStyleModal
       v-model="servingStyleModalShow"
+      v-model:servingSel="subStatus"
       @confirm="servingStyleConfirm"
     ></ServingStyleModal>
 
     <!-- 下单确认 -->
     <Modal
       v-model="orderConfirmModalShow"
+
       title="下单确认"
       confirmText="确定"
       @confirm="workerConfirm"
@@ -531,7 +536,6 @@ function setModalShow(key = "show", show = true, type = "", title = "") {
   }
   modal.key = key;
   modal[key] = show;
-  console.log(modal, 123);
 }
 
 function nullFun() {}
@@ -585,6 +589,7 @@ async function workerConfirm() {
     return infoBox.showToast("请输入当前登录员工账号");
   }
   let newOldRes = null;
+  console.log('props.orderInfo',props.orderInfo);
   if (props.data.length >= 1) {
     newOldRes = await createOrder({
       shopId: uni.getStorageSync("shopId"), //店铺Id
@@ -600,6 +605,7 @@ async function workerConfirm() {
       vipPrice: false, //是否使用会员价
       limitRate: null,
       subStatus: subStatus.value,
+      orderId: props.orderInfo.id?props.orderInfo.id:"",
     });
     if (!newOldRes) {
       return infoBox.showToast("创建订单失败");
@@ -607,6 +613,7 @@ async function workerConfirm() {
   }
 
   form.workerAccount = "";
+  subStatus.value = servingStyles[0].value
   go.to("PAGES_TABLE_ORDER", {
     orderId: newOldRes ? newOldRes.id : props.orderInfo.id,
   });
@@ -729,11 +736,12 @@ function touchend(e) {
 }
 
 function clear() {
+  edmits("clear", modal.key);
+  setModalShow("clear", false);
   if (modal.type == "cart") {
     hideGoods();
   }
-  setModalShow("clear", false);
-  edmits("clear", modal.type);
+
 
   // setModalShow('clear', false)
   // edmits('clear')

pagesCreateOrder/index/components/cart-goods-item.vue

@@ -138,7 +138,20 @@
           <template v-else>
             <view class="u-flex w-full u-row-right">
               <view class="u-flex icon-btn">
-                <template v-if="data.chooseNumber">
+                <template v-if="carsProductIdNumberMap[data.id]">
+                  <view class="u-flex" @tap.stop="emitEvent('reduce')">
+                    <image
+                      src="/pagesCreateOrder/static/images/icon-reduce.svg"
+                      class="icon"
+                      mode=""
+                    >
+                    </image>
+                  </view>
+                  <view class="u-font-32">
+                    {{ carsProductIdNumberMap[data.id] }}
+                  </view>
+                </template>
+                <!-- <template v-if="data.chooseNumber">
                   <view class="u-flex" @tap.stop="emitEvent('reduce')">
                     <image
                       src="/pagesCreateOrder/static/images/icon-reduce.svg"
@@ -150,7 +163,7 @@
                   <view class="u-font-32">
                     {{ data.chooseNumber }}
                   </view>
-                </template>
+                </template> -->
                 <view
                   class="u-flex"
                   @tap.stop="
@@ -173,7 +186,7 @@
         </template>
       </view>
       <view class="bg-fff u-p-20 w-full">
-        <view class="u-flex u-row-between ">
+        <view class="u-flex u-row-between">
           <view class="u-font-40">{{ data.name }}</view>
           <view class="u-flex" v-if="is_time_discount">
             <view class="font-bold u-m-t-16 u-font-40">
@@ -182,7 +195,9 @@
             <view class="u-m-t-16 old-price"> ￥{{ data.lowPrice }} </view>
           </view>
 
-          <view class="font-bold u-m-t-16 u-font-40" v-else> ￥{{ data.lowPrice }} </view>
+          <view class="font-bold u-m-t-16 u-font-40" v-else>
+            ￥{{ data.lowPrice }}
+          </view>
         </view>
       </view>
     </view>
@@ -197,6 +212,7 @@ const yskUtils = inject("yskUtils");
 const shopInfo = inject("shopInfo");
 dayjs.extend(isBetween);
 import { onLoad } from "@dcloudio/uni-app";
+import { defaultTo } from "lodash";
 const props = defineProps({
   limitTimeDiscount: {
     type: Object,
@@ -246,6 +262,12 @@ const props = defineProps({
     type: Number,
     default: 20,
   },
+  carsProductIdNumberMap: {
+    type: Object,
+    default: () => {
+      return {};
+    },
+  },
 });
 
 watch(
@@ -298,7 +320,7 @@ const limitPrice = computed(() => {
     return 0;
   }
   const price = yskUtils.limitUtils.returnPrice({
-    goods:     props.data,
+    goods: props.data,
     shopInfo: shopInfo,
     limitTimeDiscountRes: props.limitTimeDiscount,
     shopUserInfo: null,
@@ -383,7 +405,7 @@ function emitEvent(emitName) {
 }
 
 .btn {
-  background: #FE4F1E;
+  background: #fe4f1e;
   border-radius: 16rpx;
   font-size: 32rpx;
   font-weight: bold;
@@ -434,7 +456,7 @@ function emitEvent(emitName) {
     z-index: 2;
   }
   .limit-discount {
-    background-color: #FEB41E;
+    background-color: #feb41e;
     padding: 16rpx 44rpx;
     white-space: nowrap;
     text-align: center;
@@ -453,4 +475,4 @@ function emitEvent(emitName) {
   text-decoration: line-through;
   color: #999;
 }
-</style>
+</style>