From 0b7cd120a0c49ca3be7b4f730c68399b2d68d8d0 Mon Sep 17 00:00:00 2001
From: kele <1184860403@qq.com>
Date: Mon, 16 Jan 2023 15:04:20 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=88=86=E9=94=80?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=AE=9E=E6=97=B6=E5=8A=A8=E6=80=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commission/components/commission-log.vue  | 59 ++++++++++---------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/pages/commission/components/commission-log.vue b/pages/commission/components/commission-log.vue
index 125712e1..15b83853 100644
--- a/pages/commission/components/commission-log.vue
+++ b/pages/commission/components/commission-log.vue
@@ -14,38 +14,41 @@
       class="scroll-box log-scroll"
       scroll-with-animation="true"
     >
-      <view
-        class="log-item-box ss-flex ss-row-between"
-        v-for="item in state.pagination.data"
-        :key="item.id"
-      >
-        <view class="log-item-wrap">
-          <view class="log-item ss-flex ss-ellipsis-1 ss-col-center">
-            <view class="ss-flex ss-col-center">
-              <image
-                v-if="item.oper_type === 'user'"
-                class="log-img"
-                :src="sheep.$url.cdn(item.oper?.avatar)"
-                mode="aspectFill"
-              ></image>
-              <image
-                v-else-if="item.oper_type === 'admin'"
-                class="log-img"
-                :src="sheep.$url.static('/static/img/shop/avatar/default_user.png')"
-                mode="aspectFill"
-              ></image>
-              <image
-                v-else
-                class="log-img"
-                :src="sheep.$url.static('/static/img/shop/avatar/notice.png')"
-                mode="aspectFill"
-              ></image>
+      <view v-if="state.pagination.data">
+        <view
+          class="log-item-box ss-flex ss-row-between"
+          v-for="item in state.pagination.data"
+          :key="item.id"
+        >
+          <view class="log-item-wrap">
+            <view class="log-item ss-flex ss-ellipsis-1 ss-col-center">
+              <view class="ss-flex ss-col-center">
+                <image
+                  v-if="item.oper_type === 'user'"
+                  class="log-img"
+                  :src="sheep.$url.cdn(item.oper?.avatar)"
+                  mode="aspectFill"
+                ></image>
+                <image
+                  v-else-if="item.oper_type === 'admin'"
+                  class="log-img"
+                  :src="sheep.$url.static('/static/img/shop/avatar/default_user.png')"
+                  mode="aspectFill"
+                ></image>
+                <image
+                  v-else
+                  class="log-img"
+                  :src="sheep.$url.static('/static/img/shop/avatar/notice.png')"
+                  mode="aspectFill"
+                ></image>
+              </view>
+              <view class="log-text ss-ellipsis-1">{{ item.remark }}</view>
             </view>
-            <view class="log-text ss-ellipsis-1">{{ item.remark }}</view>
           </view>
+          <text class="log-time">{{ dayjs(item.create_time).fromNow() }}</text>
         </view>
-        <text class="log-time">{{ dayjs(item.create_time).fromNow() }}</text>
       </view>
+
       <!-- 加载更多 -->
       <uni-load-more
         v-if="state.pagination.total > 0"

From 39b87625dd6c2f35f54d713303dcce6d476e14de Mon Sep 17 00:00:00 2001
From: kele <1184860403@qq.com>
Date: Mon, 16 Jan 2023 15:11:49 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E3=80=81=E4=BD=99=E9=A2=9D=E3=80=81=E4=BD=A3=E9=87=91=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E7=AD=9B=E9=80=89=E6=97=B6=E9=97=B4=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/wallet/commission.vue | 2 +-
 pages/user/wallet/money.vue      | 2 +-
 pages/user/wallet/score.vue      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/user/wallet/commission.vue b/pages/user/wallet/commission.vue
index 43b2579c..3e78a1ce 100644
--- a/pages/user/wallet/commission.vue
+++ b/pages/user/wallet/commission.vue
@@ -218,7 +218,7 @@
   function onChangeTime(e) {
     state.date[0] = e[0];
     state.date[1] = e[e.length - 1];
-
+    state.pagination = pagination;
     getLogList();
   }
 
diff --git a/pages/user/wallet/money.vue b/pages/user/wallet/money.vue
index 476a7f67..bfec2386 100644
--- a/pages/user/wallet/money.vue
+++ b/pages/user/wallet/money.vue
@@ -161,7 +161,7 @@
   function onChangeTime(e) {
     state.date[0] = e[0];
     state.date[1] = e[e.length - 1];
-
+    state.pagination = pagination;
     getLogList();
   }
 
diff --git a/pages/user/wallet/score.vue b/pages/user/wallet/score.vue
index 38ddd3df..7c0dbab6 100644
--- a/pages/user/wallet/score.vue
+++ b/pages/user/wallet/score.vue
@@ -163,7 +163,7 @@
   function onChangeTime(e) {
     state.date[0] = e[0];
     state.date[1] = e[e.length - 1];
-
+    state.pagination = pagination;
     getLogList();
   }
 

From 5fa43dfb5bffd03fe9383421978a3d5df855cc27 Mon Sep 17 00:00:00 2001
From: kele <1184860403@qq.com>
Date: Tue, 17 Jan 2023 15:31:19 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/detail.vue | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index f462baf8..8f2e1599 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -213,6 +213,20 @@
           @tap="onComment(state.orderInfo.order_sn)"
           >评价晒单</button
         >
+        <button
+          v-if="state.orderInfo.btns?.includes('invoice')"
+          class="ss-reset-button cancel-btn"
+          @tap.stop="onOrderInvoice(state.orderInfo.invoice?.id)"
+        >
+          查看发票
+        </button>
+        <button
+          v-if="state.orderInfo.btns?.includes('re_apply_refund')"
+          class="ss-reset-button cancel-btn"
+          @tap.stop="onRefund(state.orderInfo.id)"
+        >
+          重新退款
+        </button>
       </view>
     </su-fixed>
   </s-layout>
@@ -224,6 +238,7 @@
   import { computed, reactive } from 'vue';
 
   const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+  const headerBg = sheep.$url.css('/assets/addons/shopro/frontend_img/order/order_bg.png');
   const state = reactive({
     orderInfo: {},
   });
@@ -298,6 +313,13 @@
     }
   }
 
+  // 查看发票
+  function onOrderInvoice(invoiceId) {
+    sheep.$router.go('/pages/order/invoice', {
+      invoiceId,
+    });
+  }
+
   // 评价
   function onComment(orderSN) {
     uni.$once('SELECT_INVOICE', (e) => {
@@ -337,7 +359,7 @@
   .state-box {
     color: rgba(#fff, 0.9);
     width: 100%;
-    background: v-bind("sheep.$url.css('/static/img/shop/order/order_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%;
     box-sizing: border-box;

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 4/5] =?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 7c90c0c1..3f6cc77e 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 145ae90a..d0052a15 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 854817ae..82ec97ad 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 a2701cb7..20559713 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 fca50ef1..b1f78f91 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 40f02a80..cb6b5319 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 c7748c13..99b8b8d4 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 5f0ca1ac..15b3072f 100644
--- a/pages/goods/components/detail/detail-activity-tip.vue
+++ b/pages/goods/components/detail/detail-activity-tip.vue
@@ -32,6 +32,10 @@
 <script setup>
   import { ref, reactive } from 'vue';
   import sheep from '@/sheep';
+
+  const seckillBg = sheep.$url.css('/assets/addons/shopro/frontend_img/goods/seckill-tip-bg.png');
+  const grouponBg = sheep.$url.css('/assets/addons/shopro/frontend_img/goods/groupon-tip-bg.png');
+
   const props = defineProps({
     data: {
       type: Object,
@@ -81,12 +85,12 @@
 
   //秒杀卡片
   .seckill-box {
-    background: v-bind("sheep.$url.css('/static/img/shop/goods/seckill-tip-bg.png')") no-repeat;
+    background: v-bind(seckillBg) no-repeat;
     background-size: 100% 100%;
   }
 
   .groupon-box {
-    background: v-bind("sheep.$url.css('/static/img/shop/goods/groupon-tip-bg.png')") no-repeat;
+    background: v-bind(grouponBg) no-repeat;
     background-size: 100% 100%;
   }
 </style>
diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue
index 041f7362..eacd7ec1 100644
--- a/pages/goods/groupon.vue
+++ b/pages/goods/groupon.vue
@@ -189,6 +189,15 @@
   import grouponCardList from './components/groupon/groupon-card-list.vue';
   import { useDurationTime, formatPrice, formatGoodsSwiper } from '@/sheep/hooks/useGoods';
 
+
+  const headerBg = sheep.$url.css('/assets/addons/shopro/frontend_img/goods/groupon-bg.png');
+  const btnBg = sheep.$url.css('/assets/addons/shopro/frontend_img/goods/groupon-btn.png');
+  const disabledBtnBg = sheep.$url.css(
+    '/assets/addons/shopro/frontend_img/goods/activity-btn-disabled.png',
+  );
+  const seckillBg = sheep.$url.css('/assets/addons/shopro/frontend_img/goods/seckill-tip-bg.png');
+  const grouponBg = sheep.$url.css('/assets/addons/shopro/frontend_img/goods/groupon-tip-bg.png');
+
   onPageScroll(() => {});
   const state = reactive({
     skeletonLoading: true,  // 骨架屏
@@ -337,7 +346,7 @@
     // height: 320rpx;
     background-size: 100% 100%;
     border-radius: 10rpx;
-    background-image: v-bind("sheep.$url.css('/static/img/shop/goods/groupon-bg.png')");
+    background-image: v-bind(headerBg);
     background-repeat: no-repeat;
 
     .price-box {
@@ -461,7 +470,7 @@
       font-size: 24rpx;
       font-weight: 600;
       margin-left: -36rpx;
-      background-image: v-bind("sheep.$url.css('/static/img/shop/goods/groupon-btn.png')");
+      background-image: v-bind(btnBg);
       background-repeat: no-repeat;
       background-size: 100% 100%;
       color: #ffffff;
@@ -474,9 +483,7 @@
       font-size: 24rpx;
       font-weight: 600;
       margin-left: -36rpx;
-      background-image: v-bind(
-        "sheep.$url.css('/static/img/shop/goods/activity-btn-disabled.png')"
-      );
+      background-image: v-bind(disabledBtnBg);
       background-repeat: no-repeat;
       background-size: 100% 100%;
       color: #999999;
@@ -523,12 +530,14 @@
 
   //秒杀卡片
   .seckill-box {
-    background: v-bind("sheep.$url.css('/static/img/shop/goods/seckill-tip-bg.png')") no-repeat;
+    background: v-bind(seckillBg)
+      no-repeat;
     background-size: 100% 100%;
   }
 
   .groupon-box {
-    background: v-bind("sheep.$url.css('/static/img/shop/goods/groupon-tip-bg.png')") no-repeat;
+    background: v-bind(grouponBg)
+      no-repeat;
     background-size: 100% 100%;
   }
 
diff --git a/pages/goods/score.vue b/pages/goods/score.vue
index 3ae23aad..37aafcaf 100644
--- a/pages/goods/score.vue
+++ b/pages/goods/score.vue
@@ -90,9 +90,7 @@
             </button>
           </view>
           <view class="buy-box ss-flex ss-col-center ss-p-r-20" v-else>
-            <button class="ss-reset-button disabled-btn" disabled>
-              已兑完
-            </button>
+            <button class="ss-reset-button disabled-btn" disabled> 已兑完 </button>
           </view>
         </detail-tabbar>
       </block>
@@ -115,6 +113,10 @@
   import detailCommentCard from './components/detail/detail-comment-card.vue';
   import detailContentCard from './components/detail/detail-content-card.vue';
 
+  const headerBg = sheep.$url.css('/assets/addons/shopro/frontend_img/goods/score-bg.png');
+  const seckillBg = sheep.$url.css('/assets/addons/shopro/frontend_img/goods/seckill-tip-bg.png');
+  const grouponBg = sheep.$url.css('/assets/addons/shopro/frontend_img/goods/seckill-tip-bg.png');
+
   onPageScroll(() => {});
 
   const state = reactive({
@@ -209,7 +211,7 @@
     box-sizing: border-box;
     background-size: 100% 100%;
     border-radius: 10rpx;
-    background-image: v-bind("sheep.$url.css('/static/img/shop/goods/score-bg.png')");
+    background-image: v-bind(headerBg);
     background-repeat: no-repeat;
     .price-box {
       .score-img {
@@ -306,12 +308,12 @@
 
   //秒杀卡片
   .seckill-box {
-    background: v-bind("sheep.$url.css('/static/img/shop/goods/seckill-tip-bg.png')") no-repeat;
+    background: v-bind(seckillBg) no-repeat;
     background-size: 100% 100%;
   }
 
   .groupon-box {
-    background: v-bind("sheep.$url.css('/static/img/shop/goods/groupon-tip-bg.png')") no-repeat;
+    background: v-bind(grouponBg) no-repeat;
     background-size: 100% 100%;
   }
 
diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue
index 56024220..79592b4a 100644
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@@ -6,7 +6,7 @@
     <detailSkeleton v-if="state.skeletonLoading" />
     <!-- 空置页 -->
     <s-empty
-      v-else-if="state.goodsInfo === null || state.goodsInfo.activity_type !== 'seckill' "
+      v-else-if="state.goodsInfo === null || state.goodsInfo.activity_type !== 'seckill'"
       text="活动不存在或已结束"
       icon="/static/soldout-empty.png"
       showAction
@@ -153,6 +153,14 @@
   import detailContentCard from './components/detail/detail-content-card.vue';
   import detailProgress from './components/detail/detail-progress.vue';
 
+  const headerBg = sheep.$url.css('/assets/addons/shopro/frontend_img/goods/seckill-bg.png');
+  const btnBg = sheep.$url.css('/assets/addons/shopro/frontend_img/goods/seckill-btn.png');
+  const disabledBtnBg = sheep.$url.css(
+    '/assets/addons/shopro/frontend_img/goods/activity-btn-disabled.png',
+  );
+  const seckillBg = sheep.$url.css('/assets/addons/shopro/frontend_img/goods/seckill-tip-bg.png');
+  const grouponBg = sheep.$url.css('/assets/addons/shopro/frontend_img/goods/groupon-tip-bg.png');
+
   onPageScroll(() => {});
   const state = reactive({
     goodsId: 0,
@@ -267,7 +275,7 @@
     // height: 320rpx;
     background-size: 100% 100%;
     border-radius: 10rpx;
-    background-image: v-bind("sheep.$url.css('/static/img/shop/goods/seckill-bg.png')");
+    background-image: v-bind(headerBg);
     background-repeat: no-repeat;
 
     .price-box {
@@ -415,7 +423,7 @@
       font-size: 24rpx;
       font-weight: 600;
       margin-left: -36rpx;
-      background-image: v-bind("sheep.$url.css('/static/img/shop/goods/seckill-btn.png')");
+      background-image: v-bind(btnBg);
       background-repeat: no-repeat;
       background-size: 100% 100%;
       color: #ffffff;
@@ -429,9 +437,7 @@
       font-size: 24rpx;
       font-weight: 600;
       margin-left: -36rpx;
-      background-image: v-bind(
-        "sheep.$url.css('/static/img/shop/goods/activity-btn-disabled.png')"
-      );
+      background-image: v-bind(disabledBtnBg);
       background-repeat: no-repeat;
       background-size: 100% 100%;
       color: #999999;
@@ -467,12 +473,12 @@
 
   //秒杀卡片
   .seckill-box {
-    background: v-bind("sheep.$url.css('/static/img/shop/goods/seckill-tip-bg.png')") no-repeat;
+    background: v-bind(seckillBg) no-repeat;
     background-size: 100% 100%;
   }
 
   .groupon-box {
-    background: v-bind("sheep.$url.css('/static/img/shop/goods/groupon-tip-bg.png')") no-repeat;
+    background: v-bind(grouponBg) no-repeat;
     background-size: 100% 100%;
   }
 
diff --git a/pages/order/aftersale/detail.vue b/pages/order/aftersale/detail.vue
index 7571cb5c..dd431764 100644
--- a/pages/order/aftersale/detail.vue
+++ b/pages/order/aftersale/detail.vue
@@ -207,7 +207,8 @@
   .steps-box {
     width: 100%;
     height: 190rpx;
-    background: v-bind("sheep.$url.css('/static/img/shop/order/order_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%;
     padding-left: 72rpx;
diff --git a/pages/order/invoice.vue b/pages/order/invoice.vue
index 551f7d25..62c253af 100644
--- a/pages/order/invoice.vue
+++ b/pages/order/invoice.vue
@@ -126,6 +126,7 @@
   import { computed, reactive } from 'vue';
 
   const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+  const headerBg = sheep.$url.css('/assets/addons/shopro/frontend_img/order/invoice_bg.png');
   const state = reactive({
     info: [
       {
@@ -192,7 +193,7 @@
   .invoice-heard {
     width: 100%;
     box-sizing: border-box;
-    background: v-bind("sheep.$url.css('/static/img/shop/order/invoice_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%;
     .sicon-warning-line {
diff --git a/pages/pay/recharge.vue b/pages/pay/recharge.vue
index c0aebe3d..03b1a98f 100644
--- a/pages/pay/recharge.vue
+++ b/pages/pay/recharge.vue
@@ -63,6 +63,7 @@
 
   const userInfo = computed(() => sheep.$store('user').userInfo);
   const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+  const headerBg = sheep.$url.css('/assets/addons/shopro/frontend_img/user/withdraw_bg.png');
 
   const state = reactive({
     recharge_money: '',
@@ -109,8 +110,7 @@
 
   .wallet-num-box {
     padding: 0 40rpx 80rpx;
-    background: var(--ui-BG-Main) v-bind("sheep.$url.css('/static/img/shop/user/withdraw_bg.png')")
-      center/750rpx 100% no-repeat;
+    background: var(--ui-BG-Main) v-bind(headerBg) center/750rpx 100% no-repeat;
     border-radius: 0 0 5% 5%;
 
     .num-title {
diff --git a/pages/pay/withdraw.vue b/pages/pay/withdraw.vue
index d3b99fd8..d75ca5eb 100644
--- a/pages/pay/withdraw.vue
+++ b/pages/pay/withdraw.vue
@@ -88,6 +88,7 @@
   import accountTypeSelect from './components/account-type-select.vue';
   import accountInfoModal from './components/account-info-modal.vue';
   import { onPageScroll } from '@dcloudio/uni-app';
+  const headerBg = sheep.$url.css('/assets/addons/shopro/frontend_img/user/withdraw_bg.png');
   onPageScroll(() => {});
   const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
   function filterRules(rules) {
@@ -212,8 +213,7 @@
 
   .wallet-num-box {
     padding: 0 40rpx 80rpx;
-    background: var(--ui-BG-Main) v-bind("sheep.$url.css('/static/img/shop/user/withdraw_bg.png')")
-      center/750rpx 100% no-repeat;
+    background: var(--ui-BG-Main) v-bind(headerBg) center/750rpx 100% no-repeat;
     border-radius: 0 0 5% 5%;
 
     .num-title {
diff --git a/pages/user/wallet/commission.vue b/pages/user/wallet/commission.vue
index 3e78a1ce..8a7891b4 100644
--- a/pages/user/wallet/commission.vue
+++ b/pages/user/wallet/commission.vue
@@ -140,6 +140,8 @@
   import dayjs from 'dayjs';
   import _ from 'lodash';
 
+  const headerBg = sheep.$url.css('/assets/addons/shopro/frontend_img/user/wallet_card_bg.png');
+
   // 数据
   const pagination = {
     data: [],
@@ -289,7 +291,7 @@
         position: absolute;
         top: 0;
         left: 0;
-        background: v-bind("sheep.$url.css('/static/img/shop/user/wallet_card_bg.png')") no-repeat;
+        background: v-bind(headerBg) no-repeat;
         pointer-events: none;
       }
 
diff --git a/pages/user/wallet/money.vue b/pages/user/wallet/money.vue
index bfec2386..9ef53e92 100644
--- a/pages/user/wallet/money.vue
+++ b/pages/user/wallet/money.vue
@@ -81,6 +81,8 @@
   import dayjs from 'dayjs';
   import _ from 'lodash';
 
+  const headerBg = sheep.$url.css('/assets/addons/shopro/frontend_img/user/wallet_card_bg.png');
+
   const pagination = {
     data: [],
     current_page: 1,
@@ -202,7 +204,8 @@
         position: absolute;
         top: 0;
         left: 0;
-        background: v-bind("sheep.$url.css('/static/img/shop/user/wallet_card_bg.png')") no-repeat;
+        background: v-bind(headerBg)
+          no-repeat;
         pointer-events: none;
       }
 
diff --git a/sheep/components/s-empty/s-empty.vue b/sheep/components/s-empty/s-empty.vue
index 647d3af1..27f8c4a8 100644
--- a/sheep/components/s-empty/s-empty.vue
+++ b/sheep/components/s-empty/s-empty.vue
@@ -84,10 +84,10 @@
   .empty-btn {
     width: 320rpx;
     height: 70rpx;
-    border: 2rpx solid v-bind('props.buttonColor');
+    border: 2rpx solid v-bind('buttonColor');
     border-radius: 35rpx;
     font-weight: 500;
-    color: v-bind('props.buttonColor');
+    color: v-bind('buttonColor');
     font-size: 28rpx;
   }
 </style>
diff --git a/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue b/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
index fb202a4e..ba3488c9 100644
--- a/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
+++ b/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
@@ -128,6 +128,7 @@
   import { formatPrice } from '@/sheep/hooks/useGoods';
   import { isEmpty } from 'lodash';
 
+  const headerBg = sheep.$url.css('/assets/addons/shopro/frontend_img/goods/groupon-btn-long.png');
   const emits = defineEmits(['change', 'addCart', 'buy', 'close', 'ladder']);
   const props = defineProps({
     show: {
@@ -403,7 +404,7 @@
     font-size: 24rpx;
     font-weight: 600;
     margin-left: -50rpx;
-    background-image: v-bind("sheep.$url.css('/static/img/shop/goods/groupon-btn-long.png')");
+    background-image: v-bind(headerBg);
     background-repeat: no-repeat;
     background-size: 100% 100%;
     color: #ffffff;
diff --git a/sheep/ui/su-coupon/su-coupon.vue b/sheep/ui/su-coupon/su-coupon.vue
index 1be28a73..a48d1583 100644
--- a/sheep/ui/su-coupon/su-coupon.vue
+++ b/sheep/ui/su-coupon/su-coupon.vue
@@ -182,18 +182,18 @@
       font-size: 50rpx;
       line-height: 50rpx;
       font-weight: bold;
-      color: v-bind('props.textColor');
+      color: v-bind('textColor');
       vertical-align: text-bottom;
     }
 
     .value-unit {
-      color: v-bind('props.textColor');
+      color: v-bind('textColor');
       font-size: 24rpx;
       line-height: 30rpx;
     }
 
     .title-text {
-      color: v-bind('props.textColor');
+      color: v-bind('textColor');
       font-size: 24rpx;
       line-height: 30rpx;
       width: 150rpx;
@@ -205,10 +205,10 @@
       height: 50rpx;
       border-radius: 25rpx;
       border-style: solid;
-      border-color: v-bind('props.btnTextColor');
+      border-color: v-bind('btnTextColor');
       border-width: 1px;
-      color: v-bind('props.btnTextColor');
-      background-color: v-bind('props.btnBg');
+      color: v-bind('btnTextColor');
+      background-color: v-bind('btnBg');
       font-size: 24rpx;
       line-height: 50rpx;
     }
@@ -231,19 +231,19 @@
       font-size: 36rpx;
       line-height: 36rpx;
       font-weight: bold;
-      color: v-bind('props.textColor');
+      color: v-bind('textColor');
       vertical-align: text-bottom;
     }
 
     .value-unit {
-      color: v-bind('props.textColor');
+      color: v-bind('textColor');
       font-size: 22rpx;
       line-height: 22rpx;
     }
 
     .title-text,
     .surplus-text {
-      color: v-bind('props.textColor');
+      color: v-bind('textColor');
       font-size: 22rpx;
       line-height: 22rpx;
     }
@@ -253,7 +253,7 @@
       height: 100%;
 
       .btn-text {
-        color: v-bind('props.btnTextColor');
+        color: v-bind('btnTextColor');
         font-size: 24rpx;
         text-align: center;
         writing-mode: vertical-lr;
@@ -278,12 +278,12 @@
       font-size: 50rpx;
       line-height: 50rpx;
       font-weight: bold;
-      color: v-bind('props.textColor');
+      color: v-bind('textColor');
       vertical-align: text-bottom;
     }
 
     .value-unit {
-      color: v-bind('props.textColor');
+      color: v-bind('textColor');
       font-size: 22rpx;
       line-height: 22rpx;
     }
@@ -291,7 +291,7 @@
     .title-text,
     .sellby-text,
     .surplus-text {
-      color: v-bind('props.textColor');
+      color: v-bind('textColor');
       font-size: 22rpx;
       line-height: 22rpx;
     }
@@ -303,10 +303,10 @@
         height: 50rpx;
         border-radius: 25rpx;
         border-style: solid;
-        border-color: v-bind('props.btnTextColor');
+        border-color: v-bind('btnTextColor');
         border-width: 1px;
-        color: v-bind('props.btnTextColor');
-        background-color: v-bind('props.btnBg');
+        color: v-bind('btnTextColor');
+        background-color: v-bind('btnBg');
         font-size: 24rpx;
         line-height: 50rpx;
       }
diff --git a/sheep/ui/su-popup/su-popup.vue b/sheep/ui/su-popup/su-popup.vue
index bf580f46..49b81cd4 100644
--- a/sheep/ui/su-popup/su-popup.vue
+++ b/sheep/ui/su-popup/su-popup.vue
@@ -340,6 +340,7 @@
       // TODO 解决头条冒泡的问题
       this.clearPropagation = false;
       this.maskClass.backgroundColor = this.maskBackgroundColor;
+      const headerBg = sheep.$url.css(this.backgroundImage);
     },
     methods: {
       setH5Visible() {
@@ -556,7 +557,7 @@
       display: block;
       /* #endif */
       position: relative;
-      background: v-bind('sheep.$url.css(backgroundImage)') no-repeat;
+      background: v-bind(headerBg) no-repeat;
       background-size: 100% 100%;
 
       /* iphonex 等安全区设置，底部安全区适配 */

From 7a85bc19b242f8757ceec16d48b6636a9cb11a8c Mon Sep 17 00:00:00 2001
From: kele <1184860403@qq.com>
Date: Tue, 17 Jan 2023 16:55:13 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E6=8A=A5=E8=AD=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/commission/components/commission-condition.vue | 2 +-
 sheep/ui/su-popup/su-popup.vue                       | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pages/commission/components/commission-condition.vue b/pages/commission/components/commission-condition.vue
index cd316dda..f8ef2db2 100644
--- a/pages/commission/components/commission-condition.vue
+++ b/pages/commission/components/commission-condition.vue
@@ -4,7 +4,7 @@
     type="bottom"
     round="10"
     :isMaskClick="false"
-    :backgroundImage="sheep.$url.static('/static/img/shop/commission/become-agent.png')"
+    :backgroundImage="sheep.$url.css('/static/img/shop/commission/become-agent.png')"
     @close="show = false"
     backgroundColor="var(--ui-BG-Main)"
   >
diff --git a/sheep/ui/su-popup/su-popup.vue b/sheep/ui/su-popup/su-popup.vue
index 49b81cd4..b55b0074 100644
--- a/sheep/ui/su-popup/su-popup.vue
+++ b/sheep/ui/su-popup/su-popup.vue
@@ -340,7 +340,6 @@
       // TODO 解决头条冒泡的问题
       this.clearPropagation = false;
       this.maskClass.backgroundColor = this.maskBackgroundColor;
-      const headerBg = sheep.$url.css(this.backgroundImage);
     },
     methods: {
       setH5Visible() {
@@ -557,7 +556,7 @@
       display: block;
       /* #endif */
       position: relative;
-      background: v-bind(headerBg) no-repeat;
+      background: v-bind(backgroundImage) no-repeat;
       background-size: 100% 100%;
 
       /* iphonex 等安全区设置，底部安全区适配 */