秒杀修改、下单页面修改

pages/groupBuying/details.vue

@@ -820,7 +820,8 @@ const chonseSku = (index, id) => {
   totalId = "_" + totalId + "_";
   hasId.value = totalId;
   if (goodsInfo.value.singleSku) {
-    if(dataForm.value.productSkuSetList.length>0) skuObj.value = dataForm.value.productSkuSetList[0];
+    if (dataForm.value.productSkuSetList.length > 0)
+      skuObj.value = dataForm.value.productSkuSetList[0];
   } else {
     dataForm.value.productSkuSetList.forEach((res) => {
       if (res.skuHashCode == totalId) {
@@ -830,7 +831,6 @@ const chonseSku = (index, id) => {
   }
 };
 
-
 const specOpenClose = () => {
   specOpenRef.value.close();
 };
@@ -858,42 +858,38 @@ const btnBuys = () => {
     return false;
   }
 
-  // psotJson();
+  psotJson();
 };
 
 const psotJson = () => {
-  let dataJson = {};
-  let childArr = [];
-  let parendArr = [];
-
-  childArr.push({
-    userCartId: 0,
-    activityGoodsId: skuObj.value.activityGoodsId,
-    productId: dataForm.value.productId,
-    num: addNumber.value,
-    skuHashCode: skuObj.value.skuHashCode,
-  });
-
-  parendArr.push({
+  let channelType = 0;
+  // #ifdef APP-PLUS
+  channelType = 1;
+  // #endif
+  let dataJson = {
+    shippingMethod: 0, //0物流，10自提
+    createOrderDetailBos: [
+      {
+        activityProductId: dataForm.value.id,
+        skuHashCode: skuObj.value.skuHashCode,
+        productNum: addNumber.value || 1,
+        productId: dataForm.value.productId,
+      },
+    ],
+    marketingType: 10, //0无活动，5秒杀，10拼团
+    orderType: 0,
+    channelType: channelType,
+    exchange: false,
+    userUsePoint: true,
     businessId: dataForm.value.businessId,
-    sourceShopId: shop.value.id,
     activityId: dataForm.value.groupBuyId,
-    sponsorActivityId: selectGroup.value ? selectGroup.value.id : 0,
-    userRemark: "",
-    items: childArr,
-  });
-
-  dataJson = {
-    isCart: false,
-    receiptId: null,
-    shipmentMode: 0,
-    shopOrders: parendArr,
-    marketingType: 2,
   };
-
+  specOpenRef.value.close();
+  console.log("dataJson", dataJson);
+  // return
   uni.setStorageSync("dataJson", dataJson);
   uni.navigateTo({
-    url: "/pages/product/surePay/surePaySechill?type=group",
+    url: "/pages/surePay/surePay",
   });
 };
 

pages/seckill/seckillGoods.vue

@@ -459,7 +459,8 @@ const chonseSku = (index, id) => {
   totalId = "_" + totalId + "_";
   hasId.value = totalId;
   if (productObj.value.singleSku) {
-    if(dataForm.value.productSkuSetList.length>0) skuObj.value = dataForm.value.productSkuSetList[0];
+    if (dataForm.value.productSkuSetList.length > 0)
+      skuObj.value = dataForm.value.productSkuSetList[0];
   } else {
     dataForm.value.productSkuSetList.forEach((res) => {
       if (res.skuHashCode == totalId) {
@@ -489,40 +490,38 @@ const btnBuys = () => {
     uni.$uv.toast("商品库存只有" + skuObj.value.stock + "件");
     return false;
   }
-  // psotJson();
+  psotJson();
 };
 
 const psotJson = () => {
-  let dataJson = {};
-  let childArr = [];
-  let parendArr = [];
-  skuObj.value;
-
-  childArr.push({
-    userCartId: 0,
-    activityGoodsId: skuObj.value.activityGoodsId,
-    productId: dataForm.value.productId,
-    num: addNumber.value,
-    skuHashCode: skuObj.value.skuHashCode,
-  });
-  parendArr.push({
-    businessId: shop.value.id,
-    sourceBusinessId: shop.value.id,
+  let channelType = 0;
+  // #ifdef APP-PLUS
+  channelType = 1;
+  // #endif
+  let dataJson = {
+    shippingMethod: 0, //0物流，10自提
+    createOrderDetailBos: [
+      {
+        activityProductId: dataForm.value.id,
+        skuHashCode: skuObj.value.skuHashCode,
+        productNum: addNumber.value || 1,
+        productId: dataForm.value.productId,
+      },
+    ],
+    marketingType: 5, //0无活动，5秒杀，10拼团
+    orderType: 0,
+    channelType: channelType,
+    exchange: false,
+    userUsePoint: true,
+    businessId: dataForm.value.businessId,
     activityId: dataForm.value.seckillId,
-    sponsorActivityId: 0,
-    userRemark: "",
-    items: childArr,
-  });
-  dataJson = {
-    isCart: false,
-    receiptId: null,
-    shipment_mode: 0,
-    shopOrders: parendArr,
-    marketingType: 1,
   };
+  specOpenRef.value.close();
+  // console.log("dataJson", dataJson);
+  // return
   uni.setStorageSync("dataJson", dataJson);
   uni.navigateTo({
-    url: "../surePay/surePaySechill",
+    url: "/pages/surePay/surePay",
   });
 };
 

pages/surePay/surePay.vue

@@ -351,9 +351,9 @@ const orderCreated = () => {
     .catch(() => {
       submitLoading = false;
       // uni.hideLoading();
-      setTimeout(() => {
-        uni.navigateBack();
-      }, 500);
+      // setTimeout(() => {
+      //   uni.navigateBack();
+      // }, 500);
     });
 };
 

pages/tabtar/components/Seckill.vue

@@ -13,6 +13,7 @@
             :time="finishTime"
             format="DD:HH:mm:ss"
             @change="onChange"
+            @finish="onFinish"
           >
             <view>
               <text class="time__item" v-if="timeData.hours != null"
@@ -113,6 +114,9 @@ const activeBannerIndex2 = ref(0);
 const onChange = (e) => {
   timeData.value = e;
 };
+const onFinish = () => {
+  getSeckillList();
+};
 
 const goDetail = (url) => {
   emit("goDetail", url);