张田田 hace 1 mes
padre
commit
2b0621b2c5

+ 2 - 0
miniprogram/module/order/components/after-sale-type-popup/after-sale-type-popup.scss

@@ -182,5 +182,7 @@
 }
 
 .title {
+  flex: 1;
+  text-align: center;
   line-height: 1;
 }

+ 2 - 1
miniprogram/module/order/components/after-sale-type-popup/after-sale-type-popup.wxml

@@ -27,7 +27,8 @@
         data-type="site"
       >
         <view class="after-sale-type-card__left">
-          <view class="after-sale-type-card__icon" />
+          <image class="after-sale-type-card__icon" src="{{siteOption.image}}" mode="aspectFill" wx:if="{{siteOption.image}}" />
+          <view class="after-sale-type-card__icon" wx:else />
         </view>
 
         <view class="after-sale-type-card__main">

+ 1 - 1
miniprogram/module/order/components/refund-confirm-popup/refund-confirm-popup.scss

@@ -139,7 +139,7 @@
   display: flex;
   align-items: center;
   justify-content: flex-end;
-  gap: 10rpx;
+  // gap: 10rpx;
 }
 
 .arrow-icon {

+ 1 - 0
miniprogram/module/order/components/refund-confirm-popup/refund-confirm-popup.ts

@@ -2,6 +2,7 @@ Component({
   properties: {
     visible: { type: Boolean, value: false },
     goodsName: { type: String, value: "" },
+    goodsImage: { type: String, value: "" },
     goodsPrice: { type: String, value: "" },
     goodsMeta1: { type: String, value: "" },
     goodsMeta2: { type: String, value: "" },

+ 2 - 1
miniprogram/module/order/components/refund-confirm-popup/refund-confirm-popup.wxml

@@ -14,7 +14,8 @@
 
     <view class="refund-confirm-popup__content">
       <view class="goods-card">
-        <view class="goods-card__icon" />
+        <image class="goods-card__icon" src="{{goodsImage}}" mode="aspectFill" wx:if="{{goodsImage}}" />
+        <view class="goods-card__icon" wx:else />
         <view class="goods-card__main">
           <view class="goods-card__name">{{goodsName}}</view>
           <view class="goods-card__meta">{{goodsMeta1}}</view>

+ 22 - 11
miniprogram/module/order/pages/other-detail/other-detail.ts

@@ -46,15 +46,15 @@ Page({
     selectedAfterSaleType: "",
     selectedRefundReason: "",
     refundStatus: "received", // received | not-received
-    refundMaxAmount: 240,
-    refundAmount: 240,
+    refundMaxAmount: 0,
+    refundAmount: 0,
     refundDesc: "",
     refundProofImages: [] as string[],
     afterSaleSiteOption: {
-      name: "肝血虚穴位站点",
-      price: 80,
-      meta1: "10贴",
-      meta2: "x3",
+      name: "",
+      price: 0,
+      meta1: "",
+      meta2: "",
     },
   },
   onLoad(options: any) {
@@ -175,9 +175,8 @@ Page({
               statusText: this.getGoodsStatusText(item?.sellType, item?.progress, item?.receiptStatus),
               isCanEvaluate: item?.isCanEvaluate, //是否可以评价 false-否 true-是
               evaluateTime: item?.evaluateTime, //有评价时间就是已评价,是空就是未评价
-              // [测试数据] 为了演示“申请售后”和“退款申请中”的不同状态
-              // 如果是第一个商品或者偶数商品,模拟状态为1(退款申请中),否则为0(可申请售后)
-              afterSaleStatus: index === 0 ? 1 : 0,
+              // [测试数据] 实体商品模拟”退款申请中”,线下服务和线上权益模拟”申请售后”
+              afterSaleStatus: item?.sellType === '1' ? 1 : 0,
             }
           });
         };
@@ -287,14 +286,26 @@ Page({
     // 仅用于 catchtap 阻止冒泡,避免触发父级 goAppointment
   },
   onApplyAfterSale(e: any) {
-    const status = e.currentTarget.dataset.status;
+    const { status, goods } = e.currentTarget.dataset;
     if (status === 1) {
       wx.navigateTo({
         url: "/module/order/pages/refund-processing/refund-processing"
       });
       return;
     }
-    this.setData({ afterSalePopupVisible: true });
+    this.setData({
+      afterSaleSiteOption: {
+        image: goods.image || '',
+        name: goods.name,
+        price: goods.price,
+        meta1: goods.description || '',
+        meta2: `x${goods.quantity}`,
+      },
+      refundMaxAmount: goods.price || 0,
+      refundAmount: goods.price || 0,
+      afterSalePopupVisible: true,
+    });
+        
   },
 
   onAfterSalePopupClose() {

+ 4 - 3
miniprogram/module/order/pages/other-detail/other-detail.wxml

@@ -43,7 +43,7 @@
               </view>
               <!-- 申请售后 + 评价 -->
               <view class="action-btns">
-                <view class="btn-aftersale {{goods.afterSaleStatus === 1 ? 'disabled-btn' : ''}}" catchtap="onApplyAfterSale" data-status="{{goods.afterSaleStatus}}">
+                <view class="btn-aftersale {{goods.afterSaleStatus === 1 ? 'disabled-btn' : ''}}" catchtap="onApplyAfterSale" data-status="{{goods.afterSaleStatus}}" data-goods="{{goods}}">
                   {{goods.afterSaleStatus === 1 ? '退款申请中' : '申请售后'}}
                 </view>
                 <view class="btn-review" catchtap="onReview" data-goods="{{goods}}" wx:if="{{goods.isCanEvaluate}}">{{goods.evaluateTime?"已评价":"评价"}}</view>
@@ -76,7 +76,7 @@
               </view>
               <!-- 申请售后 + 评价 -->
               <view class="action-btns" catchtap="preventTap">
-                <view class="btn-aftersale {{goods.afterSaleStatus === 1 ? 'disabled-btn' : ''}}" catchtap="onApplyAfterSale" data-status="{{goods.afterSaleStatus}}">
+                <view class="btn-aftersale {{goods.afterSaleStatus === 1 ? 'disabled-btn' : ''}}" catchtap="onApplyAfterSale" data-status="{{goods.afterSaleStatus}}" data-goods="{{goods}}">
                   {{goods.afterSaleStatus === 1 ? '退款申请中' : '申请售后'}}
                 </view>
                 <view class="btn-review" catchtap="onReview" data-goods="{{goods}}" wx:if="{{goods.isCanEvaluate}}">{{goods.evaluateTime?"已评价":"评价"}}</view>
@@ -109,7 +109,7 @@
               </view>
               <!-- 申请售后 + 评价 -->
               <view class="action-btns">
-                <view class="btn-aftersale {{goods.afterSaleStatus === 1 ? 'disabled-btn' : ''}}" catchtap="onApplyAfterSale" data-status="{{goods.afterSaleStatus}}">
+                <view class="btn-aftersale {{goods.afterSaleStatus === 1 ? 'disabled-btn' : ''}}" catchtap="onApplyAfterSale" data-status="{{goods.afterSaleStatus}}" data-goods="{{goods}}">
                   {{goods.afterSaleStatus === 1 ? '退款申请中' : '申请售后'}}
                 </view>
                 <view class="btn-review" catchtap="onReview" data-goods="{{goods}}" wx:if="{{goods.isCanEvaluate}}">{{goods.evaluateTime?"已评价":"评价"}}</view>
@@ -230,6 +230,7 @@
 <refund-confirm-popup
   visible="{{refundConfirmPopupVisible}}"
   goods-name="{{afterSaleSiteOption.name}}"
+  goods-image="{{afterSaleSiteOption.image}}"
   goods-price="{{afterSaleSiteOption.price}}"
   goods-meta1="{{afterSaleSiteOption.meta1}}"
   goods-meta2="{{afterSaleSiteOption.meta2}}"

+ 1 - 1
miniprogram/module/order/pages/refund-processing/refund-processing.ts

@@ -1,7 +1,7 @@
 Page({
   data: {
     pageTitle: '商家处理',
-    refundState: 'completed', // 测试数据:processing, approved, revoked, rejected, 或 completed
+    refundState: 'processing', // 测试数据:processing, approved, revoked, rejected, 或 completed
     days: '06',
     hours: '23',
     minutes: '43',