Browse Source

feat(api): 添加退款相关字段定义

添加 refundExpiredScore、refundScore 和 refundMoney 字段到订单API类型定义中,
用于处理退款相关的积分和金额信息

---

refactor(config): 调整开发环境配置

启用本地开发服务器配置,注释掉线上测试环境配置

---

fix(home): 修复首页导航显示逻辑

修改充电功能在审核状态下的显示逻辑,当 isOnlineAudit 为 true 时不显示该功能入口

---

feat(after-sales): 添加退款金额积分展示

在售后详情页面添加退还金额和积分的显示信息,包括已过期积分数量

---

fix(order): 优化售后按钮显示条件

调整申请售后按钮的显示逻辑,修复条件判断中的错误操作符

---

refactor(order): 移除物流插件配置

从订单详情页面移除不必要的物流插件配置项

---

fix(order-detail): 修复售后服务触发条件

更新订单详情页售后服务按钮的触发条件,确保退款状态与订单状态的正确判断
zhangtao 1 ngày trước cách đây
mục cha
commit
a27a2df0d0

+ 12 - 0
src/api/api.type.d.ts

@@ -1414,6 +1414,18 @@ namespace Api {
      */
     shipTime?: string
     updateTime?: string
+    /**
+     * 退款时过期的积分
+     */
+    refundExpiredScore?: number
+    /**
+     * 退款总积分
+     */
+    refundScore?: number
+    /**
+     * 退款金额
+     */
+    refundMoney?: number
     [property: string]: any
   }
   interface OrderRefundSkuVo {

+ 2 - 2
src/config/index.ts

@@ -2,13 +2,13 @@ const mapEnvVersion = {
   /**
    * 开发版
    */
-  // develop: 'http://192.168.1.166:8080', // 张
+  develop: 'http://192.168.1.166:8080', // 张
   // develop: 'http://192.168.1.101:8080',
   // develop: 'http://192.168.0.157:8080',
   // develop: 'http://192.168.1.253:8080',
   // develop: 'http://192.168.1.89:8080', // 田
   // develop: 'http://47.109.84.152:8081',
-  develop: 'https://smqjh.api.zswlgz.com',
+  // develop: 'https://smqjh.api.zswlgz.com',
   /**
    * 体验版
    */

+ 1 - 1
src/pages/index/index.vue

@@ -55,7 +55,7 @@ onReachBottom(() => {
 const navList = computed(() => {
   const list = [
     { icon: `${StaticUrl}/xsb.png`, title: '星闪豹', name: 'xsb-homeTabbar', show: true },
-    { icon: `${StaticUrl}/smqjh-index-cd.png`, title: '充电', name: 'charge-index', show: true }, // !isOnlineAudit.value
+    { icon: `${StaticUrl}/smqjh-index-cd.png`, title: '充电', name: '', show: !isOnlineAudit.value }, // !isOnlineAudit.value
     { icon: `${StaticUrl}/smqjh-sp.png`, title: '电影演出', name: '', show: !isOnlineAudit.value },
     { icon: `${StaticUrl}/smqjh-vip.png`, title: '视频权益', name: '', show: !isOnlineAudit.value },
     { icon: `${StaticUrl}/smqjh-diancan.png`, title: '大牌点餐', name: '', show: !isOnlineAudit.value },

+ 4 - 0
src/subPack-common/afterSalesDetail/index.vue

@@ -125,6 +125,10 @@ async function handleCancel() {
       <view class="mt20rpx text-24rpx text-#AAAAAA">
         申请通过后,将退回至原账户
       </view>
+      <view v-if="refundOrderInfo.returnMoneySts == refundStatus.ReturnCompleted" class="mt20rpx flex items-center text-24rpx text-#AAAAAA">
+        <view>退还金额:{{ refundOrderInfo.refundMoney }}</view>
+        <view>退还积分:{{ refundOrderInfo.refundScore }}(已过期{{ refundOrderInfo.refundExpiredScore }}) </view>
+      </view>
     </view>
     <view class="mt20rpx rounded-16rpx bg-white p24rpx">
       <view class="grid grid-cols-5 py24rpx text-28rpx text-#222">

+ 1 - 1
src/subPack-smqjh/order/index.vue

@@ -216,7 +216,7 @@ async function handleAfterSale(item: Api.xsbOrderList) {
               </wd-button>
             </view>
           </template>
-          <template v-if="item.refundStatus != 2 && [subPackOrder?.OrderStatus.OrderCompleted, subPackOrder?.OrderStatus.OrderWaitDelivery, subPackOrder?.OrderStatus.OrderAccepted].includes(item.hbOrderStatus) ">
+          <template v-if="item.refundStatus != 2 || [subPackOrder?.OrderStatus.OrderCompleted, subPackOrder?.OrderStatus.OrderWaitDelivery, subPackOrder?.OrderStatus.OrderAccepted].includes(item.hbOrderStatus) ">
             <view class="mr20rpx">
               <wd-button size="small" plain type="info" @click.stop="handleAfterSale(item)">
                 申请售后

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

@@ -199,7 +199,7 @@ async function handleAfterSale(item: Api.xsbOrderList) {
               </wd-button>
             </view>
           </template>
-          <template v-if="item.refundStatus != 2 && [OrderStatus.OrderCompleted, OrderStatus.OrderWaitDelivery, OrderStatus.OrderAccepted].includes(item.hbOrderStatus) ">
+          <template v-if="item.refundStatus != 2 || [OrderStatus.OrderCompleted, OrderStatus.OrderWaitDelivery, OrderStatus.OrderAccepted].includes(item.hbOrderStatus) ">
             <view class="mr20rpx">
               <wd-button size="small" plain type="info" @click.stop="handleAfterSale(item)">
                 申请售后

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

@@ -15,14 +15,6 @@ definePage({
     navigationBarTitleText: '订单详情',
     navigationStyle: 'custom',
   },
-
-  plugins: {
-    logisticsPlugin: {
-      version: '2.1.12',
-      provider: 'wx9ad912bf20548d92',
-    },
-  },
-
 })
 const collapse = ref(true)
 const orderInfo = ref<Api.xsbOrderList>()
@@ -398,7 +390,7 @@ async function handleReceive() {
             </Zcontact>
           </view>
           <view
-            v-if="[OrderStatus.OrderCompleted, OrderStatus.OrderWaitDelivery, OrderStatus.OrderAccepted].includes(orderInfo.hbOrderStatus)"
+            v-if="orderInfo.refundStatus == 2 || [OrderStatus.OrderCompleted, OrderStatus.OrderWaitDelivery, OrderStatus.OrderAccepted].includes(orderInfo.hbOrderStatus)"
             class="flex flex-col items-center" @click="handleAfterSale"
           >
             <image :src="`${StaticUrl}/orderDetaile-shou.png`" class="h40rpx w40rpx" />