Merge remote-tracking branch 'origin/master'

coriskr · Mar 22, 2022 · 76e1234 · 76e1234
2 parents 4dfca47 + fc25dd9
commit 76e1234
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/mall4uni/pages/order-detail/order-detail.css b/mall4uni/pages/order-detail/order-detail.css
@@ -6,6 +6,7 @@ page {
 
 .order-detail {
   margin-bottom: 120rpx;
+  padding-bottom: 160rpx;
 }
 
 .order-detail .delivery-addr {

diff --git a/mall4uni/pages/order-detail/order-detail.vue b/mall4uni/pages/order-detail/order-detail.vue
@@ -111,8 +111,8 @@
           <view class="item-tit">订单总额：</view>
           <view class="item-txt price">
             <text class="symbol">￥</text>
-            <text class="big-num">{{wxs.parsePrice(productTotalAmount)[0]}}</text>
-            <text class="small-num">.{{wxs.parsePrice(productTotalAmount)[1]}}</text>
+            <text class="big-num">{{wxs.parsePrice(total)[0]}}</text>
+            <text class="small-num">.{{wxs.parsePrice(total)[1]}}</text>
           </view>
         </view>
         <view class="item">
@@ -174,8 +174,8 @@ export default {
       productTotalAmount: '',
       transfee: '',
       reduceAmount: '',
-      actualTotal: '',
-      prodid: ''
+      prodid: '',
+      total: 0, // 商品总额
     };
   },
 
@@ -256,7 +256,7 @@ export default {
             productTotalAmount: res.orderItemDtos[0].productTotalAmount,
             transfee: res.transfee,
             reduceAmount: res.reduceAmount,
-            actualTotal: res.actualTotal
+            total: res.total
           });
           uni.hideLoading();
 					console.log("orderDetail",this.userAddrDto)

diff --git a/mall4uni/pages/prod/prod.css b/mall4uni/pages/prod/prod.css
@@ -88,14 +88,20 @@ swiper image {
   color: #eb2444;
   font-size: 24rpx;
   font-weight: 600;
-  margin-right: 50rpx;
+  margin-right: 30rpx;
 }
 
 .price-num {
   font-size: 46rpx;
   font-weight: 400;
 }
 
+.ori-price {
+  font-size: 25rpx;
+  color: #999;
+  text-decoration: line-through;
+}
+
 .sales {
   color: #999;
 }

diff --git a/mall4uni/pages/prod/prod.vue b/mall4uni/pages/prod/prod.vue
@@ -24,6 +24,9 @@
     <view class="sales-p">{{brief}}</view>
     <view class="prod-price">
       <text v-if="defaultSku && defaultSku.price" class="price">￥<text class="price-num">{{wxs.parsePrice(defaultSku.price)[0]}}</text>.{{wxs.parsePrice(defaultSku.price)[1]}}</text>
+      <text v-if="defaultSku && defaultSku.oriPrice" class="ori-price">
+        ￥{{wxs.parsePrice(defaultSku.oriPrice)[0]}}.{{wxs.parsePrice(defaultSku.oriPrice)[1]}}
+      </text>
       <text class="sales"></text>
     </view>
     <!-- <button class="share-icon" open-type="share">
@@ -111,7 +114,7 @@
     <view class="btn cart" @tap="showSku">
       <text>加入购物车</text>
     </view>
-    <view class="btn buy" @tap="buyNow">
+    <view class="btn buy" @tap="showSku">
       <text>立即购买</text>
     </view>
   </view>

diff --git a/mall4uni/pages/submit-order/submit-order.css b/mall4uni/pages/submit-order/submit-order.css
@@ -8,6 +8,7 @@ page {
 
 .submit-order {
   margin-bottom: 100rpx;
+  padding-bottom: 160rpx;
 }
 
 .submit-order .delivery-addr {