add

api/order.js

@@ -12,7 +12,8 @@ const api = {
 	editAddress: '/app/userAddress/editAddress', // 编辑地址
 	delAddress: '/app/userAddress/delAddress', // 删除地址
 	getCitys: '/app/common/getCitys', // 获取省市区
-
+	parseAddress: '/app/userAddress/parseAddress', //地址解析 
+	getAddressById: '/app/userAddress/getAddressById', //
 }
 
 
@@ -63,3 +64,14 @@ export function delAddress(data) {
 export function getCitys(data) {
 	return request(api.getCitys, data, 'GET', 'application/json;charset=UTF-8')
 }
+
+
+//地址解析 
+export function parseAddress(data) {
+	return request(api.parseAddress, data, 'POST', 'application/json;charset=UTF-8')
+}
+
+// 
+export function getAddressById(data) {
+	return request(api.getAddressById, data, 'GET', 'application/json;charset=UTF-8')
+}

common/request.js

@@ -2,7 +2,8 @@
 export default class Request {
 	http(router, data = {}, method,contentType) {
 		let that = this;
-		let path = 'http://nd383294.natappfree.cc'//余红奇
+		// let path = 'http://nd383294.natappfree.cc'//余红奇
+		let path = 'https://live.test.ylrztop.com/prod-api'//余红奇
 		// let path = 'http://v56c9b8e.natappfree.cc'//余红奇
 		// let path = 'http://192.168.10.170:7114'//陈果
 		// let path = 'http://192.168.10.166:7114'

components/evan-switch/evan-switch.vue

@@ -1,7 +1,4 @@
 <template>
-	<!-- <view @click="toggle" class="evan-switch" :class="{'evan-switch--disabled':disabled}" :style="{width:2*size+'px',height:switchHeight,borderRadius:size+'px',backgroundColor:currentValue===activeValue?activeColor:inactiveColor}">
-		<view class="evan-switch__circle" :style="{width:size+'px',height:size+'px',transform:currentValue===activeValue?`translateX(${size}px)`:`translateX(0)`}"></view>
-	</view> -->
 	<view @click="toggle" class="evan-switch" :class="{'evan-switch--disabled':disabled}" :style="{backgroundColor:currentValue===activeValue?activeColor:inactiveColor}">
 		<view class="evan-switch__circle" :style="{transform:currentValue===activeValue?`translateX(${29}px)`:`translateX(0)`}"></view>
 	</view>

core/config/defaultConfig.js

@@ -16,7 +16,8 @@ const testUrl = 'https://wanbei.monvkeji.cn/'
 // 开发环境
 // const developUrl = 'http://192.168.10.166:7114/'//余红奇
 // const developUrl = 'http://v56c9b8e.natappfree.cc/'//余红奇
-const developUrl = 'http://nd383294.natappfree.cc/'//余红奇
+// const developUrl = 'http://nd383294.natappfree.cc/'//余红奇
+const developUrl = 'https://live.test.ylrztop.com/prod-api/'//余红奇
 // const developUrl = 'http://192.168.10.170:7114/'//陈果
 export default {
 	// 系统名称

pages.json

@@ -82,7 +82,7 @@
 					"bounce": "none"
 				}
 			}
-		},{
+		}, {
 			"path": "pages/auth/findpass",
 			"style": {
 				"navigationBarTitleText": "",
@@ -93,7 +93,7 @@
 					"bounce": "none"
 				}
 			}
-		},{
+		}, {
 			"path": "pages/auth/h5WxLogin",
 			"style": {
 				"navigationBarTitleText": "",
@@ -104,7 +104,7 @@
 					"bounce": "none"
 				}
 			}
-		},{
+		}, {
 			"path": "pages/auth/loginIndex",
 			"style": {
 				"navigationBarTitleText": "",
@@ -115,7 +115,7 @@
 					"bounce": "none"
 				}
 			}
-		},{
+		}, {
 			"path": "pages/auth/register",
 			"style": {
 				"navigationBarTitleText": "",
@@ -131,84 +131,88 @@
 
 	],
 	"subPackages": [{
-		"root": "pages_shop",
+			"root": "pages_shop",
 
-		"pages": [{
-				"path": "cart",
-				"style": {
-					"navigationBarTitleText": "购物车",
-					"app-plus": {
-						"titleNView": false
+			"pages": [{
+					"path": "cart",
+					"style": {
+						"navigationBarTitleText": "购物车",
+						"app-plus": {
+							"titleNView": false
+						}
+					}
+				}, {
+					"path": "goods",
+					"style": {
+						"navigationBarTitleText": "商品详情",
+						"enablePullDownRefresh": false
 					}
-				}
-			}, {
-				"path": "goods",
-				"style": {
-					"navigationBarTitleText": "商品详情",
-					"enablePullDownRefresh": false
-				}
 
-			}, {
-				"path": "store",
-				"style": {
-					"navigationBarTitleText": "",
-					"enablePullDownRefresh": false,
-					"navigationStyle": "custom"
-				}
+				}, {
+					"path": "store",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "black",
+						"app-plus": {
+							"bounce": "none"
+						}
+					}
 
-			}, {
-				"path": "order",
-				"style": {
-					"navigationBarTitleText": "我的订单",
-					"navigationBarTextStyle": "black",
-					"app-plus": {
-						"bounce": "none"
+				}, {
+					"path": "order",
+					"style": {
+						"navigationBarTitleText": "我的订单",
+						"navigationBarTextStyle": "black",
+						"app-plus": {
+							"bounce": "none"
+						}
 					}
-				}
-			}, {
-				"path": "confirmCreateOrder",
-				"style": {
-					"navigationBarTitleText": "确认订单",
-					"navigationBarTextStyle": "black",
-					"app-plus": {
-						"bounce": "none"
+				}, {
+					"path": "confirmCreateOrder",
+					"style": {
+						"navigationBarTitleText": "确认订单",
+						"navigationBarTextStyle": "black",
+						"app-plus": {
+							"bounce": "none"
+						}
 					}
-				}
-			},
-			{
-				"path": "paymentOrder",
-				"style": {
-					"navigationBarTitleText": "支付订单",
-					"navigationBarTextStyle": "black",
-					"app-plus": {
-						"bounce": "none"
+				},
+				{
+					"path": "paymentOrder",
+					"style": {
+						"navigationBarTitleText": "支付订单",
+						"navigationBarTextStyle": "black",
+						"app-plus": {
+							"bounce": "none"
+						}
 					}
-				}
-			},
-			{
-				"path": "confirmPackageOrder",
-				"style": {
-					"navigationBarTitleText": "确认支付",
-					"navigationBarTextStyle": "black",
-					"app-plus": {
-						"bounce": "none"
+				},
+				{
+					"path": "confirmPackageOrder",
+					"style": {
+						"navigationBarTitleText": "确认支付",
+						"navigationBarTextStyle": "black",
+						"app-plus": {
+							"bounce": "none"
+						}
 					}
-				}
-			}, {
-				"path": "success",
-				"style": {
-					"navigationBarTitleText": "支付成功",
-					"navigationBarTextStyle": "black",
-					"app-plus": {
-						"bounce": "none"
+				}, {
+					"path": "success",
+					"style": {
+						"navigationBarTitleText": "支付成功",
+						"navigationBarTextStyle": "black",
+						"app-plus": {
+							"bounce": "none"
+						}
 					}
 				}
-			}
-		]
-	},{
-		"root": "pages_user",
+			]
+		}, {
+			"root": "pages_user",
 
-		"pages": [{
+			"pages": [{
 				"path": "address",
 				"style": {
 					"navigationBarTitleText": "收货地址",
@@ -216,7 +220,7 @@
 						"titleNView": false
 					}
 				}
-			},  {
+			}, {
 				"path": "addAddress",
 				"style": {
 					"navigationBarTitleText": "新建收货地址",
@@ -225,10 +229,9 @@
 						"bounce": "none"
 					}
 				}
-			}
-		]
-	}
-	
+			}]
+		}
+
 	],
 
 

pages/home/living.vue

@@ -72,9 +72,9 @@
 			<view class="videolist " style="margin: auto 0">
 				<view class="vedio" :style="{height:isScreen?'100vh':''}">
 					<!-- 修改video组件以支持HLS -->
-					<video id="myVideo" class="videotop" :src="livingUrl" :autoplay="autoplay" :controls='false'
+					<video id="myVideo" class="videotop" :src="livingUrl" :autoplay="autoplay" :controls='false' object-fit='contain'
 						:custom-cache="false" :enable-progress-gesture="false" vslide-gesture-in-fullscreen='true'
-						:show-center-play-btn="false" :http-cache="false" @error="videoError">
+						:show-center-play-btn="false" :http-cache="false" @error="videoError" >
 					</video>
 				</view>
 			</view>
@@ -391,7 +391,8 @@
 	// var wsUrl = "ws://192.168.10.166:17114/app/webSocket";
 
 	// var wsUrl = "ws://192.168.10.166:7114/app/webSocket"; //余红奇
-	var wsUrl = "ws://nd383294.natappfree.cc/app/webSocket"; //余红奇
+	var wsUrl = "ws://live.test.ylrztop.com/prod-api/app/webSocket"; //余红奇
+	// var wsUrl = "ws://nd383294.natappfree.cc/app/webSocket"; //余红奇
 	// var wsUrl = "ws://v56c9b8e.natappfree.cc/app/webSocket"; //余红奇
 	// var wsUrl = "ws://192.168.10.170:7114/app/webSocket"; //陈果
 	// var wsUrl = "ws://live.ylrzcloud.com/socket/app/webSocket";
@@ -423,7 +424,8 @@
 				isZoom: false, //点赞按钮控制是否放大
 				userinfo: '', //用户信息
 				// path: 'http://192.168.10.166/dev-api', //余红奇
-				path: 'http://v56c9b8e.natappfree.cc', //余红奇
+				// path: 'http://v56c9b8e.natappfree.cc', //余红奇
+				path: 'live.test.ylrztop.com/prod-api', //余红奇
 				// path: 'http://192.168.10.170/dev-api', //陈果
 				value: '',
 				talkdisabled: false, //输入框是否禁用

pages_shop/confirmCreateOrder.vue

@@ -186,6 +186,7 @@
 	// import { getMyEnableCouponList } from '@/api/coupon'
 	import {
 		createliveOrder, // 创建订单
+		userAddr // 获取用户收货地址
 	} from "@/api/order.js"
 	import EvanSwitch from '@/components/evan-switch/evan-switch.vue'
 	import popupBottom from '@/components/px-popup-bottom/px-popup-bottom.vue'
@@ -217,7 +218,6 @@
 					usedIntegral: 0,
 					totalPrice: 0.00,
 				},
-				address: null,
 				carts: [],
 				checked: false,
 				type: null,
@@ -263,9 +263,10 @@
 			// this.getWeixinOrderTemps();
 		},
 		mounted() {
+			this.getUserAddr()
 			uni.$on('updateAddress', (e) => {
-					this.address = e;
-					this.addressId = e.addressId;
+				this.address = e;
+				this.addressId = e.addressId;
 			});
 		},
 		beforeDestroy() {
@@ -273,6 +274,24 @@
 			uni.$off('updateAddress');
 		},
 		methods: {
+			// 获取用户收货地址
+			getUserAddr() {
+				this.userInfo = JSON.parse(uni.getStorageSync("userInfo"))
+				userAddr(this.userInfo.userId).then(res => {
+						if (res.code == 200) {
+							console.log("用户收货地址>>>>", res.data)
+							// this.address = res.data;
+							 this.address = res.data.find(item => item.isDefault == 1);
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none'
+							});
+						}
+					},
+					rej => {}
+				);
+			},
 
 			// 创建订单
 			createLiveOrder() {
@@ -280,9 +299,10 @@
 					liveId: this.liveId,
 					orderKey: this.orderKey,
 					// storeId:this.storeId,,
-					userName: "没名字",
-					userPhone: "1234568",
-					userAddress: "随便住",
+					userName: this.address.realName,
+					userPhone: this.address.phone,
+					userAddress: this.address.province + this.address.city + this.address.district + this.address
+						.detail,
 					// cartId:"5",
 					productId: this.productId,
 					totalNum: this.totalNum,

pages_shop/store.vue

@@ -5,11 +5,11 @@
 			<view :style="{height: statusBarHeight + 'px',width: '100%'}"></view>
 			<view class="uni-nav-barbox">
 				<view class="uni-nav-back">
-					<u-icon name="arrow-left" color="#333" size="20" @click="rightClick"></u-icon>
+					<u-icon name="arrow-left" color="#ffffff" size="20" @click="rightClick"></u-icon>
 				</view>
 				<view class="uni-nav-title"
 					:style="{opacity: 1,width:`calc(100vw - 100rpx - ${menuRight} - ${menuWidth})`}">
-					<view class="inputbox" :style="{background: opacity >= 0.6 ? '#f7f7f7':'#fff'}" @click="toSearch">
+					<view class="inputbox" :style="{background: opacity >= 0.6 ? '#6b4d40':'#fff'}" @click="toSearch">
 						<image class="icon-search" src="/static/images/search.png" mode=""></image>
 						<view>搜索店内药品</view>
 					</view>

pages_user/addAddress.vue

@@ -2,27 +2,30 @@
 	<view class="content">
 		<view class="inner">
 			<view class="address-box">
-				<textarea class="textarea" v-model="content"  placeholder="请粘贴或输入文本,点击'识别'自动识别姓名、电话、地址,格式:深圳市龙岗区坂田街道长坑路西2巷2号202 黄大大 18888888888"   />
-				<view  class="btns" >
-					<view  class="btn parse" @click="parseAddress()">识别</view>
+				<textarea class="textarea" v-model="content"
+					placeholder="请粘贴或输入文本,点击'识别'自动识别姓名、电话、地址,格式:深圳市龙岗区坂田街道长坑路西2巷2号202 黄大大 18888888888" />
+				<view class="btns">
+					<view class="btn parse" @click="parseAddress()">识别</view>
 				</view>
 			</view>
 			<view class="form-box">
-				
+
 				<view class="form-item">
 					<text class="label">联系人</text>
 					<input type="text" v-model="form.realName" maxlength="10" placeholder="姓名" class="form-input" />
 				</view>
 				<view class="form-item">
 					<text class="label">手机号</text>
-					<input type="number" v-model="form.phone" maxlength="11"  placeholder="手机号" class="form-input" />
+					<input type="number" v-model="form.phone" maxlength="11" placeholder="手机号" class="form-input" />
 				</view>
 				<view class="form-item">
 					<text class="label">所在地区</text>
-					<picker :value="multiIndex"  class="birth-picker"  mode="multiSelector" range-key="n" :range="addressList" @change="pickerChange"  @columnchange="pickerColumnchange">
+					<picker :value="multiIndex" class="birth-picker" mode="multiSelector" range-key="n"
+						:range="addressList" @change="pickerChange" @columnchange="pickerColumnchange">
 						<view class="right-box">
 							<view class="input-box">
-								<input type="text" v-model="form.address" placeholder="请选择" class="form-input" disabled="disabled" />
+								<input type="text" v-model="form.address" placeholder="请选择" class="form-input"
+									disabled="disabled" />
 							</view>
 							<image class="arrow" src="/static/images/arrow_gray.png" mode=""></image>
 						</view>
@@ -30,13 +33,14 @@
 				</view>
 				<view class="form-item">
 					<text class="label">详细地址</text>
-					<textarea class="form-textarea" v-model="form.detail" placeholder="请输入详细地址"   />
+					<textarea class="form-textarea" v-model="form.detail" placeholder="请输入详细地址" />
 				</view>
 			</view>
 			<!-- 设为默认地址 -->
 			<view class="setting-box">
 				<text class="label">设为默认地址</text>
-				<evan-switch v-model="isDefault" activeColor="#0bb3f2" inactiveColor="rgba(0, 0, 0, 0.1)"></evan-switch>
+				<evan-switch @change="logChange" v-model="isDefault" activeColor="#0bb3f2"
+					inactiveColor="rgba(0, 0, 0, 0.1)"></evan-switch>
 			</view>
 		</view>
 		<view class="btn-box">
@@ -49,7 +53,9 @@
 	import {
 		addAddress, // 添加地址
 		editAddress, // 编辑地址
-		getCitys//获取省市区
+		getCitys, //获取省市区
+		parseAddress, //地址解析 
+		getAddressById
 	} from "@/api/order.js"
 	// import {parseAddress,getCity,getCitys,getAddressById,addAddress,editAddress} from '@/api/address'
 	import EvanSwitch from '@/components/evan-switch/evan-switch.vue'
@@ -59,111 +65,139 @@
 		},
 		data() {
 			return {
-				content:null,
-				type:null,
-				addressId:null,
-				isDefault: false,
-				addressList:[[],[],[]],
-				multiIndex:[0,0,0],
-				address:[],
+				content: null,
+				type: null,
+				addressId: null,
+				// isDefault: false,
+				multiIndex: [0, 0, 0],
+				address: [],
+				addressList: [
+					[],
+					[],
+					[]
+				],
 				form: {
-					realName:null,
-					phone:null,
-					detail:null,
-					address: null,
+					realName: null,
+					phone: null,
+					addressId: null,
+					province: null,
+					city: null,
+					district: null,
+					// cityIds:null,
+					// postCode:null,
+					// longitude:null,
+					// latitude:null,
+
+
+					detail: null,
+					// address: null,
 					isDefault: 0,
 				}
 			}
 		},
 		onLoad(option) {
-			console.log("option",option)
-			this.type=option.type;
-			if(this.type=='edit'){
+			console.log("option", option)
+			this.type = option.type;
+			if (this.type == 'edit') {
 				uni.setNavigationBarTitle({
-				　　title:"修改收货地址"
+					title: "修改收货地址"
 				})
-				this.addressId=option.addressId;
-				// this.getAddressById();
-			}
-			else{
+				this.form.addressId = option.addressId;
+				this.addressId = option.addressId;
+				this.getAddressById();
+			} else {
 				uni.setNavigationBarTitle({
-				　　title:"新增收货地址"
+					title: "新增收货地址"
 				})
 			}
 			this.getCitys()
 		},
+		
 		methods: {
-			// parseAddress(){
-			// 	if(this.content==null||this.content==""){
-			// 		uni.showToast({	icon:'none',title: '请输入地址信息'});
-			// 		return;
-			// 	}
-			// 	var data={content:this.content};
-			// 	parseAddress(data).then(
-			// 		res => {
-			// 			if(res.code==200){
-			// 				this.form.realName=res.data.name
-			// 				this.form.phone=res.data.mobile
-			// 				this.form.address=res.data.provinceName+res.data.cityName+res.data.expAreaName
-			// 				this.form.province=res.data.provinceName
-			// 				this.form.city=res.data.cityName
-			// 				this.form.district=res.data.expAreaName
-			// 				this.form.detail=res.data.streetName+res.data.address
-			// 			}else{
-			// 				uni.showToast({
-			// 					icon:'none',
-			// 					title: res.msg,
-			// 				});
-			// 			}
-			// 		},
-			// 		rej => {}
-			// 	);
-			// },
-			// getAddressById(){
-			// 	var data={id:this.id};
-			// 	getAddressById(data).then(
-			// 		res => {
-			// 			if(res.code==200){
-			// 				  this.form=res.data;
-			// 				  this.isDefault=this.form.isDefault==1?true:false;
-			// 				  this.form.address=this.form.province+this.form.city+this.form.district
-			// 			}else{
-			// 				uni.showToast({
-			// 					icon:'none',
-			// 					title: res.msg,
-			// 				});
-			// 			}
-			// 		},
-			// 		rej => {}
-			// 	);
-			// },
-			submit(){
-				if(this.type=="add"){
-					this.addAddress()
+			logChange(value) {
+				console.log('isDefault 新值:', value); // 验证值是否更新
+			},
+			parseAddress() {
+				if (this.content == null || this.content == "") {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入地址信息'
+					});
+					return;
 				}
-				else if(this.type=="edit"){
+				var data = {
+					content: this.content
+				};
+				parseAddress(data).then(
+					res => {
+						if (res.code == 200) {
+							this.form.realName = res.data.name
+							this.form.phone = res.data.mobile
+							this.form.address = res.data.provinceName + res.data.cityName + res.data.expAreaName
+							this.form.province = res.data.provinceName
+							this.form.city = res.data.cityName
+							this.form.district = res.data.expAreaName
+							this.form.detail = res.data.streetName + res.data.address
+						} else {
+							uni.showToast({
+								icon: 'none',
+								title: res.msg,
+							});
+						}
+					},
+					rej => {}
+				);
+			},
+			getAddressById() {
+				var data = {
+					addressId: this.addressId
+				};
+				getAddressById(data).then(
+					res => {
+						if (res.code == 200) {
+							this.form = res.data;
+							console.log(" this.form", this.form)
+							this.isDefault = this.form.isDefault == 1 ? true : false;
+							this.form.address = this.form.province + this.form.city + this.form.district
+						} else {
+							uni.showToast({
+								icon: 'none',
+								title: res.msg,
+							});
+						}
+					},
+					rej => {}
+				);
+			},
+			submit() {
+				// 调试输出
+				console.log('提交数据:', JSON.stringify(this.form));
+
+				if (this.type == "add") {
+					this.addAddress()
+				} else if (this.type == "edit") {
 					this.editAddress()
 				}
-				
+
 			},
-			editAddress(){
+			editAddress() {
 				this.form.isDefault=this.isDefault?1:0
-				editAddress(this.form).then(
+				editAddress(submitData).then(
 					res => {
-						if(res.code==200){
-							 uni.showToast({
-							 	icon:'success',
-							 	title: "操作成功",
-							 });
-							 setTimeout(function() {
-								 uni.$emit('refreshAddress');
-								 uni.navigateBack({
-									 delta: 1
-								 })
-							 }, 500);
-						}else{
+						if (res.code == 200) {
 							uni.showToast({
-								icon:'none',
+								icon: 'success',
+								title: "操作成功",
+							});
+							setTimeout(function() {
+								uni.$emit('refreshAddress');
+								uni.navigateBack({
+									delta: 1
+								})
+							}, 500);
+						} else {
+							uni.showToast({
+								icon: 'none',
 								title: res.msg,
 							});
 						}
@@ -171,24 +205,24 @@
 					rej => {}
 				);
 			},
-			addAddress(){
+			addAddress() {
 				this.form.isDefault=this.isDefault?1:0
 				addAddress(this.form).then(
 					res => {
-						if(res.code==200){
-							 uni.showToast({
-							 	icon:'success',
-							 	title: "操作成功",
-							 });
-							 setTimeout(function() {
-								 uni.$emit('refreshAddress');
-								 uni.navigateBack({
-									 delta: 1
-								 })
-							 }, 500);
-						}else{
+						if (res.code == 200) {
+							uni.showToast({
+								icon: 'success',
+								title: "操作成功",
+							});
+							setTimeout(function() {
+								uni.$emit('refreshAddress');
+								uni.navigateBack({
+									delta: 1
+								})
+							}, 500);
+						} else {
 							uni.showToast({
-								icon:'none',
+								icon: 'none',
 								title: res.msg,
 							});
 						}
@@ -203,18 +237,19 @@
 				// 获取一级类目
 				// 获取二级类目
 				// 获取三级类目
-				this.form.address=this.addressList[0][this.multiIndex[0]].n+this.addressList[1][this.multiIndex[1]].n+this.addressList[2][this.multiIndex[2]].n
-				this.form.province=this.addressList[0][this.multiIndex[0]].n
-				this.form.city=this.addressList[1][this.multiIndex[1]].n
-				this.form.district=this.addressList[2][this.multiIndex[2]].n
-				this.form.cityId=this.addressList[1][this.multiIndex[1]].v;
-				
-				 
+				this.form.address = this.addressList[0][this.multiIndex[0]].n + this.addressList[1][this.multiIndex[1]].n +
+					this.addressList[2][this.multiIndex[2]].n
+				this.form.province = this.addressList[0][this.multiIndex[0]].n
+				this.form.city = this.addressList[1][this.multiIndex[1]].n
+				this.form.district = this.addressList[2][this.multiIndex[2]].n
+				this.form.cityId = this.addressList[1][this.multiIndex[1]].v;
+
+
 			},
-			pickerColumnchange(e){
+			pickerColumnchange(e) {
 				// 第一列滑动
-				if(e.detail.column === 0){
-					this.multiIndex[0] =  e.detail.value
+				if (e.detail.column === 0) {
+					this.multiIndex[0] = e.detail.value
 					// console.log('第一列滑动');
 					this.addressList[1] = this.address[this.multiIndex[0]].c;
 					this.addressList[2] = this.address[this.multiIndex[0]].c[0].c
@@ -223,8 +258,8 @@
 					this.multiIndex.splice(2, 1, 0)
 				}
 				// 第二列滑动
-				if(e.detail.column === 1){
-					this.multiIndex[1] =  e.detail.value
+				if (e.detail.column === 1) {
+					this.multiIndex[1] = e.detail.value
 					// console.log('第二列滑动');
 					// console.log(this.multiIndex)
 					this.addressList[2] = this.address[this.multiIndex[0]].c[this.multiIndex[1]].c
@@ -232,27 +267,27 @@
 					this.multiIndex.splice(2, 1, 0)
 				}
 				// 第三列滑动
-				if(e.detail.column === 2){
-					this.multiIndex[2] =  e.detail.value
+				if (e.detail.column === 2) {
+					this.multiIndex[2] = e.detail.value
 				}
 			},
-			getCitys(){
+			getCitys() {
 				getCitys().then(
 					res => {
-						if(res.code==200){
-							this.address=res.data
-							for(var i=0; i<this.address.length; i++){
+						if (res.code == 200) {
+							this.address = res.data
+							for (var i = 0; i < this.address.length; i++) {
 								this.addressList[0].push(this.address[i])
 							}
-							for(var i=0; i<this.address[0].c.length; i++){
+							for (var i = 0; i < this.address[0].c.length; i++) {
 								this.addressList[1].push(this.address[0].c[i])
 							}
-							for(var i=0; i<this.address[0].c[0].c.length; i++){
+							for (var i = 0; i < this.address[0].c[0].c.length; i++) {
 								this.addressList[2].push(this.address[0].c[0].c[i])
 							}
-						}else{
+						} else {
 							uni.showToast({
-								icon:'none',
+								icon: 'none',
 								title: "请求失败",
 							});
 						}
@@ -265,36 +300,41 @@
 </script>
 
 <style lang="scss">
-	page{
+	page {
 		height: 100%;
 	}
-	.content{
+
+	.content {
 		height: 100%;
 		display: flex;
 		flex-direction: column;
 		justify-content: space-between;
-		
-		.inner{
+
+		.inner {
 			height: calc(100% - 120upx);
 			padding: 20upx;
-			.address-box{
+
+			.address-box {
 				padding: 30upx;
 				background: #FFFFFF;
 				border-radius: 16upx;
 				margin-bottom: 20upx;
 				position: relative;
-				.textarea{
+
+				.textarea {
 					width: 100%;
 					height: 200upx;
 					font-size: 30upx;
 					color: #999999;
-					padding-bottom:100rpx;
+					padding-bottom: 100rpx;
 				}
-				.btns{
-					right:10rpx;
-					bottom:10rpx;
+
+				.btns {
+					right: 10rpx;
+					bottom: 10rpx;
 					position: absolute;
-					.btn{
+
+					.btn {
 						width: 155upx;
 						height: 64upx;
 						line-height: 64upx;
@@ -303,26 +343,31 @@
 						font-weight: 500;
 						text-align: center;
 						border-radius: 32upx;
-						&.parse{
+
+						&.parse {
 							background: #0bb3f2;
 							color: #FFFFFF;
 						}
 					}
 				}
 			}
-			.form-box{
+
+			.form-box {
 				padding: 0 30upx;
 				background: #FFFFFF;
 				border-radius: 16upx;
-				.form-item{
+
+				.form-item {
 					padding: 30upx 0;
 					display: flex;
 					align-items: flex-start;
 					border-bottom: 1px solid #F1F1F1;
-					&:last-child{
+
+					&:last-child {
 						border-bottom: none;
 					}
-					.label{
+
+					.label {
 						width: 180upx;
 						text-align: left;
 						font-size: 30upx;
@@ -332,36 +377,41 @@
 						color: #222222;
 						flex-shrink: 0;
 					}
-					input{
+
+					input {
 						text-align: left;
 					}
-					.form-input{
+
+					.form-input {
 						font-size: 30upx;
 						font-family: PingFang SC;
 						font-weight: 500;
 						color: #999999;
 						text-align: left;
 					}
-					.form-textarea{
+
+					.form-textarea {
 						font-size: 30upx;
 						color: #999999;
 						height: 100upx;
 						padding: 4upx 0;
 					}
-					 
+
 					.birth-picker {
 						flex: 1;
 						display: flex;
 						align-items: center;
-						
-						.right-box{
+
+						.right-box {
 							width: 100%;
 							display: flex;
 							align-items: center;
-							.input-box{
+
+							.input-box {
 								width: 470upx;
 							}
-							.arrow{
+
+							.arrow {
 								width: 13upx;
 								height: 23upx;
 								margin-left: 20upx;
@@ -370,7 +420,8 @@
 					}
 				}
 			}
-			.setting-box{
+
+			.setting-box {
 				height: 88upx;
 				background: #FFFFFF;
 				border-radius: 16upx;
@@ -379,7 +430,8 @@
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
-				.label{
+
+				.label {
 					font-size: 28upx;
 					font-family: PingFang SC;
 					font-weight: 500;
@@ -387,14 +439,16 @@
 				}
 			}
 		}
-		.btn-box{
+
+		.btn-box {
 			height: 120upx;
 			padding: 0 30upx;
 			display: flex;
 			align-items: center;
 			justify-content: center;
 			background: #FFFFFF;
-			.sub-btn{
+
+			.sub-btn {
 				width: 100%;
 				height: 88upx;
 				line-height: 88upx;

unpackage/dist/dev/mp-weixin/api/home.js

@@ -1,5 +1,5 @@
 "use strict";
-var common_request = require("../common/request.js");
+const common_request = require("../common/request.js");
 let request = new common_request.Request().http;
 function loginByMp(data) {
   return request("/app/user/loginByMp", data, "POST", "application/json;charset=UTF-8");

unpackage/dist/dev/mp-weixin/api/list.js

@@ -1,5 +1,5 @@
 "use strict";
-var common_request = require("../common/request.js");
+const common_request = require("../common/request.js");
 let request = new common_request.Request().http;
 function liveList(data) {
   return request("/app/live/liveList", data, "GET", "application/json;charset=UTF-8");

unpackage/dist/dev/mp-weixin/api/live.js

@@ -1,16 +1,27 @@
 "use strict";
-var common_request = require("../common/request.js");
+const common_request = require("../common/request.js");
 let request = new common_request.Request().http;
 const api = {
   liveDataLike: (liveId) => `/app/live/liveData/like/${liveId}`,
+  // 点赞
   collectStore: "/app/live/liveData/collectStore",
+  // 收藏/取消收藏
   follow: (liveId) => `/app/live/liveData/follow/${liveId}`,
+  // 关注/取消关注
   getRecentLiveViewers: (liveId) => `/app/live/liveData/getRecentLiveViewers/${liveId}`,
+  // 获取直播间用户(展示在线用户)
+  // checkSms: 'api/sms/checkSms',
   getLiveInfo: (liveId) => `/app/live/${liveId}`,
+  // 获取直播间信息接口
   getLiveViewData: (liveId) => `/app/live/liveData/getLiveViewData/${liveId}`,
+  // 直播间点赞、关注、在线人数数据
+  // 直播订单
   liveStore: (liveId) => `/app/live/liveGoods/liveStore/${liveId}`,
+  // 店铺展示
   liveGoodsDetail: (productId) => `/app/live/liveGoods/liveGoodsDetail/${productId}`,
+  // 商品详情
   liveOrderUser: (liveId) => `/app/live/liveOrder/liveOrderUser/${liveId}`
+  // 正在购买
 };
 function liveDataLike(liveId, data = {}) {
   return request(api.liveDataLike(liveId), data, "GET", "application/json;charset=UTF-8");

unpackage/dist/dev/mp-weixin/api/login.js

@@ -1,5 +1,5 @@
 "use strict";
-var common_request = require("../common/request.js");
+const common_request = require("../common/request.js");
 let request = new common_request.Request().http;
 const api = {
   userLoginWX: "api/login/login",
@@ -8,12 +8,18 @@ const api = {
   doSmsSend: "api/sms/send",
   checkSms: "api/sms/checkSms",
   resetPassword: "api/login/resetPassword",
+  // 我写的登录
   loginByApp: "/app/user/loginByApp",
+  //登录
   captchaImage: "captchaImage",
   checkLogin: "/app/user/checkLogin",
+  //验证是否登录
   register: "/app/user/register",
+  //注册账号
   loginByWeChat: "/app/user/loginByWeChat",
+  //微信登录
   setPhone: "/app/user/setPhone"
+  //绑定手机号码
 };
 function loginByApp(data) {
   return request(api.loginByApp, data, "POST", "application/json;charset=UTF-8");

unpackage/dist/dev/mp-weixin/api/order.js

@@ -1,17 +1,32 @@
 "use strict";
-var common_request = require("../common/request.js");
+const common_request = require("../common/request.js");
 let request = new common_request.Request().http;
 const api = {
+  // 直播订单
   liveOrderList: "/app/live/liveOrder/list",
+  // 订单列表
   createliveOrder: "/app/live/liveOrder/create",
+  // 创建订单
   updateConfirm: (orderId, type) => `/app/live/liveOrder/updateConfirm/${orderId}/${type} `,
+  // 取消/支付订单确认
   updateLiveOrder: "/app/live/liveOrder/update",
+  // 取消/支付订单
   liveOrderKey: "/app/live/liveOrder/confirm",
+  // 生成订单key
   userAddr: (userId) => `/app/user/getUserAddr/${userId} `,
+  // 获取用户收货地址
   addAddress: "/app/userAddress/addAddress",
+  // 添加地址
   editAddress: "/app/userAddress/editAddress",
+  // 编辑地址
   delAddress: "/app/userAddress/delAddress",
-  getCitys: "/app/common/getCitys"
+  // 删除地址
+  getCitys: "/app/common/getCitys",
+  // 获取省市区
+  parseAddress: "/app/userAddress/parseAddress",
+  //地址解析 
+  getAddressById: "/app/userAddress/getAddressById"
+  //
 };
 function createliveOrder(data) {
   return request(api.createliveOrder, data, "POST", "application/json;charset=UTF-8");
@@ -37,11 +52,19 @@ function delAddress(data) {
 function getCitys(data) {
   return request(api.getCitys, data, "GET", "application/json;charset=UTF-8");
 }
+function parseAddress(data) {
+  return request(api.parseAddress, data, "POST", "application/json;charset=UTF-8");
+}
+function getAddressById(data) {
+  return request(api.getAddressById, data, "GET", "application/json;charset=UTF-8");
+}
 exports.addAddress = addAddress;
 exports.createliveOrder = createliveOrder;
 exports.delAddress = delAddress;
 exports.editAddress = editAddress;
+exports.getAddressById = getAddressById;
 exports.getCitys = getCitys;
 exports.liveOrderKey = liveOrderKey;
 exports.liveOrderList = liveOrderList;
+exports.parseAddress = parseAddress;
 exports.userAddr = userAddr;

unpackage/dist/dev/mp-weixin/api/pay.js

@@ -1,29 +1,14 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var common_vendor = require("../common/vendor.js");
-var common_request = require("../common/request.js");
+const common_vendor = require("../common/vendor.js");
+const common_request = require("../common/request.js");
 let request = new common_request.Request().http;
 const api = {
+  // 支付
   zfbPayment: "/app/live/liveOrder/aliPayment",
+  // 支付宝付款
   weChatPayment: "/app/live/liveOrder/weChatPayment"
+  // 微信付款
+  // updateConfirm: (orderId, type) => `/app/live/liveOrder/updateConfirm/${orderId}/${type} `, // 取消/支付订单确认
 };
 function weChatPayment(data) {
   return new Promise((resolve, reject) => {
@@ -40,32 +25,33 @@ function weChatPayment(data) {
 }
 function invokePayment(payData) {
   return new Promise((resolve, reject) => {
-    common_vendor.index.requestPayment(__spreadProps(__spreadValues({
-      provider: "wxpay"
-    }, payData), {
+    common_vendor.index.requestPayment({
+      provider: "wxpay",
+      ...payData,
+      // 直接展开小程序所需参数
       success: (res) => {
         common_vendor.index.showToast({
-          title: "\u652F\u4ED8\u6210\u529F"
+          title: "支付成功"
         });
         resolve(res);
       },
       fail: (err) => {
         reject(new Error(formatError(err)));
       }
-    }));
+    });
   });
 }
 function formatError(err) {
   if (err.errMsg) {
     if (err.errMsg.includes("cancel"))
-      return "\u652F\u4ED8\u5DF2\u53D6\u6D88";
+      return "支付已取消";
     if (err.errMsg.includes("fail"))
-      return "\u652F\u4ED8\u5931\u8D25";
+      return "支付失败";
   }
-  return err.message || "\u652F\u4ED8\u5F02\u5E38";
+  return err.message || "支付异常";
 }
 function handlePaymentError(err) {
-  console.error("[\u652F\u4ED8\u9519\u8BEF]", err);
+  console.error("[支付错误]", err);
   common_vendor.index.showToast({
     title: err.message,
     icon: "none",

unpackage/dist/dev/mp-weixin/app.js

@@ -1,140 +1,13 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports[Symbol.toStringTag] = "Module";
-var common_vendor = require("./common/vendor.js");
-var utils_storage = require("./utils/storage.js");
-var store_index = require("./store/index.js");
-var uni_modules_uviewPlus_index = require("./uni_modules/uview-plus/index.js");
-var core_bootstrap = require("./core/bootstrap.js");
-var utils_util = require("./utils/util.js");
-var core_mixins_share = require("./core/mixins/share.js");
-var core_mixins_app = require("./core/mixins/app.js");
-require("./store/modules/app.js");
-require("./store/modules/user.js");
-require("./store/mutation-types.js");
-require("./api/login.js");
-require("./common/request.js");
-require("./core/app.js");
-require("./store/modules/cate.js");
-require("./store/getters.js");
-require("./uni_modules/uview-plus/libs/mixin/mixin.js");
-require("./uni_modules/uview-plus/libs/function/index.js");
-require("./uni_modules/uview-plus/libs/function/test.js");
-require("./uni_modules/uview-plus/libs/function/digit.js");
-require("./uni_modules/uview-plus/libs/config/config.js");
-require("./uni_modules/uview-plus/libs/util/route.js");
-require("./uni_modules/uview-plus/libs/mixin/mpMixin.js");
-require("./uni_modules/uview-plus/libs/luch-request/core/Request.js");
-require("./uni_modules/uview-plus/libs/luch-request/core/dispatchRequest.js");
-require("./uni_modules/uview-plus/libs/luch-request/adapters/index.js");
-require("./uni_modules/uview-plus/libs/luch-request/helpers/buildURL.js");
-require("./uni_modules/uview-plus/libs/luch-request/utils.js");
-require("./uni_modules/uview-plus/libs/luch-request/core/buildFullPath.js");
-require("./uni_modules/uview-plus/libs/luch-request/helpers/isAbsoluteURL.js");
-require("./uni_modules/uview-plus/libs/luch-request/helpers/combineURLs.js");
-require("./uni_modules/uview-plus/libs/luch-request/core/settle.js");
-require("./uni_modules/uview-plus/libs/luch-request/core/InterceptorManager.js");
-require("./uni_modules/uview-plus/libs/luch-request/core/mergeConfig.js");
-require("./uni_modules/uview-plus/libs/luch-request/core/defaults.js");
-require("./uni_modules/uview-plus/libs/luch-request/utils/clone.js");
-require("./uni_modules/uview-plus/libs/function/colorGradient.js");
-require("./uni_modules/uview-plus/libs/function/debounce.js");
-require("./uni_modules/uview-plus/libs/function/throttle.js");
-require("./uni_modules/uview-plus/libs/config/props.js");
-require("./uni_modules/uview-plus/libs/config/props/actionSheet.js");
-require("./uni_modules/uview-plus/libs/config/props/album.js");
-require("./uni_modules/uview-plus/libs/config/props/alert.js");
-require("./uni_modules/uview-plus/libs/config/props/avatar.js");
-require("./uni_modules/uview-plus/libs/config/props/avatarGroup.js");
-require("./uni_modules/uview-plus/libs/config/props/backtop.js");
-require("./uni_modules/uview-plus/libs/config/props/badge.js");
-require("./uni_modules/uview-plus/libs/config/props/button.js");
-require("./uni_modules/uview-plus/libs/config/props/calendar.js");
-require("./uni_modules/uview-plus/libs/config/props/carKeyboard.js");
-require("./uni_modules/uview-plus/libs/config/props/cell.js");
-require("./uni_modules/uview-plus/libs/config/props/cellGroup.js");
-require("./uni_modules/uview-plus/libs/config/props/checkbox.js");
-require("./uni_modules/uview-plus/libs/config/props/checkboxGroup.js");
-require("./uni_modules/uview-plus/libs/config/props/circleProgress.js");
-require("./uni_modules/uview-plus/libs/config/props/code.js");
-require("./uni_modules/uview-plus/libs/config/props/codeInput.js");
-require("./uni_modules/uview-plus/libs/config/props/col.js");
-require("./uni_modules/uview-plus/libs/config/props/collapse.js");
-require("./uni_modules/uview-plus/libs/config/props/collapseItem.js");
-require("./uni_modules/uview-plus/libs/config/props/columnNotice.js");
-require("./uni_modules/uview-plus/libs/config/props/countDown.js");
-require("./uni_modules/uview-plus/libs/config/props/countTo.js");
-require("./uni_modules/uview-plus/libs/config/props/datetimePicker.js");
-require("./uni_modules/uview-plus/libs/config/props/divider.js");
-require("./uni_modules/uview-plus/libs/config/props/empty.js");
-require("./uni_modules/uview-plus/libs/config/props/form.js");
-require("./uni_modules/uview-plus/libs/config/props/formItem.js");
-require("./uni_modules/uview-plus/libs/config/props/gap.js");
-require("./uni_modules/uview-plus/libs/config/props/grid.js");
-require("./uni_modules/uview-plus/libs/config/props/gridItem.js");
-require("./uni_modules/uview-plus/libs/config/props/icon.js");
-require("./uni_modules/uview-plus/libs/config/props/image.js");
-require("./uni_modules/uview-plus/libs/config/props/indexAnchor.js");
-require("./uni_modules/uview-plus/libs/config/props/indexList.js");
-require("./uni_modules/uview-plus/libs/config/props/input.js");
-require("./uni_modules/uview-plus/libs/config/props/keyboard.js");
-require("./uni_modules/uview-plus/libs/config/props/line.js");
-require("./uni_modules/uview-plus/libs/config/props/lineProgress.js");
-require("./uni_modules/uview-plus/libs/config/props/link.js");
-require("./uni_modules/uview-plus/libs/config/props/list.js");
-require("./uni_modules/uview-plus/libs/config/props/listItem.js");
-require("./uni_modules/uview-plus/libs/config/props/loadingIcon.js");
-require("./uni_modules/uview-plus/libs/config/props/loadingPage.js");
-require("./uni_modules/uview-plus/libs/config/props/loadmore.js");
-require("./uni_modules/uview-plus/libs/config/props/modal.js");
-require("./uni_modules/uview-plus/libs/config/props/navbar.js");
-require("./uni_modules/uview-plus/libs/config/color.js");
-require("./uni_modules/uview-plus/libs/config/props/noNetwork.js");
-require("./uni_modules/uview-plus/libs/config/props/noticeBar.js");
-require("./uni_modules/uview-plus/libs/config/props/notify.js");
-require("./uni_modules/uview-plus/libs/config/props/numberBox.js");
-require("./uni_modules/uview-plus/libs/config/props/numberKeyboard.js");
-require("./uni_modules/uview-plus/libs/config/props/overlay.js");
-require("./uni_modules/uview-plus/libs/config/props/parse.js");
-require("./uni_modules/uview-plus/libs/config/props/picker.js");
-require("./uni_modules/uview-plus/libs/config/props/popup.js");
-require("./uni_modules/uview-plus/libs/config/props/radio.js");
-require("./uni_modules/uview-plus/libs/config/props/radioGroup.js");
-require("./uni_modules/uview-plus/libs/config/props/rate.js");
-require("./uni_modules/uview-plus/libs/config/props/readMore.js");
-require("./uni_modules/uview-plus/libs/config/props/row.js");
-require("./uni_modules/uview-plus/libs/config/props/rowNotice.js");
-require("./uni_modules/uview-plus/libs/config/props/scrollList.js");
-require("./uni_modules/uview-plus/libs/config/props/search.js");
-require("./uni_modules/uview-plus/libs/config/props/section.js");
-require("./uni_modules/uview-plus/libs/config/props/skeleton.js");
-require("./uni_modules/uview-plus/libs/config/props/slider.js");
-require("./uni_modules/uview-plus/libs/config/props/statusBar.js");
-require("./uni_modules/uview-plus/libs/config/props/steps.js");
-require("./uni_modules/uview-plus/libs/config/props/stepsItem.js");
-require("./uni_modules/uview-plus/libs/config/props/sticky.js");
-require("./uni_modules/uview-plus/libs/config/props/subsection.js");
-require("./uni_modules/uview-plus/libs/config/props/swipeAction.js");
-require("./uni_modules/uview-plus/libs/config/props/swipeActionItem.js");
-require("./uni_modules/uview-plus/libs/config/props/swiper.js");
-require("./uni_modules/uview-plus/libs/config/props/swipterIndicator.js");
-require("./uni_modules/uview-plus/libs/config/props/switch.js");
-require("./uni_modules/uview-plus/libs/config/props/tabbar.js");
-require("./uni_modules/uview-plus/libs/config/props/tabbarItem.js");
-require("./uni_modules/uview-plus/libs/config/props/tabs.js");
-require("./uni_modules/uview-plus/libs/config/props/tag.js");
-require("./uni_modules/uview-plus/libs/config/props/text.js");
-require("./uni_modules/uview-plus/libs/config/props/textarea.js");
-require("./uni_modules/uview-plus/libs/config/props/toast.js");
-require("./uni_modules/uview-plus/libs/config/props/toolbar.js");
-require("./uni_modules/uview-plus/libs/config/props/tooltip.js");
-require("./uni_modules/uview-plus/libs/config/props/transition.js");
-require("./uni_modules/uview-plus/libs/config/props/upload.js");
-require("./uni_modules/uview-plus/libs/config/zIndex.js");
-require("./uni_modules/uview-plus/libs/function/platform.js");
-require("./core/platform.js");
-require("./core/config/index.js");
-require("./core/config/defaultConfig.js");
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const common_vendor = require("./common/vendor.js");
+const utils_storage = require("./utils/storage.js");
+const store_index = require("./store/index.js");
+const uni_modules_uviewPlus_index = require("./uni_modules/uview-plus/index.js");
+const core_bootstrap = require("./core/bootstrap.js");
+const utils_util = require("./utils/util.js");
+const core_mixins_share = require("./core/mixins/share.js");
+const core_mixins_app = require("./core/mixins/app.js");
 if (!Math) {
   "./pages/home/index.js";
   "./pages/home/living.js";
@@ -181,14 +54,17 @@ const _sfc_main = {
     console.log("App Hide");
   },
   methods: {
+    /**
+     * 小程序主动更新
+     */
     updateManager() {
       const updateManager = common_vendor.index.getUpdateManager();
       updateManager.onCheckForUpdate((res) => {
       });
       updateManager.onUpdateReady(() => {
         common_vendor.index.showModal({
-          title: "\u66F4\u65B0\u63D0\u793A",
-          content: "\u65B0\u7248\u672C\u5DF2\u7ECF\u51C6\u5907\u597D\uFF0C\u5373\u5C06\u91CD\u542F\u5E94\u7528",
+          title: "更新提示",
+          content: "新版本已经准备好，即将重启应用",
           showCancel: false,
           success(res) {
             if (res.confirm) {
@@ -199,22 +75,23 @@ const _sfc_main = {
       });
       updateManager.onUpdateFailed(() => {
         common_vendor.index.showModal({
-          title: "\u66F4\u65B0\u63D0\u793A",
-          content: "\u65B0\u7248\u672C\u4E0B\u8F7D\u5931\u8D25",
+          title: "更新提示",
+          content: "新版本下载失败",
           showCancel: false
         });
       });
     }
   }
 };
-var App = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/App.vue"]]);
 function createApp() {
-  const app = common_vendor.createSSRApp(App);
+  const app = common_vendor.createSSRApp(_sfc_main);
   app.use(uni_modules_uviewPlus_index.uviewPlus).use(store_index.store);
   app.config.productionTip = false;
   app.config.globalProperties.$img = {
     img: "/static/images/img.png",
+    // 默认图片
     logo: "/static/images/logo.png"
+    // 其他公共图片
   };
   app.config.globalProperties.$isLogin = utils_util.isLogin;
   app.config.globalProperties.$isEmpty = utils_util.isEmpty;

unpackage/dist/dev/mp-weixin/app.json

@@ -66,9 +66,6 @@
       }
     ]
   },
-  "secureNetwork": {
-    "enable": true
-  },
   "permission": {
     "scope.userLocation": {
       "desc": "需要获取您当前的位置，展示附近的服务"

unpackage/dist/dev/mp-weixin/app.wxss

@@ -26,13 +26,6 @@
 /*自定义主题色 */
 /*uview-plus */
 .u-line-1 {
-
-
-
-
-
-
-
   display: -webkit-box !important;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -41,13 +34,6 @@
   -webkit-box-orient: vertical !important;
 }
 .u-line-2 {
-
-
-
-
-
-
-
   display: -webkit-box !important;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -56,13 +42,6 @@
   -webkit-box-orient: vertical !important;
 }
 .u-line-3 {
-
-
-
-
-
-
-
   display: -webkit-box !important;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -71,13 +50,6 @@
   -webkit-box-orient: vertical !important;
 }
 .u-line-4 {
-
-
-
-
-
-
-
   display: -webkit-box !important;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -86,13 +58,6 @@
   -webkit-box-orient: vertical !important;
 }
 .u-line-5 {
-
-
-
-
-
-
-
   display: -webkit-box !important;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -135,7 +100,6 @@
 .u-reset-button {
   padding: 0;
   background-color: transparent;
-
   font-size: inherit;
   line-height: inherit;
   color: inherit;
@@ -257,7 +221,6 @@
   align-items: flex-end;
 }
 .u-flex-items-baseline {
-
   align-items: baseline;
 }
 .u-flex-items-stretch {

unpackage/dist/dev/mp-weixin/common/assets.js

@@ -1,9 +1,81 @@
 "use strict";
-var _imports_0 = "/static/images/live/return.png";
-var _imports_1 = "/static/images/search.png";
-var _imports_2 = "/static/images/collect.png";
-var _imports_3 = "/static/images/order.png";
-exports._imports_0 = _imports_0;
-exports._imports_1 = _imports_1;
-exports._imports_2 = _imports_2;
-exports._imports_3 = _imports_3;
+const _imports_0$f = "/static/images/shipin.png";
+const _imports_0$e = "/static/images/live/return.png";
+const _imports_1$8 = "/static/images/live/like.png";
+const _imports_2$6 = "/static/images/live/shop.png";
+const _imports_3$2 = "/static/images/live/share.png";
+const _imports_4 = "/static/images/live/shopping.png";
+const _imports_5 = "/static/images/shopping.png";
+const _imports_6 = "/static/images/more-icon.png";
+const _imports_0$d = "/static/images/search.png";
+const _imports_10 = "/static/images/collect.png";
+const _imports_9 = "/static/images/order.png";
+const _imports_0$c = "/static/images/top.png";
+const _imports_1$7 = "/static/images/up-down.png";
+const _imports_2$5 = "/static/images/wechat.png";
+const _imports_0$b = "/static/images/icon_close.png";
+const _imports_1$6 = "/static/image/login/weixin.png";
+const _imports_2$4 = "/static/image/login/apple.png";
+const _imports_0$a = "/static/images/radio_default.png";
+const _imports_1$5 = "/static/images/radio_choose.png";
+const _imports_0$9 = "/static/logo.png";
+const _imports_0$8 = "/static/imagesradio_default.png";
+const _imports_1$4 = "/static/image/radio_choose.png";
+const _imports_0$7 = "/static/images/jian.png";
+const _imports_1$3 = "/static/images/jian2.png";
+const _imports_2$3 = "/static/images/add.png";
+const _imports_2$2 = "/static/images/no_data.png";
+const _imports_0$6 = "/static/images/googs_service.png";
+const _imports_1$2 = "/static/images/right_arrow.png";
+const _imports_2$1 = "/static/images/googs1.png";
+const _imports_3$1 = "/static/images/googs3.png";
+const _imports_0$5 = "/static/images/a.jpg";
+const _imports_0$4 = "/static/images/arrow_gray.png";
+const _imports_2 = "/static/images/coupon1.png";
+const _imports_3 = "/static/images/coupon2.png";
+const _imports_0$3 = "/static/images/wecha_pay.png";
+const _imports_1$1 = "/static/images/arrow4.png";
+const _imports_0$2 = "/static/images/success.png";
+const _imports_0$1 = "/static/images/del1.png";
+const _imports_1 = "/static/images/edit.png";
+const _imports_0 = "/static/images/like.png";
+exports._imports_0 = _imports_0$f;
+exports._imports_0$1 = _imports_0$d;
+exports._imports_0$10 = _imports_0$5;
+exports._imports_0$11 = _imports_0$4;
+exports._imports_0$12 = _imports_0$3;
+exports._imports_0$13 = _imports_0$2;
+exports._imports_0$14 = _imports_0$1;
+exports._imports_0$15 = _imports_0;
+exports._imports_0$2 = _imports_0$e;
+exports._imports_0$3 = _imports_0$c;
+exports._imports_0$4 = _imports_0$a;
+exports._imports_0$5 = _imports_0$b;
+exports._imports_0$6 = _imports_0$9;
+exports._imports_0$7 = _imports_0$8;
+exports._imports_0$8 = _imports_0$7;
+exports._imports_0$9 = _imports_0$6;
+exports._imports_1 = _imports_1$8;
+exports._imports_1$1 = _imports_1$7;
+exports._imports_1$2 = _imports_1$5;
+exports._imports_1$3 = _imports_1$6;
+exports._imports_1$4 = _imports_1$4;
+exports._imports_1$5 = _imports_1$3;
+exports._imports_1$6 = _imports_1$2;
+exports._imports_1$7 = _imports_1$1;
+exports._imports_1$8 = _imports_1;
+exports._imports_10 = _imports_10;
+exports._imports_2 = _imports_2$6;
+exports._imports_2$1 = _imports_2$5;
+exports._imports_2$2 = _imports_2$4;
+exports._imports_2$3 = _imports_2$2;
+exports._imports_2$4 = _imports_2$3;
+exports._imports_2$5 = _imports_2$1;
+exports._imports_2$6 = _imports_2;
+exports._imports_3 = _imports_3$2;
+exports._imports_3$1 = _imports_3$1;
+exports._imports_3$2 = _imports_3;
+exports._imports_4 = _imports_4;
+exports._imports_5 = _imports_5;
+exports._imports_6 = _imports_6;
+exports._imports_9 = _imports_9;

unpackage/dist/dev/mp-weixin/common/request.js

@@ -1,11 +1,11 @@
 "use strict";
-var common_vendor = require("./vendor.js");
+const common_vendor = require("./vendor.js");
 class Request {
   http(router, data = {}, method, contentType) {
-    let path = "http://nd383294.natappfree.cc";
+    let path = "https://live.test.ylrztop.com/prod-api";
     common_vendor.index.setStorageSync("requestPath", path);
     common_vendor.index.showLoading({
-      title: "\u52A0\u8F7D\u4E2D"
+      title: "加载中"
     });
     return new Promise((resolve, reject) => {
       let token = common_vendor.index.getStorageSync("AppToken");
@@ -15,6 +15,7 @@ class Request {
       }
       common_vendor.index.request({
         header: {
+          // 'Content-Type': 'application/x-www-form-urlencoded',
           "Content-Type": httpContentType,
           "AppToken": token
         },
@@ -25,7 +26,7 @@ class Request {
           if (res.code == 401) {
             let pages = getCurrentPages();
             let url = pages[pages.length - 1];
-            \u5982\u679C\u767B\u5F55\u754C\u9762\u5DF2\u6253\u5F00, \u81EA\u52A8\u5173\u95ED;
+            如果登录界面已打开, 自动关闭;
             if (url != void 0 && url.route == "/pages/home/index") {
               resolve(res.data);
               return;

unpackage/dist/dev/mp-weixin/components/Loading.js

@@ -1,5 +1,5 @@
 "use strict";
-var common_vendor = require("../common/vendor.js");
+const common_vendor = require("../common/vendor.js");
 const _sfc_main = {
   name: "Loading",
   props: {
@@ -16,5 +16,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     c: !$props.loading
   }, !$props.loading ? {} : {}) : {});
 }
-var Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/components/Loading.vue"]]);
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 wx.createComponent(Component);

unpackage/dist/dev/mp-weixin/components/evan-switch/evan-switch.js

@@ -1,5 +1,5 @@
 "use strict";
-var common_vendor = require("../../common/vendor.js");
+const common_vendor = require("../../common/vendor.js");
 const _sfc_main = {
   name: "EvanSwitch",
   props: {
@@ -67,7 +67,11 @@ const _sfc_main = {
           for (let i = 0; i < this.contextLevel; i++) {
             context = context.$options.parent;
           }
-          const result = this.beforeChange(this.currentValue === this.activeValue ? this.inactiveValue : this.activeValue, this.extraData, context);
+          const result = this.beforeChange(
+            this.currentValue === this.activeValue ? this.inactiveValue : this.activeValue,
+            this.extraData,
+            context
+          );
           if (typeof result === "object") {
             result.then(() => {
               this.toggleValue();
@@ -96,5 +100,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     d: $data.currentValue === $props.activeValue ? $props.activeColor : $props.inactiveColor
   };
 }
-var Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-65d8598c"], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/components/evan-switch/evan-switch.vue"]]);
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-687346f1"]]);
 wx.createComponent(Component);

unpackage/dist/dev/mp-weixin/components/evan-switch/evan-switch.wxml

@@ -1 +1 @@
-<view bindtap="{{b}}" class="{{['evan-switch', 'data-v-65d8598c', c && 'evan-switch--disabled']}}" style="{{'background-color:' + d}}"><view class="evan-switch__circle data-v-65d8598c" style="{{'transform:' + a}}"></view></view>
+<view bindtap="{{b}}" class="{{['evan-switch', 'data-v-687346f1', c && 'evan-switch--disabled']}}" style="{{'background-color:' + d}}"><view class="evan-switch__circle data-v-687346f1" style="{{'transform:' + a}}"></view></view>

unpackage/dist/dev/mp-weixin/components/evan-switch/evan-switch.wxss

@@ -24,7 +24,7 @@
 /* 透明度 */
 /* 文章场景相关 */
 /*自定义主题色 */
-.evan-switch.data-v-65d8598c {
+.evan-switch.data-v-687346f1 {
   position: relative;
   border-width: 1px;
   border-color: rgba(0, 0, 0, 0.1);
@@ -36,10 +36,10 @@
   border-radius: 18rpx;
   box-sizing: content-box;
 }
-.evan-switch--disabled.data-v-65d8598c {
+.evan-switch--disabled.data-v-687346f1 {
   opacity: 0.3;
 }
-.evan-switch__circle.data-v-65d8598c {
+.evan-switch__circle.data-v-687346f1 {
   position: absolute;
   left: -4rpx;
   top: -8rpx;

unpackage/dist/dev/mp-weixin/components/px-popup-bottom/px-popup-bottom.js

@@ -1,8 +1,9 @@
 "use strict";
-var common_vendor = require("../../common/vendor.js");
+const common_vendor = require("../../common/vendor.js");
 const _sfc_main = {
   props: {
     title: {
+      //标题
       type: String,
       default: ""
     },
@@ -11,22 +12,27 @@ const _sfc_main = {
       default: "normal"
     },
     visible: {
+      //隐藏显示标识
       type: Boolean,
       default: false
     },
     maxHeight: {
+      //内容区域最大高度
       type: [String, Number],
       default: "75%"
     },
     radius: {
+      //顶部圆角
       type: [String, Number],
       default: "0"
     },
     animaTime: {
+      //弹窗动画时间
       type: Number,
       default: 0.2
     },
     bottom: {
+      //离底部距离
       type: [String, Number],
       default: 0
     },
@@ -43,6 +49,7 @@ const _sfc_main = {
       default: 999
     },
     always: {
+      //是否每次打开都重新计算内容高度
       type: Boolean,
       default: false
     }
@@ -56,6 +63,7 @@ const _sfc_main = {
       isAnimaStart: false,
       rpxRate: "",
       cotRadius: 0
+      // closeIcon: iconClose
     };
   },
   watch: {
@@ -101,6 +109,7 @@ const _sfc_main = {
       this.$emit("update:visible", false);
       this.$emit("close");
     },
+    //触底
     onScrollToLower(e) {
       this.$emit("reachBottom");
     },
@@ -127,11 +136,13 @@ const _sfc_main = {
     setBodyOverFlow(val) {
       document.body.style.overflow = val;
     },
+    //设置内容区域高度
     async setContViewHeight() {
       let data = await this.computeHeight();
       this.height = data.height + (this.title ? 100 / parseFloat(this.rpxRate) : 0);
       this.PopHeight = this.height;
     },
+    //计算内容区域高度
     computeHeight() {
       return new Promise((resolve) => {
         this.$nextTick(() => {
@@ -183,5 +194,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     A: $props.zindex
   };
 }
-var Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-32af3e28"], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/components/px-popup-bottom/px-popup-bottom.vue"]]);
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-4fac7f82"]]);
 wx.createComponent(Component);

unpackage/dist/dev/mp-weixin/components/px-popup-bottom/px-popup-bottom.wxml

@@ -1 +1 @@
-<view class="{{['data-v-32af3e28', 'popup', x]}}" catchmousewheel="{{y}}" catchtouchmove="{{z}}" style="{{'z-index:' + A}}"><view class="mask data-v-32af3e28" style="{{'z-index:' + a + ';' + ('bottom:' + b)}}" hidden="{{!c}}" catchtap="{{d}}" catchtouchmove="{{e}}"></view><view class="{{['data-v-32af3e28', 'content', l]}}" catchtap="{{m}}" catchtouchmove="{{n}}" style="{{'background-color:' + o + ';' + ('height:' + p) + ';' + ('max-height:' + q) + ';' + ('border-top-right-radius:' + r) + ';' + ('border-top-left-radius:' + s) + ';' + ('transition:' + t) + ';' + ('bottom:' + v) + ';' + ('z-index:' + w)}}"><view id="title-bar" class="title-bar data-v-32af3e28" hidden="{{!i}}"><view class="title data-v-32af3e28" style="{{'font-weight:' + g}}">{{f}}</view><view class="close-wrap data-v-32af3e28" catchtap="{{h}}"><image class="close-icon data-v-32af3e28" src="{{''}}" mode="widthFix"></image></view></view><view class="scroll-wrap data-v-32af3e28"><scroll-view enable-flex class="{{['data-v-32af3e28', j && 'scroll-view']}}" scroll-y="true" style="height:100%" bindscrolltolower="{{k}}"><view id="popup_content" class="popup_content data-v-32af3e28"><slot></slot></view></scroll-view></view></view></view>
+<view class="{{['data-v-4fac7f82', 'popup', x]}}" catchmousewheel="{{y}}" catchtouchmove="{{z}}" style="{{'z-index:' + A}}"><view class="mask data-v-4fac7f82" style="{{'z-index:' + a + ';' + ('bottom:' + b)}}" hidden="{{!c}}" catchtap="{{d}}" catchtouchmove="{{e}}"></view><view class="{{['data-v-4fac7f82', 'content', l]}}" catchtap="{{m}}" catchtouchmove="{{n}}" style="{{'background-color:' + o + ';' + ('height:' + p) + ';' + ('max-height:' + q) + ';' + ('border-top-right-radius:' + r) + ';' + ('border-top-left-radius:' + s) + ';' + ('transition:' + t) + ';' + ('bottom:' + v) + ';' + ('z-index:' + w)}}"><view id="title-bar" class="title-bar data-v-4fac7f82" hidden="{{!i}}"><view class="title data-v-4fac7f82" style="{{'font-weight:' + g}}">{{f}}</view><view class="close-wrap data-v-4fac7f82" catchtap="{{h}}"><image class="close-icon data-v-4fac7f82" src="{{''}}" mode="widthFix"></image></view></view><view class="scroll-wrap data-v-4fac7f82"><scroll-view enable-flex class="{{['data-v-4fac7f82', j && 'scroll-view']}}" scroll-y="true" style="height:100%" bindscrolltolower="{{k}}"><view id="popup_content" class="popup_content data-v-4fac7f82"><slot></slot></view></scroll-view></view></view></view>

unpackage/dist/dev/mp-weixin/components/px-popup-bottom/px-popup-bottom.wxss

@@ -24,7 +24,7 @@
 /* 透明度 */
 /* 文章场景相关 */
 /*自定义主题色 */
-.popup.popup-show.data-v-32af3e28 {
+.popup.popup-show.data-v-4fac7f82 {
   position: fixed;
   top: 0;
   right: 0;
@@ -33,7 +33,7 @@
   overflow: hidden;
   z-index: 999;
 }
-.popup .mask.data-v-32af3e28 {
+.popup .mask.data-v-4fac7f82 {
   position: fixed;
   top: 0;
   right: 0;
@@ -42,7 +42,7 @@
   background-color: rgba(0, 0, 0, 0.5);
   z-index: 999;
 }
-.popup .content.data-v-32af3e28 {
+.popup .content.data-v-4fac7f82 {
   position: fixed;
   bottom: 0;
   left: 0;
@@ -57,7 +57,7 @@
   align-items: center;
   overflow: hidden;
 }
-.popup .content .title-bar.data-v-32af3e28 {
+.popup .content .title-bar.data-v-4fac7f82 {
   width: 100%;
   flex-shrink: 0;
   text-align: center;
@@ -66,7 +66,7 @@
   box-sizing: border-box;
   height: 80rpx;
 }
-.popup .content .title-bar .title.data-v-32af3e28 {
+.popup .content .title-bar .title.data-v-4fac7f82 {
   font-size: 34rpx;
   font-family: PingFang SC;
   font-weight: bold !important;
@@ -76,40 +76,40 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.popup .content .title-bar .close-wrap.data-v-32af3e28 {
+.popup .content .title-bar .close-wrap.data-v-4fac7f82 {
   position: absolute;
   top: 20rpx;
   right: 10rpx;
   padding: 10rpx 20rpx;
   box-sizing: border-box;
 }
-.popup .content .title-bar .close-icon.data-v-32af3e28 {
+.popup .content .title-bar .close-icon.data-v-4fac7f82 {
   width: 40rpx;
   height: 40rpx;
 }
-.popup .content .scroll-wrap.data-v-32af3e28 {
+.popup .content .scroll-wrap.data-v-4fac7f82 {
   flex: 1;
   height: 0;
   width: 100%;
 }
-.popup .content.visible.data-v-32af3e28 {
+.popup .content.visible.data-v-4fac7f82 {
   max-height: 75%;
   overflow-y: hidden;
   height: auto;
 }
-.scroll-view.data-v-32af3e28 ::-webkit-scrollbar {
+.scroll-view.data-v-4fac7f82 ::-webkit-scrollbar {
   display: none !important;
   width: 0 !important;
   height: 0 !important;
   -webkit-appearance: none;
   background: transparent;
 }
-.popup_content.data-v-32af3e28 {
+.popup_content.data-v-4fac7f82 {
   width: 100%;
   padding: 0rpx 30rpx;
   box-sizing: border-box;
 }
-.popup_content.data-v-32af3e28::after {
+.popup_content.data-v-4fac7f82::after {
   display: block;
   width: 100%;
   content: " ";

unpackage/dist/dev/mp-weixin/core/app.js

@@ -1,7 +1,7 @@
 "use strict";
-var common_vendor = require("../common/vendor.js");
+const common_vendor = require("../common/vendor.js");
 require("../store/index.js");
-var utils_util = require("../utils/util.js");
+const utils_util = require("../utils/util.js");
 const getTabBarLinks = () => {
   const tabBarLinks = [
     "pages/home/index",

unpackage/dist/dev/mp-weixin/core/bootstrap.js

@@ -1,8 +1,8 @@
 "use strict";
-var store_index = require("../store/index.js");
-var utils_storage = require("../utils/storage.js");
-var core_platform = require("./platform.js");
-var store_mutationTypes = require("../store/mutation-types.js");
+const store_index = require("../store/index.js");
+const utils_storage = require("../utils/storage.js");
+const core_platform = require("./platform.js");
+const store_mutationTypes = require("../store/mutation-types.js");
 function Initializer() {
   store_index.store.commit("SET_PLATFORM", core_platform.platfrom);
   store_index.store.commit("SET_TOKEN", utils_storage.storage.get(store_mutationTypes.ACCESS_TOKEN));

unpackage/dist/dev/mp-weixin/core/config/defaultConfig.js

@@ -1,7 +1,8 @@
 "use strict";
-const developUrl = "http://nd383294.natappfree.cc/";
-var defaultConfig = {
-  name: "\u7B7E\u7EA6",
+const developUrl = "https://live.test.ylrztop.com/prod-api/";
+const defaultConfig = {
+  // 系统名称
+  name: "签约",
   apiUrl: developUrl
 };
 exports.defaultConfig = defaultConfig;

unpackage/dist/dev/mp-weixin/core/config/index.js

@@ -1,15 +1,17 @@
 "use strict";
-var core_config_defaultConfig = require("./defaultConfig.js");
+const core_config_defaultConfig = require("./defaultConfig.js");
 const mergeConfig = Object.assign({}, core_config_defaultConfig.defaultConfig);
-var config = {
+const config = {
+  // 获取全部配置
   all() {
     return mergeConfig;
   },
+  // 获取指定配置
   get(key, def = void 0) {
     if (mergeConfig.hasOwnProperty(key)) {
       return mergeConfig[key];
     }
-    console.error(`\u68C0\u6D4B\u5230\u4E0D\u5B58\u5728\u7684\u914D\u7F6E\u9879: ${key}`);
+    console.error(`检测到不存在的配置项: ${key}`);
     return def;
   },
   getResource(imgName) {

unpackage/dist/dev/mp-weixin/core/mixins/app.js

@@ -1,8 +1,8 @@
 "use strict";
 require("../../common/vendor.js");
 require("../../store/index.js");
-var core_platform = require("../platform.js");
-var mixin = {
+const core_platform = require("../platform.js");
+const mixin = {
   data() {
     return {
       platform: core_platform.platfrom

unpackage/dist/dev/mp-weixin/core/mixins/share.js

@@ -1,16 +1,21 @@
 "use strict";
-var common_vendor = require("../../common/vendor.js");
-var core_config_index = require("../config/index.js");
-var share = {
+const common_vendor = require("../../common/vendor.js");
+const core_config_index = require("../config/index.js");
+const share = {
   data() {
     return {
       share: {
+        // 转发的标题 （默认标题）
         title: core_config_index.config.get("name"),
+        // 默认是当前页面，必须是以‘/’开头的完整路径
         path: `/pages/home/index`,
+        //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，
+        //支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
         imageUrl: core_config_index.config.getResource("logo.png")
       }
     };
   },
+  // 发送给朋友
   onShareAppMessage(res) {
     let shareInfo = common_vendor.index.getStorageSync("shareInfo");
     return {
@@ -19,6 +24,7 @@ var share = {
       path: shareInfo.path || this.share.path
     };
   },
+  //分享到朋友圈
   onShareTimeline(res) {
     let shareInfo = common_vendor.index.getStorageSync("shareInfo");
     return {

unpackage/dist/dev/mp-weixin/pages/auth/findpass.js

@@ -1,7 +1,6 @@
 "use strict";
-var common_vendor = require("../../common/vendor.js");
+const common_vendor = require("../../common/vendor.js");
 require("../../api/login.js");
-require("../../common/request.js");
 const _sfc_main = {
   data() {
     return {
@@ -30,14 +29,14 @@ const _sfc_main = {
     login() {
       if (this.$isEmpty(this.userName)) {
         common_vendor.index.showToast({
-          title: "\u8BF7\u8F93\u5165\u5E10\u53F7",
+          title: "请输入帐号",
           icon: "none"
         });
         return;
       }
       if (this.$isEmpty(this.password)) {
         common_vendor.index.showToast({
-          title: "\u8BF7\u8F93\u5165\u5BC6\u7801",
+          title: "请输入密码",
           icon: "none"
         });
         return;
@@ -48,18 +47,21 @@ const _sfc_main = {
         jpushId: this.registrationID || common_vendor.index.getStorageSync("registrationID")
       };
       common_vendor.index.showLoading({
-        title: "\u5904\u7406\u4E2D..."
+        title: "处理中..."
       });
-      login(data).then((res) => {
-        common_vendor.index.hideLoading();
-        if (res.code == 200) {
-          common_vendor.index.setStorageSync("AppToken", res.data.token);
-          this.$Router.pushTab({ name: "home" });
-        } else {
-          common_vendor.index.showToast({ title: res.msg, icon: "none" });
+      login(data).then(
+        (res) => {
+          common_vendor.index.hideLoading();
+          if (res.code == 200) {
+            common_vendor.index.setStorageSync("AppToken", res.data.token);
+            this.$Router.pushTab({ name: "home" });
+          } else {
+            common_vendor.index.showToast({ title: res.msg, icon: "none" });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
     goToRegister() {
       this.$navTo("./register");
@@ -82,5 +84,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     g: common_vendor.o((...args) => $options.login && $options.login(...args))
   };
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages/auth/findpass.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages/auth/h5WxLogin.js

@@ -1,7 +1,7 @@
 "use strict";
-var common_vendor = require("../../common/vendor.js");
-var api_login = require("../../api/login.js");
-require("../../common/request.js");
+const common_vendor = require("../../common/vendor.js");
+const api_login = require("../../api/login.js");
+const common_assets = require("../../common/assets.js");
 const isWechat = () => {
   return String(navigator.userAgent.toLowerCase().match(/MicroMessenger/i)) === "micromessenger";
 };
@@ -24,22 +24,25 @@ const _sfc_main = {
         return;
       }
       common_vendor.index.showLoading({
-        title: "\u5904\u7406\u4E2D..."
+        title: "处理中..."
       });
       let that = this;
       var data = { code: this.code };
-      api_login.loginByWeChat(data).then((res) => {
-        common_vendor.index.hideLoading();
-        if (res.code == 200) {
-          common_vendor.index.setStorageSync("AppToken", res.token);
-          common_vendor.index.setStorageSync("userInfo", JSON.stringify(res.user));
-          common_vendor.index.$emit("refreshIM");
-          that.goToLanch();
-        } else {
-          common_vendor.index.showToast({ title: res.msg, icon: "none" });
+      api_login.loginByWeChat(data).then(
+        (res) => {
+          common_vendor.index.hideLoading();
+          if (res.code == 200) {
+            common_vendor.index.setStorageSync("AppToken", res.token);
+            common_vendor.index.setStorageSync("userInfo", JSON.stringify(res.user));
+            common_vendor.index.$emit("refreshIM");
+            that.goToLanch();
+          } else {
+            common_vendor.index.showToast({ title: res.msg, icon: "none" });
+          }
+        },
+        (err) => {
         }
-      }, (err) => {
-      });
+      );
     },
     getWechatCode() {
       if (isWechat) {
@@ -77,8 +80,9 @@ const _sfc_main = {
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return {
-    a: common_vendor.o(($event) => $options.loginByMp())
+    a: common_assets._imports_0$6,
+    b: common_vendor.o(($event) => $options.loginByMp())
   };
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages/auth/h5WxLogin.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages/auth/h5WxLogin.wxml

@@ -1 +1 @@
-<view class="content"><view class="force-login-wrap"><view class="force-login__content y-f"><view class="logo"><view class="logo-img"><image src="/static/logo.png"></image></view><view class="title">直播</view></view><view class="login-notice">为了提供更优质的服务，请先登录</view><view class="btns"><view class="author-btn" bindtap="{{a}}">微信授权登录</view></view></view></view></view>
+<view class="content"><view class="force-login-wrap"><view class="force-login__content y-f"><view class="logo"><view class="logo-img"><image src="{{a}}"></image></view><view class="title">直播</view></view><view class="login-notice">为了提供更优质的服务，请先登录</view><view class="btns"><view class="author-btn" bindtap="{{b}}">微信授权登录</view></view></view></view></view>

unpackage/dist/dev/mp-weixin/pages/auth/login.js

@@ -1,7 +1,7 @@
 "use strict";
-var common_vendor = require("../../common/vendor.js");
-var api_login = require("../../api/login.js");
-require("../../common/request.js");
+const common_vendor = require("../../common/vendor.js");
+const api_login = require("../../api/login.js");
+const common_assets = require("../../common/assets.js");
 const _sfc_main = {
   data() {
     return {
@@ -55,21 +55,21 @@ const _sfc_main = {
     login() {
       if (this.$isEmpty(this.userName)) {
         common_vendor.index.showToast({
-          title: "\u8BF7\u8F93\u5165\u5E10\u53F7",
+          title: "请输入帐号",
           icon: "none"
         });
         return;
       }
       if (this.$isEmpty(this.password)) {
         common_vendor.index.showToast({
-          title: "\u8BF7\u8F93\u5165\u5BC6\u7801",
+          title: "请输入密码",
           icon: "none"
         });
         return;
       }
       if (!this.agree) {
         common_vendor.index.showToast({
-          title: "\u8BF7\u540C\u610F\u76F8\u5173\u534F\u8BAE",
+          title: "请同意相关协议",
           icon: "none"
         });
         return;
@@ -77,36 +77,41 @@ const _sfc_main = {
       var data = {
         phone: this.userName,
         password: this.password,
+        // jpushId: this.registrationID,
         loginType: 1
+        // source: this.source
       };
       var that = this;
       common_vendor.index.showLoading({
-        title: "\u5904\u7406\u4E2D..."
+        title: "处理中..."
       });
-      api_login.loginByApp(data).then((res) => {
-        common_vendor.index.hideLoading();
-        console.log("qxj res:" + JSON.stringify(res));
-        if (res.code == 200) {
-          common_vendor.index.setStorageSync("AppToken", res.token);
-          common_vendor.index.setStorageSync("userInfo", JSON.stringify(res.user));
-          common_vendor.index.$emit("refreshIM");
-          common_vendor.index.$emit("showHealthButler");
-          that.goPage();
-        } else {
-          common_vendor.index.showToast({
-            title: res.msg,
-            icon: "none"
-          });
+      api_login.loginByApp(data).then(
+        (res) => {
+          common_vendor.index.hideLoading();
+          console.log("qxj res:" + JSON.stringify(res));
+          if (res.code == 200) {
+            common_vendor.index.setStorageSync("AppToken", res.token);
+            common_vendor.index.setStorageSync("userInfo", JSON.stringify(res.user));
+            common_vendor.index.$emit("refreshIM");
+            common_vendor.index.$emit("showHealthButler");
+            that.goPage();
+          } else {
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
+          }
+        },
+        (rej) => {
+          console.log("qxj rej:" + JSON.stringify(rej));
         }
-      }, (rej) => {
-        console.log("qxj rej:" + JSON.stringify(rej));
-      });
+      );
     },
     quickAppleLogin() {
       let that = this;
       if (!this.agree) {
         common_vendor.index.showToast({
-          title: "\u8BF7\u540C\u610F\u76F8\u5173\u534F\u8BAE",
+          title: "请同意相关协议",
           icon: "none"
         });
         return;
@@ -149,7 +154,7 @@ const _sfc_main = {
         appleKey: authResult.openid
       };
       common_vendor.index.showLoading({
-        title: "\u767B\u9646\u4E2D"
+        title: "登陆中"
       });
       loginByApple(params).then((res) => {
         common_vendor.index.hideLoading();
@@ -174,7 +179,7 @@ const _sfc_main = {
     loginWeixin() {
       if (!this.agree) {
         common_vendor.index.showToast({
-          title: "\u8BF7\u540C\u610F\u76F8\u5173\u534F\u8BAE",
+          title: "请同意相关协议",
           icon: "none"
         });
         return;
@@ -184,7 +189,7 @@ const _sfc_main = {
         onlyAuthorize: true,
         success: async (res) => {
           common_vendor.index.showLoading({
-            title: "\u5904\u7406\u4E2D..."
+            title: "处理中..."
           });
           const params = {
             code: res.code,
@@ -197,15 +202,17 @@ const _sfc_main = {
           console.log("qxj loginWeixin fail:", JSON.stringify(err));
           if (err.code == 1e3) {
             common_vendor.index.showModal({
-              title: "\u767B\u5F55\u5931\u8D25",
+              title: "登录失败",
               content: `${err.errMsg}
-\uFF0C\u9519\u8BEF\u7801\uFF1A${err.code}`,
-              confirmText: "\u5F00\u901A\u6307\u5357",
-              cancelText: "\u786E\u5B9A",
+，错误码：${err.code}`,
+              confirmText: "开通指南",
+              cancelText: "确定",
               success: (res) => {
                 if (res.confirm) {
                   setTimeout(() => {
-                    plus.runtime.openWeb("https://ask.dcloud.net.cn/article/37965");
+                    plus.runtime.openWeb(
+                      "https://ask.dcloud.net.cn/article/37965"
+                    );
                   }, 500);
                 }
               }
@@ -215,7 +222,7 @@ const _sfc_main = {
           if (err.code == "30005") {
             common_vendor.index.showModal({
               showCancel: false,
-              title: "\u9884\u767B\u5F55\u5931\u8D25",
+              title: "预登录失败",
               content: err.errMsg
             });
             return;
@@ -223,7 +230,7 @@ const _sfc_main = {
           if (err.code != "30003") {
             common_vendor.index.showModal({
               showCancel: false,
-              title: "\u767B\u5F55\u5931\u8D25",
+              title: "登录失败",
               content: JSON.stringify(err)
             });
           }
@@ -239,11 +246,14 @@ const _sfc_main = {
       this.$navTo("./findpass");
     },
     doUniverify(authResult) {
-      common_vendor.pn.callFunction({
+      common_vendor.tr.callFunction({
         name: "loginByMobile",
+        // 你的云函数名称
         data: {
           access_token: authResult.access_token,
+          // 客户端一键登录接口返回的access_token
           openid: authResult.openid
+          // 客户端一键登录接口返回的openid
         }
       }).then((res) => {
         common_vendor.index.closeAuthView();
@@ -256,46 +266,52 @@ const _sfc_main = {
           });
         }
       }).catch((err) => {
-        console.error("\u8C03\u7528\u4E91\u51FD\u6570\u5931\u8D25:", err);
-        console.error("\u9519\u8BEF\u4FE1\u606F:", err.errMsg);
+        console.error("调用云函数失败:", err);
+        console.error("错误信息:", err.errMsg);
       });
     },
     loginByWeChatAct(params) {
-      api_login.loginByWeChat(params).then((res) => {
-        if (res.code == 200) {
-          if (res.user != null) {
-            common_vendor.index.hideLoading();
-            common_vendor.index.setStorageSync("AppToken", res.token);
-            common_vendor.index.setStorageSync("userInfo", JSON.stringify(res.user));
-            common_vendor.index.closeAuthView();
-            common_vendor.index.$emit("refreshIM");
-            common_vendor.index.$emit("showHealthButler");
-            common_vendor.index.$emit("refreshUserInfo", {});
-            this.goPage();
-          } else {
-            this.unionid = res.unionid;
-            if (res.isNew) {
-              this.bindMobile();
+      api_login.loginByWeChat(params).then(
+        (res) => {
+          if (res.code == 200) {
+            if (res.user != null) {
+              common_vendor.index.hideLoading();
+              common_vendor.index.setStorageSync("AppToken", res.token);
+              common_vendor.index.setStorageSync("userInfo", JSON.stringify(res.user));
+              common_vendor.index.closeAuthView();
+              common_vendor.index.$emit("refreshIM");
+              common_vendor.index.$emit("showHealthButler");
+              common_vendor.index.$emit("refreshUserInfo", {});
+              this.goPage();
+            } else {
+              this.unionid = res.unionid;
+              if (res.isNew) {
+                this.bindMobile();
+              }
             }
+          } else {
+            common_vendor.index.hideLoading();
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
           }
-        } else {
-          common_vendor.index.hideLoading();
-          common_vendor.index.showToast({
-            title: res.msg,
-            icon: "none"
-          });
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
     bindMobile(type) {
     },
     loginByUniverify(authResult, type) {
-      common_vendor.pn.callFunction({
+      common_vendor.tr.callFunction({
         name: "loginByMobile",
+        // 你的云函数名称
         data: {
           access_token: authResult.access_token,
+          // 客户端一键登录接口返回的access_token
           openid: authResult.openid
+          // 客户端一键登录接口返回的openid
         }
       }).then((res) => {
         console.log("qxj doUniverify:", JSON.stringify(res));
@@ -313,8 +329,8 @@ const _sfc_main = {
           });
         }
       }).catch((err) => {
-        console.error("\u8C03\u7528\u4E91\u51FD\u6570\u5931\u8D25:", err);
-        console.error("\u9519\u8BEF\u4FE1\u606F:", err.errMsg);
+        console.error("调用云函数失败:", err);
+        console.error("错误信息:", err.errMsg);
       });
     },
     setPhoneAct(type, phone, unionId) {
@@ -329,23 +345,26 @@ const _sfc_main = {
           appleKey: this.appleKey
         };
       }
-      setPhone(params).then((res) => {
-        common_vendor.index.hideLoading();
-        if (res.code == 200) {
-          common_vendor.index.setStorageSync("AppToken", res.token);
-          common_vendor.index.setStorageSync("userInfo", JSON.stringify(res.user));
-          common_vendor.index.closeAuthView();
-          common_vendor.index.$emit("refreshIM");
-          this.goPage();
-        } else {
-          common_vendor.index.showToast({
-            title: res.msg,
-            icon: "none"
-          });
-          common_vendor.index.closeAuthView();
+      setPhone(params).then(
+        (res) => {
+          common_vendor.index.hideLoading();
+          if (res.code == 200) {
+            common_vendor.index.setStorageSync("AppToken", res.token);
+            common_vendor.index.setStorageSync("userInfo", JSON.stringify(res.user));
+            common_vendor.index.closeAuthView();
+            common_vendor.index.$emit("refreshIM");
+            this.goPage();
+          } else {
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
+            common_vendor.index.closeAuthView();
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
     getRegistrationID() {
       this.registrationID = common_vendor.index.getStorageSync("registrationID");
@@ -409,25 +428,30 @@ const _sfc_main = {
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return common_vendor.e({
     a: common_vendor.o(($event) => $options.goBack()),
-    b: $data.userName,
-    c: common_vendor.o(($event) => $data.userName = $event.detail.value),
-    d: $data.password,
-    e: common_vendor.o(($event) => $data.password = $event.detail.value),
-    f: common_vendor.o((...args) => $options.login && $options.login(...args)),
-    g: common_vendor.o(($event) => $options.goToRegister()),
-    h: $data.isApp && $data.isAgreePrivacy
+    b: common_assets._imports_0$5,
+    c: $data.userName,
+    d: common_vendor.o(($event) => $data.userName = $event.detail.value),
+    e: $data.password,
+    f: common_vendor.o(($event) => $data.password = $event.detail.value),
+    g: common_vendor.o((...args) => $options.login && $options.login(...args)),
+    h: common_vendor.o(($event) => $options.goToRegister()),
+    i: $data.isApp && $data.isAgreePrivacy
   }, $data.isApp && $data.isAgreePrivacy ? common_vendor.e({
-    i: common_vendor.o((...args) => $options.loginWeixin && $options.loginWeixin(...args)),
-    j: $data.isIos
+    j: common_assets._imports_1$3,
+    k: common_vendor.o((...args) => $options.loginWeixin && $options.loginWeixin(...args)),
+    l: $data.isIos
   }, $data.isIos ? {
-    k: common_vendor.o((...args) => $options.quickAppleLogin && $options.quickAppleLogin(...args))
+    m: common_assets._imports_2$2,
+    n: common_vendor.o((...args) => $options.quickAppleLogin && $options.quickAppleLogin(...args))
   } : {}) : {}, {
-    l: !$data.agree,
-    m: $data.agree,
-    n: common_vendor.o((...args) => $options.handleAgree && $options.handleAgree(...args)),
-    o: common_vendor.o(($event) => $options.goToWeb(0)),
-    p: common_vendor.o(($event) => $options.goToWeb(1))
+    o: common_assets._imports_0$4,
+    p: !$data.agree,
+    q: common_assets._imports_1$2,
+    r: $data.agree,
+    s: common_vendor.o((...args) => $options.handleAgree && $options.handleAgree(...args)),
+    t: common_vendor.o(($event) => $options.goToWeb(0)),
+    v: common_vendor.o(($event) => $options.goToWeb(1))
   });
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-cbd6070a"], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages/auth/login.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-2cc9f8c3"]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages/auth/login.wxss

@@ -24,10 +24,10 @@
 /* 透明度 */
 /* 文章场景相关 */
 /*自定义主题色 */
-page.data-v-cbd6070a {
+page.data-v-2cc9f8c3 {
   background-color: #ffffff;
 }
-.other-login-btn.data-v-cbd6070a {
+.other-login-btn.data-v-2cc9f8c3 {
   display: flex;
   align-items: center;
   justify-content: center;
@@ -42,10 +42,10 @@ page.data-v-cbd6070a {
   border: 2rpx solid #FF5C03;
   margin-top: 30rpx;
 }
-.other-login-btn.data-v-cbd6070a::after {
+.other-login-btn.data-v-2cc9f8c3::after {
   border: none;
 }
-.content.data-v-cbd6070a {
+.content.data-v-2cc9f8c3 {
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -53,19 +53,19 @@ page.data-v-cbd6070a {
   width: 100%;
   position: relative;
 }
-.backImg.data-v-cbd6070a {
+.backImg.data-v-2cc9f8c3 {
   position: absolute;
   left: 30rpx;
   top: 40px;
   height: 30rpx;
   width: 30rpx;
 }
-.pageTop.data-v-cbd6070a {
+.pageTop.data-v-2cc9f8c3 {
   display: flex;
   flex-direction: column;
   width: 100%;
 }
-.content .head.data-v-cbd6070a {
+.content .head.data-v-2cc9f8c3 {
   text-align: center;
   width: 100%;
   height: 100rpx;
@@ -75,39 +75,39 @@ page.data-v-cbd6070a {
   font-weight: bold;
   color: #666;
 }
-.content .head image.data-v-cbd6070a {
+.content .head image.data-v-2cc9f8c3 {
   width: 150rpx;
   height: 150rpx;
   border-radius: 10rpx;
   box-shadow: 0px 0px 20rpx rgba(0, 0, 0, 0.2);
 }
-.title.data-v-cbd6070a {
+.title.data-v-2cc9f8c3 {
   color: #141414;
   margin: 50rpx 0rpx 30rpx 0rpx;
   font-size: 38rpx;
   font-weight: 500;
 }
-.desc.data-v-cbd6070a {
+.desc.data-v-2cc9f8c3 {
   color: #686866;
   padding: 0 0 30rpx 0rpx;
   font-size: 28rpx;
 }
-.loginBox.data-v-cbd6070a {
+.loginBox.data-v-2cc9f8c3 {
   padding: 0 10px 30rpx;
   width: 100%;
   background: #FDFDFD;
   z-index: 10;
   position: relative;
 }
-.loginBox .login-item p.data-v-cbd6070a {
+.loginBox .login-item p.data-v-2cc9f8c3 {
   text-align: left;
 }
-.loginBox .line.data-v-cbd6070a {
+.loginBox .line.data-v-2cc9f8c3 {
   height: 0.5rpx;
   background-color: #efefef;
   margin-top: 10rpx;
 }
-.loginBox .input-account.data-v-cbd6070a {
+.loginBox .input-account.data-v-2cc9f8c3 {
   margin-top: 20rpx;
   margin-bottom: 0rpx;
   border-radius: 40rpx;
@@ -118,7 +118,7 @@ page.data-v-cbd6070a {
   background-size: 30rpx 30rpx;
   background-position: 30rpx;
 }
-.loginBox .input-pwd.data-v-cbd6070a {
+.loginBox .input-pwd.data-v-2cc9f8c3 {
   margin-top: 40rpx;
   margin-bottom: 20rpx;
   border-radius: 40rpx;
@@ -129,23 +129,23 @@ page.data-v-cbd6070a {
   background-size: 30rpx 30rpx;
   background-position: 30rpx;
 }
-.loginBox input.data-v-cbd6070a {
+.loginBox input.data-v-2cc9f8c3 {
   margin-left: 80rpx;
   height: 80rpx;
   line-height: 80rpx;
 }
-.loginBox .reg-box.data-v-cbd6070a {
+.loginBox .reg-box.data-v-2cc9f8c3 {
   padding-bottom: 20rpx;
   margin: 0 10px;
 }
-.loginBox .reg-box .reg-btn.data-v-cbd6070a {
+.loginBox .reg-box .reg-btn.data-v-2cc9f8c3 {
   font-size: 16px;
   color: #FF5C03;
 }
-.btns.data-v-cbd6070a {
+.btns.data-v-2cc9f8c3 {
   margin: 60rpx 0rpx;
 }
-.login-btn.data-v-cbd6070a {
+.login-btn.data-v-2cc9f8c3 {
   display: flex;
   align-items: center;
   justify-content: center;
@@ -160,7 +160,7 @@ page.data-v-cbd6070a {
   font-weight: 500;
   color: white;
 }
-.pageBottom.data-v-cbd6070a {
+.pageBottom.data-v-2cc9f8c3 {
   height: 220rpx;
   width: 75%;
   display: flex;
@@ -168,18 +168,18 @@ page.data-v-cbd6070a {
   position: absolute;
   bottom: 100rpx;
 }
-.tips.data-v-cbd6070a {
+.tips.data-v-2cc9f8c3 {
   color: #999;
   font-size: 32rpx;
 }
-.menu.data-v-cbd6070a {
+.menu.data-v-2cc9f8c3 {
   margin-top: 30rpx;
 }
-.menu image.data-v-cbd6070a {
+.menu image.data-v-2cc9f8c3 {
   width: 96rpx;
   height: 96rpx;
 }
-.checkbox.data-v-cbd6070a {
+.checkbox.data-v-2cc9f8c3 {
   margin: 20rpx;
   margin-top: 36rpx;
   display: flex;
@@ -193,14 +193,14 @@ page.data-v-cbd6070a {
   line-height: 38rpx;
   text-align: left;
 }
-.checkbox text.data-v-cbd6070a {
+.checkbox text.data-v-2cc9f8c3 {
   color: #FF5C03;
 }
-.checkbox-icon.data-v-cbd6070a {
+.checkbox-icon.data-v-2cc9f8c3 {
   flex-shrink: 0;
   margin-right: 12rpx;
 }
-.checkbox-icon image.data-v-cbd6070a {
+.checkbox-icon image.data-v-2cc9f8c3 {
   height: 24rpx;
   width: 24rpx;
 }

unpackage/dist/dev/mp-weixin/pages/auth/loginIndex.js

@@ -1,7 +1,7 @@
 "use strict";
-var common_vendor = require("../../common/vendor.js");
+const common_vendor = require("../../common/vendor.js");
 require("../../api/login.js");
-require("../../common/request.js");
+const common_assets = require("../../common/assets.js");
 const _sfc_main = {
   data() {
     return {
@@ -47,6 +47,7 @@ const _sfc_main = {
     if (this.$isLogin()) {
       common_vendor.index.reLaunch({
         url: "../course/index",
+        //url: '../course/video/living-app',
         animationType: "none",
         animationDuration: 2e3
       });
@@ -59,9 +60,11 @@ const _sfc_main = {
         url: "/pages/index/h5"
       });
     },
+    // 同意
     handleAgree() {
       this.agree = !this.agree;
     },
+    // login
     submit() {
       this.$showLoginPage();
     },
@@ -70,6 +73,7 @@ const _sfc_main = {
         url: "/pages/auth/login"
       });
     },
+    // 关闭弹窗
     close(val) {
       this.$refs.popup.close();
       if (val == "agree") {
@@ -86,12 +90,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     c: common_vendor.o((...args) => $options.submit && $options.submit(...args)),
     d: $data.btnLoading,
     e: common_vendor.o((...args) => $options.handleOtherLogin && $options.handleOtherLogin(...args)),
-    f: !$data.agree,
-    g: $data.agree,
-    h: common_vendor.o((...args) => $options.handleAgree && $options.handleAgree(...args)),
-    i: common_vendor.o(($event) => $options.goToWeb(0)),
-    j: common_vendor.o(($event) => $options.goToWeb(1))
+    f: common_assets._imports_0$7,
+    g: !$data.agree,
+    h: common_assets._imports_1$4,
+    i: $data.agree,
+    j: common_vendor.o((...args) => $options.handleAgree && $options.handleAgree(...args)),
+    k: common_vendor.o(($event) => $options.goToWeb(0)),
+    l: common_vendor.o(($event) => $options.goToWeb(1))
   };
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-5122ae47"], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages/auth/loginIndex.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-648b5fa7"]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages/auth/loginIndex.wxml

@@ -1 +1 @@
-<view class="container data-v-5122ae47"><view class="login-title data-v-5122ae47"><view class="data-v-5122ae47">您好，</view><view class="data-v-5122ae47">欢迎来到芳华未来！</view></view><view class="login-box data-v-5122ae47"><button class="login-btn data-v-5122ae47" style="margin-top:74rpx" loading="{{a}}" disabled="{{b}}" bindtap="{{c}}">本机号码一键登录</button><button class="login-btn other-login-btn data-v-5122ae47" disabled="{{d}}" bindtap="{{e}}">其他方式登录</button><view class="checkbox data-v-5122ae47"><view class="checkbox-icon data-v-5122ae47" bindtap="{{h}}"><image class="data-v-5122ae47" src="/static/imagesradio_default.png" hidden="{{!f}}"></image><image class="data-v-5122ae47" src="/static/image/radio_choose.png" hidden="{{!g}}"></image></view><view class="data-v-5122ae47">我已阅读并同意<text class="data-v-5122ae47" bindtap="{{i}}">《用户协议》</text><text class="data-v-5122ae47" bindtap="{{j}}">《隐私政策》</text> 并使用本机号码登录</view></view></view></view>
+<view class="container data-v-648b5fa7"><view class="login-title data-v-648b5fa7"><view class="data-v-648b5fa7">您好，</view><view class="data-v-648b5fa7">欢迎来到芳华未来！</view></view><view class="login-box data-v-648b5fa7"><button class="login-btn data-v-648b5fa7" style="margin-top:74rpx" loading="{{a}}" disabled="{{b}}" bindtap="{{c}}">本机号码一键登录</button><button class="login-btn other-login-btn data-v-648b5fa7" disabled="{{d}}" bindtap="{{e}}">其他方式登录</button><view class="checkbox data-v-648b5fa7"><view class="checkbox-icon data-v-648b5fa7" bindtap="{{j}}"><image class="data-v-648b5fa7" src="{{f}}" hidden="{{!g}}"></image><image class="data-v-648b5fa7" src="{{h}}" hidden="{{!i}}"></image></view><view class="data-v-648b5fa7">我已阅读并同意<text class="data-v-648b5fa7" bindtap="{{k}}">《用户协议》</text><text class="data-v-648b5fa7" bindtap="{{l}}">《隐私政策》</text> 并使用本机号码登录</view></view></view></view>

unpackage/dist/dev/mp-weixin/pages/auth/loginIndex.wxss

@@ -29,14 +29,14 @@ page {
 /* 透明度 */
 /* 文章场景相关 */
 /*自定义主题色 */
-.container.data-v-5122ae47 {
+.container.data-v-648b5fa7 {
   height: 100vh;
   padding: 0 64rpx;
   padding-top: calc(var(--status-bar-height) + 88rpx);
   padding-bottom: calc(var(--window-bottom) + 20rpx);
   box-sizing: border-box;
 }
-.popupbox.data-v-5122ae47 {
+.popupbox.data-v-648b5fa7 {
   font-family: PingFang SC, PingFang SC;
   font-weight: 400;
   font-size: 30rpx;
@@ -48,17 +48,17 @@ page {
   border-radius: 15rpx;
   box-sizing: border-box;
 }
-.popupbox text.data-v-5122ae47 {
+.popupbox text.data-v-648b5fa7 {
   color: #FF5C03;
 }
-.popupbox .popupbox-footer.data-v-5122ae47 {
+.popupbox .popupbox-footer.data-v-648b5fa7 {
   padding: 30rpx 0;
   display: flex;
   flex-direction: row;
   align-items: center;
   justify-content: center;
 }
-.popupbox .popupbox-btn.data-v-5122ae47 {
+.popupbox .popupbox-btn.data-v-648b5fa7 {
   width: 200rpx;
   height: 68rpx;
   background: #fff;
@@ -69,12 +69,12 @@ page {
   border: 1rpx solid #999;
   color: #999;
 }
-.popupbox .agree-btn.data-v-5122ae47 {
+.popupbox .agree-btn.data-v-648b5fa7 {
   background: linear-gradient(270deg, #FF5C03 0%, #FFAC64 100%);
   border: none;
   color: #fff;
 }
-.login-title.data-v-5122ae47 {
+.login-title.data-v-648b5fa7 {
   font-family: PingFang SC, PingFang SC;
   font-weight: 600;
   font-size: 56rpx;
@@ -82,18 +82,18 @@ page {
   line-height: 78rpx;
   padding-top: 40rpx;
 }
-.logoimage.data-v-5122ae47 {
+.logoimage.data-v-648b5fa7 {
   display: flex;
   flex-direction: row;
   align-items: center;
   justify-content: center;
   margin-top: 5vh;
 }
-.logoimage image.data-v-5122ae47 {
+.logoimage image.data-v-648b5fa7 {
   height: 100rpx;
   width: 100rpx;
 }
-.login-box.data-v-5122ae47 {
+.login-box.data-v-648b5fa7 {
   margin-top: 20vh;
   font-family: PingFang SC, PingFang SC;
   font-weight: 400;
@@ -101,15 +101,15 @@ page {
   color: #333333;
   text-align: center;
 }
-.login-box .phone.data-v-5122ae47 {
+.login-box .phone.data-v-648b5fa7 {
   font-weight: 500;
   font-size: 56rpx;
 }
-.login-box .tips.data-v-5122ae47 {
+.login-box .tips.data-v-648b5fa7 {
   margin-top: 18rpx;
   color: #757575;
 }
-.checkbox.data-v-5122ae47 {
+.checkbox.data-v-648b5fa7 {
   margin-top: 36rpx;
   display: flex;
   flex-direction: row;
@@ -122,18 +122,18 @@ page {
   line-height: 38rpx;
   text-align: left;
 }
-.checkbox text.data-v-5122ae47 {
+.checkbox text.data-v-648b5fa7 {
   color: #FF5C03;
 }
-.checkbox-icon.data-v-5122ae47 {
+.checkbox-icon.data-v-648b5fa7 {
   flex-shrink: 0;
   margin-right: 12rpx;
 }
-.checkbox-icon image.data-v-5122ae47 {
+.checkbox-icon image.data-v-648b5fa7 {
   height: 24rpx;
   width: 24rpx;
 }
-.login-btn.data-v-5122ae47 {
+.login-btn.data-v-648b5fa7 {
   min-width: 622rpx;
   height: 88rpx;
   margin-top: 48rpx;
@@ -146,10 +146,10 @@ page {
   font-size: 32rpx;
   color: #FFFFFF !important;
 }
-.login-btn.data-v-5122ae47::after {
+.login-btn.data-v-648b5fa7::after {
   border: none;
 }
-.other-login-btn.data-v-5122ae47 {
+.other-login-btn.data-v-648b5fa7 {
   background: #fff;
   border: 2rpx solid #ECECEC;
   color: #333333 !important;

unpackage/dist/dev/mp-weixin/pages/auth/register.js

@@ -1,7 +1,7 @@
 "use strict";
-var common_vendor = require("../../common/vendor.js");
-var api_login = require("../../api/login.js");
-require("../../common/request.js");
+const common_vendor = require("../../common/vendor.js");
+const api_login = require("../../api/login.js");
+const common_assets = require("../../common/assets.js");
 const _sfc_main = {
   components: {},
   data() {
@@ -33,27 +33,27 @@ const _sfc_main = {
     doRegister() {
       if (this.$isEmpty(this.userName)) {
         common_vendor.index.showToast({
-          title: "\u8BF7\u8F93\u5165\u5E10\u53F7",
+          title: "请输入帐号",
           icon: "none"
         });
         return;
       }
       if (this.$isEmpty(this.password)) {
         common_vendor.index.showToast({
-          title: "\u8BF7\u8F93\u5165\u5BC6\u7801",
+          title: "请输入密码",
           icon: "none"
         });
         return;
       }
       if (this.password != this.password1) {
         common_vendor.index.showToast({
-          title: "\u4E24\u6B21\u5BC6\u7801\u8F93\u5165\u4E0D\u4E00\u81F4",
+          title: "两次密码输入不一致",
           icon: "none"
         });
       }
       if (!this.agree) {
         common_vendor.index.showToast({
-          title: "\u8BF7\u540C\u610F\u76F8\u5173\u534F\u8BAE",
+          title: "请同意相关协议",
           icon: "none"
         });
         return;
@@ -61,50 +61,59 @@ const _sfc_main = {
       var data = {
         phone: this.userName,
         password: this.password
+        // jpushId: this.registrationID || uni.getStorageSync("registrationID"),
+        // loginType: 1
       };
       common_vendor.index.showLoading({
-        title: "\u6CE8\u518C\u4E2D..."
+        title: "注册中..."
       });
-      api_login.register(data).then((res) => {
-        if (res.code == 200) {
-          console.log("\u6CE8\u518C\u597D\u4E86");
-          this.doLogin();
-        } else {
-          common_vendor.index.hideLoading();
-          common_vendor.index.showToast({
-            title: res.msg,
-            icon: "none"
-          });
+      api_login.register(data).then(
+        (res) => {
+          if (res.code == 200) {
+            console.log("注册好了");
+            this.doLogin();
+          } else {
+            common_vendor.index.hideLoading();
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
     doLogin() {
       var data = {
         phone: this.userName,
         password: this.password,
+        // jpushId: this.registrationID || uni.getStorageSync("registrationID"),
         loginType: 1
       };
-      api_login.loginByApp(data).then((res) => {
-        common_vendor.index.hideLoading();
-        if (res.code == 200) {
-          common_vendor.index.setStorageSync("AppToken", res.token);
-          common_vendor.index.setStorageSync("userInfo", JSON.stringify(res.user));
-          common_vendor.index.$emit("refreshIM");
-          common_vendor.index.$emit("showHealthButler");
-          common_vendor.index.reLaunch({
-            url: "/pages/list/index",
-            animationType: "pop-in",
-            animationDuration: 100
-          });
-        } else {
-          common_vendor.index.showToast({
-            title: res.msg,
-            icon: "none"
-          });
+      api_login.loginByApp(data).then(
+        (res) => {
+          common_vendor.index.hideLoading();
+          if (res.code == 200) {
+            common_vendor.index.setStorageSync("AppToken", res.token);
+            common_vendor.index.setStorageSync("userInfo", JSON.stringify(res.user));
+            common_vendor.index.$emit("refreshIM");
+            common_vendor.index.$emit("showHealthButler");
+            common_vendor.index.reLaunch({
+              url: "/pages/list/index",
+              animationType: "pop-in",
+              animationDuration: 100
+            });
+          } else {
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
     getRegistrationID() {
     },
@@ -128,12 +137,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     e: $data.password1,
     f: common_vendor.o(($event) => $data.password1 = $event.detail.value),
     g: common_vendor.o((...args) => $options.doRegister && $options.doRegister(...args)),
-    h: !$data.agree,
-    i: $data.agree,
-    j: common_vendor.o((...args) => $options.handleAgree && $options.handleAgree(...args)),
-    k: common_vendor.o(($event) => $options.goToWeb(0)),
-    l: common_vendor.o(($event) => $options.goToWeb(1))
+    h: common_assets._imports_0$4,
+    i: !$data.agree,
+    j: common_assets._imports_1$2,
+    k: $data.agree,
+    l: common_vendor.o((...args) => $options.handleAgree && $options.handleAgree(...args)),
+    m: common_vendor.o(($event) => $options.goToWeb(0)),
+    n: common_vendor.o(($event) => $options.goToWeb(1))
   };
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages/auth/register.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages/auth/register.wxml

@@ -1 +1 @@
-<view class="page"><view class="content"><view class="pageTop x-c"><view class="loginBox"><view class="login-item"><view class="input-account"><input placeholder="手机号" type="number" value="{{a}}" bindinput="{{b}}"/></view><view class="line"></view></view><view class="login-item"><view class="input-pwd"><input placeholder="密码(6-15个字符)" type="password" value="{{c}}" bindinput="{{d}}"/></view><view class="line"></view></view><view class="login-item"><view class="input-pwd"><input placeholder="确认密码" type="password" value="{{e}}" bindinput="{{f}}"/></view><view class="line"></view></view><view class="btns"><view class="login-btn" bindtap="{{g}}">注册</view></view></view><view class="checkbox"><view class="checkbox-icon" bindtap="{{j}}"><image src="/static/images/radio_default.png" hidden="{{!h}}"></image><image src="/static/images/radio_choose.png" hidden="{{!i}}"></image></view><view>我已阅读并同意<text bindtap="{{k}}">《用户协议》</text><text bindtap="{{l}}">《隐私政策》</text> 并使用本机号码登录 </view></view></view></view></view>
+<view class="page"><view class="content"><view class="pageTop x-c"><view class="loginBox"><view class="login-item"><view class="input-account"><input placeholder="手机号" type="number" value="{{a}}" bindinput="{{b}}"/></view><view class="line"></view></view><view class="login-item"><view class="input-pwd"><input placeholder="密码(6-15个字符)" type="password" value="{{c}}" bindinput="{{d}}"/></view><view class="line"></view></view><view class="login-item"><view class="input-pwd"><input placeholder="确认密码" type="password" value="{{e}}" bindinput="{{f}}"/></view><view class="line"></view></view><view class="btns"><view class="login-btn" bindtap="{{g}}">注册</view></view></view><view class="checkbox"><view class="checkbox-icon" bindtap="{{l}}"><image src="{{h}}" hidden="{{!i}}"></image><image src="{{j}}" hidden="{{!k}}"></image></view><view>我已阅读并同意<text bindtap="{{m}}">《用户协议》</text><text bindtap="{{n}}">《隐私政策》</text> 并使用本机号码登录 </view></view></view></view></view>

unpackage/dist/dev/mp-weixin/pages/games/index.js

@@ -1,5 +1,5 @@
 "use strict";
-var common_vendor = require("../../common/vendor.js");
+const common_vendor = require("../../common/vendor.js");
 const _sfc_main = {
   data() {
     return {};
@@ -9,5 +9,5 @@ const _sfc_main = {
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return {};
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages/games/index.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages/home/index.js

@@ -1,7 +1,7 @@
 "use strict";
-var common_vendor = require("../../common/vendor.js");
-var api_home = require("../../api/home.js");
-require("../../common/request.js");
+const common_vendor = require("../../common/vendor.js");
+const api_home = require("../../api/home.js");
+const common_assets = require("../../common/assets.js");
 const isWechat = () => {
   return String(navigator.userAgent.toLowerCase().match(/MicroMessenger/i)) === "micromessenger";
 };
@@ -14,7 +14,9 @@ const _sfc_main = {
       path: "http://live.ylrzcloud.com/prod-api",
       iskefu: false,
       isLongPress: false,
+      // 是否长按
       timeout: null,
+      // 计时器
       liveId: 2
     };
   },
@@ -36,14 +38,15 @@ const _sfc_main = {
         this.isLongPress = true;
         common_vendor.index.saveImageToPhotosAlbum({
           filePath: this.livedata.qwQrCode,
+          // 图片的本地路径或网络路径
           success: () => {
             common_vendor.index.showToast({
-              title: "\u4FDD\u5B58\u6210\u529F"
+              title: "保存成功"
             });
           },
           fail: () => {
             common_vendor.index.showToast({
-              title: "\u4FDD\u5B58\u5931\u8D25",
+              title: "保存失败",
               icon: "none"
             });
           }
@@ -88,34 +91,37 @@ const _sfc_main = {
         return;
       }
       common_vendor.index.showLoading({
-        title: "\u5904\u7406\u4E2D..."
+        title: "处理中..."
       });
       var data = {
         code: this.code
       };
-      api_home.loginByMp(data).then((res) => {
-        common_vendor.index.hideLoading();
-        if (res.code == 200) {
-          console.log(res);
-          common_vendor.index.setStorageSync("AppToken", res.token);
-          common_vendor.index.setStorageSync("userInfo", JSON.stringify(res.user));
-          let beforLoginUrl = common_vendor.index.getStorageSync("beforLoginPage");
-          common_vendor.index.reLaunch({
-            url: beforLoginUrl
-          });
-          common_vendor.index.showToast({
-            title: "\u767B\u5F55\u6210\u529F",
-            icon: "none"
-          });
-          this.getliving();
-        } else {
-          common_vendor.index.showToast({
-            title: res.msg,
-            icon: "none"
-          });
+      api_home.loginByMp(data).then(
+        (res) => {
+          common_vendor.index.hideLoading();
+          if (res.code == 200) {
+            console.log(res);
+            common_vendor.index.setStorageSync("AppToken", res.token);
+            common_vendor.index.setStorageSync("userInfo", JSON.stringify(res.user));
+            let beforLoginUrl = common_vendor.index.getStorageSync("beforLoginPage");
+            common_vendor.index.reLaunch({
+              url: beforLoginUrl
+            });
+            common_vendor.index.showToast({
+              title: "登录成功",
+              icon: "none"
+            });
+            this.getliving();
+          } else {
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
+          }
+        },
+        (err) => {
         }
-      }, (err) => {
-      });
+      );
     },
     getUrlCode() {
       var url = location.search;
@@ -137,7 +143,7 @@ const _sfc_main = {
         });
       } else {
         common_vendor.index.showToast({
-          title: "\u8BF7\u767B\u5F55\u6388\u6743\uFF01",
+          title: "请登录授权！",
           icon: "none"
         });
         common_vendor.index.navigateTo({
@@ -159,28 +165,29 @@ if (!Math) {
 }
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return {
-    a: $data.livedata.liveImgUrl,
-    b: common_vendor.t($data.livedata.liveName),
-    c: common_vendor.t($data.livedata.startTime),
-    d: common_vendor.t($data.livedata.finishTime),
-    e: $data.livedata.liveDesc,
-    f: common_vendor.o((...args) => $options.comelive && $options.comelive(...args)),
-    g: common_vendor.o(($event) => _ctx.showadd = !_ctx.showadd),
-    h: common_vendor.p({
+    a: common_assets._imports_0,
+    b: $data.livedata.liveImgUrl,
+    c: common_vendor.t($data.livedata.liveName),
+    d: common_vendor.t($data.livedata.startTime),
+    e: common_vendor.t($data.livedata.finishTime),
+    f: $data.livedata.liveDesc,
+    g: common_vendor.o((...args) => $options.comelive && $options.comelive(...args)),
+    h: common_vendor.o(($event) => _ctx.showadd = !_ctx.showadd),
+    i: common_vendor.p({
       name: "close",
       size: "18"
     }),
-    i: _ctx.codeimg,
-    j: common_vendor.o((...args) => $options.longPress && $options.longPress(...args)),
-    k: common_vendor.o((...args) => $options.cancelLongPress && $options.cancelLongPress(...args)),
-    l: common_vendor.o($options.close),
-    m: common_vendor.o($options.open),
-    n: common_vendor.p({
+    j: _ctx.codeimg,
+    k: common_vendor.o((...args) => $options.longPress && $options.longPress(...args)),
+    l: common_vendor.o((...args) => $options.cancelLongPress && $options.cancelLongPress(...args)),
+    m: common_vendor.o($options.close),
+    n: common_vendor.o($options.open),
+    o: common_vendor.p({
       show: $data.iskefu,
       round: "20rpx",
       bgColor: "#fffee1"
     })
   };
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-71e217db"], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages/home/index.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-4978fed5"]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages/home/index.wxml

@@ -1 +1 @@
-<view class="home column data-v-71e217db"><view class="justify-start align-center data-v-71e217db"><image src="/static/images/shipin.png" class="wh50 p20 data-v-71e217db"></image><view class="fs32 bold data-v-71e217db">道中</view></view><image src="{{a}}" mode="widthFix" class="w100 data-v-71e217db"></image><view class="p20 data-v-71e217db"><view class="column data-v-71e217db"><text class="fs32 data-v-71e217db">{{b}}</text><text class="color9 fs24 mt20 data-v-71e217db"> 直播时间 {{c}} —— {{d}}</text></view></view><view class="p20 detail data-v-71e217db"><view class="jianjie mb20 data-v-71e217db">简介</view><view class="fs24 lh36 data-v-71e217db"><rich-text class="data-v-71e217db" nodes="{{e}}"/></view></view><view class="p12 bgf bot-box data-v-71e217db"><view class="center data-v-71e217db" bindtap="{{f}}">进入直播间</view></view><u-popup wx:if="{{n}}" class="data-v-71e217db" u-s="{{['d']}}" bindclose="{{l}}" bindopen="{{m}}" u-i="71e217db-0" bind:__l="__l" u-p="{{n}}"><view class="addchat p20 data-v-71e217db"><view class="u-flex-row-reverse u-flex data-v-71e217db"><u-icon wx:if="{{h}}" class="data-v-71e217db" bindclick="{{g}}" u-i="71e217db-1,71e217db-0" bind:__l="__l" u-p="{{h}}"></u-icon></view><view class="column align-center data-v-71e217db"><view class="fs36 data-v-71e217db" style="color:#ff5c03">扫码添加助教老师</view><view class="fs28 color6 data-v-71e217db">扫码添加助教老师</view><view class="p10 mt40 data-v-71e217db" style="border:#ff5c03 solid 2rpx"><image src="{{i}}" class="wh180 data-v-71e217db" bindtouchstart="{{j}}" bindtouchend="{{k}}"></image></view><view class="color6 mt20 data-v-71e217db">长按识别二维码</view></view></view></u-popup></view>
+<view class="home column data-v-4978fed5"><view class="justify-start align-center data-v-4978fed5"><image src="{{a}}" class="wh50 p20 data-v-4978fed5"></image><view class="fs32 bold data-v-4978fed5">道中</view></view><image src="{{b}}" mode="widthFix" class="w100 data-v-4978fed5"></image><view class="p20 data-v-4978fed5"><view class="column data-v-4978fed5"><text class="fs32 data-v-4978fed5">{{c}}</text><text class="color9 fs24 mt20 data-v-4978fed5"> 直播时间 {{d}} —— {{e}}</text></view></view><view class="p20 detail data-v-4978fed5"><view class="jianjie mb20 data-v-4978fed5">简介</view><view class="fs24 lh36 data-v-4978fed5"><rich-text class="data-v-4978fed5" nodes="{{f}}"/></view></view><view class="p12 bgf bot-box data-v-4978fed5"><view class="center data-v-4978fed5" bindtap="{{g}}">进入直播间</view></view><u-popup wx:if="{{o}}" class="data-v-4978fed5" u-s="{{['d']}}" bindclose="{{m}}" bindopen="{{n}}" u-i="4978fed5-0" bind:__l="__l" u-p="{{o}}"><view class="addchat p20 data-v-4978fed5"><view class="u-flex-row-reverse u-flex data-v-4978fed5"><u-icon wx:if="{{i}}" class="data-v-4978fed5" bindclick="{{h}}" u-i="4978fed5-1,4978fed5-0" bind:__l="__l" u-p="{{i}}"></u-icon></view><view class="column align-center data-v-4978fed5"><view class="fs36 data-v-4978fed5" style="color:#ff5c03">扫码添加助教老师</view><view class="fs28 color6 data-v-4978fed5">扫码添加助教老师</view><view class="p10 mt40 data-v-4978fed5" style="border:#ff5c03 solid 2rpx"><image src="{{j}}" class="wh180 data-v-4978fed5" bindtouchstart="{{k}}" bindtouchend="{{l}}"></image></view><view class="color6 mt20 data-v-4978fed5">长按识别二维码</view></view></view></u-popup></view>

unpackage/dist/dev/mp-weixin/pages/home/index.wxss

@@ -24,25 +24,25 @@
 /* 透明度 */
 /* 文章场景相关 */
 /*自定义主题色 */
-page.data-v-71e217db {
+page.data-v-4978fed5 {
   background-color: #fff;
 }
-.jianjie.data-v-71e217db {
+.jianjie.data-v-4978fed5 {
   font-size: 32rpx;
   width: -webkit-fit-content;
   width: fit-content;
   border-bottom: #2962FE solid 4rpx;
 }
-.detail.data-v-71e217db {
+.detail.data-v-4978fed5 {
   border-top: solid #f5f5f5 12rpx;
 }
-.bot-box.data-v-71e217db {
+.bot-box.data-v-4978fed5 {
   border-top: #f5f5f5 solid 2rpx;
   position: fixed;
   bottom: 0;
   width: 100%;
 }
-.bot-box view.data-v-71e217db {
+.bot-box view.data-v-4978fed5 {
   width: 80%;
   margin: 0 auto;
   height: 80rpx;
@@ -52,6 +52,6 @@ page.data-v-71e217db {
   color: #fff;
   border-radius: 100rpx;
 }
-.addchat.data-v-71e217db {
+.addchat.data-v-4978fed5 {
   height: 450rpx;
 }

unpackage/dist/dev/mp-weixin/pages/home/live.js

@@ -1,7 +1,7 @@
 "use strict";
-var common_vendor = require("../../common/vendor.js");
-var api_home = require("../../api/home.js");
-require("../../common/request.js");
+const common_vendor = require("../../common/vendor.js");
+const api_home = require("../../api/home.js");
+const common_assets = require("../../common/assets.js");
 var wsUrl = "ws://192.168.10.170:7114/app/webSocket";
 var pingpangTimes = null;
 var isSocketOpen = false;
@@ -9,36 +9,47 @@ var socket = null;
 const _sfc_main = {
   data() {
     return {
-      icon: "\u516C\u544A:",
-      icon2: "\u5E7F\u64AD:",
-      text1: "\u7EC4\u4EF6\u529F\u80FD\u4E30\u5BCC\u591A\u7AEF\u517C\u5BB9\u8BA9\u60A8\u5FEB\u901F\u96C6\u6210\u5F00\u7BB1\u5373\u7528",
-      text2: "\u4E30\u5BCC\u591A\u7AEF\u517C\u5BB9\u8BA9\u60A8\u5FEB\u901F\u96C6\u6210\u5F00\u7BB1\u5373\u7528",
+      icon: "公告:",
+      icon2: "广播:",
+      text1: "组件功能丰富多端兼容让您快速集成开箱即用",
+      text2: "丰富多端兼容让您快速集成开箱即用",
       srcAvatar: "",
       acttab: 0,
       value: "",
       talkdisabled: false,
-      placeholderText: "\u8BF7\u8F93\u5165\u5185\u5BB9",
+      //是否禁用
+      placeholderText: "请输入内容",
       showadd: false,
       autoplay: true,
+      //自动播放
       userinfo: "",
+      //用户信息
       path: "http://192.168.10.170/dev-api",
       livedata: {},
       bufferRate: 0,
+      // 缓冲时间
       playDuration: 0,
+      //视频播放时间
       videoContext: "",
-      thistime: common_vendor.index.$u.timeFormat(new Date(), "yyyy-mm-dd hh:MM:ss"),
+      thistime: common_vendor.index.$u.timeFormat(/* @__PURE__ */ new Date(), "yyyy-mm-dd hh:MM:ss"),
       codeimg: "",
       userid: "4",
       liveId: "5",
       upDown: true,
+      //是否视频显示隐藏
       isLongPress: false,
+      // 是否长按
       timeout: null,
+      // 计时器
       list1: [
         {
-          name: "\u8BA8\u8BBA"
+          name: "讨论"
         },
+        // {
+        // 	name: '问答'
+        // },
         {
-          name: "\u8D44\u6599"
+          name: "资料"
         }
       ],
       talklist: [],
@@ -88,14 +99,15 @@ const _sfc_main = {
         this.isLongPress = true;
         common_vendor.index.saveImageToPhotosAlbum({
           filePath: this.livedata.qwQrCode,
+          // 图片的本地路径或网络路径
           success: () => {
             common_vendor.index.showToast({
-              title: "\u4FDD\u5B58\u6210\u529F"
+              title: "保存成功"
             });
           },
           fail: () => {
             common_vendor.index.showToast({
-              title: "\u4FDD\u5B58\u5931\u8D25",
+              title: "保存失败",
               icon: "none"
             });
           }
@@ -120,7 +132,7 @@ const _sfc_main = {
             this.videoContext.seek(this.livedata.nowDuration);
           } else {
             this.autoplay = false;
-            this.placeholderText = "\u76F4\u64AD\u5F00\u59CB\u624D\u80FD\u53D1\u8A00\u8BA8\u8BBA";
+            this.placeholderText = "直播开始才能发言讨论";
             this.talkdisabled = true;
           }
         } else {
@@ -178,6 +190,9 @@ const _sfc_main = {
     initSocket() {
       var that = this;
       socket = common_vendor.index.connectSocket({
+        // url: wsUrl+"?userId=40486&liveId=2",
+        // url: wsUrl + "?userId=" + this.userid + "&liveId=" + 
+        // this.liveId+"&AppToken="+'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI0IiwiaWF0IjoxNzQwNzIxMDQ1LCJleHAiOjE3NDEzMjU4NDV9.PgS83JTMSJgVFD6vGAhUsEPbS6Az4yMyX8wVug61TZNTB3092CtvANo-AB9ZG4NdSBLgLrf4litM3vvTk-FK0g',
         url: wsUrl + "?userId=666&liveId=777&AppToken=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI2NjYiLCJpYXQiOjE3NTE4NzQ0NzEsImV4cCI6MTc4MzQxMDQ3MX0.3uxTTb0qXygmaY9ItovMclxJCNhNEi6kFEqmfLGg4lP2PYzCPODsVjW4PjXNu6EYsl5eYyESltHWcwBnaNkilQ&signature=ff21bfb41ddd5f2e31d6f5bf32ec565aab9c518614d139fa26727468ce701237&userType=0&timestamp=666",
         multiple: true,
         success: (res) => {
@@ -209,18 +224,18 @@ const _sfc_main = {
       });
       common_vendor.index.onSocketOpen(() => {
         isSocketOpen = true;
-        console.log("WebSocket\u8FDE\u63A5\u5DF2\u6253\u5F00\uFF01!");
+        console.log("WebSocket连接已打开！!");
         common_vendor.index.showToast({
-          title: "\u63D2\u4EF6\u5DF2\u6253\u5F00",
+          title: "插件已打开",
           icon: "none"
         });
       });
       common_vendor.index.onSocketClose(() => {
         isSocketOpen = false;
         clearInterval(pingpangTimes);
-        console.log("WebSocket\u8FDE\u63A5\u5DF2\u5173\u95ED\uFF01");
+        console.log("WebSocket连接已关闭！");
         common_vendor.index.showToast({
-          title: "\u63D2\u4EF6\u79BB\u7EBF",
+          title: "插件离线",
           icon: "none"
         });
         that.reConnect();
@@ -228,13 +243,13 @@ const _sfc_main = {
       common_vendor.index.onSocketError(() => {
         isSocketOpen = false;
         clearInterval(pingpangTimes);
-        console.log("WebSocket\u8FDE\u63A5\u6253\u5F00\u5931\u8D25");
+        console.log("WebSocket连接打开失败");
         common_vendor.index.showToast({
-          title: "\u63D2\u4EF6\u79BB\u7EBF",
+          title: "插件离线",
           icon: "none"
         });
         common_vendor.index.showModal({
-          content: "\u804A\u5929\u8FDE\u63A5\u5931\u8D25\u662F\u5426\u91CD\u65B0\u5C1D\u8BD5\u8FDE\u63A5",
+          content: "聊天连接失败是否重新尝试连接",
           success() {
             that.reConnect();
           }
@@ -254,18 +269,18 @@ const _sfc_main = {
         };
         if (this.value == "") {
           common_vendor.index.showToast({
-            title: "\u4E0D\u80FD\u53D1\u9001\u7A7A\u6D88\u606F",
+            title: "不能发送空消息",
             icon: "none"
           });
         } else {
           socket.send({
             data: JSON.stringify(data),
             success: () => {
-              console.log("\u53D1\u9001\u6210\u529F");
+              console.log("发送成功");
               this.value = "";
             },
             fail: () => {
-              console.log("\u53D1\u9001\u5931\u8D25");
+              console.log("发送失败");
             }
           });
         }
@@ -311,15 +326,17 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       itemStyle: "width:120rpx;height: 80rpx;"
     }),
     k: common_vendor.o(($event) => $options.getliving()),
-    l: $data.upDown,
-    m: common_vendor.o(($event) => $data.upDown = !$data.upDown),
-    n: !$data.upDown,
-    o: common_vendor.o(($event) => $data.upDown = !$data.upDown),
-    p: $data.acttab == 0
+    l: common_assets._imports_0$3,
+    m: $data.upDown,
+    n: common_vendor.o(($event) => $data.upDown = !$data.upDown),
+    o: common_assets._imports_1$1,
+    p: !$data.upDown,
+    q: common_vendor.o(($event) => $data.upDown = !$data.upDown),
+    r: $data.acttab == 0
   }, $data.acttab == 0 ? common_vendor.e({
-    q: common_vendor.f($data.talklist, (item, index, i0) => {
+    s: common_vendor.f($data.talklist, (item, index, i0) => {
       return common_vendor.e({
-        a: "281d25f3-1-" + i0,
+        a: "81fcd0c9-1-" + i0,
         b: common_vendor.p({
           src: item.avatar,
           size: "30"
@@ -335,9 +352,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         i: item.cmd == "sendMsg"
       });
     }),
-    r: $data.showWelcomeMessage
+    t: $data.showWelcomeMessage
   }, $data.showWelcomeMessage ? {
-    s: common_vendor.f($data.talklist, (item, index, i0) => {
+    v: common_vendor.f($data.talklist, (item, index, i0) => {
       return common_vendor.e({
         a: item.userType == 1
       }, item.userType == 1 ? {} : {}, {
@@ -349,39 +366,40 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       });
     })
   } : {}, {
-    t: $data.scrollIntoView,
-    v: common_vendor.o(($event) => $data.value = $event),
-    w: common_vendor.p({
+    w: $data.scrollIntoView,
+    x: common_vendor.o(($event) => $data.value = $event),
+    y: common_vendor.p({
       placeholder: $data.placeholderText,
       border: "none",
       customStyle: "background:#f1f7f7;padding:12rpx;padding-left:40rpx",
       shape: "circle",
       modelValue: $data.value
     }),
-    x: common_vendor.o((...args) => $options.sendMsg && $options.sendMsg(...args))
+    z: common_vendor.o((...args) => $options.sendMsg && $options.sendMsg(...args))
   }) : {}, {
-    y: $data.acttab == 1
+    A: $data.acttab == 1
   }, $data.acttab == 1 ? {
-    z: $data.livedata.liveDesc,
-    A: !$data.livedata.liveDesc
+    B: $data.livedata.liveDesc,
+    C: !$data.livedata.liveDesc
   } : {}, {
-    B: common_vendor.o((...args) => $options.addwechat && $options.addwechat(...args)),
-    C: common_vendor.o(($event) => $data.showadd = !$data.showadd),
-    D: common_vendor.p({
+    D: common_assets._imports_2$1,
+    E: common_vendor.o((...args) => $options.addwechat && $options.addwechat(...args)),
+    F: common_vendor.o(($event) => $data.showadd = !$data.showadd),
+    G: common_vendor.p({
       name: "close",
       size: "18"
     }),
-    E: $data.codeimg,
-    F: common_vendor.o((...args) => $options.longPress && $options.longPress(...args)),
-    G: common_vendor.o((...args) => $options.cancelLongPress && $options.cancelLongPress(...args)),
-    H: common_vendor.o($options.close),
-    I: common_vendor.o($options.open),
-    J: common_vendor.p({
+    H: $data.codeimg,
+    I: common_vendor.o((...args) => $options.longPress && $options.longPress(...args)),
+    J: common_vendor.o((...args) => $options.cancelLongPress && $options.cancelLongPress(...args)),
+    K: common_vendor.o($options.close),
+    L: common_vendor.o($options.open),
+    M: common_vendor.p({
       show: $data.showadd,
       round: "20rpx",
       bgColor: "#fffee1"
     })
   });
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-281d25f3"], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages/home/live.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-81fcd0c9"]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages/home/live.wxss

@@ -24,7 +24,7 @@
 /* 透明度 */
 /* 文章场景相关 */
 /*自定义主题色 */
-.welcome-message.data-v-281d25f3 {
+.welcome-message.data-v-81fcd0c9 {
   position: fixed;
   width: 100%;
   bottom: 120rpx;
@@ -33,11 +33,11 @@
   color: #666;
   padding: 10px 20px;
   border-radius: 20px;
-  animation: fadeOut-281d25f3 1s ease 1s forwards;
+  animation: fadeOut-81fcd0c9 1s ease 1s forwards;
   /* 1秒后开始淡出 */
   z-index: 1000;
 }
-@keyframes fadeOut-281d25f3 {
+@keyframes fadeOut-81fcd0c9 {
 from {
     opacity: 1;
 }
@@ -45,16 +45,16 @@ to {
     opacity: 0;
 }
 }
-.live.data-v-281d25f3 {
+.live.data-v-81fcd0c9 {
   height: 100%;
   overflow: hidden;
 }
-.list.data-v-281d25f3 {
+.list.data-v-81fcd0c9 {
   width: 80%;
   margin-bottom: 20rpx;
-  animation: xxxawdawd-281d25f3 0.2s;
+  animation: xxxawdawd-81fcd0c9 0.2s;
 }
-@keyframes xxxawdawd-281d25f3 {
+@keyframes xxxawdawd-81fcd0c9 {
 from {
     margin-top: 0rpx;
     opacity: 0;
@@ -64,17 +64,17 @@ to {
     opacity: 1;
 }
 }
-.vedio.data-v-281d25f3 {
+.vedio.data-v-81fcd0c9 {
   height: 500rpx;
   width: 100%;
   background-color: rgba(0, 0, 0, 0.6);
   position: relative;
 }
-.videotop.data-v-281d25f3 {
+.videotop.data-v-81fcd0c9 {
   width: 100%;
   height: 100%;
 }
-.popup-video.data-v-281d25f3 {
+.popup-video.data-v-81fcd0c9 {
   position: absolute;
   top: 0;
   height: 500rpx;
@@ -86,7 +86,7 @@ to {
   color: #fff;
   background-color: rgba(0, 0, 0, 0.6);
 }
-.popup-video .more.data-v-281d25f3 {
+.popup-video .more.data-v-81fcd0c9 {
   background-color: #3280fe;
   border-radius: 80rpx;
   width: 280rpx;
@@ -94,24 +94,24 @@ to {
   height: 60rpx;
   line-height: 60rpx;
 }
-.textscll.data-v-281d25f3 {
+.textscll.data-v-81fcd0c9 {
   position: absolute;
   top: 0;
   z-index: 999;
 }
-.reflash.data-v-281d25f3 {
+.reflash.data-v-81fcd0c9 {
   border: 2rpx solid #888;
   border-radius: 80rpx;
   padding: 4rpx 16rpx;
   color: #888;
 }
-.talktext.data-v-281d25f3 {
+.talktext.data-v-81fcd0c9 {
   border-radius: 8rpx;
 }
-.talktext view.data-v-281d25f3 {
+.talktext view.data-v-81fcd0c9 {
   width: 100%;
 }
-.bot_talk.data-v-281d25f3 {
+.bot_talk.data-v-81fcd0c9 {
   width: calc(100% - 40rpx);
   display: flex;
   justify-content: space-between;
@@ -120,7 +120,7 @@ to {
   bottom: 0;
   padding: 20rpx;
 }
-.bot_talk .sent.data-v-281d25f3 {
+.bot_talk .sent.data-v-81fcd0c9 {
   width: 120rpx;
   text-align: center;
   height: 60rpx;
@@ -130,7 +130,7 @@ to {
   border-radius: 40rpx;
   font-size: 24rpx;
 }
-.invite-member.data-v-281d25f3 {
+.invite-member.data-v-81fcd0c9 {
   height: 55px;
   width: 50px;
   position: fixed;
@@ -138,10 +138,10 @@ to {
   right: 10px;
   cursor: pointer;
 }
-.invite-member .weimg.data-v-281d25f3 {
+.invite-member .weimg.data-v-81fcd0c9 {
   position: relative;
 }
-.invite-member .addwe.data-v-281d25f3 {
+.invite-member .addwe.data-v-81fcd0c9 {
   position: absolute;
   left: -7%;
   bottom: 4rpx;
@@ -151,6 +151,6 @@ to {
   border-radius: 20rpx;
   padding: 4rpx 12rpx;
 }
-.addchat.data-v-281d25f3 {
+.addchat.data-v-81fcd0c9 {
   height: 450rpx;
 }

unpackage/dist/dev/mp-weixin/pages/home/living.js

@@ -1,11 +1,10 @@
 "use strict";
-var common_vendor = require("../../common/vendor.js");
-var api_live = require("../../api/live.js");
+const common_vendor = require("../../common/vendor.js");
+const api_live = require("../../api/live.js");
 require("../../api/order.js");
-var api_home = require("../../api/home.js");
-var common_assets = require("../../common/assets.js");
-require("../../common/request.js");
-var wsUrl = "ws://nd383294.natappfree.cc/app/webSocket";
+const api_home = require("../../api/home.js");
+const common_assets = require("../../common/assets.js");
+var wsUrl = "ws://live.test.ylrztop.com/prod-api/app/webSocket";
 var pingpangTimes = null;
 var isSocketOpen = false;
 var socket = null;
@@ -13,67 +12,131 @@ const _sfc_main = {
   data() {
     return {
       boxHeight: 300,
+      //小黄车高度
       isFollow: true,
       liveViewData: {},
       liveViewers: [],
+      //观众
       likeName: 0,
       hlsPlayer: null,
+      // HLS播放器实例,
       livingUrl: "",
       products: {},
       store: {},
       orderUser: {},
+      //正在购买
       userType: 0,
       timestamp: "",
       liveId: null,
+      // userId: uni.getStorageSync("userInfo.userId"),
       livedata: {},
       codeimg: "",
-      placeholderText: "\u8BF4\u70B9\u4EC0\u4E48...",
+      placeholderText: "说点什么...",
       isZoom: false,
+      //点赞按钮控制是否放大
       userinfo: "",
-      path: "http://v56c9b8e.natappfree.cc",
+      //用户信息
+      // path: 'http://192.168.10.166/dev-api', //余红奇
+      // path: 'http://v56c9b8e.natappfree.cc', //余红奇
+      path: "live.test.ylrztop.com/prod-api",
+      //余红奇
+      // path: 'http://192.168.10.170/dev-api', //陈果
       value: "",
       talkdisabled: false,
+      //输入框是否禁用
       autoplay: false,
+      //视频自动播放
       showadd: false,
       talklist: [],
       scrollIntoView: "",
       bufferRate: 0,
+      //视频缓冲时间
       playDuration: 0,
+      //视频播放时间
       videoContext: "",
-      thistime: common_vendor.index.$u.timeFormat(new Date(), "yyyy-mm-dd hh:MM:ss"),
+      thistime: common_vendor.index.$u.timeFormat(/* @__PURE__ */ new Date(), "yyyy-mm-dd hh:MM:ss"),
       upDown: true,
+      //是否视频显示隐藏
       isLongPress: false,
+      // 是否长按
       timeout: null,
+      // 计时器
       showWelcomeMessage: false,
       isSubmit: false,
       messageContent: "",
       showziliao: false,
       isScreen: true,
       showAnswer: false,
+      //展示答题
       Answerlistall: {},
+      //所有题目
       answerlist: {},
+      //当前题目
       answerfrist: 0,
+      //当前选择
       checkboxValue: [],
+      //多选数据
       checkboxFormValue: "",
+      //多选数据
       allAnswerLists: [],
+      // 新增：存储所有题目列表
       showAnswerred: false,
+      //展示红包答题
       answerbtn: false,
+      //答题按钮弹窗
       redallAnswerLists: [],
+      //储存所有红包答题列表
       redanswerAll: [],
+      //红包当前题目
       redanswerList: [],
+      //红包答题列表
       redanswertips: [],
+      //红包答题提示
       shopping: false,
+      //小黄车弹窗
       scrollTop: 0,
+      //弹幕
       old: {
         scrollTop: 0
       },
       liveData: {}
+      //直播间点赞、关注、在线人数数据
+      // shopList: [{
+      // 	title: '史士昊老师四神汤健脾消食疗法',
+      // 	details: '看它来喘口气，小小震撼，',
+      // 	people: '45708 '
+      // },{
+      // 	title: '史士昊老师四神汤健脾消食疗法',
+      // 	details: '看它来喘口气，小小震撼，',
+      // 	people: '45708 '
+      // }],
+      // chatList: [{
+      // 		lable: '达人',
+      // 		name: '锅巴',
+      // 		txt: '中医调节身体确实'
+      // 	},
+      // 	{
+      // 		lable: '',
+      // 		name: '从芯开始',
+      // 		txt: '来了'
+      // 	}
+      // 	{
+      // 		lable: '',
+      // 		name: '北京的帅小伙：',
+      // 		txt: '来了来了，上茶'
+      // 	},
+      // 	{
+      // 		lable: '',
+      // 		name: '萍萍',
+      // 		txt: '来了'
+      // 	}
+      // ]
     };
   },
   onLoad(options) {
     if (options.liveId) {
       this.liveId = options.liveId;
-      console.log("\u63A5\u6536\u5230\u7684liveId:", this.liveId);
+      console.log("接收到的liveId:", this.liveId);
     }
   },
   computed: {
@@ -81,6 +144,11 @@ const _sfc_main = {
       return this.liveViewers.slice(0, 3);
     }
   },
+  // computed: {
+  // 	 userId() {
+  // 	       return this.$store.state.user.userId
+  // 	     }
+  // },
   mounted() {
     this.getliveViewData();
     this.intervalId = setInterval(() => {
@@ -121,11 +189,13 @@ const _sfc_main = {
         url: "/pages_shop/store?liveId=" + this.liveId
       });
     },
+    // 去订单列表
     goOrderList() {
       common_vendor.index.navigateTo({
         url: "/pages_shop/order"
       });
     },
+    // 初始化HLS播放器
     initHlsPlayer() {
       if (common_vendor.Hls.isSupported() && this.livingUrl) {
         const video = document.getElementById("myVideo");
@@ -139,8 +209,9 @@ const _sfc_main = {
         }
       }
     },
+    // 视频错误处理
     videoError(e) {
-      console.error("\u89C6\u9891\u64AD\u653E\u9519\u8BEF:", e.detail.errMsg);
+      console.error("视频播放错误:", e.detail.errMsg);
       if (this.livingUrl) {
         setTimeout(() => {
           this.videoContext.play();
@@ -171,7 +242,7 @@ const _sfc_main = {
               this.getLiveinformation();
             } else {
               this.autoplay = false;
-              this.placeholderText = "\u76F4\u64AD\u5F00\u59CB\u624D\u80FD\u53D1\u8A00\u8BA8\u8BBA";
+              this.placeholderText = "直播开始才能发言讨论";
               this.talkdisabled = true;
             }
           }
@@ -194,109 +265,139 @@ const _sfc_main = {
       const decimalPart = Math.abs(num).toFixed(precision).split(".")[1];
       return (decimalPart == null ? void 0 : decimalPart.replace(/0+$/, "")) || "";
     },
+    // 返回上一个页面并关闭WebSocket
     goBack() {
       common_vendor.index.navigateBack();
       closeWebSocket();
     },
+    // // 收藏商品
+    // collectProducts(){
+    // },
+    //直播间点赞、关注、在线人数数据
     getliveViewData() {
-      api_live.getLiveViewData(this.liveId).then((res) => {
-        if (res.code == 200) {
-          this.liveViewData = res;
-        } else {
-          common_vendor.index.showToast({
-            title: res.msg,
-            icon: "none"
-          });
+      api_live.getLiveViewData(this.liveId).then(
+        (res) => {
+          if (res.code == 200) {
+            this.liveViewData = res;
+          } else {
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
+    //正在购买
     getliveOrder() {
-      api_live.liveOrderUser(this.liveId).then((res) => {
-        if (res.code == 200) {
-          console.log("\u6B63\u5728\u8D2D\u4E70>>>>", res);
-          this.orderUser = res;
-        } else {
-          common_vendor.index.showToast({
-            title: res.msg,
-            icon: "none"
-          });
+      api_live.liveOrderUser(this.liveId).then(
+        (res) => {
+          if (res.code == 200) {
+            console.log("正在购买>>>>", res);
+            this.orderUser = res;
+          } else {
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
+    //小黄车 店铺展示
     getliveStore() {
       let data = {
         pageSize: 10,
         page: 1
       };
-      api_live.liveStore(this.liveId, data).then((res) => {
-        if (res.code == 200) {
-          console.log("\u5C0F\u9EC4\u8F66 \u5E97\u94FA\u5C55\u793A>>>>", res);
-          this.products = res.data;
-        } else {
-          common_vendor.index.showToast({
-            title: res.msg,
-            icon: "none"
-          });
+      api_live.liveStore(this.liveId, data).then(
+        (res) => {
+          if (res.code == 200) {
+            console.log("小黄车 店铺展示>>>>", res);
+            this.products = res.data;
+          } else {
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
+    // 获取直播间信息接口
     getLiveinformation() {
-      api_live.getLiveInfo(this.liveId).then((res) => {
-        if (res.code == 200) {
-          console.log("\u83B7\u53D6\u76F4\u64AD\u95F4\u4FE1\u606F\u63A5\u53E3>>>>", res);
-          this.livingUrl = res.livingUrl;
-        } else {
-          common_vendor.index.showToast({
-            title: res.msg,
-            icon: "none"
-          });
+      api_live.getLiveInfo(this.liveId).then(
+        (res) => {
+          if (res.code == 200) {
+            console.log("获取直播间信息接口>>>>", res);
+            this.livingUrl = res.livingUrl;
+          } else {
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
+    // 获取直播间用户
     getliveUser() {
-      api_live.getRecentLiveViewers(this.liveId).then((res) => {
-        if (res.code == 200) {
-          console.log("\u83B7\u53D6\u76F4\u64AD\u95F4\u7528\u6237>>>>", res);
-          this.liveViewers = res.recentLiveViewers;
-        } else {
-          common_vendor.index.showToast({
-            title: res.msg,
-            icon: "none"
-          });
+      api_live.getRecentLiveViewers(this.liveId).then(
+        (res) => {
+          if (res.code == 200) {
+            console.log("获取直播间用户>>>>", res);
+            this.liveViewers = res.recentLiveViewers;
+          } else {
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
+    // 点赞
     onLike() {
-      api_live.liveDataLike(this.liveId).then((res) => {
-        if (res.code == 200) {
-          if (typeof res.msg === "number" || typeof res.msg === "string" && /^\d+$/.test(res.msg.trim())) {
-            this.liveData++;
+      api_live.liveDataLike(this.liveId).then(
+        (res) => {
+          if (res.code == 200) {
+            if (typeof res.msg === "number" || typeof res.msg === "string" && /^\d+$/.test(res.msg.trim())) {
+              this.liveData++;
+            } else {
+              common_vendor.index.showToast({
+                title: res.msg,
+                icon: "none"
+              });
+            }
           } else {
             common_vendor.index.showToast({
               title: res.msg,
               icon: "none"
             });
           }
-        } else {
-          common_vendor.index.showToast({
-            title: res.msg,
-            icon: "none"
-          });
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
+    // 去购买,跳商品详情
     goShop(item) {
-      console.log("\u53BB\u8D2D\u4E70,\u8DF3\u5546\u54C1\u8BE6\u60C5", item);
+      console.log("去购买,跳商品详情", item);
       common_vendor.index.navigateTo({
         url: "/pages_shop/goods?productId=" + item + "&liveId=" + this.liveId
       });
     },
+    // 收藏
     onCollect(item) {
       console.log("item>>>", item.productId);
       common_vendor.index.setStorageSync("storeId", storeId);
@@ -305,32 +406,47 @@ const _sfc_main = {
         productId: item.productId,
         storeId: this.store.storeId
       };
-      api_live.collectStore(data).then((res) => {
-        if (res.code == 200) {
-          console.log("\u6536\u85CFlcollectStore>>>>", res);
-        } else {
+      api_live.collectStore(data).then(
+        (res) => {
+          if (res.code == 200) {
+            console.log("收藏lcollectStore>>>>", res);
+          } else {
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
+          }
+        },
+        (rej) => {
+        }
+      );
+    },
+    // 关注
+    onFollow() {
+      api_live.follow(this.liveId).then(
+        (res) => {
+          this.isFollow = !this.isFollow;
           common_vendor.index.showToast({
             title: res.msg,
             icon: "none"
           });
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
-    },
-    onFollow() {
-      api_live.follow(this.liveId).then((res) => {
-        this.isFollow = !this.isFollow;
-        common_vendor.index.showToast({
-          title: res.msg,
-          icon: "none"
-        });
-      }, (rej) => {
-      });
+      );
     },
     initTime() {
-      const now = new Date();
+      const now = /* @__PURE__ */ new Date();
       this.timestamp = now.getTime();
     },
+    // initWebSocket() {
+    //       const liveWS = new LiveWS('ws://your-server.com', 123, 456);
+    //       // 从 URL 中解析 timestamp
+    //       const urlParams = new URL(liveWS.url).searchParams;
+    //       this.timestamp = urlParams.get('timestamp');
+    //       // console.log('Timestamp:', timestamp);
+    //     },
+    // 弹幕滚动
     lowerChat: function(e) {
       console.log(e);
     },
@@ -340,6 +456,7 @@ const _sfc_main = {
     },
     loadmore() {
     },
+    // 弹幕
     scrollchat() {
     },
     noredanswer() {
@@ -347,7 +464,7 @@ const _sfc_main = {
         this.showAnswer = !this.this.showAnswer;
       } else {
         common_vendor.index.showToast({
-          title: "\u6682\u65E0\u9898\u76EE",
+          title: "暂无题目",
           icon: "none"
         });
       }
@@ -377,7 +494,7 @@ const _sfc_main = {
           this.answerlist.content = JSON.parse(this.answerlist.content);
         } else {
           common_vendor.index.showToast({
-            title: "\u5DF2\u662F\u6700\u540E\u4E00\u9898",
+            title: "已是最后一题",
             icon: "none"
           });
           this.showAnswer = false;
@@ -462,6 +579,7 @@ const _sfc_main = {
     closeanswer() {
       this.answerbtn = !this.answerbtn;
     },
+    // 关闭小黄车
     closeshop() {
       this.shopping = !this.shopping;
     },
@@ -470,9 +588,10 @@ const _sfc_main = {
         this.isLongPress = true;
         common_vendor.index.saveImageToPhotosAlbum({
           filePath: this.livedata.qwQrCode,
+          // 图片的本地路径或网络路径
           success: () => {
             common_vendor.index.showToast({
-              title: "\u4FDD\u5B58\u6210\u529F"
+              title: "保存成功"
             });
           },
           fail: () => {
@@ -488,12 +607,41 @@ const _sfc_main = {
       clearTimeout(this.timeout);
       this.isLongPress = false;
     },
+    // 触摸开始
     handleTouchStart() {
       this.isZoom = true;
     },
+    // 触摸结束
     handleTouchEnd() {
       this.isZoom = false;
     },
+    // getliving() {
+    // 	const param = {
+    // 		id: this.liveId
+    // 	}
+    // 	getlive(param).then(res => {
+    // 		if (res.code == 200) {
+    // 			this.livedata = res.data
+    // 			this.codeimg = res.data.qwQrCode
+    // 			if (this.livedata.status == 1) {
+    // 				this.autoplay = true
+    // 				this.videoContext.seek(this.livedata.nowDuration)
+    // 				// console.log(this.autoplay)
+    // 			} else {
+    // 				this.autoplay = false
+    // 				this.placeholderText = "直播开始才能发言讨论"
+    // 				this.talkdisabled = true
+    // 			}
+    // 			console.log(this.autoplay)
+    // 		} else {
+    // 			uni.showToast({
+    // 				title: res.msg,
+    // 				icon: 'none',
+    // 				duration: 2000
+    // 			});
+    // 		}
+    // 	})
+    // },
     getEWechatSdk() {
     },
     closeWebSocket() {
@@ -514,9 +662,18 @@ const _sfc_main = {
     },
     initSocket() {
       this.userinfo = JSON.parse(common_vendor.index.getStorageSync("userInfo"));
-      let signature = common_vendor.CryptoJS.HmacSHA256(common_vendor.CryptoJS.enc.Utf8.parse(this.liveId.toString() + this.userinfo.userId + this.userType + this.timestamp), common_vendor.CryptoJS.enc.Utf8.parse(this.timestamp)).toString(common_vendor.CryptoJS.enc.Hex);
+      let signature = common_vendor.CryptoJS.HmacSHA256(
+        common_vendor.CryptoJS.enc.Utf8.parse(this.liveId.toString() + this.userinfo.userId + this.userType + this.timestamp),
+        common_vendor.CryptoJS.enc.Utf8.parse(this.timestamp)
+      ).toString(common_vendor.CryptoJS.enc.Hex);
       var that = this;
       socket = common_vendor.index.connectSocket({
+        // url: wsUrl+"?userId=40486&liveId=2",
+        // 	url: wsUrl + "?userId=" + this.userid + "&liveId=" +
+        // this.liveId+"&AppToken="+'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI0IiwiaWF0IjoxNzQwNzIxMDQ1LCJleHAiOjE3NDEzMjU4NDV9.PgS83JTMSJgVFD6vGAhUsEPbS6Az4yMyX8wVug61TZNTB3092CtvANo-AB9ZG4NdSBLgLrf4litM3vvTk-FK0g',
+        // 
+        // url: wsUrl + "?userId=" + this.userId + "&liveId=" + this.liveId + "&AppToken=" + uni
+        // 	.getStorageSync('AppToken'),
         url: wsUrl + "?userId=" + this.userinfo.userId + "&liveId=" + this.liveId + "&userType=" + this.userType + "&timestamp=" + this.timestamp + "&signature=" + signature,
         multiple: true,
         success: (res) => {
@@ -530,7 +687,7 @@ const _sfc_main = {
               });
             }
             const redata = JSON.parse(res2.data);
-            console.log("WebSocket\u62FF\u5230\u7684\u4E1C\u897F", redata);
+            console.log("WebSocket拿到的东西", redata);
             this.talklist.push(redata.data);
             this.$nextTick(() => {
               this.scrollIntoView = `list_${this.talklist.length - 1}`;
@@ -562,18 +719,18 @@ const _sfc_main = {
       });
       common_vendor.index.onSocketOpen(() => {
         isSocketOpen = true;
-        console.log("WebSocket\u8FDE\u63A5\u5DF2\u6253\u5F00\uFF01!");
+        console.log("WebSocket连接已打开！!");
         common_vendor.index.showToast({
-          title: "\u63D2\u4EF6\u5DF2\u6253\u5F00",
+          title: "插件已打开",
           icon: "none"
         });
       });
       common_vendor.index.onSocketClose(() => {
         isSocketOpen = false;
         clearInterval(pingpangTimes);
-        console.log("WebSocket\u8FDE\u63A5\u5DF2\u5173\u95ED\uFF01");
+        console.log("WebSocket连接已关闭！");
         common_vendor.index.showToast({
-          title: "\u63D2\u4EF6\u79BB\u7EBF",
+          title: "插件离线",
           icon: "none"
         });
         that.reConnect();
@@ -581,13 +738,13 @@ const _sfc_main = {
       common_vendor.index.onSocketError(() => {
         isSocketOpen = false;
         clearInterval(pingpangTimes);
-        console.log("WebSocket\u8FDE\u63A5\u6253\u5F00\u5931\u8D25");
+        console.log("WebSocket连接打开失败");
         common_vendor.index.showToast({
-          title: "\u63D2\u4EF6\u79BB\u7EBF",
+          title: "插件离线",
           icon: "none"
         });
         common_vendor.index.showModal({
-          content: "\u804A\u5929\u8FDE\u63A5\u5931\u8D25\u662F\u5426\u91CD\u65B0\u5C1D\u8BD5\u8FDE\u63A5",
+          content: "聊天连接失败是否重新尝试连接",
           success() {
             that.reConnect();
           }
@@ -607,18 +764,18 @@ const _sfc_main = {
         };
         if (this.value == "") {
           common_vendor.index.showToast({
-            title: "\u4E0D\u80FD\u53D1\u9001\u7A7A\u6D88\u606F",
+            title: "不能发送空消息",
             icon: "none"
           });
         } else {
           socket.send({
             data: JSON.stringify(data),
             success: () => {
-              console.log("\u53D1\u9001\u6210\u529F");
+              console.log("发送成功");
               this.value = "";
             },
             fail: () => {
-              console.log("\u53D1\u9001\u5931\u8D25");
+              console.log("发送失败");
             }
           });
         }
@@ -643,12 +800,12 @@ if (!Math) {
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return common_vendor.e({
     a: common_vendor.o((...args) => $options.goBack && $options.goBack(...args)),
-    b: common_assets._imports_0,
+    b: common_assets._imports_0$2,
     c: common_vendor.p({
       src: $data.livedata.liveImgUrl,
       size: "32"
     }),
-    d: common_vendor.t($data.livedata.liveName ? $data.livedata.liveName : "\u82B3\u534E\u672A\u6765"),
+    d: common_vendor.t($data.livedata.liveName ? $data.livedata.liveName : "芳华未来"),
     e: common_vendor.t($data.liveViewData.follow || $data.liveViewData.follow === 0 ? $data.liveViewData.follow : 0),
     f: $data.isFollow
   }, $data.isFollow ? {
@@ -664,15 +821,19 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     }),
     j: common_vendor.t($data.liveViewData.online),
     k: common_vendor.o(($event) => $options.onLike()),
-    l: common_vendor.t($data.liveViewData.like),
-    m: common_vendor.o(($event) => $options.goStore()),
-    n: common_vendor.t($data.orderUser.userName ? $options.maskString($data.orderUser.userName) : ""),
-    o: common_vendor.t($data.orderUser.count || 0),
-    p: $data.livingUrl,
-    q: $data.autoplay,
-    r: common_vendor.o((...args) => $options.videoError && $options.videoError(...args)),
-    s: $data.isScreen ? "100vh" : "",
-    t: common_vendor.f($data.talklist, (item, index, i0) => {
+    l: common_assets._imports_1,
+    m: common_vendor.t($data.liveViewData.like),
+    n: common_assets._imports_2,
+    o: common_vendor.o(($event) => $options.goStore()),
+    p: common_assets._imports_3,
+    q: common_assets._imports_4,
+    r: common_vendor.t($data.orderUser.userName ? $options.maskString($data.orderUser.userName) : ""),
+    s: common_vendor.t($data.orderUser.count || 0),
+    t: $data.livingUrl,
+    v: $data.autoplay,
+    w: common_vendor.o((...args) => $options.videoError && $options.videoError(...args)),
+    x: $data.isScreen ? "100vh" : "",
+    y: common_vendor.f($data.talklist, (item, index, i0) => {
       return {
         a: common_vendor.t(item.msg),
         b: item.index,
@@ -680,8 +841,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         d: item.cmd == "announcement"
       };
     }),
-    v: common_vendor.t($data.messageContent),
-    w: common_vendor.f($data.talklist, (item, index, i0) => {
+    z: common_vendor.t($data.messageContent),
+    A: common_vendor.f($data.talklist, (item, index, i0) => {
       return {
         a: common_vendor.t(item.nickName),
         b: common_vendor.t(item.msg),
@@ -690,9 +851,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         e: item.cmd == "sendMsg"
       };
     }),
-    x: $data.showWelcomeMessage
+    B: $data.showWelcomeMessage
   }, $data.showWelcomeMessage ? {
-    y: common_vendor.f($data.talklist, (item, index, i0) => {
+    C: common_vendor.f($data.talklist, (item, index, i0) => {
       return {
         a: common_vendor.t(item.nickName),
         b: common_vendor.t(item.msg),
@@ -701,13 +862,13 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         e: item.cmd == "entry" || item.cmd == "out"
       };
     }),
-    z: common_vendor.t($data.messageContent)
+    D: common_vendor.t($data.messageContent)
   } : {}, {
-    A: $data.scrollIntoView,
-    B: common_vendor.o($options.sendMsg),
-    C: common_vendor.o($options.sendMsg),
-    D: common_vendor.o(($event) => $data.value = $event),
-    E: common_vendor.p({
+    E: $data.scrollIntoView,
+    F: common_vendor.o($options.sendMsg),
+    G: common_vendor.o($options.sendMsg),
+    H: common_vendor.o(($event) => $data.value = $event),
+    I: common_vendor.p({
       placeholder: $data.placeholderText,
       border: "none",
       customStyle: "font-size:24rpx;",
@@ -716,30 +877,32 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       placeholderStyle: "color:#e7e7e7",
       modelValue: $data.value
     }),
-    F: common_vendor.o(($event) => $data.shopping = !$data.shopping),
-    G: common_vendor.o(($event) => $data.showziliao = !$data.showziliao),
-    H: common_vendor.o(($event) => $data.showziliao = !$data.showziliao),
-    I: common_vendor.p({
+    J: common_assets._imports_5,
+    K: common_vendor.o(($event) => $data.shopping = !$data.shopping),
+    L: common_assets._imports_6,
+    M: common_vendor.o(($event) => $data.showziliao = !$data.showziliao),
+    N: common_vendor.o(($event) => $data.showziliao = !$data.showziliao),
+    O: common_vendor.p({
       name: "close",
       size: "18"
     }),
-    J: $data.livedata.liveDesc,
-    K: common_vendor.o($options.closes),
-    L: common_vendor.p({
+    P: $data.livedata.liveDesc,
+    Q: common_vendor.o($options.closes),
+    R: common_vendor.p({
       show: $data.showziliao,
       round: "20",
       bgColor: "#fffee1"
     }),
-    M: common_vendor.p({
+    S: common_vendor.p({
       src: $data.livedata.liveImgUrl,
       size: "36"
     }),
-    N: common_assets._imports_1,
-    O: common_assets._imports_2,
-    P: common_vendor.o((...args) => $options.onCollect && $options.onCollect(...args)),
-    Q: common_assets._imports_3,
-    R: common_vendor.o((...args) => $options.goOrderList && $options.goOrderList(...args)),
-    S: common_vendor.f($data.products, (item, index, i0) => {
+    T: common_assets._imports_0$1,
+    U: common_assets._imports_10,
+    V: common_vendor.o((...args) => $options.onCollect && $options.onCollect(...args)),
+    W: common_assets._imports_9,
+    X: common_vendor.o((...args) => $options.goOrderList && $options.goOrderList(...args)),
+    Y: common_vendor.f($data.products, (item, index, i0) => {
       return common_vendor.e({
         a: item.imgUrl,
         b: common_vendor.t(index + 1),
@@ -748,26 +911,27 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         e: common_vendor.t(item.sales),
         f: common_vendor.t(Math.trunc(item.price)),
         g: common_vendor.t($options.getPureDecimal(item.price) ? $options.getPureDecimal(item.price) : "00"),
-        h: common_vendor.o(($event) => $options.onCollect(item)),
+        h: common_vendor.o(($event) => $options.onCollect(item), index),
         i: item.status == 1
       }, item.status == 1 ? {
-        j: common_vendor.o(($event) => $options.goShop(item.productId))
+        j: common_vendor.o(($event) => $options.goShop(item.productId), index)
       } : item.status == 0 ? {
-        l: common_vendor.o(($event) => $options.goShop(item.productId))
+        l: common_vendor.o(($event) => $options.goShop(item.productId), index)
       } : {}, {
         k: item.status == 0,
         m: index
       });
     }),
-    T: $data.boxHeight + "px",
-    U: common_vendor.o($options.closeshop),
-    V: common_vendor.o($options.open),
-    W: common_vendor.p({
+    Z: common_assets._imports_10,
+    aa: $data.boxHeight + "px",
+    ab: common_vendor.o($options.closeshop),
+    ac: common_vendor.o($options.open),
+    ad: common_vendor.p({
       show: $data.shopping,
       round: "20rpx",
       bgColor: "#f3f5f9"
     })
   });
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-55719d20"], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages/home/living.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-471975a0"]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages/home/living.wxss

@@ -24,7 +24,7 @@
 /* 透明度 */
 /* 文章场景相关 */
 /*自定义主题色 */
-.content.data-v-55719d20 {
+.content.data-v-471975a0 {
   position: relative;
   z-index: 2;
   height: 100%;
@@ -35,7 +35,7 @@
   flex-direction: column;
   justify-content: space-between;
 }
-.content .content-top.data-v-55719d20 {
+.content .content-top.data-v-471975a0 {
   width: 100%;
   margin-top: 150rpx;
   display: flex;
@@ -44,7 +44,7 @@
   padding: 0 24rpx;
   box-sizing: border-box;
 }
-.content .content-top .sum.data-v-55719d20 {
+.content .content-top .sum.data-v-471975a0 {
   width: 80rpx;
   height: 52rpx;
   background: rgba(0, 0, 0, 0.5);
@@ -54,7 +54,7 @@
   text-align: center;
   line-height: 52rpx;
 }
-.content .follow-btn.data-v-55719d20 {
+.content .follow-btn.data-v-471975a0 {
   padding: 8rpx 16rpx;
   background: linear-gradient(270deg, #FF5C03 0%, #FFAC64 100%);
   border-radius: 26rpx;
@@ -62,20 +62,20 @@
   font-size: 26rpx;
   color: #FFFFFF;
 }
-.videolist.data-v-55719d20 {
+.videolist.data-v-471975a0 {
   position: relative;
 }
-.vedio.data-v-55719d20 {
+.vedio.data-v-471975a0 {
   height: 100vh;
   /* 占屏幕高度的80% */
   width: 100%;
   background-color: rgba(0, 0, 0, 0.6);
 }
-.videotop.data-v-55719d20 {
+.videotop.data-v-471975a0 {
   width: 100%;
   height: 100%;
 }
-.popup-video.data-v-55719d20 {
+.popup-video.data-v-471975a0 {
   position: absolute;
   top: 30%;
   height: 500rpx;
@@ -87,7 +87,7 @@
   color: #fff;
   z-index: 9;
 }
-.popup-video .more.data-v-55719d20 {
+.popup-video .more.data-v-471975a0 {
   background-color: #3280fe;
   border-radius: 80rpx;
   width: 280rpx;
@@ -95,7 +95,7 @@
   height: 60rpx;
   line-height: 60rpx;
 }
-.icon-bg.data-v-55719d20 {
+.icon-bg.data-v-471975a0 {
   background-color: rgba(255, 255, 255, 0.2);
   border-radius: 50%;
   width: 72rpx;
@@ -105,12 +105,12 @@
   align-items: center;
   transition: transform 0.2s ease;
 }
-.list.data-v-55719d20 {
+.list.data-v-471975a0 {
   width: 80%;
   margin-bottom: 20rpx;
-  animation: xxxawdawd-55719d20 0.2s;
+  animation: xxxawdawd-471975a0 0.2s;
 }
-@keyframes xxxawdawd-55719d20 {
+@keyframes xxxawdawd-471975a0 {
 from {
     margin-top: 0rpx;
     opacity: 0;
@@ -120,7 +120,7 @@ to {
     opacity: 1;
 }
 }
-.shop-prompt.data-v-55719d20 {
+.shop-prompt.data-v-471975a0 {
   position: absolute;
   bottom: 600rpx;
   left: 24rpx;
@@ -132,7 +132,7 @@ to {
   font-size: 26rpx;
   color: #FFFFFF;
 }
-.side-group.data-v-55719d20 {
+.side-group.data-v-471975a0 {
   position: absolute;
   top: 30%;
   right: 50rpx;
@@ -141,27 +141,27 @@ to {
   flex-direction: column;
   align-items: center;
 }
-.side-group .side-item.data-v-55719d20 {
+.side-group .side-item.data-v-471975a0 {
   font-weight: 500;
   font-size: 24rpx;
   color: #FFFFFF;
   margin-bottom: 32rpx;
   text-align: center;
 }
-.side-group .side-item image.data-v-55719d20 {
+.side-group .side-item image.data-v-471975a0 {
   width: 72rpx;
   height: 72rpx;
 }
-.shoppop.data-v-55719d20 {
+.shoppop.data-v-471975a0 {
   padding: 22rpx 16rpx;
 }
-.shoppop .shoppop-top.data-v-55719d20 {
+.shoppop .shoppop-top.data-v-471975a0 {
   display: flex;
   justify-content: space-between;
   align-items: center;
   padding: 0 16rpx 22rpx;
 }
-.shoppop .shoppop-top .search-input.data-v-55719d20 {
+.shoppop .shoppop-top .search-input.data-v-471975a0 {
   width: 414rpx;
   height: 76rpx;
   background: #FFFFFF;
@@ -172,14 +172,14 @@ to {
   font-size: 24rpx;
   margin-right: 24rpx;
 }
-.shoppop .shoppop-top .search-top.data-v-55719d20 {
+.shoppop .shoppop-top .search-top.data-v-471975a0 {
   font-size: 18rpx;
   color: #222222;
 }
-.shoppop .shop-list.data-v-55719d20 {
+.shoppop .shop-list.data-v-471975a0 {
   overflow: hidden;
 }
-.shoppop .shop-list .list-item.data-v-55719d20 {
+.shoppop .shop-list .list-item.data-v-471975a0 {
   display: flex;
   align-items: center;
   padding: 20rpx 16rpx;
@@ -187,7 +187,7 @@ to {
   border-radius: 16rpx;
   margin-bottom: 16rpx;
 }
-.shoppop .shop-list .list-item .goods-img.data-v-55719d20 {
+.shoppop .shop-list .list-item .goods-img.data-v-471975a0 {
   width: 200rpx;
   height: 200rpx;
   border-radius: 16rpx;
@@ -195,11 +195,11 @@ to {
   position: relative;
   margin-right: 24rpx;
 }
-.shoppop .shop-list .list-item .goods-img image.data-v-55719d20 {
+.shoppop .shop-list .list-item .goods-img image.data-v-471975a0 {
   width: 100%;
   height: 100%;
 }
-.shoppop .shop-list .list-item .goods-img .goods-label.data-v-55719d20 {
+.shoppop .shop-list .list-item .goods-img .goods-label.data-v-471975a0 {
   position: absolute;
   top: 0;
   width: 64rpx;
@@ -211,43 +211,43 @@ to {
   font-size: 28rpx;
   color: #FFFFFF;
 }
-.shoppop .shop-list .list-item .goods-right.data-v-55719d20 {
+.shoppop .shop-list .list-item .goods-right.data-v-471975a0 {
   flex: 1;
 }
-.shoppop .shop-list .list-item .goods-right .goods-title.data-v-55719d20 {
+.shoppop .shop-list .list-item .goods-right .goods-title.data-v-471975a0 {
   font-weight: 500;
   font-size: 28rpx;
   color: #000000;
 }
-.shoppop .shop-list .list-item .goods-right .goods-details.data-v-55719d20 {
+.shoppop .shop-list .list-item .goods-right .goods-details.data-v-471975a0 {
   font-size: 24rpx;
   color: #999999;
   margin: 10rpx 0 20rpx;
 }
-.shoppop .shop-list .list-item .goods-right .goods-people.data-v-55719d20 {
+.shoppop .shop-list .list-item .goods-right .goods-people.data-v-471975a0 {
   font-size: 22rpx;
   color: #E69A22;
   height: 56rpx;
 }
-.shoppop .shop-list .list-item .goods-right .goods-shop.data-v-55719d20 {
+.shoppop .shop-list .list-item .goods-right .goods-shop.data-v-471975a0 {
   display: flex;
   justify-content: space-between;
 }
-.shoppop .shop-list .list-item .goods-right .goods-shop .nummber.data-v-55719d20 {
+.shoppop .shop-list .list-item .goods-right .goods-shop .nummber.data-v-471975a0 {
   color: #FF5C03;
   font-size: 22rpx;
   font-weight: 500;
 }
-.shoppop .shop-list .list-item .goods-right .goods-shop .btn-group.data-v-55719d20 {
+.shoppop .shop-list .list-item .goods-right .goods-shop .btn-group.data-v-471975a0 {
   text-align: center;
   line-height: 56rpx;
 }
-.shoppop .shop-list .list-item .goods-right .goods-shop .btn-group .collect-btn.data-v-55719d20 {
+.shoppop .shop-list .list-item .goods-right .goods-shop .btn-group .collect-btn.data-v-471975a0 {
   width: 72rpx;
   background: #F5F7FA;
   border-radius: 8rpx 0rpx 0rpx 8rpx;
 }
-.shoppop .shop-list .list-item .goods-right .goods-shop .btn-group .shop-btn.data-v-55719d20 {
+.shoppop .shop-list .list-item .goods-right .goods-shop .btn-group .shop-btn.data-v-471975a0 {
   width: 152rpx;
   background: linear-gradient(270deg, #FF5C03 0%, #FFAC64 100%);
   border-radius: 0rpx 8rpx 8rpx 0rpx;
@@ -255,7 +255,7 @@ to {
   font-size: 26rpx;
   color: #FFFFFF;
 }
-.data-v-55719d20 .u-list-item {
+.data-v-471975a0 .u-list-item {
   width: 100%;
   display: flex;
   align-items: center;

unpackage/dist/dev/mp-weixin/pages/list/index.js

@@ -1,7 +1,6 @@
 "use strict";
-var common_vendor = require("../../common/vendor.js");
-var api_list = require("../../api/list.js");
-require("../../common/request.js");
+const common_vendor = require("../../common/vendor.js");
+const api_list = require("../../api/list.js");
 const _sfc_main = {
   data() {
     return {
@@ -15,9 +14,10 @@ const _sfc_main = {
   methods: {
     goLive(item) {
       this.liveId = item.liveId;
-      console.log("\u8981\u4F20\u7684liveId", this.liveId);
+      console.log("要传的liveId", this.liveId);
       common_vendor.index.navigateTo({
         url: "/pages/home/living?liveId=" + this.liveId
+        // url: `/pages/home/living?liveId=${encodeURIComponent(JSON.stringify(liveId))}`
       });
     },
     getList() {
@@ -26,7 +26,7 @@ const _sfc_main = {
         page_size: 10
       };
       common_vendor.index.showLoading({
-        title: "\u5904\u7406\u4E2D..."
+        title: "处理中..."
       });
       api_list.liveList(data).then((res) => {
         if (res.code == 200) {
@@ -39,7 +39,7 @@ const _sfc_main = {
           });
         }
       }).catch((rej) => {
-        console.log("\u8BF7\u6C42\u5931\u8D25:", JSON.stringify(rej));
+        console.log("请求失败:", JSON.stringify(rej));
       }).finally(() => {
         common_vendor.index.hideLoading();
       });
@@ -58,5 +58,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     })
   };
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-49d770da"], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages/list/index.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-7bd28468"]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages/list/index.wxml

@@ -1 +1 @@
-<view class="content data-v-49d770da"><view class="list data-v-49d770da"><view wx:for="{{a}}" wx:for-item="item" wx:key="d" class="list-item data-v-49d770da" bindtap="{{item.c}}"><image class="data-v-49d770da" src="{{item.a}}"></image><view class="info data-v-49d770da"><text class="data-v-49d770da">{{item.b}}</text></view></view></view></view>
+<view class="content data-v-7bd28468"><view class="list data-v-7bd28468"><view wx:for="{{a}}" wx:for-item="item" wx:key="d" class="list-item data-v-7bd28468" bindtap="{{item.c}}"><image class="data-v-7bd28468" src="{{item.a}}"></image><view class="info data-v-7bd28468"><text class="data-v-7bd28468">{{item.b}}</text></view></view></view></view>

unpackage/dist/dev/mp-weixin/pages/list/index.wxss

@@ -24,17 +24,17 @@
 /* 透明度 */
 /* 文章场景相关 */
 /*自定义主题色 */
-.content.data-v-49d770da {
+.content.data-v-7bd28468 {
   background-color: #111;
   min-height: 100vh;
   padding: 24rpx;
 }
-.content .list.data-v-49d770da {
+.content .list.data-v-7bd28468 {
   display: flex;
   justify-content: space-between;
   flex-wrap: wrap;
 }
-.content .list .list-item.data-v-49d770da {
+.content .list .list-item.data-v-7bd28468 {
   border-radius: 16rpx;
   width: 340rpx;
   height: 600rpx;
@@ -44,13 +44,13 @@
   overflow: hidden;
   position: relative;
 }
-.content .list .list-item .info.data-v-49d770da {
+.content .list .list-item .info.data-v-7bd28468 {
   position: absolute;
   left: 20rpx;
   bottom: 14rpx;
   color: #ffffff;
 }
-.content .list .list-item image.data-v-49d770da {
+.content .list .list-item image.data-v-7bd28468 {
   width: 100%;
   height: 100%;
 }

unpackage/dist/dev/mp-weixin/pages/user/index.js

@@ -1,8 +1,8 @@
 "use strict";
-var common_vendor = require("../../common/vendor.js");
+const common_vendor = require("../../common/vendor.js");
 const _sfc_main = {};
 function _sfc_render(_ctx, _cache) {
   return {};
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages/user/index.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages_shop/cart.js

@@ -1,5 +1,6 @@
 "use strict";
-var common_vendor = require("../common/vendor.js");
+const common_vendor = require("../common/vendor.js");
+const common_assets = require("../common/assets.js");
 const likeProduct = () => "./components/likeProduct.js";
 const _sfc_main = {
   components: {
@@ -25,26 +26,29 @@ const _sfc_main = {
       if (selectCarts.length == 0) {
         common_vendor.index.showToast({
           icon: "none",
-          title: "\u8BF7\u9009\u62E9\u5546\u54C1\u5220\u9664"
+          title: "请选择商品删除"
         });
         return;
       }
       let data = { ids: selectCarts };
-      delCart(data).then((res) => {
-        if (res.code == 200) {
-          common_vendor.index.showToast({
-            icon: "success",
-            title: "\u64CD\u4F5C\u6210\u529F"
-          });
-          this.getCarts();
-        } else {
-          common_vendor.index.showToast({
-            icon: "none",
-            title: res.msg
-          });
+      delCart(data).then(
+        (res) => {
+          if (res.code == 200) {
+            common_vendor.index.showToast({
+              icon: "success",
+              title: "操作成功"
+            });
+            this.getCarts();
+          } else {
+            common_vendor.index.showToast({
+              icon: "none",
+              title: res.msg
+            });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
       console.log(selectCarts);
     },
     computedMoney() {
@@ -86,7 +90,7 @@ const _sfc_main = {
       item.cartNum = e.detail.value.replace(/\D/g, "");
       if (item.cartNum <= 1) {
         common_vendor.index.showToast({
-          title: "\u5DF2\u7ECF\u662F\u5E95\u7EBF\u5566!",
+          title: "已经是底线啦!",
           icon: "none",
           duration: 2e3
         });
@@ -102,46 +106,53 @@ const _sfc_main = {
     },
     changeCartNum(item) {
       let data = { number: item.cartNum, id: item.id };
-      cartNum(data).then((res) => {
-        if (res.code == 200) {
-          common_vendor.index.showToast({
-            icon: "none",
-            title: "\u64CD\u4F5C\u6210\u529F"
-          });
-          this.computedMoney();
-        } else {
-          common_vendor.index.showToast({
-            icon: "none",
-            title: res.msg
-          });
+      cartNum(data).then(
+        (res) => {
+          if (res.code == 200) {
+            common_vendor.index.showToast({
+              icon: "none",
+              title: "操作成功"
+            });
+            this.computedMoney();
+          } else {
+            common_vendor.index.showToast({
+              icon: "none",
+              title: res.msg
+            });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
     getCarts() {
-      getCarts().then((res) => {
-        if (res.code == 200) {
-          this.carts = res.carts;
-          this.carts.forEach((item) => {
-            item.checked = false;
-            item.list.forEach((it) => {
-              it.checked = false;
+      getCarts().then(
+        (res) => {
+          if (res.code == 200) {
+            this.carts = res.carts;
+            this.carts.forEach((item) => {
+              item.checked = false;
+              item.list.forEach((it) => {
+                it.checked = false;
+              });
             });
-          });
-          this.computedMoney();
-        } else {
-          common_vendor.index.showToast({
-            icon: "none",
-            title: "\u8BF7\u6C42\u5931\u8D25"
-          });
+            this.computedMoney();
+          } else {
+            common_vendor.index.showToast({
+              icon: "none",
+              title: "请求失败"
+            });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
+    // 购物车减法
     delNum(item) {
       if (item.cartNum <= 1) {
         common_vendor.index.showToast({
-          title: "\u5DF2\u7ECF\u662F\u5E95\u7EBF\u5566!",
+          title: "已经是底线啦!",
           icon: "none",
           duration: 2e3
         });
@@ -153,6 +164,7 @@ const _sfc_main = {
       }
       this.changeCartNum(item);
     },
+    // 购物车加法
     addNum(item) {
       console.log(item);
       item.cartNum++;
@@ -161,6 +173,7 @@ const _sfc_main = {
       }
       this.changeCartNum(item);
     },
+    // 结算
     submit() {
       let selectCarts = this.carts.filter((item) => item.list.some((listItem) => listItem.checked === true)).map((item) => ({
         storeId: item.list[0].storeId || "",
@@ -172,7 +185,7 @@ const _sfc_main = {
       if (selectCarts.length == 0) {
         common_vendor.index.showToast({
           icon: "none",
-          title: "\u8BF7\u9009\u62E9\u5546\u54C1"
+          title: "请选择商品"
         });
         return;
       }
@@ -199,40 +212,47 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       }, shop.storeName && shop.storeName != "null" ? {
         b: shop.checked,
         c: shop.checked,
-        d: common_vendor.o(($event) => $options.checkShopChange(shop)),
+        d: common_vendor.o(($event) => $options.checkShopChange(shop), idx),
         e: common_vendor.t(shop.storeName)
       } : {}, {
         f: common_vendor.f(shop.list, (item, index, i1) => {
           return common_vendor.e({
             a: item.checked,
             b: item.checked,
-            c: common_vendor.o(($event) => $options.checkChange(item, shop)),
+            c: common_vendor.o(($event) => $options.checkChange(item, shop), index),
             d: item.productAttrImage == null || item.productAttrImage == "" ? item.productImage : item.productAttrImage,
             e: common_vendor.t(_ctx.utils.getDictLabelName("storeProductType", item.productType)),
             f: common_vendor.t(item.productName),
             g: common_vendor.t(item.productAttrName),
             h: common_vendor.t(item.price),
             i: item.cartNum <= 1
-          }, item.cartNum <= 1 ? {} : {}, {
-            j: common_vendor.o(($event) => $options.delNum(item)),
-            k: common_vendor.o(($event) => $options.changeNum($event, item)),
-            l: item.cartNum,
-            m: common_vendor.o(($event) => $options.addNum(item)),
-            n: index
+          }, item.cartNum <= 1 ? {
+            j: common_assets._imports_0$8
+          } : {
+            k: common_assets._imports_1$5
+          }, {
+            l: common_vendor.o(($event) => $options.delNum(item), index),
+            m: common_vendor.o(($event) => $options.changeNum($event, item), index),
+            n: item.cartNum,
+            o: common_vendor.o(($event) => $options.addNum(item), index),
+            p: index
           });
         }),
         g: idx
       });
     }),
-    b: $data.carts.length == 0
-  }, $data.carts.length == 0 ? {} : {}, {
-    c: common_vendor.sr("product", "50e5f29e-0"),
-    d: $data.checkAll,
-    e: common_vendor.o(($event) => $options.handleCheckAll()),
-    f: common_vendor.o(($event) => $options.delCart()),
-    g: common_vendor.t($data.totalMoney.toFixed(2)),
-    h: common_vendor.o((...args) => $options.submit && $options.submit(...args))
+    b: common_assets._imports_2$4,
+    c: $data.carts.length == 0
+  }, $data.carts.length == 0 ? {
+    d: common_assets._imports_2$3
+  } : {}, {
+    e: common_vendor.sr("product", "50e5f29e-0"),
+    f: $data.checkAll,
+    g: common_vendor.o(($event) => $options.handleCheckAll()),
+    h: common_vendor.o(($event) => $options.delCart()),
+    i: common_vendor.t($data.totalMoney.toFixed(2)),
+    j: common_vendor.o((...args) => $options.submit && $options.submit(...args))
   });
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages_shop/cart.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages_shop/cart.wxml

@@ -1 +1 @@
-<view class="content"><view wx:for="{{a}}" wx:for-item="shop" wx:key="g" class="shopbox"><view wx:if="{{shop.a}}" class="shopbox-name"><label style="margin-right:30upx"><checkbox value="{{shop.b}}" checked="{{shop.c}}" bindtap="{{shop.d}}"/></label><text>{{shop.e}}</text></view><view class="goods-list"><view wx:for="{{shop.f}}" wx:for-item="item" wx:key="n" class="item"><label style="margin-right:30upx"><checkbox value="{{item.a}}" checked="{{item.b}}" bindtap="{{item.c}}"/></label><image class="goods-img" src="{{item.d}}" mode="aspectFit"></image><view class="info-box"><view><view class="title-box"><view class="tag">{{item.e}}</view><view class="title ellipsis">{{item.f}}</view></view><view class="intro ellipsis">{{item.g}}</view></view><view class="price-num"><view class="price"><text class="unit">¥</text><text class="text">{{item.h}}</text></view><view class="num-box"><view class="img-box" bindtap="{{item.j}}"><image wx:if="{{item.i}}" src="/static/images/jian.png" mode=""></image><image wx:else src="/static/images/jian2.png" mode=""></image></view><input type="number" bindchange="{{item.k}}" value="{{item.l}}"/><view class="img-box" bindtap="{{item.m}}"><image src="/static/images/add.png" mode=""></image></view></view></view></view></view></view></view><view wx:if="{{b}}" class="no-data-box"><image src="/static/images/no_data.png" mode="aspectFit"></image><view class="empty-title">暂无数据</view></view><view class="like-product"><like-product class="r" u-r="product" u-i="50e5f29e-0" bind:__l="__l"/></view><view class="btn-foot"><view class="left"><label><checkbox checked="{{d}}" bindtap="{{e}}"/></label><text class="text">全选</text><text class="text" bindtap="{{f}}">删除</text></view><view class="right"><view class="total"><text class="label">合计：</text><view class="price"><text class="unit">¥</text><text class="num">{{g}}</text></view></view><view class="btn" bindtap="{{h}}">结算</view></view></view></view>
+<view class="content"><view wx:for="{{a}}" wx:for-item="shop" wx:key="g" class="shopbox"><view wx:if="{{shop.a}}" class="shopbox-name"><label style="margin-right:30upx"><checkbox value="{{shop.b}}" checked="{{shop.c}}" bindtap="{{shop.d}}"/></label><text>{{shop.e}}</text></view><view class="goods-list"><view wx:for="{{shop.f}}" wx:for-item="item" wx:key="p" class="item"><label style="margin-right:30upx"><checkbox value="{{item.a}}" checked="{{item.b}}" bindtap="{{item.c}}"/></label><image class="goods-img" src="{{item.d}}" mode="aspectFit"></image><view class="info-box"><view><view class="title-box"><view class="tag">{{item.e}}</view><view class="title ellipsis">{{item.f}}</view></view><view class="intro ellipsis">{{item.g}}</view></view><view class="price-num"><view class="price"><text class="unit">¥</text><text class="text">{{item.h}}</text></view><view class="num-box"><view class="img-box" bindtap="{{item.l}}"><image wx:if="{{item.i}}" src="{{item.j}}" mode=""></image><image wx:else src="{{item.k}}" mode=""></image></view><input type="number" bindchange="{{item.m}}" value="{{item.n}}"/><view class="img-box" bindtap="{{item.o}}"><image src="{{b}}" mode=""></image></view></view></view></view></view></view></view><view wx:if="{{c}}" class="no-data-box"><image src="{{d}}" mode="aspectFit"></image><view class="empty-title">暂无数据</view></view><view class="like-product"><like-product class="r" u-r="product" u-i="50e5f29e-0" bind:__l="__l"/></view><view class="btn-foot"><view class="left"><label><checkbox checked="{{f}}" bindtap="{{g}}"/></label><text class="text">全选</text><text class="text" bindtap="{{h}}">删除</text></view><view class="right"><view class="total"><text class="label">合计：</text><view class="price"><text class="unit">¥</text><text class="num">{{i}}</text></view></view><view class="btn" bindtap="{{j}}">结算</view></view></view></view>

unpackage/dist/dev/mp-weixin/pages_shop/components/likeProduct.js

@@ -1,5 +1,6 @@
 "use strict";
-var common_vendor = require("../../common/vendor.js");
+const common_vendor = require("../../common/vendor.js");
+const common_assets = require("../../common/assets.js");
 const Loading = () => "../../components/Loading.js";
 const _sfc_main = {
   components: { Loading },
@@ -29,25 +30,28 @@ const _sfc_main = {
         return;
       that.loading = true;
       common_vendor.index.showLoading({
-        title: "\u52A0\u8F7D\u4E2D..."
+        title: "加载中..."
       });
-      getGoodsProducts(that.page).then((res) => {
-        if (res.code == 200) {
-          that.total = res.data.total;
-          that.list.push.apply(that.list, res.data.list);
-          that.loading = false;
-          that.loaded = that.list.length < that.total ? false : true;
-          that.page.page = that.page.page + 1;
+      getGoodsProducts(that.page).then(
+        (res) => {
+          if (res.code == 200) {
+            that.total = res.data.total;
+            that.list.push.apply(that.list, res.data.list);
+            that.loading = false;
+            that.loaded = that.list.length < that.total ? false : true;
+            that.page.page = that.page.page + 1;
+            common_vendor.index.hideLoading();
+          }
+        },
+        (err) => {
           common_vendor.index.hideLoading();
+          common_vendor.index.showToast({
+            title: err.msg,
+            icon: "none",
+            duration: 2e3
+          });
         }
-      }, (err) => {
-        common_vendor.index.hideLoading();
-        common_vendor.index.showToast({
-          title: err.msg,
-          icon: "none",
-          duration: 2e3
-        });
-      });
+      );
     },
     showProduct(item) {
       common_vendor.index.navigateTo({
@@ -62,7 +66,8 @@ if (!Array) {
 }
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return {
-    a: common_vendor.f($data.list, (item, index, i0) => {
+    a: common_assets._imports_0$15,
+    b: common_vendor.f($data.list, (item, index, i0) => {
       return {
         a: item.image,
         b: common_vendor.t(item.productName),
@@ -72,11 +77,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         f: common_vendor.o(($event) => $options.showProduct(item), index)
       };
     }),
-    b: common_vendor.p({
+    c: common_vendor.p({
       loaded: $data.loaded,
       loading: $data.loading
     })
   };
 }
-var Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages_shop/components/likeProduct.vue"]]);
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 wx.createComponent(Component);

unpackage/dist/dev/mp-weixin/pages_shop/components/likeProduct.wxml

@@ -1 +1 @@
-<view><view class="like-title"><image src="/static/images/like.png" mode=""></image><text class="text">猜你喜欢</text></view><view class="like-list"><view wx:for="{{a}}" wx:for-item="item" wx:key="e" class="item" bindtap="{{item.f}}"><view class="img-box"><image src="{{item.a}}" mode=""></image></view><view class="info-box"><view class="title ellipsis2">{{item.b}}</view><view class="price-box"><view class="now"><text class="unit">¥</text><text class="num">{{item.c}}</text></view><view class="old">¥{{item.d}}</view></view></view></view></view><loading wx:if="{{b}}" u-i="741c0e5d-0" bind:__l="__l" u-p="{{b}}"></loading></view>
+<view><view class="like-title"><image src="{{a}}" mode=""></image><text class="text">猜你喜欢</text></view><view class="like-list"><view wx:for="{{b}}" wx:for-item="item" wx:key="e" class="item" bindtap="{{item.f}}"><view class="img-box"><image src="{{item.a}}" mode=""></image></view><view class="info-box"><view class="title ellipsis2">{{item.b}}</view><view class="price-box"><view class="now"><text class="unit">¥</text><text class="num">{{item.c}}</text></view><view class="old">¥{{item.d}}</view></view></view></view></view><loading wx:if="{{c}}" u-i="741c0e5d-0" bind:__l="__l" u-p="{{c}}"></loading></view>

unpackage/dist/dev/mp-weixin/pages_shop/confirmCreateOrder.js

@@ -1,7 +1,7 @@
 "use strict";
-var common_vendor = require("../common/vendor.js");
-var api_order = require("../api/order.js");
-require("../common/request.js");
+const common_vendor = require("../common/vendor.js");
+const api_order = require("../api/order.js");
+const common_assets = require("../common/assets.js");
 const EvanSwitch = () => "../components/evan-switch/evan-switch.js";
 const popupBottom = () => "../components/px-popup-bottom/px-popup-bottom.js";
 const _sfc_main = {
@@ -20,9 +20,10 @@ const _sfc_main = {
       orderList: [],
       userInfo: null,
       userAddrLiat: [],
+      //用户地址
       temps: [],
       couponUserId: null,
-      couponText: "\u8BF7\u9009\u62E9",
+      couponText: "请选择",
       couponsList: [],
       couponVisible: false,
       priceAll: {
@@ -31,11 +32,19 @@ const _sfc_main = {
         usedIntegral: 0,
         totalPrice: 0
       },
-      address: null,
       carts: [],
       checked: false,
       type: null,
       cartIds: null,
+      // form:{
+      // 	useIntegral:0,
+      // 	orderKey:null,
+      // 	addressId:null,
+      // 	mark:null,
+      // 	companyId:null,
+      // 	companyUserId:null,
+      // 	createOrderKey:null,
+      // },
       confirmParam: []
     };
   },
@@ -45,7 +54,7 @@ const _sfc_main = {
     }
   },
   onLoad(options) {
-    console.log("\u786E\u8BA4\u8BA2\u5355", options);
+    console.log("确认订单", options);
     this.orderKey = options.orderKey;
     this.liveId = options.liveId;
     this.productId = options.productId;
@@ -53,6 +62,7 @@ const _sfc_main = {
     this.price = Number(options.price);
   },
   mounted() {
+    this.getUserAddr();
     common_vendor.index.$on("updateAddress", (e) => {
       this.address = e;
       this.addressId = e.addressId;
@@ -62,15 +72,39 @@ const _sfc_main = {
     common_vendor.index.$off("updateAddress");
   },
   methods: {
+    // 获取用户收货地址
+    getUserAddr() {
+      this.userInfo = JSON.parse(common_vendor.index.getStorageSync("userInfo"));
+      api_order.userAddr(this.userInfo.userId).then(
+        (res) => {
+          if (res.code == 200) {
+            console.log("用户收货地址>>>>", res.data);
+            this.address = res.data.find((item) => item.isDefault == 1);
+          } else {
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
+          }
+        },
+        (rej) => {
+        }
+      );
+    },
+    // 创建订单
     createLiveOrder() {
       let data = {
         liveId: this.liveId,
         orderKey: this.orderKey,
-        userName: "\u6CA1\u540D\u5B57",
-        userPhone: "1234568",
-        userAddress: "\u968F\u4FBF\u4F4F",
+        // storeId:this.storeId,,
+        userName: this.address.realName,
+        userPhone: this.address.phone,
+        userAddress: this.address.province + this.address.city + this.address.district + this.address.detail,
+        // cartId:"5",
         productId: this.productId,
         totalNum: this.totalNum
+        // totalPrice:999,
+        // remark:"随便备注",
       };
       return api_order.createliveOrder(data).then((res) => {
         if (res.code == 200) {
@@ -86,15 +120,18 @@ const _sfc_main = {
       });
     },
     getWeixinOrderTemps: function() {
-      getWeixinOrderTemps().then((res) => {
-        if (res.code == 200) {
-          this.temps = res.temp;
+      getWeixinOrderTemps().then(
+        (res) => {
+          if (res.code == 200) {
+            this.temps = res.temp;
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
     couponSelect(item) {
-      this.couponText = "-\xA5" + item.couponPrice.toFixed(2);
+      this.couponText = "-¥" + item.couponPrice.toFixed(2);
       this.couponUserId = item.id;
       this.couponVisible = false;
       this.computed();
@@ -114,19 +151,87 @@ const _sfc_main = {
       this.form.useIntegral = e ? 1 : 0;
       this.computed();
     },
+    // confirm(item) {
+    // 	// let data = {type:this.type,cartIds:this.cartIds};
+    // 	confirm(this.confirmParam).then(
+    // 		res => {
+    // 			if (res.code == 200) {
+    // 				this.carts = res.carts.map(item => ({
+    // 					...item,
+    // 					markinfo: ""
+    // 				}));
+    // 				this.form.orderKey = res.orderKeys;
+    // 				if (res.address != null) {
+    // 					this.form.addressId = res.address.id;
+    // 					this.address = res.address;
+    // 				}
+    // 				this.computed()
+    // 			} else {
+    // 				uni.showToast({
+    // 					icon: 'none',
+    // 					title: res.msg,
+    // 				});
+    // 			}
+    // 		},
+    // 		rej => {}
+    // 	);
+    // },
+    // computed(item) {
+    // 	let data = {
+    // 		createOrderKey: this.form.createOrderKey,
+    // 		couponUserId: this.couponUserId,
+    // 		orderKeys: this.form.orderKey,
+    // 		addressId: this.form.addressId,
+    // 		useIntegral: this.form.useIntegral
+    // 	};
+    // 	computed(data).then(
+    // 		res => {
+    // 			if (res.code == 200) {
+    // 				// this.price=res.data
+    // 				this.price = res.data && res.data.length > 0 ? res.data : []
+    // 				this.priceAll = res.data && res.data.length > 0 ? res.data[res.data.length - 1] : {
+    // 					payPrice: 0,
+    // 					totalPostage: 0,
+    // 					usedIntegral: 0,
+    // 					totalPrice: 0.00,
+    // 				}
+    // 			} else {
+    // 				if (res.code == 501) {
+    // 					uni.showToast({
+    // 						icon: 'none',
+    // 						title: res.msg,
+    // 					});
+    // 					setTimeout(function() {
+    // 						uni.navigateBack({
+    // 							delta: 1
+    // 						})
+    // 					}, 500);
+    // 					return;
+    // 				} else {
+    // 					uni.showToast({
+    // 						icon: 'none',
+    // 						title: res.msg,
+    // 					});
+    // 				}
+    // 			}
+    // 		},
+    // 		rej => {}
+    // 	);
+    // },
+    // 提交订单
     async submitOrder() {
       try {
         if (this.orderKey == null) {
           common_vendor.index.showToast({
             icon: "none",
-            title: "\u8BA2\u5355KEY\u4E0D\u5B58\u5728"
+            title: "订单KEY不存在"
           });
           return;
         }
         if (this.address == null) {
           common_vendor.index.showToast({
             icon: "none",
-            title: "\u6536\u8D27\u5730\u5740\u4E0D\u80FD\u4E3A\u7A7A"
+            title: "收货地址不能为空"
           });
           return;
         }
@@ -136,13 +241,110 @@ const _sfc_main = {
           url: `/pages_shop/paymentOrder?orderList=${orderListStr}`
         });
       } catch (error) {
-        console.error("\u8BA2\u5355\u521B\u5EFA\u5931\u8D25:", error);
+        console.error("订单创建失败:", error);
         common_vendor.index.showToast({
-          title: "\u63D0\u4EA4\u5931\u8D25",
+          title: "提交失败",
           icon: "none"
         });
       }
     },
+    // createOrder() {
+    // 	const mark = this.carts.map(item => item.markinfo)
+    // 	var that = this;
+    // 	var data = null;
+    // 	var tuiUserId = uni.getStorageSync('tuiUserId');
+    // 	uni.showLoading({
+    // 		title: '正在处理中...'
+    // 	});
+    // 	if (tuiUserId != null && tuiUserId != undefined && tuiUserId > 0) {
+    // 		data = {
+    // 			createOrderKey: this.form.createOrderKey,
+    // 			orderCreateType: 3,
+    // 			tuiUserId: tuiUserId,
+    // 			companyId: this.form.companyId,
+    // 			companyUserId: this.form.companyUserId,
+    // 			couponUserId: this.couponUserId,
+    // 			mark: mark,
+    // 			orderKeys: this.form.orderKey,
+    // 			addressId: this.form.addressId,
+    // 			useIntegral: this.form.useIntegral,
+    // 			payType: 1
+    // 		};
+    // 	} else {
+    // 		data = {
+    // 			createOrderKey: this.form.createOrderKey,
+    // 			orderCreateType: 3,
+    // 			companyId: this.form.companyId,
+    // 			companyUserId: this.form.companyUserId,
+    // 			couponUserId: this.couponUserId,
+    // 			mark: mark,
+    // 			orderKeys: this.form.orderKey,
+    // 			addressId: this.form.addressId,
+    // 			useIntegral: this.form.useIntegral,
+    // 			payType: 1
+    // 		};
+    // 	}
+    // 	create(data).then(
+    // 		res => {
+    // 			uni.hideLoading()
+    // 			if (!res.code && res.code !== 0) {
+    // 				uni.hideLoading()
+    // 				// if(res.order.isPrescribe==1){
+    // 				// 	setTimeout(function(){
+    // 				// 		uni.redirectTo({
+    // 				// 			url:"prescribe?orderId="+res.order.id
+    // 				// 		})
+    // 				// 	},200);
+    // 				// }
+    // 				// else{
+    // 				// 	setTimeout(function(){
+    // 				// 		uni.redirectTo({
+    // 				// 			url: './paymentOrder?orderId='+res.order.id
+    // 				// 		})
+    // 				// 	},200);
+    // 				// }
+    // 				if (res.some(item => item.order.isPrescribe) == 1) {
+    // 					setTimeout(function() {
+    // 						let orderIds = res.filter(item => item.order.isPrescribe == 1).map(it => it
+    // 							.order.id)
+    // 						orderIds = orderIds.join(',')
+    // 						uni.redirectTo({
+    // 							url: "prescribe?orderId=" + orderIds + "&combinationOrderId=" +
+    // 								encodeURIComponent(res[0].order.combinationOrderId)
+    // 						})
+    // 					}, 200);
+    // 				} else {
+    // 					setTimeout(function() {
+    // 						uni.redirectTo({
+    // 							url: './paymentOrder?combinationOrderId=' + encodeURIComponent(
+    // 								res[0].order.combinationOrderId)
+    // 						})
+    // 					}, 200);
+    // 				}
+    // 				return;
+    // 			} else {
+    // 				if (res.code == 501) {
+    // 					uni.showToast({
+    // 						icon: 'none',
+    // 						title: res.msg,
+    // 					});
+    // 					setTimeout(function() {
+    // 						uni.navigateBack({
+    // 							delta: 1
+    // 						})
+    // 					}, 200);
+    // 					return;
+    // 				} else {
+    // 					uni.showToast({
+    // 						icon: 'none',
+    // 						title: res.msg,
+    // 					});
+    // 				}
+    // 			}
+    // 		},
+    // 		rej => {}
+    // 	);
+    // },
     openAddress() {
       common_vendor.index.navigateTo({
         url: "/pages_user/address"
@@ -159,22 +361,24 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return common_vendor.e({
     a: $data.address == null
   }, $data.address == null ? {
-    b: common_vendor.o(($event) => $options.openAddress())
+    b: common_assets._imports_0$11,
+    c: common_vendor.o(($event) => $options.openAddress())
   } : {}, {
-    c: $data.address != null
+    d: $data.address != null
   }, $data.address != null ? common_vendor.e({
-    d: common_vendor.t($data.address.realName),
-    e: $data.address.phone != null
+    e: common_vendor.t($data.address.realName),
+    f: $data.address.phone != null
   }, $data.address.phone != null ? {
-    f: common_vendor.t(_ctx.$parsePhone($data.address.phone))
+    g: common_vendor.t(_ctx.$parsePhone($data.address.phone))
   } : {}, {
-    g: common_vendor.t($data.address.province),
-    h: common_vendor.t($data.address.city),
-    i: common_vendor.t($data.address.district),
-    j: common_vendor.t($data.address.detail),
-    k: common_vendor.o(($event) => $options.openAddress())
+    h: common_vendor.t($data.address.province),
+    i: common_vendor.t($data.address.city),
+    j: common_vendor.t($data.address.district),
+    k: common_vendor.t($data.address.detail),
+    l: common_assets._imports_0$11,
+    m: common_vendor.o(($event) => $options.openAddress())
   }) : {}, {
-    l: common_vendor.f($data.carts, (shop, idx, i0) => {
+    n: common_vendor.f($data.carts, (shop, idx, i0) => {
       return common_vendor.e({
         a: shop.storeName && shop.storeName != "null"
       }, shop.storeName && shop.storeName != "null" ? {
@@ -193,39 +397,45 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           };
         })
       }, $data.price && $data.price.length > 0 ? {
-        d: common_vendor.t($data.price[idx].payPostage == null || $data.price[idx].payPostage == 0 ? "\u514D\u8FD0\u8D39" : $data.price[idx].payPostage.toFixed(2))
+        d: common_vendor.t($data.price[idx].payPostage == null || $data.price[idx].payPostage == 0 ? "免运费" : $data.price[idx].payPostage.toFixed(2))
       } : {}, {
         e: shop.markinfo,
-        f: common_vendor.o(($event) => shop.markinfo = $event.detail.value),
+        f: common_vendor.o(($event) => shop.markinfo = $event.detail.value, idx),
         g: idx
       });
     }),
-    m: $data.price && $data.price.length > 0,
-    n: common_vendor.t((_a = $data.price) == null ? void 0 : _a.toFixed(2)),
-    o: common_vendor.t((_b = $options.priceSum) == null ? void 0 : _b.toFixed(2)),
-    p: common_vendor.t((_c = $options.priceSum) == null ? void 0 : _c.toFixed(2)),
-    q: common_vendor.o((...args) => $options.submitOrder && $options.submitOrder(...args)),
-    r: $data.couponsList.length > 0
+    o: $data.price && $data.price.length > 0,
+    p: common_vendor.t((_a = $data.price) == null ? void 0 : _a.toFixed(2)),
+    q: common_vendor.t((_b = $options.priceSum) == null ? void 0 : _b.toFixed(2)),
+    r: common_vendor.t((_c = $options.priceSum) == null ? void 0 : _c.toFixed(2)),
+    s: common_vendor.o((...args) => $options.submitOrder && $options.submitOrder(...args)),
+    t: $data.couponsList.length > 0
   }, $data.couponsList.length > 0 ? {
-    s: common_vendor.f($data.couponsList, (item, index, i0) => {
+    v: common_vendor.f($data.couponsList, (item, index, i0) => {
       return common_vendor.e({
         a: item.status == 0
-      }, item.status == 0 ? {} : {}, {
-        b: item.status != 0
-      }, item.status != 0 ? {} : {}, {
-        c: common_vendor.t(item.couponPrice),
-        d: common_vendor.t(item.useMinPrice),
-        e: common_vendor.t(item.couponTitle),
-        f: common_vendor.t(item.limitTime),
-        g: common_vendor.o(($event) => $options.couponSelect(item)),
-        h: index
+      }, item.status == 0 ? {
+        b: common_assets._imports_2$6
+      } : {}, {
+        c: item.status != 0
+      }, item.status != 0 ? {
+        d: common_assets._imports_3$2
+      } : {}, {
+        e: common_vendor.t(item.couponPrice),
+        f: common_vendor.t(item.useMinPrice),
+        g: common_vendor.t(item.couponTitle),
+        h: common_vendor.t(item.limitTime),
+        i: common_vendor.o(($event) => $options.couponSelect(item), index),
+        j: index
       });
     })
   } : {}, {
-    t: $data.couponsList.length == 0
-  }, $data.couponsList.length == 0 ? {} : {}, {
-    v: common_vendor.sr("popup", "bb501b1c-0"),
-    w: common_vendor.p({
+    w: $data.couponsList.length == 0
+  }, $data.couponsList.length == 0 ? {
+    x: common_assets._imports_2$3
+  } : {}, {
+    y: common_vendor.sr("popup", "5fa01107-0"),
+    z: common_vendor.p({
       visible: $data.couponVisible,
       title: " ",
       bgColor: "#f5f5f5",
@@ -234,5 +444,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     })
   });
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-bb501b1c"], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages_shop/confirmCreateOrder.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-5fa01107"]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages_shop/confirmCreateOrder.wxss

@@ -356,11 +356,11 @@
   background: #0bb3f2;
   border-radius: 44rpx;
 }
-.coupon.data-v-bb501b1c {
+.coupon.data-v-5fa01107 {
   height: 100%;
 }
 /*优惠券列表公共*/
-.coupon-list .item.data-v-bb501b1c {
+.coupon-list .item.data-v-5fa01107 {
   display: flex;
   flex-direction: column;
   justify-content: center;
@@ -369,7 +369,7 @@
   height: 170rpx;
   margin-bottom: 16rpx;
 }
-.coupon-list .item .money.data-v-bb501b1c {
+.coupon-list .item .money.data-v-5fa01107 {
   background-size: 100% 100%;
   width: 240rpx;
   height: 100%;
@@ -383,38 +383,38 @@
   justify-content: center;
   position: relative;
 }
-.coupon-list .item .money .img.data-v-bb501b1c {
+.coupon-list .item .money .img.data-v-5fa01107 {
   position: absolute;
   width: 240rpx;
   height: 100%;
   color: #fff;
 }
-.coupon-list .item .money .num.data-v-bb501b1c {
+.coupon-list .item .money .num.data-v-5fa01107 {
   font-size: 60rpx;
 }
-.coupon-list .item .money .pic-num.data-v-bb501b1c {
+.coupon-list .item .money .pic-num.data-v-5fa01107 {
   font-size: 20rpx;
   z-index: 99;
 }
-.coupon-list .item .text.data-v-bb501b1c {
+.coupon-list .item .text.data-v-5fa01107 {
   width: 450rpx;
   padding: 0 17rpx 0 24rpx;
   background-color: #fff;
   box-sizing: border-box;
 }
-.coupon-list .item .text .condition.data-v-bb501b1c {
+.coupon-list .item .text .condition.data-v-5fa01107 {
   font-size: 30rpx;
   color: #282828;
   height: 93rpx;
   line-height: 93rpx;
   border-bottom: 1px solid #f0f0f0;
 }
-.coupon-list .item .text .data.data-v-bb501b1c {
+.coupon-list .item .text .data.data-v-5fa01107 {
   font-size: 20rpx;
   color: #999;
   height: 76rpx;
 }
-.coupon-list .item .text .data .bnt.data-v-bb501b1c {
+.coupon-list .item .text .data .bnt.data-v-5fa01107 {
   width: 136rpx;
   height: 44rpx;
   border-radius: 22rpx;
@@ -424,6 +424,6 @@
   line-height: 44rpx;
   background-color: red;
 }
-.coupon-list .item .text .data .bnt.gray.data-v-bb501b1c {
+.coupon-list .item .text .data .bnt.gray.data-v-5fa01107 {
   background-color: #ccc;
 }

unpackage/dist/dev/mp-weixin/pages_shop/confirmPackageOrder.js

@@ -1,5 +1,6 @@
 "use strict";
-var common_vendor = require("../common/vendor.js");
+const common_vendor = require("../common/vendor.js");
+const common_assets = require("../common/assets.js");
 const EvanSwitch = () => "../components/evan-switch/evan-switch.js";
 const popupBottom = () => "../components/px-popup-bottom/px-popup-bottom.js";
 const _sfc_main = {
@@ -13,14 +14,18 @@ const _sfc_main = {
       temps: [],
       totalMoney: 0,
       couponUserId: null,
-      couponText: "\u8BF7\u9009\u62E9",
+      couponText: "请选择",
       couponsList: [],
       couponVisible: false,
       companyUserId: null,
       packageId: null,
       address: null,
       package: {},
+      // checked: false,
+      // type:null,
+      // cartIds:null,
       form: {
+        // useIntegral:0,
         orderKey: null,
         addressId: null,
         mark: null
@@ -33,15 +38,18 @@ const _sfc_main = {
   },
   methods: {
     getWeixinTemps: function() {
-      getWeixinTemps().then((res) => {
-        if (res.code == 200) {
-          this.temps = res.temp;
+      getWeixinTemps().then(
+        (res) => {
+          if (res.code == 200) {
+            this.temps = res.temp;
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
     couponSelect(item) {
-      this.couponText = "-\xA5" + item.couponPrice.toFixed(2);
+      this.couponText = "-¥" + item.couponPrice.toFixed(2);
       this.couponUserId = item.id;
       this.couponVisible = false;
       this.computedPackageOrder();
@@ -56,51 +64,58 @@ const _sfc_main = {
     },
     confirmPackageOrder() {
       let data = { packageId: this.packageId, couponUserId: this.couponUserId };
-      confirmPackageOrder(data).then((res) => {
-        if (res.code == 200) {
-          this.form.orderKey = res.orderKey;
-          this.address = res.address;
-          this.package = res.package;
-          if (res.address != null) {
-            this.form.addressId = res.address.id;
+      confirmPackageOrder(data).then(
+        (res) => {
+          if (res.code == 200) {
+            this.form.orderKey = res.orderKey;
+            this.address = res.address;
+            this.package = res.package;
+            if (res.address != null) {
+              this.form.addressId = res.address.id;
+            }
+            this.totalMoney = res.totalMoney;
+          } else {
+            common_vendor.index.showToast({
+              icon: "none",
+              title: res.msg
+            });
           }
-          this.totalMoney = res.totalMoney;
-        } else {
-          common_vendor.index.showToast({
-            icon: "none",
-            title: res.msg
-          });
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
     computedPackageOrder() {
       let data = { packageId: this.packageId, couponUserId: this.couponUserId };
-      computedPackageOrder(data).then((res) => {
-        if (res.code == 200) {
-          this.totalMoney = res.totalMoney;
-        } else {
-          common_vendor.index.showToast({
-            icon: "none",
-            title: res.msg
-          });
+      computedPackageOrder(data).then(
+        (res) => {
+          if (res.code == 200) {
+            this.totalMoney = res.totalMoney;
+          } else {
+            common_vendor.index.showToast({
+              icon: "none",
+              title: res.msg
+            });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
+    // 提交订单
     submitOrder() {
       var that = this;
       if (this.form.orderKey == null) {
         common_vendor.index.showToast({
           icon: "none",
-          title: "\u8BA2\u5355KEY\u4E0D\u5B58\u5728"
+          title: "订单KEY不存在"
         });
         return;
       }
       if (this.form.addressId == null) {
         common_vendor.index.showToast({
           icon: "none",
-          title: "\u6536\u8D27\u5730\u5740\u4E0D\u80FD\u4E3A\u7A7A"
+          title: "收货地址不能为空"
         });
         return;
       }
@@ -116,47 +131,50 @@ const _sfc_main = {
     },
     createPackageOrder() {
       common_vendor.index.showLoading({
-        title: "\u6B63\u5728\u5904\u7406\u4E2D..."
+        title: "正在处理中..."
       });
       let data = { couponUserId: this.couponUserId, mark: this.form.mark, orderKey: this.form.orderKey, addressId: this.form.addressId, packageId: this.packageId, companyUserId: this.companyUserId };
-      createPackageOrder(data).then((res) => {
-        common_vendor.index.hideLoading();
-        if (res.code == 200) {
-          if (res.order.isPrescribe == 1) {
-            setTimeout(function() {
-              common_vendor.index.redirectTo({
-                url: "prescribe?orderId=" + res.order.id
-              });
-            }, 200);
+      createPackageOrder(data).then(
+        (res) => {
+          common_vendor.index.hideLoading();
+          if (res.code == 200) {
+            if (res.order.isPrescribe == 1) {
+              setTimeout(function() {
+                common_vendor.index.redirectTo({
+                  url: "prescribe?orderId=" + res.order.id
+                });
+              }, 200);
+            } else {
+              setTimeout(function() {
+                common_vendor.index.redirectTo({
+                  url: "./paymentOrder?orderId=" + res.order.id
+                });
+              }, 200);
+            }
+            return;
           } else {
-            setTimeout(function() {
-              common_vendor.index.redirectTo({
-                url: "./paymentOrder?orderId=" + res.order.id
+            if (res.code == 501) {
+              common_vendor.index.showToast({
+                icon: "none",
+                title: res.msg
               });
-            }, 200);
-          }
-          return;
-        } else {
-          if (res.code == 501) {
-            common_vendor.index.showToast({
-              icon: "none",
-              title: res.msg
-            });
-            setTimeout(function() {
-              common_vendor.index.navigateBack({
-                delta: 1
+              setTimeout(function() {
+                common_vendor.index.navigateBack({
+                  delta: 1
+                });
+              }, 200);
+              return;
+            } else {
+              common_vendor.index.showToast({
+                icon: "none",
+                title: res.msg
               });
-            }, 200);
-            return;
-          } else {
-            common_vendor.index.showToast({
-              icon: "none",
-              title: res.msg
-            });
+            }
           }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
     openAddress() {
       common_vendor.index.navigateTo({
@@ -173,62 +191,71 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return common_vendor.e({
     a: $data.address == null
   }, $data.address == null ? {
-    b: common_vendor.o(($event) => $options.openAddress())
+    b: common_assets._imports_0$11,
+    c: common_vendor.o(($event) => $options.openAddress())
   } : {}, {
-    c: $data.address != null
+    d: $data.address != null
   }, $data.address != null ? common_vendor.e({
-    d: common_vendor.t($data.address.realName),
-    e: $data.address.phone != null
+    e: common_vendor.t($data.address.realName),
+    f: $data.address.phone != null
   }, $data.address.phone != null ? {
-    f: common_vendor.t(_ctx.utils.parsePhone($data.address.phone))
+    g: common_vendor.t(_ctx.utils.parsePhone($data.address.phone))
   } : {}, {
-    g: common_vendor.t($data.address.province),
-    h: common_vendor.t($data.address.city),
-    i: common_vendor.t($data.address.district),
-    j: common_vendor.t($data.address.detail),
-    k: common_vendor.o(($event) => $options.openAddress())
+    h: common_vendor.t($data.address.province),
+    i: common_vendor.t($data.address.city),
+    j: common_vendor.t($data.address.district),
+    k: common_vendor.t($data.address.detail),
+    l: common_assets._imports_0$11,
+    m: common_vendor.o(($event) => $options.openAddress())
   }) : {}, {
-    l: $data.package.imgUrl,
-    m: common_vendor.t($data.package.title),
-    n: common_vendor.t($data.package.descs),
-    o: $data.package.payMoney != null
-  }, $data.package.payMoney != null ? {
-    p: common_vendor.t($data.package.payMoney.toFixed(2))
-  } : {}, {
+    n: $data.package.imgUrl,
+    o: common_vendor.t($data.package.title),
+    p: common_vendor.t($data.package.descs),
     q: $data.package.payMoney != null
   }, $data.package.payMoney != null ? {
     r: common_vendor.t($data.package.payMoney.toFixed(2))
   } : {}, {
-    s: common_vendor.t($data.couponText),
-    t: common_vendor.o(($event) => $options.openCoupon()),
-    v: $data.form.mark,
-    w: common_vendor.o(($event) => $data.form.mark = $event.detail.value),
-    x: $data.totalMoney != null
+    s: $data.package.payMoney != null
+  }, $data.package.payMoney != null ? {
+    t: common_vendor.t($data.package.payMoney.toFixed(2))
+  } : {}, {
+    v: common_vendor.t($data.couponText),
+    w: common_assets._imports_1$7,
+    x: common_vendor.o(($event) => $options.openCoupon()),
+    y: $data.form.mark,
+    z: common_vendor.o(($event) => $data.form.mark = $event.detail.value),
+    A: $data.totalMoney != null
   }, $data.totalMoney != null ? {
-    y: common_vendor.t($data.totalMoney.toFixed(2))
+    B: common_vendor.t($data.totalMoney.toFixed(2))
   } : {}, {
-    z: common_vendor.o((...args) => $options.submitOrder && $options.submitOrder(...args)),
-    A: $data.couponsList.length > 0
+    C: common_vendor.o((...args) => $options.submitOrder && $options.submitOrder(...args)),
+    D: $data.couponsList.length > 0
   }, $data.couponsList.length > 0 ? {
-    B: common_vendor.f($data.couponsList, (item, index, i0) => {
+    E: common_vendor.f($data.couponsList, (item, index, i0) => {
       return common_vendor.e({
         a: item.status == 0
-      }, item.status == 0 ? {} : {}, {
-        b: item.status != 0
-      }, item.status != 0 ? {} : {}, {
-        c: common_vendor.t(item.couponPrice),
-        d: common_vendor.t(item.useMinPrice),
-        e: common_vendor.t(item.couponTitle),
-        f: common_vendor.t(item.limitTime),
-        g: common_vendor.o(($event) => $options.couponSelect(item)),
-        h: index
+      }, item.status == 0 ? {
+        b: common_assets._imports_2$6
+      } : {}, {
+        c: item.status != 0
+      }, item.status != 0 ? {
+        d: common_assets._imports_3$2
+      } : {}, {
+        e: common_vendor.t(item.couponPrice),
+        f: common_vendor.t(item.useMinPrice),
+        g: common_vendor.t(item.couponTitle),
+        h: common_vendor.t(item.limitTime),
+        i: common_vendor.o(($event) => $options.couponSelect(item), index),
+        j: index
       });
     })
   } : {}, {
-    C: $data.couponsList.length == 0
-  }, $data.couponsList.length == 0 ? {} : {}, {
-    D: common_vendor.sr("popup", "6a46ad18-0"),
-    E: common_vendor.p({
+    F: $data.couponsList.length == 0
+  }, $data.couponsList.length == 0 ? {
+    G: common_assets._imports_2$3
+  } : {}, {
+    H: common_vendor.sr("popup", "365fa217-0"),
+    I: common_vendor.p({
       visible: $data.couponVisible,
       title: " ",
       bgColor: "#f5f5f5",
@@ -237,5 +264,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     })
   });
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-6a46ad18"], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages_shop/confirmPackageOrder.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-365fa217"]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages_shop/confirmPackageOrder.wxss

@@ -321,11 +321,11 @@
   background: #0bb3f2;
   border-radius: 44rpx;
 }
-.coupon.data-v-6a46ad18 {
+.coupon.data-v-365fa217 {
   height: 100%;
 }
 /*优惠券列表公共*/
-.coupon-list .item.data-v-6a46ad18 {
+.coupon-list .item.data-v-365fa217 {
   display: flex;
   flex-direction: column;
   justify-content: center;
@@ -334,7 +334,7 @@
   height: 170rpx;
   margin-bottom: 16rpx;
 }
-.coupon-list .item .money.data-v-6a46ad18 {
+.coupon-list .item .money.data-v-365fa217 {
   background-size: 100% 100%;
   width: 240rpx;
   height: 100%;
@@ -348,38 +348,38 @@
   justify-content: center;
   position: relative;
 }
-.coupon-list .item .money .img.data-v-6a46ad18 {
+.coupon-list .item .money .img.data-v-365fa217 {
   position: absolute;
   width: 240rpx;
   height: 100%;
   color: #fff;
 }
-.coupon-list .item .money .num.data-v-6a46ad18 {
+.coupon-list .item .money .num.data-v-365fa217 {
   font-size: 60rpx;
 }
-.coupon-list .item .money .pic-num.data-v-6a46ad18 {
+.coupon-list .item .money .pic-num.data-v-365fa217 {
   font-size: 20rpx;
   z-index: 99;
 }
-.coupon-list .item .text.data-v-6a46ad18 {
+.coupon-list .item .text.data-v-365fa217 {
   width: 450rpx;
   padding: 0 17rpx 0 24rpx;
   background-color: #fff;
   box-sizing: border-box;
 }
-.coupon-list .item .text .condition.data-v-6a46ad18 {
+.coupon-list .item .text .condition.data-v-365fa217 {
   font-size: 30rpx;
   color: #282828;
   height: 93rpx;
   line-height: 93rpx;
   border-bottom: 1px solid #f0f0f0;
 }
-.coupon-list .item .text .data.data-v-6a46ad18 {
+.coupon-list .item .text .data.data-v-365fa217 {
   font-size: 20rpx;
   color: #999;
   height: 76rpx;
 }
-.coupon-list .item .text .data .bnt.data-v-6a46ad18 {
+.coupon-list .item .text .data .bnt.data-v-365fa217 {
   width: 136rpx;
   height: 44rpx;
   border-radius: 22rpx;
@@ -389,6 +389,6 @@
   line-height: 44rpx;
   background-color: red;
 }
-.coupon-list .item .text .data .bnt.gray.data-v-6a46ad18 {
+.coupon-list .item .text .data .bnt.gray.data-v-365fa217 {
   background-color: #ccc;
 }

unpackage/dist/dev/mp-weixin/pages_shop/goods.js

@@ -1,8 +1,8 @@
 "use strict";
-var common_vendor = require("../common/vendor.js");
-var api_order = require("../api/order.js");
-var api_live = require("../api/live.js");
-require("../common/request.js");
+const common_vendor = require("../common/vendor.js");
+const api_order = require("../api/order.js");
+const api_live = require("../api/live.js");
+const common_assets = require("../common/assets.js");
 const popupBottom = () => "../components/px-popup-bottom/px-popup-bottom.js";
 const _sfc_main = {
   components: {
@@ -14,15 +14,19 @@ const _sfc_main = {
       orderKey: null,
       type: null,
       liveOrderList: [],
+      //下订单的 不在这个页面
       liveId: null,
-      serviceList: ["\u514D\u90AE\u53D1\u8D27", "\u836F\u5E08\u670D\u52A1", "\u9690\u79C1\u4FDD\u62A4"],
+      // storeId:uni.setStorageSync("storeId"),
+      serviceList: ["免邮发货", "药师服务", "隐私保护"],
       editShow: false,
       productId: null,
       goosDetail: {},
+      //商品详情
       loadding: true,
-      buyText: "\u7ACB\u5373\u8D2D\u4E70",
+      buyText: "立即购买",
       showStorePicker: false,
       goodsNum: 0,
+      //商品选择数量
       productValueSelect: {
         price: 0,
         serviceFee: 0
@@ -38,16 +42,24 @@ const _sfc_main = {
         otPrice: 0
       },
       showModal: false,
+      // 当前轮播的图片
       activeBanner: 1,
+      // 购物车数量
       cartCount: 0,
+      // 规格弹窗
       specVisible: false,
+      // 规格数量
       specNum: 1,
       config: null,
       showServiceFee: false,
       selectVal: "",
+      // 链接带的storeId
       urlStoreId: void 0,
+      // 所选规格门店店铺价格
       storePriceList: [],
+      // 所选店铺
       storeSelectInfo: {},
+      // 保存选的规格
       choseSpecSubIndex: 0,
       choseSpecIndex: 0
     };
@@ -55,54 +67,112 @@ const _sfc_main = {
   onLoad(options) {
     if (options.productId) {
       this.productId = options.productId;
-      console.log("\u63A5\u6536\u5230\u7684productId:", this.productId);
+      console.log("接收到的productId:", this.productId);
     }
     this.liveId = options.liveId;
   },
   mounted() {
     this.getliveGoods();
     var userInfo = common_vendor.index.getStorageSync("userInfo");
-    console.log("\u4E4B\u524D\u7684\u6570\u636E\u5728\u8FD9\u91CC", userInfo);
+    console.log("之前的数据在这里", userInfo);
   },
   onShow() {
   },
   methods: {
+    // 获得key
     getKey() {
-      api_order.liveOrderKey().then((res) => {
-        if (res.code == 200) {
-          console.log("\u4E0B\u8BA2\u5355\u7684key>>>>", res);
-          this.orderKey = res.orderKey;
-          console.log("key>>>>", this.orderKey);
-          common_vendor.index.navigateTo({
-            url: "/pages_shop/confirmCreateOrder?orderKey=" + this.orderKey + "&liveId=" + this.liveId + "&productId=" + this.productId + "&totalNum=" + this.totalNum + "&price=" + this.goosDetail.price
-          });
-        } else {
-          common_vendor.index.showToast({
-            title: res.msg,
-            icon: "none"
-          });
+      api_order.liveOrderKey().then(
+        (res) => {
+          if (res.code == 200) {
+            console.log("下订单的key>>>>", res);
+            this.orderKey = res.orderKey;
+            console.log("key>>>>", this.orderKey);
+            common_vendor.index.navigateTo({
+              url: "/pages_shop/confirmCreateOrder?orderKey=" + this.orderKey + "&liveId=" + this.liveId + "&productId=" + this.productId + "&totalNum=" + this.totalNum + "&price=" + this.goosDetail.price
+            });
+          } else {
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
+    // 点击取消/支付订单
     operateOrder(type) {
       let orderId = this.liveOrderList;
       console.log("orderId>>", orderId);
     },
+    // 选择商品数量
     goodsNumChange(e) {
-      console.log("\u5F53\u524D\u9009\u62E9\u5546\u54C1\u6570\u91CF\u4E3A: " + e.value);
+      console.log("当前选择商品数量为: " + e.value);
       this.totalNum = e.value;
     },
+    // 提交
     submit() {
       this.specVisible = false;
       this.getKey();
     },
+    // 加入购物车
     addCart(type) {
       this.type = type;
       this.specVisible = true;
     },
+    // doAddCart(type) {
+    // 	if (this.specNum == 0) {
+    // 		uni.showToast({
+    // 			icon: 'none',
+    // 			title: "库存不足",
+    // 		});
+    // 		return;
+    // 	}
+    // 	var isBuy = type == "buy" ? 1 : 0;
+    // 	let data = {
+    // 		isBuy: isBuy,
+    // 		cartNum: this.specNum,
+    // 		productId: this.productValueSelect.productId,
+    // 		attrValueId: this.productValueSelect.id
+    // 	};
+    // 	addCart(data).then(
+    // 		res => {
+    // 			if (res.code == 200) {
+    // 				if (type == "buy") {
+    // 					const selectCarts = [{
+    // 						storeId: this.storeId,
+    // 						data: {
+    // 							type: this.type,
+    // 							cartIds: res.id,
+    // 						}
+    // 					}]
+    // 					uni.navigateTo({
+    // 						url: '/pages/shopping/confirmOrder?type=' + this.type + '&orderType=' +
+    // 							this.orderType + '&confirmParam=' + encodeURIComponent(JSON.stringify(
+    // 								selectCarts))
+    // 					})
+    // 				} else {
+    // 					this.getCartCount()
+    // 					uni.showToast({
+    // 						icon: 'success',
+    // 						title: "添加成功",
+    // 					});
+    // 				}
+    // 			} else {
+    // 				uni.showToast({
+    // 					icon: 'none',
+    // 					title: res.msg,
+    // 				});
+    // 				this.getProductDetails()
+    // 			}
+    // 		},
+    // 		rej => {}
+    // 	);
+    // },
+    // 跳转页面
     navgetTo(url) {
-      console.log("\u8DF3\u8F6C");
+      console.log("跳转");
       common_vendor.index.navigateTo({
         url
       });
@@ -110,19 +180,23 @@ const _sfc_main = {
     openEditMoney() {
       this.editShow = true;
     },
+    //商品详情
     getliveGoods() {
-      api_live.liveGoodsDetail(this.productId).then((res) => {
-        if (res.code == 200) {
-          console.log("\u5C0F\u9EC4\u8F66 \u5546\u54C1\u8BE6\u60C5>>>>", res);
-          this.goosDetail = res.data;
-        } else {
-          common_vendor.index.showToast({
-            title: res.msg,
-            icon: "none"
-          });
+      api_live.liveGoodsDetail(this.productId).then(
+        (res) => {
+          if (res.code == 200) {
+            console.log("小黄车 商品详情>>>>", res);
+            this.goosDetail = res.data;
+          } else {
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     }
   }
 };
@@ -155,32 +229,36 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         b: index
       };
     }),
-    g: common_vendor.o(($event) => $options.openEditMoney()),
-    h: $data.editShow
+    g: common_assets._imports_0$9,
+    h: common_assets._imports_1$6,
+    i: common_vendor.o(($event) => $options.openEditMoney()),
+    j: $data.editShow
   }, $data.editShow ? {
-    i: common_vendor.o(($event) => _ctx.cancelEditMoney()),
-    j: common_vendor.o(($event) => _ctx.cancelEditMoney()),
-    k: common_vendor.o(($event) => _ctx.cancelEditMoney())
+    k: common_vendor.o(($event) => _ctx.cancelEditMoney()),
+    l: common_vendor.o(($event) => _ctx.cancelEditMoney()),
+    m: common_vendor.o(($event) => _ctx.cancelEditMoney())
   } : {}, {
-    l: common_vendor.t(),
-    m: common_vendor.o(($event) => $options.navgetTo("/pages_shop/store?liveId=" + $data.liveId)),
-    n: $data.product.description,
-    o: common_vendor.o(($event) => $options.navgetTo("./store")),
-    p: common_vendor.p({
+    n: common_vendor.t(),
+    o: common_vendor.o(($event) => $options.navgetTo("/pages_shop/store?liveId=" + $data.liveId)),
+    p: $data.product.description,
+    q: common_assets._imports_2$5,
+    r: common_vendor.o(($event) => $options.navgetTo("./store")),
+    s: common_assets._imports_3$1,
+    t: common_vendor.p({
       size: "small",
       text: $data.cartCount,
       absolute: "rightTop",
       type: "error"
     }),
-    q: common_vendor.o(($event) => $options.navgetTo("./cart")),
-    r: common_vendor.o(($event) => $options.addCart("cart")),
-    s: common_vendor.t($data.buyText),
-    t: common_vendor.o(($event) => $options.addCart("buy")),
-    v: ((_a = $data.goosDetail) == null ? void 0 : _a.imgUrl) || _ctx.$img.img,
-    w: common_vendor.t($data.goosDetail.productName),
-    x: common_vendor.t($data.goosDetail.price ? $data.goosDetail.price.toFixed(2) : "0.00"),
-    y: common_vendor.t($data.goosDetail.sales),
-    z: common_vendor.f($data.storePriceList, (item, index, i0) => {
+    v: common_vendor.o(($event) => $options.navgetTo("./cart")),
+    w: common_vendor.o(($event) => $options.addCart("cart")),
+    x: common_vendor.t($data.buyText),
+    y: common_vendor.o(($event) => $options.addCart("buy")),
+    z: ((_a = $data.goosDetail) == null ? void 0 : _a.imgUrl) || _ctx.$img.img,
+    A: common_vendor.t($data.goosDetail.productName),
+    B: common_vendor.t($data.goosDetail.price ? $data.goosDetail.price.toFixed(2) : "0.00"),
+    C: common_vendor.t($data.goosDetail.sales),
+    D: common_vendor.f($data.storePriceList, (item, index, i0) => {
       return {
         a: common_vendor.t(item.price.toFixed(2)),
         b: common_vendor.t(_ctx.utils.formatSalesNum(item.sales)),
@@ -191,25 +269,25 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         g: common_vendor.o(($event) => _ctx.pickerStore(item, index), index)
       };
     }),
-    A: common_vendor.p({
+    E: common_vendor.p({
       name: "arrow-right",
       color: "#000",
       size: "14"
     }),
-    B: common_vendor.p({
+    F: common_vendor.p({
       show: $data.showStorePicker,
       round: 16,
       mode: "bottom"
     }),
-    C: common_vendor.o($options.goodsNumChange),
-    D: common_vendor.o(($event) => $data.goodsNum = $event),
-    E: common_vendor.p({
+    G: common_vendor.o($options.goodsNumChange),
+    H: common_vendor.o(($event) => $data.goodsNum = $event),
+    I: common_vendor.p({
       bgColor: "#ececec",
       modelValue: $data.goodsNum
     }),
-    F: common_vendor.o((...args) => $options.submit && $options.submit(...args)),
-    G: common_vendor.sr("popup", "14e5f6c8-1"),
-    H: common_vendor.p({
+    J: common_vendor.o((...args) => $options.submit && $options.submit(...args)),
+    K: common_vendor.sr("popup", "14e5f6c8-1"),
+    L: common_vendor.p({
       visible: $data.specVisible,
       title: " ",
       radius: "32",
@@ -217,5 +295,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     })
   });
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages_shop/goods.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages_shop/order.js

@@ -1,17 +1,17 @@
 "use strict";
-var common_vendor = require("../common/vendor.js");
-var api_order = require("../api/order.js");
-require("../common/request.js");
+const common_vendor = require("../common/vendor.js");
+const api_order = require("../api/order.js");
+const common_assets = require("../common/assets.js");
 const _sfc_main = {
   data() {
     return {
       orderList: [],
       tabList: [{
-        name: "\u5168\u90E8"
+        name: "全部"
       }, {
-        name: "\u5F85\u4ED8\u6B3E"
+        name: "待付款"
       }, {
-        name: "\u5DF2\u4ED8\u6B3E"
+        name: "已付款"
       }]
     };
   },
@@ -22,24 +22,28 @@ const _sfc_main = {
     tabsClick(item) {
       console.log("item", item);
     },
+    // 订单列表
     getliveOrderList() {
       let data = {
         pageSize: 10,
         page: 1
       };
-      api_order.liveOrderList(data).then((res) => {
-        if (res.code == 200) {
-          console.log("\u8BA2\u5355\u5217\u8868\u6570\u636E>>>>", res);
-          this.orderList = res.rows;
-        } else {
-          common_vendor.index.showToast({
-            title: res.msg,
-            icon: "none"
-          });
+      api_order.liveOrderList(data).then(
+        (res) => {
+          if (res.code == 200) {
+            console.log("订单列表数据>>>>", res);
+            this.orderList = res.rows;
+          } else {
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
+          }
+        },
+        (rej) => {
+          console.log("rej:" + JSON.stringify(rej));
         }
-      }, (rej) => {
-        console.log("rej:" + JSON.stringify(rej));
-      });
+      );
     }
   }
 };
@@ -75,8 +79,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         k: common_vendor.t(item.totalPrice),
         l: index
       });
-    })
+    }),
+    d: common_assets._imports_0$10
   };
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-07fa39de"], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages_shop/order.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-11bfd2e6"]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages_shop/order.wxml

@@ -1 +1 @@
-<view class="data-v-07fa39de"><view class=" data-v-07fa39de"></view><view class="content data-v-07fa39de"><u-tabs wx:if="{{b}}" class="tabs data-v-07fa39de" bindclick="{{a}}" u-i="07fa39de-0" bind:__l="__l" u-p="{{b}}"></u-tabs><view class="order-list data-v-07fa39de"><view wx:for="{{c}}" wx:for-item="item" wx:key="l" class="order-item data-v-07fa39de"><view class="order-num data-v-07fa39de"><text class="data-v-07fa39de">订单号：{{item.a}}</text><text wx:if="{{item.b}}" class="data-v-07fa39de">申请退款</text><text wx:elif="{{item.c}}" class="data-v-07fa39de">退货成功</text><text wx:elif="{{item.d}}" class="data-v-07fa39de">待支付</text><text wx:elif="{{item.e}}" class="data-v-07fa39de">待发货</text><text wx:elif="{{item.f}}" class="data-v-07fa39de">待收货</text><text wx:elif="{{item.g}}" class="data-v-07fa39de">待评价</text><text wx:elif="{{item.h}}" class="data-v-07fa39de">已完成</text></view><view class="order-main data-v-07fa39de"><view class="img-box data-v-07fa39de"><image class="data-v-07fa39de" src="/static/images/a.jpg"></image></view><view class="order-text data-v-07fa39de"><view class="title data-v-07fa39de">{{item.i}}</view><view class="txt data-v-07fa39de">适用于乏力、头晕等人群，通过问诊可明确诊断给予专业性指导意见。</view><view class="num data-v-07fa39de"><text class="data-v-07fa39de">45708 人已购</text><text class="grey data-v-07fa39de">x{{item.j}}</text></view></view></view><view class="order-money data-v-07fa39de"><text class="title data-v-07fa39de">订单金额：</text><text class="num data-v-07fa39de">￥<text class="bold data-v-07fa39de">{{item.k}}</text>.00</text></view></view></view></view></view>
+<view class="data-v-11bfd2e6"><view class=" data-v-11bfd2e6"></view><view class="content data-v-11bfd2e6"><u-tabs wx:if="{{b}}" class="tabs data-v-11bfd2e6" bindclick="{{a}}" u-i="11bfd2e6-0" bind:__l="__l" u-p="{{b}}"></u-tabs><view class="order-list data-v-11bfd2e6"><view wx:for="{{c}}" wx:for-item="item" wx:key="l" class="order-item data-v-11bfd2e6"><view class="order-num data-v-11bfd2e6"><text class="data-v-11bfd2e6">订单号：{{item.a}}</text><text wx:if="{{item.b}}" class="data-v-11bfd2e6">申请退款</text><text wx:elif="{{item.c}}" class="data-v-11bfd2e6">退货成功</text><text wx:elif="{{item.d}}" class="data-v-11bfd2e6">待支付</text><text wx:elif="{{item.e}}" class="data-v-11bfd2e6">待发货</text><text wx:elif="{{item.f}}" class="data-v-11bfd2e6">待收货</text><text wx:elif="{{item.g}}" class="data-v-11bfd2e6">待评价</text><text wx:elif="{{item.h}}" class="data-v-11bfd2e6">已完成</text></view><view class="order-main data-v-11bfd2e6"><view class="img-box data-v-11bfd2e6"><image class="data-v-11bfd2e6" src="{{d}}"></image></view><view class="order-text data-v-11bfd2e6"><view class="title data-v-11bfd2e6">{{item.i}}</view><view class="txt data-v-11bfd2e6">适用于乏力、头晕等人群，通过问诊可明确诊断给予专业性指导意见。</view><view class="num data-v-11bfd2e6"><text class="data-v-11bfd2e6">45708 人已购</text><text class="grey data-v-11bfd2e6">x{{item.j}}</text></view></view></view><view class="order-money data-v-11bfd2e6"><text class="title data-v-11bfd2e6">订单金额：</text><text class="num data-v-11bfd2e6">￥<text class="bold data-v-11bfd2e6">{{item.k}}</text>.00</text></view></view></view></view></view>

unpackage/dist/dev/mp-weixin/pages_shop/order.wxss

@@ -24,30 +24,30 @@
 /* 透明度 */
 /* 文章场景相关 */
 /*自定义主题色 */
-.data-v-07fa39de .u-tabs {
+.data-v-11bfd2e6 .u-tabs {
   background-color: #FFFFFF;
 }
-.content .order-list.data-v-07fa39de {
+.content .order-list.data-v-11bfd2e6 {
   background: #F5F7FA;
   padding: 0 24rpx;
 }
-.content .order-list .order-item.data-v-07fa39de {
+.content .order-list .order-item.data-v-11bfd2e6 {
   background: #FFFFFF;
   border-radius: 16rpx;
   padding: 30rpx 24rpx;
   margin-top: 24rpx;
 }
-.content .order-list .order-item .order-num.data-v-07fa39de {
+.content .order-list .order-item .order-num.data-v-11bfd2e6 {
   display: flex;
   justify-content: space-between;
   font-size: 26rpx;
   color: #999999;
 }
-.content .order-list .order-item .order-main.data-v-07fa39de {
+.content .order-list .order-item .order-main.data-v-11bfd2e6 {
   display: flex;
   margin: 26rpx 0 30rpx;
 }
-.content .order-list .order-item .order-main .img-box.data-v-07fa39de {
+.content .order-list .order-item .order-main .img-box.data-v-11bfd2e6 {
   width: 180rpx;
   height: 180rpx;
   border-radius: 16rpx;
@@ -55,41 +55,41 @@
   overflow: hidden;
   margin-right: 26rpx;
 }
-.content .order-list .order-item .order-main .img-box image.data-v-07fa39de {
+.content .order-list .order-item .order-main .img-box image.data-v-11bfd2e6 {
   width: 100%;
   height: 100%;
 }
-.content .order-list .order-item .order-main .order-text .title.data-v-07fa39de {
+.content .order-list .order-item .order-main .order-text .title.data-v-11bfd2e6 {
   font-weight: 500;
   font-size: 28rpx;
   color: #222222;
 }
-.content .order-list .order-item .order-main .order-text .txt.data-v-07fa39de {
+.content .order-list .order-item .order-main .order-text .txt.data-v-11bfd2e6 {
   font-size: 24rpx;
   color: #999999;
   margin: 8rpx 0 18rpx 0;
 }
-.content .order-list .order-item .order-main .order-text .num.data-v-07fa39de {
+.content .order-list .order-item .order-main .order-text .num.data-v-11bfd2e6 {
   display: flex;
   justify-content: space-between;
   font-size: 22rpx;
   color: #E69A22;
 }
-.content .order-list .order-item .order-main .order-text .num .grey.data-v-07fa39de {
+.content .order-list .order-item .order-main .order-text .num .grey.data-v-11bfd2e6 {
   margin-top: 12rpx;
   font-size: 24rpx;
   color: #999999;
 }
-.content .order-list .order-item .order-money .title.data-v-07fa39de {
+.content .order-list .order-item .order-money .title.data-v-11bfd2e6 {
   font-size: 24rpx;
   color: #757575;
 }
-.content .order-list .order-item .order-money .num.data-v-07fa39de {
+.content .order-list .order-item .order-money .num.data-v-11bfd2e6 {
   font-weight: 600;
   font-size: 20rpx;
   color: #FF5C03;
 }
-.content .order-list .order-item .order-money .num .bold.data-v-07fa39de {
+.content .order-list .order-item .order-money .num .bold.data-v-11bfd2e6 {
   font-weight: bold;
   font-size: 36rpx;
 }

unpackage/dist/dev/mp-weixin/pages_shop/paymentOrder.js

@@ -1,19 +1,22 @@
 "use strict";
-var common_vendor = require("../common/vendor.js");
-var api_pay = require("../api/pay.js");
-require("../common/request.js");
+const common_vendor = require("../common/vendor.js");
+const api_pay = require("../api/pay.js");
+const common_assets = require("../common/assets.js");
 const _sfc_main = {
   data() {
     return {
       payType: 2,
       order: null,
+      // formattedDate: '',
       orderId: null,
       payDelivery: 0,
       payMoney: 0,
       config: null,
       payType: 1,
+      // payLimitTime: null,
       user: null,
       combinationOrderId: "",
+      // 需要开处方的订单id
       prescribeOrder: ""
     };
   },
@@ -28,23 +31,25 @@ const _sfc_main = {
     }
   },
   onLoad(options) {
-    console.log("\u652F\u4ED8\u8BA2\u5355\u662F>>", options);
+    console.log("支付订单是>>", options);
     if (options.orderList) {
       try {
         const decoded = decodeURIComponent(options.orderList);
         this.order = JSON.parse(decoded) || {};
       } catch (e) {
-        console.error("\u53C2\u6570\u89E3\u6790\u5931\u8D25:", e);
+        console.error("参数解析失败:", e);
         this.order = {};
       }
     }
   },
+  //发送给朋友
   onShareAppMessage(res) {
     const combinationOrderId = this.combinationOrderId ? `&combinationOrderId=${encodeURIComponent(this.combinationOrderId)}` : "";
     return {
-      title: "\u5E2ETA\u652F\u4ED8",
+      title: "帮TA支付",
       path: "/pages_user/user/otherPaymentOrder?orderId=" + this.orderId + combinationOrderId,
       imageUrl: "/static/images/logo.png"
+      //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
     };
   },
   methods: {
@@ -55,29 +60,37 @@ const _sfc_main = {
         this.doAlipay();
       } else {
         common_vendor.index.showToast({
-          title: "\u6682\u65F6\u65E0\u53EF\u7528\u652F\u4ED8",
+          title: "暂时无可用支付",
           icon: "none"
         });
       }
     },
+    // 选微信支付或者支付宝支付
     handlePayTypeChange(e) {
       this.payType = e.detail.value;
-      console.log("\u5F53\u524D\u9009\u4E2D:", this.payType);
+      console.log("当前选中:", this.payType);
     },
     async doWechatPay() {
       try {
-        common_vendor.index.showLoading({ title: "\u53D1\u8D77\u652F\u4ED8\u4E2D...", mask: true });
+        common_vendor.index.showLoading({ title: "发起支付中...", mask: true });
         let data = {
           orderId: this.order.orderId
         };
         await api_pay.weChatPayment(data);
         common_vendor.index.redirectTo({ url: "/pages_shop/success" });
       } catch (err) {
-        console.error("\u652F\u4ED8\u6D41\u7A0B\u5F02\u5E38:", err);
+        console.error("支付流程异常:", err);
       } finally {
         common_vendor.index.hideLoading();
       }
     },
+    // doWechatPay(){
+    // 	weChatPayment(data).then(res => {
+    // 		if (res.code == 200) {
+    // 		}
+    // 	})
+    // },
+    // 支付宝支付
     doAlipay() {
       ({
         orderId: this.order.orderId
@@ -85,28 +98,34 @@ const _sfc_main = {
       console.log("orderId>>", this.order.orderId);
     },
     getUserInfo() {
-      getUserInfo().then((res) => {
-        if (res.code == 200) {
-          if (res.user != null) {
-            this.user = res.user;
+      getUserInfo().then(
+        (res) => {
+          if (res.code == 200) {
+            if (res.user != null) {
+              this.user = res.user;
+            }
+          } else {
+            common_vendor.index.showToast({
+              icon: "none",
+              title: "请求失败"
+            });
           }
-        } else {
-          common_vendor.index.showToast({
-            icon: "none",
-            title: "\u8BF7\u6C42\u5931\u8D25"
-          });
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
     getStoreConfig() {
-      getStoreConfig().then((res) => {
-        if (res.code == 200) {
-          this.config = res.data;
-          console.log(this.config);
+      getStoreConfig().then(
+        (res) => {
+          if (res.code == 200) {
+            this.config = res.data;
+            console.log(this.config);
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
     payTypeChange(e) {
       if (this.combinationOrderId) {
@@ -120,12 +139,44 @@ const _sfc_main = {
         data: text,
         success: () => {
           common_vendor.index.showToast({
-            title: "\u5185\u5BB9\u5DF2\u6210\u529F\u590D\u5236\u5230\u526A\u5207\u677F",
+            title: "内容已成功复制到剪切板",
             icon: "none"
           });
         }
       });
     },
+    // getStoreOrderById(){
+    // 	var data = {orderId:this.orderId};
+    // 	var that=this;
+    // 	uni.showLoading();
+    // 	getStoreOrderById(data).then(
+    // 		res => {
+    // 			if(res.code==200){
+    // 				console.log(res);
+    // 				uni.hideLoading();
+    // 				that.order=res.order;
+    // 				that.order.orderCodes = that.order.orderCode ? [that.order.orderCode]:[]
+    // 				that.orderCode = that.order.orderCode
+    // 				that.payLimitTime=res.payLimitTime;
+    // 				//套餐订单处理
+    // 				if(res.productPackage!=null){
+    // 					this.payType=res.productPackage.payType;
+    // 					console.log(this.payType)
+    // 					if(this.order.payType==4){
+    // 						this.order.payType=1;
+    // 					}
+    // 				}
+    // 				this.editPayType(this.order.payType)
+    // 			}else{
+    // 				uni.showToast({
+    // 					icon:'none',
+    // 					title: res.msg,
+    // 				});
+    // 			}
+    // 		},
+    // 		rej => {}
+    // 	);
+    // },
     editPayType(payType) {
       var data = {
         orderId: this.orderId,
@@ -133,29 +184,132 @@ const _sfc_main = {
       };
       var that = this;
       common_vendor.index.showLoading();
-      editPayType(data).then((res) => {
-        if (res.code == 200) {
-          console.log(res);
-          common_vendor.index.hideLoading();
-          that.order = res.order;
-          that.order.orderCodes = that.order.orderCode ? [that.order.orderCode] : [];
-          that.orderCode = that.order.orderCode;
-          this.payMoney = this.order.payMoney;
-          this.payDelivery = this.order.payDelivery;
-        } else {
-          common_vendor.index.showToast({
-            icon: "none",
-            title: res.msg
-          });
+      editPayType(data).then(
+        (res) => {
+          if (res.code == 200) {
+            console.log(res);
+            common_vendor.index.hideLoading();
+            that.order = res.order;
+            that.order.orderCodes = that.order.orderCode ? [that.order.orderCode] : [];
+            that.orderCode = that.order.orderCode;
+            this.payMoney = this.order.payMoney;
+            this.payDelivery = this.order.payDelivery;
+          } else {
+            common_vendor.index.showToast({
+              icon: "none",
+              title: res.msg
+            });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
+    // getStoreOrderByCombinationId() {
+    // 	var data = {combinationId:this.combinationOrderId};
+    // 	var that=this;
+    // 	uni.showLoading();
+    // 	getStoreOrderByCombinationId(data).then(
+    // 		res => {
+    // 			if(res.code==200){
+    // 				console.log(res);
+    // 				uni.hideLoading();
+    // 				that.order=res.order;
+    // 				that.orderCode = res.order.orderCodes ? res.order.orderCodes.join(',') : "";
+    // 				that.payLimitTime=res.payLimitTime;
+    // 				//套餐订单处理
+    // 				if(res.productPackage!=null){
+    // 					this.payType=res.productPackage.payType;
+    // 					console.log(this.payType)
+    // 					if(this.order.payType==4){
+    // 						this.order.payType=1;
+    // 					}
+    // 				}
+    // 				that.prescribeOrder = res.prescribeOrder;
+    // 				this.editPayTypeByCombinationId(this.order.payType)
+    // 			}else{
+    // 				uni.showToast({
+    // 					icon:'none',
+    // 					title: res.msg,
+    // 				});
+    // 			}
+    // 		},
+    // 		rej => {}
+    // 	);
+    // },
+    // editPayTypeByCombinationId(payType){
+    // 	var data = {combinationOrderId:this.combinationOrderId,payType:payType};
+    // 	var that=this;
+    // 	uni.showLoading();
+    // 	editPayTypeByCombinationId(data).then(
+    // 		res => {
+    // 			if(res.code==200){
+    // 				console.log(res);
+    // 				uni.hideLoading();
+    // 				that.order=res.order;
+    // 				that.orderCode = res.order.orderCodes ? res.order.orderCodes.join(',') : "";
+    // 				//this.payType=this.order.payType
+    // 				this.payMoney=this.order.payMoney;
+    // 				this.payDelivery=this.order.payDelivery;
+    // 				that.prescribeOrder = res.prescribeOrder;
+    // 			}else{
+    // 				uni.showToast({
+    // 					icon:'none',
+    // 					title: res.msg,
+    // 				});
+    // 			}
+    // 		},
+    // 		rej => {}
+    // 	);
+    // },
     otherPayOrder() {
       common_vendor.index.navigateTo({
         url: "/pages_user/user/otherPaymentOrder?combinationOrderId=" + encodeURIComponent(this.combinationOrderId)
       });
     },
+    // payOrder() {
+    // 	if (this.combinationOrderId) {
+    // 		let data = {
+    // 			combinationOrderId: this.combinationOrderId,
+    // 			payType: this.order.payType
+    // 		};
+    // 		let that = this;
+    // 		uni.showLoading();
+    // 		payByCombinationId(data).then(
+    // 			res => {
+    // 				if (res.code == 200) {
+    // 					this.payfun(res)
+    // 				} else {
+    // 					uni.showToast({
+    // 						icon: 'none',
+    // 						title: res.msg,
+    // 					});
+    // 				}
+    // 			},
+    // 			rej => {}
+    // 		);
+    // 	} else {
+    // 		let data = {
+    // 			orderId: this.order.id,
+    // 			payType: this.order.payType
+    // 		};
+    // 		let that = this;
+    // 		uni.showLoading();
+    // 		pay(data).then(
+    // 			res => {
+    // 				if (res.code == 200) {
+    // 					this.payfun(res)
+    // 				} else {
+    // 					uni.showToast({
+    // 						icon: 'none',
+    // 						title: res.msg,
+    // 					});
+    // 				}
+    // 			},
+    // 			rej => {}
+    // 		);
+    // 	}
+    // },
     payfun(res) {
       const that = this;
       console.log(res.result);
@@ -164,6 +318,7 @@ const _sfc_main = {
           provider: "wxpay",
           timeStamp: res.result.timeStamp,
           nonceStr: res.result.nonceStr,
+          // package: res.result.packageValue,
           package: res.result.packageStr,
           signType: res.result.signType,
           paySign: res.result.paySign,
@@ -202,18 +357,19 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return common_vendor.e({
     a: common_vendor.t($options.payLimitTime),
     b: common_vendor.t($data.order ? (Number($data.order.totalPrice) || 0).toFixed(2) : "0.00"),
-    c: $data.payType === 1,
-    d: common_vendor.o((...args) => $options.handlePayTypeChange && $options.handlePayTypeChange(...args)),
-    e: common_vendor.t((_a = $data.order) == null ? void 0 : _a.orderCode),
-    f: common_vendor.o(($event) => $options.copyOrderSn(_ctx.orderCode)),
-    g: common_vendor.t($options.formattedDate),
-    h: $data.order != null
+    c: common_assets._imports_0$12,
+    d: $data.payType === 1,
+    e: common_vendor.o((...args) => $options.handlePayTypeChange && $options.handlePayTypeChange(...args)),
+    f: common_vendor.t((_a = $data.order) == null ? void 0 : _a.orderCode),
+    g: common_vendor.o(($event) => $options.copyOrderSn(_ctx.orderCode)),
+    h: common_vendor.t($options.formattedDate),
+    i: $data.order != null
   }, $data.order != null ? {
-    i: common_vendor.t($data.order ? (Number($data.order.totalPrice) || 0).toFixed(2) : "0.00")
+    j: common_vendor.t($data.order ? (Number($data.order.totalPrice) || 0).toFixed(2) : "0.00")
   } : {}, {
-    j: common_vendor.o(($event) => $options.payOrder())
+    k: common_vendor.o(($event) => $options.payOrder())
   });
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages_shop/paymentOrder.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 _sfc_main.__runtimeHooks = 2;
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages_shop/paymentOrder.wxml

@@ -1 +1 @@
-<view class="content"><view class="inner"><view class="time-price"><text class="time">请在{{a}}前完成支付</text><view class="price-box"><text class="unit">¥</text><text class="num">{{b}}</text></view></view><view class="pay-type"><view class="title">支付方式</view><radio-group bindchange="{{d}}"><view class="item"><view class="left"><image src="/static/images/wecha_pay.png" mode=""></image><text class="text">微信支付</text></view><label><radio value="{{1}}" checked="{{c}}"/></label></view></radio-group></view><view class="order-info"><view class="title">订单信息</view><view class="item"><text class="label">订单编号</text><view class="sn-box"><view><view class="text">{{e}}</view></view><view class="copy-btn" bindtap="{{f}}">复制</view></view></view><view class="item"><text class="label">下单时间</text><text class="text">{{g}}</text></view><view class="item"><text class="label">订单金额</text><text wx:if="{{h}}" class="text">{{i}}</text></view></view></view><view class="btn-box"><view class="btn" bindtap="{{j}}">去支付</view></view></view>
+<view class="content"><view class="inner"><view class="time-price"><text class="time">请在{{a}}前完成支付</text><view class="price-box"><text class="unit">¥</text><text class="num">{{b}}</text></view></view><view class="pay-type"><view class="title">支付方式</view><radio-group bindchange="{{e}}"><view class="item"><view class="left"><image src="{{c}}" mode=""></image><text class="text">微信支付</text></view><label><radio value="{{1}}" checked="{{d}}"/></label></view></radio-group></view><view class="order-info"><view class="title">订单信息</view><view class="item"><text class="label">订单编号</text><view class="sn-box"><view><view class="text">{{f}}</view></view><view class="copy-btn" bindtap="{{g}}">复制</view></view></view><view class="item"><text class="label">下单时间</text><text class="text">{{h}}</text></view><view class="item"><text class="label">订单金额</text><text wx:if="{{i}}" class="text">{{j}}</text></view></view></view><view class="btn-box"><view class="btn" bindtap="{{k}}">去支付</view></view></view>

unpackage/dist/dev/mp-weixin/pages_shop/store.js

@@ -1,37 +1,46 @@
 "use strict";
-var common_vendor = require("../common/vendor.js");
-var api_live = require("../api/live.js");
-require("../common/request.js");
+const common_vendor = require("../common/vendor.js");
+const api_live = require("../api/live.js");
+const common_assets = require("../common/assets.js");
 const _sfc_main = {
   data() {
     return {
       products: [],
       liveId: null,
       statusBarHeight: common_vendor.index.getWindowInfo().statusBarHeight,
+      // 右侧的胶囊距离右侧屏幕距离-px
       menuRight: common_vendor.index.getStorageSync("menuInfo").menuRight,
+      // 右侧的胶囊宽度-px
       menuWidth: common_vendor.index.getStorageSync("menuInfo").menuWidth,
       opacity: 0,
       opacityTxt: 0,
+      // storeId: "",
       tabbar: [{
-        name: "\u5546\u54C1"
+        name: "商品"
       }, {
-        name: "\u5546\u5BB6"
+        name: "商家"
       }],
       current: 0,
       storeInfo: {},
+      // logoUrl: "/static/images/adfd21c004854c9b8997d371d7a0ce8c.jpg",
+      // 商家资质图片
+      // licenseImagesList: ["/static/images/sjzz.jpg"],
       divHeight: "0px",
       allCates: [],
       cates: [],
       subCates: [],
+      // 选中药品分类
       cateSelect: 0,
+      // 轮播图
       advs: [],
+      // 'company'表示销售管理的进来的
       from: ""
     };
   },
   onLoad(options) {
     if (options.liveId) {
       this.liveId = options.liveId;
-      console.log("\u63A5\u6536\u5230\u7684liveId:", this.liveId);
+      console.log("接收到的liveId:", this.liveId);
     }
     this.storeId = options.storeId || "";
     this.from = options.from || "";
@@ -40,7 +49,7 @@ const _sfc_main = {
       this.getProductCate();
     } else {
       common_vendor.index.showToast({
-        title: "storeId\u4E0D\u5B58\u5728~",
+        title: "storeId不存在~",
         icon: "none"
       });
     }
@@ -61,23 +70,27 @@ const _sfc_main = {
     }
   },
   methods: {
+    //小黄车 店铺展示
     getliveStore() {
       let data = {
         pageSize: 10,
         page: 1
       };
-      api_live.liveStore(this.liveId, data).then((res) => {
-        if (res.code == 200) {
-          console.log("\u5C0F\u9EC4\u8F66 \u5E97\u94FA\u5C55\u793A>>>>", res);
-          this.products = res.data;
-        } else {
-          common_vendor.index.showToast({
-            title: res.msg,
-            icon: "none"
-          });
+      api_live.liveStore(this.liveId, data).then(
+        (res) => {
+          if (res.code == 200) {
+            console.log("小黄车 店铺展示>>>>", res);
+            this.products = res.data;
+          } else {
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
     rightClick() {
       common_vendor.index.navigateBack();
@@ -85,6 +98,7 @@ const _sfc_main = {
     clickTab(item) {
       this.current = item.index;
     },
+    // 预览图片
     previewImage(index) {
       common_vendor.index.previewImage({
         current: index,
@@ -94,17 +108,20 @@ const _sfc_main = {
     getStoreInfo() {
       getStoreById({
         storeId: this.storeId
-      }).then((res) => {
-        if (res.code == 200) {
-          this.storeInfo = res.data || {};
-        } else {
-          common_vendor.index.showToast({
-            icon: "none",
-            title: res.msg
-          });
+      }).then(
+        (res) => {
+          if (res.code == 200) {
+            this.storeInfo = res.data || {};
+          } else {
+            common_vendor.index.showToast({
+              icon: "none",
+              title: res.msg
+            });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
     toSearch() {
       if (this.from == "company") {
@@ -134,27 +151,44 @@ const _sfc_main = {
         });
       }
     },
+    // getAdv() {
+    // 	let data = {
+    // 		advType: 2
+    // 	};
+    // 	getAdv(data).then(
+    // 		res => {
+    // 			if (res.code == 200) {
+    // 				this.advs = res.data;
+    // 			}
+    // 		},
+    // 		rej => {}
+    // 	);
+    // },
     getProductCate() {
       let data = {};
-      getProductCate(data).then((res) => {
-        if (res.code == 200) {
-          this.allCates = res.data;
-          this.cates = this.allCates.filter(function(item) {
-            return item.pid == 0;
-          });
-          if (this.cates != null && this.cates.length > 0) {
-            this.cateSelect = this.cates[0].cateId;
-            this.getSubCate();
+      getProductCate(data).then(
+        (res) => {
+          if (res.code == 200) {
+            this.allCates = res.data;
+            this.cates = this.allCates.filter(function(item) {
+              return item.pid == 0;
+            });
+            if (this.cates != null && this.cates.length > 0) {
+              this.cateSelect = this.cates[0].cateId;
+              this.getSubCate();
+            }
+          } else {
+            common_vendor.index.showToast({
+              icon: "none",
+              title: "请求失败"
+            });
           }
-        } else {
-          common_vendor.index.showToast({
-            icon: "none",
-            title: "\u8BF7\u6C42\u5931\u8D25"
-          });
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
+    // 药品分类选择
     choseCate(item) {
       this.cateSelect = item.cateId;
       this.getSubCate();
@@ -165,6 +199,7 @@ const _sfc_main = {
         return item.pid == that.cateSelect;
       });
     },
+    // 查看药品详情
     showProductList(item) {
       common_vendor.index.navigateTo({
         url: "/pages/shopping/productList?cateId=" + item.cateId + "&pid=" + item.pid + "&storeId=" + this.storeId + "&from=" + this.from
@@ -192,33 +227,34 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     b: common_vendor.o($options.rightClick),
     c: common_vendor.p({
       name: "arrow-left",
-      color: "#333",
+      color: "#ffffff",
       size: "20"
     }),
-    d: $data.opacity >= 0.6 ? "#f7f7f7" : "#fff",
-    e: common_vendor.o((...args) => $options.toSearch && $options.toSearch(...args)),
-    f: `calc(100vw - 100rpx - ${$data.menuRight} - ${$data.menuWidth})`,
-    g: `rgba(58, 17, 1,${$data.opacity})`,
-    h: common_vendor.p({
+    d: common_assets._imports_0$1,
+    e: $data.opacity >= 0.6 ? "#6b4d40" : "#fff",
+    f: common_vendor.o((...args) => $options.toSearch && $options.toSearch(...args)),
+    g: `calc(100vw - 100rpx - ${$data.menuRight} - ${$data.menuWidth})`,
+    h: `rgba(58, 17, 1,${$data.opacity})`,
+    i: common_vendor.p({
       shape: "square",
       src: $data.storeInfo.logoUrl || _ctx.logoUrl,
       width: "100rpx",
       height: "100rpx",
       radius: "6"
     }),
-    i: common_vendor.t($data.storeInfo.storeName || ""),
-    j: common_vendor.t($data.storeInfo.salesCount),
-    k: $data.storeInfo.storeName,
-    l: common_vendor.o($options.clickTab),
-    m: common_vendor.p({
+    j: common_vendor.t($data.storeInfo.storeName || ""),
+    k: common_vendor.t($data.storeInfo.salesCount),
+    l: $data.storeInfo.storeName,
+    m: common_vendor.o($options.clickTab),
+    n: common_vendor.p({
       list: $data.tabbar,
       current: $data.current
     }),
-    n: common_vendor.p({
+    o: common_vendor.p({
       bgColor: "#fff",
       ["offset-top"]: $data.statusBarHeight + 44
     }),
-    o: common_vendor.f($data.cates, (item, index, i0) => {
+    p: common_vendor.f($data.cates, (item, index, i0) => {
       return {
         a: common_vendor.t(item.cateName),
         b: index,
@@ -226,14 +262,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         d: common_vendor.o(($event) => $options.choseCate(item), index)
       };
     }),
-    p: common_vendor.f($data.advs, (item, index, i0) => {
+    q: common_vendor.f($data.advs, (item, index, i0) => {
       return {
         a: item.imageUrl,
         b: index,
         c: common_vendor.o(($event) => $options.handleAdvClick(item), index)
       };
     }),
-    q: common_vendor.f($data.products, (subItem, index, i0) => {
+    r: common_vendor.f($data.products, (subItem, index, i0) => {
       return {
         a: subItem.imgUrl,
         b: common_vendor.t(subItem.productName),
@@ -241,41 +277,41 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         d: common_vendor.o(($event) => $options.showProductList(subItem), index)
       };
     }),
-    r: $data.divHeight,
-    s: $data.current == 0 ? "flex" : "none",
-    t: common_vendor.p({
+    s: $data.divHeight,
+    t: $data.current == 0 ? "flex" : "none",
+    v: common_vendor.p({
       name: "map",
       color: "#ccc",
       size: "18"
     }),
-    v: common_vendor.t($data.storeInfo.address || "--"),
-    w: $data.storeInfo.phone
+    w: common_vendor.t($data.storeInfo.address || "--"),
+    x: $data.storeInfo.phone
   }, $data.storeInfo.phone ? {
-    x: common_vendor.p({
+    y: common_vendor.p({
       name: "phone",
       color: "#ccc",
       size: "18"
     }),
-    y: common_vendor.t($data.storeInfo.phone || "--")
+    z: common_vendor.t($data.storeInfo.phone || "--")
   } : {}, {
-    z: $data.storeInfo.descs
+    A: $data.storeInfo.descs
   }, $data.storeInfo.descs ? {
-    A: common_vendor.p({
+    B: common_vendor.p({
       name: "volume",
       color: "#ccc",
       size: "18"
     }),
-    B: common_vendor.t($data.storeInfo.descs || "--")
+    C: common_vendor.t($data.storeInfo.descs || "--")
   } : {}, {
-    C: common_vendor.p({
+    D: common_vendor.p({
       name: "file-text",
       color: "#ccc",
       size: "18"
     }),
-    D: common_vendor.f(_ctx.licenseImagesList, (img, i, i0) => {
+    E: common_vendor.f(_ctx.licenseImagesList, (img, i, i0) => {
       return {
-        a: common_vendor.o(($event) => $options.previewImage(i)),
-        b: "f7aaac1e-8-" + i0,
+        a: common_vendor.o(($event) => $options.previewImage(i), i),
+        b: "dd5fc6f3-8-" + i0,
         c: common_vendor.p({
           shape: "square",
           lazyLoad: true,
@@ -287,10 +323,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         d: i
       };
     }),
-    E: $data.divHeight,
-    F: $data.current == 1
+    F: $data.divHeight,
+    G: $data.current == 1
   });
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-f7aaac1e"], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages_shop/store.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-dd5fc6f3"]]);
 _sfc_main.__runtimeHooks = 1;
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages_shop/store.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "",
   "enablePullDownRefresh": false,
   "navigationStyle": "custom",
+  "navigationBarTextStyle": "black",
   "usingComponents": {
     "u-icon": "../uni_modules/uview-plus/components/u-icon/u-icon",
     "u-image": "../uni_modules/uview-plus/components/u-image/u-image",

unpackage/dist/dev/mp-weixin/pages_shop/store.wxss

@@ -24,7 +24,7 @@
 /* 透明度 */
 /* 文章场景相关 */
 /*自定义主题色 */
-.inputbox.data-v-f7aaac1e {
+.inputbox.data-v-dd5fc6f3 {
   height: 60rpx;
   padding: 0 20rpx;
   display: flex;
@@ -36,12 +36,12 @@
   font-size: 28rpx;
   color: #999;
 }
-.inputbox .icon-search.data-v-f7aaac1e {
+.inputbox .icon-search.data-v-dd5fc6f3 {
   width: 28rpx;
   height: 28rpx;
   margin-right: 20rpx;
 }
-.uni-nav-bar.data-v-f7aaac1e {
+.uni-nav-bar.data-v-dd5fc6f3 {
   position: fixed;
   top: 0;
   left: 0;
@@ -50,7 +50,7 @@
   overflow: hidden;
   font-weight: 500;
 }
-.uni-nav-bar .uni-nav-barbox.data-v-f7aaac1e {
+.uni-nav-bar .uni-nav-barbox.data-v-dd5fc6f3 {
   width: 100%;
   height: 88rpx;
   display: flex;
@@ -60,14 +60,14 @@
   position: relative;
   font-size: 24rpx;
 }
-.uni-nav-bar .uni-nav-title.data-v-f7aaac1e {
+.uni-nav-bar .uni-nav-title.data-v-dd5fc6f3 {
   font-size: 14px;
   overflow: hidden;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
 }
-.uni-nav-bar .uni-nav-back.data-v-f7aaac1e {
+.uni-nav-bar .uni-nav-back.data-v-dd5fc6f3 {
   margin-left: 20rpx;
   margin-right: 20rpx;
   height: 88rpx;
@@ -76,11 +76,11 @@
   align-items: center;
   justify-content: flex-start;
 }
-.content.data-v-f7aaac1e {
+.content.data-v-dd5fc6f3 {
   width: 100%;
   position: relative;
 }
-.content .bg.data-v-f7aaac1e {
+.content .bg.data-v-dd5fc6f3 {
   width: 100%;
   height: auto;
   position: absolute;
@@ -89,11 +89,11 @@
   height: 388rpx;
   background: #3A1101;
 }
-.content-body.data-v-f7aaac1e {
+.content-body.data-v-dd5fc6f3 {
   position: relative;
   padding-top: calc(var(--status-bar-height) + 88rpx);
 }
-.store-head.data-v-f7aaac1e {
+.store-head.data-v-dd5fc6f3 {
   position: relative;
   z-index: 9;
   margin: 0 24rpx 0 24rpx;
@@ -104,19 +104,19 @@
   color: #222222;
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
 }
-.store-head-top.data-v-f7aaac1e {
+.store-head-top.data-v-dd5fc6f3 {
   display: flex;
   align-items: center;
 }
-.store-head-logo.data-v-f7aaac1e {
+.store-head-logo.data-v-dd5fc6f3 {
   flex-shrink: 0;
   margin-right: 24rpx;
 }
-.store-head-name.data-v-f7aaac1e {
+.store-head-name.data-v-dd5fc6f3 {
   font-weight: 600;
   font-size: 32rpx;
 }
-.store-head-desc.data-v-f7aaac1e {
+.store-head-desc.data-v-dd5fc6f3 {
   margin-top: 16rpx;
   display: flex;
   align-items: center;
@@ -125,12 +125,12 @@
   position: relative;
   z-index: 2;
 }
-.store-head-desc view.data-v-f7aaac1e {
+.store-head-desc view.data-v-dd5fc6f3 {
   padding-right: 20rpx;
   font-size: 26rpx;
   position: relative;
 }
-.store-head-desc view.data-v-f7aaac1e::after {
+.store-head-desc view.data-v-dd5fc6f3::after {
   content: "";
   width: 0;
   height: 28rpx;
@@ -140,13 +140,13 @@
   top: 50%;
   transform: translate(0, -50%);
 }
-.store-head-desc view.data-v-f7aaac1e:last-child::after {
+.store-head-desc view.data-v-dd5fc6f3:last-child::after {
   border: none;
 }
-.border_bottom_line.data-v-f7aaac1e {
+.border_bottom_line.data-v-dd5fc6f3 {
   position: relative;
 }
-.border_bottom_line.data-v-f7aaac1e::after {
+.border_bottom_line.data-v-dd5fc6f3::after {
   content: "";
   position: absolute;
   bottom: 0;
@@ -158,7 +158,7 @@
   border-right-color: #F5F7FA;
   border-left-color: #F5F7FA;
 }
-.storebox.data-v-f7aaac1e {
+.storebox.data-v-dd5fc6f3 {
   width: 100%;
   margin-top: -60rpx;
   padding-top: 80rpx;
@@ -167,7 +167,7 @@
   position: relative;
   z-index: 1;
 }
-.storebox-info.data-v-f7aaac1e {
+.storebox-info.data-v-dd5fc6f3 {
   padding: 24rpx 24rpx 0 24rpx;
   background-color: #fff;
   font-family: PingFang SC, PingFang SC;
@@ -176,24 +176,24 @@
   position: relative;
   border-top: 4px solid #F5F7FA;
 }
-.storebox-map.data-v-f7aaac1e {
+.storebox-map.data-v-dd5fc6f3 {
   display: flex;
   align-items: center;
   word-break: break-all;
   padding: 24rpx 0;
 }
-.storebox-qualifications.data-v-f7aaac1e {
+.storebox-qualifications.data-v-dd5fc6f3 {
   display: flex;
   align-items: center;
   padding: 24rpx 0;
 }
-.storebox .qualifications.data-v-f7aaac1e {
+.storebox .qualifications.data-v-dd5fc6f3 {
   padding: 24rpx 0;
 }
-.medic-box.data-v-f7aaac1e {
+.medic-box.data-v-dd5fc6f3 {
   display: flex;
 }
-.medic-box .cate-list.data-v-f7aaac1e {
+.medic-box .cate-list.data-v-dd5fc6f3 {
   box-sizing: border-box;
   width: 200rpx;
   background: #F2F5F9;
@@ -202,7 +202,7 @@
   padding: 20rpx 0;
   overflow-y: scroll;
 }
-.medic-box .cate-list .item.data-v-f7aaac1e {
+.medic-box .cate-list .item.data-v-dd5fc6f3 {
   height: 100rpx;
   line-height: 100rpx;
   padding-left: 30rpx;
@@ -212,10 +212,10 @@
   color: #333333;
   position: relative;
 }
-.medic-box .cate-list .item.active.data-v-f7aaac1e {
+.medic-box .cate-list .item.active.data-v-dd5fc6f3 {
   color: #0bb3f2;
 }
-.medic-box .cate-list .item.active.data-v-f7aaac1e::after {
+.medic-box .cate-list .item.active.data-v-dd5fc6f3::after {
   content: "";
   width: 8rpx;
   height: 50rpx;
@@ -224,42 +224,42 @@
   top: 25rpx;
   left: 0;
 }
-.medic-box .medic.data-v-f7aaac1e {
+.medic-box .medic.data-v-dd5fc6f3 {
   box-sizing: border-box;
   width: calc(100% - 200rpx);
   height: 100%;
   padding: 0 30rpx;
 }
-.medic-box .medic .banner-box.data-v-f7aaac1e {
+.medic-box .medic .banner-box.data-v-dd5fc6f3 {
   margin-top: 30rpx;
   width: 100%;
   height: 160rpx;
   border-radius: 10rpx;
   overflow: hidden;
 }
-.medic-box .medic .banner-box .swiper.data-v-f7aaac1e,
-.medic-box .medic .banner-box .swiper-item.data-v-f7aaac1e,
-.medic-box .medic .banner-box .swiper-item image.data-v-f7aaac1e {
+.medic-box .medic .banner-box .swiper.data-v-dd5fc6f3,
+.medic-box .medic .banner-box .swiper-item.data-v-dd5fc6f3,
+.medic-box .medic .banner-box .swiper-item image.data-v-dd5fc6f3 {
   width: 100%;
   height: 100%;
 }
-.medic-box .medic .medic-list.data-v-f7aaac1e {
+.medic-box .medic .medic-list.data-v-dd5fc6f3 {
   box-sizing: border-box;
   padding: 30rpx 0;
   overflow-y: auto;
   height: calc(100% - 220rpx);
   position: relative;
 }
-.medic-box .medic .medic-list .inner-list.data-v-f7aaac1e {
+.medic-box .medic .medic-list .inner-list.data-v-dd5fc6f3 {
   display: flex;
   flex-wrap: wrap;
 }
-.medic-box .medic .medic-list .inner-list .definite.data-v-f7aaac1e {
+.medic-box .medic .medic-list .inner-list .definite.data-v-dd5fc6f3 {
   width: calc(33% - 20rpx);
   margin-right: 30rpx;
   margin-bottom: 30rpx;
 }
-.medic-box .medic .medic-list .inner-list .definite .img-box.data-v-f7aaac1e {
+.medic-box .medic .medic-list .inner-list .definite .img-box.data-v-dd5fc6f3 {
   width: 100%;
   height: 144rpx;
   background: #F5F5F5;
@@ -268,10 +268,10 @@
   display: flex;
   align-items: center;
 }
-.medic-box .medic .medic-list .inner-list .definite .img-box image.data-v-f7aaac1e {
+.medic-box .medic .medic-list .inner-list .definite .img-box image.data-v-dd5fc6f3 {
   max-width: 100%;
 }
-.medic-box .medic .medic-list .inner-list .definite .name.data-v-f7aaac1e {
+.medic-box .medic .medic-list .inner-list .definite .name.data-v-dd5fc6f3 {
   width: 100%;
   margin-top: 20rpx;
   font-size: 24rpx;
@@ -280,6 +280,6 @@
   color: #666666;
   text-align: center;
 }
-.medic-box .medic .medic-list .inner-list .definite.data-v-f7aaac1e:nth-child(3n) {
+.medic-box .medic .medic-list .inner-list .definite.data-v-dd5fc6f3:nth-child(3n) {
   margin-right: 0;
 }

unpackage/dist/dev/mp-weixin/pages_shop/success.js

@@ -1,5 +1,6 @@
 "use strict";
-var common_vendor = require("../common/vendor.js");
+const common_vendor = require("../common/vendor.js");
+const common_assets = require("../common/assets.js");
 const _sfc_main = {
   data() {
     return {
@@ -19,7 +20,7 @@ const _sfc_main = {
         data: text,
         success: () => {
           common_vendor.index.showToast({
-            title: "\u5185\u5BB9\u5DF2\u6210\u529F\u590D\u5236\u5230\u526A\u5207\u677F",
+            title: "内容已成功复制到剪切板",
             icon: "none"
           });
         }
@@ -40,16 +41,17 @@ const _sfc_main = {
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return {
-    a: common_vendor.o(($event) => $options.goOrderDetails($data.order.id)),
-    b: common_vendor.f($data.order.orderCodes, (item, k0, i0) => {
+    a: common_assets._imports_0$13,
+    b: common_vendor.o(($event) => $options.goOrderDetails($data.order.id)),
+    c: common_vendor.f($data.order.orderCodes, (item, k0, i0) => {
       return {
         a: common_vendor.t(item),
         b: item
       };
     }),
-    c: common_vendor.o(($event) => $options.copyOrderSn($data.orderCode)),
-    d: common_vendor.t($data.order.createTime)
+    d: common_vendor.o(($event) => $options.copyOrderSn($data.orderCode)),
+    e: common_vendor.t($data.order.createTime)
   };
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages_shop/success.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages_shop/success.wxml

@@ -1 +1 @@
-<view class="content"><view class="inner"><view class="top"><text class="title">支付成功</text><image class="icon" src="/static/images/success.png"></image><view class="btn-box"><view class="btn cancel" bindtap="{{a}}"> 查看订单</view></view></view><view class="order-info"><view class="title">订单信息</view><view class="item"><text class="label">订单编号</text><view class="sn-box"><view><view wx:for="{{b}}" wx:for-item="item" wx:key="b" class="text">{{item.a}}</view></view><view class="copy-btn" bindtap="{{c}}">复制</view></view></view><view class="item"><text class="label">下单时间</text><text class="text">{{d}}</text></view></view></view></view>
+<view class="content"><view class="inner"><view class="top"><text class="title">支付成功</text><image class="icon" src="{{a}}"></image><view class="btn-box"><view class="btn cancel" bindtap="{{b}}"> 查看订单</view></view></view><view class="order-info"><view class="title">订单信息</view><view class="item"><text class="label">订单编号</text><view class="sn-box"><view><view wx:for="{{c}}" wx:for-item="item" wx:key="b" class="text">{{item.a}}</view></view><view class="copy-btn" bindtap="{{d}}">复制</view></view></view><view class="item"><text class="label">下单时间</text><text class="text">{{e}}</text></view></view></view></view>

unpackage/dist/dev/mp-weixin/pages_user/addAddress.js

@@ -1,7 +1,7 @@
 "use strict";
-var common_vendor = require("../common/vendor.js");
-var api_order = require("../api/order.js");
-require("../common/request.js");
+const common_vendor = require("../common/vendor.js");
+const api_order = require("../api/order.js");
+const common_assets = require("../common/assets.js");
 const EvanSwitch = () => "../components/evan-switch/evan-switch.js";
 const _sfc_main = {
   components: {
@@ -12,15 +12,27 @@ const _sfc_main = {
       content: null,
       type: null,
       addressId: null,
-      isDefault: false,
-      addressList: [[], [], []],
+      // isDefault: false,
       multiIndex: [0, 0, 0],
       address: [],
+      addressList: [
+        [],
+        [],
+        []
+      ],
       form: {
         realName: null,
         phone: null,
+        addressId: null,
+        province: null,
+        city: null,
+        district: null,
+        // cityIds:null,
+        // postCode:null,
+        // longitude:null,
+        // latitude:null,
         detail: null,
-        address: null,
+        // address: null,
         isDefault: 0
       }
     };
@@ -30,18 +42,78 @@ const _sfc_main = {
     this.type = option.type;
     if (this.type == "edit") {
       common_vendor.index.setNavigationBarTitle({
-        title: "\u4FEE\u6539\u6536\u8D27\u5730\u5740"
+        title: "修改收货地址"
       });
+      this.form.addressId = option.addressId;
       this.addressId = option.addressId;
+      this.getAddressById();
     } else {
       common_vendor.index.setNavigationBarTitle({
-        title: "\u65B0\u589E\u6536\u8D27\u5730\u5740"
+        title: "新增收货地址"
       });
     }
     this.getCitys();
   },
   methods: {
+    logChange(value) {
+      console.log("isDefault 新值:", value);
+    },
+    parseAddress() {
+      if (this.content == null || this.content == "") {
+        common_vendor.index.showToast({
+          icon: "none",
+          title: "请输入地址信息"
+        });
+        return;
+      }
+      var data = {
+        content: this.content
+      };
+      api_order.parseAddress(data).then(
+        (res) => {
+          if (res.code == 200) {
+            this.form.realName = res.data.name;
+            this.form.phone = res.data.mobile;
+            this.form.address = res.data.provinceName + res.data.cityName + res.data.expAreaName;
+            this.form.province = res.data.provinceName;
+            this.form.city = res.data.cityName;
+            this.form.district = res.data.expAreaName;
+            this.form.detail = res.data.streetName + res.data.address;
+          } else {
+            common_vendor.index.showToast({
+              icon: "none",
+              title: res.msg
+            });
+          }
+        },
+        (rej) => {
+        }
+      );
+    },
+    getAddressById() {
+      var data = {
+        addressId: this.addressId
+      };
+      api_order.getAddressById(data).then(
+        (res) => {
+          if (res.code == 200) {
+            this.form = res.data;
+            console.log(" this.form", this.form);
+            this.isDefault = this.form.isDefault == 1 ? true : false;
+            this.form.address = this.form.province + this.form.city + this.form.district;
+          } else {
+            common_vendor.index.showToast({
+              icon: "none",
+              title: res.msg
+            });
+          }
+        },
+        (rej) => {
+        }
+      );
+    },
     submit() {
+      console.log("提交数据:", JSON.stringify(this.form));
       if (this.type == "add") {
         this.addAddress();
       } else if (this.type == "edit") {
@@ -50,50 +122,57 @@ const _sfc_main = {
     },
     editAddress() {
       this.form.isDefault = this.isDefault ? 1 : 0;
-      api_order.editAddress(this.form).then((res) => {
-        if (res.code == 200) {
-          common_vendor.index.showToast({
-            icon: "success",
-            title: "\u64CD\u4F5C\u6210\u529F"
-          });
-          setTimeout(function() {
-            common_vendor.index.$emit("refreshAddress");
-            common_vendor.index.navigateBack({
-              delta: 1
+      api_order.editAddress(submitData).then(
+        (res) => {
+          if (res.code == 200) {
+            common_vendor.index.showToast({
+              icon: "success",
+              title: "操作成功"
             });
-          }, 500);
-        } else {
-          common_vendor.index.showToast({
-            icon: "none",
-            title: res.msg
-          });
+            setTimeout(function() {
+              common_vendor.index.$emit("refreshAddress");
+              common_vendor.index.navigateBack({
+                delta: 1
+              });
+            }, 500);
+          } else {
+            common_vendor.index.showToast({
+              icon: "none",
+              title: res.msg
+            });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
     addAddress() {
       this.form.isDefault = this.isDefault ? 1 : 0;
-      api_order.addAddress(this.form).then((res) => {
-        if (res.code == 200) {
-          common_vendor.index.showToast({
-            icon: "success",
-            title: "\u64CD\u4F5C\u6210\u529F"
-          });
-          setTimeout(function() {
-            common_vendor.index.$emit("refreshAddress");
-            common_vendor.index.navigateBack({
-              delta: 1
+      api_order.addAddress(this.form).then(
+        (res) => {
+          if (res.code == 200) {
+            common_vendor.index.showToast({
+              icon: "success",
+              title: "操作成功"
             });
-          }, 500);
-        } else {
-          common_vendor.index.showToast({
-            icon: "none",
-            title: res.msg
-          });
+            setTimeout(function() {
+              common_vendor.index.$emit("refreshAddress");
+              common_vendor.index.navigateBack({
+                delta: 1
+              });
+            }, 500);
+          } else {
+            common_vendor.index.showToast({
+              icon: "none",
+              title: res.msg
+            });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
+    // 地区选择
     pickerChange(e) {
       this.multiIndex = e.detail.value;
       this.form.address = this.addressList[0][this.multiIndex[0]].n + this.addressList[1][this.multiIndex[1]].n + this.addressList[2][this.multiIndex[2]].n;
@@ -120,26 +199,29 @@ const _sfc_main = {
       }
     },
     getCitys() {
-      api_order.getCitys().then((res) => {
-        if (res.code == 200) {
-          this.address = res.data;
-          for (var i = 0; i < this.address.length; i++) {
-            this.addressList[0].push(this.address[i]);
-          }
-          for (var i = 0; i < this.address[0].c.length; i++) {
-            this.addressList[1].push(this.address[0].c[i]);
-          }
-          for (var i = 0; i < this.address[0].c[0].c.length; i++) {
-            this.addressList[2].push(this.address[0].c[0].c[i]);
+      api_order.getCitys().then(
+        (res) => {
+          if (res.code == 200) {
+            this.address = res.data;
+            for (var i = 0; i < this.address.length; i++) {
+              this.addressList[0].push(this.address[i]);
+            }
+            for (var i = 0; i < this.address[0].c.length; i++) {
+              this.addressList[1].push(this.address[0].c[i]);
+            }
+            for (var i = 0; i < this.address[0].c[0].c.length; i++) {
+              this.addressList[2].push(this.address[0].c[0].c[i]);
+            }
+          } else {
+            common_vendor.index.showToast({
+              icon: "none",
+              title: "请求失败"
+            });
           }
-        } else {
-          common_vendor.index.showToast({
-            icon: "none",
-            title: "\u8BF7\u6C42\u5931\u8D25"
-          });
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     }
   }
 };
@@ -155,27 +237,29 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return {
     a: $data.content,
     b: common_vendor.o(($event) => $data.content = $event.detail.value),
-    c: common_vendor.o(($event) => _ctx.parseAddress()),
+    c: common_vendor.o(($event) => $options.parseAddress()),
     d: $data.form.realName,
     e: common_vendor.o(($event) => $data.form.realName = $event.detail.value),
     f: $data.form.phone,
     g: common_vendor.o(($event) => $data.form.phone = $event.detail.value),
     h: $data.form.address,
     i: common_vendor.o(($event) => $data.form.address = $event.detail.value),
-    j: $data.multiIndex,
-    k: $data.addressList,
-    l: common_vendor.o((...args) => $options.pickerChange && $options.pickerChange(...args)),
-    m: common_vendor.o((...args) => $options.pickerColumnchange && $options.pickerColumnchange(...args)),
-    n: $data.form.detail,
-    o: common_vendor.o(($event) => $data.form.detail = $event.detail.value),
-    p: common_vendor.o(($event) => $data.isDefault = $event),
-    q: common_vendor.p({
+    j: common_assets._imports_0$11,
+    k: $data.multiIndex,
+    l: $data.addressList,
+    m: common_vendor.o((...args) => $options.pickerChange && $options.pickerChange(...args)),
+    n: common_vendor.o((...args) => $options.pickerColumnchange && $options.pickerColumnchange(...args)),
+    o: $data.form.detail,
+    p: common_vendor.o(($event) => $data.form.detail = $event.detail.value),
+    q: common_vendor.o($options.logChange),
+    r: common_vendor.o(($event) => _ctx.isDefault = $event),
+    s: common_vendor.p({
       activeColor: "#0bb3f2",
       inactiveColor: "rgba(0, 0, 0, 0.1)",
-      modelValue: $data.isDefault
+      modelValue: _ctx.isDefault
     }),
-    r: common_vendor.o(($event) => $options.submit())
+    t: common_vendor.o(($event) => $options.submit())
   };
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages_user/addAddress.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages_user/addAddress.wxml

@@ -1 +1 @@
-<view class="content"><view class="inner"><view class="address-box"><block wx:if="{{r0}}"><textarea class="textarea" placeholder="请粘贴或输入文本,点击'识别'自动识别姓名、电话、地址,格式:深圳市龙岗区坂田街道长坑路西2巷2号202 黄大大 18888888888" value="{{a}}" bindinput="{{b}}"/></block><view class="btns"><view class="btn parse" bindtap="{{c}}">识别</view></view></view><view class="form-box"><view class="form-item"><text class="label">联系人</text><input type="text" maxlength="10" placeholder="姓名" class="form-input" value="{{d}}" bindinput="{{e}}"/></view><view class="form-item"><text class="label">手机号</text><input type="number" maxlength="11" placeholder="手机号" class="form-input" value="{{f}}" bindinput="{{g}}"/></view><view class="form-item"><text class="label">所在地区</text><picker value="{{j}}" class="birth-picker" mode="multiSelector" range-key="n" range="{{k}}" bindchange="{{l}}" bindcolumnchange="{{m}}"><view class="right-box"><view class="input-box"><input type="text" placeholder="请选择" class="form-input" disabled="disabled" value="{{h}}" bindinput="{{i}}"/></view><image class="arrow" src="/static/images/arrow_gray.png" mode=""></image></view></picker></view><view class="form-item"><text class="label">详细地址</text><block wx:if="{{r0}}"><textarea class="form-textarea" placeholder="请输入详细地址" value="{{n}}" bindinput="{{o}}"/></block></view></view><view class="setting-box"><text class="label">设为默认地址</text><evan-switch wx:if="{{q}}" u-i="34d4ffc8-0" bind:__l="__l" bindupdateModelValue="{{p}}" u-p="{{q}}"></evan-switch></view></view><view class="btn-box"><view class="sub-btn" bindtap="{{r}}">保存地址</view></view></view>
+<view class="content"><view class="inner"><view class="address-box"><block wx:if="{{r0}}"><textarea class="textarea" placeholder="请粘贴或输入文本,点击'识别'自动识别姓名、电话、地址,格式:深圳市龙岗区坂田街道长坑路西2巷2号202 黄大大 18888888888" value="{{a}}" bindinput="{{b}}"/></block><view class="btns"><view class="btn parse" bindtap="{{c}}">识别</view></view></view><view class="form-box"><view class="form-item"><text class="label">联系人</text><input type="text" maxlength="10" placeholder="姓名" class="form-input" value="{{d}}" bindinput="{{e}}"/></view><view class="form-item"><text class="label">手机号</text><input type="number" maxlength="11" placeholder="手机号" class="form-input" value="{{f}}" bindinput="{{g}}"/></view><view class="form-item"><text class="label">所在地区</text><picker value="{{k}}" class="birth-picker" mode="multiSelector" range-key="n" range="{{l}}" bindchange="{{m}}" bindcolumnchange="{{n}}"><view class="right-box"><view class="input-box"><input type="text" placeholder="请选择" class="form-input" disabled="disabled" value="{{h}}" bindinput="{{i}}"/></view><image class="arrow" src="{{j}}" mode=""></image></view></picker></view><view class="form-item"><text class="label">详细地址</text><block wx:if="{{r0}}"><textarea class="form-textarea" placeholder="请输入详细地址" value="{{o}}" bindinput="{{p}}"/></block></view></view><view class="setting-box"><text class="label">设为默认地址</text><evan-switch wx:if="{{s}}" bindchange="{{q}}" u-i="34d4ffc8-0" bind:__l="__l" bindupdateModelValue="{{r}}" u-p="{{s}}"></evan-switch></view></view><view class="btn-box"><view class="sub-btn" bindtap="{{t}}">保存地址</view></view></view>

unpackage/dist/dev/mp-weixin/pages_user/address.js

@@ -1,7 +1,7 @@
 "use strict";
-var common_vendor = require("../common/vendor.js");
-var api_order = require("../api/order.js");
-require("../common/request.js");
+const common_vendor = require("../common/vendor.js");
+const api_order = require("../api/order.js");
+const common_assets = require("../common/assets.js");
 const _sfc_main = {
   data() {
     return {
@@ -14,64 +14,131 @@ const _sfc_main = {
       this.getUserAddr();
     });
   },
+  // mounted() {
+  // 	this.getUserAddr()
+  // },
   methods: {
+    // 获取用户收货地址
     getUserAddr() {
       this.userInfo = JSON.parse(common_vendor.index.getStorageSync("userInfo"));
-      api_order.userAddr(this.userInfo.userId).then((res) => {
-        if (res.code == 200) {
-          console.log("\u7528\u6237\u6536\u8D27\u5730\u5740>>>>", res.data);
-          this.address = res.data;
-        } else {
-          common_vendor.index.showToast({
-            title: res.msg,
-            icon: "none"
-          });
+      api_order.userAddr(this.userInfo.userId).then(
+        (res) => {
+          if (res.code == 200) {
+            console.log("用户收货地址>>>>", res.data);
+            this.address = res.data;
+          } else {
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
+          }
+        },
+        (rej) => {
         }
-      }, (rej) => {
-      });
+      );
     },
+    // 选地址
     selectAddress(item) {
       common_vendor.index.$emit("updateAddress", item);
       common_vendor.index.navigateBack({
         delta: 1
       });
     },
+    // 编辑地址
     editAddress(item) {
       common_vendor.index.navigateTo({
         url: "./addAddress?type=edit&addressId=" + item.addressId
       });
     },
+    // 删除所有地址(暂无)
+    // delAllAddress(item) {
+    // 	uni.showModal({
+    // 		title: "提示",
+    // 		content: "确认删除所有地址吗?",
+    // 		showCancel: true,
+    // 		cancelText: '取消',
+    // 		confirmText: '确定',
+    // 		success: res => {
+    // 			if (res.confirm) {
+    // 				var data = {}
+    // 				delAllAddress(data).then(
+    // 					res => {
+    // 						if (res.code == 200) {
+    // 							uni.showToast({
+    // 								icon: 'success',
+    // 								title: "操作成功",
+    // 							});
+    // 							this.getAddressList()
+    // 						} else {
+    // 							uni.showToast({
+    // 								icon: 'none',
+    // 								title: "请求失败",
+    // 							});
+    // 						}
+    // 					},
+    // 					rej => {}
+    // 				);
+    // 			} else {
+    // 				// 否则点击了取消  
+    // 			}
+    // 		}
+    // 	})
+    // },
+    // 删除地址
     delAddress(item) {
       common_vendor.index.showModal({
-        title: "\u63D0\u793A",
-        content: "\u786E\u8BA4\u5220\u9664\u6B64\u5730\u5740\u5417?",
+        title: "提示",
+        content: "确认删除此地址吗?",
         showCancel: true,
-        cancelText: "\u53D6\u6D88",
-        confirmText: "\u786E\u5B9A",
+        cancelText: "取消",
+        confirmText: "确定",
         success: (res) => {
           if (res.confirm) {
             var data = {
               addressId: item.addressId
             };
-            api_order.delAddress(data).then((res2) => {
-              if (res2.code == 200) {
-                common_vendor.index.showToast({
-                  icon: "success",
-                  title: "\u64CD\u4F5C\u6210\u529F"
-                });
-                this.getUserAddr();
-              } else {
-                common_vendor.index.showToast({
-                  icon: "none",
-                  title: "\u8BF7\u6C42\u5931\u8D25"
-                });
+            api_order.delAddress(data).then(
+              (res2) => {
+                if (res2.code == 200) {
+                  common_vendor.index.showToast({
+                    icon: "success",
+                    title: "操作成功"
+                  });
+                  this.getUserAddr();
+                } else {
+                  common_vendor.index.showToast({
+                    icon: "none",
+                    title: "请求失败"
+                  });
+                }
+              },
+              (rej) => {
               }
-            }, (rej) => {
-            });
+            );
           }
         }
       });
     },
+    // getAddressList(){
+    // 	uni.showLoading({
+    // 		title:"正在加载中"
+    // 	})
+    // 	getAddressList().then(
+    // 		res => {
+    // 			uni.hideLoading()
+    // 			if(res.code==200){
+    // 				this.address=res.data;
+    // 			}else{
+    // 				uni.showToast({
+    // 					icon:'none',
+    // 					title: "请求失败",
+    // 				});
+    // 			}
+    // 		},
+    // 		rej => {}
+    // 	);
+    // },
+    // 新建收货地址
     addAdress() {
       common_vendor.index.navigateTo({
         url: "./addAddress?type=add"
@@ -91,18 +158,21 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         e: common_vendor.t(item.detail),
         f: common_vendor.t(item.realName),
         g: common_vendor.t(_ctx.$parsePhone(item.phone)),
-        h: common_vendor.o(($event) => $options.selectAddress(item)),
-        i: common_vendor.o(($event) => $options.delAddress(item)),
-        j: common_vendor.o(($event) => $options.editAddress(item)),
+        h: common_vendor.o(($event) => $options.selectAddress(item), index),
+        i: common_vendor.o(($event) => $options.delAddress(item), index),
+        j: common_vendor.o(($event) => $options.editAddress(item), index),
         k: index
       });
     }),
-    b: $data.address.length == 0
+    b: common_assets._imports_0$14,
+    c: common_assets._imports_1$8,
+    d: $data.address.length == 0
   }, $data.address.length == 0 ? {
-    c: common_vendor.o(($event) => _ctx.getAddressList())
+    e: common_assets._imports_2$3,
+    f: common_vendor.o(($event) => _ctx.getAddressList())
   } : {}, {
-    d: common_vendor.o((...args) => $options.addAdress && $options.addAdress(...args))
+    g: common_vendor.o((...args) => $options.addAdress && $options.addAdress(...args))
   });
 }
-var MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/pages_user/address.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages_user/address.wxml

@@ -1 +1 @@
-<view class="content"><view class="inner"><view wx:for="{{a}}" wx:for-item="item" wx:key="k" class="address-item"><view class="info" bindtap="{{item.h}}"><view class="title"><view wx:if="{{item.a}}" class="tag">默认</view> {{item.b}}{{item.c}}{{item.d}}{{item.e}}</view><view class="name-phone"><text class="text">{{item.f}}</text><text class="text">{{item.g}}</text></view></view><view class="operat-box"><image src="/static/images/del1.png" mode="" bindtap="{{item.i}}"></image><image src="/static/images/edit.png" mode="" bindtap="{{item.j}}"></image></view></view><view wx:if="{{b}}" class="no-data-box" bindtap="{{c}}"><image src="/static/images/no_data.png" mode="aspectFit"></image><view class="empty-title">暂无数据</view></view></view><view class="btn-box"><view class="sub-btn" bindtap="{{d}}">新建收货地址</view></view></view>
+<view class="content"><view class="inner"><view wx:for="{{a}}" wx:for-item="item" wx:key="k" class="address-item"><view class="info" bindtap="{{item.h}}"><view class="title"><view wx:if="{{item.a}}" class="tag">默认</view> {{item.b}}{{item.c}}{{item.d}}{{item.e}}</view><view class="name-phone"><text class="text">{{item.f}}</text><text class="text">{{item.g}}</text></view></view><view class="operat-box"><image src="{{b}}" mode="" bindtap="{{item.i}}"></image><image src="{{c}}" mode="" bindtap="{{item.j}}"></image></view></view><view wx:if="{{d}}" class="no-data-box" bindtap="{{f}}"><image src="{{e}}" mode="aspectFit"></image><view class="empty-title">暂无数据</view></view></view><view class="btn-box"><view class="sub-btn" bindtap="{{g}}">新建收货地址</view></view></view>

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -10,7 +10,7 @@
       "list": [
         {
           "name": "pages_shop/confirmCreateOrder",
-          "pathName": "pages_shop/cart",
+          "pathName": "pages_shop/store",
           "query": "",
           "scene": null,
           "launchMode": "default"

unpackage/dist/dev/mp-weixin/store/index.js

@@ -1,9 +1,9 @@
 "use strict";
-var common_vendor = require("../common/vendor.js");
-var store_modules_app = require("./modules/app.js");
-var store_modules_user = require("./modules/user.js");
-var store_modules_cate = require("./modules/cate.js");
-var store_getters = require("./getters.js");
+const common_vendor = require("../common/vendor.js");
+const store_modules_app = require("./modules/app.js");
+const store_modules_user = require("./modules/user.js");
+const store_modules_cate = require("./modules/cate.js");
+const store_getters = require("./getters.js");
 const store = common_vendor.createStore({
   modules: {
     app: store_modules_app.app,

unpackage/dist/dev/mp-weixin/store/modules/app.js

@@ -2,6 +2,7 @@
 require("../../common/vendor.js");
 const app = {
   state: {
+    // 当前终端平台
     platform: ""
   },
   mutations: {

unpackage/dist/dev/mp-weixin/store/modules/cate.js

@@ -1,7 +1,8 @@
 "use strict";
-var common_vendor = require("../../common/vendor.js");
+const common_vendor = require("../../common/vendor.js");
 const cate = {
   state: {
+    // 当前终端平台
     cate_history: common_vendor.index.getStorageSync("cate_history") ? common_vendor.index.getStorageSync("cate_history") : []
   },
   mutations: {

unpackage/dist/dev/mp-weixin/store/modules/user.js

@@ -1,9 +1,9 @@
 "use strict";
-var common_vendor = require("../../common/vendor.js");
-var store_mutationTypes = require("../mutation-types.js");
-var utils_storage = require("../../utils/storage.js");
+const common_vendor = require("../../common/vendor.js");
+const store_mutationTypes = require("../mutation-types.js");
+const utils_storage = require("../../utils/storage.js");
 require("../../api/login.js");
-var core_app = require("../../core/app.js");
+const core_app = require("../../core/app.js");
 const loginSuccess = (commit, {
   token,
   id,
@@ -18,7 +18,9 @@ const loginSuccess = (commit, {
 };
 const user = {
   state: {
+    // 用户认证token
     token: common_vendor.index.getStorageSync(store_mutationTypes.ACCESS_TOKEN),
+    // 用户ID
     userId: common_vendor.index.getStorageSync(store_mutationTypes.USER_ID),
     userInfo: common_vendor.index.getStorageSync(store_mutationTypes.USER_INFO),
     parent_id: null
@@ -38,6 +40,7 @@ const user = {
     }
   },
   actions: {
+    // 用户登录(普通登录: 输入手机号和验证码)
     async LoginWX({
       commit
     }, data) {
@@ -55,6 +58,7 @@ const user = {
         }
       }
     },
+    // 用户登录(普通登录: 输入手机号和验证码)
     async LoginApp({
       commit
     }, data) {
@@ -69,6 +73,7 @@ const user = {
         return Promise.resolve(result);
       }
     },
+    // H5登陆
     async LoginH5({
       commit
     }, data) {
@@ -85,6 +90,7 @@ const user = {
         }
       }
     },
+    // 退出登录
     async Logout({
       commit
     }, data) {

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-avatar/props.js

@@ -1,63 +1,78 @@
 "use strict";
-var uni_modules_uviewPlus_libs_config_props = require("../../libs/config/props.js");
-var uni_modules_uviewPlus_libs_function_test = require("../../libs/function/test.js");
-var props = {
+const uni_modules_uviewPlus_libs_config_props = require("../../libs/config/props.js");
+const uni_modules_uviewPlus_libs_function_test = require("../../libs/function/test.js");
+const props = {
   props: {
+    // 头像图片路径(不能为相对路径)
     src: {
       type: String,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.avatar.src
     },
+    // 头像形状，circle-圆形，square-方形
     shape: {
       type: String,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.avatar.shape
     },
+    // 头像尺寸
     size: {
       type: [String, Number],
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.avatar.size
     },
+    // 裁剪模式
     mode: {
       type: String,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.avatar.mode
     },
+    // 显示的文字
     text: {
       type: String,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.avatar.text
     },
+    // 背景色
     bgColor: {
       type: String,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.avatar.bgColor
     },
+    // 文字颜色
     color: {
       type: String,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.avatar.color
     },
+    // 文字大小
     fontSize: {
       type: [String, Number],
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.avatar.fontSize
     },
+    // 显示的图标
     icon: {
       type: String,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.avatar.icon
     },
+    // 显示小程序头像，只对百度，微信，QQ小程序有效
     mpAvatar: {
       type: Boolean,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.avatar.mpAvatar
     },
+    // 是否使用随机背景色
     randomBgColor: {
       type: Boolean,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.avatar.randomBgColor
     },
+    // 加载失败的默认头像(组件有内置默认图片)
     defaultUrl: {
       type: String,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.avatar.defaultUrl
     },
+    // 如果配置了randomBgColor为true，且配置了此值，则从默认的背景色数组中取出对应索引的颜色值，取值0-19之间
     colorIndex: {
       type: [String, Number],
+      // 校验参数规则，索引在0-19之间
       validator(n) {
         return uni_modules_uviewPlus_libs_function_test.test.range(n, [0, 19]) || n === "";
       },
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.avatar.colorIndex
     },
+    // 组件标识符
     name: {
       type: String,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.avatar.name

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-avatar/u-avatar.wxml

@@ -1 +1 @@
-<view class="{{['u-avatar', 'data-v-7ad729fa', m]}}" style="{{n + ';' + o}}" bindtap="{{p}}"><block wx:if="{{$slots.d}}"><slot></slot></block><block wx:else><open-data wx:if="{{a}}" class="data-v-7ad729fa" type="userAvatarUrl" style="{{b}}"/><block wx:if="{{c}}"></block><u-icon wx:elif="{{d}}" class="data-v-7ad729fa" u-i="7ad729fa-0" bind:__l="__l" u-p="{{e}}"></u-icon><u-text wx:elif="{{f}}" class="data-v-7ad729fa" u-i="7ad729fa-1" bind:__l="__l" u-p="{{g}}"></u-text><image wx:else class="{{['u-avatar__image', 'data-v-7ad729fa', h]}}" src="{{i}}" mode="{{j}}" binderror="{{k}}" style="{{l}}"></image></block></view>
+<view class="{{['u-avatar', 'data-v-34d954f9', m]}}" style="{{n + ';' + o}}" bindtap="{{p}}"><block wx:if="{{$slots.d}}"><slot></slot></block><block wx:else><open-data wx:if="{{a}}" class="data-v-34d954f9" type="userAvatarUrl" style="{{b}}"/><block wx:if="{{c}}"></block><u-icon wx:elif="{{d}}" class="data-v-34d954f9" u-i="34d954f9-0" bind:__l="__l" u-p="{{e}}"></u-icon><u-text wx:elif="{{f}}" class="data-v-34d954f9" u-i="34d954f9-1" bind:__l="__l" u-p="{{g}}"></u-text><image wx:else class="{{['u-avatar__image', 'data-v-34d954f9', h]}}" src="{{i}}" mode="{{j}}" binderror="{{k}}" style="{{l}}"></image></block></view>

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-avatar/u-avatar.wxss

@@ -24,14 +24,14 @@
 /* 透明度 */
 /* 文章场景相关 */
 /*自定义主题色 */
-.u-empty.data-v-7ad729fa,
-.u-empty__wrap.data-v-7ad729fa,
-.u-tabs.data-v-7ad729fa,
-.u-tabs__wrapper.data-v-7ad729fa,
-.u-tabs__wrapper__scroll-view-wrapper.data-v-7ad729fa,
-.u-tabs__wrapper__scroll-view.data-v-7ad729fa,
-.u-tabs__wrapper__nav.data-v-7ad729fa,
-.u-tabs__wrapper__nav__line.data-v-7ad729fa {
+.u-empty.data-v-34d954f9,
+.u-empty__wrap.data-v-34d954f9,
+.u-tabs.data-v-34d954f9,
+.u-tabs__wrapper.data-v-34d954f9,
+.u-tabs__wrapper__scroll-view-wrapper.data-v-34d954f9,
+.u-tabs__wrapper__scroll-view.data-v-34d954f9,
+.u-tabs__wrapper__nav.data-v-34d954f9,
+.u-tabs__wrapper__nav__line.data-v-34d954f9 {
   display: flex;
   flex-direction: column;
   flex-shrink: 0;
@@ -40,24 +40,22 @@
   align-items: stretch;
   align-content: flex-start;
 }
-.u-avatar.data-v-7ad729fa {
-
+.u-avatar.data-v-34d954f9 {
   display: flex;
-
   flex-direction: row;
   align-items: center;
   justify-content: center;
 }
-.u-avatar--circle.data-v-7ad729fa {
+.u-avatar--circle.data-v-34d954f9 {
   border-radius: 100px;
 }
-.u-avatar--square.data-v-7ad729fa {
+.u-avatar--square.data-v-34d954f9 {
   border-radius: 4px;
 }
-.u-avatar__image--circle.data-v-7ad729fa {
+.u-avatar__image--circle.data-v-34d954f9 {
   border-radius: 100px;
   overflow: hidden;
 }
-.u-avatar__image--square.data-v-7ad729fa {
+.u-avatar__image--square.data-v-34d954f9 {
   border-radius: 4px;
 }

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/props.js

@@ -1,59 +1,76 @@
 "use strict";
-var uni_modules_uviewPlus_libs_config_props = require("../../libs/config/props.js");
-var props = {
+const uni_modules_uviewPlus_libs_config_props = require("../../libs/config/props.js");
+const props = {
   props: {
+    // 是否显示圆点
     isDot: {
       type: Boolean,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.isDot
     },
+    // 显示的内容
     value: {
       type: [Number, String],
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.value
     },
+    // 显示的内容
     modelValue: {
       type: [Number, String],
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.modelValue
     },
+    // 是否显示
     show: {
       type: Boolean,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.show
     },
+    // 最大值，超过最大值会显示 '{max}+'
     max: {
       type: [Number, String],
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.max
     },
+    // 主题类型，error|warning|success|primary
     type: {
       type: String,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.type
     },
+    // 当数值为 0 时，是否展示 Badge
     showZero: {
       type: Boolean,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.showZero
     },
+    // 背景颜色，优先级比type高，如设置，type参数会失效
     bgColor: {
       type: [String, null],
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.bgColor
     },
+    // 字体颜色
     color: {
       type: [String, null],
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.color
     },
+    // 徽标形状，circle-四角均为圆角，horn-左下角为直角
     shape: {
       type: String,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.shape
     },
+    // 设置数字的显示方式，overflow|ellipsis|limit
+    // overflow会根据max字段判断，超出显示`${max}+`
+    // ellipsis会根据max判断，超出显示`${max}...`
+    // limit会依据1000作为判断条件，超出1000，显示`${value/1000}K`，比如2.2k、3.34w，最多保留2位小数
     numberType: {
       type: String,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.numberType
     },
+    // 设置badge的位置偏移，格式为 [x, y]，也即设置的为top和right的值，absolute为true时有效
     offset: {
       type: Array,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.offset
     },
+    // 是否反转背景和字体颜色
     inverted: {
       type: Boolean,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.inverted
     },
+    // 是否绝对定位
     absolute: {
       type: Boolean,
       default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.absolute

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/u-badge.js

@@ -1,111 +1,19 @@
 "use strict";
-var uni_modules_uviewPlus_components_uBadge_props = require("./props.js");
-var uni_modules_uviewPlus_libs_mixin_mpMixin = require("../../libs/mixin/mpMixin.js");
-var uni_modules_uviewPlus_libs_mixin_mixin = require("../../libs/mixin/mixin.js");
-var uni_modules_uviewPlus_libs_function_index = require("../../libs/function/index.js");
-var common_vendor = require("../../../../common/vendor.js");
-require("../../libs/config/props.js");
-require("../../libs/config/config.js");
-require("../../libs/config/props/actionSheet.js");
-require("../../libs/config/props/album.js");
-require("../../libs/config/props/alert.js");
-require("../../libs/config/props/avatar.js");
-require("../../libs/config/props/avatarGroup.js");
-require("../../libs/config/props/backtop.js");
-require("../../libs/config/props/badge.js");
-require("../../libs/config/props/button.js");
-require("../../libs/config/props/calendar.js");
-require("../../libs/config/props/carKeyboard.js");
-require("../../libs/config/props/cell.js");
-require("../../libs/config/props/cellGroup.js");
-require("../../libs/config/props/checkbox.js");
-require("../../libs/config/props/checkboxGroup.js");
-require("../../libs/config/props/circleProgress.js");
-require("../../libs/config/props/code.js");
-require("../../libs/config/props/codeInput.js");
-require("../../libs/config/props/col.js");
-require("../../libs/config/props/collapse.js");
-require("../../libs/config/props/collapseItem.js");
-require("../../libs/config/props/columnNotice.js");
-require("../../libs/config/props/countDown.js");
-require("../../libs/config/props/countTo.js");
-require("../../libs/config/props/datetimePicker.js");
-require("../../libs/config/props/divider.js");
-require("../../libs/config/props/empty.js");
-require("../../libs/config/props/form.js");
-require("../../libs/config/props/formItem.js");
-require("../../libs/config/props/gap.js");
-require("../../libs/config/props/grid.js");
-require("../../libs/config/props/gridItem.js");
-require("../../libs/config/props/icon.js");
-require("../../libs/config/props/image.js");
-require("../../libs/config/props/indexAnchor.js");
-require("../../libs/config/props/indexList.js");
-require("../../libs/config/props/input.js");
-require("../../libs/config/props/keyboard.js");
-require("../../libs/config/props/line.js");
-require("../../libs/config/props/lineProgress.js");
-require("../../libs/config/props/link.js");
-require("../../libs/config/props/list.js");
-require("../../libs/config/props/listItem.js");
-require("../../libs/config/props/loadingIcon.js");
-require("../../libs/config/props/loadingPage.js");
-require("../../libs/config/props/loadmore.js");
-require("../../libs/config/props/modal.js");
-require("../../libs/config/props/navbar.js");
-require("../../libs/config/color.js");
-require("../../libs/config/props/noNetwork.js");
-require("../../libs/config/props/noticeBar.js");
-require("../../libs/config/props/notify.js");
-require("../../libs/config/props/numberBox.js");
-require("../../libs/config/props/numberKeyboard.js");
-require("../../libs/config/props/overlay.js");
-require("../../libs/config/props/parse.js");
-require("../../libs/config/props/picker.js");
-require("../../libs/config/props/popup.js");
-require("../../libs/config/props/radio.js");
-require("../../libs/config/props/radioGroup.js");
-require("../../libs/config/props/rate.js");
-require("../../libs/config/props/readMore.js");
-require("../../libs/config/props/row.js");
-require("../../libs/config/props/rowNotice.js");
-require("../../libs/config/props/scrollList.js");
-require("../../libs/config/props/search.js");
-require("../../libs/config/props/section.js");
-require("../../libs/config/props/skeleton.js");
-require("../../libs/config/props/slider.js");
-require("../../libs/config/props/statusBar.js");
-require("../../libs/config/props/steps.js");
-require("../../libs/config/props/stepsItem.js");
-require("../../libs/config/props/sticky.js");
-require("../../libs/config/props/subsection.js");
-require("../../libs/config/props/swipeAction.js");
-require("../../libs/config/props/swipeActionItem.js");
-require("../../libs/config/props/swiper.js");
-require("../../libs/config/props/swipterIndicator.js");
-require("../../libs/config/props/switch.js");
-require("../../libs/config/props/tabbar.js");
-require("../../libs/config/props/tabbarItem.js");
-require("../../libs/config/props/tabs.js");
-require("../../libs/config/props/tag.js");
-require("../../libs/config/props/text.js");
-require("../../libs/config/props/textarea.js");
-require("../../libs/config/props/toast.js");
-require("../../libs/config/props/toolbar.js");
-require("../../libs/config/props/tooltip.js");
-require("../../libs/config/props/transition.js");
-require("../../libs/config/props/upload.js");
-require("../../libs/function/test.js");
-require("../../libs/util/route.js");
-require("../../libs/function/digit.js");
+const uni_modules_uviewPlus_components_uBadge_props = require("./props.js");
+const uni_modules_uviewPlus_libs_mixin_mpMixin = require("../../libs/mixin/mpMixin.js");
+const uni_modules_uviewPlus_libs_mixin_mixin = require("../../libs/mixin/mixin.js");
+const uni_modules_uviewPlus_libs_function_index = require("../../libs/function/index.js");
+const common_vendor = require("../../../../common/vendor.js");
 const _sfc_main = {
   name: "u-badge",
   mixins: [uni_modules_uviewPlus_libs_mixin_mpMixin.mpMixin, uni_modules_uviewPlus_components_uBadge_props.props, uni_modules_uviewPlus_libs_mixin_mixin.mixin],
   computed: {
+    // 是否将badge中心与父组件右上角重合
     boxStyle() {
       let style = {};
       return style;
     },
+    // 整个组件的样式
     badgeStyle() {
       const style = {};
       if (this.color) {
@@ -155,5 +63,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     h: common_vendor.s($options.badgeStyle)
   } : {});
 }
-var Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-84d64f8a"], ["__file", "C:/Users/Administrator/Desktop/\u9879\u76EE/\u76F4\u64AD/liveH5-v3/uni_modules/uview-plus/components/u-badge/u-badge.vue"]]);
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-06cca9b7"]]);
 wx.createComponent(Component);

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/u-badge.wxml

@@ -1 +1 @@
-<text wx:if="{{a}}" class="{{[c, d, e, f, 'u-badge', 'data-v-84d64f8a']}}" style="{{g + ';' + h}}">{{b}}</text>
+<text wx:if="{{a}}" class="{{[c, d, e, f, 'u-badge', 'data-v-06cca9b7']}}" style="{{g + ';' + h}}">{{b}}</text>

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/u-badge.wxss

@@ -24,14 +24,14 @@
 /* 透明度 */
 /* 文章场景相关 */
 /*自定义主题色 */
-.u-empty.data-v-84d64f8a,
-.u-empty__wrap.data-v-84d64f8a,
-.u-tabs.data-v-84d64f8a,
-.u-tabs__wrapper.data-v-84d64f8a,
-.u-tabs__wrapper__scroll-view-wrapper.data-v-84d64f8a,
-.u-tabs__wrapper__scroll-view.data-v-84d64f8a,
-.u-tabs__wrapper__nav.data-v-84d64f8a,
-.u-tabs__wrapper__nav__line.data-v-84d64f8a {
+.u-empty.data-v-06cca9b7,
+.u-empty__wrap.data-v-06cca9b7,
+.u-tabs.data-v-06cca9b7,
+.u-tabs__wrapper.data-v-06cca9b7,
+.u-tabs__wrapper__scroll-view-wrapper.data-v-06cca9b7,
+.u-tabs__wrapper__scroll-view.data-v-06cca9b7,
+.u-tabs__wrapper__nav.data-v-06cca9b7,
+.u-tabs__wrapper__nav__line.data-v-06cca9b7 {
   display: flex;
   flex-direction: column;
   flex-shrink: 0;
@@ -40,60 +40,58 @@
   align-items: stretch;
   align-content: flex-start;
 }
-.u-badge.data-v-84d64f8a {
+.u-badge.data-v-06cca9b7 {
   border-top-right-radius: 100px;
   border-top-left-radius: 100px;
   border-bottom-left-radius: 100px;
   border-bottom-right-radius: 100px;
-
   display: flex;
-
   flex-direction: row;
   line-height: 11px;
   text-align: center;
   font-size: 11px;
   color: #FFFFFF;
 }
-.u-badge--dot.data-v-84d64f8a {
+.u-badge--dot.data-v-06cca9b7 {
   height: 8px;
   width: 8px;
 }
-.u-badge--inverted.data-v-84d64f8a {
+.u-badge--inverted.data-v-06cca9b7 {
   font-size: 13px;
 }
-.u-badge--not-dot.data-v-84d64f8a {
+.u-badge--not-dot.data-v-06cca9b7 {
   padding: 2px 5px;
 }
-.u-badge--horn.data-v-84d64f8a {
+.u-badge--horn.data-v-06cca9b7 {
   border-bottom-left-radius: 0;
 }
-.u-badge--primary.data-v-84d64f8a {
+.u-badge--primary.data-v-06cca9b7 {
   background-color: #3c9cff;
 }
-.u-badge--primary--inverted.data-v-84d64f8a {
+.u-badge--primary--inverted.data-v-06cca9b7 {
   color: #3c9cff;
 }
-.u-badge--error.data-v-84d64f8a {
+.u-badge--error.data-v-06cca9b7 {
   background-color: #f56c6c;
 }
-.u-badge--error--inverted.data-v-84d64f8a {
+.u-badge--error--inverted.data-v-06cca9b7 {
   color: #f56c6c;
 }
-.u-badge--success.data-v-84d64f8a {
+.u-badge--success.data-v-06cca9b7 {
   background-color: #5ac725;
 }
-.u-badge--success--inverted.data-v-84d64f8a {
+.u-badge--success--inverted.data-v-06cca9b7 {
   color: #5ac725;
 }
-.u-badge--info.data-v-84d64f8a {
+.u-badge--info.data-v-06cca9b7 {
   background-color: #909399;
 }
-.u-badge--info--inverted.data-v-84d64f8a {
+.u-badge--info--inverted.data-v-06cca9b7 {
   color: #909399;
 }
-.u-badge--warning.data-v-84d64f8a {
+.u-badge--warning.data-v-06cca9b7 {
   background-color: #f9ae3d;
 }
-.u-badge--warning--inverted.data-v-84d64f8a {
+.u-badge--warning--inverted.data-v-06cca9b7 {
   color: #f9ae3d;
 }

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-icon/icons.js

@@ -1,216 +1,216 @@
 "use strict";
-var icons = {
-  "uicon-level": "\uE693",
-  "uicon-column-line": "\uE68E",
-  "uicon-checkbox-mark": "\uE807",
-  "uicon-folder": "\uE7F5",
-  "uicon-movie": "\uE7F6",
-  "uicon-star-fill": "\uE669",
-  "uicon-star": "\uE65F",
-  "uicon-phone-fill": "\uE64F",
-  "uicon-phone": "\uE622",
-  "uicon-apple-fill": "\uE881",
-  "uicon-chrome-circle-fill": "\uE885",
-  "uicon-backspace": "\uE67B",
-  "uicon-attach": "\uE632",
-  "uicon-cut": "\uE948",
-  "uicon-empty-car": "\uE602",
-  "uicon-empty-coupon": "\uE682",
-  "uicon-empty-address": "\uE646",
-  "uicon-empty-favor": "\uE67C",
-  "uicon-empty-permission": "\uE686",
-  "uicon-empty-news": "\uE687",
-  "uicon-empty-search": "\uE664",
-  "uicon-github-circle-fill": "\uE887",
-  "uicon-rmb": "\uE608",
-  "uicon-person-delete-fill": "\uE66A",
-  "uicon-reload": "\uE788",
-  "uicon-order": "\uE68F",
-  "uicon-server-man": "\uE6BC",
-  "uicon-search": "\uE62A",
-  "uicon-fingerprint": "\uE955",
-  "uicon-more-dot-fill": "\uE630",
-  "uicon-scan": "\uE662",
-  "uicon-share-square": "\uE60B",
-  "uicon-map": "\uE61D",
-  "uicon-map-fill": "\uE64E",
-  "uicon-tags": "\uE629",
-  "uicon-tags-fill": "\uE651",
-  "uicon-bookmark-fill": "\uE63B",
-  "uicon-bookmark": "\uE60A",
-  "uicon-eye": "\uE613",
-  "uicon-eye-fill": "\uE641",
-  "uicon-mic": "\uE64A",
-  "uicon-mic-off": "\uE649",
-  "uicon-calendar": "\uE66E",
-  "uicon-calendar-fill": "\uE634",
-  "uicon-trash": "\uE623",
-  "uicon-trash-fill": "\uE658",
-  "uicon-play-left": "\uE66D",
-  "uicon-play-right": "\uE610",
-  "uicon-minus": "\uE618",
-  "uicon-plus": "\uE62D",
-  "uicon-info": "\uE653",
-  "uicon-info-circle": "\uE7D2",
-  "uicon-info-circle-fill": "\uE64B",
-  "uicon-question": "\uE715",
-  "uicon-error": "\uE6D3",
-  "uicon-close": "\uE685",
-  "uicon-checkmark": "\uE6A8",
-  "uicon-android-circle-fill": "\uE67E",
-  "uicon-android-fill": "\uE67D",
-  "uicon-ie": "\uE87B",
-  "uicon-IE-circle-fill": "\uE889",
-  "uicon-google": "\uE87A",
-  "uicon-google-circle-fill": "\uE88A",
-  "uicon-setting-fill": "\uE872",
-  "uicon-setting": "\uE61F",
-  "uicon-minus-square-fill": "\uE855",
-  "uicon-plus-square-fill": "\uE856",
-  "uicon-heart": "\uE7DF",
-  "uicon-heart-fill": "\uE851",
-  "uicon-camera": "\uE7D7",
-  "uicon-camera-fill": "\uE870",
-  "uicon-more-circle": "\uE63E",
-  "uicon-more-circle-fill": "\uE645",
-  "uicon-chat": "\uE620",
-  "uicon-chat-fill": "\uE61E",
-  "uicon-bag-fill": "\uE617",
-  "uicon-bag": "\uE619",
-  "uicon-error-circle-fill": "\uE62C",
-  "uicon-error-circle": "\uE624",
-  "uicon-close-circle": "\uE63F",
-  "uicon-close-circle-fill": "\uE637",
-  "uicon-checkmark-circle": "\uE63D",
-  "uicon-checkmark-circle-fill": "\uE635",
-  "uicon-question-circle-fill": "\uE666",
-  "uicon-question-circle": "\uE625",
-  "uicon-share": "\uE631",
-  "uicon-share-fill": "\uE65E",
-  "uicon-shopping-cart": "\uE621",
-  "uicon-shopping-cart-fill": "\uE65D",
-  "uicon-bell": "\uE609",
-  "uicon-bell-fill": "\uE640",
-  "uicon-list": "\uE650",
-  "uicon-list-dot": "\uE616",
-  "uicon-zhihu": "\uE6BA",
-  "uicon-zhihu-circle-fill": "\uE709",
-  "uicon-zhifubao": "\uE6B9",
-  "uicon-zhifubao-circle-fill": "\uE6B8",
-  "uicon-weixin-circle-fill": "\uE6B1",
-  "uicon-weixin-fill": "\uE6B2",
-  "uicon-twitter-circle-fill": "\uE6AB",
-  "uicon-twitter": "\uE6AA",
-  "uicon-taobao-circle-fill": "\uE6A7",
-  "uicon-taobao": "\uE6A6",
-  "uicon-weibo-circle-fill": "\uE6A5",
-  "uicon-weibo": "\uE6A4",
-  "uicon-qq-fill": "\uE6A1",
-  "uicon-qq-circle-fill": "\uE6A0",
-  "uicon-moments-circel-fill": "\uE69A",
-  "uicon-moments": "\uE69B",
-  "uicon-qzone": "\uE695",
-  "uicon-qzone-circle-fill": "\uE696",
-  "uicon-baidu-circle-fill": "\uE680",
-  "uicon-baidu": "\uE681",
-  "uicon-facebook-circle-fill": "\uE68A",
-  "uicon-facebook": "\uE689",
-  "uicon-car": "\uE60C",
-  "uicon-car-fill": "\uE636",
-  "uicon-warning-fill": "\uE64D",
-  "uicon-warning": "\uE694",
-  "uicon-clock-fill": "\uE638",
-  "uicon-clock": "\uE60F",
-  "uicon-edit-pen": "\uE612",
-  "uicon-edit-pen-fill": "\uE66B",
-  "uicon-email": "\uE611",
-  "uicon-email-fill": "\uE642",
-  "uicon-minus-circle": "\uE61B",
-  "uicon-minus-circle-fill": "\uE652",
-  "uicon-plus-circle": "\uE62E",
-  "uicon-plus-circle-fill": "\uE661",
-  "uicon-file-text": "\uE663",
-  "uicon-file-text-fill": "\uE665",
-  "uicon-pushpin": "\uE7E3",
-  "uicon-pushpin-fill": "\uE86E",
-  "uicon-grid": "\uE673",
-  "uicon-grid-fill": "\uE678",
-  "uicon-play-circle": "\uE647",
-  "uicon-play-circle-fill": "\uE655",
-  "uicon-pause-circle-fill": "\uE654",
-  "uicon-pause": "\uE8FA",
-  "uicon-pause-circle": "\uE643",
-  "uicon-eye-off": "\uE648",
-  "uicon-eye-off-outline": "\uE62B",
-  "uicon-gift-fill": "\uE65C",
-  "uicon-gift": "\uE65B",
-  "uicon-rmb-circle-fill": "\uE657",
-  "uicon-rmb-circle": "\uE677",
-  "uicon-kefu-ermai": "\uE656",
-  "uicon-server-fill": "\uE751",
-  "uicon-coupon-fill": "\uE8C4",
-  "uicon-coupon": "\uE8AE",
-  "uicon-integral": "\uE704",
-  "uicon-integral-fill": "\uE703",
-  "uicon-home-fill": "\uE964",
-  "uicon-home": "\uE965",
-  "uicon-hourglass-half-fill": "\uE966",
-  "uicon-hourglass": "\uE967",
-  "uicon-account": "\uE628",
-  "uicon-plus-people-fill": "\uE626",
-  "uicon-minus-people-fill": "\uE615",
-  "uicon-account-fill": "\uE614",
-  "uicon-thumb-down-fill": "\uE726",
-  "uicon-thumb-down": "\uE727",
-  "uicon-thumb-up": "\uE733",
-  "uicon-thumb-up-fill": "\uE72F",
-  "uicon-lock-fill": "\uE979",
-  "uicon-lock-open": "\uE973",
-  "uicon-lock-opened-fill": "\uE974",
-  "uicon-lock": "\uE97A",
-  "uicon-red-packet-fill": "\uE690",
-  "uicon-photo-fill": "\uE98B",
-  "uicon-photo": "\uE98D",
-  "uicon-volume-off-fill": "\uE659",
-  "uicon-volume-off": "\uE644",
-  "uicon-volume-fill": "\uE670",
-  "uicon-volume": "\uE633",
-  "uicon-red-packet": "\uE691",
-  "uicon-download": "\uE63C",
-  "uicon-arrow-up-fill": "\uE6B0",
-  "uicon-arrow-down-fill": "\uE600",
-  "uicon-play-left-fill": "\uE675",
-  "uicon-play-right-fill": "\uE676",
-  "uicon-rewind-left-fill": "\uE679",
-  "uicon-rewind-right-fill": "\uE67A",
-  "uicon-arrow-downward": "\uE604",
-  "uicon-arrow-leftward": "\uE601",
-  "uicon-arrow-rightward": "\uE603",
-  "uicon-arrow-upward": "\uE607",
-  "uicon-arrow-down": "\uE60D",
-  "uicon-arrow-right": "\uE605",
-  "uicon-arrow-left": "\uE60E",
-  "uicon-arrow-up": "\uE606",
-  "uicon-skip-back-left": "\uE674",
-  "uicon-skip-forward-right": "\uE672",
-  "uicon-rewind-right": "\uE66F",
-  "uicon-rewind-left": "\uE671",
-  "uicon-arrow-right-double": "\uE68D",
-  "uicon-arrow-left-double": "\uE68C",
-  "uicon-wifi-off": "\uE668",
-  "uicon-wifi": "\uE667",
-  "uicon-empty-data": "\uE62F",
-  "uicon-empty-history": "\uE684",
-  "uicon-empty-list": "\uE68B",
-  "uicon-empty-page": "\uE627",
-  "uicon-empty-order": "\uE639",
-  "uicon-man": "\uE697",
-  "uicon-woman": "\uE69C",
-  "uicon-man-add": "\uE61C",
-  "uicon-man-add-fill": "\uE64C",
-  "uicon-man-delete": "\uE61A",
-  "uicon-man-delete-fill": "\uE66A",
-  "uicon-zh": "\uE70A",
-  "uicon-en": "\uE692"
+const icons = {
+  "uicon-level": "",
+  "uicon-column-line": "",
+  "uicon-checkbox-mark": "",
+  "uicon-folder": "",
+  "uicon-movie": "",
+  "uicon-star-fill": "",
+  "uicon-star": "",
+  "uicon-phone-fill": "",
+  "uicon-phone": "",
+  "uicon-apple-fill": "",
+  "uicon-chrome-circle-fill": "",
+  "uicon-backspace": "",
+  "uicon-attach": "",
+  "uicon-cut": "",
+  "uicon-empty-car": "",
+  "uicon-empty-coupon": "",
+  "uicon-empty-address": "",
+  "uicon-empty-favor": "",
+  "uicon-empty-permission": "",
+  "uicon-empty-news": "",
+  "uicon-empty-search": "",
+  "uicon-github-circle-fill": "",
+  "uicon-rmb": "",
+  "uicon-person-delete-fill": "",
+  "uicon-reload": "",
+  "uicon-order": "",
+  "uicon-server-man": "",
+  "uicon-search": "",
+  "uicon-fingerprint": "",
+  "uicon-more-dot-fill": "",
+  "uicon-scan": "",
+  "uicon-share-square": "",
+  "uicon-map": "",
+  "uicon-map-fill": "",
+  "uicon-tags": "",
+  "uicon-tags-fill": "",
+  "uicon-bookmark-fill": "",
+  "uicon-bookmark": "",
+  "uicon-eye": "",
+  "uicon-eye-fill": "",
+  "uicon-mic": "",
+  "uicon-mic-off": "",
+  "uicon-calendar": "",
+  "uicon-calendar-fill": "",
+  "uicon-trash": "",
+  "uicon-trash-fill": "",
+  "uicon-play-left": "",
+  "uicon-play-right": "",
+  "uicon-minus": "",
+  "uicon-plus": "",
+  "uicon-info": "",
+  "uicon-info-circle": "",
+  "uicon-info-circle-fill": "",
+  "uicon-question": "",
+  "uicon-error": "",
+  "uicon-close": "",
+  "uicon-checkmark": "",
+  "uicon-android-circle-fill": "",
+  "uicon-android-fill": "",
+  "uicon-ie": "",
+  "uicon-IE-circle-fill": "",
+  "uicon-google": "",
+  "uicon-google-circle-fill": "",
+  "uicon-setting-fill": "",
+  "uicon-setting": "",
+  "uicon-minus-square-fill": "",
+  "uicon-plus-square-fill": "",
+  "uicon-heart": "",
+  "uicon-heart-fill": "",
+  "uicon-camera": "",
+  "uicon-camera-fill": "",
+  "uicon-more-circle": "",
+  "uicon-more-circle-fill": "",
+  "uicon-chat": "",
+  "uicon-chat-fill": "",
+  "uicon-bag-fill": "",
+  "uicon-bag": "",
+  "uicon-error-circle-fill": "",
+  "uicon-error-circle": "",
+  "uicon-close-circle": "",
+  "uicon-close-circle-fill": "",
+  "uicon-checkmark-circle": "",
+  "uicon-checkmark-circle-fill": "",
+  "uicon-question-circle-fill": "",
+  "uicon-question-circle": "",
+  "uicon-share": "",
+  "uicon-share-fill": "",
+  "uicon-shopping-cart": "",
+  "uicon-shopping-cart-fill": "",
+  "uicon-bell": "",
+  "uicon-bell-fill": "",
+  "uicon-list": "",
+  "uicon-list-dot": "",
+  "uicon-zhihu": "",
+  "uicon-zhihu-circle-fill": "",
+  "uicon-zhifubao": "",
+  "uicon-zhifubao-circle-fill": "",
+  "uicon-weixin-circle-fill": "",
+  "uicon-weixin-fill": "",
+  "uicon-twitter-circle-fill": "",
+  "uicon-twitter": "",
+  "uicon-taobao-circle-fill": "",
+  "uicon-taobao": "",
+  "uicon-weibo-circle-fill": "",
+  "uicon-weibo": "",
+  "uicon-qq-fill": "",
+  "uicon-qq-circle-fill": "",
+  "uicon-moments-circel-fill": "",
+  "uicon-moments": "",
+  "uicon-qzone": "",
+  "uicon-qzone-circle-fill": "",
+  "uicon-baidu-circle-fill": "",
+  "uicon-baidu": "",
+  "uicon-facebook-circle-fill": "",
+  "uicon-facebook": "",
+  "uicon-car": "",
+  "uicon-car-fill": "",
+  "uicon-warning-fill": "",
+  "uicon-warning": "",
+  "uicon-clock-fill": "",
+  "uicon-clock": "",
+  "uicon-edit-pen": "",
+  "uicon-edit-pen-fill": "",
+  "uicon-email": "",
+  "uicon-email-fill": "",
+  "uicon-minus-circle": "",
+  "uicon-minus-circle-fill": "",
+  "uicon-plus-circle": "",
+  "uicon-plus-circle-fill": "",
+  "uicon-file-text": "",
+  "uicon-file-text-fill": "",
+  "uicon-pushpin": "",
+  "uicon-pushpin-fill": "",
+  "uicon-grid": "",
+  "uicon-grid-fill": "",
+  "uicon-play-circle": "",
+  "uicon-play-circle-fill": "",
+  "uicon-pause-circle-fill": "",
+  "uicon-pause": "",
+  "uicon-pause-circle": "",
+  "uicon-eye-off": "",
+  "uicon-eye-off-outline": "",
+  "uicon-gift-fill": "",
+  "uicon-gift": "",
+  "uicon-rmb-circle-fill": "",
+  "uicon-rmb-circle": "",
+  "uicon-kefu-ermai": "",
+  "uicon-server-fill": "",
+  "uicon-coupon-fill": "",
+  "uicon-coupon": "",
+  "uicon-integral": "",
+  "uicon-integral-fill": "",
+  "uicon-home-fill": "",
+  "uicon-home": "",
+  "uicon-hourglass-half-fill": "",
+  "uicon-hourglass": "",
+  "uicon-account": "",
+  "uicon-plus-people-fill": "",
+  "uicon-minus-people-fill": "",
+  "uicon-account-fill": "",
+  "uicon-thumb-down-fill": "",
+  "uicon-thumb-down": "",
+  "uicon-thumb-up": "",
+  "uicon-thumb-up-fill": "",
+  "uicon-lock-fill": "",
+  "uicon-lock-open": "",
+  "uicon-lock-opened-fill": "",
+  "uicon-lock": "",
+  "uicon-red-packet-fill": "",
+  "uicon-photo-fill": "",
+  "uicon-photo": "",
+  "uicon-volume-off-fill": "",
+  "uicon-volume-off": "",
+  "uicon-volume-fill": "",
+  "uicon-volume": "",
+  "uicon-red-packet": "",
+  "uicon-download": "",
+  "uicon-arrow-up-fill": "",
+  "uicon-arrow-down-fill": "",
+  "uicon-play-left-fill": "",
+  "uicon-play-right-fill": "",
+  "uicon-rewind-left-fill": "",
+  "uicon-rewind-right-fill": "",
+  "uicon-arrow-downward": "",
+  "uicon-arrow-leftward": "",
+  "uicon-arrow-rightward": "",
+  "uicon-arrow-upward": "",
+  "uicon-arrow-down": "",
+  "uicon-arrow-right": "",
+  "uicon-arrow-left": "",
+  "uicon-arrow-up": "",
+  "uicon-skip-back-left": "",
+  "uicon-skip-forward-right": "",
+  "uicon-rewind-right": "",
+  "uicon-rewind-left": "",
+  "uicon-arrow-right-double": "",
+  "uicon-arrow-left-double": "",
+  "uicon-wifi-off": "",
+  "uicon-wifi": "",
+  "uicon-empty-data": "",
+  "uicon-empty-history": "",
+  "uicon-empty-list": "",
+  "uicon-empty-page": "",
+  "uicon-empty-order": "",
+  "uicon-man": "",
+  "uicon-woman": "",
+  "uicon-man-add": "",
+  "uicon-man-add-fill": "",
+  "uicon-man-delete": "",
+  "uicon-man-delete-fill": "",
+  "uicon-zh": "",
+  "uicon-en": ""
 };
 exports.icons = icons;