Merge branch 'master' of https://gitee.com/sheepjs/shopro-uniapp

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%;

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 {

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 {

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;
 

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)"
   >

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 {

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"

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%;
     // 团队信息总览

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%;
     // 团队信息总览

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>

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%;
   }
 

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%;
   }
 

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%;
   }
 

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;

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;

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 {

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 {

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 {

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: [],
@@ -218,7 +220,7 @@
   function onChangeTime(e) {
     state.date[0] = e[0];
     state.date[1] = e[e.length - 1];
-
+    state.pagination = pagination;
     getLogList();
   }
 
@@ -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;
       }
 

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,
@@ -161,7 +163,7 @@
   function onChangeTime(e) {
     state.date[0] = e[0];
     state.date[1] = e[e.length - 1];
-
+    state.pagination = pagination;
     getLogList();
   }
 
@@ -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;
       }
 

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();
   }
 

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>

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;

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;
       }

sheep/ui/su-popup/su-popup.vue

@@ -556,7 +556,7 @@
       display: block;
       /* #endif */
       position: relative;
-      background: v-bind('sheep.$url.css(backgroundImage)') no-repeat;
+      background: v-bind(backgroundImage) no-repeat;
       background-size: 100% 100%;
 
       /* iphonex 等安全区设置，底部安全区适配 */