Merge branch 'zzx'

src/config/index.ts

@@ -11,7 +11,7 @@ const mapEnvVersion = {
   // develop: 'http://192.168.0.11:8081', // 王
   // develop: 'http://192.168.1.21:8080', // 田
   // develop: 'http://74949mkfh190.vicp.fun', // 付
-  // develop: 'http://47.109.84.152:8081', // 测试代理
+  develop: 'http://47.109.84.152:8081', // 测试代理
   // develop: 'https://5ed0f7cc.r9.vip.cpolar.cn',
   // develop: 'https://25740642.r3.cpolar.top',
   develop: 'https://smqjh.api.zswlgz.com',

src/subPack-xsb/confirmOrder/index.vue

@@ -87,14 +87,14 @@ const displayTotalPrice = computed(() => {
   if (!orderInfo.value) {
     return 0
   }
-  if (!hasManualCouponSelection.value) {
-    return Number(orderInfo.value.totalPrice || 0)
-  }
   const goodsPrice = Number(orderInfo.value.price || 0)
-  const freight = Number(orderInfo.value.transfee || 0)
+  const freight = Number(deliveryType.value !== 2 ? orderInfo.value.transfee : 0)
+  const couponDiscount = hasManualCouponSelection.value
+    ? Number(confirmedCoupon.value?.discountMoney || 0)
+    : Number(orderInfo.value?.coupon || 0)
   const pointsDiscount = offsetPoints.value / 100
   const memberDiscount = memberDiscountCents.value / 100
-  return Math.max(0, Number((goodsPrice + freight - currentCouponDiscount.value - pointsDiscount - memberDiscount).toFixed(2)))
+  return Math.max(0, Number((goodsPrice + freight - couponDiscount - pointsDiscount - memberDiscount).toFixed(2)))
 })
 const displayDiscountTotal = computed(() => Number((currentCouponDiscount.value + offsetPoints.value / 100 + memberDiscountCents.value / 100).toFixed(2)))
 const giftOriginalTotal = computed(() => {
@@ -273,7 +273,7 @@ async function handlePay() {
     })
 
     const orderNumber = await useUserStore().getOrderPayMent(
-      orderInfo.value.transfee,
+      deliveryType.value !== 2 ? orderInfo.value.transfee : 0,
       'XSB',
       deliveryType.value,
       Number(orderInfo.value?.skuList[0].shopId || SelectShopInfo.value?.shopId),
@@ -451,7 +451,7 @@ async function handlePay() {
           自提
         </view>
         <view class="text-#FF4D3A font-semibold">
-          ￥{{ orderInfo?.transfee }}
+          ￥{{ deliveryType == 2 ? '0.00' : orderInfo?.transfee }}
         </view>
       </view>
       <view v-if="!isMemberGiftOrder && userMemberInfo.active && orderInfo?.memberBenefitDesc && orderInfo?.memberDiscountAmount" class="mb28rpx flex items-center justify-between text-28rpx">