shish 8 часов назад
Родитель
Сommit
34b34044aa
2 измененных файлов с 42 добавлено и 5 удалено
  1. 1 1
      hdApp/src/admin/clear/info.vue
  2. 41 4
      hdApp/src/pagesPurchase/purDetails.vue

+ 1 - 1
hdApp/src/admin/clear/info.vue

@@ -224,7 +224,7 @@ export default {
 			const clearSn = bill && bill.clearSn ? String(bill.clearSn).trim() : ''
 			if (clearSn) {
 				const suffix = clearSn.length > 4 ? clearSn.slice(-4) : clearSn
-				return '单' + suffix
+				return '结账单' + suffix
 			}
 			return '结账单' + this.getOrderClearBillDisplayIndex(rowIndex, billIndex)
 		},

+ 41 - 4
hdApp/src/pagesPurchase/purDetails.vue

@@ -150,13 +150,18 @@
 
         <view class="order-info_box order-clear-bills" v-if="!$util.isEmpty(detailInfo.orderClearList)" style="margin-top:20upx;">
           <view>账单信息:</view>
+          <!-- 单条与多条均纵向排列,避免横向挤在一起难看 -->
           <view class="order-clear-bills__links">
-            <text
+            <view
               v-for="(bill, billIndex) in detailInfo.orderClearList"
               :key="billIndex"
               class="order-clear-bills__link"
+              :class="{ 'order-clear-bills__link--first': billIndex === 0 }"
               @click.stop="goClearBill(bill)"
-            >{{ bill.clearSn ? bill.clearSn : ('结账单' + (billIndex + 1)) }}<text v-if="Number(bill.amount)>0" class="order-clear-bills__amt"> ¥{{ parseFloat(bill.amount) }}</text></text>
+            >
+              <text class="order-clear-bills__sn">{{ formatClearBillLabel(bill) }}</text>
+              <text v-if="Number(bill.amount) > 0" class="order-clear-bills__amt">¥{{ parseFloat(bill.amount) }}</text>
+            </view>
           </view>
         </view>
 
@@ -554,6 +559,15 @@ export default {
       let salt = item.salt ? item.salt : ''
       this.pageTo({ url: '/admin/clear/info?id='+item.clearId+'&salt='+salt})
     },
+    /**
+     * 结账单短文案:前缀「结账单」+ clearSn 后四位。
+     * 完整单号过长不利于行内展示,后四位足够区分同页多笔账单。
+     */
+    formatClearBillLabel(bill) {
+      const sn = bill && bill.clearSn != null ? String(bill.clearSn) : '';
+      const tail = sn ? sn.slice(-4) : '';
+      return '结账单' + tail;
+    },
     copy (val) {
       const self = this;
       uni.setClipboardData({
@@ -698,19 +712,42 @@ export default {
         justify-content: flex-end;
       }
     }
+    /* 账单信息:右侧每行约两个,金额用红色突出 */
+    .order-clear-bills {
+      align-items: flex-start;
+    }
     .order-clear-bills__links {
       flex: 1;
       display: flex;
+      flex-direction: row;
       flex-wrap: wrap;
+      min-width: 0;
     }
     .order-clear-bills__link {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      box-sizing: border-box;
+      width: 50%;
       color: #3385ff;
-      margin-right: 20upx;
+      line-height: 1.4;
+      margin-top: 12upx;
+      padding-right: 12upx;
+    }
+    /* 首行两项顶对齐,去掉多余上边距 */
+    .order-clear-bills__link--first,
+    .order-clear-bills__link:nth-child(2) {
+      margin-top: 0;
+    }
+    .order-clear-bills__sn {
+      color: #3385ff;
+      font-size: 28upx;
     }
     .order-clear-bills__amt {
+      color: red;
       font-weight: normal;
       font-size: 28upx;
-      margin-left:10upx;
+      margin-left: 8upx;
     }
   }
   .content-box {