订单金额

hdApp/src/admin/home/order.vue

@@ -36,9 +36,9 @@
           </div>
           <div class="list-bottom">
             <div>
-              <span class="freight-text">运费：￥{{ item.sendCost }}</span>
+              <span v-if="item.sendCost > 0" class="freight-text">运费：￥{{ item.sendCost }}</span>
               <span>金额：</span>
-              <span class="app-size-30 app-bold">¥{{ item.actPrice }}</span>
+              <span class="app-size-30 app-bold">¥{{ item.realPrice }}</span>
             </div>
 
             <div class="list-button">

hdApp/src/admin/order/detail.vue

@@ -54,7 +54,7 @@
               <div v-if="data.reachDate == '0000-00-00'" class="value">-</div>
               <div v-else class="value"><span style="margin-right:10rpx;">{{data.reachDate}}</span> <span v-if="data.reachPeriod == 0">上午</span><span v-else-if="data.reachPeriod == 1">下午</span><span v-else>晚上</span></div>
             </div>
-            <div class="msg-list">
+            <div v-if="data.reachDate != '0000-00-00'" class="msg-list">
               <div class="label">贺卡</div>
               <div class="value">{{ data.needCard == 1 ? "需要" : '不需要' }}</div>
             </div>
@@ -90,9 +90,17 @@
               <div class="value">￥{{ data.sendCost }}</div>
             </div>
             <div class="msg-list">
-              <div class="label">总价</div>
+              <div class="label">总金额</div>
               <div class="value">￥{{ data.prePrice }}</div>
             </div>
+            <div v-if="data.discountAmount > 0" class="msg-list">
+              <div class="label">优惠</div>
+              <div class="value">￥{{ data.discountAmount }}</div>
+            </div>
+            <div class="msg-list">
+              <div class="label">实付款</div>
+              <div class="value">￥{{ data.realPrice }}</div>
+            </div>
           </div>
         </div>
       </div>
@@ -105,13 +113,11 @@
           <div
             class="app-color-3"
           >
-
           <template v-if="data.discountType == 0">未知</template>
           <template v-else-if="data.discountType == 1">优惠券</template>
           <template v-else-if="data.discountType == 2">会员优惠</template>
           <template v-else-if="data.discountType == 3">随机优惠</template>
           <template v-else>未知</template>
-
           </div>
           <div class="app-price">-￥{{ data.discountAmount }}</div>
         </div>