开单流程等优化

hdApp/src/admin/home/order.vue

@@ -48,7 +48,14 @@
           <view class="list-bottom" style="padding-top:0upx;">
             <view style="border-bottom:1upx solid #EEEEEE;padding-bottom:8upx;">
               <text v-if="item.sendCost > 0" class="freight-text">运费 ￥{{ item.sendCost ? parseFloat(item.sendCost) : 0 }}</text>
-              <text class="app-size-30 app-bold">{{item.forward==0?'':'售后付款 -'}}¥{{ item.orderPrice ? parseFloat(item.orderPrice) :0 }}</text>
+              <text class="app-size-30 app-bold" v-if="item.forward==0">
+                <text v-if="item.orderPrice == item.actPrice">￥{{ item.orderPrice ? parseFloat(item.orderPrice):0 }}</text>
+                <text v-else>
+                  <text style="text-decoration: line-through;color:#847676;">￥{{ item.orderPrice ? parseFloat(item.orderPrice):0 }}</text>
+                  <text style="margin-left:10upx;">￥{{ item.actPrice ? parseFloat(item.actPrice):0 }}</text>
+                </text>
+              </text>
+              <text class="app-size-30 app-bold" v-else>售后付款 -¥{{ item.orderPrice ? parseFloat(item.orderPrice) :0 }}</text>
             </view>
 
         <view v-if="item.sameTimeIdsNum && item.sameTimeIdsNum>1" style="text-align: center;color:white;

hdApp/src/admin/order/detail.vue

@@ -302,7 +302,7 @@
 
             <!-- 应付金额 -->
             <view class="msg-list" v-if="Number(orderInfo.tkPrice)>0">
-              <view class="label">订单金额</view>
+              <view class="label">订单金额：</view>
               <view class="value">￥{{ orderInfo.orderPrice ? parseFloat(orderInfo.orderPrice) : 0 }}</view>
             </view>
 
@@ -345,7 +345,7 @@
 
             <!-- 订单状态 -->
             <view class="msg-list">
-              <view class="label">状态：</view>
+              <view class="label">订单状态：</view>
               <view class="value">
                 {{orderInfo.status == 1 ? '待付款':
                   orderInfo.status == 2 ? '待发货':

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

@@ -43,7 +43,7 @@
           </text>
         </view>
 
-        <view v-if="Number(orderInfo.realPrice)>0">
+        <view>
           <text class="left">实际金额</text>
           <text class="right" style="font-weight:bold;">
           {{orderInfo.forward==0?'':'-'}}￥{{ orderInfo.realPrice ? parseFloat(orderInfo.realPrice) : 0 }}

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

@@ -11,7 +11,14 @@
                 <view :class="[selectOrderId==item.id ? 'active' : 'not-active', 'item-body_box']">
                     <view class="flower-name_box">
                         <view class="current-item-title">
-                            <text>{{item.actPrice}}</text> <text v-if="item.repeat == 1" style="margin-left:10upx;">扫码收款</text>                      
+
+                            <text v-if="item.orderPrice == item.actPrice">￥{{ item.orderPrice ? parseFloat(item.orderPrice):0 }}</text>
+                            <text v-else>
+                            <text style="margin-right:5upx;">￥{{ item.actPrice ? parseFloat(item.actPrice):0 }}</text>
+                            <text style="text-decoration: line-through;color:#847676;">￥{{ item.orderPrice ? parseFloat(item.orderPrice):0 }}</text>
+                            </text>
+                            
+                            <text v-if="item.repeat == 1" style="margin-left:8upx;">扫码收款</text>                      
                         </view>
                         <image class="flower-image" :src="item.cover"></image>
                         <text v-if="item.fromType!=4" style="position:absolute;top:2upx;left:90upx;font-size:11upx;">{{item.sn}}</text>
@@ -207,7 +214,7 @@ export default {
                     padding: 0 5upx;
                     position: relative;
                     .current-item-title {
-                        font-size:12upx;
+                        font-size:11upx;
                         color: #333333;
                         font-weight: bold;
                         overflow: hidden;