diff --git a/pages.json b/pages.json index 19f70be..c83bb07 100644 --- a/pages.json +++ b/pages.json @@ -868,7 +868,10 @@ "path": "order-details/order-details", "style": { "navigationBarTitleText": "订单详情", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3da7e7", + "backgroundColorTop": "#3da7e7", + "navigationBarTextStyle": "white" } }, { diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue index 35ea94e..1d84e11 100644 --- a/pages/tabBar/home/home.vue +++ b/pages/tabBar/home/home.vue @@ -760,7 +760,9 @@ this.currentSwiper = event.detail.current; }, test(item) { - let a = item % 2; + uni.navigateTo({ + url:'../../user/news/news' + }) }, eheckStu(item) { diff --git a/pages/user/coupon/coupon.vue b/pages/user/coupon/coupon.vue index 8718087..c6af601 100644 --- a/pages/user/coupon/coupon.vue +++ b/pages/user/coupon/coupon.vue @@ -22,8 +22,8 @@ - - + @@ -279,6 +279,10 @@ uni.navigateTo({ url: '/member-Recharge/choicepage/choicepage' }) + } else if (e.highDiscount.useScope == 7) { + uni.navigateTo({ + url: '../../goods/refuel/refuel' + }) } else { uni.navigateTo({ url: '../mineCouponsDestails/mineCouponsDestails?id=' + e.id @@ -534,7 +538,6 @@ animation: closeMenu 0.15s linear both; } - background-color: #fff; position: absolute; width: 100%; padding: 0 0; @@ -543,7 +546,9 @@ flex-wrap: nowrap; .left { - width: 100%; + background-color: #fff; + width: 72%; + background-image: radial-gradient(6px at top right, #f5f5f5 50px, #ffffff); .title { width: 90%; @@ -552,8 +557,9 @@ } .term { - width: 90%; - margin: 0 5%; + width: 95%; + background-image: radial-gradient(6px at bottom right, #f5f5f5 50px, #ffffff); + margin-left: 5%; font-size: 26upx; color: #999; } @@ -591,7 +597,8 @@ flex-shrink: 0; width: 28%; color: #fff; - background: linear-gradient(to right, #ec625c, #ee827f); + background: linear-gradient(to right, #66c4ff, #009DFF); + background-image: radial-gradient(6px at bottom left, #f5f5f5 50px, #009DFF); &.invalid { background: linear-gradient(to right, #aaa, #999); @@ -609,18 +616,18 @@ } .ticket { + background-image: radial-gradient(6px at top left, #f5f5f5 50px, #009DFF); padding-top: 1vw; justify-content: center; align-items: baseline; - height: 6vw; .num { - font-size: 42upx; + font-size: 60upx; font-weight: 600; } .unit { - font-size: 24upx; + font-size: 28upx; } } @@ -631,15 +638,15 @@ } .use { - width: 50%; - height: 40upx; + width: 70%; + height: 60rpx; justify-content: center; align-items: center; - font-size: 24upx; + font-size: 28rpx; background-color: #fff; - color: #ee827f; - border-radius: 40upx; - padding: 0 10upx; + color: #009DFF; + border-radius: 40rpx; + padding: 0 10rpx; } } } diff --git a/qianzhu-KFC/order-details/order-details.vue b/qianzhu-KFC/order-details/order-details.vue index 63082b0..b9fc1d8 100644 --- a/qianzhu-KFC/order-details/order-details.vue +++ b/qianzhu-KFC/order-details/order-details.vue @@ -1,19 +1,17 @@