更新积分商城

pages.json

@@ -317,7 +317,7 @@
 				{
 					"path": "address/list",
 					"style": {
-						"navigationBarTitleText": "收货地址"
+						"navigationBarTitleText": "实体商品收货地址"
 					},
 					"meta": {
 						"auth": true,
@@ -326,6 +326,18 @@
 						"group": "用户中心"
 					}
 				},
+				{
+					"path": "dummyAddress/list",
+					"style": {
+						"navigationBarTitleText": "虚拟商品收货地址"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "虚拟商品收货地址",
+						"group": "用户中心"
+					}
+				},
 				{
 					"path": "invoice/edit",
 					"style": {
@@ -358,6 +370,16 @@
 						"title": "编辑地址"
 					}
 				},
+				{
+					"path": "dummyAddress/edit",
+					"style": {
+						"navigationBarTitleText": "编辑地址"
+					},
+					"meta": {
+						"auth": true,
+						"title": "编辑地址"
+					}
+				},
 				{
 					"path": "wallet/money",
 					"style": {

pages/goods/index.vue

@@ -3,7 +3,6 @@
 		<s-layout :onShareAppMessage="shareInfo" navbar="goods">
 			<!-- 标题栏 -->
 			<detailNavbar v-model="state.goodsInfo" />
-
 			<!-- 骨架屏 -->
 			<detailSkeleton v-if="state.skeletonLoading" />
 			<!-- 下架/售罄提醒 -->
@@ -14,15 +13,15 @@
 					<!-- 商品轮播图  -->
 					<su-swiper class="ss-m-b-14" isPreview :list="formatGoodsSwiper(state.goodsInfo.sliderPicUrls)"
 						otStyle="tag" imageMode="widthFix" dotCur="bg-mask-40" :seizeHeight="750" />
-
 					<!-- 价格+标题 -->
 					<view class="title-card detail-card ss-p-y-40 ss-p-x-20">
 						<view class="ss-flex ss-row-between ss-col-center ss-m-b-26">
 							<view class="price-box ss-flex ss-col-center">
 								<view class="price-text ss-m-r-16">
+									<image src="@/static/icon/points.png"  v-if="state.goodsInfo.spuPayType == 2" style="width:40rpx;height:40rpx"   ></image>
+									<text v-else>￥</text>
 									{{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
 								</view>
-
 								<view class="origin-price-text" v-if="state.goodsInfo.promotionFee >= 0">
 									数字权益:{{ fen2yuan(state.selectedSku.promotionFee || state.goodsInfo.promotionFee)  }}
 								</view>
@@ -41,7 +40,6 @@
 									</view>
 								</view>
 							</div>
-
 							<!-- 优惠劵 -->
 							<view class="get-coupon-box ss-flex ss-col-center ss-m-l-20" @tap="state.showModel = true"
 								v-if="state.couponInfo.length">
@@ -70,30 +68,48 @@
 				<detail-content-card class="detail-content-selector" :content="state.goodsInfo.description" />
 
 				<!-- 活动跳转：拼团/秒杀/砍价活动 -->
-				<detail-activity-tip v-if="state.activityList.length > 0" :activity-list="state.activityList" />
+				<!-- <detail-activity-tip v-if="state.activityList.length > 0" :activity-list="state.activityList" /> -->
 
 				<!-- 详情 tabbar -->
+				
+				
 				<detail-tabbar v-model="state.goodsInfo">
-					<view class="buy-box ss-flex ss-col-center ss-p-r-20" v-if="state.goodsInfo.stock > 0">
-						<button class="ss-reset-button add-btn ui-Shadow-Main" @tap="state.showSelectSku = true">
+					<!-- {{state.goodsInfo.spuType }}  {{state.goodsInfo.spuPayType }} -->
+					<!-- 如果有库存并且不是积分商品和虚拟商品 可以加入购物车和购买 -->
+					<view class="buy-box ss-flex ss-col-center ss-p-r-20" v-if="state.goodsInfo.stock > 0 && state.goodsInfo.spuType && state.goodsInfo.spuPayType == 1">
+						<button class="ss-reset-button add-btn ui-Shadow-Main"  @tap="state.showSelectSku = true">
 							加入购物车
 						</button>
 						<button class="ss-reset-button buy-btn ui-Shadow-Main" @tap="state.showSelectSku = true">
 							立即购买
 						</button>
 					</view>
+					
+					<!-- 如果有库存并且是积分商品或虚拟商品 只可以加入购物车 -->
+					<!-- 库存不为0和虚拟产品 -->
+					<view class="buy-box ss-flex ss-col-center ss-p-r-20" v-else-if="state.goodsInfo.stock > 0 && !state.goodsInfo.spuType">
+						<button class="ss-reset-button disabled-btn buy-btn ui-Shadow-Main " @tap="state.showSelectSku = true">
+							立即购买
+						</button>
+					</view>
+					<!-- 库存不为0和非现金支付 -->
+					<view class="buy-box ss-flex ss-col-center ss-p-r-20" v-else-if="state.goodsInfo.stock > 0 &&  state.goodsInfo.spuPayType != 1">
+						<button class="ss-reset-button disabled-btn buy-btn ui-Shadow-Main " @tap="state.showSelectSku = true">
+							立即购买
+						</button>
+					</view>
 					<view class="buy-box ss-flex ss-col-center ss-p-r-20" v-else>
-						<button class="ss-reset-button disabled-btn" disabled> 已售罄 </button>
+						<button class="ss-reset-button disabled-btn" disabled style="background: #999999;"> 已售罄 </button>
 					</view>
 				</detail-tabbar>
 
 				<!-- 优惠劵弹窗 -->
-				<s-coupon-get v-model="state.couponInfo" :show="state.showModel" @close="state.showModel = false"
-					@get="onGet" />
+				<!-- <s-coupon-get v-model="state.couponInfo" :show="state.showModel" @close="state.showModel = false"
+					@get="onGet" /> -->
 
 				<!-- 满减送/限时折扣活动弹窗 -->
-				<s-activity-pop v-model="state.activityInfo" :show="state.showActivityModel"
-					@close="state.showActivityModel = false" />
+				<!-- <s-activity-pop v-model="state.activityInfo" :show="state.showActivityModel"
+					@close="state.showActivityModel = false" /> -->
 			</block>
 		</s-layout>
 	</view>
@@ -181,6 +197,8 @@
 					skuId: e.id,
 					count: e.goods_num
 				}],
+				spuType:state.goodsInfo.spuType,
+				spuPayType:state.goodsInfo.spuPayType,
 				// TODO 芋艿：后续清理掉这 2 参数
 				deliveryType: 1,
 				pointStatus: false,
@@ -251,6 +269,7 @@
 			// 加载到商品
 			state.skeletonLoading = false;
 			state.goodsInfo = res.data;
+			console.log(state.goodsInfo )
 			if(!isLogin.value){
 				return;
 			}
@@ -280,7 +299,7 @@
 		}
 	})
 	onLoad((options) => {
-		console.log("options.id",options.id,"options.linkId",options.linkId)
+		// console.log("options.id",options.id,"options.linkId",options.linkId)
 		// 没有spuId和linkId的话 就有问题
 		if (!options.id && !options.linkId) {
 			state.goodsInfo = null;
@@ -343,10 +362,10 @@
 				line-height: 30rpx;
 				font-family: OPPOSANS;
 
-				&::before {
-					content: '￥';
-					font-size: 30rpx;
-				}
+				// &::before {
+				// 	content: '￥';
+				// 	font-size: 30rpx;
+				// }
 			}
 
 			.origin-price-text {
@@ -445,7 +464,7 @@
 			width: 428rpx;
 			height: 72rpx;
 			border-radius: 40rpx;
-			background: #999999;
+			
 			color: $white;
 		}
 	}

pages/order/confirm.vue

@@ -2,7 +2,7 @@
 	<s-layout title="确认订单">
 		<!-- TODO：这个判断先删除 v-if="state.orderInfo.need_address === 1" -->
 		<view class="bg-white address-box ss-m-b-14 ss-r-b-10" @tap="onSelectAddress">
-			<s-address-item :item="state.addressInfo" :hasBorderBottom="false">
+			<s-address-item :item="state.addressInfo" :spuType="state.orderPayload.spuType" :hasBorderBottom="false">
 				<view class="ss-rest-button">
 					<text class="_icon-forward" />
 				</view>
@@ -46,7 +46,9 @@
 			<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">
-					{{"￥"+fen2yuan(items.price.payPrice)}}
+					<image src="@/static/icon/points.png"  v-if="state.orderPayload.spuPayType == 2" style="width:30rpx;height:30rpx"   ></image>
+					<text v-else>￥</text>
+					{{fen2yuan(items.price.payPrice)}}
 				</view>
 			</view>
 		</view>
@@ -61,7 +63,9 @@
 					<view class="item-title">商品总价 共{{totalItemCount}}件商品</view>
 					<view class="ss-flex ss-col-center">
 						<text class="item-value ss-m-r-24">
-							￥{{ fen2yuan(state.orderInfo.price.totalPrice) }}
+							<image src="@/static/icon/points.png"  v-if="state.orderPayload.spuPayType == 2" style="width:30rpx;height:30rpx"   ></image>
+							<text v-else>￥</text>
+							{{ fen2yuan(state.orderInfo.price.totalPrice) }}
 						</text>
 					</view>
 				</view>
@@ -70,19 +74,19 @@
 					<view class="item-title">运费</view>
 					<view class="ss-flex ss-col-center">
 						<text class="item-value ss-m-r-24">
-							￥{{ fen2yuan(state.orderInfo.price.deliveryPrice) }}
+							<image src="@/static/icon/points.png"  v-if="state.orderPayload.spuPayType == 2" style="width:30rpx;height:30rpx"   ></image>
+							<text v-else>￥</text>
+							{{ fen2yuan(state.orderInfo.price.deliveryPrice) }}
 						</text>
 					</view>
 				</view>
-				<view class="order-item ss-flex ss-col-center ss-row-between">
+				<view class="order-item ss-flex ss-col-center ss-row-between" v-if="state.orderPayload.spuPayType != 2">
 					<view class="item-title">数字权益抵扣</view>
 					<view class="ss-flex ss-col-center" @tap="state.showPoints = true">
 						<!-- <text class="item-value text-red">
 		    </text> -->
 						<text class="item-value" :class="state.usedPoint > 0 ? 'text-red' : 'text-disabled'">
-							{{
-		        state.usedPoint > 0 ?  ' 可抵扣' + state.usedPoint + '元' : '不使用数字权益'
-		      }}
+							{{ state.usedPoint > 0 ?  ' 可抵扣' + state.usedPoint + '元' : '不使用数字权益' }}
 						</text>
 						<text class="_icon-forward item-icon" />
 					</view>
@@ -130,14 +134,18 @@
 					共{{ totalItemCount }}件
 				</view>
 				<view>合计：</view>
-				<view class="total-num text-red"> ￥{{ fen2yuan(state.orderInfo.price.payPrice) }} </view>
+				<view class="total-num text-red"> 
+				
+				<image src="@/static/icon/points.png"  v-if="state.orderPayload.spuPayType == 2" style="width:30rpx;height:30rpx"   ></image>
+				<text v-else>￥</text>
+				{{ fen2yuan(state.orderInfo.price.payPrice) - 0.01 }} </view>
 			</view>
 		</view>
 
 		<!-- 数字权益-->
 		<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" />
+			:currentTotalPrice="state.currentTotalPrice" :currentDeliveryPrice="state.currentDeliveryPrice"
+			:show="state.showPoints" @confirm="onInputPoints" @close="state.showPoints = false" />
 
 		<!-- 满额折扣弹框 TODO 非繁人：后续要把优惠信息打进去 -->
 		<!-- <s-discount-list
@@ -150,7 +158,12 @@
 		<su-fixed bottom :opacity="false" bg="bg-white" placeholder :noFixed="false" :index="200">
 			<view class="footer-box border-top ss-flex ss-row-between ss-p-x-20 ss-col-center">
 				<view class="total-box-footer ss-flex ss-col-center">
-					<view class="total-num ss-font-30 text-red">
+					<view class="total-num ss-font-30 text-red " v-if="state.orderPayload.spuPayType == 2">
+						<image src="@/static/icon/points.png"  v-if="state.orderPayload.spuPayType == 2" style="width:30rpx;height:30rpx"   ></image>
+						{{ state.usedPoint }}
+						￥0.01
+					</view>
+					<view class="total-num ss-font-30 text-red" v-else>
 						￥{{ fen2yuan(state.orderInfo.price.payPrice) }}
 					</view>
 				</view>
@@ -193,8 +206,8 @@
 		showDiscount: false, // 是否展示营销活动
 		currentMemberPoints: 0, //用户当前可用数字权益
 		usedPoint: 0, //用户使用的数字权益 
-		currentTotalPrice: 0 ,//当前的整个订单的总价格
-		currentDeliveryPrice:0 // 当前订单的总运费
+		currentTotalPrice: 0, //当前的整个订单的总价格
+		currentDeliveryPrice: 0 // 当前订单的总运费
 	});
 
 	// 返回来的数据根据店铺名过滤 TODO
@@ -229,7 +242,14 @@
 		uni.$once('SELECT_ADDRESS', (e) => {
 			changeConsignee(e.addressInfo);
 		});
-		sheep.$router.go('/pages/user/address/list');
+		console.log(state.orderPayload.spuType)
+		// 如果是虚拟商品 进入选虚拟地址
+		if(state.orderPayload.spuType){
+			sheep.$router.go('/pages/user/address/list');
+		}else{
+			sheep.$router.go('/pages/user/dummyAddress/list');
+		}
+		
 	}
 
 	// 更改收货人地址&计算订单信息
@@ -239,7 +259,6 @@
 		}
 		await getOrderInfo();
 	}
-
 	// 使用数字权益
 	async function onInputPoints(points) {
 
@@ -254,16 +273,23 @@
 
 	// 提交订单
 	function onConfirm() {
+
 		if (!state.addressInfo.id) {
 			sheep.$helper.toast('请选择收货地址');
 			return;
 		}
-
+		// console.log(state.usedPoint,)
+		if(state.usedPoint > state.currentMemberPoints){
+			sheep.$helper.toast('可用数字权益不足');
+			return;
+		}
+		// if (state.currentMemberPoints)
 		submitOrder();
 	}
 
 	// 创建订单&跳转
 	async function submitOrder() {
+		
 		// 处理每个店铺的留言 以{店铺id:留言}的形式返回
 		const shops = shopsByNames.value;
 		const shopRemarks = {};
@@ -271,7 +297,7 @@
 			const shop = shops[shopName];
 			shopRemarks[shop.shopId] = shop.remark;
 		});
-
+		
 		const {
 			code,
 			data
@@ -279,7 +305,7 @@
 			items: state.orderPayload.items,
 			couponId: state.orderPayload.couponId,
 			addressId: state.addressInfo.id,
-			deliveryType: 1, // TODO 非繁人：需要支持【门店自提】
+			deliveryType:  state.orderPayload.spuType == 1 ? 1 : 3, // TODO 非繁人：需要支持【门店自提】
 			pointStatus: false, // TODO 非繁人：需要支持【数字权益选择】
 			combinationActivityId: state.orderPayload.combinationActivityId,
 			combinationHeadId: state.orderPayload.combinationHeadId,
@@ -305,12 +331,13 @@
 		//  每次查询设置订单之前  看有没有评论 如果有评论就存到shopRemarks
 		const shops = shopsByNames.value
 		let shopRemarks = {};
-		if(Object.keys(shops).length !== 0){
+		if (Object.keys(shops).length !== 0) {
 			Object.keys(shops).forEach(shopName => {
 				const shop = shops[shopName];
 				shopRemarks[shopName] = shop.remark;
 			});
 		}
+		
 		const {
 			data,
 			code
@@ -318,24 +345,25 @@
 			items: state.orderPayload.items,
 			couponId: state.orderPayload.couponId,
 			addressId: state.addressInfo.id,
-			deliveryType: 1, // TODO 非繁人：需要支持【门店自提】
+			deliveryType:  state.orderPayload.spuType == 1 ? 1 : 3, // TODO 非繁人：需要支持【门店自提】
 			pointStatus: false, // TODO 非繁人：需要支持【数字权益选择】
 			combinationActivityId: state.orderPayload.combinationActivityId,
 			combinationHeadId: state.orderPayload.combinationHeadId,
 			seckillActivityId: state.orderPayload.seckillActivityId,
-			usedPoint: state.usedPoint
+			usedPoint: state.usedPoint,
+			addressType:state.orderPayload.spuType == 1 ? 1 : 2 //如果是虚拟产品
 		});
 		if (code !== 0) {
 			return;
 		}
 		state.orderInfo = data;
 		// 如果shopRemarks有评论的话 就放回shopsByNames
-		if(Object.keys(shopRemarks).length !== 0){
+		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;
@@ -344,7 +372,12 @@
 		state.currentTotalPrice = fen2yuan(state.orderInfo.price.payPrice)
 		state.currentDeliveryPrice = fen2yuan(state.orderInfo.price.deliveryPrice)
 		// console.log("父",state.currentTotalPrice)
-
+		
+		if(state.orderPayload.spuPayType == 2){
+			state.usedPoint = state.currentTotalPrice - 0.01
+			console.log(state.spuType)
+		}
+		
 	}
 
 
@@ -372,6 +405,7 @@
 			return;
 		}
 		state.orderPayload = JSON.parse(options.data);
+		
 		await getOrderInfo();
 
 	});
@@ -471,7 +505,7 @@
 		height: 100rpx;
 
 		.submit-btn {
-			width: 240rpx;
+			width: 230rpx;
 			height: 70rpx;
 			font-size: 28rpx;
 			font-weight: 500;
@@ -482,7 +516,7 @@
 		}
 
 		.cancel-btn {
-			width: 240rpx;
+			width: 230rpx;
 			height: 80rpx;
 			font-size: 26rpx;
 			background-color: #e5e5e5;

pages/user/dummyAddress/edit.vue

@@ -0,0 +1,281 @@
+<!-- 收货地址的新增/编辑 -->
+<template>
+	<!-- {{ru}} -->
+	<s-layout :title="state.model.id ? '编辑虚拟地址' : '新增虚拟地址'">
+		<uni-forms ref="addressFormRef" v-model="state.model" :rules="rules" validateTrigger="bind" labelWidth="160"
+			labelAlign="left" border :labelStyle="{ fontWeight: 'bold' }">
+			<view class="bg-white form-box ss-p-x-30">
+				<uni-forms-item name="name" label="收货人" class="form-item">
+					<uni-easyinput v-model="state.model.name" placeholder="请填写收货人姓名" :inputBorder="false"
+						placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal" />
+				</uni-forms-item>
+
+				<uni-forms-item name="mobile" label="手机号" class="form-item">
+					<uni-easyinput v-model="state.model.mobile" type="number" placeholder="请输入手机号" :inputBorder="false"
+						placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal">
+					</uni-easyinput>
+				</uni-forms-item>
+
+				<uni-forms-item name="detailAddress" label="详细地址" :formItemStyle="{ alignItems: 'flex-start' }"
+					:labelStyle="{ lineHeight: '5em' }" class="textarea-item">
+					<uni-easyinput :inputBorder="false" type="textarea" v-model="state.model.detailAddress"
+						placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
+						placeholder="请输入详细地址" clearable />
+				</uni-forms-item>
+			</view>
+			<view class="ss-m-y-20 bg-white ss-p-x-30 ss-flex ss-row-between ss-col-center default-box">
+				<view class="default-box-title"> 设为默认虚拟地址 </view>
+				<su-switch style="transform: scale(0.8)" v-model="state.model.defaultStatus" />
+			</view>
+		</uni-forms>
+		<su-fixed bottom :opacity="false" bg="" placeholder :noFixed="false" :index="10">
+			<view class="footer-box ss-flex-col ss-row-between ss-p-20">
+				<view class="ss-m-b-20">
+					<button class="ss-reset-button save-btn ui-Shadow-Main" @tap="onSave">保存</button>
+				</view>
+				<button v-if="state.model.id" class="ss-reset-button cancel-btn" @tap="onDelete">
+					删除
+				</button>
+			</view>
+		</su-fixed>
+
+		<!-- 省市区弹窗 -->
+		<su-region-picker :show="state.showRegion" @cancel="state.showRegion = false" @confirm="onRegionConfirm" />
+	</s-layout>
+</template>
+
+<script setup>
+	import {
+		ref,
+		reactive,
+		unref
+	} from 'vue';
+	import sheep from '@/sheep';
+	import {
+		onLoad
+	} from '@dcloudio/uni-app';
+	import _ from 'lodash';
+	import {
+		mobile
+	} from '@/sheep/validate/form';
+	import AreaApi from '@/sheep/api/system/area';
+	import AddressApi from '@/sheep/api/member/address';
+	import $helper from '@/sheep/helper';
+	const addressFormRef = ref(null);
+	const state = reactive({
+		showRegion: false,
+		model: {
+			name: '',
+			mobile: '',
+			detailAddress: '',
+			defaultStatus: false,
+			areaName: '',
+			addressType:2
+		},
+		rules: {},
+	});
+	// let ru = ref({})
+	const rules = {
+		name: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入收货人姓名',
+			}, ],
+		},
+		mobile,
+		detailAddress: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入详细地址',
+			}]
+		},
+
+	};
+
+	// 确认选择地区
+	const onRegionConfirm = (e) => {
+		state.model.areaName = `${e.province_name} ${e.city_name} ${e.district_name}`
+		state.model.areaId = e.district_id;
+		state.showRegion = false;
+	};
+
+	// 获得地区数据
+	const getAreaData = () => {
+		if (_.isEmpty(uni.getStorageSync('areaData'))) {
+			AreaApi.getAreaTree().then((res) => {
+				if (res.code === 0) {
+					uni.setStorageSync('areaData', res.data);
+				}
+			});
+		}
+	};
+
+	// 保存收货地址
+	const onSave = async () => {
+		console.log(state)
+		// 参数校验
+		const validate = await unref(addressFormRef)
+			.validate()
+			.catch((error) => {
+				console.log('error: ', error);
+			});
+		if (!validate) {
+			return;
+		}
+
+		// 提交请求
+		const formData = {
+			...state.model
+		}
+		const {
+			code
+		} = state.model.id > 0 ? await AddressApi.updateAddress(formData) :
+			await AddressApi.createAddress(formData);
+		if (code === 0) {
+			sheep.$router.back();
+		}
+	};
+
+	// 删除收货地址
+	const onDelete = () => {
+		uni.showModal({
+			title: '提示',
+			content: '确认删除此收货地址吗？',
+			success: async function(res) {
+				if (!res.confirm) {
+					return;
+				}
+				const {
+					code
+				} = await AddressApi.deleteAddress( state.model.id , 2);
+				if (code === 0) {
+					sheep.$router.back();
+				}
+			},
+		});
+	};
+
+	onLoad(async (options) => {
+
+		// ru.value = {
+		// 	'consignee': 'aa',
+		// 	'mobile': '1595505005050',
+		// 	'province_name': '广东省',
+		// 	'city_name': '湛江市',
+		// 	'district_name': '廉江市',
+		// 	'address': 'yyyyyyyyy',
+		// 	'region': '',
+		// 	'is_default': 'false',
+		// }
+
+		// 获得地区数据
+		getAreaData();
+		// 情况一：基于 id 获得收件地址
+	
+		if (options.id) {
+			let {
+				code,
+				data
+			} = await AddressApi.getAddress(options.id,  2);
+			if (code !== 0) {
+				return;
+			}
+			// console.log(data)
+			state.model = data;
+		}
+		// 情况二：微信导入 TODO 非繁人：待接入
+		if (options.data) {
+			let data = JSON.parse(options.data);
+			// ru.value = data
+			const areaData = uni.getStorageSync('areaData');
+			let provinceArr = areaData.filter(item => item.name == data.province_name);
+			data.province_id = provinceArr[0].id;
+			let provinceArr2 = provinceArr[0].children.filter(item => item.name == data.city_name);
+			data.city_id = provinceArr2[0].id;
+			let provinceArr3 = provinceArr2[0].children.filter(item => item.name == data.district_name);
+			data.district_id = provinceArr3[0].id;
+
+			state.model = {
+				name: data.consignee,
+				mobile: data.mobile,
+				detailAddress: data.address,
+				defaultStatus: data.is_default,
+				areaName: data.province_name + ' ' + data.city_name + ' ' + data.district_name,
+				areaId: data.district_id
+			}
+
+
+
+
+			// state.model = {
+			// 	...state.model,
+			// 	...data,
+			// };
+		}
+	});
+</script>
+
+<style lang="scss" scoped>
+	:deep() {
+		.uni-forms-item__label .label-text {
+			font-size: 28rpx !important;
+			color: #333333 !important;
+			line-height: normal !important;
+		}
+
+		.uni-easyinput__content-input {
+			font-size: 28rpx !important;
+			color: #333333 !important;
+			line-height: normal !important;
+			padding-left: 0 !important;
+		}
+
+		.uni-easyinput__content-textarea {
+			font-size: 28rpx !important;
+			color: #333333 !important;
+			line-height: normal !important;
+			margin-top: 8rpx !important;
+		}
+
+		.uni-icons {
+			font-size: 40rpx !important;
+		}
+
+		.is-textarea-icon {
+			margin-top: 22rpx;
+		}
+
+		.is-disabled {
+			color: #333333;
+		}
+	}
+
+	.default-box {
+		width: 100%;
+		box-sizing: border-box;
+		height: 100rpx;
+
+		.default-box-title {
+			font-size: 28rpx;
+			color: #333333;
+			line-height: normal;
+		}
+	}
+
+	.footer-box {
+		.save-btn {
+			width: 710rpx;
+			height: 80rpx;
+			border-radius: 40rpx;
+			background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+			color: $white;
+		}
+
+		.cancel-btn {
+			width: 710rpx;
+			height: 80rpx;
+			border-radius: 40rpx;
+			background: var(--ui-BG);
+		}
+	}
+</style>

pages/user/dummyAddress/list.vue

@@ -0,0 +1,152 @@
+<!-- 收件地址列表 -->
+<template>
+	<s-layout title="虚拟商品收货地址" :bgStyle="{ color: '#FFF' }">
+		<view v-if="state.list.length">
+			<s-address-item spuType="0" hasBorderBottom v-for="item in state.list" :key="item.id" :item="item"
+				@tap="onSelect(item)" />
+		</view>
+
+		<su-fixed bottom placeholder>
+			<view class="footer-box ss-flex ss-row-between ss-p-20">
+				<!-- 微信小程序和微信H5 -->
+				<!-- <button v-if="['WechatMiniProgram', 'WechatOfficialAccount'].includes(sheep.$platform.name)"
+					@tap="importWechatAddress"
+					class="border ss-reset-button sync-wxaddress ss-m-20 ss-flex ss-row-center ss-col-center">
+					<text class="cicon-weixin ss-p-r-10" style="color: #09bb07; font-size: 40rpx"></text>
+					导入微信地址
+				</button> -->
+				<button class="add-btn ss-reset-button ui-Shadow-Main"
+					@tap="sheep.$router.go('/pages/user/dummyAddress/edit')">
+					新增收货地址
+				</button>
+			</view>
+		</su-fixed>
+		<s-empty v-if="state.list.length === 0 && !state.loading" text="暂无收货地址" icon="/static/data-empty.png" />
+	</s-layout>
+</template>
+
+<script setup>
+	import {
+		reactive,
+		onBeforeMount
+	} from 'vue';
+	import {
+		onShow
+	} from '@dcloudio/uni-app';
+	import sheep from '@/sheep';
+	import {
+		isEmpty
+	} from 'lodash';
+	import AreaApi from '@/sheep/api/system/area';
+	import AddressApi from '@/sheep/api/member/address';
+	import $helper from '@/sheep/helper';
+	const state = reactive({
+		list: [], // 地址列表
+		loading: true,
+	});
+
+	// 选择收货地址
+	const onSelect = (addressInfo) => {
+		uni.$emit('SELECT_ADDRESS', {
+			addressInfo,
+		});
+		sheep.$router.back();
+	};
+
+	// 导入微信地址
+	// TODO 非繁人：未测试
+	function importWechatAddress() {
+		let wechatAddress = {};
+		// #ifdef MP
+		uni.chooseAddress({
+			success: (res) => {
+				wechatAddress = {
+					consignee: res.userName,
+					mobile: res.telNumber,
+					province_name: res.provinceName,
+					city_name: res.cityName,
+					district_name: res.countyName,
+					address: res.detailInfo,
+					region: '',
+					is_default: false,
+				};
+				if (!isEmpty(wechatAddress)) {
+					sheep.$router.go('/pages/user/dummyAddress/edit', {
+						data: JSON.stringify(wechatAddress),
+					});
+				}
+			},
+			fail: (err) => {
+				console.log("uni.chooseAddress调用失败，问题是：", err);
+			},
+		});
+		// #endif
+		// #ifdef H5
+		sheep.$platform.useProvider('wechat').jssdk.openAddress({
+			success: (res) => {
+				wechatAddress = {
+					consignee: res.userName,
+					mobile: res.telNumber,
+					province_name: res.provinceName,
+					city_name: res.cityName,
+					district_name: res.countryName,
+					address: res.detailInfo,
+					region: '',
+					is_default: false,
+				};
+				if (!isEmpty(wechatAddress)) {
+					sheep.$router.go('/pages/user/dummyAddress/edit', {
+						data: JSON.stringify(wechatAddress),
+					});
+				}
+			},
+		});
+		// #endif
+
+
+	}
+
+	onShow(async () => {
+		state.list = (await AddressApi.getAddressList(2)).data;
+		state.loading = false;
+	});
+
+	onBeforeMount(() => {
+		if (!!uni.getStorageSync('areaData')) {
+			return;
+		}
+		// 提前加载省市区数据
+		AreaApi.getAreaTree().then((res) => {
+			if (res.code === 0) {
+				uni.setStorageSync('areaData', res.data);
+			}
+		});
+	});
+</script>
+
+<style lang="scss" scoped>
+	.footer-box {
+		.add-btn {
+			flex: 1;
+			background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+			border-radius: 80rpx;
+			font-size: 30rpx;
+			font-weight: 500;
+			line-height: 80rpx;
+			color: $white;
+			position: relative;
+			z-index: 1;
+		}
+
+		.sync-wxaddress {
+			flex: 1;
+			line-height: 80rpx;
+			background: $white;
+			border-radius: 80rpx;
+			font-size: 30rpx;
+			font-weight: 500;
+			color: $dark-6;
+			margin-right: 18rpx;
+		}
+	}
+</style>

pages/user/setting.vue

@@ -28,7 +28,14 @@
 					<uni-list-item
 						clickable
 						@tap="sheep.$router.go('/pages/user/address/list')"
-						title="收货地址管理"
+						title="实体收货地址管理"
+						showArrow
+						:border="false"
+					/>
+					<uni-list-item
+						clickable
+						@tap="sheep.$router.go('/pages/user/dummyAddress/list')"
+						title="虚拟收货地址管理"
 						showArrow
 						:border="false"
 					/>

pages/user/wallet/team.vue

@@ -58,7 +58,7 @@
 											<text class="time" style="float: right;color: #666666;">贡献值：{{points2point(item.residueSocial)}}</text>
 										</view>
 										
-										<view class="time" style="width: 100%;color: #999">
+										<view class="time" style="width: 100%;color: #9992">
 											{{item.socialStatusLevel}} / <text >{{item.depth == 1?'直推人':''}}</text>
 											<text style="float: right;">团队：{{item.descendantsCount}}人</text>
 											

sheep/api/member/address.js

@@ -2,10 +2,11 @@ import request from '@/sheep/request';
 
 const AddressApi = {
   // 获得用户收件地址列表
-  getAddressList: () => {
+  getAddressList: (addressType = 1) => {
     return request({
       url: '/member/address/list',
-      method: 'GET'
+      method: 'GET',
+	  params: { addressType }
     });
   },
   // 创建用户收件地址
@@ -33,19 +34,20 @@ const AddressApi = {
     });
   },
   // 获得用户收件地址
-  getAddress: (id) => {
+  getAddress: (id,addressType = 1) => {
+	  console.log('123123',addressType)
     return request({
       url: '/member/address/get',
       method: 'GET',
-      params: { id }
+      params: { id ,addressType}
     });
   },
   // 删除用户收件地址
-  deleteAddress: (id) => {
+  deleteAddress: (id,addressType = 1) => {
     return request({
       url: '/member/address/delete',
       method: 'DELETE',
-      params: { id }
+      params: { id,addressType }
     });
   },
 };

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

@@ -57,12 +57,26 @@
       type: Boolean,
       defult: true,
     },
+	spuType:{
+		type:Number,
+	}
   });
-
+	
   const onEdit = () => {
-    sheep.$router.go('/pages/user/address/edit', {
-      id: props.item.id,
-    });
+	  // 虚拟商品去虚拟地址
+	  if(props.spuType == 0){
+		  sheep.$router.go('/pages/user/dummyAddress/edit', {
+		    id: props.item.id,
+			
+		  });
+	  }else{
+		sheep.$router.go('/pages/user/address/edit', {
+		  id: props.item.id,
+		});
+	  }
+    
+	
+	
   };
 </script>
 

sheep/components/s-select-sku/s-select-sku.vue

@@ -12,9 +12,13 @@
 					<view class="header-right-bottom ss-flex ss-col-center ss-row-between">
 						<view class="ss-flex">
 							<view class="price-text">
+								<image src="@/static/icon/points.png" v-if="goodsInfo.spuPayType == 2"
+									style="width:30rpx;height:30rpx"></image>
+								<text v-else>￥</text>
 								{{ fen2yuan( state.selectedSku.price || goodsInfo.price) }}
 							</view>
-							<view class="origin-price-text ss-m-l-10" v-if="state.selectedSku.promotionFee >= 0 || goodsInfo.promotionFee >= 0">
+							<view class="origin-price-text ss-m-l-10"
+								v-if="state.selectedSku.promotionFee >= 0 || goodsInfo.promotionFee >= 0">
 								数字权益:{{ fen2yuan(state.selectedSku.promotionFee || goodsInfo.promotionFee) }}
 							</view>
 						</view>
@@ -43,20 +47,34 @@
 							</button>
 						</view>
 					</view>
-					<view class="buy-num-box ss-flex ss-col-center ss-row-between ss-m-b-40">
+					<view class="buy-num-box ss-flex ss-col-center ss-row-between ss-m-b-40"
+						v-if="goodsInfo.spuPayType == 2">
+						<view class="label-text">购买金额</view>
+						<view class="ss-flex ss-col-center">
+							<image src="@/static/icon/points.png" v-if="goodsInfo.spuPayType == 2"
+								style="width:30rpx;height:30rpx"></image>
+							<input v-model.number="state.selectedSku.use_points" class="uni-input input-points "
+								style="width:100rpx;text-align: center;" type="number" placeholder="0" 
+								oninput="this.value=this.value.replace(/\D/g);" :disabled="!state.selectedSku.id" />
+						</view>
+					</view>
+					<view class="buy-num-box ss-flex ss-col-center ss-row-between ss-m-b-40" v-else>
 						<view class="label-text">购买数量</view>
 						<su-number-box :min="1" :max="state.selectedSku.stock" :step="1"
 							v-model="state.selectedSku.goods_num" @change="onNumberChange($event)" />
 					</view>
 				</scroll-view>
 			</view>
-
 			<!-- 操作区 -->
 			<view class="modal-footer border-top">
-				<view class="buy-box ss-flex ss-col-center ss-flex ss-col-center ss-row-center">
+				<view class="buy-box ss-flex ss-col-center ss-flex ss-col-center ss-row-center"
+					v-if="goodsInfo.spuType && goodsInfo.spuPayType == 1">
 					<button class="ss-reset-button add-btn ui-Shadow-Main" @tap="onAddCart">加入购物车</button>
 					<button class="ss-reset-button buy-btn ui-Shadow-Main" @tap="onBuy">立即购买</button>
 				</view>
+				<view class="buy-box ss-flex ss-col-center ss-flex ss-col-center ss-row-center" v-else>
+					<button class="ss-reset-button one-buy-btn ui-Shadow-Main" @tap="onBuy">立即购买</button>
+				</view>
 			</view>
 		</view>
 	</su-popup>
@@ -75,7 +93,7 @@
 		convertProductPropertyList,
 		fen2yuan
 	} from '@/sheep/hooks/useGoods';
-	
+
 	const emits = defineEmits(['change', 'addCart', 'buy', 'close']);
 	const props = defineProps({
 		goodsInfo: {
@@ -89,12 +107,13 @@
 	});
 
 	const state = reactive({
+		
 		selectedSku: {}, // 选中的 SKU
 		currentPropertyArray: [], // 当前选中的属性，实际是个 Map。key 是 property 编号，value 是 value 编号
 	});
 
 	const propertyList = convertProductPropertyList(props.goodsInfo.skus);
-	
+
 	// SKU 列表
 	const skuList = computed(() => {
 		let skuPrices = props.goodsInfo.skus;
@@ -107,7 +126,11 @@
 	watch(
 		() => state.selectedSku,
 		(newVal) => {
-			console.log(newVal)
+			
+			if(newVal.use_points){
+				console.log(newVal.use_points,fen2yuan(state.selectedSku.price))
+				state.selectedSku.goods_num = parseInt( newVal.use_points / fen2yuan(state.selectedSku.price) )
+			}
 			emits('change', newVal);
 		}, {
 			immediate: true, // 立即执行
@@ -138,6 +161,11 @@
 
 	// 立即购买
 	function onBuy() {
+		console.log()
+		if ( state.selectedSku.goods_num < 1  || !state.selectedSku.use_points){
+			sheep.$helper.toast('输入金额少于可购买数量');
+			return;
+		}
 		if (state.selectedSku.id <= 0) {
 			sheep.$helper.toast('请选择规格');
 			return;
@@ -283,15 +311,15 @@
 		// 改变 property 禁用状态
 		changeDisabled(isChecked, propertyId, valueId);
 	}
-	
+
 	changeDisabled(false);
-	
+
 	onMounted(() => {
-	  // 如果商品的属性只有一条，则默认选中
-	  if(propertyList.length == 1 && propertyList[0].values.length == 1){
-		  onSelectSku(0,0)
-	  }
-	  // 这里可以处理其他初始化逻辑，但请注意这不会接收到 onLoad 的 options 参数
+		// 如果商品的属性只有一条，则默认选中
+		if (propertyList.length == 1 && propertyList[0].values.length == 1) {
+			onSelectSku(0, 0)
+		}
+		// 这里可以处理其他初始化逻辑，但请注意这不会接收到 onLoad 的 options 参数
 	});
 
 	// TODO 非繁人：待讨论的优化点：1）单规格，要不要默认选中；2）默认要不要选中第一个规格
@@ -306,9 +334,10 @@
 		background: #ffca3e;
 		padding: 2px 8px;
 		border-radius: 4px;
-		display:inline-block;
+		display: inline-block;
 		color: #597533;
 	}
+
 	// 购买
 	.buy-box {
 		padding: 10rpx 0;
@@ -329,6 +358,14 @@
 			color: #fff;
 		}
 
+		.one-buy-btn {
+			width: 98%;
+			height: 80rpx;
+			border-radius: 40rpx;
+			background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+			color: #fff;
+		}
+
 		.score-btn {
 			width: 100%;
 			margin: 0 20rpx;
@@ -391,10 +428,10 @@
 				font-family: OPPOSANS;
 
 				&::before {
-					content: '￥';
-					font-size: 30rpx;
-					font-weight: 500;
-					color: $red;
+					// content: '￥';
+					// font-size: 30rpx;
+					// font-weight: 500;
+					// color: $red;
 				}
 			}
 

sheep/store/user.js

@@ -80,10 +80,10 @@ const user = defineStore({
 			if (code !== 0) {
 				return;
 			}
-			console.log("user.js data",data)
+			// console.log("user.js data",data)
 			
 			this.userInfo = data;
-			console.log("user.js this.userInfo",this.userInfo)
+			// console.log("user.js this.userInfo",this.userInfo)
 			// console.log("获取到用户信息 开始自动签到")
 			autoSign();
 			return Promise.resolve(data);

unpackage/dist/build/web/assets/address.8b848c4e.js

@@ -1 +0,0 @@
-import{Y as e}from"./index-b7f10455.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/address.8d53b697.js

@@ -0,0 +1 @@
+import{Z as e}from"./index-a0c79ae7.js";const s={getAddressList:(s=1)=>e({url:"/member/address/list",method:"GET",params:{addressType:s}}),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,d=1)=>(console.log("123123",d),e({url:"/member/address/get",method:"GET",params:{id:s,addressType:d}})),deleteAddress:(s,d=1)=>e({url:"/member/address/delete",method:"DELETE",params:{id:s,addressType:d}})};export{s as A};

unpackage/dist/build/web/assets/afterSale.05a42813.js → unpackage/dist/build/web/assets/afterSale.0ab41998.js

@@ -1 +1 @@
-import{Y as e}from"./index-b7f10455.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-a0c79ae7.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/area.25e016b2.js

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

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

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

unpackage/dist/build/web/assets/brokerage.0676b876.js → unpackage/dist/build/web/assets/brokerage.166a3e7d.js

@@ -1 +1 @@
-import{Y as e}from"./index-b7f10455.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-a0c79ae7.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.6d4201ab.js → unpackage/dist/build/web/assets/category.9354c674.js

@@ -1 +1 @@
-import{Y as t}from"./index-b7f10455.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-a0c79ae7.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.06e2df67.js → unpackage/dist/build/web/assets/combination.a02874ce.js

@@ -1 +1 @@
-import{Y as o}from"./index-b7f10455.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-a0c79ae7.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.5a2c734d.js

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

unpackage/dist/build/web/assets/config.7706eef8.js

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

unpackage/dist/build/web/assets/const.5e624034.js → unpackage/dist/build/web/assets/const.f03dbf43.js

@@ -1 +1 @@
-import{Y as t,az as e}from"./index-b7f10455.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:"折扣"}},a={DATE:{type:1,name:"固定日期可用"},TERM:{type:2,name:"领取之后可用"}},l={WAIT_START:"即将开始",STARTED:"进行中",END:"已结束"},s=(t,i)=>{const o=e();return o.isBefore(t)?l.WAIT_START:o.isAfter(i)?l.END:l.STARTED};export{a as C,o as P,i as S,l as T,s as g};
+import{Z as t,az as e}from"./index-a0c79ae7.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:"折扣"}},a={DATE:{type:1,name:"固定日期可用"},TERM:{type:2,name:"领取之后可用"}},l={WAIT_START:"即将开始",STARTED:"进行中",END:"已结束"},s=(t,i)=>{const o=e();return o.isBefore(t)?l.WAIT_START:o.isAfter(i)?l.END:l.STARTED};export{a as C,o as P,i as S,l as T,s as g};

unpackage/dist/build/web/assets/edit-6d3e095d.css

@@ -0,0 +1 @@
+[data-v-382534e4] .uni-forms-item__label .label-text{font-size:.875rem!important;color:#333!important;line-height:normal!important}[data-v-382534e4] .uni-easyinput__content-input{font-size:.875rem!important;color:#333!important;line-height:normal!important;padding-left:0!important}[data-v-382534e4] .uni-easyinput__content-textarea{font-size:.875rem!important;color:#333!important;line-height:normal!important;margin-top:.25rem!important}[data-v-382534e4] .uni-icons{font-size:1.25rem!important}[data-v-382534e4] .is-textarea-icon{margin-top:.6875rem}[data-v-382534e4] .is-disabled{color:#333}.default-box[data-v-382534e4]{width:100%;box-sizing:border-box;height:3.125rem}.default-box .default-box-title[data-v-382534e4]{font-size:.875rem;color:#333;line-height:normal}.footer-box .save-btn[data-v-382534e4]{width:22.1875rem;height:2.5rem;border-radius:1.25rem;background:linear-gradient(90deg,var(--ui-BG-Main),var(--ui-BG-Main-gradient));color:#fff}.footer-box .cancel-btn[data-v-382534e4]{width:22.1875rem;height:2.5rem;border-radius:1.25rem;background:var(--ui-BG)}

unpackage/dist/build/web/assets/edit-d10a5f51.css

@@ -0,0 +1 @@
+[data-v-084dfbbe] .uni-forms-item__label .label-text{font-size:.875rem!important;color:#333!important;line-height:normal!important}[data-v-084dfbbe] .uni-easyinput__content-input{font-size:.875rem!important;color:#333!important;line-height:normal!important;padding-left:0!important}[data-v-084dfbbe] .uni-easyinput__content-textarea{font-size:.875rem!important;color:#333!important;line-height:normal!important;margin-top:.25rem!important}[data-v-084dfbbe] .uni-icons{font-size:1.25rem!important}[data-v-084dfbbe] .is-textarea-icon{margin-top:.6875rem}[data-v-084dfbbe] .is-disabled{color:#333}.default-box[data-v-084dfbbe]{width:100%;box-sizing:border-box;height:3.125rem}.default-box .default-box-title[data-v-084dfbbe]{font-size:.875rem;color:#333;line-height:normal}.footer-box .save-btn[data-v-084dfbbe]{width:22.1875rem;height:2.5rem;border-radius:1.25rem;background:linear-gradient(90deg,var(--ui-BG-Main),var(--ui-BG-Main-gradient));color:#fff}.footer-box .cancel-btn[data-v-084dfbbe]{width:22.1875rem;height:2.5rem;border-radius:1.25rem;background:var(--ui-BG)}

unpackage/dist/build/web/assets/favorite.cb707cd8.js → unpackage/dist/build/web/assets/favorite.91f238f0.js

@@ -1 +1 @@
-import{Y as e}from"./index-b7f10455.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:"收藏成功"}}),createCollectBefore:t=>e({url:"/distri/user-collect-before/create",method:"POST",data:{productSpuId:t}}),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-a0c79ae7.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:"收藏成功"}}),createCollectBefore:t=>e({url:"/distri/user-collect-before/create",method:"POST",data:{productSpuId:t}}),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.883851c3.js → unpackage/dist/build/web/assets/history.52ca95f3.js

@@ -1 +1 @@
-import{Y as s}from"./index-b7f10455.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-a0c79ae7.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/list-2bfa617f.css

@@ -0,0 +1 @@
+.footer-box .add-btn[data-v-79fb41c9]{flex:1;background:linear-gradient(90deg,var(--ui-BG-Main),var(--ui-BG-Main-gradient));border-radius:2.5rem;font-size:.9375rem;font-weight:500;line-height:2.5rem;color:#fff;position:relative;z-index:1}.footer-box .sync-wxaddress[data-v-79fb41c9]{flex:1;line-height:2.5rem;background:#ffffff;border-radius:2.5rem;font-size:.9375rem;font-weight:500;color:#666;margin-right:.5625rem}

unpackage/dist/build/web/assets/list-48edf1bb.css

@@ -1 +0,0 @@
-.card-btn[data-v-ce30d1a5]{padding:0 .5rem;height:1.5625rem;border-radius:1.25rem;background:linear-gradient(90deg,var(--ui-BG-Main),var(--ui-BG-Main-gradient));color:#fff;font-size:.75rem;font-weight:400}.border-btn[data-v-ce30d1a5]{background:linear-gradient(90deg,var(--ui-BG-Main-opacity-4),var(--ui-BG-Main-light));color:#fff!important}.disabled-btn[data-v-ce30d1a5]{background:#cccccc;background-color:#ccc!important;color:#fff!important}

unpackage/dist/build/web/assets/pages-index-index.dfab58a9.js → unpackage/dist/build/web/assets/pages-index-index.fc1c10c5.js

@@ -1 +1 @@
-import{h as e,c as t,o as s,s as a,$ as o,a as p,b as r,d as i,e as l,f as n,w as m,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-b7f10455.js";import{_ as b,a as f}from"./s-block.94acf14e.js";import{_ as x}from"./s-layout.dd5636db.js";import"./phone-international-input.64f9446f.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.ec4fb70e.js";import"./uni-badge.468297c5.js";import"./su-image.a2eee315.js";import"./su-swiper.70727003.js";import"./s-goods-column.7e6d422b.js";/* empty css                                                                     */import"./uni-load-more.36b13806.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.5ea823ff.js";import"./combination.06e2df67.js";import"./const.5e624034.js";import"./mp-html.415494d6.js";import"./richtext.2bcf8869.js";const h={__name:"index",setup(h){e();const k=t((()=>{var e;return null==(e=a.$store("app").template)?void 0:e.home}));return s((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,t)=>{const s=g(v("s-block-item"),b),a=g(v("s-block"),f),o=g(v("s-layout"),x),p=d;return k.value?(l(),n(p,{key:0},{default:m((()=>{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:m((()=>[(l(!0),y(j,null,c(k.value.components,((e,t)=>(l(),n(a,{key:t,styles:e.property.style},{default:m((()=>[_(s,{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 t,o as s,s as a,$ as o,a as p,b as r,d as i,e as l,f as n,w as m,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-a0c79ae7.js";import{_ as b,a as f}from"./s-block.27c5f8eb.js";import{_ as x}from"./s-layout.fd6ec616.js";import"./phone-international-input.98e38fd1.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.5b649166.js";import"./uni-badge.84babb8f.js";import"./su-image.8ff1a2f0.js";import"./su-swiper.df429999.js";import"./s-goods-column.183b90a9.js";/* empty css                                                                     */import"./uni-load-more.4b2063b3.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.5286ecb7.js";import"./combination.a02874ce.js";import"./const.f03dbf43.js";import"./mp-html.061ec6fc.js";import"./richtext.09baaffa.js";const h={__name:"index",setup(h){e();const k=t((()=>{var e;return null==(e=a.$store("app").template)?void 0:e.home}));return s((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,t)=>{const s=g(v("s-block-item"),b),a=g(v("s-block"),f),o=g(v("s-layout"),x),p=d;return k.value?(l(),n(p,{key:0},{default:m((()=>{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:m((()=>[(l(!0),y(j,null,c(k.value.components,((e,t)=>(l(),n(a,{key:t,styles:e.property.style},{default:m((()=>[_(s,{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.970b726c.js → unpackage/dist/build/web/assets/pages-index-page.a1f8fef1.js

@@ -1 +1 @@
-import{_ as t,a as e}from"./s-block.94acf14e.js";import{y as s,o,V as a,d as p,e as n,f as i,w as r,l,k as m,r as _,F as u,m as y,j as d}from"./index-b7f10455.js";import{_ as c}from"./s-layout.dd5636db.js";import"./phone-international-input.64f9446f.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.ec4fb70e.js";import"./uni-badge.468297c5.js";import"./su-image.a2eee315.js";import"./su-swiper.70727003.js";import"./s-goods-column.7e6d422b.js";/* empty css                                                                     */import"./uni-load-more.36b13806.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.5ea823ff.js";import"./combination.06e2df67.js";import"./const.5e624034.js";import"./mp-html.415494d6.js";import"./richtext.2bcf8869.js";const g={__name:"page",setup(g){const j=s({name:"",components:[],navigationBar:{},page:{}});return o((async t=>{var e,s,o;let p=t.id;const{code:n,data:i}=await a.getDiyPage(p);0===n&&(j.name=i.name,j.components=null==(e=i.property)?void 0:e.components,j.navigationBar=null==(s=i.property)?void 0:s.navigationBar,j.page=null==(o=i.property)?void 0:o.page)})),p((()=>{})),(s,o)=>{const a=l(y("s-block-item"),t),p=l(y("s-block"),e),g=l(y("s-layout"),c);return n(),i(g,{title:j.name,navbar:"custom",bgStyle:j.page,navbarStyle:j.navigationBar,onShareAppMessage:"",showLeftButton:""},{default:r((()=>[(n(!0),m(u,null,_(j.components,((t,e)=>(n(),i(p,{key:e,styles:t.property.style},{default:r((()=>[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 e}from"./s-block.27c5f8eb.js";import{y as s,o,V as a,d as p,e as n,f as i,w as r,l,k as m,r as _,F as u,m as y,j as d}from"./index-a0c79ae7.js";import{_ as c}from"./s-layout.fd6ec616.js";import"./phone-international-input.98e38fd1.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.5b649166.js";import"./uni-badge.84babb8f.js";import"./su-image.8ff1a2f0.js";import"./su-swiper.df429999.js";import"./s-goods-column.183b90a9.js";/* empty css                                                                     */import"./uni-load-more.4b2063b3.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.5286ecb7.js";import"./combination.a02874ce.js";import"./const.f03dbf43.js";import"./mp-html.061ec6fc.js";import"./richtext.09baaffa.js";const g={__name:"page",setup(g){const j=s({name:"",components:[],navigationBar:{},page:{}});return o((async t=>{var e,s,o;let p=t.id;const{code:n,data:i}=await a.getDiyPage(p);0===n&&(j.name=i.name,j.components=null==(e=i.property)?void 0:e.components,j.navigationBar=null==(s=i.property)?void 0:s.navigationBar,j.page=null==(o=i.property)?void 0:o.page)})),p((()=>{})),(s,o)=>{const a=l(y("s-block-item"),t),p=l(y("s-block"),e),g=l(y("s-layout"),c);return n(),i(g,{title:j.name,navbar:"custom",bgStyle:j.page,navbarStyle:j.navigationBar,onShareAppMessage:"",showLeftButton:""},{default:r((()=>[(n(!0),m(u,null,_(j.components,((t,e)=>(n(),i(p,{key:e,styles:t.property.style},{default:r((()=>[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.17345035.js

@@ -1 +0,0 @@
-import{y as s,o as t,N as e,e as a,f as o,w as r,l as i,j as l,t as n,k as c,r as u,F as f,s as h,p as y,M as d,U as p,m as _,i as m,G as x,u as L}from"./index-b7f10455.js";import{b as g,_ as b}from"./s-layout.dd5636db.js";import{_ as w}from"./_plugin-vue_export-helper.1b428a4d.js";import"./phone-international-input.64f9446f.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((()=>[n("搜索历史")])),_:1}),l(y,{class:"clean-history ss-reset-button",onClick:C},{default:r((()=>[n(" 清除搜索历史 ")])),_:1})])),_:1}),l(h,{class:"ss-flex ss-col-center ss-row-left ss-flex-wrap"},{default:r((()=>[(a(!0),c(f,null,u(k.historyList,((s,t)=>(a(),o(y,{class:"history-btn ss-reset-button",onClick:t=>j(s),key:t},{default:r((()=>[n(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-search.bcd351f3.js

@@ -0,0 +1 @@
+import{y as s,o as t,N as e,e as a,f as o,w as r,l as i,j as l,t as n,k as c,r as u,F as f,s as h,p as y,M as d,U as p,m as _,i as m,G as x,u as L}from"./index-a0c79ae7.js";import{b,_ as g}from"./s-layout.fd6ec616.js";import{_ as w}from"./_plugin-vue_export-helper.1b428a4d.js";import"./phone-international-input.98e38fd1.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"),b),h=m,y=x,d=i(_("s-layout"),g);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((()=>[n("搜索历史")])),_:1}),l(y,{class:"clean-history ss-reset-button",onClick:C},{default:r((()=>[n(" 清除搜索历史 ")])),_:1})])),_:1}),l(h,{class:"ss-flex ss-col-center ss-row-left ss-flex-wrap"},{default:r((()=>[(a(!0),c(f,null,u(k.historyList,((s,t)=>(a(),o(y,{class:"history-btn ss-reset-button",onClick:t=>j(s),key:t},{default:r((()=>[n(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.3801a22c.js → unpackage/dist/build/web/assets/pages-index-user.e09ef33f.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 i,p as l,q as n,e as u,f as m,w as _,l as d,k as y,r as c,F as j,m as b,j as g}from"./index-b7f10455.js";import{_ as v,a as f}from"./s-block.94acf14e.js";import{_ as k}from"./s-layout.dd5636db.js";import"./phone-international-input.64f9446f.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.ec4fb70e.js";import"./uni-badge.468297c5.js";import"./su-image.a2eee315.js";import"./su-swiper.70727003.js";import"./s-goods-column.7e6d422b.js";/* empty css                                                                     */import"./uni-load-more.36b13806.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.5ea823ff.js";import"./combination.06e2df67.js";import"./const.5e624034.js";import"./mp-html.415494d6.js";import"./richtext.2bcf8869.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((()=>{})),i((s=>{s.linkId&&(l("linkId",s.linkId),S.value||n("register","register"))})),(s,e)=>{var t;const a=d(b("s-block-item"),v),o=d(b("s-block"),f),r=d(b("s-layout"),k);return u(),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:_((()=>[(u(!0),y(j,null,c(h.value.components,((s,e)=>(u(),m(o,{key:e,styles:s.property.style},{default:_((()=>[g(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 i,p as l,q as n,e as u,f as m,w as _,l as d,k as y,r as c,F as j,m as b,j as g}from"./index-a0c79ae7.js";import{_ as v,a as f}from"./s-block.27c5f8eb.js";import{_ as k}from"./s-layout.fd6ec616.js";import"./phone-international-input.98e38fd1.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.5b649166.js";import"./uni-badge.84babb8f.js";import"./su-image.8ff1a2f0.js";import"./su-swiper.df429999.js";import"./s-goods-column.183b90a9.js";/* empty css                                                                     */import"./uni-load-more.4b2063b3.js";/* empty css                                                                *//* empty css                                                                      */import"./spu.5286ecb7.js";import"./combination.a02874ce.js";import"./const.f03dbf43.js";import"./mp-html.061ec6fc.js";import"./richtext.09baaffa.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((()=>{})),i((s=>{s.linkId&&(l("linkId",s.linkId),S.value||n("register","register"))})),(s,e)=>{var t;const a=d(b("s-block-item"),v),o=d(b("s-block"),f),r=d(b("s-layout"),k);return u(),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:_((()=>[(u(!0),y(j,null,c(h.value.components,((s,e)=>(u(),m(o,{key:e,styles:s.property.style},{default:_((()=>[g(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.155f841d.js

@@ -0,0 +1 @@
+import{e as t,f as a,w as e,j as s,B as l,g as i,t as o,u as n,v as d,s as r,E as c,i as u,y as m,o as f,l as p,k as _,r as y,F as x,m as g}from"./index-a0c79ae7.js";import{_ as b}from"./s-layout.fd6ec616.js";import{_ as j}from"./_plugin-vue_export-helper.1b428a4d.js";import{A as h}from"./afterSale.0ab41998.js";import"./phone-international-input.98e38fd1.js";const v=j({__name:"log-item",props:{item:{type:Object,default(){}},index:{type:Number,default:0},data:{type:Object,default(){}}},setup:m=>(f,p)=>{const _=c,y=u;return t(),a(y,{class:"log-item ss-flex"},{default:e((()=>[s(y,{class:"log-icon ss-flex-col ss-col-center ss-m-r-20"},{default:e((()=>[s(_,{class:l(["cicon-title",0===m.index?"activity-color":""])},null,8,["class"]),m.data.length-1!==m.index?(t(),a(y,{key:0,class:"line"})):i("",!0)])),_:1}),s(y,null,{default:e((()=>[s(y,{class:"text"},{default:e((()=>[o(n(m.item.content),1)])),_:1}),s(y,{class:"date"},{default:e((()=>[o(n(d(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:a}=await h.getAfterSaleLogList(t);i.list=a}(t.id)})),(l,o)=>{const n=u,d=p(g("s-layout"),b);return t(),a(d,{title:"售后进度"},{default:e((()=>[s(n,{class:"log-box"},{default:e((()=>[(t(!0),_(x,null,y(i.list,((l,o)=>(t(),a(n,{key:l.id},{default:e((()=>[s(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};

unpackage/dist/build/web/assets/pages-order-aftersale-log.413f2cda.js

@@ -1 +0,0 @@
-import{e as t,f as e,w as a,j as s,B as l,g as i,t as o,u as n,v as d,s as r,E as c,i as u,y as m,o as f,l as p,k as _,r as y,F as x,m as g}from"./index-b7f10455.js";import{_ as b}from"./s-layout.dd5636db.js";import{_ as j}from"./_plugin-vue_export-helper.1b428a4d.js";import{A as h}from"./afterSale.05a42813.js";import"./phone-international-input.64f9446f.js";const v=j({__name:"log-item",props:{item:{type:Object,default(){}},index:{type:Number,default:0},data:{type:Object,default(){}}},setup:m=>(f,p)=>{const _=c,y=u;return t(),e(y,{class:"log-item ss-flex"},{default:a((()=>[s(y,{class:"log-icon ss-flex-col ss-col-center ss-m-r-20"},{default:a((()=>[s(_,{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}),s(y,null,{default:a((()=>[s(y,{class:"text"},{default:a((()=>[o(n(m.item.content),1)])),_:1}),s(y,{class:"date"},{default:a((()=>[o(n(d(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 n=u,d=p(g("s-layout"),b);return t(),e(d,{title:"售后进度"},{default:a((()=>[s(n,{class:"log-box"},{default:a((()=>[(t(!0),_(x,null,y(i.list,((l,o)=>(t(),e(n,{key:l.id},{default:a((()=>[s(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};