Browse Source

修改了收藏时加身价的接口,修改了一些静态图片为我们的服务器

RuHu.Xu 11 months ago
parent
commit
d282f7fd92
100 changed files with 93 additions and 98 deletions
  1. 1 1
      pages/activity/groupon/detail.vue
  2. 1 1
      pages/app/sign.vue
  3. 6 6
      pages/chat/index.vue
  4. 1 1
      pages/commission/components/commission-auth.vue
  5. 2 2
      pages/commission/components/commission-log.vue
  6. 9 9
      pages/commission/components/commission-menu.vue
  7. 1 1
      pages/coupon/detail.vue
  8. 4 4
      pages/goods/components/detail/detail-activity-tip.vue
  9. 6 3
      pages/goods/components/detail/detail-navbar.vue
  10. 0 7
      pages/goods/components/detail/detail-tabbar.vue
  11. 5 5
      pages/goods/groupon.vue
  12. 0 13
      pages/order/confirm.vue
  13. 5 5
      pages/order/detail.vue
  14. 1 1
      pages/order/otherlist.vue
  15. 3 3
      pages/pay/result.vue
  16. 3 3
      pages/user/info.vue
  17. 1 1
      pages/user/wallet/team.vue
  18. 10 0
      sheep/api/product/favorite.js
  19. 1 1
      sheep/components/s-address-item/s-address-item.vue
  20. 3 3
      sheep/components/s-auth-modal/s-auth-modal.vue
  21. 4 4
      sheep/components/s-coupon-card/s-coupon-card.vue
  22. 3 3
      sheep/components/s-live-card/s-live-card.vue
  23. 7 7
      sheep/components/s-menu-tools/s-menu-tools.vue
  24. 5 5
      sheep/components/s-order-card/s-order-card.vue
  25. 2 2
      sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
  26. 1 1
      sheep/components/s-share-modal/canvas-poster/poster/user.js
  27. 4 4
      sheep/components/s-share-modal/s-share-modal.vue
  28. 1 1
      sheep/components/s-uploader/s-uploader.vue
  29. 2 1
      sheep/components/s-user-card/s-user-card.vue
  30. 1 0
      sheep/url/index.js
  31. BIN
      static/images/WechatMiniProgram.png
  32. BIN
      static/images/WechatOfficialAccount.png
  33. BIN
      static/images/activity-btn-disabled.png
  34. BIN
      static/images/all_coupon.png
  35. BIN
      static/images/all_order.png
  36. BIN
      static/images/apple.png
  37. BIN
      static/images/browse.png
  38. BIN
      static/images/cargo.png
  39. BIN
      static/images/cart.png
  40. BIN
      static/images/change_order.png
  41. BIN
      static/images/collect.png
  42. BIN
      static/images/collect_0.png
  43. BIN
      static/images/collect_1.gif
  44. BIN
      static/images/commission_icon1.png
  45. BIN
      static/images/commission_icon2.png
  46. BIN
      static/images/commission_icon3.png
  47. BIN
      static/images/commission_icon4.png
  48. BIN
      static/images/commission_icon5.png
  49. BIN
      static/images/commission_icon7.png
  50. BIN
      static/images/correct.png
  51. BIN
      static/images/coupon_icon.png
  52. BIN
      static/images/default.png
  53. BIN
      static/images/default_avatar.png
  54. BIN
      static/images/edit.png
  55. BIN
      static/images/ended.png
  56. BIN
      static/images/forbidden.png
  57. BIN
      static/images/goods.png
  58. BIN
      static/images/groupon-bg.png
  59. BIN
      static/images/groupon-btn-long.png
  60. BIN
      static/images/groupon-btn.png
  61. BIN
      static/images/groupon-icon.png
  62. BIN
      static/images/groupon-tag-white.png
  63. BIN
      static/images/groupon-tag.png
  64. BIN
      static/images/groupon-tip-bg (1).png
  65. BIN
      static/images/groupon-tip-bg.png
  66. BIN
      static/images/home.png
  67. BIN
      static/images/image.png
  68. BIN
      static/images/living.png
  69. BIN
      static/images/loading.png
  70. BIN
      static/images/no_comment.png
  71. BIN
      static/images/no_pay.png
  72. BIN
      static/images/no_take.png
  73. BIN
      static/images/notice.png
  74. BIN
      static/images/nouse_coupon.png
  75. BIN
      static/images/order.png
  76. BIN
      static/images/order_bg.png
  77. BIN
      static/images/order_close.png
  78. BIN
      static/images/order_express.png
  79. BIN
      static/images/order_loading.png
  80. BIN
      static/images/order_paty_fail.gif
  81. BIN
      static/images/order_pay_success.gif
  82. BIN
      static/images/order_success.png
  83. BIN
      static/images/out_coupon.png
  84. 0 0
      static/images/score1.svg
  85. BIN
      static/images/search (1).png
  86. BIN
      static/images/seckill-icon.png
  87. BIN
      static/images/seckill-tip-bg.png
  88. BIN
      static/images/service.png
  89. BIN
      static/images/share.png
  90. BIN
      static/images/share_guide.png
  91. BIN
      static/images/share_link.png
  92. BIN
      static/images/share_poster.png
  93. BIN
      static/images/share_wx.png
  94. BIN
      static/images/start.png
  95. BIN
      static/images/title1.png
  96. BIN
      static/images/title2.png
  97. BIN
      static/images/unknown.png
  98. BIN
      static/images/upload-camera.png
  99. BIN
      static/images/useend_coupon.png
  100. BIN
      static/images/user.png

+ 1 - 1
pages/activity/groupon/detail.vue

@@ -111,7 +111,7 @@
           <!-- 还有几个坑位 -->
           <view class="default-avatar ss-m-r-24 ss-m-b-20" v-for="item in state.remainNumber" :key="item">
             <image
-              :src="sheep.$url.static('/static/img/shop/avatar/unknown.png')"
+              :src="sheep.$url.static('/static/images/unknown.png')"
               class="avatar-img"
             ></image>
           </view>

+ 1 - 1
pages/app/sign.vue

@@ -43,7 +43,7 @@
 							<view v-if="item.isSign" class="is-sign ss-flex ss-row-center">
 								<view class="is-sign-num">{{ item.day < 10 ? '0' + item.day : item.day }}</view>
 								<image class="is-sign-image"
-									:src="sheep.$url.static('/static/img/shop/app/correct.png')">
+									:src="sheep.$url.static('/static/images/correct.png')">
 								</image>
 							</view>
 							<!-- 未签到日期 -->

+ 6 - 6
pages/chat/index.vue

@@ -71,7 +71,7 @@
               class="chat-avatar ss-m-r-24"
               :src="
                 sheep.$url.cdn(item?.sender?.avatar) ||
-                sheep.$url.static('/static/img/shop/chat/default.png')
+                sheep.$url.static('/static/images/default.png')
               "
               mode="aspectFill"
             ></image>
@@ -88,13 +88,13 @@
               <image
                 v-if="chatData.isSendSucces == -1"
                 class="loading"
-                :src="sheep.$url.static('/static/img/shop/chat/loading.png')"
+                :src="sheep.$url.static('/static/images/loading.png')"
                 mode="aspectFill"
               ></image>
               <!-- <image
                 v-if="chatData.isSendSucces == 1"
                 class="warning"
-                :src="sheep.$url.static('/static/img/shop/chat/warning.png')"
+                :src="sheep.$url.static('/static/images/warning.png')"
                 mode="aspectFill"
                 @click="onAgainSendMessage(item)"
               ></image> -->
@@ -246,7 +246,7 @@
               >
                 <image
                   class="icon"
-                  :src="sheep.$url.static('/static/img/shop/chat/image.png')"
+                  :src="sheep.$url.static('/static/images/image.png')"
                   mode="aspectFill"
                 ></image>
               </s-uploader>
@@ -255,7 +255,7 @@
             <view class="goods" @tap="onShowSelect('goods')">
               <image
                 class="icon"
-                :src="sheep.$url.static('/static/img/shop/chat/goods.png')"
+                :src="sheep.$url.static('/static/images/goods.png')"
                 mode="aspectFill"
               ></image>
               <view>商品</view>
@@ -263,7 +263,7 @@
             <view class="order" @tap="onShowSelect('order')">
               <image
                 class="icon"
-                :src="sheep.$url.static('/static/img/shop/chat/order.png')"
+                :src="sheep.$url.static('/static/images/order.png')"
                 mode="aspectFill"
               ></image>
               <view>订单</view>

+ 1 - 1
pages/commission/components/commission-auth.vue

@@ -12,7 +12,7 @@
       <view class="img-wrap">
         <image
           class="notice-img"
-          :src="sheep.$url.static('/static/img/shop/commission/forbidden.png')"
+          :src="sheep.$url.static('/static/images/forbidden.png')"
           mode="aspectFill"
         />
       </view>

+ 2 - 2
pages/commission/components/commission-log.vue

@@ -2,7 +2,7 @@
 <template>
 	<view class="distribution-log-wrap">
 		<view class="header-box">
-			<image class="header-bg" :src="sheep.$url.static('/static/img/shop/commission/title2.png')" />
+			<image class="header-bg" :src="sheep.$url.static('/static/images/title2.png')" />
 			<view class="ss-flex header-title">
 				<view class="title">实时动态</view>
 				<text class="cicon-forward" />
@@ -15,7 +15,7 @@
 					<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 class="log-img" :src="sheep.$url.static('/static/img/shop/avatar/notice.png')" mode="aspectFill" />
+								<image class="log-img" :src="sheep.$url.static('/static/images/notice.png')" mode="aspectFill" />
 							</view>
 							<view class="log-text ss-ellipsis-1">
                 {{ item.title }} {{ fen2yuan(item.price) }} 元

+ 9 - 9
pages/commission/components/commission-menu.vue

@@ -2,7 +2,7 @@
 <template>
 	<view class="menu-box ss-flex-col">
 		<view class="header-box">
-			<image class="header-bg" :src="sheep.$url.static('/static/img/shop/commission/title1.png')" />
+			<image class="header-bg" :src="sheep.$url.static('/static/images/title1.png')" />
 			<view class="ss-flex header-title">
 				<view class="title">功能专区</view>
 				<text class="cicon-forward"></text>
@@ -24,45 +24,45 @@
 
 	const state = reactive({
 		menuList: [{
-				img: '/static/img/shop/commission/commission_icon1.png',
+				img: '/static/images/commission_icon1.png',
 				title: '我的团队',
 				path: '/pages/commission/team',
 			},
 			{
-				img: '/static/img/shop/commission/commission_icon2.png',
+				img: '/static/images/commission_icon2.png',
 				title: '佣金明细',
 				path: '/pages/commission/wallet',
 			},
 			{
-				img: '/static/img/shop/commission/commission_icon3.png',
+				img: '/static/images/commission_icon3.png',
 				title: '分销订单',
 				path: '/pages/commission/order',
 			},
 			{
-				img: '/static/img/shop/commission/commission_icon4.png',
+				img: '/static/images/commission_icon4.png',
 				title: '推广商品',
 				path: '/pages/commission/goods',
 			},
 			// {
-			//   img: '/static/img/shop/commission/commission_icon5.png',
+			//   img: '/static/images/commission_icon5.png',
 			//   title: '我的资料',
 			//   path: '/pages/commission/apply',
 			//   isAgentFrom: true,
 			// },
 			// todo @非繁人:邀请海报需要登录后的个人数据
 			{
-				img: '/static/img/shop/commission/commission_icon7.png',
+				img: '/static/images/commission_icon7.png',
 				title: '邀请海报',
 				path: 'action:showShareModal',
 			},
       // TODO @非繁人:缺少 icon
       {
-				// img: '/static/img/shop/commission/commission_icon7.png',
+				// img: '/static/images/commission_icon7.png',
 				title: '推广排行',
 				path: '/pages/commission/promoter',
 			},
       {
-				// img: '/static/img/shop/commission/commission_icon7.png',
+				// img: '/static/images/commission_icon7.png',
 				title: '佣金排行',
 				path: '/pages/commission/commission-ranking',
 			}

+ 1 - 1
pages/coupon/detail.vue

@@ -8,7 +8,7 @@
           <view class="tag-box ss-flex ss-col-center ss-row-center">
             <image
               class="tag-image"
-              :src="sheep.$url.static('/static/img/shop/app/coupon_icon.png')"
+              :src="sheep.$url.static('/static/images/coupon_icon.png')"
               mode="aspectFit"
             />
           </view>

+ 4 - 4
pages/goods/components/detail/detail-activity-tip.vue

@@ -11,13 +11,13 @@
             <view class="ss-m-r-16">
               <image
                 v-if="activity.type === 1"
-                :src="sheep.$url.static('/static/img/shop/goods/seckill-icon.png')"
+                :src="sheep.$url.static('/static/images/seckill-icon.png')"
                 class="activity-icon"
               />
               <!-- TODO 非繁人:拼团 -->
               <image
                 v-else-if="activity.type === 3"
-                :src="sheep.$url.static('/static/img/shop/goods/groupon-icon.png')"
+                :src="sheep.$url.static('/static/images/groupon-icon.png')"
                 class="activity-icon"
               />
             </view>
@@ -34,8 +34,8 @@
   import sheep from '@/sheep';
 
   // TODO 非繁人:这里要迁移下;
-  const seckillBg = sheep.$url.css('/static/img/shop/goods/seckill-tip-bg.png');
-  const grouponBg = sheep.$url.css('/static/img/shop/goods/groupon-tip-bg.png');
+  const seckillBg = sheep.$url.css('/static/images/seckill-tip-bg.png');
+  const grouponBg = sheep.$url.css('/static/images/groupon-tip-bg.png');
 
   const props = defineProps({
     activityList: {

+ 6 - 3
pages/goods/components/detail/detail-navbar.vue

@@ -38,18 +38,18 @@
 							@tap="onFavorite">
 							<block v-if="modelValue.favorite">
 								<image class="item-icon"
-									:src="sheep.$url.static('/static/img/shop/goods/collect_1.gif')" mode="aspectFit" />
+									:src="sheep.$url.static('/static/images/collect_1.gif')" mode="aspectFit" />
 								<!-- <view class="item-title">已收藏</view> -->
 							</block>
 							<block v-else>
 								<image class="item-icon"
-									:src="sheep.$url.static('/static/img/shop/goods/collect_0.png')" mode="aspectFit" />
+									:src="sheep.$url.static('/static/images/collect_0.png')" mode="aspectFit" />
 								<!-- <view class="item-title">收藏</view> -->
 							</block>
 						</view>
 						<view v-if="shareIcon" class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
 							@tap="showShareModal">
-							<image class="item-icon" :src="sheep.$url.static('/static/img/shop/goods/share.png')"
+							<image class="item-icon" :src="sheep.$url.static('/static/images/share.png')"
 								mode="aspectFit" />
 							<!-- <view class="item-title">分享</view> -->
 						</view>
@@ -188,9 +188,12 @@
 			props.modelValue.favorite = false;
 			// 情况二:添加收藏
 		} else {
+			// 收藏
 			const {
 				code
 			} = await FavoriteApi.createFavorite(props.modelValue.id);
+			// 调用收藏加身价的接口
+			await FavoriteApi.createCollectBefore(props.modelValue.id)
 			if (code !== 0) {
 				return
 			}

+ 0 - 7
pages/goods/components/detail/detail-tabbar.vue

@@ -28,13 +28,6 @@
 						mode="aspectFit" />
 					<view class="item-title">购物车</view>
 				</view>
-				
-				<!-- <view v-if="shareIcon" class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
-					@tap="showShareModal">
-					<image class="item-icon" :src="sheep.$url.static('/static/img/shop/goods/share.png')"
-						mode="aspectFit" />
-					<view class="item-title">分享</view>
-				</view> -->
 				<slot></slot>
 			</view>
 		</view>

+ 5 - 5
pages/goods/groupon.vue

@@ -39,7 +39,7 @@
                   <view class="tig-icon ss-flex ss-col-center ss-row-center">
                     <view class="groupon-tag">
                       <image
-                        :src="sheep.$url.static('/static/img/shop/goods/groupon-tag.png')"
+                        :src="sheep.$url.static('/static/images/groupon-tag.png')"
                       ></image>
                     </view>
                   </view>
@@ -153,12 +153,12 @@
   import CombinationApi from "@/sheep/api/promotion/combination";
   import SpuApi from "@/sheep/api/product/spu";
 
-  const headerBg = sheep.$url.css('/static/img/shop/goods/groupon-bg.png');
-  const btnBg = sheep.$url.css('/static/img/shop/goods/groupon-btn.png');
+  const headerBg = sheep.$url.css('/static/images/groupon-bg.png');
+  const btnBg = sheep.$url.css('/static/images/groupon-btn.png');
   const disabledBtnBg = sheep.$url.css(
-    '/static/img/shop/goods/activity-btn-disabled.png',
+    '/static/images/activity-btn-disabled.png',
   );
-  const grouponBg = sheep.$url.css('/static/img/shop/goods/groupon-tip-bg.png');
+  const grouponBg = sheep.$url.css('/static/images/groupon-tip-bg.png');
 
   onPageScroll(() => {});
   const state = reactive({

+ 0 - 13
pages/order/confirm.vue

@@ -66,19 +66,6 @@
 					</view>
 				</view>
 				<!-- TODO 非繁人:接入积分 -->
-				<!-- <view
-          class="order-item ss-flex ss-col-center ss-row-between"
-          v-if="state.orderPayload.order_type === 'score'"
-        >
-          <view class="item-title">扣除积分</view>
-          <view class="ss-flex ss-col-center">
-            <image
-              :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
-              class="score-img"
-            />
-            <text class="item-value ss-m-r-24">{{ state.orderInfo.score_amount }}</text>
-          </view>
-        </view> -->
 				<view class="order-item ss-flex ss-col-center ss-row-between">
 					<view class="item-title">运费</view>
 					<view class="ss-flex ss-col-center">

+ 5 - 5
pages/order/detail.vue

@@ -19,7 +19,7 @@
             state.orderInfo.status_code == 'nocomment'
           "
           class="state-img"
-          :src="sheep.$url.static('/static/img/shop/order/order_loading.png')"
+          :src="sheep.$url.static('/static/images/order_loading.png')"
         >
         </image>
         <image
@@ -28,19 +28,19 @@
             state.orderInfo.status_code == 'refund_agree'
           "
           class="state-img"
-          :src="sheep.$url.static('/static/img/shop/order/order_success.png')"
+          :src="sheep.$url.static('/static/images/order_success.png')"
         >
         </image>
         <image
           v-if="state.orderInfo.status_code == 'cancel' || state.orderInfo.status_code == 'closed'"
           class="state-img"
-          :src="sheep.$url.static('/static/img/shop/order/order_close.png')"
+          :src="sheep.$url.static('/static/images/order_close.png')"
         >
         </image>
         <image
           v-if="state.orderInfo.status_code == 'noget'"
           class="state-img"
-          :src="sheep.$url.static('/static/img/shop/order/order_express.png')"
+          :src="sheep.$url.static('/static/images/order_express.png')"
         >
         </image>
         <view class="ss-font-30">{{ formatOrderStatus(state.orderInfo) }}</view>
@@ -270,7 +270,7 @@
   import OrderApi from '@/sheep/api/trade/order';
 
   const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
-  const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png');
+  const headerBg = sheep.$url.css('/static/images/order_bg.png');
 
   const state = reactive({
     orderInfo: {},

+ 1 - 1
pages/order/otherlist.vue

@@ -102,7 +102,7 @@
             <view v-if="order.score_amount">+</view>
             <view class="discounts-money pay-color ss-flex ss-col-center" v-if="order.score_amount">
               <image
-                :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
+                :src="sheep.$url.static('/static/images/score1.svg')"
                 class="score-img"
               ></image>
               <view>{{ order.score_amount }}</view>

+ 3 - 3
pages/pay/result.vue

@@ -7,12 +7,12 @@
       <image
         class="pay-img ss-m-b-30"
         v-if="payResult === 'success'"
-        :src="sheep.$url.static('/static/img/shop/order/order_pay_success.gif')"
+        :src="sheep.$url.static('/static/images/order_pay_success.gif')"
       />
       <image
         class="pay-img ss-m-b-30"
         v-if="['failed', 'closed'].includes(payResult)"
-        :src="sheep.$url.static('/static/img/shop/order/order_paty_fail.gif')"
+        :src="sheep.$url.static('/static/images/order_paty_fail.gif')"
       />
       <view class="tip-text ss-m-b-30" v-if="payResult === 'success'">支付成功</view>
       <view class="tip-text ss-m-b-30" v-if="payResult === 'failed'">支付失败</view>
@@ -52,7 +52,7 @@
       <!-- TODO 非繁人:订阅 -->
       <!-- #ifdef MP -->
       <view class="subscribe-box ss-flex ss-m-t-44">
-        <image class="subscribe-img" :src="sheep.$url.static('/static/img/shop/order/cargo.png')" />
+        <image class="subscribe-img" :src="sheep.$url.static('/static/images/cargo.png')" />
         <view class="subscribe-title ss-m-r-48 ss-m-l-16">获取实时发货信息与订单状态</view>
         <view class="subscribe-start" @tap="subscribeMessage">立即订阅</view>
       </view>

+ 3 - 3
pages/user/info.vue

@@ -134,21 +134,21 @@
         <view v-if="'WechatOfficialAccount' === sheep.$platform.name" class="ss-flex ss-col-center">
           <image
             class="list-img"
-            :src="sheep.$url.static('/static/img/shop/platform/WechatOfficialAccount.png')"
+            :src="sheep.$url.static('/static/images/WechatOfficialAccount.png')"
           />
           <text class="list-name">微信公众号</text>
         </view>
         <view v-if="'WechatMiniProgram' === sheep.$platform.name" class="ss-flex ss-col-center">
           <image
             class="list-img"
-            :src="sheep.$url.static('/static/img/shop/platform/WechatMiniProgram.png')"
+            :src="sheep.$url.static('/static/images/WechatMiniProgram.png')"
           />
           <text class="list-name">微信小程序</text>
         </view>
         <view v-if="'App' === sheep.$platform.name" class="ss-flex ss-col-center">
           <image
             class="list-img"
-            :src="sheep.$url.static('/static/img/shop/platform/wechat.png')"
+            :src="sheep.$url.static('/static/images/wechat.png')"
           />
           <text class="list-name">微信开放平台</text>
         </view>

+ 1 - 1
pages/user/wallet/team.vue

@@ -50,7 +50,7 @@
 									<!-- 头像 -->
 									<view class="avatar-box ss-m-x-20">
 										<image class="avatar-img" :src="
-									   item.avatar || sheep.$url.static('/static/img/shop/default_avatar.png')" mode="aspectFill"></image>
+									   item.avatar || sheep.$url.static('/static/images/default_avatar.png')" mode="aspectFill"></image>
 									</view>
 									<view class="ss-flex ss-m-t-10"
 										style="flex-direction: column;align-items: flex-start;width: calc(100% - 5.5rem);">

+ 10 - 0
sheep/api/product/favorite.js

@@ -34,6 +34,16 @@ const FavoriteApi = {
       },
     });
   },
+  // 添加商品收藏时调用的加身价
+  createCollectBefore: (spuId) => {
+    return request({
+      url: '/distri/user-collect-before/create',
+      method: 'POST',
+      data: {
+        spuId,
+      }
+    });
+  },
   // 取消商品收藏
   deleteFavorite: (spuId) => {
     return request({

+ 1 - 1
sheep/components/s-address-item/s-address-item.vue

@@ -28,7 +28,7 @@
     <slot>
       <button class="ss-reset-button edit-btn" @tap.stop="onEdit">
         <view class="edit-icon ss-flex ss-row-center ss-col-center">
-          <image :src="sheep.$url.static('/static/img/shop/user/address/edit.png')" />
+          <image :src="sheep.$url.static('/static/images/edit.png')" />
         </view>
       </button>
     </slot>

+ 3 - 3
sheep/components/s-auth-modal/s-auth-modal.vue

@@ -45,7 +45,7 @@
 				<view class="wx-login-btn " @tap="thirdLogin('wechat')" v-if=" ['WechatOfficialAccount', 'WechatMiniProgram', 'App'].includes(sheep.$platform.name) && sheep.$platform.isWechatInstalled
 				">
 
-					<image class=" auto-login-img" :src="sheep.$url.static('/static/img/shop/platform/wechat.png')" />
+					<image class=" auto-login-img" :src="sheep.$url.static('/static/images/wechat.png')" />
 
 					<text>微信授权登录</text>
 				</view>
@@ -98,7 +98,7 @@
         >
           <image
             class="auto-login-img"
-            :src="sheep.$url.static('/static/img/shop/platform/wechat.png')"
+            :src="sheep.$url.static('/static/images/wechat.png')"
           />
         </button> -->
 
@@ -107,7 +107,7 @@
 				<!-- 7.3 iOS 登录 TODO 非繁人:等后面搞 App 再弄 -->
 				<button v-if="sheep.$platform.os === 'ios' && sheep.$platform.name === 'App'" @tap="thirdLogin('apple')"
 					class="ss-reset-button auto-login-btn">
-					<image class="auto-login-img" :src="sheep.$url.static('/static/img/shop/platform/apple.png')" />
+					<image class="auto-login-img" :src="sheep.$url.static('/static/images/apple.png')" />
 				</button>
 			</view>
 

+ 4 - 4
sheep/components/s-coupon-card/s-coupon-card.vue

@@ -24,28 +24,28 @@
 				return [{
 						title: '已领取',
 						value: '0',
-						icon: '/static/img/shop/order/nouse_coupon.png',
+						icon: '/static/images/nouse_coupon.png',
 						path: '/pages/coupon/list',
 						type: 'geted',
 					},
 					{
 						title: '已使用',
 						value: '0',
-						icon: '/static/img/shop/order/useend_coupon.png',
+						icon: '/static/images/useend_coupon.png',
 						path: '/pages/coupon/list',
 						type: 'used',
 					},
 					{
 						title: '已失效',
 						value: '0',
-						icon: '/static/img/shop/order/out_coupon.png',
+						icon: '/static/images/out_coupon.png',
 						path: '/pages/coupon/list',
 						type: 'expired',
 					},
 					{
 					  title: '领券中心',
 					  value: '0',
-					  icon: '/static/img/shop/order/all_coupon.png',
+					  icon: '/static/images/all_coupon.png',
 					  path: '/pages/coupon/list',
 					  type: 'all',
 					},

+ 3 - 3
sheep/components/s-live-card/s-live-card.vue

@@ -104,15 +104,15 @@
   const state = reactive({
     liveStatus: {
       101: {
-        img: sheep.$url.static('/static/img/shop/app/mplive/living.png'),
+        img: sheep.$url.static('/static/images/living.png'),
         title: '直播中',
       },
       102: {
-        img: sheep.$url.static('/static/img/shop/app/mplive/start.png'),
+        img: sheep.$url.static('/static/images/start.png'),
         title: '未开始',
       },
       103: {
-        img: sheep.$url.static('/static/img/shop/app/mplive/ended.png'),
+        img: sheep.$url.static('/static/images/ended.png'),
         title: '已结束',
       },
     },

+ 7 - 7
sheep/components/s-menu-tools/s-menu-tools.vue

@@ -36,37 +36,37 @@
   const list = [
     {
       url: '/pages/index/index',
-      icon: '/static/img/shop/tools/home.png',
+      icon: '/static/images/home.png',
       title: '首页',
     },
     {
       url: '/pages/index/search',
-      icon: '/static/img/shop/tools/search.png',
+      icon: '/static/images/search.png',
       title: '搜索',
     },
     {
       url: '/pages/index/user',
-      icon: '/static/img/shop/tools/user.png',
+      icon: '/static/images/user.png',
       title: '个人中心',
     },
     {
       url: '/pages/index/cart',
-      icon: '/static/img/shop/tools/cart.png',
+      icon: '/static/images/cart.png',
       title: '购物车',
     },
     {
       url: '/pages/user/goods-log',
-      icon: '/static/img/shop/tools/browse.png',
+      icon: '/static/images/browse.png',
       title: '浏览记录',
     },
     {
       url: '/pages/user/goods-collect',
-      icon: '/static/img/shop/tools/collect.png',
+      icon: '/static/images/collect.png',
       title: '我的收藏',
     },
     {
       url: '/pages/chat/index',
-      icon: '/static/img/shop/tools/service.png',
+      icon: '/static/images/service.png',
       title: '客服',
     },
   ];

+ 5 - 5
sheep/components/s-order-card/s-order-card.vue

@@ -31,7 +31,7 @@
     {
       title: '待付款',
       value: '1',
-      icon: '/static/img/shop/order/no_pay.png',
+      icon: '/static/images/no_pay.png',
       path: '/pages/order/list',
       type: 'unpaid',
       count: 'unpaidCount',
@@ -39,7 +39,7 @@
     {
       title: '待收货',
       value: '3',
-      icon: '/static/img/shop/order/no_take.png',
+      icon: '/static/images/no_take.png',
       path: '/pages/order/list',
       type: 'noget',
       count: 'deliveredCount',
@@ -47,7 +47,7 @@
     {
       title: '待评价',
       value: '4',
-      icon: '/static/img/shop/order/no_comment.png',
+      icon: '/static/images/no_comment.png',
       path: '/pages/order/list',
       type: 'nocomment',
       count: 'uncommentedCount',
@@ -55,7 +55,7 @@
     {
       title: '售后单',
       value: '0',
-      icon: '/static/img/shop/order/change_order.png',
+      icon: '/static/images/change_order.png',
       path: '/pages/order/aftersale/list',
       type: 'aftersale',
       count: 'afterSaleCount',
@@ -63,7 +63,7 @@
     {
       title: '全部订单',
       value: '0',
-      icon: '/static/img/shop/order/all_order.png',
+      icon: '/static/images/all_order.png',
       path: '/pages/order/list',
     },
   ];

+ 2 - 2
sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue

@@ -12,7 +12,7 @@
             <view class="tig ss-flex ss-col-center">
               <view class="tig-icon ss-flex ss-col-center ss-row-center">
                 <view class="groupon-tag">
-                  <image :src="sheep.$url.static('/static/img/shop/goods/groupon-tag-white.png')" />
+                  <image :src="sheep.$url.static('/static/images/groupon-tag-white.png')" />
                 </view>
               </view>
               <view class="tig-title">拼团价</view>
@@ -79,7 +79,7 @@
   import sheep from '@/sheep';
   import {convertProductPropertyList, fen2yuan} from '@/sheep/hooks/useGoods';
 
-  const headerBg = sheep.$url.css('/static/img/shop/goods/groupon-btn-long.png');
+  const headerBg = sheep.$url.css('/static/images/groupon-btn-long.png');
   const emits = defineEmits(['change', 'addCart', 'buy', 'close', 'ladder']);
   const props = defineProps({
     show: {

+ 1 - 1
sheep/components/s-share-modal/canvas-poster/poster/user.js

@@ -7,7 +7,7 @@ const user = (poster) => {
   console.log()
   return {
     background: window.location.origin + '/static/user-poster-bg.jpg',
-    // background: formatImageUrlProtocol(sheep.$url.static(sheep.$store('app').platform.share.posterInfo.user_bg)),
+    
     list: [
       {
         name: 'nickname',

+ 4 - 4
sheep/components/s-share-modal/s-share-modal.vue

@@ -3,7 +3,7 @@
 	<view>
 		<su-popup :show="state.showShareGuide" :showClose="false" @close="onCloseGuide" />
 		<view v-if="state.showShareGuide" class="guide-wrap">
-			<image class="guide-image" :src="sheep.$url.static('/static/img/shop/share/share_guide.png')" />
+			<image class="guide-image" :src="sheep.$url.static('/static/images/share_guide.png')" />
 		</view>
 
 		<su-popup :show="show" round="10" :showClose="false" @close="closeShareModal">
@@ -14,7 +14,7 @@
 					<button v-if="shareConfig.methods.includes('forward')"
 						class="share-item share-btn ss-flex-col ss-col-center" open-type="share"
 						@tap="onShareByForward">
-						<image class="share-img" :src="sheep.$url.static('/static/img/shop/share/share_wx.png')"
+						<image class="share-img" :src="sheep.$url.static('/static/images/share_wx.png')"
 							mode="" />
 						<text class="share-title">微信好友</text>
 					</button>
@@ -22,7 +22,7 @@
 					<!-- 操作 ②:生成海报图片 -->
 					<button v-if="shareConfig.methods.includes('poster')"
 						class="share-item share-btn ss-flex-col ss-col-center" @tap="onShareByPoster">
-						<image class="share-img" :src="sheep.$url.static('/static/img/shop/share/share_poster.png')"
+						<image class="share-img" :src="sheep.$url.static('/static/images/share_poster.png')"
 							mode="" />
 						<text class="share-title">生成海报</text>
 					</button>
@@ -30,7 +30,7 @@
 					<!-- 操作 ③:生成链接 -->
 					<!-- <button v-if="shareConfig.methods.includes('link')"
 						class="share-item share-btn ss-flex-col ss-col-center" @tap="onShareByCopyLink">
-						<image class="share-img" :src="sheep.$url.static('/static/img/shop/share/share_link.png')"
+						<image class="share-img" :src="sheep.$url.static('/static/images/share_link.png')"
 							mode="" />
 						<text class="share-title">复制链接</text>
 					</button> -->

+ 1 - 1
sheep/components/s-uploader/s-uploader.vue

@@ -205,7 +205,7 @@
       return {
         files: [],
         localValue: [],
-        imgsrc: sheep.$url.static('/static/img/shop/upload-camera.png'),
+        imgsrc: sheep.$url.static('/static/images/upload-camera.png'),
       };
     },
     watch: {

+ 2 - 1
sheep/components/s-user-card/s-user-card.vue

@@ -4,10 +4,11 @@
 		<view class="ss-flex ss-col-center ss-row-between ss-m-b-20">
 			<view class="left-box ss-flex ss-col-center ss-m-l-36">
 				<view class="avatar-box ss-m-r-24">
+					
 					<image class="avatar-img" :src="
               isLogin
                 ? sheep.$url.cdn(userInfo.avatar)
-                : sheep.$url.static('/static/img/shop/default_avatar.png')
+                : sheep.$url.static('/static/images/default_avatar.png')
             " mode="aspectFill" @tap="sheep.$router.go('/pages/user/info')"></image>
 				</view>
 				<view>

+ 1 - 0
sheep/url/index.js

@@ -27,6 +27,7 @@ export default {
     if (staticurl !== 'local') {
       url = cdn(url, staticurl);
     }
+	
     return url;
   },
   // css背景图片地址

BIN
static/images/WechatMiniProgram.png


BIN
static/images/WechatOfficialAccount.png


BIN
static/images/activity-btn-disabled.png


BIN
static/images/all_coupon.png


BIN
static/images/all_order.png


BIN
static/images/apple.png


BIN
static/images/browse.png


BIN
static/images/cargo.png


BIN
static/images/cart.png


BIN
static/images/change_order.png


BIN
static/images/collect.png


BIN
static/images/collect_0.png


BIN
static/images/collect_1.gif


BIN
static/images/commission_icon1.png


BIN
static/images/commission_icon2.png


BIN
static/images/commission_icon3.png


BIN
static/images/commission_icon4.png


BIN
static/images/commission_icon5.png


BIN
static/images/commission_icon7.png


BIN
static/images/correct.png


BIN
static/images/coupon_icon.png


BIN
static/images/default.png


BIN
static/images/default_avatar.png


BIN
static/images/edit.png


BIN
static/images/ended.png


BIN
static/images/forbidden.png


BIN
static/images/goods.png


BIN
static/images/groupon-bg.png


BIN
static/images/groupon-btn-long.png


BIN
static/images/groupon-btn.png


BIN
static/images/groupon-icon.png


BIN
static/images/groupon-tag-white.png


BIN
static/images/groupon-tag.png


BIN
static/images/groupon-tip-bg (1).png


BIN
static/images/groupon-tip-bg.png


BIN
static/images/home.png


BIN
static/images/image.png


BIN
static/images/living.png


BIN
static/images/loading.png


BIN
static/images/no_comment.png


BIN
static/images/no_pay.png


BIN
static/images/no_take.png


BIN
static/images/notice.png


BIN
static/images/nouse_coupon.png


BIN
static/images/order.png


BIN
static/images/order_bg.png


BIN
static/images/order_close.png


BIN
static/images/order_express.png


BIN
static/images/order_loading.png


BIN
static/images/order_paty_fail.gif


BIN
static/images/order_pay_success.gif


BIN
static/images/order_success.png


BIN
static/images/out_coupon.png


File diff suppressed because it is too large
+ 0 - 0
static/images/score1.svg


BIN
static/images/search (1).png


BIN
static/images/seckill-icon.png


BIN
static/images/seckill-tip-bg.png


BIN
static/images/service.png


BIN
static/images/share.png


BIN
static/images/share_guide.png


BIN
static/images/share_link.png


BIN
static/images/share_poster.png


BIN
static/images/share_wx.png


BIN
static/images/start.png


BIN
static/images/title1.png


BIN
static/images/title2.png


BIN
static/images/unknown.png


BIN
static/images/upload-camera.png


BIN
static/images/useend_coupon.png


BIN
static/images/user.png


Some files were not shown because too many files changed in this diff