shish 7 ore fa
parent
commit
3275417f6b

+ 29 - 22
hdApp/src/admin/billing/freeRefundList.vue

@@ -72,10 +72,21 @@
           :key="index"
           @click="goDetail(item)"
         >
-          <!-- 顶栏:客户 + 金额(状态放到右下角突出展示) -->
+          <!-- 顶栏:客户左;右上角金额 + 状态 -->
           <view class="card-head">
             <text class="custom-name">{{ item.customName || '客户' }}</text>
-            <text class="amount">¥{{ formatMoney(item.refundPrice) }}</text>
+            <view class="card-head-right">
+              <text class="amount">¥{{ formatMoney(item.refundPrice) }}</text>
+              <text
+                class="status-chip"
+                :class="{
+                  pending: item.status == 0,
+                  pass: item.status == 1,
+                  reject: item.status == 2,
+                  cancel: item.status == 3
+                }"
+              >{{ statusText(item.status) }}</text>
+            </view>
           </view>
 
           <!-- 明细:两列信息,避免竖排过长 -->
@@ -104,7 +115,7 @@
             </view>
             <view class="meta-item" v-if="item.sameDay == 0">
               <text class="meta-label">时间</text>
-              <text class="meta-value" style="color: green;font-weight: bold;">隔天售后</text>
+              <text class="meta-value" style="color: green;font-weight: bold;">封账后退款</text>
             </view>
             <view class="meta-item">
               <text class="meta-label">操作</text>
@@ -121,7 +132,7 @@
             <text class="remark-text">{{ item.remark }}</text>
           </view>
 
-          <!-- 底栏:确认退还方式 + 查看凭证(不可用时灰色)+ 状态 -->
+          <!-- 底栏:确认退还方式 + 查看凭证(不可用时灰色) -->
           <view class="card-foot">
             <view class="card-foot-btns">
               <view
@@ -143,15 +154,6 @@
                 >查看凭证</button>
               </view>
             </view>
-            <text
-              class="status-chip"
-              :class="{
-                pending: item.status == 0,
-                pass: item.status == 1,
-                reject: item.status == 2,
-                cancel: item.status == 3
-              }"
-            >{{ statusText(item.status) }}</text>
           </view>
         </view>
       </block>
@@ -208,7 +210,7 @@ export default {
       startTime: '',
       endTime: '',
       totalAmount: 0,
-      // -1全部 1当天售后 0隔天售后
+      // -1全部 1当天退款 0封账后退款
       sameDay: -1,
       customId: 0,
       searchList: [],
@@ -225,8 +227,8 @@ export default {
       ],
       sameDayOptions: [
         { label: '全部', value: -1 },
-        { label: '当天售后', value: 1 },
-        { label: '隔天售后', value: 0 }
+        { label: '当天退款', value: 1 },
+        { label: '封账后退款', value: 0 }
       ]
     }
   },
@@ -620,7 +622,7 @@ export default {
 }
 .total-bar {
   padding: 16upx 30upx;
-  font-size: 26upx;
+  font-size: 34upx;
   color: #333;
   font-weight: bold;
   background: #fff;
@@ -643,6 +645,12 @@ export default {
   justify-content: space-between;
   align-items: center;
 }
+.card-head-right {
+  display: flex;
+  flex-direction: row;
+  align-items: baseline;
+  flex-shrink: 0;
+}
 .custom-name {
   flex: 1;
   min-width: 0;
@@ -654,12 +662,13 @@ export default {
   font-weight: bold;
   color: #222;
 }
-/* 右下角状态:加大字号与字重,仅文字着色、无背景 */
+/* 右上角状态:排在金额后,仅文字着色、无背景 */
 .status-chip {
   flex-shrink: 0;
-  font-size: 28upx;
+  margin-left: 40upx;
+  font-size: 26upx;
   font-weight: bold;
-  line-height: 52upx;
+  line-height: 1.2;
   color: #999;
 }
 .status-chip.pass {
@@ -763,7 +772,6 @@ export default {
 .card-foot {
   display: flex;
   align-items: center;
-  justify-content: space-between;
   margin-top: 16upx;
   padding-top: 16upx;
   border-top: 1upx solid #f0f2f5;
@@ -772,7 +780,6 @@ export default {
   display: flex;
   align-items: center;
   flex: 1;
-  margin-right: 12upx;
 }
 .poster-btn-wrap {
   flex-shrink: 0;

+ 1 - 1
mallApp/src/pages/order/detail.vue

@@ -143,7 +143,7 @@
       <!-- 非待支付:申请记录 + 申请售后始终同时展示;有待审时进申请页只能看进度不能再提交 -->
       <template v-else>
         <view class="refund-actions">
-          <button class="button-com default big refund-btn" @click="goViewRefund">申请记录</button>
+          <button class="button-com default big refund-btn" @click="goViewRefund">售后记录</button>
           <button class="button-com default big refund-btn" @click="goRefund">申请售后</button>
         </view>
       </template>