显示优化

hdApp/src/admin/order/detail.vue

@@ -253,9 +253,7 @@
             </view>
 
             <!-- 欠款信息 -->
-            <view 
-              class="msg-list rel" 
-              v-if="Number(orderInfo.remainDebtPrice)>0">
+            <view class="msg-list rel" v-if="Number(orderInfo.remainDebtPrice)>0">
               <view class="label">欠款金额：</view>
               <view class="value" style="color:red;font-weight:bold;">
                 ￥{{ orderInfo.remainDebtPrice ? parseFloat(orderInfo.remainDebtPrice) : 0 }}

hdPad/src/pages/home/components/orderInfo.vue

@@ -15,20 +15,47 @@
           <text class="right" style="color:red;">[贺卡内容] {{orderInfo.cardInfo}}</text>
         </view>
 
+        <view v-if="Number(orderInfo.remainDebtPrice)>0">
+          <text class="left">欠款金额</text>
+          <text class="right" style="color:red;font-weight:bold;">
+          ￥{{ orderInfo.remainDebtPrice ? parseFloat(orderInfo.remainDebtPrice) : 0 }}
+          </text>
+        </view>
+
         <view v-if="Number(orderInfo.orderPrice)>0">
           <text class="left">订单金额</text>
-          <text class="right" style="font-weight:bold;">
+          <text class="right">
           ¥{{orderInfo.orderPrice && Number(orderInfo.orderPrice)>0 ? parseFloat(orderInfo.orderPrice) : ''}}
           </text>
         </view>
 
-        <view><text class="left">开单人</text><text class="right">{{orderInfo.shopAdminName||''}}</text></view>
+        <view v-if="Number(orderInfo.tkPrice)>0">
+          <text class="left">退款金额</text>
+          <text class="right">
+          -￥{{ orderInfo.tkPrice ? parseFloat(orderInfo.tkPrice) : 0 }}
+          </text>
+        </view>
+
+        <view v-if="orderInfo.discountAmount > 0">
+          <text class="left">优惠金额</text>
+          <text class="right">
+          -￥{{ orderInfo.discountAmount ? parseFloat(orderInfo.discountAmount) : 0 }}
+          </text>
+        </view>
+
+        <view v-if="Number(orderInfo.realPrice)>0">
+          <text class="left">实际金额</text>
+          <text class="right" style="font-weight:bold;">
+          {{orderInfo.forward==0?'':'-'}}￥{{ orderInfo.realPrice ? parseFloat(orderInfo.realPrice) : 0 }}
+          </text>
+        </view>
+
         <view><text class="left">订单号</text><text class="right">{{orderInfo.orderSn||''}}</text></view>
         <view><text class="left">状态</text><text class="right">{{getStatus(orderInfo.status)}}</text></view>
 
         <view><text class="left">类型</text><text class="right">{{orderInfo.onlinePay == 1 ?'线下':'线上'}}</text></view>
         <view><text class="left">方式</text><text class="right">{{orderInfo.payWay==0?'微信':orderInfo.payWay ==1?"支付宝":orderInfo.payWay==2?'余额':orderInfo.payWay==3?'欠款':orderInfo.payWay==4?'现金':'银行卡'}}</text></view>
-
+        <view><text class="left">开单人</text><text class="right">{{orderInfo.shopAdminName||''}}</text></view>
         <view>
           <text class="left">创建时间</text>
           <text class="right">{{orderInfo.addTime ? orderInfo.addTime.substr(5,11):''}}</text>
@@ -51,7 +78,8 @@
                 </text>
               </view>
               <view class="info-line">
-                <text class="item-type"></text>
+                <text></text>
+                <text class="item-type">￥{{ s.price?parseFloat(s.price):0 }}</text>
               </view>
             </view>
           </view>
@@ -62,11 +90,12 @@
               <view class="info-line">
                 <text class="item-name">{{ s.name }}</text>
                 <text class="item-price">
-                  <text class="unit">{{s.num}}份</text>
+                  <text class="unit">{{s.num}}份 x ￥{{s.unitPrice?parseFloat(s.unitPrice):0}}</text>
                 </text>
               </view>
               <view class="info-line">
-                <text class="item-type"></text>
+                <text></text>
+                <text class="item-type">￥{{ s.price?parseFloat(s.price):0 }}</text>
               </view>
             </view>
           </view>
@@ -389,8 +418,8 @@ export default {
                 font-size: 10upx;
               }
               .item-type {
-                color: #999;
-                font-size: 8upx;
+                color: #202020;
+                font-size:11upx;
               }
               .item-count {
                 color: #666;
@@ -462,8 +491,8 @@ export default {
                 font-size: 10upx;
               }
               .item-type {
-                color: #999;
-                font-size: 8upx;
+                color: #202020;
+                font-size:11upx;
               }
               .item-count {
                 color: #666;