diff --git a/pages/user/address/edit.vue b/pages/user/address/edit.vue index d38fcf4..613f40b 100644 --- a/pages/user/address/edit.vue +++ b/pages/user/address/edit.vue @@ -168,8 +168,8 @@ content: '确认删除此收货地址吗?', success: async function (res) { if (res.confirm) { - const { code } = await sheep.$api.user.address.delete(state.model.id); - if (res.code === 1) { + const res = await sheep.$api.user.address.delete(state.model.id); + if (res.code == 1) { sheep.$router.back(); } } @@ -250,8 +250,10 @@ width: 710rpx; height: 80rpx; border-radius: 40rpx; - background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient)); - color: $white; + background: linear-gradient(to right, var(--ui-BG-Main-gradient), var(--ui-BG-Main)); + // color: $white; + font-weight: bold; + color: #333333; } .cancel-btn { diff --git a/pages/user/address/list.vue b/pages/user/address/list.vue index 76cb74a..d91ea8a 100644 --- a/pages/user/address/list.vue +++ b/pages/user/address/list.vue @@ -18,13 +18,15 @@ v-if="['WechatMiniProgram', 'WechatOfficialAccount'].includes(sheep.$platform.name)" @tap="importWechatAddress" class="border ss-reset-button sync-wxaddress ss-m-20 ss-flex ss-row-center ss-col-center" + style="font-weight: bold;" > - + 导入微信地址 @@ -129,12 +131,13 @@ .footer-box { .add-btn { flex: 1; - background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient)); + background: linear-gradient(to right, var(--ui-BG-Main-gradient), var(--ui-BG-Main)); border-radius: 80rpx; font-size: 30rpx; font-weight: 500; line-height: 80rpx; - color: $white; + // color: $white; + color: #333333; position: relative; z-index: 1; } diff --git a/pages/user/info.vue b/pages/user/info.vue index fc2b809..e607e4b 100644 --- a/pages/user/info.vue +++ b/pages/user/info.vue @@ -36,7 +36,7 @@ - + { .logout-btn { width: 710rpx; height: 80rpx; - background: linear-gradient(90deg,#FCCA58, #FFBD25); + background: linear-gradient(to right, #FCCA58, #FFBD25); border-radius: 40rpx; font-size: 30rpx; - font-weight: 500; - color: $white; + font-weight: bold; + color: #333333; } .exit-btn { @@ -424,7 +424,7 @@ onBeforeMount(async () => { height: 80rpx; background: #ffffff; border-radius: 40rpx; - border: 2rpx solid #999999; + border: 1rpx solid #999999; font-size: 30rpx; font-weight: 800; color: #999999; diff --git a/pages/user/invoice/edit.vue b/pages/user/invoice/edit.vue index 9a44395..363c2c2 100644 --- a/pages/user/invoice/edit.vue +++ b/pages/user/invoice/edit.vue @@ -263,8 +263,9 @@ width: 710rpx; height: 80rpx; border-radius: 40rpx; - background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient)); - color: $white; + background: linear-gradient(to right, var(--ui-BG-Main-gradient), var(--ui-BG-Main)); + // color: $white; + color: #333333; } .cancel-btn { diff --git a/pages/user/invoice/list.vue b/pages/user/invoice/list.vue index bb3be36..448d1a8 100644 --- a/pages/user/invoice/list.vue +++ b/pages/user/invoice/list.vue @@ -58,12 +58,12 @@ .footer-box { .add-btn { flex: 1; - background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient)); + background: linear-gradient(to right, var(--ui-BG-Main-gradient), var(--ui-BG-Main)); border-radius: 80rpx; font-size: 30rpx; - font-weight: 500; + font-weight: bold; line-height: 80rpx; - color: $white; + color: #333333; position: relative; z-index: 1; } diff --git a/sheep/components/s-address-item/s-address-item.vue b/sheep/components/s-address-item/s-address-item.vue index 8e35116..0cd3c1b 100644 --- a/sheep/components/s-address-item/s-address-item.vue +++ b/sheep/components/s-address-item/s-address-item.vue @@ -6,9 +6,9 @@ @@ -72,6 +72,10 @@ font-weight: 400; color: $dark-9; } + + .defaultBox { + border-radius: 10rpx; + } .address-text { font-size: 32rpx;