Browse Source

修改个人分享页和商品分享页

RuHu.Xu 11 months ago
parent
commit
49460d1f9f
100 changed files with 198 additions and 193 deletions
  1. 1 0
      pages/goods/index.vue
  2. 42 86
      pages/user/wallet/score.vue
  3. 12 7
      sheep/api/infra/file.js
  4. 6 5
      sheep/components/s-share-modal/canvas-poster/index.vue
  5. 39 21
      sheep/components/s-share-modal/canvas-poster/poster/goods.js
  6. 43 24
      sheep/components/s-share-modal/canvas-poster/poster/index.js
  7. 5 4
      sheep/components/s-share-modal/canvas-poster/poster/user.js
  8. 22 18
      sheep/components/s-share-modal/canvas-poster/useCanvas.js
  9. 4 4
      sheep/components/s-wallet-card/s-wallet-card.vue
  10. 1 1
      sheep/platform/share.js
  11. 2 2
      sheep/store/app.js
  12. BIN
      static/goods-poster-bg.jpg
  13. BIN
      static/user-poster-bg.jpg
  14. 1 1
      unpackage/dist/build/web/assets/address.8dffaaef.js
  15. 1 1
      unpackage/dist/build/web/assets/afterSale.eb682946.js
  16. 1 0
      unpackage/dist/build/web/assets/area.6376b5a4.js
  17. 0 1
      unpackage/dist/build/web/assets/area.f4e2f02d.js
  18. 0 0
      unpackage/dist/build/web/assets/bargain.9abb4b90.js
  19. 1 1
      unpackage/dist/build/web/assets/brokerage.f0ce6ec9.js
  20. 1 1
      unpackage/dist/build/web/assets/category.6c4f0bbb.js
  21. 1 1
      unpackage/dist/build/web/assets/combination.466625d6.js
  22. 0 0
      unpackage/dist/build/web/assets/comment-item.e156da97.js
  23. 0 1
      unpackage/dist/build/web/assets/config.89abba17.js
  24. 1 0
      unpackage/dist/build/web/assets/config.c0e71b0a.js
  25. 1 1
      unpackage/dist/build/web/assets/const.af58d68f.js
  26. 0 0
      unpackage/dist/build/web/assets/detail-content-card.e9dba58d.js
  27. 1 1
      unpackage/dist/build/web/assets/favorite.c4066b85.js
  28. 0 0
      unpackage/dist/build/web/assets/form.fd4cb395.js
  29. 1 1
      unpackage/dist/build/web/assets/history.17aa6d5a.js
  30. 0 0
      unpackage/dist/build/web/assets/index-2b1e33d4.css
  31. 0 0
      unpackage/dist/build/web/assets/index-d9239240.js
  32. 0 0
      unpackage/dist/build/web/assets/mp-html.d8fc4b91.js
  33. 0 0
      unpackage/dist/build/web/assets/pages-activity-bargain-detail.2c6dcaa6.js
  34. 0 0
      unpackage/dist/build/web/assets/pages-activity-bargain-list.5e9b1adf.js
  35. 0 0
      unpackage/dist/build/web/assets/pages-activity-groupon-detail.102458c7.js
  36. 0 0
      unpackage/dist/build/web/assets/pages-activity-groupon-list.8809ee0a.js
  37. 0 0
      unpackage/dist/build/web/assets/pages-activity-groupon-order.97dc7c8c.js
  38. 0 0
      unpackage/dist/build/web/assets/pages-activity-index.00e7010a.js
  39. 0 0
      unpackage/dist/build/web/assets/pages-activity-seckill-list.b17ef35a.js
  40. 0 0
      unpackage/dist/build/web/assets/pages-app-sign.76cc462b.js
  41. 0 0
      unpackage/dist/build/web/assets/pages-chat-index.53d34a92.js
  42. 0 0
      unpackage/dist/build/web/assets/pages-commission-commission-ranking.54fc7895.js
  43. 0 0
      unpackage/dist/build/web/assets/pages-commission-goods.a7d408f1.js
  44. 0 0
      unpackage/dist/build/web/assets/pages-commission-index.83267726.js
  45. 0 0
      unpackage/dist/build/web/assets/pages-commission-order.f8c8730b.js
  46. 0 0
      unpackage/dist/build/web/assets/pages-commission-promoter.463f9f7d.js
  47. 0 0
      unpackage/dist/build/web/assets/pages-commission-team.5b65c354.js
  48. 0 0
      unpackage/dist/build/web/assets/pages-commission-wallet.7941598f.js
  49. 0 0
      unpackage/dist/build/web/assets/pages-commission-withdraw.26e7716e.js
  50. 0 0
      unpackage/dist/build/web/assets/pages-coupon-detail.02952425.js
  51. 0 0
      unpackage/dist/build/web/assets/pages-coupon-list.b14b03ca.js
  52. 0 0
      unpackage/dist/build/web/assets/pages-goods-comment-add.60b89d76.js
  53. 0 0
      unpackage/dist/build/web/assets/pages-goods-comment-list.99eedacf.js
  54. 0 0
      unpackage/dist/build/web/assets/pages-goods-groupon.aa48242d.js
  55. 0 0
      unpackage/dist/build/web/assets/pages-goods-index.6e6f963a.js
  56. 0 0
      unpackage/dist/build/web/assets/pages-goods-list.66135d32.js
  57. 0 0
      unpackage/dist/build/web/assets/pages-goods-seckill.7f32a5c6.js
  58. 0 0
      unpackage/dist/build/web/assets/pages-index-cart.f416df4f.js
  59. 0 0
      unpackage/dist/build/web/assets/pages-index-category.a1ba568f.js
  60. 1 1
      unpackage/dist/build/web/assets/pages-index-index.49638735.js
  61. 0 0
      unpackage/dist/build/web/assets/pages-index-login.c7e166f6.js
  62. 1 1
      unpackage/dist/build/web/assets/pages-index-page.010109ec.js
  63. 1 1
      unpackage/dist/build/web/assets/pages-index-search.260d641c.js
  64. 1 1
      unpackage/dist/build/web/assets/pages-index-user.4ed25cd9.js
  65. 0 0
      unpackage/dist/build/web/assets/pages-order-aftersale-apply.462cb7b8.js
  66. 0 0
      unpackage/dist/build/web/assets/pages-order-aftersale-detail.59b339c3.js
  67. 0 0
      unpackage/dist/build/web/assets/pages-order-aftersale-list.ef321cf1.js
  68. 1 1
      unpackage/dist/build/web/assets/pages-order-aftersale-log.24f14402.js
  69. 0 0
      unpackage/dist/build/web/assets/pages-order-aftersale-return-delivery.2b433c5c.js
  70. 0 0
      unpackage/dist/build/web/assets/pages-order-confirm.b24fd408.js
  71. 0 0
      unpackage/dist/build/web/assets/pages-order-detail.67cb31be.js
  72. 0 0
      unpackage/dist/build/web/assets/pages-order-express-log.ae811fa9.js
  73. 0 0
      unpackage/dist/build/web/assets/pages-order-list.f7f0cb08.js
  74. 0 0
      unpackage/dist/build/web/assets/pages-order-otherlist.04c69a58.js
  75. 0 0
      unpackage/dist/build/web/assets/pages-pay-index.2683b670.js
  76. 0 0
      unpackage/dist/build/web/assets/pages-pay-recharge-log.6a11c179.js
  77. 0 0
      unpackage/dist/build/web/assets/pages-pay-recharge.35e15910.js
  78. 0 0
      unpackage/dist/build/web/assets/pages-pay-result.0a2b7e91.js
  79. 1 1
      unpackage/dist/build/web/assets/pages-public-error.74cc7539.js
  80. 1 1
      unpackage/dist/build/web/assets/pages-public-faq.50837fff.js
  81. 0 0
      unpackage/dist/build/web/assets/pages-public-setting.fed93ad1.js
  82. 1 1
      unpackage/dist/build/web/assets/pages-public-webview.b1aba11b.js
  83. 0 0
      unpackage/dist/build/web/assets/pages-shop-index.52c74672.js
  84. 0 0
      unpackage/dist/build/web/assets/pages-user-address-edit.3ae8ff97.js
  85. 0 0
      unpackage/dist/build/web/assets/pages-user-address-list.ce0e60de.js
  86. 0 0
      unpackage/dist/build/web/assets/pages-user-goods-collect.8a94b552.js
  87. 0 0
      unpackage/dist/build/web/assets/pages-user-goods-log.dd945953.js
  88. 0 0
      unpackage/dist/build/web/assets/pages-user-info.1824a04e.js
  89. 0 0
      unpackage/dist/build/web/assets/pages-user-invoice-edit.ce1e59b1.js
  90. 1 1
      unpackage/dist/build/web/assets/pages-user-invoice-list.a9050eff.js
  91. 0 0
      unpackage/dist/build/web/assets/pages-user-qrcode-share.780d8503.js
  92. 0 0
      unpackage/dist/build/web/assets/pages-user-qrcode-share.b8064bb4.js
  93. 0 0
      unpackage/dist/build/web/assets/pages-user-setting.9ee67fa7.js
  94. 0 0
      unpackage/dist/build/web/assets/pages-user-wallet-money.ab08e581.js
  95. 0 0
      unpackage/dist/build/web/assets/pages-user-wallet-score.220c66a4.js
  96. 0 0
      unpackage/dist/build/web/assets/pages-user-wallet-score.870a135b.js
  97. 0 0
      unpackage/dist/build/web/assets/pages-user-wallet-scoreToMoney.f310d48d.js
  98. 0 0
      unpackage/dist/build/web/assets/pages-user-wallet-team.d458866f.js
  99. 1 1
      unpackage/dist/build/web/assets/rewardActivity.765de964.js
  100. 1 1
      unpackage/dist/build/web/assets/richtext.e1731e9f.js

+ 1 - 0
pages/goods/index.vue

@@ -216,6 +216,7 @@
 		}, {
 			type: 'goods', // 商品海报
 			title: state.goodsInfo.name, // 商品标题
+			introduction:state.goodsInfo.introduction,
 			// image: sheep.$url.cdn(state.goodsInfo.image), // 商品主图
 			image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图
 			price: fen2yuan(state.goodsInfo.price), // 商品价格

+ 42 - 86
pages/user/wallet/score.vue

@@ -2,7 +2,7 @@
 <template>
 	<s-layout class="wallet-wrap" :bgStyle="{'backgroundColor':'#ffffff'}" title="我的积分" navbar="normal">
 		<view class="score-box bg-white ss-flex-col ss-row-center ss-col-center">
-			<view class="ss-m-b-40 value-box " @tap="state.showModel = true">
+			<view class="ss-m-b-40 value-box " @tap="showModel()">
 				<view class="all-title ss-m-r-8">#</view>
 			</view>
 			<view class="ss-m-b-40 ss-font-40">
@@ -11,7 +11,7 @@
 			<view class="ss-m-b-40 ss-font-32 text-center">
 				<view class="all-title ss-m-r-8 ss-m-b-10 ">
 					当前可兑换积分:#{{ points2point(userWallet.integralDO.currentQuota) }}</view>
-				<view class="all-title ss-m-r-8" style="color: var(--ui-BG-Main)" @tap="state.showQueModel = true">
+				<view class="all-title ss-m-r-8" style="color: var(--ui-BG-Main)" @tap="showQueModel()">
 					待确权积分:#{{points2point(userWallet.integralDO.freezeQuota)}}</view>
 			</view>
 			<view class="ss-m-b-80">
@@ -38,25 +38,17 @@
 		<su-popup :show="state.showModel" type="center" round="10" :isMaskClick="false" showClose @close="close">
 			<view class="model-box ss-flex-col">
 				<scroll-view class="list-box" style="width: 600rpx;" scroll-y="true" @touchmove.stop>
-					<view v-if="state.pagination.total > 0">
+					<view v-if="state.pagination.total > 0" style="padding: 20rpx 0;">
 						<view class="list-item ss-flex ss-col-center ss-row-between "
-							v-for="(item,index)  in state.pagination.list" :key="item.id" style="padding: 30rpx 0;">
+							v-for="(item,index)  in state.pagination.list" :key="item.id" style="padding:0;padding: 20rpx 0;border-bottom: 1px solid #c4c4c4;">
 							<view class="ss-flex ss-col-center" style="width: 100%;">
-								<view>
-									{{index+1}}
-								</view>
-								<!-- 头像 -->
-								<view class="avatar-box ss-m-x-20">
-									<image class="avatar-img" :src="
-									    sheep.$url.static('/static/img/shop/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);">
-									<view class="name" style="width: 100%;"> {{ item.name || '空' }} <text
-											style="float: right;">#{{item.point}}</text></view>
+									style="flex-direction: column;align-items: flex-start;width: 100%;">
+									<view class="name" style="width: 100%;"> {{ item.profitStatusName || '空' }} <text
+											style="float: right;" class="color-red" :class="{'color-green':item.amount < 0}">{{item.amount > 0 ? '+'+points2point(item.amount):+points2point(item.amount)}}</text></view>
 									<view class="time " style="width: 100%;">
 										{{sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM')}}
-										<text style="float: right;">消费额:¥234</text>
+										<text style="float: right;">余额:{{points2point(item.afterAmount)}}</text>
 									</view>
 								</view>
 							</view>
@@ -66,41 +58,28 @@
 				</scroll-view>
 			</view>
 		</su-popup>
-		{{state.pagination.list}}
+		
 		<!-- 积分确权 -->
 		<su-popup :show="state.showQueModel" type="center" round="10" :isMaskClick="false" showClose @close="close">
 			<view class="model-box ss-flex-col">
-				<view class="all-title ss-p-x-30 ss-p-t-30">
-					待确权积分 <text style="float: right;">共#{{points2point(userWallet.integralDO.freezeQuota)}}</text>
-				</view>
-				
 				<scroll-view class="list-box" style="width: 600rpx;" scroll-y="true" @touchmove.stop>
-					<view v-if="!(state.pagination.total > 0)">
+					<view v-if="state.pagination.total > 0" style="padding: 20rpx 0;">
 						<view class="list-item ss-flex ss-col-center ss-row-between "
-							v-for="(item,index)  in state.pagination.list" :key="item.id" style="padding: 30rpx 0;">
+							v-for="(item,index)  in state.pagination.list" :key="item.id" style="padding:0;padding: 20rpx 0;border-bottom: 1px solid #c4c4c4;">
 							<view class="ss-flex ss-col-center" style="width: 100%;">
-								<view>
-									{{index+1}}
-								</view>
-								<!-- 头像 -->
-								<view class="avatar-box ss-m-x-20">
-									<image class="avatar-img" :src="
-									    sheep.$url.static('/static/img/shop/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);">
-									<view class="name" style="width: 100%;"> {{ item.name || '空' }} <text
-											style="float: right;">#{{item.point}}</text></view>
+									style="flex-direction: column;align-items: flex-start;width: 100%;">
+									<view class="name" style="width: 100%;"> {{ item.profitStatusName || '空' }} <text
+											style="float: right;" class="color-red" :class="{'color-green':item.amount < 0}">{{item.amount > 0 ? '+'+points2point(item.amount):+points2point(item.amount)}}</text></view>
 									<view class="time " style="width: 100%;">
 										{{sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM')}}
-										<text style="float: right;">消费额:¥234</text>
+										<text style="float: right;">余额:{{points2point(item.afterAmount)}}</text>
 									</view>
 								</view>
 							</view>
 						</view>
 					</view>
-
-					<s-empty v-else text="暂无数据" paddingTop="80" icon="/static/data-empty.png" />
+					<s-empty v-else text="暂无数据" paddingTop="120" icon="/static/data-empty.png" />
 				</scroll-view>
 			</view>
 		</su-popup>
@@ -137,60 +116,30 @@
 	const state = reactive({
 		currentTab: 0,
 		pagination: {
-			"list": [{
-					"createTime": 1713607898000,
-					"profitStatus": 6,
-					"profitStatusName": "最高可以获得积分",
-					"userId": 247,
-					"orderId": 67,
-					"orderNo": "o202404161713151",
-					"id": 28,
-					"amount": 93312,
-					"afterAmount": 2822688,
-					"freezeAmount": null,
-					"afterFreezeAmount": null,
-					"percentTemplate": "{\"createTime\":1712568106000,\"updateTime\":1713238272000,\"creator\":\"1\",\"updater\":\"1\",\"deleted\":false,\"id\":1,\"grossProfitPerc\":\"0.3888\",\"grossProfitUserQuotaPerc\":\"0.3500\",\"grossProfitAncestorQuotaPerc\":\"0.3500\",\"grossProfitBonusQuotaPerc\":\"0.0800\",\"grossProfitPlatformQuotaPerc\":\"0.1000\",\"divideIntoPerc\":\"0.0400\",\"status\":1}"
-				},
-				{
-					"createTime": 1713607898000,
-					"profitStatus": 4,
-					"profitStatusName": "直推人额度",
-					"userId": 247,
-					"orderId": 73,
-					"orderNo": "o202404172239581",
-					"id": 33,
-					"amount": 13608,
-					"afterAmount": 227832,
-					"freezeAmount": null,
-					"afterFreezeAmount": null,
-					"percentTemplate": "{\"createTime\":1712568106000,\"updateTime\":1713238272000,\"creator\":\"1\",\"updater\":\"1\",\"deleted\":false,\"id\":1,\"grossProfitPerc\":\"0.3888\",\"grossProfitUserQuotaPerc\":\"0.3500\",\"grossProfitAncestorQuotaPerc\":\"0.3500\",\"grossProfitBonusQuotaPerc\":\"0.0800\",\"grossProfitPlatformQuotaPerc\":\"0.1000\",\"divideIntoPerc\":\"0.0400\",\"status\":1}"
-				},
-				{
-					"createTime": 1713607898000,
-					"profitStatus": 6,
-					"profitStatusName": "最高可以获得积分",
-					"userId": 247,
-					"orderId": 73,
-					"orderNo": "o202404172239581",
-					"id": 35,
-					"amount": 116640,
-					"afterAmount": 1632960,
-					"freezeAmount": null,
-					"afterFreezeAmount": null,
-					"percentTemplate": "{\"createTime\":1712568106000,\"updateTime\":1713238272000,\"creator\":\"1\",\"updater\":\"1\",\"deleted\":false,\"id\":1,\"grossProfitPerc\":\"0.3888\",\"grossProfitUserQuotaPerc\":\"0.3500\",\"grossProfitAncestorQuotaPerc\":\"0.3500\",\"grossProfitBonusQuotaPerc\":\"0.0800\",\"grossProfitPlatformQuotaPerc\":\"0.1000\",\"divideIntoPerc\":\"0.0400\",\"status\":1}"
-				}
-			],
-
+			list: [],
 			total: 0,
-			pageSize: 6,
+			pageSize: 1000,
 			pageNo: 1,
 		},
 		loadStatus: '',
-
+		showModel:false,
+		showQueModel:false
 	});
 
-
-
+	function close(){
+		state.showModel = false;
+		state.showQueModel = false;
+	}
+	function showModel(){
+		getLogList(false);
+		state.showModel = true;
+		
+	}
+	function showQueModel(){
+		getLogList(true);
+		state.showQueModel = true;
+		
+	}
 	async function getLogList(isFreeze) {
 		state.loadStatus = 'loading';
 		// isFreeze为true是冻结积分 isFreeze为false是已拿到的积分
@@ -213,6 +162,7 @@
 	onLoad(() => {
 		// getLogList(true);
 		// getLogList(false);
+		console.log(state.pagination.list)
 	});
 
 
@@ -230,6 +180,12 @@
 </script>
 
 <style lang="scss" scoped>
+	.color-red{
+		color: red;
+	}
+	.color-green{
+		color: green;
+	}
 	.score-box {
 		margin: 20rpx;
 		border-radius: 20rpx;
@@ -329,7 +285,7 @@
 	.list-box {
 		width: 500rpx;
 		height: 600rpx;
-		padding: 0 20rpx;
+		padding: 0 30rpx;
 		overflow-y: auto;
 
 		.list-item {

+ 12 - 7
sheep/api/infra/file.js

@@ -41,13 +41,18 @@ const FileApi = {
     });
   },
   // 通过图片url获得文件流
-  getFileIO: (fileUrl) => {
-	return request({
-	  url: '/infra/file/downloadByUrl?fileUrl='+fileUrl,
-	  method: 'GET',
-	  responseType: 'blob'
-	});
-  }
+  getFileIO: async (fileUrl) => {
+	const response = await fetch(import.meta.env.SHOPRO_BASE_URL+'/app-api/infra/file/downloadByUrl?fileUrl='+fileUrl, {
+	  method: 'GET', 
+	})
+	if (!response.ok) {
+	  throw new Error('网络响应不是OK状态');
+	}
+	const blob = await response.blob();
+	return blob;
+
+  },
+  
 };
 
 export default FileApi;

+ 6 - 5
sheep/components/s-share-modal/canvas-poster/index.vue

@@ -2,6 +2,7 @@
 <template>
 	<su-popup :show="show" round="10" @close="onClosePoster" type="center" class="popup-box">
 		<view class="ss-flex-col ss-col-center ss-row-center">
+			<!-- <image  class="poster-img" :src="imageUrl"/> -->
 			<view v-if="poster.src === ''" class="poster-title ss-flex ss-row-center" :style="{
           height: poster.height + 'px',
           width: poster.width + 'px',
@@ -34,11 +35,12 @@
 <script setup>
 	import {
 		reactive,
-		getCurrentInstance
+		getCurrentInstance,
+		ref
 	} from 'vue';
 	import sheep from '@/sheep';
 	import useCanvas from './useCanvas';
-	import FileApi from '@/sheep/api/infra/file';
+	// import FileApi from '@/sheep/api/infra/file';
 	const props = defineProps({
 		show: {
 			type: Boolean,
@@ -55,6 +57,7 @@
 		width: sheep.$platform.device.windowWidth * 0.9,
 		height: 600,
 		src: '',
+		imgData:''
 	});
 
 	const emits = defineEmits(['success', 'close']);
@@ -81,12 +84,10 @@
 			},
 		});
 	};
-	
+	const imageUrl = ref("")
 
 	// 使用 canvas 生成海报
 	async function getPoster(params) {
-		// const  data  = FileApi.getFileIO("https://mall-ffkj.oss-cn-guangzhou.aliyuncs.com/1113667b212fe1ba9fb9c99c20fbcb61ff69fa2d8bc243cfdd40c3dfa06f9bb6.png")
-		// console.log(data)
 		poster.src = '';
 		poster.shareInfo = props.shareInfo;
 		// #ifdef APP-PLUS

+ 39 - 21
sheep/components/s-share-modal/canvas-poster/poster/goods.js

@@ -1,17 +1,20 @@
 import sheep from '@/sheep';
+
 import { formatImageUrlProtocol } from './index';
 
-const goods = (poster) => {
+
+const goods =  (poster) => {
   const width = poster.width;
   const userInfo = sheep.$store('user').userInfo;
-  return {
-    background: formatImageUrlProtocol(sheep.$url.cdn(sheep.$store('app').platform.share.posterInfo.goods_bg)),
+  return  {
+	background: window.location.origin + '/static/goods-poster-bg.jpg',
+    // background: formatImageUrlProtocol(sheep.$url.cdn(sheep.$store('app').platform.share.posterInfo.goods_bg)),
     list: [
       {
         name: 'nickname',
         type: 'text',
         val: userInfo.nickname,
-        x: width * 0.22,
+        x: width * 0.21,
         y: width * 0.06,
         paintbrushProps: {
           fillStyle: '#333',
@@ -24,49 +27,64 @@ const goods = (poster) => {
       {
         name: 'avatar',
         type: 'image',
-        val: formatImageUrlProtocol(sheep.$url.cdn(userInfo.avatar)),
+        val: poster.avatar,
         x: width * 0.04,
         y: width * 0.04,
         width: width * 0.14,
         height: width * 0.14,
         d: width * 0.14,
       },
+	  {
+	    name: 'goodsBg',
+	    type: 'rect',
+	    x: width * 0.03,
+	    y: width * 0.3,
+	    width: width * 0.94,
+	    height: width * 0.75,
+	    r: 5,
+
+	  },
       {
         name: 'goodsImage',
         type: 'image',
-        val: formatImageUrlProtocol(poster.shareInfo.poster.image),
+        val:  poster.shareInfo.poster.image,
         x: width * 0.03,
-        y: width * 0.21,
+        y: width * 0.3,
         width: width * 0.94,
-        height: width * 0.94,
-        r: 10,
+        height: width * 0.5,
+        r: 5,
       },
+	  
       {
         name: 'goodsTitle',
         type: 'text',
         val: poster.shareInfo.poster.title,
-        x: width * 0.04,
-        y: width * 1.18,
+        x: width * 0.05,
+        y: width * 0.83,
         maxWidth: width * 0.91,
-        line: 2,
-        lineHeight: 5,
+        line: 5,
+        lineHeight: 10,
         paintbrushProps: {
           fillStyle: '#333',
           font: {
-            fontSize: 14,
+            fontSize: 16,
           },
         },
       },
       {
-        name: 'goodsPrice',
+        name: 'goodsIntroduction',
         type: 'text',
-        val: '¥' + poster.shareInfo.poster.price,
-        x: width * 0.04,
-        y: width * 1.3,
+        val: poster.shareInfo.poster.introduction,
+        x: width * 0.05,
+        y: width * 0.89,
+		maxWidth: width * 0.9,
+		height:width * 0.1,
+		line:3,
+		lineHeight:3,
         paintbrushProps: {
-          fillStyle: '#ff0000',
+          fillStyle: '#333',
           font: {
-            fontSize: 20,
+            fontSize: 14,
             fontFamily: 'OPPOSANS',
           },
         },
@@ -98,7 +116,7 @@ const goods = (poster) => {
         type: 'qrcode',
         val: poster.shareInfo.link,
         x: width * 0.75,
-        y: width * 1.3,
+        y: width * 1.07,
         size: width * 0.2,
       },
       // #endif

+ 43 - 24
sheep/components/s-share-modal/canvas-poster/poster/index.js

@@ -1,32 +1,51 @@
 import user from './user';
 import goods from './goods';
 import groupon from './groupon';
-
-export function getPosterData(options) {
-  switch (options.shareInfo.poster.type) {
-    case 'user':
-      return user(options);
-    case 'goods':
-      return goods(options);
-    case 'groupon':
-      return groupon(options);
-  }
+import sheep from '@/sheep';
+import {
+	ref
+} from 'vue'
+import FileApi from '@/sheep/api/infra/file';
+let locaImage = ref("")
+async function getFileURL(file) {
+	console.log("file", file)
+	await FileApi.getFileIO(file).then((res) => {
+		locaImage.value = window.URL.createObjectURL(res);
+	})
+}
+export async function getPosterData(options) {
+	const userInfo = sheep.$store('user').userInfo;
+	let avatar = userInfo.avatar
+	switch (options.shareInfo.poster.type) {
+		case 'user':
+			await getFileURL(avatar)
+			options.avatar = locaImage.value
+			return user(options);
+		case 'goods':
+			await getFileURL(avatar)
+			options.avatar = locaImage.value
+			await getFileURL(options.shareInfo.poster.image)
+			options.shareInfo.poster.image = locaImage.value
+			return goods(options);
+		case 'groupon':
+			return groupon(options);
+	}
 }
 
 export function formatImageUrlProtocol(url) {
-  // #ifdef H5
-  // H5平台 https协议下需要转换
-  if (window.location.protocol === 'https:' && url.indexOf('http:') === 0) {
-    url = url.replace('http:', 'https:');
-  }
-  // #endif
+	// #ifdef H5
+	// H5平台 https协议下需要转换
+	if (window.location.protocol === 'https:' && url.indexOf('http:') === 0) {
+		url = url.replace('http:', 'https:');
+	}
+	// #endif
 
-  // #ifdef MP-WEIXIN
-  // 小程序平台 需要强制转换为https协议
-  if (url.indexOf('http:') === 0) {
-    url = url.replace('http:', 'https:');
-  }
-  // #endif
+	// #ifdef MP-WEIXIN
+	// 小程序平台 需要强制转换为https协议
+	if (url.indexOf('http:') === 0) {
+		url = url.replace('http:', 'https:');
+	}
+	// #endif
 
-  return url;
-}
+	return url;
+}

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

@@ -4,9 +4,10 @@ import { formatImageUrlProtocol } from './index';
 const user = (poster) => {
   const width = poster.width;
   const userInfo = sheep.$store('user').userInfo;
-
+  console.log()
   return {
-    background: formatImageUrlProtocol(sheep.$url.cdn(sheep.$store('app').platform.share.posterInfo.user_bg)),
+    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',
@@ -26,7 +27,7 @@ const user = (poster) => {
       {
         name: 'avatar',
         type: 'image',
-        val: formatImageUrlProtocol(sheep.$url.cdn(userInfo.avatar)),
+        val: poster.avatar,
         x: width * 0.4,
         y: width * 0.16,
         width: width * 0.2,
@@ -39,7 +40,7 @@ const user = (poster) => {
         type: 'qrcode',
         val: poster.shareInfo.link,
         x: width * 0.35,
-        y: width * 0.84,
+        y: width * 0.74,
         size: width * 0.3,
       },
       // #endif

+ 22 - 18
sheep/components/s-share-modal/canvas-poster/useCanvas.js

@@ -22,8 +22,8 @@ export default async function useCanvas(options, vm) {
 		vm,
 	);
 
-	let drawer = getPosterData(options);
-	console.log(drawer)
+	let drawer = await getPosterData(options);
+	// console.log("drawer",drawer)
 	// 绘制背景图
 
 	const background = await qsc.drawImg({
@@ -36,16 +36,6 @@ export default async function useCanvas(options, vm) {
 		zIndex: 0,
 	});
 	
-	// const background = await qsc.drawImg({
-	//     "name": "avatar",
-	//     "type": "image",
-	//     "val": "https://file.sheepjs.com/static/img/shop/goods/share.png",
-	//     "x": 14.040000000000001,
-	//     "y": 14.040000000000001,
-	//     "width": 49.14000000000001,
-	//     "height": 49.14000000000001,
-	//     "d": 49.14000000000001
-	// });
 	await qsc.updateCanvasWH({
 		width: background.width,
 		height: background.bottom,
@@ -62,7 +52,6 @@ export default async function useCanvas(options, vm) {
 		}
 		// 绘制图片
 		if (item.type === 'image') {
-			
 			if (item.d) {
 				qsc.setCircle({
 					x: item.x,
@@ -71,7 +60,6 @@ export default async function useCanvas(options, vm) {
 					clip: true,
 				});
 			}
-
 			if (item.r) {
 				qsc.setRect({
 					x: item.x,
@@ -82,17 +70,33 @@ export default async function useCanvas(options, vm) {
 					clip: true,
 				});
 			}
-
 			try {
 				await qsc.drawImg(item);
-				
 			} catch (error) {
 				console.log(error)
 			}
-
 			qsc.restore();
 		}
-
+		// 绘制矩形
+		if (item.type === 'rect') {
+			if (item.r) {
+				qsc.setRect({
+					x: item.x,
+					y: item.y,
+					height: item.height,
+					width: item.width,
+					r: item.r,
+					clip: true,
+				});
+			}
+			try {
+				await qsc.draw(item);
+			} catch (error) {
+				console.log(error)
+			}
+			qsc.restore();
+		}
+		
 		// 绘制二维码
 		if (item.type === 'qrcode') {
 			await qsc.drawQrCode(item);

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

@@ -52,8 +52,8 @@
 					<view class="value-text">积分</view>
 				</view>
 				<view class="menu-title ss-m-t-15">#{{ points2point(userWallet.integralDO.currentQuota)  }}</view>
-				<view class=" ss-m-t-15">历史总积分:#{{ points2point(userWallet.integralDO.highQuota)  }}</view>
-				<view class=" ss-m-t-15">待确权积分:#{{ points2point(userWallet.integralDO.freezeQuota) }}</view>
+				<view class=" ss-m-t-10 text-center">历史总积分:#{{ points2point(userWallet.integralDO.highQuota)  }}</view>
+				<view class=" ss-m-t-10 text-center">待确权积分:#{{ points2point(userWallet.integralDO.freezeQuota) }}</view>
 			</view>
 			<view class="menu-item ss-flex-1 ss-flex-col  ss-col-center"
 				@tap="sheep.$router.go('/pages/user/wallet/team')">
@@ -61,8 +61,8 @@
 					<view class="value-text">团队</view>
 				</view>
 				<view class="menu-title ss-m-t-15">{{ userWallet.descNo }}人</view>
-				<view class="ss-m-t-15">团队今日贡献#{{ points2point(userWallet.descPrice) }}</view>
-				<view class="ss-m-t-15">团队总贡献值#{{ points2point(userWallet.descTotalPrice) }}</view>
+				<view class="ss-m-t-10 text-center">团队今日贡献  #{{ points2point(userWallet.descPrice) }}</view>
+				<view class="ss-m-t-10 text-center">团队总贡献值  #{{ points2point(userWallet.descTotalPrice) }}</view>
 			</view>
 
 		</view>

+ 1 - 1
sheep/platform/share.js

@@ -45,7 +45,7 @@ const getShareInfo = (
 
 	// 配置分享链接地址
 	shareInfo.link = buildSpmLink(query, shareConfig.linkAddress);
-	console.log("share.js link", shareInfo.link)
+	// console.log("share.js link", shareInfo.link)
 	// 配置转发参数
 	if (shareConfig.methods.includes('forward')) {
 		if (shareConfig.forwardInfo.title === '' || shareConfig.forwardInfo.image === '') {

+ 2 - 2
sheep/store/app.js

@@ -78,8 +78,8 @@ const app = defineStore({
 						// linkAddress: "http://localhost/#/", //跳转链接 
 						linkAddress: import.meta.env.SHOPRO_BASE_URL+'/#/', //跳转链接 
 						posterInfo: {
-							"user_bg": "/static/img/shop/config/user-poster-bg.png",
-							"goods_bg": "/static/img/shop/config/goods-poster-bg.png",
+							"user_bg": "/static/user-poster-bg.jpg",
+							"goods_bg": "/static/user-poster-bg.jpg",
 							"groupon_bg": "/static/img/shop/config/groupon-poster-bg.png"
 						}
 					},

BIN
static/goods-poster-bg.jpg


BIN
static/user-poster-bg.jpg


+ 1 - 1
unpackage/dist/build/web/assets/address.cf2f89d9.js → unpackage/dist/build/web/assets/address.8dffaaef.js

@@ -1 +1 @@
-import{Z as e}from"./index-f8bddd99.js";const s={getAddressList:()=>e({url:"/member/address/list",method:"GET"}),createAddress:s=>e({url:"/member/address/create",method:"POST",data:s,custom:{showSuccess:!0,successMsg:"保存成功"}}),updateAddress:s=>e({url:"/member/address/update",method:"PUT",data:s,custom:{showSuccess:!0,successMsg:"更新成功"}}),getAddress:s=>e({url:"/member/address/get",method:"GET",params:{id:s}}),deleteAddress:s=>e({url:"/member/address/delete",method:"DELETE",params:{id:s}})};export{s as A};
+import{Z as e}from"./index-d9239240.js";const s={getAddressList:()=>e({url:"/member/address/list",method:"GET"}),createAddress:s=>e({url:"/member/address/create",method:"POST",data:s,custom:{showSuccess:!0,successMsg:"保存成功"}}),updateAddress:s=>e({url:"/member/address/update",method:"PUT",data:s,custom:{showSuccess:!0,successMsg:"更新成功"}}),getAddress:s=>e({url:"/member/address/get",method:"GET",params:{id:s}}),deleteAddress:s=>e({url:"/member/address/delete",method:"DELETE",params:{id:s}})};export{s as A};

+ 1 - 1
unpackage/dist/build/web/assets/afterSale.8fcc09dd.js → unpackage/dist/build/web/assets/afterSale.eb682946.js

@@ -1 +1 @@
-import{Z as e}from"./index-f8bddd99.js";const a={getAfterSalePage:a=>e({url:"/trade/after-sale/page",method:"GET",params:a,custom:{showLoading:!1}}),createAfterSale:a=>e({url:"/trade/after-sale/create",method:"POST",data:a}),getAfterSale:a=>e({url:"/trade/after-sale/get",method:"GET",params:{id:a}}),cancelAfterSale:a=>e({url:"/trade/after-sale/cancel",method:"DELETE",params:{id:a}}),getAfterSaleLogList:a=>e({url:"/trade/after-sale-log/list",method:"GET",params:{afterSaleId:a}}),deliveryAfterSale:a=>e({url:"/trade/after-sale/delivery",method:"PUT",data:a})};export{a as A};
+import{Z as e}from"./index-d9239240.js";const a={getAfterSalePage:a=>e({url:"/trade/after-sale/page",method:"GET",params:a,custom:{showLoading:!1}}),createAfterSale:a=>e({url:"/trade/after-sale/create",method:"POST",data:a}),getAfterSale:a=>e({url:"/trade/after-sale/get",method:"GET",params:{id:a}}),cancelAfterSale:a=>e({url:"/trade/after-sale/cancel",method:"DELETE",params:{id:a}}),getAfterSaleLogList:a=>e({url:"/trade/after-sale-log/list",method:"GET",params:{afterSaleId:a}}),deliveryAfterSale:a=>e({url:"/trade/after-sale/delivery",method:"PUT",data:a})};export{a as A};

+ 1 - 0
unpackage/dist/build/web/assets/area.6376b5a4.js

@@ -0,0 +1 @@
+import{Z as e}from"./index-d9239240.js";const r={getAreaTree:()=>e({url:"/system/area/tree",method:"GET"})};export{r as A};

+ 0 - 1
unpackage/dist/build/web/assets/area.f4e2f02d.js

@@ -1 +0,0 @@
-import{Z as e}from"./index-f8bddd99.js";const r={getAreaTree:()=>e({url:"/system/area/tree",method:"GET"})};export{r as A};

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/bargain.9abb4b90.js


+ 1 - 1
unpackage/dist/build/web/assets/brokerage.c3f67b2f.js → unpackage/dist/build/web/assets/brokerage.f0ce6ec9.js

@@ -1 +1 @@
-import{Z as e}from"./index-f8bddd99.js";const r={getBrokerageUser:()=>e({url:"/trade/brokerage-user/get",method:"GET"}),getBrokerageUserSummary:()=>e({url:"/trade/brokerage-user/get-summary",method:"GET"}),getBrokerageRecordPage:r=>{void 0===r.status&&delete r.status;const t=Object.keys(r).map((e=>encodeURIComponent(e)+"="+r[e])).join("&");return e({url:`/trade/brokerage-record/page?${t}`,method:"GET"})},createBrokerageWithdraw:r=>e({url:"/trade/brokerage-withdraw/create",method:"POST",data:r}),getProductBrokeragePrice:r=>e({url:"/trade/brokerage-record/get-product-brokerage-price",method:"GET",params:{spuId:r}}),getRankByPrice:r=>{const t=`times=${r.times[0]}&times=${r.times[1]}`;return e({url:`/trade/brokerage-user/get-rank-by-price?${t}`,method:"GET"})},getBrokerageUserChildSummaryPageByPrice:r=>{const t=Object.keys(r).map((e=>encodeURIComponent(e)+"="+r[e])).join("&");return e({url:`/trade/brokerage-user/rank-page-by-price?${t}`,method:"GET"})},getBrokerageUserRankPageByUserCount:r=>{const t=Object.keys(r).map((e=>encodeURIComponent(e)+"="+r[e])).join("&");return e({url:`/trade/brokerage-user/rank-page-by-user-count?${t}`,method:"GET"})},getBrokerageUserChildSummaryPage:r=>e({url:"/trade/brokerage-user/child-summary-page",method:"GET",params:r})};export{r as B};
+import{Z as e}from"./index-d9239240.js";const r={getBrokerageUser:()=>e({url:"/trade/brokerage-user/get",method:"GET"}),getBrokerageUserSummary:()=>e({url:"/trade/brokerage-user/get-summary",method:"GET"}),getBrokerageRecordPage:r=>{void 0===r.status&&delete r.status;const t=Object.keys(r).map((e=>encodeURIComponent(e)+"="+r[e])).join("&");return e({url:`/trade/brokerage-record/page?${t}`,method:"GET"})},createBrokerageWithdraw:r=>e({url:"/trade/brokerage-withdraw/create",method:"POST",data:r}),getProductBrokeragePrice:r=>e({url:"/trade/brokerage-record/get-product-brokerage-price",method:"GET",params:{spuId:r}}),getRankByPrice:r=>{const t=`times=${r.times[0]}&times=${r.times[1]}`;return e({url:`/trade/brokerage-user/get-rank-by-price?${t}`,method:"GET"})},getBrokerageUserChildSummaryPageByPrice:r=>{const t=Object.keys(r).map((e=>encodeURIComponent(e)+"="+r[e])).join("&");return e({url:`/trade/brokerage-user/rank-page-by-price?${t}`,method:"GET"})},getBrokerageUserRankPageByUserCount:r=>{const t=Object.keys(r).map((e=>encodeURIComponent(e)+"="+r[e])).join("&");return e({url:`/trade/brokerage-user/rank-page-by-user-count?${t}`,method:"GET"})},getBrokerageUserChildSummaryPage:r=>e({url:"/trade/brokerage-user/child-summary-page",method:"GET",params:r})};export{r as B};

+ 1 - 1
unpackage/dist/build/web/assets/category.6710c4e0.js → unpackage/dist/build/web/assets/category.6c4f0bbb.js

@@ -1 +1 @@
-import{Z as t}from"./index-f8bddd99.js";const o={getCategoryList:()=>t({url:"/product/category/list",method:"GET"}),getCategoryListByIds:o=>t({url:"/product/category/list-by-ids",method:"GET",params:{ids:o}})};export{o as C};
+import{Z as t}from"./index-d9239240.js";const o={getCategoryList:()=>t({url:"/product/category/list",method:"GET"}),getCategoryListByIds:o=>t({url:"/product/category/list-by-ids",method:"GET",params:{ids:o}})};export{o as C};

+ 1 - 1
unpackage/dist/build/web/assets/combination.aa187614.js → unpackage/dist/build/web/assets/combination.466625d6.js

@@ -1 +1 @@
-import{Z as o}from"./index-f8bddd99.js";const t={getCombinationActivityList:t=>o({url:"/promotion/combination-activity/list",method:"GET",params:{count:t}}),getCombinationActivityPage:t=>o({url:"/promotion/combination-activity/page",method:"GET",params:t}),getCombinationActivity:t=>o({url:"/promotion/combination-activity/get-detail",method:"GET",params:{id:t}}),getHeadCombinationRecordList:(t,i,a)=>o({url:"/promotion/combination-record/get-head-list",method:"GET",params:{activityId:t,status:i,count:a}}),getCombinationRecordPage:t=>o({url:"/promotion/combination-record/page",method:"GET",params:t}),getCombinationRecordDetail:t=>o({url:"/promotion/combination-record/get-detail",method:"GET",params:{id:t}}),getCombinationRecordSummary:()=>o({url:"/promotion/combination-record/get-summary",method:"GET"})};export{t as C};
+import{Z as o}from"./index-d9239240.js";const t={getCombinationActivityList:t=>o({url:"/promotion/combination-activity/list",method:"GET",params:{count:t}}),getCombinationActivityPage:t=>o({url:"/promotion/combination-activity/page",method:"GET",params:t}),getCombinationActivity:t=>o({url:"/promotion/combination-activity/get-detail",method:"GET",params:{id:t}}),getHeadCombinationRecordList:(t,i,a)=>o({url:"/promotion/combination-record/get-head-list",method:"GET",params:{activityId:t,status:i,count:a}}),getCombinationRecordPage:t=>o({url:"/promotion/combination-record/page",method:"GET",params:t}),getCombinationRecordDetail:t=>o({url:"/promotion/combination-record/get-detail",method:"GET",params:{id:t}}),getCombinationRecordSummary:()=>o({url:"/promotion/combination-record/get-summary",method:"GET"})};export{t as C};

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/comment-item.e156da97.js


+ 0 - 1
unpackage/dist/build/web/assets/config.89abba17.js

@@ -1 +0,0 @@
-import{Z as e}from"./index-f8bddd99.js";const o={getTradeConfig:()=>e({url:"/trade/config/get",method:"GET"})};export{o as T};

+ 1 - 0
unpackage/dist/build/web/assets/config.c0e71b0a.js

@@ -0,0 +1 @@
+import{Z as e}from"./index-d9239240.js";const o={getTradeConfig:()=>e({url:"/trade/config/get",method:"GET"})};export{o as T};

+ 1 - 1
unpackage/dist/build/web/assets/const.dd4dedd7.js → unpackage/dist/build/web/assets/const.af58d68f.js

@@ -1 +1 @@
-import{Z as t,b2 as e}from"./index-f8bddd99.js";const i={getSeckillConfigList:()=>t({url:"promotion/seckill-config/list",method:"GET"}),getNowSeckillActivity:()=>t({url:"promotion/seckill-activity/get-now",method:"GET"}),getSeckillActivityPage:e=>t({url:"promotion/seckill-activity/page",method:"GET",params:e}),getSeckillActivity:e=>t({url:"promotion/seckill-activity/get-detail",method:"GET",params:{id:e}})},o={PRICE:{type:1,name:"满减"},PERCENT:{type:2,name:"折扣"}},l={DATE:{type:1,name:"固定日期可用"},TERM:{type:2,name:"领取之后可用"}},a={WAIT_START:"即将开始",STARTED:"进行中",END:"已结束"},s=(t,i)=>{const o=e();return o.isBefore(t)?a.WAIT_START:o.isAfter(i)?a.END:a.STARTED};export{l as C,o as P,i as S,a as T,s as g};
+import{Z as t,b2 as e}from"./index-d9239240.js";const i={getSeckillConfigList:()=>t({url:"promotion/seckill-config/list",method:"GET"}),getNowSeckillActivity:()=>t({url:"promotion/seckill-activity/get-now",method:"GET"}),getSeckillActivityPage:e=>t({url:"promotion/seckill-activity/page",method:"GET",params:e}),getSeckillActivity:e=>t({url:"promotion/seckill-activity/get-detail",method:"GET",params:{id:e}})},o={PRICE:{type:1,name:"满减"},PERCENT:{type:2,name:"折扣"}},l={DATE:{type:1,name:"固定日期可用"},TERM:{type:2,name:"领取之后可用"}},a={WAIT_START:"即将开始",STARTED:"进行中",END:"已结束"},s=(t,i)=>{const o=e();return o.isBefore(t)?a.WAIT_START:o.isAfter(i)?a.END:a.STARTED};export{l as C,o as P,i as S,a as T,s as g};

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/detail-content-card.e9dba58d.js


+ 1 - 1
unpackage/dist/build/web/assets/favorite.e5ab9312.js → unpackage/dist/build/web/assets/favorite.c4066b85.js

@@ -1 +1 @@
-import{Z as e}from"./index-f8bddd99.js";const t={getFavoritePage:t=>e({url:"/product/favorite/page",method:"GET",params:t}),isFavoriteExists:t=>e({url:"/product/favorite/exits",method:"GET",params:{spuId:t}}),createFavorite:t=>e({url:"/product/favorite/create",method:"POST",data:{spuId:t},custom:{auth:!0,showSuccess:!0,successMsg:"收藏成功"}}),deleteFavorite:t=>e({url:"/product/favorite/delete",method:"DELETE",data:{spuId:t},custom:{auth:!0,showSuccess:!0,successMsg:"取消成功"}})};export{t as F};
+import{Z as e}from"./index-d9239240.js";const t={getFavoritePage:t=>e({url:"/product/favorite/page",method:"GET",params:t}),isFavoriteExists:t=>e({url:"/product/favorite/exits",method:"GET",params:{spuId:t}}),createFavorite:t=>e({url:"/product/favorite/create",method:"POST",data:{spuId:t},custom:{auth:!0,showSuccess:!0,successMsg:"收藏成功"}}),deleteFavorite:t=>e({url:"/product/favorite/delete",method:"DELETE",data:{spuId:t},custom:{auth:!0,showSuccess:!0,successMsg:"取消成功"}})};export{t as F};

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/form.fd4cb395.js


+ 1 - 1
unpackage/dist/build/web/assets/history.2c87849a.js → unpackage/dist/build/web/assets/history.17aa6d5a.js

@@ -1 +1 @@
-import{Z as s}from"./index-f8bddd99.js";const o={deleteBrowseHistory:o=>s({url:"/product/browse-history/delete",method:"DELETE",data:{spuIds:o},custom:{showSuccess:!0,successMsg:"删除成功"}}),cleanBrowseHistory:()=>s({url:"/product/browse-history/clean",method:"DELETE",custom:{showSuccess:!0,successMsg:"清空成功"}}),getBrowseHistoryPage:o=>s({url:"/product/browse-history/page",method:"GET",data:o,custom:{showLoading:!1}})};export{o as S};
+import{Z as s}from"./index-d9239240.js";const o={deleteBrowseHistory:o=>s({url:"/product/browse-history/delete",method:"DELETE",data:{spuIds:o},custom:{showSuccess:!0,successMsg:"删除成功"}}),cleanBrowseHistory:()=>s({url:"/product/browse-history/clean",method:"DELETE",custom:{showSuccess:!0,successMsg:"清空成功"}}),getBrowseHistoryPage:o=>s({url:"/product/browse-history/page",method:"GET",data:o,custom:{showLoading:!1}})};export{o as S};

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/index-2b1e33d4.css


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/index-d9239240.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/mp-html.d8fc4b91.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-activity-bargain-detail.2c6dcaa6.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-activity-bargain-list.5e9b1adf.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-activity-groupon-detail.102458c7.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-activity-groupon-list.8809ee0a.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-activity-groupon-order.97dc7c8c.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-activity-index.00e7010a.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-activity-seckill-list.b17ef35a.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-app-sign.76cc462b.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-chat-index.53d34a92.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-commission-commission-ranking.54fc7895.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-commission-goods.a7d408f1.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-commission-index.83267726.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-commission-order.f8c8730b.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-commission-promoter.463f9f7d.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-commission-team.5b65c354.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-commission-wallet.7941598f.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-commission-withdraw.26e7716e.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-coupon-detail.02952425.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-coupon-list.b14b03ca.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-goods-comment-add.60b89d76.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-goods-comment-list.99eedacf.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-goods-groupon.aa48242d.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-goods-index.6e6f963a.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-goods-list.66135d32.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-goods-seckill.7f32a5c6.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-index-cart.f416df4f.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-index-category.a1ba568f.js


+ 1 - 1
unpackage/dist/build/web/assets/pages-index-index.75d8bd04.js → unpackage/dist/build/web/assets/pages-index-index.49638735.js

@@ -1 +1 @@
-import{h as e,c as s,o as t,s as a,$ as o,a as p,b as r,d as i,e as l,f as m,w as n,g as u,i as d,j as _,k as y,r as c,F as j,l as g,m as v}from"./index-f8bddd99.js";import{_ as b,a as f}from"./s-block.727700b7.js";import{_ as x}from"./s-layout.371535bd.js";import"./form.da68c851.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.8f086c11.js";import"./uni-badge.a05a0a55.js";import"./su-image.4ab6d30d.js";import"./su-swiper.b07c7652.js";import"./s-goods-column.50c235dd.js";import"./useGoods.93739f21.js";/* empty css                                                                     */import"./uni-load-more.3ba8d975.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.505e4112.js";import"./combination.aa187614.js";import"./const.dd4dedd7.js";import"./mp-html.fb44b569.js";import"./richtext.4a7e07d8.js";const h={__name:"index",setup(h){e();const k=s((()=>{var e;return null==(e=a.$store("app").template)?void 0:e.home}));return t((e=>{e.templateId&&a.$store("app").init(e.templateId),e.spm&&o.decryptSpm(e.spm),e.page&&a.$router.go(decodeURIComponent(e.page))})),p((()=>{a.$store("app").init(),setTimeout((function(){r()}),800)})),i((()=>{})),(e,s)=>{const t=g(v("s-block-item"),b),a=g(v("s-block"),f),o=g(v("s-layout"),x),p=d;return k.value?(l(),m(p,{key:0},{default:n((()=>{var e;return[_(o,{title:"首页",navbar:"custom",tabbar:"/pages/index/index",bgStyle:k.value.page,navbarStyle:null==(e=k.value.style)?void 0:e.navbar,onShareAppMessage:""},{default:n((()=>[(l(!0),y(j,null,c(k.value.components,((e,s)=>(l(),m(a,{key:s,styles:e.property.style},{default:n((()=>[_(t,{type:e.id,data:e.property,styles:e.property.style},null,8,["type","data","styles"])])),_:2},1032,["styles"])))),128))])),_:1},8,["bgStyle","navbarStyle"])]})),_:1})):u("",!0)}}};export{h as default};
+import{h as e,c as s,o as t,s as a,$ as o,a as p,b as r,d as i,e as l,f as m,w as n,g as u,i as d,j as _,k as y,r as c,F as j,l as g,m as v}from"./index-d9239240.js";import{_ as b,a as f}from"./s-block.d449eedb.js";import{_ as x}from"./s-layout.2c6032ed.js";import"./form.fd4cb395.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.c583a476.js";import"./uni-badge.96ef0d44.js";import"./su-image.1fa1c5c2.js";import"./su-swiper.50b12a5a.js";import"./s-goods-column.2ed5220f.js";import"./useGoods.fbd70fd6.js";/* empty css                                                                     */import"./uni-load-more.a51b00ea.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.d587660f.js";import"./combination.466625d6.js";import"./const.af58d68f.js";import"./mp-html.d8fc4b91.js";import"./richtext.e1731e9f.js";const h={__name:"index",setup(h){e();const k=s((()=>{var e;return null==(e=a.$store("app").template)?void 0:e.home}));return t((e=>{e.templateId&&a.$store("app").init(e.templateId),e.spm&&o.decryptSpm(e.spm),e.page&&a.$router.go(decodeURIComponent(e.page))})),p((()=>{a.$store("app").init(),setTimeout((function(){r()}),800)})),i((()=>{})),(e,s)=>{const t=g(v("s-block-item"),b),a=g(v("s-block"),f),o=g(v("s-layout"),x),p=d;return k.value?(l(),m(p,{key:0},{default:n((()=>{var e;return[_(o,{title:"首页",navbar:"custom",tabbar:"/pages/index/index",bgStyle:k.value.page,navbarStyle:null==(e=k.value.style)?void 0:e.navbar,onShareAppMessage:""},{default:n((()=>[(l(!0),y(j,null,c(k.value.components,((e,s)=>(l(),m(a,{key:s,styles:e.property.style},{default:n((()=>[_(t,{type:e.id,data:e.property,styles:e.property.style},null,8,["type","data","styles"])])),_:2},1032,["styles"])))),128))])),_:1},8,["bgStyle","navbarStyle"])]})),_:1})):u("",!0)}}};export{h as default};

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-index-login.c7e166f6.js


+ 1 - 1
unpackage/dist/build/web/assets/pages-index-page.d73555f2.js → unpackage/dist/build/web/assets/pages-index-page.010109ec.js

@@ -1 +1 @@
-import{_ as t,a as s}from"./s-block.727700b7.js";import{y as e,o,W as a,d as p,e as r,f as i,w as n,l,k as m,r as _,F as u,m as y,j as d}from"./index-f8bddd99.js";import{_ as c}from"./s-layout.371535bd.js";import"./form.da68c851.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.8f086c11.js";import"./uni-badge.a05a0a55.js";import"./su-image.4ab6d30d.js";import"./su-swiper.b07c7652.js";import"./s-goods-column.50c235dd.js";import"./useGoods.93739f21.js";/* empty css                                                                     */import"./uni-load-more.3ba8d975.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.505e4112.js";import"./combination.aa187614.js";import"./const.dd4dedd7.js";import"./mp-html.fb44b569.js";import"./richtext.4a7e07d8.js";const g={__name:"page",setup(g){const j=e({name:"",components:[],navigationBar:{},page:{}});return o((async t=>{var s,e,o;let p=t.id;const{code:r,data:i}=await a.getDiyPage(p);0===r&&(j.name=i.name,j.components=null==(s=i.property)?void 0:s.components,j.navigationBar=null==(e=i.property)?void 0:e.navigationBar,j.page=null==(o=i.property)?void 0:o.page)})),p((()=>{})),(e,o)=>{const a=l(y("s-block-item"),t),p=l(y("s-block"),s),g=l(y("s-layout"),c);return r(),i(g,{title:j.name,navbar:"custom",bgStyle:j.page,navbarStyle:j.navigationBar,onShareAppMessage:"",showLeftButton:""},{default:n((()=>[(r(!0),m(u,null,_(j.components,((t,s)=>(r(),i(p,{key:s,styles:t.property.style},{default:n((()=>[d(a,{type:t.id,data:t.property,styles:t.property.style},null,8,["type","data","styles"])])),_:2},1032,["styles"])))),128))])),_:1},8,["title","bgStyle","navbarStyle"])}}};export{g as default};
+import{_ as t,a as s}from"./s-block.d449eedb.js";import{y as e,o,W as a,d as p,e as r,f as i,w as n,l,k as m,r as _,F as u,m as y,j as d}from"./index-d9239240.js";import{_ as c}from"./s-layout.2c6032ed.js";import"./form.fd4cb395.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.c583a476.js";import"./uni-badge.96ef0d44.js";import"./su-image.1fa1c5c2.js";import"./su-swiper.50b12a5a.js";import"./s-goods-column.2ed5220f.js";import"./useGoods.fbd70fd6.js";/* empty css                                                                     */import"./uni-load-more.a51b00ea.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.d587660f.js";import"./combination.466625d6.js";import"./const.af58d68f.js";import"./mp-html.d8fc4b91.js";import"./richtext.e1731e9f.js";const g={__name:"page",setup(g){const j=e({name:"",components:[],navigationBar:{},page:{}});return o((async t=>{var s,e,o;let p=t.id;const{code:r,data:i}=await a.getDiyPage(p);0===r&&(j.name=i.name,j.components=null==(s=i.property)?void 0:s.components,j.navigationBar=null==(e=i.property)?void 0:e.navigationBar,j.page=null==(o=i.property)?void 0:o.page)})),p((()=>{})),(e,o)=>{const a=l(y("s-block-item"),t),p=l(y("s-block"),s),g=l(y("s-layout"),c);return r(),i(g,{title:j.name,navbar:"custom",bgStyle:j.page,navbarStyle:j.navigationBar,onShareAppMessage:"",showLeftButton:""},{default:n((()=>[(r(!0),m(u,null,_(j.components,((t,s)=>(r(),i(p,{key:s,styles:t.property.style},{default:n((()=>[d(a,{type:t.id,data:t.property,styles:t.property.style},null,8,["type","data","styles"])])),_:2},1032,["styles"])))),128))])),_:1},8,["title","bgStyle","navbarStyle"])}}};export{g as default};

+ 1 - 1
unpackage/dist/build/web/assets/pages-index-search.20e46cba.js → unpackage/dist/build/web/assets/pages-index-search.260d641c.js

@@ -1 +1 @@
-import{y as s,o as t,M as e,e as a,f as o,w as r,l as i,j as l,t as c,k as n,r as u,F as f,s as h,p as y,U as d,V as p,m as _,i as m,G as x,u as L}from"./index-f8bddd99.js";import{b as g,_ as b}from"./s-layout.371535bd.js";import{_ as w}from"./_plugin-vue_export-helper.1b428a4d.js";import"./form.da68c851.js";const k=w({__name:"search",setup(w){const k=s({historyList:[]});function j(s){s&&(!function(s){k.historyList.includes(s)&&k.historyList.splice(k.historyList.indexOf(s),1);k.historyList.unshift(s),k.historyList.length>=10&&(k.historyList.length=10);y("searchHistory",k.historyList)}(s),h.$router.go("/pages/goods/list",{keyword:s}))}function C(){d({title:"提示",content:"确认清除搜索历史吗?",success:function(s){s.confirm&&(k.historyTag=[],p("searchHistory"))}})}return t((()=>{k.historyList=e("searchHistory")||[]})),(s,t)=>{const e=i(_("uni-search-bar"),g),h=m,y=x,d=i(_("s-layout"),b);return a(),o(d,{class:"set-wrap",title:"搜索",bgStyle:{color:"#FFF"}},{default:r((()=>[l(h,{class:"ss-p-x-24"},{default:r((()=>[l(h,{class:"ss-flex ss-col-center"},{default:r((()=>[l(e,{class:"ss-flex-1",radius:"33",placeholder:"请输入关键字",cancelButton:"none",focus:!0,onConfirm:t[0]||(t[0]=s=>j(s.value))})])),_:1}),l(h,{class:"ss-flex ss-row-between ss-col-center"},{default:r((()=>[l(h,{class:"serach-history"},{default:r((()=>[c("搜索历史")])),_:1}),l(y,{class:"clean-history ss-reset-button",onClick:C},{default:r((()=>[c(" 清除搜索历史 ")])),_:1})])),_:1}),l(h,{class:"ss-flex ss-col-center ss-row-left ss-flex-wrap"},{default:r((()=>[(a(!0),n(f,null,u(k.historyList,((s,t)=>(a(),o(y,{class:"history-btn ss-reset-button",onClick:t=>j(s),key:t},{default:r((()=>[c(L(s),1)])),_:2},1032,["onClick"])))),128))])),_:1})])),_:1})])),_:1})}}},[["__scopeId","data-v-d3779116"]]);export{k as default};
+import{y as s,o as t,M as e,e as a,f as o,w as r,l as i,j as l,t as c,k as n,r as u,F as f,s as h,p as y,U as d,V as p,m as _,i as m,G as x,u as L}from"./index-d9239240.js";import{b as g,_ as b}from"./s-layout.2c6032ed.js";import{_ as w}from"./_plugin-vue_export-helper.1b428a4d.js";import"./form.fd4cb395.js";const k=w({__name:"search",setup(w){const k=s({historyList:[]});function j(s){s&&(!function(s){k.historyList.includes(s)&&k.historyList.splice(k.historyList.indexOf(s),1);k.historyList.unshift(s),k.historyList.length>=10&&(k.historyList.length=10);y("searchHistory",k.historyList)}(s),h.$router.go("/pages/goods/list",{keyword:s}))}function C(){d({title:"提示",content:"确认清除搜索历史吗?",success:function(s){s.confirm&&(k.historyTag=[],p("searchHistory"))}})}return t((()=>{k.historyList=e("searchHistory")||[]})),(s,t)=>{const e=i(_("uni-search-bar"),g),h=m,y=x,d=i(_("s-layout"),b);return a(),o(d,{class:"set-wrap",title:"搜索",bgStyle:{color:"#FFF"}},{default:r((()=>[l(h,{class:"ss-p-x-24"},{default:r((()=>[l(h,{class:"ss-flex ss-col-center"},{default:r((()=>[l(e,{class:"ss-flex-1",radius:"33",placeholder:"请输入关键字",cancelButton:"none",focus:!0,onConfirm:t[0]||(t[0]=s=>j(s.value))})])),_:1}),l(h,{class:"ss-flex ss-row-between ss-col-center"},{default:r((()=>[l(h,{class:"serach-history"},{default:r((()=>[c("搜索历史")])),_:1}),l(y,{class:"clean-history ss-reset-button",onClick:C},{default:r((()=>[c(" 清除搜索历史 ")])),_:1})])),_:1}),l(h,{class:"ss-flex ss-col-center ss-row-left ss-flex-wrap"},{default:r((()=>[(a(!0),n(f,null,u(k.historyList,((s,t)=>(a(),o(y,{class:"history-btn ss-reset-button",onClick:t=>j(s),key:t},{default:r((()=>[c(L(s),1)])),_:2},1032,["onClick"])))),128))])),_:1})])),_:1})])),_:1})}}},[["__scopeId","data-v-d3779116"]]);export{k as default};

+ 1 - 1
unpackage/dist/build/web/assets/pages-index-user.fb82afa3.js → unpackage/dist/build/web/assets/pages-index-user.4ed25cd9.js

@@ -1 +1 @@
-import{h as s,c as e,n as t,s as a,a as o,b as r,d as p,o as l,p as i,q as u,e as n,f as m,w as _,l as d,k as y,r as c,F as j,m as b,j as v}from"./index-f8bddd99.js";import{_ as g,a as f}from"./s-block.727700b7.js";import{_ as k}from"./s-layout.371535bd.js";import"./form.da68c851.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.8f086c11.js";import"./uni-badge.a05a0a55.js";import"./su-image.4ab6d30d.js";import"./su-swiper.b07c7652.js";import"./s-goods-column.50c235dd.js";import"./useGoods.93739f21.js";/* empty css                                                                     */import"./uni-load-more.3ba8d975.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.505e4112.js";import"./combination.aa187614.js";import"./const.dd4dedd7.js";import"./mp-html.fb44b569.js";import"./richtext.4a7e07d8.js";const x={__name:"user",setup(x){s();const h=e((()=>a.$store("app").template.user));console.log(h.value);const S=e((()=>a.$store("user").isLogin));return t((()=>{a.$store("user").updateUserData()})),o((()=>{a.$store("user").updateUserData(),setTimeout((function(){r()}),800)})),p((()=>{})),l((s=>{s.linkId&&i("linkId",s.linkId),S.value||u()})),(s,e)=>{var t;const a=d(b("s-block-item"),g),o=d(b("s-block"),f),r=d(b("s-layout"),k);return n(),m(r,{title:"我的",tabbar:"/pages/index/user",navbar:"custom",bgStyle:h.value.page,navbarStyle:null==(t=h.value.style)?void 0:t.navbar,onShareAppMessage:""},{default:_((()=>[(n(!0),y(j,null,c(h.value.components,((s,e)=>(n(),m(o,{key:e,styles:s.property.style},{default:_((()=>[v(a,{type:s.id,data:s.property,styles:s.property.style},null,8,["type","data","styles"])])),_:2},1032,["styles"])))),128))])),_:1},8,["bgStyle","navbarStyle"])}}};export{x as default};
+import{h as s,c as e,n as t,s as a,a as o,b as r,d as p,o as l,p as i,q as u,e as n,f as m,w as _,l as d,k as y,r as c,F as j,m as b,j as v}from"./index-d9239240.js";import{_ as g,a as f}from"./s-block.d449eedb.js";import{_ as k}from"./s-layout.2c6032ed.js";import"./form.fd4cb395.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.c583a476.js";import"./uni-badge.96ef0d44.js";import"./su-image.1fa1c5c2.js";import"./su-swiper.50b12a5a.js";import"./s-goods-column.2ed5220f.js";import"./useGoods.fbd70fd6.js";/* empty css                                                                     */import"./uni-load-more.a51b00ea.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.d587660f.js";import"./combination.466625d6.js";import"./const.af58d68f.js";import"./mp-html.d8fc4b91.js";import"./richtext.e1731e9f.js";const x={__name:"user",setup(x){s();const h=e((()=>a.$store("app").template.user));console.log(h.value);const S=e((()=>a.$store("user").isLogin));return t((()=>{a.$store("user").updateUserData()})),o((()=>{a.$store("user").updateUserData(),setTimeout((function(){r()}),800)})),p((()=>{})),l((s=>{s.linkId&&i("linkId",s.linkId),S.value||u()})),(s,e)=>{var t;const a=d(b("s-block-item"),g),o=d(b("s-block"),f),r=d(b("s-layout"),k);return n(),m(r,{title:"我的",tabbar:"/pages/index/user",navbar:"custom",bgStyle:h.value.page,navbarStyle:null==(t=h.value.style)?void 0:t.navbar,onShareAppMessage:""},{default:_((()=>[(n(!0),y(j,null,c(h.value.components,((s,e)=>(n(),m(o,{key:e,styles:s.property.style},{default:_((()=>[v(a,{type:s.id,data:s.property,styles:s.property.style},null,8,["type","data","styles"])])),_:2},1032,["styles"])))),128))])),_:1},8,["bgStyle","navbarStyle"])}}};export{x as default};

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-aftersale-apply.462cb7b8.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-aftersale-detail.59b339c3.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-aftersale-list.ef321cf1.js


+ 1 - 1
unpackage/dist/build/web/assets/pages-order-aftersale-log.918b6264.js → unpackage/dist/build/web/assets/pages-order-aftersale-log.24f14402.js

@@ -1 +1 @@
-import{e as t,f as e,w as s,j as a,B as l,g as i,t as o,u as d,v as n,s as r,E as c,i as u,y as m,o as f,l as _,k as p,r as y,F as x,m as g}from"./index-f8bddd99.js";import{_ as b}from"./s-layout.371535bd.js";import{_ as j}from"./_plugin-vue_export-helper.1b428a4d.js";import{A as h}from"./afterSale.8fcc09dd.js";import"./form.da68c851.js";const v=j({__name:"log-item",props:{item:{type:Object,default(){}},index:{type:Number,default:0},data:{type:Object,default(){}}},setup:m=>(f,_)=>{const p=c,y=u;return t(),e(y,{class:"log-item ss-flex"},{default:s((()=>[a(y,{class:"log-icon ss-flex-col ss-col-center ss-m-r-20"},{default:s((()=>[a(p,{class:l(["cicon-title",0===m.index?"activity-color":""])},null,8,["class"]),m.data.length-1!==m.index?(t(),e(y,{key:0,class:"line"})):i("",!0)])),_:1}),a(y,null,{default:s((()=>[a(y,{class:"text"},{default:s((()=>[o(d(m.item.content),1)])),_:1}),a(y,{class:"date"},{default:s((()=>[o(d(n(r).$helper.timeFormat(m.item.createTime,"yyyy-mm-dd hh:MM:ss")),1)])),_:1})])),_:1})])),_:1})}},[["__scopeId","data-v-bbeb067c"]]),k=j({__name:"log",setup(l){const i=m({list:[]});return f((t=>{i.aftersaleId=t.id,async function(t){const{data:e}=await h.getAfterSaleLogList(t);i.list=e}(t.id)})),(l,o)=>{const d=u,n=_(g("s-layout"),b);return t(),e(n,{title:"售后进度"},{default:s((()=>[a(d,{class:"log-box"},{default:s((()=>[(t(!0),p(x,null,y(i.list,((l,o)=>(t(),e(d,{key:l.id},{default:s((()=>[a(v,{item:l,index:o,data:i.list},null,8,["item","index","data"])])),_:2},1024)))),128))])),_:1})])),_:1})}}},[["__scopeId","data-v-b61de3f9"]]);export{k as default};
+import{e as t,f as e,w as s,j as a,B as l,g as i,t as o,u as d,v as n,s as r,E as c,i as u,y as m,o as f,l as _,k as p,r as y,F as x,m as g}from"./index-d9239240.js";import{_ as b}from"./s-layout.2c6032ed.js";import{_ as j}from"./_plugin-vue_export-helper.1b428a4d.js";import{A as h}from"./afterSale.eb682946.js";import"./form.fd4cb395.js";const v=j({__name:"log-item",props:{item:{type:Object,default(){}},index:{type:Number,default:0},data:{type:Object,default(){}}},setup:m=>(f,_)=>{const p=c,y=u;return t(),e(y,{class:"log-item ss-flex"},{default:s((()=>[a(y,{class:"log-icon ss-flex-col ss-col-center ss-m-r-20"},{default:s((()=>[a(p,{class:l(["cicon-title",0===m.index?"activity-color":""])},null,8,["class"]),m.data.length-1!==m.index?(t(),e(y,{key:0,class:"line"})):i("",!0)])),_:1}),a(y,null,{default:s((()=>[a(y,{class:"text"},{default:s((()=>[o(d(m.item.content),1)])),_:1}),a(y,{class:"date"},{default:s((()=>[o(d(n(r).$helper.timeFormat(m.item.createTime,"yyyy-mm-dd hh:MM:ss")),1)])),_:1})])),_:1})])),_:1})}},[["__scopeId","data-v-bbeb067c"]]),k=j({__name:"log",setup(l){const i=m({list:[]});return f((t=>{i.aftersaleId=t.id,async function(t){const{data:e}=await h.getAfterSaleLogList(t);i.list=e}(t.id)})),(l,o)=>{const d=u,n=_(g("s-layout"),b);return t(),e(n,{title:"售后进度"},{default:s((()=>[a(d,{class:"log-box"},{default:s((()=>[(t(!0),p(x,null,y(i.list,((l,o)=>(t(),e(d,{key:l.id},{default:s((()=>[a(v,{item:l,index:o,data:i.list},null,8,["item","index","data"])])),_:2},1024)))),128))])),_:1})])),_:1})}}},[["__scopeId","data-v-b61de3f9"]]);export{k as default};

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-aftersale-return-delivery.2b433c5c.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-confirm.b24fd408.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-detail.67cb31be.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-express-log.ae811fa9.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-list.f7f0cb08.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-otherlist.04c69a58.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-pay-index.2683b670.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-pay-recharge-log.6a11c179.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-pay-recharge.35e15910.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-pay-result.0a2b7e91.js


+ 1 - 1
unpackage/dist/build/web/assets/pages-public-error.701b6e50.js → unpackage/dist/build/web/assets/pages-public-error.74cc7539.js

@@ -1 +1 @@
-import{K as t,o as e,e as o,f as n,w as a,i as s,g as r,aT as i,bu as c,l,m as p}from"./index-f8bddd99.js";import{_ as u}from"./s-empty.1db6ca8e.js";import{_ as m}from"./_plugin-vue_export-helper.1b428a4d.js";/* empty css                                                                */const _=m({__name:"error",setup(m){const _=t(""),f=t("");async function x(){i({url:"/pages/index/index"}),await c()}return e((t=>{_.value=t.errCode,f.value=t.errMsg})),(t,e)=>{const i=l(p("s-empty"),u),c=s;return o(),n(c,{class:"error-page"},{default:a((()=>["NetworkError"===_.value?(o(),n(i,{key:0,icon:"/static/internet-empty.png",text:"网络连接失败",showAction:"",actionText:"重新连接",onClickAction:x,buttonColor:"#ff3000"})):"TemplateError"===_.value?(o(),n(i,{key:1,icon:"/static/internet-empty.png",text:"未找到模板",showAction:"",actionText:"重新加载",onClickAction:x,buttonColor:"#ff3000"})):""!==_.value?(o(),n(i,{key:2,icon:"/static/internet-empty.png",text:f.value,showAction:"",actionText:"重新加载",onClickAction:x,buttonColor:"#ff3000"},null,8,["text"])):r("",!0)])),_:1})}}},[["__scopeId","data-v-88db9efc"]]);export{_ as default};
+import{K as t,o as e,e as o,f as n,w as a,i as s,g as r,aT as i,bu as c,l,m as p}from"./index-d9239240.js";import{_ as u}from"./s-empty.c20f6be9.js";import{_ as m}from"./_plugin-vue_export-helper.1b428a4d.js";/* empty css                                                                */const _=m({__name:"error",setup(m){const _=t(""),f=t("");async function x(){i({url:"/pages/index/index"}),await c()}return e((t=>{_.value=t.errCode,f.value=t.errMsg})),(t,e)=>{const i=l(p("s-empty"),u),c=s;return o(),n(c,{class:"error-page"},{default:a((()=>["NetworkError"===_.value?(o(),n(i,{key:0,icon:"/static/internet-empty.png",text:"网络连接失败",showAction:"",actionText:"重新连接",onClickAction:x,buttonColor:"#ff3000"})):"TemplateError"===_.value?(o(),n(i,{key:1,icon:"/static/internet-empty.png",text:"未找到模板",showAction:"",actionText:"重新加载",onClickAction:x,buttonColor:"#ff3000"})):""!==_.value?(o(),n(i,{key:2,icon:"/static/internet-empty.png",text:f.value,showAction:"",actionText:"重新加载",onClickAction:x,buttonColor:"#ff3000"},null,8,["text"])):r("",!0)])),_:1})}}},[["__scopeId","data-v-88db9efc"]]);export{_ as default};

+ 1 - 1
unpackage/dist/build/web/assets/pages-public-faq.89343a46.js → unpackage/dist/build/web/assets/pages-public-faq.50837fff.js

@@ -1 +1 @@
-import{y as s,o as t,s as e,e as a,f as l,w as o,l as c,j as r,k as i,r as n,F as p,g as u,m as _,t as m,u as f,i as d,E as g}from"./index-f8bddd99.js";import{_ as y,a as x}from"./uni-collapse.8d112671.js";import{_ as j}from"./s-empty.1db6ca8e.js";import{_ as b}from"./s-layout.371535bd.js";import{_ as h}from"./_plugin-vue_export-helper.1b428a4d.js";import"./form.da68c851.js";/* empty css                                                                */const v=h({__name:"faq",setup(h){const v=s({list:[],loading:!0});return t((()=>{e.$router.go("/pages/public/richtext",{title:"常见问题"})})),(s,t)=>{const e=d,h=g,F=c(_("uni-collapse-item"),y),k=c(_("uni-collapse"),x),w=c(_("s-empty"),j),I=c(_("s-layout"),b);return a(),l(I,{class:"set-wrap",title:"常见问题",bgStyle:{color:"#FFF"}},{default:o((()=>[r(k,null,{default:o((()=>[(a(!0),i(p,null,n(v.list,((s,t)=>(a(),l(F,{key:s},{title:o((()=>[r(e,{class:"ss-flex ss-col-center header"},{default:o((()=>[r(e,{class:"ss-m-l-20 ss-m-r-20 icon"},{default:o((()=>[r(e,{class:"rectangle"},{default:o((()=>[r(e,{class:"num ss-flex ss-row-center ss-col-center"},{default:o((()=>[m(f(t+1<10?"0"+(t+1):t+1),1)])),_:2},1024)])),_:2},1024),r(e,{class:"triangle"})])),_:2},1024),r(e,{class:"title ss-m-t-36 ss-m-b-36"},{default:o((()=>[m(f(s.title),1)])),_:2},1024)])),_:2},1024)])),default:o((()=>[r(e,{class:"content ss-p-l-78 ss-p-r-40 ss-p-b-50 ss-p-t-20"},{default:o((()=>[r(h,{class:"text"},{default:o((()=>[m(f(s.content),1)])),_:2},1024)])),_:2},1024)])),_:2},1024)))),128))])),_:1}),0!==v.list.length||v.loading?u("",!0):(a(),l(w,{key:0,text:"暂无常见问题",icon:"/static/collect-empty.png"}))])),_:1})}}},[["__scopeId","data-v-d403c664"]]);export{v as default};
+import{y as s,o as t,s as e,e as a,f as l,w as o,l as c,j as r,k as i,r as n,F as p,g as u,m as _,t as m,u as f,i as d,E as g}from"./index-d9239240.js";import{_ as y,a as x}from"./uni-collapse.6bda1483.js";import{_ as j}from"./s-empty.c20f6be9.js";import{_ as b}from"./s-layout.2c6032ed.js";import{_ as h}from"./_plugin-vue_export-helper.1b428a4d.js";import"./form.fd4cb395.js";/* empty css                                                                */const v=h({__name:"faq",setup(h){const v=s({list:[],loading:!0});return t((()=>{e.$router.go("/pages/public/richtext",{title:"常见问题"})})),(s,t)=>{const e=d,h=g,F=c(_("uni-collapse-item"),y),k=c(_("uni-collapse"),x),w=c(_("s-empty"),j),I=c(_("s-layout"),b);return a(),l(I,{class:"set-wrap",title:"常见问题",bgStyle:{color:"#FFF"}},{default:o((()=>[r(k,null,{default:o((()=>[(a(!0),i(p,null,n(v.list,((s,t)=>(a(),l(F,{key:s},{title:o((()=>[r(e,{class:"ss-flex ss-col-center header"},{default:o((()=>[r(e,{class:"ss-m-l-20 ss-m-r-20 icon"},{default:o((()=>[r(e,{class:"rectangle"},{default:o((()=>[r(e,{class:"num ss-flex ss-row-center ss-col-center"},{default:o((()=>[m(f(t+1<10?"0"+(t+1):t+1),1)])),_:2},1024)])),_:2},1024),r(e,{class:"triangle"})])),_:2},1024),r(e,{class:"title ss-m-t-36 ss-m-b-36"},{default:o((()=>[m(f(s.title),1)])),_:2},1024)])),_:2},1024)])),default:o((()=>[r(e,{class:"content ss-p-l-78 ss-p-r-40 ss-p-b-50 ss-p-t-20"},{default:o((()=>[r(h,{class:"text"},{default:o((()=>[m(f(s.content),1)])),_:2},1024)])),_:2},1024)])),_:2},1024)))),128))])),_:1}),0!==v.list.length||v.loading?u("",!0):(a(),l(w,{key:0,text:"暂无常见问题",icon:"/static/collect-empty.png"}))])),_:1})}}},[["__scopeId","data-v-d403c664"]]);export{v as default};

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-public-setting.fed93ad1.js


+ 1 - 1
unpackage/dist/build/web/assets/pages-public-webview.8d4406f4.js → unpackage/dist/build/web/assets/pages-public-webview.b1aba11b.js

@@ -1 +1 @@
-import{K as e,o as s,e as a,f as n,w as t,i as o,j as r,bv as u}from"./index-f8bddd99.js";const l={__name:"webview",setup(l){const c=e("");return s((e=>{c.value=decodeURIComponent(e.url)})),(e,s)=>{const l=u,d=o;return a(),n(d,null,{default:t((()=>[r(l,{src:c.value},null,8,["src"])])),_:1})}}};export{l as default};
+import{K as e,o as s,e as a,f as n,w as t,i as o,j as r,bv as u}from"./index-d9239240.js";const l={__name:"webview",setup(l){const c=e("");return s((e=>{c.value=decodeURIComponent(e.url)})),(e,s)=>{const l=u,d=o;return a(),n(d,null,{default:t((()=>[r(l,{src:c.value},null,8,["src"])])),_:1})}}};export{l as default};

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-shop-index.52c74672.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-address-edit.3ae8ff97.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-address-list.ce0e60de.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-goods-collect.8a94b552.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-goods-log.dd945953.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-info.1824a04e.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-invoice-edit.ce1e59b1.js


+ 1 - 1
unpackage/dist/build/web/assets/pages-user-invoice-list.59565270.js → unpackage/dist/build/web/assets/pages-user-invoice-list.a9050eff.js

@@ -1 +1 @@
-import{y as s,n as a,L as t,M as e,p as o,e as r,f as i,w as l,l as d,k as n,r as m,F as p,g as _,j as u,v as f,s as c,t as g,m as y,i as j,G as b,at as k}from"./index-f8bddd99.js";import{_ as x}from"./s-address-item.18c8717e.js";import{a as h,_ as v}from"./s-layout.371535bd.js";import{_ as A}from"./s-empty.1db6ca8e.js";import{A as w}from"./area.f4e2f02d.js";import{A as F}from"./address.cf2f89d9.js";import{_ as S}from"./_plugin-vue_export-helper.1b428a4d.js";import"./form.da68c851.js";/* empty css                                                                */const C=S({__name:"list",setup(S){const C=s({list:[],loading:!0});return a((async()=>{C.list=(await F.getAddressList()).data,C.loading=!1})),t((()=>{e("areaData")||w.getAreaTree().then((s=>{0===s.code&&o("areaData",s.data)}))})),(s,a)=>{const t=d(y("s-address-item"),x),e=j,o=b,w=d(y("su-fixed"),h),F=d(y("s-empty"),A),S=d(y("s-layout"),v);return r(),i(S,{title:"发票抬头管理",bgStyle:{color:"#FFF"}},{default:l((()=>[C.list.length?(r(),i(e,{key:0},{default:l((()=>[(r(!0),n(p,null,m(C.list,(s=>(r(),i(t,{hasBorderBottom:"",key:s.id,item:s,onClick:a=>(k("SELECT_ADDRESS",{addressInfo:s}),void c.$router.back())},null,8,["item","onClick"])))),128))])),_:1})):_("",!0),u(w,{bottom:"",placeholder:""},{default:l((()=>[u(e,{class:"footer-box ss-flex ss-row-between ss-p-20"},{default:l((()=>[u(o,{class:"add-btn ss-reset-button ui-Shadow-Main",onClick:a[0]||(a[0]=s=>f(c).$router.go("/pages/user/invoice/edit"))},{default:l((()=>[g(" 新增发票抬头 ")])),_:1})])),_:1})])),_:1}),0!==C.list.length||C.loading?_("",!0):(r(),i(F,{key:1,text:"暂无发票抬头",icon:"/static/data-empty.png"}))])),_:1})}}},[["__scopeId","data-v-0bd54ac4"]]);export{C as default};
+import{y as s,n as a,L as t,M as e,p as o,e as r,f as i,w as l,l as d,k as n,r as m,F as p,g as _,j as u,v as f,s as c,t as g,m as y,i as j,G as b,at as k}from"./index-d9239240.js";import{_ as x}from"./s-address-item.6ad415f3.js";import{a as h,_ as v}from"./s-layout.2c6032ed.js";import{_ as A}from"./s-empty.c20f6be9.js";import{A as w}from"./area.6376b5a4.js";import{A as F}from"./address.8dffaaef.js";import{_ as S}from"./_plugin-vue_export-helper.1b428a4d.js";import"./form.fd4cb395.js";/* empty css                                                                */const C=S({__name:"list",setup(S){const C=s({list:[],loading:!0});return a((async()=>{C.list=(await F.getAddressList()).data,C.loading=!1})),t((()=>{e("areaData")||w.getAreaTree().then((s=>{0===s.code&&o("areaData",s.data)}))})),(s,a)=>{const t=d(y("s-address-item"),x),e=j,o=b,w=d(y("su-fixed"),h),F=d(y("s-empty"),A),S=d(y("s-layout"),v);return r(),i(S,{title:"发票抬头管理",bgStyle:{color:"#FFF"}},{default:l((()=>[C.list.length?(r(),i(e,{key:0},{default:l((()=>[(r(!0),n(p,null,m(C.list,(s=>(r(),i(t,{hasBorderBottom:"",key:s.id,item:s,onClick:a=>(k("SELECT_ADDRESS",{addressInfo:s}),void c.$router.back())},null,8,["item","onClick"])))),128))])),_:1})):_("",!0),u(w,{bottom:"",placeholder:""},{default:l((()=>[u(e,{class:"footer-box ss-flex ss-row-between ss-p-20"},{default:l((()=>[u(o,{class:"add-btn ss-reset-button ui-Shadow-Main",onClick:a[0]||(a[0]=s=>f(c).$router.go("/pages/user/invoice/edit"))},{default:l((()=>[g(" 新增发票抬头 ")])),_:1})])),_:1})])),_:1}),0!==C.list.length||C.loading?_("",!0):(r(),i(F,{key:1,text:"暂无发票抬头",icon:"/static/data-empty.png"}))])),_:1})}}},[["__scopeId","data-v-0bd54ac4"]]);export{C as default};

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-qrcode-share.780d8503.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-qrcode-share.b8064bb4.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-setting.9ee67fa7.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-wallet-money.ab08e581.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-wallet-score.220c66a4.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-wallet-score.870a135b.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-wallet-scoreToMoney.f310d48d.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-wallet-team.d458866f.js


+ 1 - 1
unpackage/dist/build/web/assets/rewardActivity.f538df69.js → unpackage/dist/build/web/assets/rewardActivity.765de964.js

@@ -1 +1 @@
-import{Z as t}from"./index-f8bddd99.js";const r={getRewardActivity:r=>t({url:"/promotion/reward-activity/get",method:"GET",params:{id:r}})};export{r as R};
+import{Z as t}from"./index-d9239240.js";const r={getRewardActivity:r=>t({url:"/promotion/reward-activity/get",method:"GET",params:{id:r}})};export{r as R};

+ 1 - 1
unpackage/dist/build/web/assets/richtext.4a7e07d8.js → unpackage/dist/build/web/assets/richtext.e1731e9f.js

@@ -1 +1 @@
-import{Z as t,y as e,o as l,b7 as s,e as i,f as a,w as o,l as n,j as r,m as c,i as p}from"./index-f8bddd99.js";import{_ as u}from"./mp-html.fb44b569.js";import{_ as m}from"./s-layout.371535bd.js";import{_ as d}from"./_plugin-vue_export-helper.1b428a4d.js";const _={getArticle:(e,l)=>t({url:"/promotion/article/get",method:"GET",params:{id:e,title:l}})},f=d({__name:"richtext",props:{title:{defautls:"",type:String},type:{defautls:"",type:String}},setup(t){const d=e({title:"",content:""});const f=t;return l((t=>{(t.title||f.title)&&(d.title=t.title||f.title,s({title:d.title||f.title})),async function(t,e){const{code:l,data:i}=await _.getArticle(t,e);0===l&&(d.content=i.content,d.title!==i.title&&(d.title=i.title,s({title:d.title})))}(t.id,t.title||f.title)})),(e,l)=>{const s=n(c("mp-html"),u),_=p,f=n(c("s-layout"),m);return d.title&&!t.type?(i(),a(f,{key:0,class:"set-wrap",title:d.title,bgStyle:{color:"#FFF"}},{default:o((()=>[r(_,{class:"ss-p-30"},{default:o((()=>[r(s,{class:"richtext",content:d.content},null,8,["content"])])),_:1})])),_:1},8,["title"])):(i(),a(s,{key:1,class:"richtext",content:d.content},null,8,["content"]))}}},[["__scopeId","data-v-5342d437"]]),y=Object.freeze(Object.defineProperty({__proto__:null,default:f},Symbol.toStringTag,{value:"Module"}));export{_ as A,y as a,f as r};
+import{Z as t,y as e,o as l,b7 as s,e as i,f as a,w as o,l as n,j as r,m as c,i as p}from"./index-d9239240.js";import{_ as u}from"./mp-html.d8fc4b91.js";import{_ as m}from"./s-layout.2c6032ed.js";import{_ as d}from"./_plugin-vue_export-helper.1b428a4d.js";const _={getArticle:(e,l)=>t({url:"/promotion/article/get",method:"GET",params:{id:e,title:l}})},f=d({__name:"richtext",props:{title:{defautls:"",type:String},type:{defautls:"",type:String}},setup(t){const d=e({title:"",content:""});const f=t;return l((t=>{(t.title||f.title)&&(d.title=t.title||f.title,s({title:d.title||f.title})),async function(t,e){const{code:l,data:i}=await _.getArticle(t,e);0===l&&(d.content=i.content,d.title!==i.title&&(d.title=i.title,s({title:d.title})))}(t.id,t.title||f.title)})),(e,l)=>{const s=n(c("mp-html"),u),_=p,f=n(c("s-layout"),m);return d.title&&!t.type?(i(),a(f,{key:0,class:"set-wrap",title:d.title,bgStyle:{color:"#FFF"}},{default:o((()=>[r(_,{class:"ss-p-30"},{default:o((()=>[r(s,{class:"richtext",content:d.content},null,8,["content"])])),_:1})])),_:1},8,["title"])):(i(),a(s,{key:1,class:"richtext",content:d.content},null,8,["content"]))}}},[["__scopeId","data-v-5342d437"]]),y=Object.freeze(Object.defineProperty({__proto__:null,default:f},Symbol.toStringTag,{value:"Module"}));export{_ as A,y as a,f as r};

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