订单

hdApp/src/admin/order/components/detail-goods.vue

@@ -49,6 +49,10 @@ export default {
 				font-size: 28upx;
 				color: $fontColor2;
 				margin-bottom: 10upx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				width: 420upx;
 			}
 			.desc {
 				color: $fontColor3;

hdApp/src/admin/order/components/detail-item.vue

@@ -49,6 +49,10 @@ export default {
 				font-size: 28upx;
 				color: $fontColor2;
 				margin-bottom: 10upx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				width: 420upx;
 			}
 			.desc {
 				color: $fontColor3;

hdApp/src/admin/order/detail.vue

@@ -49,7 +49,12 @@
             </view>
             <view class="msg-list" v-if="orderInfo.sendType != 1 ">
               <view class="label">时间：</view>
-              <view class="value">{{orderInfo.reachDate||''}} {{orderInfo.reachPeriod||''}}前</view>
+              <view class="value">
+                <text v-if="orderInfo.reachDate == orderInfo.today">今天</text>
+                <text v-else-if="orderInfo.reachDate == orderInfo.tomorrow">明天</text>
+                <text v-else>{{orderInfo.reachDate ? orderInfo.reachDate.substr(5,11):''}}</text>
+                <text style="margin-left:10upx;">{{orderInfo.reachPeriod||''}}前</text>
+              </view>
             </view>
             <view class="msg-list">
               <view class="label">寄语：</view>
@@ -108,23 +113,39 @@
               <view class="label">过期：</view>
               <view class="value">{{ orderInfo.deadline?orderInfo.deadline:''}}</view>
             </view>
+            <view class="msg-list" v-if="Number(orderInfo.sendCost)>0">
+              <view class="label">商品合计：</view>
+              <view class="value">￥{{ orderInfo.goodsPrice ? parseFloat(orderInfo.goodsPrice) : 0 }}</view>
+            </view>
             <view class="msg-list" v-if="Number(orderInfo.sendCost)>0">
               <view class="label">运费：</view>
               <view class="value">￥{{ orderInfo.sendCost ? parseFloat(orderInfo.sendCost) : 0 }}</view>
             </view>
-            <view v-if="orderInfo.discountAmount > 0" class="msg-list">
-              <view class="label">优惠：</view>
-              <view class="value">-￥{{ orderInfo.discountAmount ? parseFloat(orderInfo.discountAmount) : 0 }}</view>
+            <view class="msg-list" v-if="Number(orderInfo.serviceFee)>0">
+              <view class="label">手续费：</view>
+              <view class="value">￥{{ orderInfo.serviceFee ? parseFloat(orderInfo.serviceFee) : 0 }}</view>
+            </view>
+            <view class="msg-list" v-if="Number(orderInfo.labourCost)>0">
+              <view class="label">包装费：</view>
+              <view class="value">￥{{ orderInfo.labourCost ? parseFloat(orderInfo.labourCost) : 0 }}</view>
             </view>
             <view class="msg-list">
               <view class="label">原价：</view>
-              <view class="value">￥{{ orderInfo.orderPrice ? parseFloat(orderInfo.orderPrice) : 0 }}</view>
+              <view class="value">￥{{ orderInfo.prePrice ? parseFloat(orderInfo.prePrice) : 0 }}</view>
+            </view>
+            <view v-if="orderInfo.discountAmount > 0" class="msg-list">
+              <view class="label">优惠：</view>
+              <view class="value">-￥{{ orderInfo.discountAmount ? parseFloat(orderInfo.discountAmount) : 0 }}</view>
             </view>
             <view class="msg-list" v-if="Number(orderInfo.tkPrice)>0">
               <view class="label">退款：</view>
               <view class="value">-￥{{ orderInfo.tkPrice ? parseFloat(orderInfo.tkPrice) : 0 }}</view>
               <view style="color: #3385ff;margin-left:50upx;" @click="pageTo({url: '/admin/order/refundList',query: {orderSn: orderInfo.orderSn}})">退款记录</view>
             </view>
+            <view class="msg-list">
+              <view class="label">应付：</view>
+              <view class="value">￥{{ orderInfo.orderPrice ? parseFloat(orderInfo.orderPrice) : 0 }}</view>
+            </view>
             <view class="msg-list">
               <view class="label">实际：</view>
               <view class="value">￥{{ orderInfo.realPrice ? parseFloat(orderInfo.realPrice) : 0 }}</view>