From cebde87682500ce1ed13989729a4ce62b1bb5124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Sun, 26 Sep 2021 10:30:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=BC=98=E6=83=A0=E5=88=B8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                     |  4 +---
 pages/cart/coupon/index.vue    | 13 +++++++++----
 pages/order/fillorder.vue      |  2 +-
 pages/tabbar/cart/cartList.vue |  2 --
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pages.json b/pages.json
index 8e52682..f82445a 100644
--- a/pages.json
+++ b/pages.json
@@ -18,8 +18,6 @@
 			"path": "pages/tabbar/cart/cartList",
 			"style": {
 				"navigationBarTitleText": "购物车",
-				"navigationStyle": "custom",
-
 				"navigationBarBackgroundColor": "#fff"
 
 			}
@@ -720,7 +718,7 @@
 			]
 		}
 	],
-	"globalStyle": {
+	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "Lili商城",
 		"titleColor": "#303133",
diff --git a/pages/cart/coupon/index.vue b/pages/cart/coupon/index.vue
index 9edd921..489d0b8 100644
--- a/pages/cart/coupon/index.vue
+++ b/pages/cart/coupon/index.vue
@@ -69,6 +69,10 @@ export default {
       routerVal: "", //上级传参
     };
   },
+  onLoad(options){
+    this.routerVal = options
+   
+  },
   watch: {
     current(val) {
       console.log(this.$store.state.cantUseCoupons);
@@ -114,10 +118,11 @@ export default {
 </script>
 <style scoped lang="scss">
 .desc {
-  height: 100%;
+  height: 220rpx;
+  flex: 2;
   display: flex;
   flex-direction: column;
-  justify-content: center;
+  justify-content: space-around;
 }
 .end-time,
 .reason {
@@ -204,14 +209,14 @@ export default {
     align-items: center;
     width: 450rpx;
     font-size: $font-sm;
-    height: 100%;
+    height: 220rpx;
     background-color: #ffffff;
     overflow: hidden;
     position: relative;
     > view:nth-child(1) {
       color: #666666;
       margin-left: 20rpx;
-      line-height: 3em;
+    
       > view:nth-child(1) {
         color: #ff6262;
         font-size: 30rpx;
diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue
index c599db9..da6896a 100644
--- a/pages/order/fillorder.vue
+++ b/pages/order/fillorder.vue
@@ -150,7 +150,7 @@
         <u-row>
           <u-col :span="9">优惠金额</u-col>
           <u-col :span="3" textAlign="right" v-if=" orderMessage.priceDetailDTO.couponPrice">
-            -￥{{ orderMessage.priceDetailDTO.couponPrice | unitPrice }}</u-col>
+           <span class="main-color"> -￥{{ orderMessage.priceDetailDTO.couponPrice | unitPrice }}</span></u-col>
           <u-col :span="3" textAlign="right" v-else>0.00</u-col>
         </u-row>
       </div>
diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue
index 5a6474c..83228f0 100644
--- a/pages/tabbar/cart/cartList.vue
+++ b/pages/tabbar/cart/cartList.vue
@@ -1,7 +1,5 @@
 <template>
   <div class="wrapper">
-    <u-navbar :isBack="false" title="购物车"></u-navbar>
-
     <!-- 空白页-->
     <view v-if="cartDetail.cartList == '' || cartDetail.cartList == [] || !cartDetail" class="empty">
       <image src="/static/emptyCart.png" mode="aspectFit"></image>