LuoDLeo 2 лет назад
Родитель
Сommit
96acf15966
2 измененных файлов с 29 добавлено и 10 удалено
  1. 14 3
      orderPages/orderDetail/index.rpx.scss
  2. 15 7
      orderPages/orderDetail/index.vue

+ 14 - 3
orderPages/orderDetail/index.rpx.scss

@@ -123,9 +123,20 @@
   font-size: 28rpx;
   font-family: PingFangSC-Medium, PingFang SC;
   font-weight: 500;
-  color: #ED569F;
+  color: #353535;
   line-height: 44rpx;
 }
+
+.lineMoney{
+  font-size: 20rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #959595;
+  line-height: 44rpx;
+  margin-left: 8rpx;
+  text-decoration:line-through;
+}
+
 .bottom1{
   width: 750rpx;
   height: 212rpx;
@@ -169,10 +180,10 @@
   font-size: 24rpx;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
-  color: #333333;
+  color: #d65d58;
   line-height: 108rpx;
   margin-left: 16rpx;
-  text-decoration:line-through;
+  //text-decoration:line-through;
 }
 
 .priceDetail{

+ 15 - 7
orderPages/orderDetail/index.vue

@@ -120,10 +120,13 @@
                                     </view>
                                 </view>
                                 <view class="flex-row justify-between">
-                                    <view>
-                                        <text  class="key">金额:</text>
-                                        <text  class="projectMoney">¥{{item.servicePrice}}</text>
+                                    <view v-if="item.discountAmount > 0">
+                                      <text  class="projectMoney">¥{{item.payAmount}}</text>
+                                      <text  class="lineMoney">¥{{item.servicePrice}}</text>
                                     </view>
+                                  <view v-else>
+                                    <text  class="projectMoney">¥{{item.servicePrice}}</text>
+                                  </view>
 
                                     <view class="flex-row" v-if="item.status === 1" @click="appeal(item.orderServiceId)">
                                         <u-icon name="/static/order/ud17.png" color="#93D21A" size="18"></u-icon>
@@ -137,12 +140,13 @@
             <view class="bottomHeight"></view>
 
             <view class="bottom1 flex-col">
-                <text class="allMoney">合计价格:¥{{allPrice}}</text>
+                <text class="allMoney"></text>
                 <view class="bottomBtn flex-row justify-between">
                     <view class=" flex-row">
-                        <text  class="unpaid">待支付</text>
+                        <text  class="unpaid">合计</text>
                         <text  class="preferentialPrice">¥{{allPrice}}</text>
-                        <text  class="originalPrice">¥{{allPrice}}</text>
+                      <text  class="unpaid">已优惠</text>
+                        <text  class="originalPrice">¥{{totalDiscount}}</text>
 <!--                        <text  class="priceDetail">价格明细</text>-->
                     </view>
 
@@ -265,6 +269,7 @@ export default {
             tabIndex: 3,
             order:{},
             allPrice:0,
+            totalDiscount:0,
             appealId:'',
             appealReason:'',
             orderId:'',
@@ -411,14 +416,17 @@ export default {
 
           if (item.status === 1 || item.status === 4){
               this.allPrice = 0
+              this.totalDiscount = 0;
               item.tick = !item.tick
               this.$set(this.order.child,index,item)
               this.order.child.forEach(i=>{
                   if (i.tick){
-                      this.allPrice += i.servicePrice *1
+                      this.totalDiscount += i.discountAmount * 1;
+                      this.allPrice += i.payAmount *1;
                   }
               })
               this.allPrice = this.allPrice.toFixed(2)
+              this.totalDiscount = this.totalDiscount.toFixed(2)
           }
         },