优化

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

@@ -10,8 +10,8 @@
 				</view>
 			</view>
 			<view class="list-right">
-				<view class="price">￥{{ info.unitPrice ? parseFloat(info.unitPrice) : 0 }}</view>
-				<view class="num">X{{ info.num||0 }}{{info.unitName||'份'}}</view>
+				<view class="price">￥{{ info.price?parseFloat(info.price):0 }}</view>
+				<view class="num">￥{{ info.unitPrice ? parseFloat(info.unitPrice) : 0 }} X {{ info.num||0 }}{{info.unitName||'份'}}</view>
 			</view>
 		</block>
 	</view>

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

@@ -10,8 +10,8 @@
 				</view>
 			</view>
 			<view class="list-right">
-				<view class="price">￥{{ info.unitPrice ? parseFloat(info.unitPrice) : 0 }}</view>
-				<view class="num">X{{ info.num||0 }}{{info.unitName||'份'}}</view>
+				<view class="price">￥{{ info.price?parseFloat(info.price):0 }}</view>
+				<view class="num">￥{{ info.unitPrice ? parseFloat(info.unitPrice) : 0 }} X {{ info.num||0 }}{{info.unitName||'份'}}</view>
 			</view>
 		</block>
 	</view>

hdApp/src/admin/order/detail.vue

@@ -63,20 +63,13 @@
         <view class="module-tit">商品信息 <text style="font-weight:normal;" @click="showGoodsModal">编号 {{ orderInfo.sendNum }}</text></view>
         <view class="module-det">
           <block v-if="!$util.isEmpty(orderInfo.goodsInfoList)">
-            <detailGoods 
-              v-for="(items, subIndex) in orderInfo.goodsInfoList" 
-              :key="subIndex" 
-              :info="items">
-            </detailGoods>
+            <detailGoods v-for="(items, subIndex) in orderInfo.goodsInfoList" :key="subIndex" :info="items"> </detailGoods>
           </block>
           <block v-if="!$util.isEmpty(orderInfo.itemInfoList)">
-            <detailItem 
-              v-for="(items, subIndex) in orderInfo.itemInfoList" 
-              :key="subIndex" 
-              :info="items">
-            </detailItem>
+            <detailItem v-for="(items, subIndex) in orderInfo.itemInfoList" :key="subIndex" :info="items"> </detailItem>
           </block>
         </view>
+        <view style="text-align: right;margin-top:12upx;padding-bottom:12upx;font-size:28upx;padding-right:8upx;">合计 ￥{{ orderInfo.goodsPrice ? parseFloat(orderInfo.goodsPrice) : 0 }}</view>
       </view>
 
       <!-- 收花人信息模块 -->
@@ -261,12 +254,6 @@
               </view>
             </view>
 
-            <!-- 商品价格 -->
-            <view class="msg-list">
-              <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>
@@ -291,21 +278,9 @@
               <view class="value">￥{{ orderInfo.packingFee ? parseFloat(orderInfo.packingFee) : 0 }}</view>
             </view>
 
-            <!-- 原价 -->
-            <view class="msg-list">
-              <view class="label">原价：</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">
-              <view class="label">应付金额：</view>
+            <view class="msg-list" v-if="Number(orderInfo.tkPrice)>0">
+              <view class="label">订单金额</view>
               <view class="value">￥{{ orderInfo.orderPrice ? parseFloat(orderInfo.orderPrice) : 0 }}</view>
             </view>
 
@@ -332,6 +307,12 @@
               </text>
             </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">
               <view class="label">实际金额：</view>