Jelajahi Sumber

fix(config): 调整环境地址配置,修复优惠券退款逻辑

- 注释并切换 develop 和 trial 环境地址,优化配置管理
- 修复优惠券组件中部分退款不退还优惠券的显示条件
- 修正订单详情页优惠金额计算,避免 discountMoney 为空时报错
- 去除 manifest.json 文件多余的大括号符号
zhangtao 4 hari lalu
induk
melakukan
a101cc8f17

+ 4 - 4
src/config/index.ts

@@ -11,17 +11,17 @@ const mapEnvVersion = {
   // develop: 'http://192.168.0.11:8080', // 王
   // 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://smqjh.api.zswlgz.com',
+  develop: 'https://smqjh.api.zswlgz.com',
   /**
    * 体验版
    */
   // trial: "http://192.168.1.166:8080/jeecg-boot",
   // trial: 'http://192.168.0.157:8080',
-  trial: 'http://47.109.84.152:8081',
+  // trial: 'http://47.109.84.152:8081',
   // trial: 'http://192.168.1.166:8080,
-  // trial: 'https://smqjh.api.zswlgz.com',
+  trial: 'https://smqjh.api.zswlgz.com',
   /**
    * 正式版
    */

+ 1 - 1
src/subPack-xsb/components/coupon/index.vue

@@ -66,7 +66,7 @@ function handleUseCoupon() {
             <view v-if="itemcoupon.lockOrderId" class="mt-8rpx flex items-center text-22rpx text-[#AAAAAA]">
               订单号:{{ itemcoupon.lockOrderId }}
             </view>
-            <view v-if="itemcoupon.useStatus === 1" class="mt-8rpx text-22rpx text-[#AAAAAA]">
+            <view v-if="itemcoupon.useStatus === 1 && itemcoupon.isRnum == 1" class="mt-8rpx text-22rpx text-[#AAAAAA]">
               说明:部分退款,优惠券不退还
             </view>
             <view v-if="itemcoupon.useStatus === 7" class="mt-8rpx text-22rpx text-[#AAAAAA]">

+ 1 - 1
src/subPack-xsb/orderDetaile/index.vue

@@ -496,7 +496,7 @@ function handleRefundDetail(item: any) {
         <view class="my-24rpx h-2rpx w-full bg-[#F0F0F0]" />
         <view class="flex items-center justify-end">
           <view class="text-28rpx">
-            总计{{ orderInfo.orderMoney }} 共减 {{ Number(orderInfo.offsetPoints) / 100 + Number(orderInfo.couponBaseInfoDTO?.discountMoney) }}
+            总计{{ orderInfo.orderMoney }} 共减 {{ Number(orderInfo.offsetPoints) / 100 + (Number(orderInfo.couponBaseInfoDTO?.discountMoney) || 0) }}
           </view>
           <view class="ml-20rpx text-28rpx text-[#FF4D3A] font-semibold">
             {{ [OrderStatus.PaddingPay, OrderStatus.OrderCancel].includes(Number(orderInfo.hbOrderStatus)) ? '需' : '实'