20240503常规更新

pages/goods/comment/add.vue

@@ -28,7 +28,7 @@
 								placeholder="宝贝满足你的期待吗？说说你的使用心得，分享给想买的他们吧~" />
 							<!-- TODO 非繁人：文件上传 -->
 							<view class="img-box">
-								<s-uploader v-model:url="state.commentList[index].images" fileMediatype="image"
+								<s-uploader v-model:url="state.commentList[index].picUrls" fileMediatype="image"
 									limit="9" mode="grid" :imageStyles="{ width: '168rpx', height: '168rpx' }" />
 							</view>
 						</view>

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), // 商品价格

pages/index/user.vue

@@ -27,7 +27,6 @@
   uni.hideTabBar();
 
   const template = computed(() => sheep.$store('app').template.user);
-  console.log(template.value)
   const isLogin = computed(() => sheep.$store('user').isLogin);
 
   onShow(() => {

pages/order/aftersale/apply.vue

@@ -67,7 +67,7 @@
           <!-- TODO 非繁人：上传的测试 -->
           <view class="upload-img">
             <s-uploader
-              v-model:url="formData.images"
+              v-model:url="formData.applyPicUrls"
               fileMediatype="image"
               limit="9"
               mode="grid"
@@ -158,7 +158,7 @@
     way: '',
     applyReason: '',
     applyDescription: '',
-    images: [],
+    applyPicUrls: [],
   });
   const rules = reactive({});
 

pages/order/confirm.vue

@@ -14,9 +14,9 @@
 			<view class="title-text ss-p-x-20 ss-p-t-20">
 				{{name}}
 			</view>
-			<s-goods-item v-for="item in items.items" :key="item?.skuId" :img="item?.picUrl"
-				:title="item?.spuName" :skuText="item?.properties.map((property) => property.valueName).join(' ')"
-				:price="item?.price" :num="item?.count" />
+			<s-goods-item v-for="item in items.items" :key="item?.skuId" :img="item?.picUrl" :title="item?.spuName"
+				:skuText="item?.properties.map((property) => property.valueName).join(' ')" :price="item?.price"
+				:num="item?.count" />
 			<view class="order-item ss-flex ss-col-center ss-row-between ss-p-x-20 bg-white ss-r-10">
 				<view class="item-title">运费</view>
 				<view class="ss-flex ss-col-center">
@@ -39,8 +39,8 @@
 			<view class="order-item ss-flex ss-col-center ss-row-between ss-p-x-20 bg-white ss-r-10">
 				<view class="item-title">订单备注</view>
 				<view class="ss-flex ss-col-center">
-					<uni-easyinput maxlength="20" placeholder="建议留言前先与商家沟通" v-model="items.remark"
-						:inputBorder="false" :clearable="false" />
+					<uni-easyinput maxlength="20" placeholder="建议留言前先与商家沟通" v-model="items.remark" :inputBorder="false"
+						:clearable="false" />
 				</view>
 			</view>
 			<view class="order-item ss-flex ss-col-center ss-row-between ss-p-x-20 bg-white ss-r-10">
@@ -146,9 +146,10 @@
 				<view class="total-num text-red"> ￥{{ fen2yuan(state.orderInfo.price.payPrice) }} </view>
 			</view>
 		</view>
-  
+
 		<!-- 积分-->
-		<s-points-pop v-model="state.couponInfo" :currentMemberPoints="state.currentMemberPoints" :currentTotalPrice="state.currentTotalPrice" :show="state.showPoints" @confirm="onInputPoints"
+		<s-points-pop v-model="state.couponInfo" :currentMemberPoints="state.currentMemberPoints"
+			:currentTotalPrice="state.currentTotalPrice" :currentDeliveryPrice="state.currentDeliveryPrice" :show="state.showPoints" @confirm="onInputPoints"
 			@close="state.showPoints = false" />
 
 		<!-- 满额折扣弹框 TODO 非繁人：后续要把优惠信息打进去 -->
@@ -177,7 +178,7 @@
 <script setup>
 	import {
 		reactive,
-		computed 
+		computed
 	} from 'vue';
 	import {
 		onLoad
@@ -203,33 +204,38 @@
 		showPoints: false, // 是否积分抵扣
 		couponInfo: [], // 优惠劵列表
 		showDiscount: false, // 是否展示营销活动
-		currentMemberPoints:0 ,//用户当前可用积分
-		usedPoint:0, //用户使用的积分 
-		currentTotalPrice:0 //当前的整个订单的总价格
+		currentMemberPoints: 0, //用户当前可用积分
+		usedPoint: 0, //用户使用的积分 
+		currentTotalPrice: 0 ,//当前的整个订单的总价格
+		currentDeliveryPrice:0 // 当前订单的总运费
 	});
-	
+
 	// 返回来的数据根据店铺名过滤 TODO
 	const shopsByNames = computed(() => {
-	  const shops = {};
-	  Object.keys(state.orderInfo.shopRespVOMap).forEach(shopId => {
-	    const shopName = state.orderInfo.shopNameMap[shopId];
-	    if (shopName) {
-	      shops[shopName] = state.orderInfo.shopRespVOMap[shopId];
-		  shops[shopName].remark = ""
-		  shops[shopName].shopId = shopId
-	    }
-	  });
-	  return shops;
+		const shops = {};
+		try {
+			Object.keys(state.orderInfo.shopRespVOMap).forEach(shopId => {
+				const shopName = state.orderInfo.shopNameMap[shopId];
+				if (shopName) {
+					shops[shopName] = state.orderInfo.shopRespVOMap[shopId];
+					shops[shopName].remark = ""
+					shops[shopName].shopId = shopId
+				}
+			});
+		} catch (e) {
+			// console.log(e)
+		}
+		return shops;
 	});
 	// 计算所有商品的总数
 	const totalItemCount = computed(() => {
-	  let totalCount = 0;
-	  Object.values(shopsByNames.value).forEach(shop => {
-	    shop.items.forEach(item => {
-	      totalCount += item.count;
-	    });
-	  });
-	  return totalCount;
+		let totalCount = 0;
+		Object.values(shopsByNames.value).forEach(shop => {
+			shop.items.forEach(item => {
+				totalCount += item.count;
+			});
+		});
+		return totalCount;
 	});
 	// 选择地址
 	function onSelectAddress() {
@@ -250,7 +256,7 @@
 	// 使用积分
 	async function onInputPoints(points) {
 
-		if(points == undefined){
+		if (points == undefined) {
 			points = 0
 		}
 		const payprice = state.currentTotalPrice
@@ -268,17 +274,17 @@
 
 		submitOrder();
 	}
-	
+
 	// 创建订单&跳转
 	async function submitOrder() {
 		// 处理每个店铺的留言 以{店铺id:留言}的形式返回
 		const shops = shopsByNames.value;
 		const shopRemarks = {};
 		Object.keys(shops).forEach(shopName => {
-		  const shop = shops[shopName];
-		  shopRemarks[shop.shopId]=shop.remark;
+			const shop = shops[shopName];
+			shopRemarks[shop.shopId] = shop.remark;
 		});
-		
+
 		const {
 			code,
 			data
@@ -291,8 +297,8 @@
 			combinationActivityId: state.orderPayload.combinationActivityId,
 			combinationHeadId: state.orderPayload.combinationHeadId,
 			seckillActivityId: state.orderPayload.seckillActivityId,
-			payIntegral:state.usedPoint,
-			shopRemarks:shopRemarks
+			payIntegral: state.usedPoint,
+			shopRemarks: shopRemarks
 		});
 		if (code !== 0) {
 			return;
@@ -309,7 +315,15 @@
 
 	// 检查库存 & 计算订单价格
 	async function getOrderInfo() {
-		// 计算价格
+		//  每次查询设置订单之前  看有没有评论 如果有评论就存到shopRemarks
+		const shops = shopsByNames.value
+		let shopRemarks = {};
+		if(Object.keys(shops).length !== 0){
+			Object.keys(shops).forEach(shopName => {
+				const shop = shops[shopName];
+				shopRemarks[shopName] = shop.remark;
+			});
+		}
 		const {
 			data,
 			code
@@ -322,23 +336,33 @@
 			combinationActivityId: state.orderPayload.combinationActivityId,
 			combinationHeadId: state.orderPayload.combinationHeadId,
 			seckillActivityId: state.orderPayload.seckillActivityId,
-			usedPoint:state.usedPoint
+			usedPoint: state.usedPoint
 		});
 		if (code !== 0) {
 			return;
 		}
 		state.orderInfo = data;
+		// 如果shopRemarks有评论的话 就放回shopsByNames
+		if(Object.keys(shopRemarks).length !== 0){
+			Object.keys(shopRemarks).forEach(shopName => {
+				shopsByNames.value[shopName].remark = shopRemarks[shopName]
+			});
+		}
+		
 		// 设置收货地址
 		if (state.orderInfo.address) {
 			state.addressInfo = state.orderInfo.address;
 		}
 		state.currentMemberPoints = points2point(state.orderInfo.currentQuota)
 		state.currentTotalPrice = fen2yuan(state.orderInfo.price.payPrice)
+		state.currentDeliveryPrice = fen2yuan(state.orderInfo.price.deliveryPrice)
+		// console.log("父",state.currentTotalPrice)
+
 	}
-	
-	
-	
-	
+
+
+
+
 	// 获取可用优惠券
 	// async function getCoupons() {
 	// 	const {
@@ -354,7 +378,7 @@
 	// 		state.couponInfo = data;
 	// 	}
 	// }
-	
+
 	onLoad(async (options) => {
 		if (!options.data) {
 			sheep.$helper.toast('参数不正确，请检查！');

pages/order/express/log.vue

@@ -7,8 +7,10 @@
 				<uni-swiper-dot :info="goodsImages" :current="state.current" mode="round">
 					<swiper class="swiper-box">
 						<swiper-item v-for="(item, index) in goodsImages" :key="index">
-							<view class="image-container">
-								<image class="log-card-img" mode="aspectFill" :src="sheep.$url.static(item.image)" />
+							<view class="image-container" style="width: 100%; height: 100%;">
+								<view style="width: 100%;height: 106rpx;padding-top: 15%;">
+									<image class="log-card-img" mode="aspectFill" :src="sheep.$url.static(item.image)" style="width: 100%;height: 100%;object-fit: cover;"/>
+								</view>
 							</view>
 						</swiper-item>
 					</swiper>
@@ -118,29 +120,29 @@
 			border: 2rpx solid #f6f6f6;
 		}
 
-		.image-container {
-			width: 100%;
-			/* 容器宽度100% */
-			position: relative;
-			/* 相对定位 */
-			overflow: hidden;
-			/* 隐藏超出部分 */
-			padding-top: 56.25%;
-			/* 9 / 16 = 0.5625, 即56.25% */
-		}
-
-		.log-card-img {
-			position: absolute;
-			/* 绝对定位 */
-			top: 0;
-			left: 0;
-			width: 100%;
-			/* 图片宽度100% */
-			height: 100%;
-			/* 高度自动调整 */
-			object-fit: cover;
-			/* 覆盖填充方式，保持宽高比 */
-		}
+		// .image-container {
+		// 	width: 100%;
+		// 	/* 容器宽度100% */
+		// 	position: relative;
+		// 	/* 相对定位 */
+		// 	overflow: hidden;
+		// 	/* 隐藏超出部分 */
+		// 	padding-top: 56.25%;
+		// 	/* 9 / 16 = 0.5625, 即56.25% */
+		// }
+
+		// .log-card-img {
+		// 	position: absolute;
+		// 	/* 绝对定位 */
+		// 	top: 0;
+		// 	left: 0;
+		// 	width: 100%;
+		// 	/* 图片宽度100% */
+		// 	height: 100%;
+		// 	/* 高度自动调整 */
+		// 	object-fit: cover;
+		// 	/* 覆盖填充方式，保持宽高比 */
+		// }
 
 		uni-image>div {
 			background-size: contain;

pages/user/wallet/ScoreLog.vue

@@ -0,0 +1,274 @@
+<template>
+	<!-- 积分确权 -->
+	<view class="model-box ss-flex-col">
+		<scroll-view class="list-box" scroll-y="true" @touchmove.stop>
+			<view v-if="state.pagination.total > 0" style="padding: 20rpx 0 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:0;padding: 20rpx 0;border-bottom: 1px solid #c4c4c4;">
+					<view class="ss-flex ss-col-center" style="width: 100%;">
+						<view class="ss-flex ss-m-t-10"
+							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.freezeAmount < 0}" v-if="isFreeze">{{item.freezeAmount > 0 ? '+'+points2point(item.freezeAmount):+points2point(item.freezeAmount)}}
+								</text>
+								<text style="float: right;" class="color-red"
+									:class="{'color-green':item.amount < 0}" v-else>{{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;"
+									v-if="isFreeze">余额:{{ points2point(item.afterFreezeAmount)}}</text>
+								<!-- 已经拿到的积分 -->
+								<text style="float: right;" v-else>余额:{{points2point(item.afterAmount)}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<s-empty v-else text="暂无数据" paddingTop="200" icon="/static/data-empty.png" />
+			<uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
+					  contentdown: '点击加载更多',
+					}" @tap="onLoadMore(true)" @scrolltolower="onLoadMore(true)" />
+		</scroll-view>
+
+	</view>
+
+</template>
+
+<script setup>
+	import sheep from '@/sheep';
+	import {
+		onLoad,
+		onReachBottom
+	} from '@dcloudio/uni-app';
+	import {
+		computed,
+		reactive
+	} from 'vue';
+	import {
+		points2point
+	} from '@/sheep/hooks/useGoods';
+	import _ from 'lodash';
+	import dayjs from 'dayjs';
+	import PointApi from '@/sheep/api/member/point';
+	import {
+		resetPagination
+	} from '@/sheep/util';
+	import ScoreApi from '@/sheep/api/distri/score';
+
+	const userWallet = computed(() => sheep.$store('user').userWallet);
+	const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+	const userInfo = computed(() => sheep.$store('user').userInfo);
+	const sys_navBar = sheep.$platform.navbar;
+	const props = defineProps({
+		isFreeze: {
+			type: Boolean
+		}
+	})
+	const state = reactive({
+		currentTab: 0,
+		pagination: {
+			list: [],
+			total: 0,
+			pageSize: 10,
+			pageNo: 1,
+		},
+		loadStatus: '',
+		showModel: false,
+		showQueModel: false
+	});
+
+	async function getLogList(isFreeze) {
+		state.loadStatus = 'loading';
+		// isFreeze为true是冻结积分 isFreeze为false是已拿到的积分
+		let {
+			code,
+			data
+		} = await ScoreApi.getScoreApi({
+			pageNo: state.pagination.pageNo,
+			pageSize: state.pagination.pageSize,
+			isFreeze: isFreeze
+		});
+		if (code !== 0) {
+			return;
+		}
+		let list = _.concat(state.pagination.list, data.list);
+		state.pagination.list = list;
+		state.pagination.total = data.total;
+		state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+	}
+
+	onLoad(() => {
+		getLogList(props.isFreeze);
+	});
+
+
+	function onLoadMore(isFreeze) {
+		if (state.loadStatus === 'noMore') {
+			return;
+		}
+		state.pagination.pageNo++;
+		getLogList(isFreeze);
+	}
+
+	onReachBottom(() => {
+
+		onLoadMore();
+	});
+</script>
+
+<style lang="scss" scoped>
+	.color-red {
+		color: red;
+	}
+
+	.color-green {
+		color: green;
+	}
+
+	.score-box {
+		margin: 20rpx;
+		border-radius: 20rpx;
+		padding-top: 100rpx;
+	}
+
+	.avatar-box {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50%;
+		overflow: hidden;
+
+		.avatar-img {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.value-box {
+		width: 100rpx;
+		height: 100rpx;
+		line-height: 100rpx;
+		text-align: center;
+		border-radius: 50%;
+		border: 2px solid #f6f6f6;
+	}
+
+	.btn {
+		width: 300rpx;
+		background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+		border-radius: 20rpx;
+		font-size: 30rpx;
+		font-weight: 500;
+		line-height: 80rpx;
+		color: $white;
+		position: relative;
+		z-index: 1;
+	}
+
+	.header-box {
+		width: 100%;
+		background: linear-gradient(180deg, var(--ui-BG-Main) 0%, var(--ui-BG-Main-gradient) 100%) no-repeat;
+		background-size: 750rpx 100%;
+		padding: 0 0 120rpx 0;
+		box-sizing: border-box;
+
+		.score-box {
+			height: 100%;
+
+			.all-num {
+				font-size: 50rpx;
+				font-weight: bold;
+				color: #fff;
+				font-family: OPPOSANS;
+			}
+
+			.all-title {
+				font-size: 26rpx;
+				font-weight: 500;
+				color: #fff;
+			}
+
+			.cicon-help-o {
+				color: #fff;
+				font-size: 28rpx;
+			}
+		}
+	}
+
+	// 筛选
+	.filter-box {
+		height: 114rpx;
+		background-color: $bg-page;
+
+		.total-box {
+			font-size: 24rpx;
+			font-weight: 500;
+			color: $dark-9;
+		}
+
+		.date-btn {
+			background-color: $white;
+			line-height: 54rpx;
+			border-radius: 27rpx;
+			padding: 0 20rpx;
+			font-size: 24rpx;
+			font-weight: 500;
+			color: $dark-6;
+
+			.ss-seldate-icon {
+				font-size: 50rpx;
+				color: $dark-9;
+			}
+		}
+	}
+
+
+	.list-box {
+		width: 600rpx;
+		padding: 0 30rpx;
+		overflow-y: auto;
+		height: 80vh;
+
+		.list-item {
+
+			background: #fff;
+			// border-bottom: 1rpx solid #dfdfdf;
+			padding: 30rpx;
+
+			.name {
+				font-size: 28rpx;
+
+				font-weight: 500;
+				color: rgba(102, 102, 102, 1);
+				line-height: 28rpx;
+				// margin-bottom: 20rpx;
+			}
+
+			.time {
+				font-size: 24rpx;
+
+				font-weight: 500;
+				color: rgba(196, 196, 196, 1);
+				line-height: 24px;
+			}
+
+			.add {
+				font-size: 30rpx;
+
+				font-weight: 500;
+				color: #e6b873;
+			}
+
+			.minus {
+				font-size: 30rpx;
+
+				font-weight: 500;
+				color: $dark-3;
+			}
+		}
+	}
+</style>

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">
@@ -36,73 +36,12 @@
 		</view>
 		<!-- 积分来源 -->
 		<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 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;">
-							<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>
-									<view class="time " style="width: 100%;">
-										{{sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM')}}
-										<text style="float: right;">消费额:￥234</text>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-					<s-empty v-else text="暂无数据" paddingTop="120" icon="/static/data-empty.png" />
-				</scroll-view>
-			</view>
+			<ScoreLog :isFreeze="false"/>
 		</su-popup>
-
+		
 		<!-- 积分确权 -->
 		<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>
-				<!-- {{state.pagination.list}} -->
-				<scroll-view class="list-box" style="width: 600rpx;" scroll-y="true" @touchmove.stop>
-					<view v-if="!(state.pagination.total > 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;">
-							<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>
-									<view class="time " style="width: 100%;">
-										{{sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM')}}
-										<text style="float: right;">消费额:￥234</text>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-
-					<s-empty v-else text="暂无数据" paddingTop="80" icon="/static/data-empty.png" />
-				</scroll-view>
-			</view>
+			<ScoreLog :isFreeze="true"/>
 		</su-popup>
 	</s-layout>
 
@@ -128,7 +67,8 @@
 		resetPagination
 	} from '@/sheep/util';
 	import ScoreApi from '@/sheep/api/distri/score';
-
+	import ScoreLog from './ScoreLog'
+	
 	const userWallet = computed(() => sheep.$store('user').userWallet);
 	const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
 	const userInfo = computed(() => sheep.$store('user').userInfo);
@@ -137,60 +77,27 @@
 	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: 10,
 			pageNo: 1,
 		},
 		loadStatus: '',
-
+		showModel:false,
+		showQueModel:false
 	});
 
-
-
+	function close(){
+		state.showModel = false;
+		state.showQueModel = false;
+	}
+	function showModel(){
+		state.showModel = true;
+		
+	}
+	function showQueModel(){
+		state.showQueModel = true;
+	}
 	async function getLogList(isFreeze) {
 		state.loadStatus = 'loading';
 		// isFreeze为true是冻结积分 isFreeze为false是已拿到的积分
@@ -205,31 +112,39 @@
 		if (code !== 0) {
 			return;
 		}
-		state.pagination.list = data.list;
+		let list = _.concat(state.pagination.list, data.list);
+		state.pagination.list = list;
 		state.pagination.total = data.total;
 		state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
 	}
 
 	onLoad(() => {
-		// getLogList(true);
-		// getLogList(false);
+
 	});
 
 
-	function onLoadMore() {
+	function onLoadMore(isFreeze) {
+
 		if (state.loadStatus === 'noMore') {
 			return;
 		}
 		state.pagination.pageNo++;
-		getLogList();
+		getLogList(isFreeze);
 	}
 
 	onReachBottom(() => {
+
 		onLoadMore();
 	});
 </script>
 
 <style lang="scss" scoped>
+	.color-red{
+		color: red;
+	}
+	.color-green{
+		color: green;
+	}
 	.score-box {
 		margin: 20rpx;
 		border-radius: 20rpx;
@@ -325,11 +240,12 @@
 			}
 		}
 	}
-
+	.model-box{
+		height: 50vh;
+	}
 	.list-box {
 		width: 500rpx;
-		height: 600rpx;
-		padding: 0 20rpx;
+		padding: 0 30rpx;
 		overflow-y: auto;
 
 		.list-item {

pages/user/wallet/team.vue

@@ -4,9 +4,9 @@
 
 		<view class="model-box ss-flex-col">
 			<view class="all-title ss-p-x-45 ss-p-t-30">
-				 <text style="float: right;">共{{state.teamCount}}人</text>
+				<text style="float: right;">共{{state.teamCount}}人</text>
 			</view>
-			
+
 			<view class="list-box" style="width: 100%;padding: 0;height: calc(100vh - 5.5rem) ;">
 				<!-- 推荐人 -->
 				<view>
@@ -22,10 +22,15 @@
 							</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%;"> {{ state.ancestor.ancNickName  }} <text class="ss-m-l-16"  style="float: right;">推荐人</text></view>
+								<view class="name" style="width: 100%;">
+										<text style="width:40%;display: inline-block;">{{ state.ancestor.ancNickName  }}</text> 
+										<text >推荐人</text>
+										
+								</view>
 								<view class="time " style="width: 100%;">
-									身价
-									<text style="float: right;">{{sheep.$helper.timeFormat(state.ancestor.createTime, 'yyyy-mm-dd')}}</text>
+									{{state.ancestor.socialStatusLevel || "等级1"}}
+									<text
+										style="float: right;">{{sheep.$helper.timeFormat(state.ancestor.createTime, 'yyyy-mm-dd')}}</text>
 								</view>
 							</view>
 						</view>
@@ -36,7 +41,8 @@
 					<scroll-view style="width: 100%;" scroll-y="true" @touchmove.stop>
 						<view v-if="state.descendants.total > 0">
 							<view class="list-item ss-flex ss-col-center ss-row-between "
-								v-for="(item,index)  in state.descendants.list" :key="item.id" style="padding-top: 30rpx ;padding-bottom: 0;">
+								v-for="(item,index)  in state.descendants.list" :key="item.id"
+								style="padding-top: 30rpx ;padding-bottom: 0;">
 								<view class="ss-flex ss-col-center" style="width: 100%;">
 									<view>
 										{{item.sort}}
@@ -48,10 +54,17 @@
 									</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.descNickName || '空' }} <text style="float: right;">{{item.depth == 1?'直推人':'团队成员'}}</text></view>
+										<view class="name" style="width: 100%;">
+											<text style="width:40%;display: inline-block;"> {{ item.descNickName || '空' }}</text>
+											<text >{{item.depth == 1?'直推人':''}}</text>
+											<text style="float: right;">{{item.descendantsCount}}</text>
+
+										</view>
+										
 										<view class="time " style="width: 100%;">
-											身价
-											<text style="float: right;">{{sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd')}}</text>
+											{{item.socialStatusLevel}}
+											<text
+												style="float: right;">{{sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd')}}</text>
 										</view>
 									</view>
 								</view>
@@ -59,7 +72,7 @@
 						</view>
 						<s-empty v-else text="暂无团队成员" icon="/static/data-empty.png" />
 					</scroll-view>
-					
+
 				</view>
 			</view>
 		</view>
@@ -99,13 +112,13 @@
 			pageNo: 1,
 		},
 		loadStatus: '',
-		descendants:{
+		descendants: {
 			total: 0,
-			list:[]
+			list: []
 		},
-		teamCount:0,
-		ancestor:{
-			
+		teamCount: 0,
+		ancestor: {
+
 		}
 	});
 
@@ -134,13 +147,13 @@
 		state.teamCount = data.teamCount
 		// 直推人
 		state.ancestor = data.ancestor
-		
+
 		let descendantsList = _.concat(state.descendants.list, data.descendants.list);
-		
+
 		// 后代
 		state.descendants.list = descendantsList
-		console.log(state.descendants.list)
-		
+		// console.log(state.descendants.list)
+
 		// state.pagination.list = data.list;
 		state.descendants.total = data.descendants.total;
 		state.pagination.total = data.descendants.total;
@@ -179,10 +192,11 @@
 		border-radius: 50%;
 		overflow: hidden;
 		border: 1px solid #eaeaea;
+
 		.avatar-img {
 			width: 100%;
 			height: 100%;
-			
+
 		}
 	}
 

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;

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

@@ -2,6 +2,7 @@
 	<!-- 规格弹窗 -->
 	<su-popup :show="authType !== ''" round="10" :showClose="true" @close="closeAuthModal">
 		<view class="login-wrap">
+
 			<!-- 标题栏 -->
 			<view class="head-box " v-if="['smsLogin', 'accountLogin'].includes(authType)">
 				<view class="ss-flex ss-m-b-20">
@@ -12,8 +13,9 @@
 						短信登录
 					</view>
 					<view
-						:class="[isActive=='accountLogin'?`head-title head-title-line head-title-animation`:`head-title-active head-title-line`]"
-						@tap="isActive='accountLogin';showAuthModal('accountLogin')">
+						:class="[isActive=='accountLogin' ?`head-title head-title-line head-title-animation`:`head-title-active head-title-line`]"
+						@tap="isActive='accountLogin';showAuthModal('accountLogin','accountLogin')">
+						
 						账号登录
 					</view>
 
@@ -72,6 +74,7 @@
 			
 			
 			<!-- 7. 第三方登录 -->
+
 			<view v-if="['accountLogin', 'smsLogin'].includes(authType)"
 				class="auto-login-box ss-flex ss-flex-col ss-row-center ss-col-center">
 				<!-- 7.1 微信小程序的快捷登录 -->
@@ -119,7 +122,7 @@
 		computed,
 		reactive,
 		ref
-	} from 'vue';
+	} from 'vue';	
 	import sheep from '@/sheep';
 	import accountLogin from './components/account-login.vue';
 	import smsLogin from './components/sms-login.vue';
@@ -138,11 +141,14 @@
 	const modalStore = sheep.$store('modal');
 	// 授权弹窗类型
 	const authType = computed(() => modalStore.auth);
-
+	const isActive = computed(() => modalStore.isActive)
 	const state = reactive({
 		protocol: false,
 	});
-	const isActive = ref("smsLogin")
+
+	
+	
+
 	const currentProtocol = ref(false);
 
 	// 勾选协议

sheep/components/s-points-pop/s-points-pop.vue

@@ -14,7 +14,6 @@
 					@tap="state.points = 0;emits('confirm', state.points)">取消</button>
 				<button class="confirm-btn ss-reset-button" @tap="onConfirm">确认</button>
 			</view>
-			
 		</view>
 	</su-popup>
 </template>
@@ -38,15 +37,18 @@
 			default: false,
 		},
 		currentMemberPoints: {
-			type: String,
-			default: ''
+			type: Number,
+			default: 0
 		},
 		currentTotalPrice: {
-			type: String,
-			default: ''
+			type: Number,
+			default: 0
 		},
+		currentDeliveryPrice:{
+			type: Number,
+			default: 0
+		}
 	});
-	
 	const emits = defineEmits(['confirm', 'close']);
 	const state = reactive({
 		points: 0,
@@ -58,13 +60,16 @@
 	const currentOrderTotalPrice = computed(()=>{
 		return parseFloat(props.currentTotalPrice)
 	})
-	// 当前可使用的最高积分 是当前的总价格 - 1块钱 并且积分只能是正数
+	const currentOrderDeliveryPrice= computed(()=>{
+		return parseFloat(props.currentDeliveryPrice)
+	})
+	
+	// 当前可使用的最高积分 = 当前的总价格 - 0.01分钱（即最低也要给1分钱） 并且积分只能是正数 且不能抵扣运费
 	const canUesPoint = computed(()=>{
-		console.log("state.currentTotalPrice",parseInt(currentOrderTotalPrice.value - 1))
+		// console.log("state.currentTotalPrice",currentOrderTotalPrice.value - 1)
 		if(!currentOrderTotalPrice.value) return currentOrderTotalPrice.value
-		return parseInt(currentOrderTotalPrice.value - 1)
+		return (currentOrderTotalPrice.value - 0.01 - currentOrderDeliveryPrice.value).toFixed(2)
 	})
-
 	watchEffect(() => {
 		// 使用积分不能大于可用积分
 		if (state.points > currentOrderMemberPoints.value) {
@@ -74,20 +79,19 @@
 			});
 		}
 		// 使用积分不能大于当前可以使用的最大积分
-		console.log(state.points > canUesPoint.value)
 		if (state.points > canUesPoint.value) {
-			
-			console.log("newValue", state.points)
-			console.log("state.currentTotalPrice", canUesPoint.value)
-			// 使用 nextTick 确保 DOM 更新
 			nextTick(() => {
 				state.points = canUesPoint.value;
 			});
 		}
+
 		// 如果计算出来的当前可以使用的最大积分等于小于0 则不给输入
 		if(canUesPoint.value == 0 || canUesPoint.value < 0){
 			state.disabled = true
 		}
+		if(canUesPoint.value > 0){
+			state.disabled = false
+		}
 	})
 	// 确认
 	const onConfirm = () => {

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',
@@ -36,11 +37,11 @@
 	import {
 		reactive,
 		getCurrentInstance,
-		ref 
+		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,
@@ -57,6 +58,7 @@
 		width: sheep.$platform.device.windowWidth * 0.9,
 		height: 600,
 		src: '',
+		imgData:''
 	});
 
 	const emits = defineEmits(['success', 'close']);
@@ -83,14 +85,12 @@
 			},
 		});
 	};
-	
+	const imageUrl = ref("")
 
 	
 
 
 	async function getPoster(params) {
-		// const {data} = await FileApi.getFileIO("https://mall-ffkj.oss-cn-guangzhou.aliyuncs.com/1113667b212fe1ba9fb9c99c20fbcb61ff69fa2d8bc243cfdd40c3dfa06f9bb6.png")
-		// console.log(data)
 
 		poster.src = '';
 		poster.shareInfo = props.shareInfo;

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:4,
         paintbrushProps: {
-          fillStyle: '#ff0000',
+          fillStyle: '#333',
           font: {
-            fontSize: 20,
+            fontSize: 12,
             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

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

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

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

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

@@ -3,9 +3,12 @@
 	<view>
 		<view class="progress-box" @tap="state.showProtocol = true">
 			<view class="progress-container">
-				<view class="progress-bar" :style="{ width: progressWidth + '%' }">
-					<text class="progress-text">身价：36级别 </text>
+				<view class="progress-bar" :style="{ width: progressWidth }">
 				</view>
+				<view class="progress-text">
+					{{userWallet.socialStatusLevel || "无等级"}}
+				</view>
+
 			</view>
 		</view>
 		<!-- <view class="ss-wallet-menu-wrap ss-flex ss-col-center">
@@ -44,29 +47,30 @@
 				<view class="menu-title ss-m-t-15">点击跳转查看行情</view>
 			</view>
 		</view> -->
-		
+
 		<view class="ss-wallet-menu-wrap ss-flex ss-col-center">
-			<view class="menu-item ss-flex-1 ss-flex-col  ss-col-center"
+			<view class="menu-item ss-flex-1 ss-flex-col  ss-col-center ss-row-center"
 				@tap="sheep.$router.go('/pages/user/wallet/score')">
 				<view class="value-box ">
 					<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"
+			<view class="menu-item ss-flex-1 ss-flex-col  ss-col-center ss-row-center"
 				@tap="sheep.$router.go('/pages/user/wallet/team')">
 				<view class="value-box ">
 					<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="menu-title ss-m-t-15">{{ userWallet.descNo  }}人</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>
-		
+
 		<!-- 积分确权 -->
 		<su-popup :show="state.showProtocol" type="center" round="10" :isMaskClick="false" showClose @close="close">
 			<view class="head-nav">
@@ -102,7 +106,7 @@
 	} from '../../hooks/useGoods';
 	import richtext from '@/pages/public/richtext'
 
-	const progressWidth = 90
+
 	const state = reactive({
 		showProtocol: false,
 		navIndex: 0
@@ -110,6 +114,16 @@
 	const userWallet = computed(() => sheep.$store('user').userWallet);
 	const userInfo = computed(() => sheep.$store('user').userInfo);
 	const numData = computed(() => sheep.$store('user').numData);
+	const progressWidth = computed(() => {
+		if (!userWallet.value.socialStatusPoint && !userWallet.value.socialStatusPoint){
+			return "0%"
+		}
+		const progress = ((userWallet.value.socialStatusPoint / (userWallet.value.socialStatusPoint +
+		userWallet.value.socialUpNeed)) * 100) + "%"
+		console.log(progress)
+		return progress
+	})
+
 	// 查看协议
 	function onProtocol(title) {
 		sheep.$router.go('/pages/public/richtext', {
@@ -131,7 +145,7 @@
 		display: flex;
 		align-items: center;
 		color: #CCCCCC;
-		
+
 	}
 
 	.activite {
@@ -194,9 +208,11 @@
 	/* 进度文本 */
 	.progress-text {
 		color: white;
-		/* 文本颜色 */
-		font-size: 14px;
-		/* 字体大小 */
+		font-size: 16px;
+		position: absolute;
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%, -50%);
 	}
 
 	.ss-wallet-menu-wrap {
@@ -223,6 +239,7 @@
 			/* flex-grow: 0, flex-shrink: 0, flex-basis: 50% */
 			box-sizing: border-box;
 			padding: 20rpx;
+
 			/* 确保 padding 和 border 不会使元素宽度超过 50% */
 			/* 可选，为了视觉效果 */
 			.menu-title {
@@ -230,6 +247,7 @@
 				line-height: 34rpx;
 				color: #333333;
 			}
+
 			/* 可选，为了视觉效果 */
 			.menu-mini-title {
 				font-size: 20rpx;

sheep/hooks/useGoods.js

@@ -330,11 +330,11 @@ export function fen2yuan(price) {
 /**
  * 将后台积分转换为可使用积分
  *
- * @param point 分，例如说 10000 分
+ * @param point 分，例如说 1000000 分
  * @returns {string} 分，例如说 1.00 分
  */
 export function points2point(point) {
-  return (point / 10000.0).toFixed(2)
+  return (point / 1000000.0).toFixed(3).slice(0, -1) // 干掉四舍五入 实际返回不四舍五入的两位小数
 }
 
 

sheep/hooks/useModal.js

@@ -6,19 +6,20 @@ import test from '@/sheep/helper/test.js';
 import AuthUtil from '@/sheep/api/member/auth';
 
 // 打开授权弹框
-export function showAuthModal(type = 'smsLogin') {
-	console.log(type)
+export function showAuthModal(type = 'smsLogin',isActive = 'smsLogin') {
   const modal = $store('modal');
   if (modal.auth !== '') {
     closeAuthModal();
     setTimeout(() => {
       modal.$patch((state) => {
         state.auth = type;
+		state.isActive = isActive;
       });
     }, 100);
   } else {
     modal.$patch((state) => {
       state.auth = type;
+	  state.isActive = isActive;
     });
   }
 }

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 === '') {

sheep/store/app.js

@@ -76,10 +76,10 @@ const app = defineStore({
 					share: {
 						methods: ["poster", "link"],
 						// linkAddress: "http://localhost/#/", //跳转链接 
-						linkAddress: import.meta.env.SHOPRO_BASE_URL+"/#/", //跳转链接 
+						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"
 						}
 					},

sheep/store/cart.js

@@ -1,116 +1,132 @@
-import { defineStore } from 'pinia';
+import {
+	defineStore
+} from 'pinia';
 import CartApi from '@/sheep/api/trade/cart';
 
 const cart = defineStore({
-  id: 'cart',
-  state: () => ({
-	shopNameMap:[],
-	shopSkuMap:[],
-    list: [], // 购物车列表
-    selectedIds: [], // 已选列表
-    isAllSelected: false, // 是否全选
-    totalPriceSelected: 0, // 选中项总金额
-	
-  }),
-  actions: {
-    // 获取购物车列表
-    async getList() {
-      const { data, code } = await CartApi.getCartList();
-      if (code === 0) {
-        this.list = data.validList
-		this.shopSkuMap = data.shopSkuMap
-		this.shopNameMap = data.shopNameMap
-        // 计算各种关联属性
-        this.selectedIds = [];
-        this.isAllSelected = true;
-        this.totalPriceSelected = 0;
-        this.list.forEach((item) => {
-          if (item.selected) {
-            this.selectedIds.push(item.id);
-            this.totalPriceSelected += item.count * item.sku.price;
-          } else {
-            this.isAllSelected = false;
-          }
-        });
-      }
-    },
+	id: 'cart',
+	state: () => ({
+		shopNameMap: [],
+		shopSkuMap: [],
+		list: [], // 购物车列表
+		selectedIds: [], // 已选列表
+		isAllSelected: false, // 是否全选
+		totalPriceSelected: 0, // 选中项总金额
 
-    // 添加购物车
-    async add(goodsInfo) {
-      // 添加购物项
-      const { code } = await CartApi.addCart({
-        skuId: goodsInfo.id,
-        count: goodsInfo.goods_num,
-      });
-      // 刷新购物车列表
-      if (code === 0) {
-        await this.getList();
-      }
-    },
+	}),
+	actions: {
+		// 获取购物车列表
+		async getList() {
+			const {
+				data,
+				code
+			} = await CartApi.getCartList();
+			if (code === 0) {
+				this.list = data.validList
+				this.shopSkuMap = data.shopSkuMap
+				this.shopNameMap = data.shopNameMap
+				// 计算各种关联属性
+				this.selectedIds = [];
+				this.isAllSelected = true;
+				this.totalPriceSelected = 0;
+				this.list.forEach((item) => {
+					if (item.selected) {
+						this.selectedIds.push(item.id);
+						this.totalPriceSelected += item.count * item.sku.price;
+					} else {
+						this.isAllSelected = false;
+					}
+				});
+			}
+		},
 
-    // 更新购物车
-    async update(goodsInfo) {
-      const { code } = await CartApi.updateCartCount({
-        id: goodsInfo.goods_id,
-        count: goodsInfo.goods_num,
-      });
-      if (code === 0) {
-        await this.getList();
-      }
-    },
+		// 添加购物车
+		async add(goodsInfo) {
+			// 添加购物项
+			const {
+				code
+			} = await CartApi.addCart({
+				skuId: goodsInfo.id,
+				count: goodsInfo.goods_num,
+			});
+			// 刷新购物车列表
+			if (code === 0) {
+				await this.getList();
+			}
+		},
 
-    // 移除购物车
-    async delete(ids) {
-		// console.log(ids)
-	  if(typeof ids === 'number'){
-		  const { code } = await CartApi.deleteCart(ids);
-	  }else{
-		  const { code } = await CartApi.deleteCart(ids.join(','));
-	  }
-      
-      
-		await this.getList();
-      
-    },
 
-    // 单选购物车商品
-    async selectSingle(goodsId) {
-      const { code } = await CartApi.updateCartSelected({
-        ids: [goodsId],
-        selected: !this.selectedIds.includes(goodsId), // 取反
-      });
-      if (code === 0) {
-        await this.getList();
-      }
-    },
+		// 更新购物车
+		async update(goodsInfo) {
+			const {
+				code
+			} = await CartApi.updateCartCount({
+				id: goodsInfo.goods_id,
+				count: goodsInfo.goods_num,
+			});
+			if (code === 0) {
+				await this.getList();
+			}
+		},
 
-    // 全选购物车商品
-    async selectAll(flag) {
-      const { code } = await CartApi.updateCartSelected({
-        ids: this.list.map((item) => item.id),
-        selected: flag
-      });
-      if (code === 0) {
-        await this.getList();
-      }
-    },
 
-    // 清空购物车。注意，仅用于用户退出时，重置数据
-    emptyList() {
-      this.list = [];
-      this.selectedIds = [];
-      this.isAllSelected = true;
-      this.totalPriceSelected = 0;
-    },
-  },
-  persist: {
-    enabled: true,
-    strategies: [
-      {
-        key: 'cart-store',
-      },
-    ],
-  },
+		// 移除购物车
+		async delete(ids) {
+			let id;
+			if (typeof ids === 'number') {
+				id = ids
+			}else {
+				id = ids.join(',')
+			}
+			const {
+				code
+			} = await CartApi.deleteCart(id);
+			 
+			if (code === 0) {
+				await this.getList();
+			}
+		},
+
+		// 单选购物车商品
+		async selectSingle(goodsId) {
+			const {
+				code
+			} = await CartApi.updateCartSelected({
+				ids: [goodsId],
+				selected: !this.selectedIds.includes(goodsId), // 取反
+			});
+			if (code === 0) {
+				await this.getList();
+			}
+		},
+
+		// 全选购物车商品
+		async selectAll(flag) {
+			const {
+				code
+			} = await CartApi.updateCartSelected({
+				ids: this.list.map((item) => item.id),
+				selected: flag
+			});
+			if (code === 0) {
+				await this.getList();
+			}
+		},
+
+		// 清空购物车。注意，仅用于用户退出时，重置数据
+		emptyList() {
+			this.list = [];
+			this.selectedIds = [];
+			this.isAllSelected = true;
+			this.totalPriceSelected = 0;
+		},
+	},
+	persist: {
+		enabled: true,
+		strategies: [{
+			key: 'cart-store',
+		}, ],
+	},
 });
 
-export default cart;
+export default cart;

sheep/store/modal.js

@@ -4,6 +4,7 @@ const modal = defineStore({
   id: 'modal',
   state: () => ({
     auth: '', // 授权弹框 accountLogin|smsLogin|resetPassword|changeMobile|changePassword|changeUsername
+	isActive: '',
     share: false, // 分享弹框
     menu: false, // 快捷菜单弹框
     advHistory: [], // 广告弹框记录

sheep/store/user.js

@@ -25,6 +25,10 @@ const defaultUserInfo = {
 	gender: 0, // 性别
 	mobile: '', // 手机号
 	point: 0, // 积分
+	socialStatusLevel: "",
+	socialStatusLevelName: "",
+	socialStatusPoint: 0,
+	socialUpNeed: 0,
 };
 
 // 默认钱包信息
@@ -87,6 +91,8 @@ const user = defineStore({
 				return;
 			}
 			this.userWallet = data;
+			// 为什么要加2 因为这里返回来的人员不包括自身
+			this.userWallet.descNo = data.descNo + 1
 		},
 
 		// 获取订单、优惠券等其他资产信息

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

@@ -41,6 +41,7 @@
             size="32"
             @click="close"
           ></uni-icons>
+		  	  
           <slot />
         </view>
       </uni-transition>
@@ -51,6 +52,7 @@
   </view>
   <!-- #ifdef MP -->
   <view v-else style="display: none">
+
     <slot></slot>
   </view>
   <!-- #endif -->

unpackage/dist/build/web/assets/add-1704ed99.css

@@ -1 +0,0 @@
-.goods-card[data-v-330c19e1]{margin:.3125rem 0;padding:.625rem;background:#fff}.form-item[data-v-330c19e1]{background:#fff}.form-item .star-box[data-v-330c19e1]{height:3.125rem;padding:0 .78125rem}.form-item .star-title[data-v-330c19e1]{font-weight:600}.area-box[data-v-330c19e1]{width:21.5625rem;min-height:9.5625rem;background:#f9fafb;border-radius:.625rem;padding:.875rem;margin:auto}.area-box .img-box[data-v-330c19e1]{margin-top:.625rem}.post-btn[data-v-330c19e1]{width:21.5625rem;line-height:2.5rem;border-radius:1.25rem;color:rgba(255,255,255,.9);margin-bottom:.625rem}

unpackage/dist/build/web/assets/add-dd001c59.css

@@ -0,0 +1 @@
+.goods-card[data-v-b2bb001b]{margin:.3125rem 0;padding:.625rem;background:#fff}.form-item[data-v-b2bb001b]{background:#fff}.form-item .star-box[data-v-b2bb001b]{height:3.125rem;padding:0 .78125rem}.form-item .star-title[data-v-b2bb001b]{font-weight:600}.area-box[data-v-b2bb001b]{width:21.5625rem;min-height:9.5625rem;background:#f9fafb;border-radius:.625rem;padding:.875rem;margin:auto}.area-box .img-box[data-v-b2bb001b]{margin-top:.625rem}.post-btn[data-v-b2bb001b]{width:21.5625rem;line-height:2.5rem;border-radius:1.25rem;color:rgba(255,255,255,.9);margin-bottom:.625rem}

unpackage/dist/build/web/assets/address.e338ed88.js → unpackage/dist/build/web/assets/address.9ea6df70.js

@@ -1 +1 @@
-import{Z as e}from"./index-dd2338f3.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-da4e4690.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};

unpackage/dist/build/web/assets/afterSale.3a0e46cd.js → unpackage/dist/build/web/assets/afterSale.0c5fd858.js

@@ -1 +1 @@
-import{Z as e}from"./index-dd2338f3.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-da4e4690.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};

unpackage/dist/build/web/assets/apply-1188fba5.css

@@ -1 +0,0 @@
-.item-title[data-v-500f2bca]{font-size:.9375rem;font-weight:700;color:#333}.refund-item[data-v-500f2bca]{background-color:#fff;border-bottom:.03125rem solid #f5f5f5;padding:.9375rem}.refund-item[data-v-500f2bca]:last-child{border:none}.refund-item .describe-box[data-v-500f2bca]{width:21.5625rem;background:#f9fafb;padding:.9375rem;box-sizing:border-box;border-radius:.625rem}.refund-item .describe-box .describe-content[data-v-500f2bca]{height:6.25rem;font-size:.75rem;font-weight:400;color:#333}.refund-item .input-box[data-v-500f2bca]{height:2.625rem;background:#f9fafb;border-radius:.625rem}.goods-box[data-v-500f2bca]{background:#fff;padding:.625rem;margin-bottom:.625rem}.foot-wrap[data-v-500f2bca]{height:3.125rem;width:100%}.foot_box[data-v-500f2bca]{height:3.125rem;background-color:#fff}.foot_box .sub-btn[data-v-500f2bca]{width:10.5rem;line-height:2.3125rem;border-radius:1.1875rem;color:rgba(255,255,255,.9);font-size:.875rem}.foot_box .contcat-btn[data-v-500f2bca]{width:10.5rem;line-height:2.3125rem;background:#eeeeee;border-radius:1.1875rem;font-size:.875rem;font-weight:400;color:#333}.modal-box[data-v-500f2bca]{width:23.4375rem;border-radius:.9375rem .9375rem 0 0;background:#fff}.modal-box .modal-head[data-v-500f2bca]{height:3.125rem;font-size:.9375rem}.modal-box .modal-content[data-v-500f2bca]{font-size:.875rem}.modal-box .modal-foot .close-btn[data-v-500f2bca]{width:22.1875rem;line-height:2.5rem;border-radius:1.25rem;color:rgba(255,255,255,.9)}.success-box[data-v-500f2bca]{width:18.75rem;padding:2.8125rem 0 2rem}.success-box .cicon-check-round[data-v-500f2bca]{font-size:3rem;color:#04b750}.success-box .success-title[data-v-500f2bca]{font-weight:500;color:#333;font-size:1rem}.success-box .success-btn[data-v-500f2bca]{width:15.375rem;height:2.1875rem;background:linear-gradient(90deg,var(--ui-BG-Main-gradient),var(--ui-BG-Main));border-radius:1.09375rem}

unpackage/dist/build/web/assets/apply-869cbfed.css

@@ -0,0 +1 @@
+.item-title[data-v-081ed619]{font-size:.9375rem;font-weight:700;color:#333}.refund-item[data-v-081ed619]{background-color:#fff;border-bottom:.03125rem solid #f5f5f5;padding:.9375rem}.refund-item[data-v-081ed619]:last-child{border:none}.refund-item .describe-box[data-v-081ed619]{width:21.5625rem;background:#f9fafb;padding:.9375rem;box-sizing:border-box;border-radius:.625rem}.refund-item .describe-box .describe-content[data-v-081ed619]{height:6.25rem;font-size:.75rem;font-weight:400;color:#333}.refund-item .input-box[data-v-081ed619]{height:2.625rem;background:#f9fafb;border-radius:.625rem}.goods-box[data-v-081ed619]{background:#fff;padding:.625rem;margin-bottom:.625rem}.foot-wrap[data-v-081ed619]{height:3.125rem;width:100%}.foot_box[data-v-081ed619]{height:3.125rem;background-color:#fff}.foot_box .sub-btn[data-v-081ed619]{width:10.5rem;line-height:2.3125rem;border-radius:1.1875rem;color:rgba(255,255,255,.9);font-size:.875rem}.foot_box .contcat-btn[data-v-081ed619]{width:10.5rem;line-height:2.3125rem;background:#eeeeee;border-radius:1.1875rem;font-size:.875rem;font-weight:400;color:#333}.modal-box[data-v-081ed619]{width:23.4375rem;border-radius:.9375rem .9375rem 0 0;background:#fff}.modal-box .modal-head[data-v-081ed619]{height:3.125rem;font-size:.9375rem}.modal-box .modal-content[data-v-081ed619]{font-size:.875rem}.modal-box .modal-foot .close-btn[data-v-081ed619]{width:22.1875rem;line-height:2.5rem;border-radius:1.25rem;color:rgba(255,255,255,.9)}.success-box[data-v-081ed619]{width:18.75rem;padding:2.8125rem 0 2rem}.success-box .cicon-check-round[data-v-081ed619]{font-size:3rem;color:#04b750}.success-box .success-title[data-v-081ed619]{font-weight:500;color:#333;font-size:1rem}.success-box .success-btn[data-v-081ed619]{width:15.375rem;height:2.1875rem;background:linear-gradient(90deg,var(--ui-BG-Main-gradient),var(--ui-BG-Main));border-radius:1.09375rem}

unpackage/dist/build/web/assets/area.655980e4.js

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

unpackage/dist/build/web/assets/area.d012f61a.js

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

unpackage/dist/build/web/assets/brokerage.36b07333.js → unpackage/dist/build/web/assets/brokerage.e56948e3.js

@@ -1 +1 @@
-import{Z as e}from"./index-dd2338f3.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-da4e4690.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};

unpackage/dist/build/web/assets/category.f75e9f8e.js → unpackage/dist/build/web/assets/category.1fb7c839.js

@@ -1 +1 @@
-import{Z as t}from"./index-dd2338f3.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-da4e4690.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};

unpackage/dist/build/web/assets/combination.84425fde.js → unpackage/dist/build/web/assets/combination.91783385.js

@@ -1 +1 @@
-import{Z as o}from"./index-dd2338f3.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-da4e4690.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};

unpackage/dist/build/web/assets/config.c35a5f1d.js

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

unpackage/dist/build/web/assets/config.fb838326.js

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

unpackage/dist/build/web/assets/const.ec6c1b58.js → unpackage/dist/build/web/assets/const.a1597e0f.js

@@ -1 +1 @@
-import{Z as t,b2 as e}from"./index-dd2338f3.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-da4e4690.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};

unpackage/dist/build/web/assets/favorite.0549488c.js → unpackage/dist/build/web/assets/favorite.9dda3079.js

@@ -1 +1 @@
-import{Z as e}from"./index-dd2338f3.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-da4e4690.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};

unpackage/dist/build/web/assets/history.ffaa91df.js → unpackage/dist/build/web/assets/history.c7148659.js

@@ -1 +1 @@
-import{Z as s}from"./index-dd2338f3.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-da4e4690.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};

unpackage/dist/build/web/assets/pages-index-index.1847b90a.js → unpackage/dist/build/web/assets/pages-index-index.43d28087.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-dd2338f3.js";import{_ as b,a as f}from"./s-block.f4e967ee.js";import{_ as x}from"./s-layout.f823d018.js";import"./form.8db2a708.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.fb58285f.js";import"./uni-badge.766a939b.js";import"./su-image.c76ff67d.js";import"./su-swiper.f7c6bc72.js";import"./s-goods-column.3a80b8fd.js";import"./useGoods.6f6aacf8.js";/* empty css                                                                     */import"./uni-load-more.39f527fe.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.91082a05.js";import"./combination.84425fde.js";import"./const.ec6c1b58.js";import"./mp-html.d5a44f01.js";import"./richtext.f5a3dd94.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-da4e4690.js";import{_ as b,a as f}from"./s-block.46e00e07.js";import{_ as x}from"./s-layout.53223775.js";import"./form.88014d17.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.a659982b.js";import"./uni-badge.e594f8af.js";import"./su-image.1ad5c095.js";import"./su-swiper.2c328d54.js";import"./s-goods-column.48e88cf3.js";import"./useGoods.1c867597.js";/* empty css                                                                     */import"./uni-load-more.781ec82a.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.62d78c57.js";import"./combination.91783385.js";import"./const.a1597e0f.js";import"./mp-html.23088c33.js";import"./richtext.a535aa95.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};

unpackage/dist/build/web/assets/pages-index-page.f062ea7d.js → unpackage/dist/build/web/assets/pages-index-page.d7507310.js

@@ -1 +1 @@
-import{_ as t,a as s}from"./s-block.f4e967ee.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-dd2338f3.js";import{_ as c}from"./s-layout.f823d018.js";import"./form.8db2a708.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.fb58285f.js";import"./uni-badge.766a939b.js";import"./su-image.c76ff67d.js";import"./su-swiper.f7c6bc72.js";import"./s-goods-column.3a80b8fd.js";import"./useGoods.6f6aacf8.js";/* empty css                                                                     */import"./uni-load-more.39f527fe.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.91082a05.js";import"./combination.84425fde.js";import"./const.ec6c1b58.js";import"./mp-html.d5a44f01.js";import"./richtext.f5a3dd94.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.46e00e07.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-da4e4690.js";import{_ as c}from"./s-layout.53223775.js";import"./form.88014d17.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.a659982b.js";import"./uni-badge.e594f8af.js";import"./su-image.1ad5c095.js";import"./su-swiper.2c328d54.js";import"./s-goods-column.48e88cf3.js";import"./useGoods.1c867597.js";/* empty css                                                                     */import"./uni-load-more.781ec82a.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.62d78c57.js";import"./combination.91783385.js";import"./const.a1597e0f.js";import"./mp-html.23088c33.js";import"./richtext.a535aa95.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};

unpackage/dist/build/web/assets/pages-index-search.064bf344.js → unpackage/dist/build/web/assets/pages-index-search.2b723f80.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-dd2338f3.js";import{b as g,_ as b}from"./s-layout.f823d018.js";import{_ as w}from"./_plugin-vue_export-helper.1b428a4d.js";import"./form.8db2a708.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-da4e4690.js";import{b as g,_ as b}from"./s-layout.53223775.js";import{_ as w}from"./_plugin-vue_export-helper.1b428a4d.js";import"./form.88014d17.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};

unpackage/dist/build/web/assets/pages-index-user.4668789c.js

@@ -0,0 +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 m,f as n,w as _,l as d,k as y,r as j,F as c,m as b,j as v}from"./index-da4e4690.js";import{_ as g,a as f}from"./s-block.46e00e07.js";import{_ as k}from"./s-layout.53223775.js";import"./form.88014d17.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.a659982b.js";import"./uni-badge.e594f8af.js";import"./su-image.1ad5c095.js";import"./su-swiper.2c328d54.js";import"./s-goods-column.48e88cf3.js";import"./useGoods.1c867597.js";/* empty css                                                                     */import"./uni-load-more.781ec82a.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.62d78c57.js";import"./combination.91783385.js";import"./const.a1597e0f.js";import"./mp-html.23088c33.js";import"./richtext.a535aa95.js";const x={__name:"user",setup(x){s();const h=e((()=>a.$store("app").template.user)),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 m(),n(r,{title:"我的",tabbar:"/pages/index/user",navbar:"custom",bgStyle:h.value.page,navbarStyle:null==(t=h.value.style)?void 0:t.navbar,onShareAppMessage:""},{default:_((()=>[(m(!0),y(c,null,j(h.value.components,((s,e)=>(m(),n(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};

unpackage/dist/build/web/assets/pages-index-user.ee78c18b.js

@@ -1 +0,0 @@
-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-dd2338f3.js";import{_ as g,a as f}from"./s-block.f4e967ee.js";import{_ as k}from"./s-layout.f823d018.js";import"./form.8db2a708.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.fb58285f.js";import"./uni-badge.766a939b.js";import"./su-image.c76ff67d.js";import"./su-swiper.f7c6bc72.js";import"./s-goods-column.3a80b8fd.js";import"./useGoods.6f6aacf8.js";/* empty css                                                                     */import"./uni-load-more.39f527fe.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.91082a05.js";import"./combination.84425fde.js";import"./const.ec6c1b58.js";import"./mp-html.d5a44f01.js";import"./richtext.f5a3dd94.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};

unpackage/dist/build/web/assets/pages-order-aftersale-log.3e2e35e3.js → unpackage/dist/build/web/assets/pages-order-aftersale-log.18f44122.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-dd2338f3.js";import{_ as b}from"./s-layout.f823d018.js";import{_ as j}from"./_plugin-vue_export-helper.1b428a4d.js";import{A as h}from"./afterSale.3a0e46cd.js";import"./form.8db2a708.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-da4e4690.js";import{_ as b}from"./s-layout.53223775.js";import{_ as j}from"./_plugin-vue_export-helper.1b428a4d.js";import{A as h}from"./afterSale.0c5fd858.js";import"./form.88014d17.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};