diff --git a/components/shopTabbar.vue b/components/shopTabbar.vue index 266bd041..20b20c33 100644 --- a/components/shopTabbar.vue +++ b/components/shopTabbar.vue @@ -86,6 +86,10 @@ export default { type: Number, default: 99, }, + comeForm: { + type: String, + default: "", + }, }, watch: { page: { @@ -110,9 +114,16 @@ export default { } if (pageIndex === '/pages/shopMallPage/index/index') { - uni.navigateBack({ - delta: 1, - }); + if (this.comeForm === 'index') { + uni.redirectTo({ + url: '/pages/shopMallPage/index/index', + }); + } else { + uni.navigateBack({ + delta: 1, + }); + } + } else if (pageIndex === "/pages/shopMallPage/shopCar/index") { if (!this.user && !this.user.MEMBERSHIP_ID) { uni.showModal({ @@ -198,7 +209,8 @@ export default { line-height: 28rpx; text-align: left; font-style: normal; - background: #fa5151; + // background: #fa5151; + background: #4BCB7E; border-radius: 16rpx; padding: 2rpx 8rpx; } diff --git a/pages/couponDetail/index.vue b/pages/couponDetail/index.vue index f6b69fd7..a081963e 100644 --- a/pages/couponDetail/index.vue +++ b/pages/couponDetail/index.vue @@ -52,7 +52,7 @@ "> {{ subItem.ServerpartShopName || "-" - }}{{ + }}{{ subIndex > 0 && subIndex !== item.ServerpartShopList.length - 1 ? "、" @@ -67,8 +67,8 @@
{{ couponMsg.takeState ? "立即领取" : "已领取" }}
@@ -358,7 +358,7 @@ export default { font-family: PingFangSC, PingFang SC; font-weight: 400; font-size: 28rpx; - color: #ba922f; + color: #4BCB7E; line-height: 40rpx; text-align: left; font-style: normal; @@ -368,7 +368,7 @@ export default { font-family: DINAlternate, DINAlternate; font-weight: bold; font-size: 64rpx; - color: #ba922f; + color: #4BCB7E; line-height: 72rpx; text-align: left; font-style: normal; @@ -382,7 +382,7 @@ export default { font-family: PingFangSC, PingFang SC; font-weight: 400; font-size: 28rpx; - color: #ba922f; + color: #4BCB7E; line-height: 40rpx; text-align: left; font-style: normal; @@ -474,6 +474,7 @@ export default { font-style: normal; padding: 22rpx 0; border-radius: 6rpx; + border-radius: 32rpx; } } } diff --git a/pages/index/index.vue b/pages/index/index.vue index 89544a07..c9eb7407 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -186,7 +186,7 @@ - + 距离{{ ScenicData.ScenicDistance || '-' }}km @@ -1478,7 +1478,7 @@ export default { } else if (obj.value === 17) { if (obj.index === 0) { uni.navigateTo({ - url: `/pages/shopMallPage/shopType/index`, + url: `/pages/shopMallPage/shopType/index?comeForm=index`, }); } else { uni.navigateTo({ diff --git a/pages/myAddress/newAdd/index.vue b/pages/myAddress/newAdd/index.vue index 469e2961..dcdccc67 100644 --- a/pages/myAddress/newAdd/index.vue +++ b/pages/myAddress/newAdd/index.vue @@ -12,7 +12,7 @@ - + {{ item.name }} @@ -75,8 +75,16 @@ /> -->
-
保存并使用
-
删除地址
+ + + + + 保存并使用 + 删除地址 + + +
@@ -803,9 +811,9 @@ textarea { } .tip-tag.active { - color: #c7ac85; - border-color: #c7ac85; - background: #f7efe3; + color: #4BCB7E; + border-color: #4BCB7E; + background: #E7F8EE; } .content-title { @@ -855,6 +863,41 @@ textarea { text-align: center; } + .btnBox { + width: 100%; + box-sizing: border-box; + padding: 0 32rpx; + margin-top: 32rpx; + display: flex; + align-items: center; + justify-content: space-between; + + .saveBtn { + width: calc(50% - 16rpx); + border-radius: 48rpx; + background-color: #07C160; + font-weight: 400; + font-size: 32rpx; + color: #FFFFFF; + text-align: center; + font-style: normal; + padding: 24rpx 0; + } + + .loginOut { + width: calc(50% - 16rpx); + border-radius: 48rpx; + font-weight: 400; + font-size: 32rpx; + color: #07C160; + text-align: center; + font-style: normal; + padding: 24rpx 0; + border: 1px solid #07C160; + box-sizing: border-box; + } + } + .del-btn { margin: 0 auto; height: 80rpx; diff --git a/pages/order/buyOrder/index.vue b/pages/order/buyOrder/index.vue index 7207b56f..4b3747ee 100644 --- a/pages/order/buyOrder/index.vue +++ b/pages/order/buyOrder/index.vue @@ -709,7 +709,7 @@ export default { .statusBox { font-family: PingFangSC, PingFang SC; font-weight: 400; - font-size: 28rpx; + font-size: 24rpx; color: #F83D3D; line-height: 40rpx; text-align: right; diff --git a/pages/order/foodOrder/components/orderItem.vue b/pages/order/foodOrder/components/orderItem.vue index 939ff038..bc2ea42e 100644 --- a/pages/order/foodOrder/components/orderItem.vue +++ b/pages/order/foodOrder/components/orderItem.vue @@ -1,14 +1,12 @@