From 100dc94f53683a9c4a31e9acccdf83cbb67fc993 Mon Sep 17 00:00:00 2001 From: kele <1184860403@qq.com> Date: Tue, 17 Jan 2023 15:34:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=85=BC=E5=AE=B9HbuilderX=203.6.15?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/activity/groupon/detail.vue | 3 +- pages/activity/groupon/list.vue | 3 +- pages/activity/seckill/list.vue | 3 +- pages/app/sign.vue | 4 ++- .../commission/components/commission-info.vue | 3 +- pages/commission/order.vue | 3 +- pages/commission/team.vue | 3 +- .../components/detail/detail-activity-tip.vue | 8 +++-- pages/goods/groupon.vue | 23 +++++++++---- pages/goods/score.vue | 14 ++++---- pages/goods/seckill.vue | 22 ++++++++----- pages/order/aftersale/detail.vue | 3 +- pages/order/invoice.vue | 3 +- pages/pay/recharge.vue | 4 +-- pages/pay/withdraw.vue | 4 +-- pages/user/wallet/commission.vue | 4 ++- pages/user/wallet/money.vue | 5 ++- sheep/components/s-empty/s-empty.vue | 4 +-- .../s-select-groupon-sku.vue | 3 +- sheep/ui/su-coupon/su-coupon.vue | 32 +++++++++---------- sheep/ui/su-popup/su-popup.vue | 3 +- 21 files changed, 96 insertions(+), 58 deletions(-) diff --git a/pages/activity/groupon/detail.vue b/pages/activity/groupon/detail.vue index 7c90c0c..3f6cc77 100644 --- a/pages/activity/groupon/detail.vue +++ b/pages/activity/groupon/detail.vue @@ -205,6 +205,7 @@ import { showShareModal } from '@/sheep/hooks/useModal'; import { isEmpty } from 'lodash'; + const headerBg = sheep.$url.css('/assets/addons/shopro/frontend_img/user/withdraw_bg.png'); const statusBarHeight = sheep.$platform.device.statusBarHeight * 2; const state = reactive({ data: {}, @@ -313,7 +314,7 @@ .recharge-box { position: relative; margin-bottom: 120rpx; - background: v-bind("sheep.$url.css('/static/img/shop/user/withdraw_bg.png')") center/750rpx 100% + background: v-bind(headerBg) center/750rpx 100% no-repeat, linear-gradient(115deg, #f44739 0%, #ff6600 100%); border-radius: 0 0 5% 5%; diff --git a/pages/activity/groupon/list.vue b/pages/activity/groupon/list.vue index 145ae90..d0052a1 100644 --- a/pages/activity/groupon/list.vue +++ b/pages/activity/groupon/list.vue @@ -73,6 +73,7 @@ const statusBarHeight = sheep.$platform.device.statusBarHeight * 2; const pageHeight = (safeArea.height + safeAreaInsets.bottom) * 2 + statusBarHeight - sys_navBar - 350; + const headerBg = sheep.$url.css('/assets/addons/shopro/frontend_img/goods/groupon-header.png'); const state = reactive({ activityId: 0, @@ -147,7 +148,7 @@ width: 100%; height: 458rpx; margin-top: -88rpx; - background: v-bind("sheep.$url.css('/static/img/shop/goods/groupon-header.png')") no-repeat; + background: v-bind(headerBg) no-repeat; background-size: 100% 100%; } .list-content { diff --git a/pages/activity/seckill/list.vue b/pages/activity/seckill/list.vue index 854817a..82ec97a 100644 --- a/pages/activity/seckill/list.vue +++ b/pages/activity/seckill/list.vue @@ -73,6 +73,7 @@ const statusBarHeight = sheep.$platform.device.statusBarHeight * 2; const pageHeight = (safeArea.height + safeAreaInsets.bottom) * 2 + statusBarHeight - sys_navBar - 350; + const headerBg = sheep.$url.css('/assets/addons/shopro/frontend_img/goods/seckill-header.png'); const state = reactive({ activityId: 0, @@ -146,7 +147,7 @@ .page-bg { width: 100%; height: 458rpx; - background: v-bind("sheep.$url.css('/static/img/shop/goods/seckill-header.png')") no-repeat; + background: v-bind(headerBg) no-repeat; background-size: 100% 100%; } .list-content { diff --git a/pages/app/sign.vue b/pages/app/sign.vue index a2701cb..2055971 100644 --- a/pages/app/sign.vue +++ b/pages/app/sign.vue @@ -158,6 +158,8 @@ import { onLoad, onReady } from '@dcloudio/uni-app'; import { computed, reactive } from 'vue'; + const headerBg = sheep.$url.css('/assets/addons/shopro/frontend_img/app/sign.png'); + const state = reactive({ data: { days: [], //日历 @@ -480,7 +482,7 @@ width: 520rpx; height: 344rpx; background-size: 100% 100%; - background-image: v-bind('sheep.$url.css("/static/img/shop/app/sign.png")'); + background-image: v-bind(headerBg); background-repeat: no-repeat; border-radius: 0 0 10rpx 10rpx; diff --git a/pages/commission/components/commission-info.vue b/pages/commission/components/commission-info.vue index fca50ef..b1f78f9 100644 --- a/pages/commission/components/commission-info.vue +++ b/pages/commission/components/commission-info.vue @@ -35,6 +35,7 @@ const userInfo = computed(() => sheep.$store('user').userInfo); const agentInfo = computed(() => sheep.$store('user').agentInfo); + const headerBg = sheep.$url.css('/assets/addons/shopro/frontend_img/commission/background.png'); const state = reactive({ showMoney: false, @@ -48,7 +49,7 @@ height: 192rpx; margin: -88rpx 20rpx 0 20rpx; padding-top: 88rpx; - background: v-bind("sheep.$url.css('/static/img/shop/commission/background.png')") no-repeat; + background: v-bind(headerBg) no-repeat; background-size: 100% 100%; .head-img-box { diff --git a/pages/commission/order.vue b/pages/commission/order.vue index 40f02a8..cb6b531 100644 --- a/pages/commission/order.vue +++ b/pages/commission/order.vue @@ -149,6 +149,7 @@ import { onPageScroll } from '@dcloudio/uni-app'; const statusBarHeight = sheep.$platform.device.statusBarHeight * 2; + const headerBg = sheep.$url.css('/assets/addons/shopro/frontend_img/user/withdraw_bg.png'); onPageScroll((e) => { if (e.scrollTop > 100) { state.scrollTop = false; @@ -256,7 +257,7 @@ box-sizing: border-box; padding: 0 20rpx 20rpx 20rpx; width: 750rpx; - background: v-bind("sheep.$url.css('/static/img/shop/user/withdraw_bg.png')") no-repeat, + background: v-bind(headerBg) no-repeat, linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient)); background-size: 750rpx 100%; // 团队信息总览 diff --git a/pages/commission/team.vue b/pages/commission/team.vue index c7748c1..99b8b8d 100644 --- a/pages/commission/team.vue +++ b/pages/commission/team.vue @@ -98,6 +98,7 @@ const statusBarHeight = sheep.$platform.device.statusBarHeight * 2; const agentInfo = computed(() => sheep.$store('user').agentInfo); const userInfo = computed(() => sheep.$store('user').userInfo); + const headerBg = sheep.$url.css('/assets/addons/shopro/frontend_img/user/withdraw_bg.png'); onPageScroll((e) => { if (e.scrollTop > 100) { @@ -172,7 +173,7 @@ width: 750rpx; z-index: 3; position: relative; - background: v-bind("sheep.$url.css('/static/img/shop/user/withdraw_bg.png')") no-repeat, + background: v-bind(headerBg) no-repeat, linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient)); background-size: 750rpx 100%; // 团队信息总览 diff --git a/pages/goods/components/detail/detail-activity-tip.vue b/pages/goods/components/detail/detail-activity-tip.vue index 5f0ca1a..15b3072 100644 --- a/pages/goods/components/detail/detail-activity-tip.vue +++ b/pages/goods/components/detail/detail-activity-tip.vue @@ -32,6 +32,10 @@