9.26

api/test/index.js

@@ -5,6 +5,9 @@ const {
 
 
 //用户相关
+
+export const getAfterSaleCon = (params, config = {}) => http.post('/api/users/bindingAfterSale', params, config)
+
 // 微信授权登陆
 export const wxAuthLoginReq = (params, config = {}) => http.post('/api/auth/mnplogin', params, config)
 

pages/index.vue

@@ -21,7 +21,7 @@
 				<view class="bookingAndIndicator">
 					<view class="btn" @click="toList">
 						<text class="btnTxt">一键定制</text>
-						<image src="@/static/index/halfRight.png" mode="" style="width: 24rpx;height: 8rpx;">
+						<image :src="picUrl+'/static/other/halfRight.png'" mode="" style="width: 30rpx;height: 20rpx;">
 						</image>
 					</view>
 					<view class="indicatorBox">
@@ -147,6 +147,7 @@
 	} from '@/api/index/index.js'
 	import {
 		getPricePercentReq,
+		getAfterSaleCon
 	} from '@/api/test/index.js'
 	export default {
 		data() {
@@ -176,6 +177,22 @@
 				console.log('接收到的o.inviteId', o.inviteId);
 			}
 
+			if (o.scene) {
+				uni.setStorageSync('afterSaleId', o.scene)
+				console.log('接收到的o.afterSaleId', o.scene);
+			}
+			// o.scene = 'b3f48188b03b54aeb32256c825044e35'
+			if (uni.getStorageSync('token') && o.scene) {
+				let res88 = await getAfterSaleCon({
+					id: o.scene
+				})
+				if (res88.code == 0) {
+					console.log('测试邀请:', res88);
+				} else {
+					this.$toast(res88.message)
+				}
+			}
+			console.log('首页收到的o:', JSON.stringify(o));
 			let res = await getBannerDataReq()
 			if (res.code == 0) {
 				this.bannerList = res.data

pages/index/aiControlSys/index.vue

@@ -18,7 +18,7 @@
 					<view class="con">
 						详情
 					</view>
-					<image :src="picUrl+'/static/other/r_whitebg.png'" mode="" style="width: 24rpx;height: 8rpx;">
+					<image :src="picUrl+'/static/other/halfRight_b.png'" mode="" style="width: 25rpx;height: 15rpx;">
 					</image>
 				</view>
 			</view>

pages/index/aiControlSys_step2/index.scss

@@ -2,14 +2,17 @@
 	border: none!important;
 }
 ::v-deep button{
-	// background-color:#fff !important;
 	font-size: 32rpx;
 	font-family: PingFang-SC-Medium, PingFang-SC;
 	font-weight: 500;
-	color: #333333;
-	// box-sizing: content-box;
-	// // width: 180rpx;
-	// height: 96rpx;
+}
+.orderBtn{
+	font-size: 32rpx;
+	font-family: PingFang-SC-Medium, PingFang-SC;
+	font-weight: 500;
+	color: #FFFFFF;
+	background: #333333;
+	border-radius: 4rpx;
 }
 .page{
 	padding-bottom: 208rpx;

pages/index/aiControlSys_step2/index.vue

@@ -171,7 +171,9 @@
 					<u--input clearable placeholder="请输入备注" border="surround" v-model="remark"
 						@change="change"></u--input>
 				</view>
-				<u-button text="确认下单" color="#333" @click="postOrder"></u-button>
+				<button open-type="share" class="orderBtn" :plain="true">
+					确认下单
+				</button>
 			</view>
 		</u-popup>
 	</view>
@@ -256,15 +258,58 @@
 				this.pConfig = getApp().pConfig
 			}
 		},
-		onShareAppMessage(params) {
+		async onShareAppMessage(params) {
 			if (params.from === 'button' || params.from === 'menu') {
-				return {
-					title: '定制我家的智能控制系统',
-					imageUrl: this.picUrl + '/static/other/c2.png',
-					path: '/pages/index/aiControlSys_step2/index?orderId=' + this.orderId,
-					mpId: this.$appId,
-					type: this.$shareType,
+				let phoneReg = /^[1][3,4,5,7,8,9][0-9]{9}$/
+				if (!this.name) {
+					return this.$toast('请填写收货人')
+				}
+				if (!this.phone) {
+					return this.$toast('请填写电话')
+				}
+				if (!phoneReg.test(this.phone)) {
+					return this.$toast('手机号格式不正确')
+				}
+				if (!this.addr) {
+					return this.$toast('请填写收货地址')
+				}
+				if (!this.remark) {
+					return this.$toast('请填写备注')
+				}
+				let res = await postOrderReq({
+					address: this.addr,
+					phone: this.phone,
+					name: this.name,
+					remark: this.remark,
+					config_id: this.pConfig,
+					type: 3
+				})
+				if (res.code == 0) {
+					console.log('提交订单返回值: ', res);
+					this.orderId = res.data.orderId
+					this.showFixInfo = false
+					return {
+						title: '定制我家的智能控制系统',
+						imageUrl: this.picUrl + '/static/other/c2.png',
+						path: '/pages/index/aiControlSys_step2/index?orderId=' + this.orderId,
+						mpId: this.$appId,
+						type: this.$shareType,
+					}
+
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				}
+
+				// return {
+				// 	title: '定制我家的智能控制系统',
+				// 	imageUrl: this.picUrl + '/static/other/c2.png',
+				// 	path: '/pages/index/aiControlSys_step2/index?orderId=' + this.orderId,
+				// 	mpId: this.$appId,
+				// 	type: this.$shareType,
+				// }
 			}
 		},
 		methods: {

pages/index/customMian/index.scss

@@ -2,11 +2,17 @@
 	border: none!important;
 }
 ::v-deep button{
-	// background-color:#fff !important;
 	font-size: 32rpx;
 	font-family: PingFang-SC-Medium, PingFang-SC;
 	font-weight: 500;
-	color: #333333;
+}
+.orderBtn{
+	font-size: 32rpx;
+	font-family: PingFang-SC-Medium, PingFang-SC;
+	font-weight: 500;
+	color: #FFFFFF;
+	background: #333333;
+	border-radius: 4rpx;
 }
 .page{
 	padding-bottom: 208rpx;

pages/index/customMian/index.vue

@@ -211,7 +211,9 @@
 					<u--input clearable placeholder="请输入备注" border="surround" v-model="remark"
 						@change="change"></u--input>
 				</view>
-				<u-button text="一键下单" color="#333" @click="postOrder"></u-button>
+				<button open-type="share" class="orderBtn" :plain="true">
+					确认下单
+				</button>
 			</view>
 		</u-popup>
 		<u-modal :show="showShare" title="请长按图片保存小程序二维码至相册以分享" @confirm="showShare=false" content='' confirmText="关闭"
@@ -323,15 +325,61 @@
 				console.log('所有灯id', this.ids);
 			}
 		},
-		onShareAppMessage(params) {
+		async onShareAppMessage(params) {
 			if (params.from === 'button' || params.from === 'menu') {
-				return {
-					title: '定制我家的主灯',
-					imageUrl: this.picUrl + '/static/other/noMain_img3.png',
-					path: '/pages/index/customMian/index?orderId=' + this.orderId + "&dType=" + this.dType,
-					mpId: this.$appId,
-					type: this.$shareType,
+				if (params.from === 'button' || params.from === 'menu') {
+					let phoneReg = /^[1][3,4,5,7,8,9][0-9]{9}$/
+					if (!this.name) {
+						return this.$toast('请填写收货人')
+					}
+					if (!this.phone) {
+						return this.$toast('请填写电话')
+					}
+					if (!phoneReg.test(this.phone)) {
+						return this.$toast('手机号格式不正确')
+					}
+					if (!this.addr) {
+						return this.$toast('请填写收货地址')
+					}
+					if (!this.remark) {
+						return this.$toast('请填写备注')
+					}
+					let res = await postOrderReq({
+						address: this.addr,
+						phone: this.phone,
+						name: this.name,
+						remark: this.remark,
+						config_id: this.pConfig,
+						type: this.dType ? this.dType : 2
+					})
+					if (res.code == 0) {
+						console.log('提交订单返回值: ', res);
+						this.orderId = res.data.orderId
+						this.showFixInfo = false
+						return {
+							title: this.dType ? '定制我家的吸顶灯' : '定制我家的主灯',
+							imageUrl: this.picUrl + '/static/other/noMain_img3.png',
+							path: '/pages/index/customMian/index?orderId=' + this.orderId + "&dType=" + this.dType,
+							mpId: this.$appId,
+							type: this.$shareType,
+						}
+
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
 				}
+
+
+				// return {
+				// 	title: '定制我家的主灯',
+				// 	imageUrl: this.picUrl + '/static/other/noMain_img3.png',
+				// 	path: '/pages/index/customMian/index?orderId=' + this.orderId + "&dType=" + this.dType,
+				// 	mpId: this.$appId,
+				// 	type: this.$shareType,
+				// }
 			}
 		},
 		methods: {

pages/index/customMian_step1/index.vue

@@ -18,7 +18,7 @@
 					<view class="con">
 						详情
 					</view>
-					<image :src="picUrl+'/static/other/r_whitebg.png'" mode="" style="width: 24rpx;height: 8rpx;">
+					<image :src="picUrl+'/static/other/halfRight_b.png'" mode="" style="width: 25rpx;height: 15rpx;">
 					</image>
 				</view>
 			</view>

pages/index/customNoMian_step1/index.vue

@@ -18,7 +18,7 @@
 					<view class="con">
 						详情
 					</view>
-					<image :src="picUrl+'/static/other/r_whitebg.png'" mode="" style="width: 24rpx;height: 8rpx;">
+					<image :src="picUrl+'/static/other/halfRight_b.png'" mode="" style="width: 25rpx;height: 15rpx;">
 					</image>
 				</view>
 

pages/index/customNoMian_step2/index.scss

@@ -4,11 +4,17 @@
 	// background-color:#fff !important;
 }
 ::v-deep button{
-	// background-color:#fff !important;
 	font-size: 32rpx;
 	font-family: PingFang-SC-Medium, PingFang-SC;
 	font-weight: 500;
-	color: #333333;
+}
+.orderBtn{
+	font-size: 32rpx;
+	font-family: PingFang-SC-Medium, PingFang-SC;
+	font-weight: 500;
+	color: #FFFFFF;
+	background: #333333;
+	border-radius: 4rpx;
 }
 .page{
 	padding-bottom: 208rpx;

pages/index/customNoMian_step2/index.vue

@@ -168,7 +168,9 @@
 						@change="change"></u--input>
 				</view>
 
-				<u-button text="确认下单" color="#333" @click="postOrder"></u-button>
+				<button open-type="share" class="orderBtn" :plain="true">
+					确认下单
+				</button>
 			</view>
 		</u-popup>
 	</view>
@@ -253,15 +255,61 @@
 				this.totalPrice = getApp().totalPrice
 			}
 		},
-		onShareAppMessage(params) {
+		async onShareAppMessage(params) {
 			if (params.from === 'button' || params.from === 'menu') {
-				return {
-					title: '定制我家的无主灯',
-					imageUrl: this.picUrl + '/static/other/noMain_img4.png',
-					path: '/pages/index/customNoMian_step2/index?orderId=' + this.orderId,
-					mpId: this.$appId,
-					type: this.$shareType,
+				if (params.from === 'button' || params.from === 'menu') {
+					let phoneReg = /^[1][3,4,5,7,8,9][0-9]{9}$/
+					if (!this.name) {
+						return this.$toast('请填写收货人')
+					}
+					if (!this.phone) {
+						return this.$toast('请填写电话')
+					}
+					if (!phoneReg.test(this.phone)) {
+						return this.$toast('手机号格式不正确')
+					}
+					if (!this.addr) {
+						return this.$toast('请填写收货地址')
+					}
+					if (!this.remark) {
+						return this.$toast('请填写备注')
+					}
+					let res = await postOrderReq({
+						address: this.addr,
+						phone: this.phone,
+						name: this.name,
+						remark: this.remark,
+						config_id: this.pConfig,
+						type: 1
+					})
+					if (res.code == 0) {
+						console.log('提交订单返回值: ', res);
+						this.orderId = res.data.orderId
+						this.showFixInfo = false
+						return {
+							title: '定制我家的无主灯',
+							imageUrl: this.picUrl + '/static/other/noMain_img4.png',
+							path: '/pages/index/customNoMian_step2/index?orderId=' + this.orderId,
+							mpId: this.$appId,
+							type: this.$shareType,
+						}
+
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
 				}
+
+
+				// return {
+				// 	title: '定制我家的无主灯',
+				// 	imageUrl: this.picUrl + '/static/other/noMain_img4.png',
+				// 	path: '/pages/index/customNoMian_step2/index?orderId=' + this.orderId,
+				// 	mpId: this.$appId,
+				// 	type: this.$shareType,
+				// }
 			}
 		},
 		methods: {

pages/index/fullHouseWifi/index.scss

@@ -2,11 +2,17 @@
 	border: none!important;
 }
 ::v-deep button{
-	// background-color:#fff !important;
 	font-size: 32rpx;
 	font-family: PingFang-SC-Medium, PingFang-SC;
 	font-weight: 500;
-	color: #333333;
+}
+.orderBtn{
+	font-size: 32rpx;
+	font-family: PingFang-SC-Medium, PingFang-SC;
+	font-weight: 500;
+	color: #FFFFFF;
+	background: #333333;
+	border-radius: 4rpx;
 }
 .page{
 	padding-bottom: 160rpx;

pages/index/fullHouseWifi/index.vue

@@ -18,7 +18,7 @@
 					<view class="con">
 						详情
 					</view>
-					<image :src="picUrl+'/static/other/r_whitebg.png'" mode="" style="width: 24rpx;height: 8rpx;">
+					<image :src="picUrl+'/static/other/halfRight_b.png'" mode="" style="width: 25rpx;height: 15rpx;">
 					</image>
 				</view>
 			</view>
@@ -39,12 +39,6 @@
 				</view>
 			</view>
 		</view>
-		<!-- 	<view class="rule">
-			<image src="/static/index/ruleImg.png" mode=""></image>
-			<view class="txt">
-				挑选规则
-			</view>
-		</view> -->
 		<view class="bot">
 			<view class="left">
 				<view class="price">
@@ -102,7 +96,10 @@
 					<u--input clearable placeholder="请输入备注" border="surround" v-model="remark"
 						@change="change"></u--input>
 				</view>
-				<u-button text="确认下单" color="#333" @click="postOrder"></u-button>
+
+				<button open-type="share" class="orderBtn" :plain="true">
+					确认下单
+				</button>
 			</view>
 		</u-popup>
 	</view>
@@ -176,14 +173,49 @@
 		onShow() {
 			this.cutdownRatio = this.$getCutDown()
 		},
-		onShareAppMessage(params) {
+		async onShareAppMessage(params) {
 			if (params.from === 'button' || params.from === 'menu') {
-				return {
-					title: '定制我家的全屋WiFi',
-					imageUrl: this.picUrl + '/static/other/c1.png',
-					path: '/pages/index/fullHouseWifi_step2/index?orderId=' + this.orderId,
-					mpId: this.$appId,
-					type: this.$shareType,
+				let phoneReg = /^[1][3,4,5,7,8,9][0-9]{9}$/
+				if (!this.name) {
+					return this.$toast('请填写收货人')
+				}
+				if (!this.phone) {
+					return this.$toast('请填写电话')
+				}
+				if (!phoneReg.test(this.phone)) {
+					return this.$toast('手机号格式不正确')
+				}
+				if (!this.addr) {
+					return this.$toast('请填写收货地址')
+				}
+				if (!this.remark) {
+					return this.$toast('请填写备注')
+				}
+				let res = await postOrderReq({
+					address: this.addr,
+					phone: this.phone,
+					name: this.name,
+					remark: this.remark,
+					config_id: this.pConfig,
+					type: 4
+				})
+				if (res.code == 0) {
+					console.log('提交订单返回值: ', res);
+					this.orderId = res.data.orderId
+					this.showFixInfo = false
+					return {
+						title: '定制我家的全屋WiFi',
+						imageUrl: this.picUrl + '/static/other/c1.png',
+						path: '/pages/index/fullHouseWifi_step2/index?orderId=' + this.orderId,
+						mpId: this.$appId,
+						type: this.$shareType,
+					}
+
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				}
 			}
 		},
@@ -201,14 +233,6 @@
 				})
 			},
 			async postOrder() {
-				console.log('wifi下单参数', {
-					address: this.addr,
-					phone: this.phone,
-					name: this.name,
-					remark: this.remark,
-					config_id: this.selHx.id,
-					type: 4
-				});
 				let res = await postOrderReq({
 					address: this.addr,
 					phone: this.phone,

pages/mall.vue

@@ -15,21 +15,17 @@
 
 		<view class="content" v-if="searchKey" style="margin-top: 140rpx;">
 			<view class="rightDes" style="height: calc(100vh - 330rpx)">
-				<view class="item">
-					<!-- <view class="top" @click="toList(item,allTypesValues[index])">
-						<view class="name">
-							{{allTypesValues[index]}}
-						</view>
-						<image src="/static/index/more.png" mode=""
-							style="width: 40rpx;height: 40rpx;margin-right: 4rpx;">
-						</image>
-					</view> -->
+				<view class="item" v-if="resList.length!=0">
 					<view class="bottom">
 						<image @click="goDetail(item1)" :src="picBase+item1.cover" mode="" style="" class="img"
 							v-for="(item1,index) in resList">
 						</image>
 					</view>
 				</view>
+				<view class="" v-else style="">
+					<u-empty mode="data" text="暂无数据" width="100" height="100" :icon="picUrl+'/static/other/empty.png'">
+					</u-empty>
+				</view>
 			</view>
 		</view>
 
@@ -58,7 +54,7 @@
 
 
 
-					<view class="bottom" v-if="resList[item].length!=0">
+					<view class="bottom" v-if="resList[item][0].id">
 						<image @click="goDetail(item1)" :src="picBase+item1.cover" mode="" style="" class="img"
 							v-for="(item1,index) in resList[item] ">
 						</image>
@@ -112,7 +108,10 @@
 				allTypesValues: [],
 				tOList: [],
 
-				pid: -1
+				pid: -1,
+
+				catTabId: -1,
+				initialPid: -1
 
 			};
 		},
@@ -120,13 +119,12 @@
 
 		},
 		async onLoad() {
-			// this.handle1({
-			// 	id: 1
-			// })
 
 			let res = await getMallCatReq()
 			if (res.code == 0) {
 				console.log('获取商城顶部分类数据返回值: ', res);
+
+				this.catTabId = res.data[0].id
 				this.handle1({
 					id: res.data[0].id
 				})
@@ -162,9 +160,6 @@
 
 					this.list2 = res.data
 					console.log('zhongxiang', res);
-
-					// this.pid = res.data[0].id
-
 					this.getMall(res.data[0].id)
 				}
 			},
@@ -181,7 +176,7 @@
 					this.allTypes = Object.keys(res.data.typeName)
 					this.allTypesValues = Object.values(res.data.typeName)
 					this.resList = res.data
-					// console.log('获取商城数据返回值列表: ', this.resList, this.allTypes, this.allTypesValues, this.typesList);
+					console.log('获取商城数据返回值列表: ', this.resList, this.allTypes, this.allTypesValues);
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -197,6 +192,7 @@
 				if (res.code == 0) {
 					console.log('获取商城数据返回值2: ', res.data);
 					this.resList = res.data
+					// this.resList = []
 					console.log('获取商城数据返回值列表2: ', this.resList);
 				} else {
 					uni.showToast({
@@ -217,7 +213,7 @@
 				})
 			},
 			goDetail(item) {
-				// console.log('item');
+				console.log('item-------------------', item);
 				getApp().mallItem = item
 				uni.navigateTo({
 					url: '/pages/mall/detail/index'
@@ -227,24 +223,17 @@
 		watch: {
 			searchKey(n, o) {
 				if (!n) {
-					this.selTab = {
-						type: 1,
-						brand: 7
-					}
 					this.currBrandIndex = 0
+					console.log('当搜索词为空时传递的pid', this.pid, this.initialPid, this.catTabId);
+					this.handle1({
+						id: this.catTabId
+					})
 					return
 				}
 				setTimeout(() => {
 					this.getMall2(n)
-				}, 1000)
+				}, 0)
 			},
-			// selTab: {
-			// 	handler(n, o) {
-			// 		console.log('n, o', n);
-			// 		this.getMall(n.type, n.brand)
-			// 	},
-			// 	deep: true
-			// }
 		},
 		components: {}
 	};

pages/my.vue

@@ -22,11 +22,14 @@
 						<text class="btn"
 							v-if="token&&role=='hy'">{{userInfo.nickname?userInfo.nickname:'默认用户(会员)'}}</text>
 
-						<view class="lMember" v-if="token&&role=='lhy'">
+						<view class="lMember" v-if="token&&role=='lhy'" style="">
 							<text class="btn1">{{userInfo.nickname?userInfo.nickname:'默认用户(L会员)'}}</text>
-							<view class="botDes">
-								查看商品会员价，72小时后自动恢复
-								为售价。会员价格还剩 00:05:59
+							<view class="botDes" style="width: 420rpx;">
+								查看商品会员价，{{hours}}小时后自动恢复为售价。会员价格还剩
+								<view class="" style="display: inline-block;">
+									<u-count-down @change="cutDownChange" style="display: inline-block;"
+										:time="remainTime" format="HH:mm:ss"></u-count-down>
+								</view>
 							</view>
 						</view>
 						<view class="lMember" v-if="token&&role=='hdhy'">
@@ -42,6 +45,13 @@
 								{{userInfo.phone}}
 							</view>
 						</view>
+
+						<view class="lMember" v-if="token&&role=='gvip'">
+							<text class="btn1">{{userInfo.nickname?userInfo.nickname:'默认用户(G-VIP)'}}</text>
+							<view class="botDes" v-if="userInfo.phone">
+								{{userInfo.phone}}
+							</view>
+						</view>
 						<view class="lMember" v-if="token&&role=='yk'">
 							<text class="btn1">{{userInfo.nickname?userInfo.nickname:'默认用户(游客)'}}</text>
 							<view class="botDes" v-if="userInfo.phone">
@@ -112,6 +122,7 @@
 		updateUserInfoReq,
 		addInviteReq
 	} from '@/api/test/index.js'
+	import moment from 'moment'
 	export default {
 		// components: {
 		// 	navBar
@@ -175,7 +186,18 @@
 
 				show: false,
 				list: [],
-				userInfo: null
+				userInfo: null,
+
+				hours: 0,
+				remainTime: 0,
+
+				watchTimeObj: {
+					days: 0,
+					hours: 0,
+					minutes: 0,
+					seconds: 0,
+					milliseconds: 0
+				}
 			}
 		},
 		async onShow() {
@@ -192,8 +214,17 @@
 					// 	phone: null,
 					// 	sex: null,
 					// }
-					console.log('用户信息', this.userInfo);
-					// this.role = 'cydg'
+					console.log('用户信息', this.userInfo, new Date(this.userInfo.ls_expire_time), moment(this.userInfo
+						.ls_expire_time).format("YYYY-MM-DD HH:mm:ss"), );
+
+					let ms = this.userInfo.ls_expire_time - Date.now();
+					if (ms > 0) {
+						this.hours = (ms / 1000 / 60 / 60).toFixed(1)
+						this.remainTime = ms
+					}
+
+
+					// this.role = 'yk'
 					// this.checkRole()
 					// return
 					if (res.data.status) {
@@ -216,6 +247,9 @@
 							case 5:
 								this.role = 'hy'
 								break
+							case 6:
+								this.role = 'gvip'
+								break
 						}
 						console.log('当前用户角色', this.role);
 					} else {
@@ -260,7 +294,29 @@
 			// })
 		},
 		computed: {},
+		watch: {
+			watchTimeObj: {
+				handler(n, o) {
+					console.log('handler(n, o)', n, this.role);
+					if (n.days == 0 && n.hours == 0 && n.minutes == 0 && n.seconds == 1) {
+						setTimeout(() => {
+							uni.reLaunch({
+								url: '/pages/my'
+							})
+							console.log('L会员到期-----------------------------------------', n, this.role);
+						}, 1000)
+					}
+				},
+				deep: true
+			}
+		},
 		methods: {
+			cutDownChange(e) {
+				this.watchTimeObj = {
+					...e
+				}
+				console.log('e-------------', this.watchTimeObj);
+			},
 			call(phone) {
 				uni.makePhoneCall({
 					phoneNumber: phone,
@@ -268,9 +324,19 @@
 			},
 			toPage(page) {
 				console.log('page----------------', page);
-				if (!this.token && page != '/pages/my/otherInfo/index' && !page.phone) {
+
+				if (page == 'info' && !this.token) {
+					return this.$toast('请先登录')
+				}
+				if (page.url == '/pages/my/collect/index' && !this.token) {
 					return this.$toast('请先登录')
 				}
+
+				// if (!this.token && page != '/pages/my/otherInfo/index' && !page.phone) {
+				// 	return this.$toast('请先登录')
+				// }
+
+
 				if (page == 'set') {
 					uni.navigateTo({
 						url: '/pages/my/set/index?role=' + this.role
@@ -293,29 +359,39 @@
 					provider: 'weixin',
 					success: async (res) => {
 						if (res.errMsg == 'login:ok') {
-							let res1 = await wxAuthLoginReq({
-								code: res.code
-							})
+
+							let parmas = {
+								code: res.code,
+							}
+
+							if (uni.getStorageSync('inviteId')) {
+								parmas['inviteId'] = uni.getStorageSync('inviteId')
+							}
+							if (uni.getStorageSync('afterSaleId')) {
+								parmas['afterSaleId'] = uni.getStorageSync('afterSaleId')
+							}
+							console.log('登录所传的parmas参数:', parmas);
+
+							let res1 = await wxAuthLoginReq(parmas)
 							if (res1.code == 0) {
 								uni.setStorageSync('token', res1.data.token)
-								// uni.setStorageSync('role', 'yk')
-								// uni.setStorageSync('userInfo', res1.data.user_info)
 								_this.$toast('登录成功')
-								console.log('登录时返回的用户信息', res1.data.user_info);
-								if (res1.data.user_info.status && res1.data.user_info.type == 0) {
-									console.log('当前登录的用户是游客,此时的邀请id', uni.getStorageSync('inviteId'));
-									let res3 = await addInviteReq({
-										inviteId: uni.getStorageSync('inviteId') || ''
-									})
-									if (res3.code == 0) {
-										console.log('登录时提交邀请返回值', res3);
-
-										uni.removeStorageSync('inviteId')
-									} else {
-										_this.$toast(res3.message)
-									}
-								}
-
+								// console.log('登录时返回的用户信息', res1.data.user_info);
+								// if (res1.data.user_info.status && res1.data.user_info.type == 0) {
+								// 	console.log('当前登录的用户是游客,此时的邀请id', uni.getStorageSync('inviteId'));
+								// 	let res3 = await addInviteReq({
+								// 		inviteId: uni.getStorageSync('inviteId') || ''
+								// 	})
+								// 	if (res3.code == 0) {
+								// 		console.log('登录时提交邀请返回值', res3);
+
+								// 		uni.removeStorageSync('inviteId')
+								// 	} else {
+								// 		_this.$toast(res3.message)
+								// 	}
+								// }
+								uni.removeStorageSync('inviteId')
+								uni.removeStorageSync('afterSaleId')
 								setTimeout(() => {
 									uni.reLaunch({
 										url: '/pages/my'
@@ -367,7 +443,26 @@
 							name: '关于我们',
 							url: '/pages/my/aboutMe/index'
 						},
+						{
+							icon: this.$picUrl + '/static/my/qt.png',
+							name: '其他信息',
+							url: '/pages/my/otherInfo/index'
+						},
+
 					]
+					if (this.userInfo.role == 1) {
+						this.serList.push({
+							icon: this.picUrl + '/static/my/tg.png',
+							name: '团购商品',
+							url: '/pages/my/actGoods/index'
+						})
+					} else if (this.userInfo.role == 2) {
+						this.serList.push({
+							icon: this.picUrl + '/static/my/sh.png',
+							name: '售后',
+							url: '/pages/my/sellAfter/index'
+						})
+					}
 				} else if (this.role == 'svip') {
 					this.serList = [{
 							icon: this.picUrl + '/static/my/set.png',
@@ -380,7 +475,7 @@
 						}, {
 							icon: this.picUrl + '/static/my/yjlx.png',
 							name: '一键联系',
-							phone: '12983098478'
+							phone: this.userInfo.invitePhone
 						}, {
 							icon: this.picUrl + '/static/my/qt.png',
 							name: '小程序使用指南',
@@ -391,21 +486,95 @@
 							name: '关于我们',
 							url: '/pages/my/aboutMe/index'
 						},
+						{
+							icon: this.$picUrl + '/static/my/qt.png',
+							name: '其他信息',
+							url: '/pages/my/otherInfo/index'
+						},
+					]
+				} else if (this.role == 'gvip') {
+					this.serList = [{
+							icon: this.picUrl + '/static/my/set.png',
+							name: '设置',
+							url: '/pages/my/set/index?role=' + this.role
+						}, {
+							icon: this.picUrl + '/static/my/sc.png',
+							name: '收藏',
+							url: '/pages/my/collect/index'
+						}, {
+							icon: this.picUrl + '/static/my/yjlx.png',
+							name: '一键联系',
+							phone: this.userInfo.invitePhone
+						}, {
+							icon: this.picUrl + '/static/my/qt.png',
+							name: '小程序使用指南',
+							url: '/pages/my/useLead/index'
+						},
+						{
+							icon: this.picUrl + '/static/other/aboutMe.png',
+							name: '关于我们',
+							url: '/pages/my/aboutMe/index'
+						},
+						{
+							icon: this.$picUrl + '/static/my/qt.png',
+							name: '其他信息',
+							url: '/pages/my/otherInfo/index'
+						},
 					]
 				} else if (this.role == 'lhy') {
 					this.serList = [{
-						icon: this.picUrl + '/static/my/sh.png',
-						name: '售后',
-						url: '/pages/my/sellAfterCon/index'
-					}, {
-						icon: this.picUrl + '/static/my/sc.png',
-						name: '收藏',
-						url: '/pages/my/collect/index'
-					}, {
-						icon: this.picUrl + '/static/my/qt.png',
-						name: '小程序使用指南',
-						url: '/pages/my/useLead/index'
-					}, ]
+							icon: this.picUrl + '/static/my/sc.png',
+							name: '收藏',
+							url: '/pages/my/collect/index'
+						},
+						{
+							icon: this.picUrl + '/static/my/yjlx.png',
+							name: '一键联系',
+							phone: this.userInfo.invitePhone
+						},
+						{
+							icon: this.picUrl + '/static/my/qt.png',
+							name: '小程序使用指南',
+							url: '/pages/my/useLead/index'
+						},
+						{
+							icon: this.picUrl + '/static/other/aboutMe.png',
+							name: '关于我们',
+							url: '/pages/my/aboutMe/index'
+						},
+						{
+							icon: this.$picUrl + '/static/my/qt.png',
+							name: '其他信息',
+							url: '/pages/my/otherInfo/index'
+						},
+					]
+				} else if (this.role == 'hy') {
+					this.serList = [{
+							icon: this.picUrl + '/static/my/sc.png',
+							name: '收藏',
+							url: '/pages/my/collect/index'
+						},
+						{
+							icon: this.picUrl + '/static/my/yjlx.png',
+							name: '一键联系',
+							phone: this.userInfo.invitePhone
+						},
+						{
+							icon: this.picUrl + '/static/my/qt.png',
+							name: '小程序使用指南',
+							url: '/pages/my/useLead/index'
+						},
+						{
+							icon: this.picUrl + '/static/other/aboutMe.png',
+							name: '关于我们',
+							url: '/pages/my/aboutMe/index'
+						},
+						{
+							icon: this.$picUrl + '/static/my/qt.png',
+							name: '其他信息',
+							url: '/pages/my/otherInfo/index'
+						},
+					]
 				} else if (this.role == 'cydg') {
 					this.serList = [{
 							icon: this.picUrl + '/static/my/set.png',
@@ -420,20 +589,29 @@
 						{
 							icon: this.picUrl + '/static/my/yjlx.png',
 							name: '一键联系',
-							phone: '12983098478'
-						},
-						{
-							icon: this.picUrl + '/static/my/jiang.png',
-							name: '兑奖信息',
-							url: '/pages/my/duijiang/index'
-							// phone: '12983098478'
+							phone: this.userInfo.invitePhone
 						},
+						// {
+						// 	icon: this.picUrl + '/static/my/jiang.png',
+						// 	name: '兑奖信息',
+						// 	url: '/pages/my/duijiang/index'
+						// 	// phone: '12983098478'
+						// },
 						{
 							icon: this.picUrl + '/static/my/qt.png',
 							name: '小程序使用指南',
 							url: '/pages/my/useLead/index'
 						},
-
+						{
+							icon: this.picUrl + '/static/other/aboutMe.png',
+							name: '关于我们',
+							url: '/pages/my/aboutMe/index'
+						},
+						{
+							icon: this.$picUrl + '/static/my/qt.png',
+							name: '其他信息',
+							url: '/pages/my/otherInfo/index'
+						},
 					]
 				} else if (this.role == 'hdhy') {
 					this.serList = [{
@@ -457,48 +635,31 @@
 						name: '小程序使用指南',
 						url: '/pages/my/useLead/index'
 					}, ]
-				} else if (this.role == 'hy') {
+				} else if (this.role == 'superAdmin') {
 					this.serList = [{
+							icon: this.picUrl + '/static/my/set.png',
+							name: '设置',
+							url: '/pages/my/set/index?role=' + this.role
+						},
+						{
 							icon: this.picUrl + '/static/my/sh.png',
 							name: '售后',
 							url: '/pages/my/sellAfter/index'
+						},
+						{
+							icon: this.picUrl + '/static/my/tg.png',
+							name: '团购商品',
+							url: '/pages/my/actGoods/index'
 						}, {
 							icon: this.picUrl + '/static/my/sc.png',
 							name: '收藏',
 							url: '/pages/my/collect/index'
 						}, {
 							icon: this.picUrl + '/static/my/qt.png',
-							name: '小程序使用指南',
-							url: '/pages/my/useLead/index'
-						},
-						{
-							icon: this.picUrl + '/static/my/yjlx.png',
-							name: '一键联系',
-							phone: '12983098478'
+							name: '其他信息',
+							url: '/pages/my/otherInfo/index'
 						},
 					]
-				} else if (this.role == 'superAdmin') {
-					this.serList = [{
-						icon: this.picUrl + '/static/my/set.png',
-						name: '设置',
-						url: '/pages/my/set/index?role=' + this.role
-					}, {
-						icon: this.picUrl + '/static/my/sh.png',
-						name: '售后',
-						url: '/pages/my/sellAfter/index'
-					}, {
-						icon: this.picUrl + '/static/my/tg.png',
-						name: '团购商品',
-						url: '/pages/my/actGoods/index'
-					}, {
-						icon: this.picUrl + '/static/my/sc.png',
-						name: '收藏',
-						url: '/pages/my/collect/index'
-					}, {
-						icon: this.picUrl + '/static/my/qt.png',
-						name: '其他信息',
-						url: '/pages/my/otherInfo/index'
-					}, ]
 
 					this.list = [{
 							name: '邀约VIP'
@@ -519,28 +680,66 @@
 				} else if (this.role == 'sjkf' || this.role == 'yw') {
 					if (this.role == 'sjkf') {
 						this.serList = [{
-							icon: this.picUrl + '/static/my/set.png',
-							name: '设置',
-							url: '/pages/my/set/index?role=' + this.role
-						}, {
-							icon: this.picUrl + '/static/my/sh.png',
-							name: '售后',
-							url: '/pages/my/sellAfter/index'
-						}, {
-							icon: this.picUrl + '/static/my/sc.png',
-							name: '收藏',
-							url: '/pages/my/collect/index'
-						}, {
-							icon: this.picUrl + '/static/my/qt.png',
-							name: '小程序使用指南',
-							url: '/pages/my/useLead/index'
-						}, ]
+								icon: this.picUrl + '/static/my/sh.png',
+								name: '售后',
+								url: '/pages/my/sellAfter/index'
+							},
+							{
+								icon: this.picUrl + '/static/my/tg.png',
+								name: '团购商品',
+								url: '/pages/my/actGoods/index'
+							},
+							{
+								icon: this.picUrl + '/static/my/sc.png',
+								name: '收藏',
+								url: '/pages/my/collect/index'
+							},
+							{
+								icon: this.picUrl + '/static/my/qt.png',
+								name: '其他信息',
+								url: '/pages/my/otherInfo/index'
+							},
+						]
 					} else {
 						this.serList = [{
-							icon: this.picUrl + '/static/my/set.png',
-							name: '设置',
-							url: '/pages/my/set/index?role=' + this.role
-						}, {
+								icon: this.picUrl + '/static/my/sh.png',
+								name: '售后',
+								url: '/pages/my/sellAfter/index'
+							}, {
+								icon: this.picUrl + '/static/my/tg.png',
+								name: '团购商品',
+								url: '/pages/my/actGoods/index'
+							}, {
+								icon: this.picUrl + '/static/my/sc.png',
+								name: '收藏',
+								url: '/pages/my/collect/index'
+							},
+							{
+								icon: this.picUrl + '/static/my/qt.png',
+								name: '其他信息',
+								url: '/pages/my/otherInfo/index'
+							},
+						]
+					}
+					this.list = [{
+							name: '邀约VIP'
+						},
+						{
+							name: '邀约L会员'
+						},
+						{
+							name: '邀约活动用户'
+						}
+					]
+
+				} else if (this.role == 'shkf') {
+					this.serList = [
+						// 	{
+						// 	icon: this.picUrl + '/static/my/set.png',
+						// 	name: '设置',
+						// 	url: '/pages/my/set/index?role=' + this.role
+						// }, 
+						{
 							icon: this.picUrl + '/static/my/sh.png',
 							name: '售后',
 							url: '/pages/my/sellAfter/index'
@@ -552,46 +751,14 @@
 							icon: this.picUrl + '/static/my/sc.png',
 							name: '收藏',
 							url: '/pages/my/collect/index'
-						}, {
-							icon: this.picUrl + '/static/my/qt.png',
-							name: '小程序使用指南',
-							url: '/pages/my/useLead/index'
-						}, ]
-					}
-					this.list = [{
-							name: '邀约VIP'
 						},
 						{
-							name: '邀约L会员'
+							icon: this.picUrl + '/static/my/qt.png',
+							name: '其他信息',
+							url: '/pages/my/otherInfo/index'
 						},
-						{
-							name: '邀约活动用户'
-						}
 					]
 
-				} else if (this.role == 'shkf') {
-					this.serList = [{
-						icon: this.picUrl + '/static/my/set.png',
-						name: '设置',
-						url: '/pages/my/set/index?role=' + this.role
-					}, {
-						icon: this.picUrl + '/static/my/sh.png',
-						name: '售后',
-						url: '/pages/my/sellAfter/index'
-					}, {
-						icon: this.picUrl + '/static/my/tg.png',
-						name: '团购商品',
-						url: '/pages/my/actGoods/index'
-					}, {
-						icon: this.picUrl + '/static/my/sc.png',
-						name: '收藏',
-						url: '/pages/my/collect/index'
-					}, {
-						icon: this.picUrl + '/static/my/qt.png',
-						name: '小程序使用指南',
-						url: '/pages/my/useLead/index'
-					}, ]
-
 					this.list = [{
 							name: '邀约VIP'
 						},

pages/my/inviteDetail/index.scss

@@ -4,6 +4,20 @@
 ::v-deep button::after{
 	border: none!important;
 }
+
+::v-deep button{
+	font-size: 32rpx;
+	font-family: PingFang-SC-Medium, PingFang-SC;
+	font-weight: 500;
+}
+.orderBtn{
+	font-size: 32rpx;
+	font-family: PingFang-SC-Medium, PingFang-SC;
+	font-weight: 500;
+	color: #FFFFFF;
+	background: #333333;
+	border-radius: 4rpx;
+}
 .page{
 	
 }

pages/my/inviteDetail/index.vue

@@ -278,7 +278,9 @@ height: 140rpx;"></image>
 					<u--input clearable placeholder="请输入项目名称" border="surround" v-model="l_xmmc"
 						@change="change"></u--input>
 				</view>
-				<u-button text="确定" color="#333" @click="inviteLVip"></u-button>
+				<button open-type="share" class="orderBtn" :plain="true">
+					确定
+				</button>
 			</view>
 		</u-popup>
 
@@ -316,7 +318,9 @@ height: 140rpx;"></image>
 					<u--input clearable placeholder="请输入项目名称" border="surround" v-model="l_xmmc"
 						@change="change"></u--input>
 				</view> -->
-				<u-button text="确定" color="#333" @click="inviteYhVip"></u-button>
+				<button open-type="share" class="orderBtn" :plain="true">
+					确定
+				</button>
 			</view>
 		</u-popup>
 
@@ -354,7 +358,9 @@ height: 140rpx;"></image>
 					<u--input clearable placeholder="请输入项目名称" border="surround" v-model="h_xmmc"
 						@change="change"></u--input>
 				</view>
-				<u-button text="确定" color="#333" @click="inviteHyVip"></u-button>
+				<button open-type="share" class="orderBtn" :plain="true">
+					确定
+				</button>
 			</view>
 		</u-popup>
 
@@ -400,7 +406,10 @@ height: 140rpx;"></image>
 					<u--textarea v-model="d_djxx" placeholder="请输入兑奖信息"></u--textarea>
 				</view>
 
-				<u-button text="确定" color="#333" @click="inviteDgVip(item)"></u-button>
+				<!-- <u-button text="确定" color="#333" @click="inviteDgVip(item)"></u-button> -->
+				<button open-type="share" class="orderBtn" :plain="true">
+					确定
+				</button>
 			</view>
 		</u-popup>
 
@@ -455,7 +464,9 @@ height: 140rpx;"></image>
 					<u--input clearable placeholder="请输入备注" border="surround" v-model="v_bz"
 						@change="change"></u--input>
 				</view>
-				<u-button text="确定" color="#333" @click="inviteVip"></u-button>
+				<button open-type="share" class="orderBtn" :plain="true">
+					确定
+				</button>
 			</view>
 		</u-popup>
 	</view>
@@ -573,18 +584,20 @@ height: 140rpx;"></image>
 			this.getList()
 			// this.type = 'vip'
 		},
-		onShareAppMessage(params) {
+		async onShareAppMessage(params) {
 
 			console.log('触发邀请的inviteId', this.inviteId);
 			if (params.from === 'button' || params.from === 'menu') {
-				return {
-					// title: this.v_sf ? '邀您成为G-VIP' : '邀您成为S-VIP',
-					title: this.type == 'vip' ? '邀您成为VIP' : this.type == 'ls' ? '邀您成为L会员' : this.type == 'hy' ? '邀您成为会员' :
-						this.type == 'yh' ? '邀您成为活动用户' : '邀您成为产业电工',
-					imageUrl: this.$picUrl + '/static/other/inviteBg.jpg',
-					path: '/pages/index?inviteId=' + this.inviteId,
-					mpId: this.$appId,
-					type: this.$shareType,
+				if (this.showVipPop) {
+					return this.inviteVip()
+				} else if (this.showLsPop) {
+					return this.inviteLVip()
+				} else if (this.showHyPop) {
+					return this.inviteHyVip()
+				} else if (this.showYhPop) {
+					return this.inviteYhVip()
+				} else if (this.showDgPop) {
+					return this.inviteDgVip()
 				}
 			}
 		},
@@ -654,13 +667,6 @@ height: 140rpx;"></image>
 			async inviteDgVip(item) {
 				let parms = {}
 				if (item) {
-					// parms = {
-					// 	type: this.user_roleType,
-					// 	name: item.name,
-					// 	phone: item.phone,
-					// 	status: item.status,
-					// 	award_content: item.award
-					// }
 					this.d_xm = item.name
 					this.d_dh = item.phone
 					this.d_djxx = item.award_data.award_content
@@ -693,7 +699,7 @@ height: 140rpx;"></image>
 				}
 				let res = await postInviteReq(parms)
 				if (res.code == 0) {
-					this.$toast('提交邀约申请成功，请点击上方分享按钮分享至微信')
+					// this.$toast('提交邀约申请成功，请点击上方分享按钮分享至微信')
 					console.log('提交电工邀请返回值: ', res);
 					this.showDgPop = false
 					this.d_ly = -1
@@ -703,7 +709,15 @@ height: 140rpx;"></image>
 					this.getList()
 
 					this.inviteId = res.data.inviteId
-					this.showDgshareBtn = true
+					// this.showDgshareBtn = true
+					return {
+						title: this.type == 'vip' ? '邀您成为VIP' : this.type == 'ls' ? '邀您成为L会员' : this.type == 'hy' ?
+							'邀您成为会员' : this.type == 'yh' ? '邀您成为活动用户' : '邀您成为产业电工',
+						imageUrl: this.$picUrl + '/static/other/inviteBg.jpg',
+						path: '/pages/index?inviteId=' + this.inviteId,
+						mpId: this.$appId,
+						type: this.$shareType,
+					}
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -714,14 +728,6 @@ height: 140rpx;"></image>
 			async inviteHyVip(item) {
 				let parms = {}
 				if (item) {
-					// parms = {
-					// 	type: this.user_roleType,
-					// 	name: item.name,
-					// 	phone: item.phone,
-					// 	project_name: item.project_name,
-					// 	status: item.status
-					// }
-
 					this.h_xm = item.name
 					this.h_dh = item.phone
 					this.h_xmmc = item.project_name
@@ -744,7 +750,7 @@ height: 140rpx;"></image>
 				}
 				let res = await postInviteReq(parms)
 				if (res.code == 0) {
-					this.$toast('提交邀约申请成功，请点击上方分享按钮分享至微信')
+					// this.$toast('提交邀约申请成功，请点击上方分享按钮分享至微信')
 					console.log('提交会员vip邀请返回值: ', res);
 					this.showHyPop = false
 					this.h_xm = ''
@@ -752,7 +758,15 @@ height: 140rpx;"></image>
 					this.h_xmmc = ''
 					this.getList()
 					this.inviteId = res.data.inviteId
-					this.showHyshareBtn = true
+					// this.showHyshareBtn = true
+					return {
+						title: this.type == 'vip' ? '邀您成为VIP' : this.type == 'ls' ? '邀您成为L会员' : this.type == 'hy' ?
+							'邀您成为会员' : this.type == 'yh' ? '邀您成为活动用户' : '邀您成为产业电工',
+						imageUrl: this.$picUrl + '/static/other/inviteBg.jpg',
+						path: '/pages/index?inviteId=' + this.inviteId,
+						mpId: this.$appId,
+						type: this.$shareType,
+					}
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -763,12 +777,6 @@ height: 140rpx;"></image>
 			async inviteYhVip(item) {
 				let parms = {}
 				if (item) {
-					// parms = {
-					// 	type: this.user_roleType,
-					// 	name: item.name,
-					// 	phone: item.phone,
-					// 	status: item.status
-					// }
 					this.y_xm = item.name
 					this.y_dh = item.phone
 					this.showYhPop = true
@@ -789,14 +797,22 @@ height: 140rpx;"></image>
 				}
 				let res = await postInviteReq(parms)
 				if (res.code == 0) {
-					this.$toast('提交邀约申请成功，请点击上方分享按钮分享至微信')
+					// this.$toast('提交邀约申请成功，请点击上方分享按钮分享至微信')
 					console.log('提交活动用户vip邀请返回值: ', res);
 					this.showYhPop = false
 					this.y_xm = ''
 					this.y_dh = ''
 					this.getList()
 					this.inviteId = res.data.inviteId
-					this.showYhshareBtn = true
+					// this.showYhshareBtn = true
+					return {
+						title: this.type == 'vip' ? '邀您成为VIP' : this.type == 'ls' ? '邀您成为L会员' : this.type == 'hy' ?
+							'邀您成为会员' : this.type == 'yh' ? '邀您成为活动用户' : '邀您成为产业电工',
+						imageUrl: this.$picUrl + '/static/other/inviteBg.jpg',
+						path: '/pages/index?inviteId=' + this.inviteId,
+						mpId: this.$appId,
+						type: this.$shareType,
+					}
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -807,13 +823,6 @@ height: 140rpx;"></image>
 			async inviteLVip(item) {
 				let parms = {}
 				if (item) {
-					// parms = {
-					// 	type: this.user_roleType,
-					// 	name: item.name,
-					// 	phone: item.phone,
-					// 	project_name: item.project_name
-					// }
-
 					this.l_xm = item.name
 					this.l_dh = item.phone
 					this.l_xmmc = item.project_name
@@ -835,7 +844,7 @@ height: 140rpx;"></image>
 				}
 				let res = await postInviteReq(parms)
 				if (res.code == 0) {
-					this.$toast('提交邀约申请成功，请点击上方分享按钮分享至微信')
+					// this.$toast('提交邀约申请成功，请点击上方分享按钮分享至微信')
 					console.log('提交Lvip邀请返回值: ', res);
 					this.showLsPop = false
 					this.l_xm = ''
@@ -843,8 +852,15 @@ height: 140rpx;"></image>
 					this.l_xmmc = ''
 					this.getList()
 					this.inviteId = res.data.inviteId
-
-					this.showLshareBtn = true
+					// this.showLshareBtn = true
+					return {
+						title: this.type == 'vip' ? '邀您成为VIP' : this.type == 'ls' ? '邀您成为L会员' : this.type == 'hy' ?
+							'邀您成为会员' : this.type == 'yh' ? '邀您成为活动用户' : '邀您成为产业电工',
+						imageUrl: this.$picUrl + '/static/other/inviteBg.jpg',
+						path: '/pages/index?inviteId=' + this.inviteId,
+						mpId: this.$appId,
+						type: this.$shareType,
+					}
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -854,27 +870,9 @@ height: 140rpx;"></image>
 			},
 			async inviteVip(item) {
 
-				// console.log('参数', {
-				// 1VIP，2临时VIP（L），3产业电工，4邀请活动，5，兑换
-				// type: 1,
-				// name: this.v_xm,
-				// phone: this.v_dh,
-				// status: this.v_sf ? 'Gvip' : 'Svip',
-				// company: this.v_gs,
-				// remark: this.v_bz,
-				// project_name: 'project_name'
-				// });
-
 				let parms = {}
 				if (item) {
-					// parms = {
-					// 	type: this.user_roleType,
-					// 	name: item.name,
-					// 	phone: item.phone,
-					// 	status: item.status,
-					// 	company: item.company,
-					// 	remark: item.remark,
-					// }
+
 					this.v_xm = item.name
 					this.v_dh = item.phone
 					this.v_gs = item.company
@@ -909,7 +907,7 @@ height: 140rpx;"></image>
 				}
 				let res = await postInviteReq(parms)
 				if (res.code == 0) {
-					this.$toast('提交邀约申请成功，请点击上方分享按钮分享至微信')
+					// this.$toast('提交邀约申请成功，请点击上方分享按钮分享至微信')
 					console.log('提交vip邀请返回值: ', res);
 					this.showVipPop = false
 					this.v_sf = -1
@@ -921,10 +919,13 @@ height: 140rpx;"></image>
 					this.getList()
 					this.inviteId = res.data.inviteId
 
-					if (this.fromBtn) {
-						this.inviteSvipSuc = true
-					} else {
-						this.inviteGvipSuc = true
+					return {
+						title: this.type == 'vip' ? '邀您成为VIP' : this.type == 'ls' ? '邀您成为L会员' : this.type == 'hy' ?
+							'邀您成为会员' : this.type == 'yh' ? '邀您成为活动用户' : '邀您成为产业电工',
+						imageUrl: this.$picUrl + '/static/other/inviteBg.jpg',
+						path: '/pages/index?inviteId=' + this.inviteId,
+						mpId: this.$appId,
+						type: this.$shareType,
 					}
 				} else {
 					uni.showToast({

pages/my/set/index.vue

@@ -13,7 +13,7 @@
 							inactiveColor="#E6E6E6"></u-switch>
 					</view>
 				</view>
-				<view class="line" v-if="role!='svip'">
+				<view class="line" v-if="role!='svip'&&role!='gvip'">
 					<view class="left">
 						显示会员价
 					</view>

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

@@ -0,0 +1,4 @@
+
+require('./common/runtime.js')
+require('./common/vendor.js')
+require('./common/main.js')

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

@@ -0,0 +1,157 @@
+{
+  "pages": [
+    "pages/index",
+    "pages/mall",
+    "pages/service",
+    "pages/my",
+    "pages/map/index",
+    "pages/qrPage/index",
+    "pages/test/index",
+    "pages/privicyPopup/index"
+  ],
+  "subPackages": [
+    {
+      "root": "pages/index",
+      "pages": [
+        "customMian_step1/index",
+        "customNoMian_step1/index",
+        "customNoMian_step2/index",
+        "customMian/index",
+        "mainDetail/index",
+        "customNoMain/index",
+        "productLead/index",
+        "fullHouseWifi/index",
+        "fullHouseWifi_step2/index",
+        "aiControlSys/index",
+        "rule/index",
+        "mainList/index",
+        "productLeadDetail/index",
+        "aiControlSys_step2/index"
+      ]
+    },
+    {
+      "root": "pages/mall",
+      "pages": [
+        "detail/index",
+        "pickKeting/index",
+        "goodsList/index"
+      ]
+    },
+    {
+      "root": "pages/service",
+      "pages": [
+        "detail/index"
+      ]
+    },
+    {
+      "root": "pages/my",
+      "pages": [
+        "actGoods/index",
+        "actGoodsDetail/index",
+        "chapinShip/index",
+        "collect/index",
+        "useLead/index",
+        "feedBack/index",
+        "userInfo/index",
+        "set/index",
+        "sellAfter/index",
+        "otherInfo/index",
+        "sellAfterDefer/index",
+        "sellAfterCon/index",
+        "inviteDetail/index",
+        "collectDetail/index",
+        "changeNewStep/index",
+        "changeNewGoods/index",
+        "aboutMe/index",
+        "protocol/index",
+        "duijiang/index"
+      ]
+    }
+  ],
+  "window": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "uni-app",
+    "navigationBarBackgroundColor": "#F8F8F8",
+    "backgroundColor": "#F8F8F8",
+    "navigationStyle": "custom"
+  },
+  "tabBar": {
+    "color": "#CBC8C7",
+    "selectedColor": "#F7790C",
+    "borderStyle": "black",
+    "backgroundColor": "#fff",
+    "fontSize": "22rpx",
+    "spacing": "5px",
+    "height": "50px",
+    "iconfontSrc": "static/fonts/iconfont.ttf",
+    "list": [
+      {
+        "pagePath": "pages/index",
+        "text": "首页",
+        "iconPath": "static/tabbar/index.png",
+        "selectedIconPath": "static/tabbar/index_a.png",
+        "iconfont": {
+          "text": "",
+          "selectedText": "",
+          "fontSize": "17px",
+          "color": "#333",
+          "selectedColor": "red"
+        }
+      },
+      {
+        "pagePath": "pages/mall",
+        "text": "商城",
+        "iconPath": "static/tabbar/mall.png",
+        "selectedIconPath": "static/tabbar/mall_a.png",
+        "iconfont": {
+          "text": "",
+          "selectedText": "",
+          "fontSize": "17px",
+          "color": "#333",
+          "selectedColor": "red"
+        }
+      },
+      {
+        "pagePath": "pages/service",
+        "text": "服务",
+        "iconPath": "static/tabbar/service.png",
+        "selectedIconPath": "static/tabbar/service_a.png",
+        "iconfont": {
+          "text": "",
+          "selectedText": "",
+          "fontSize": "17px",
+          "color": "#333",
+          "selectedColor": "red"
+        }
+      },
+      {
+        "pagePath": "pages/my",
+        "text": "我的",
+        "iconPath": "static/tabbar/my.png",
+        "selectedIconPath": "static/tabbar/my_a.png",
+        "iconfont": {
+          "text": "",
+          "selectedText": "",
+          "fontSize": "17px",
+          "color": "#333",
+          "selectedColor": "red"
+        }
+      }
+    ]
+  },
+  "permission": {
+    "scope.userLocation": {
+      "desc": "用于小程序使用中为您提供位置信息"
+    }
+  },
+  "requiredPrivateInfos": [
+    "getLocation",
+    "choosePoi",
+    "chooseAddress",
+    "chooseLocation"
+  ],
+  "usingComponents": {
+    "nav-bar": "/components/navBar/index",
+    "dpopup": "/components/popup/index"
+  }
+}

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

@@ -0,0 +1,3 @@
+@import './common/main.wxss';
+
+[data-custom-hidden="true"],[bind-data-custom-hidden="true"]{display: none !important;}

unpackage/dist/build/mp-weixin/components/navBar/index.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/navBar/index"],{"01e6":function(t,n,e){"use strict";e.r(n);var i=e("42f5"),a=e("dc70");for(var u in a)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(u);e("1ebb");var o=e("f0c5"),r=Object(o["a"])(a["default"],i["b"],i["c"],!1,null,"3ee39edc",null,!1,i["a"],void 0);n["default"]=r.exports},"1ebb":function(t,n,e){"use strict";var i=e("5b9d"),a=e.n(i);a.a},"42f5":function(t,n,e){"use strict";e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){return i}));var i={uniIcons:function(){return Promise.all([e.e("common/vendor"),e.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(e.bind(null,"3773"))}},a=function(){var t=this.$createElement,n=(this._self._c,this.title?this.title.replace("true",""):null);this.$mp.data=Object.assign({},{$root:{g0:n}})},u=[]},"5b9d":function(t,n,e){},da93:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{statusBarHeight:20,navBareight:45,windowWidth:375}},props:{backType:{type:String,default:""},navImg:{type:String,default:""},flex:{type:String,default:"left"},title:{type:String,default:" "},color:{type:String,default:"#fff"},background:{type:String,default:"transparent"},back:{type:Boolean,default:!1}},created:function(){var n=t.getSystemInfoSync(),e=n.statusBarHeight,i=n.windowWidth;this.statusBarHeight=e,this.windowWidth=i;var a=t.getMenuButtonBoundingClientRect(),u=a.top,o=a.bottom,r=a.left;this.navBareight=o-e+(u-e),this.windowWidth=r},methods:{onBack:function(){this.backType?t.switchTab({url:"/pages/index"}):(this.$emit("onBack"),t.navigateBack({delta:1}))}}};n.default=e}).call(this,e("543d")["default"])},dc70:function(t,n,e){"use strict";e.r(n);var i=e("da93"),a=e.n(i);for(var u in i)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(u);n["default"]=a.a}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'components/navBar/index-create-component',
+    {
+        'components/navBar/index-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("01e6"))
+        })
+    },
+    [['components/navBar/index-create-component']]
+]);

unpackage/dist/build/mp-weixin/components/navBar/index.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  },
+  "component": true
+}

unpackage/dist/build/mp-weixin/components/navBar/index.wxml

@@ -0,0 +1 @@
+<view class="navbar data-v-3ee39edc" style="{{'height:'+(statusBarHeight+navBareight+'px')+';'+('background:'+(background)+';')}}"><view class="narbar-flexd data-v-3ee39edc" style="{{'background:'+(background)+';'}}"><view style="{{'height:'+(statusBarHeight+'px')+';'}}" class="data-v-3ee39edc"></view><view class="narbar-content data-v-3ee39edc" style="{{'height:'+(navBareight+'px')+';'+('justify-content:'+(flex=='cen'?'center':'')+';')}}"><block wx:if="{{back}}"><view data-event-opts="{{[['tap',[['onBack',['$event']]]]]}}" class="left data-v-3ee39edc" style="{{'color:'+(color)+';'+('padding-top:'+(paddingTop)+';')}}" bindtap="__e"><uni-icons vue-id="3a6d4f98-1" type="arrowleft" size="25" color="{{color}}" class="data-v-3ee39edc" bind:__l="__l"></uni-icons></view></block><block wx:if="{{!back&&navImg}}"><view data-event-opts="{{[['tap',[['',['$event']]]]]}}" class="left data-v-3ee39edc" bindtap="__e"><image style="width:40rpx;height:40rpx;margin-right:8rpx;" showLoading="{{true}}" src="{{navImg}}" data-event-opts="{{[['tap',[['',['$event']]]]]}}" bindtap="__e" class="data-v-3ee39edc"></image></view></block><block wx:if="{{title}}"><view class="title data-v-3ee39edc" style="{{'color:'+(color)+';'}}">{{''+$root.g0+''}}</view></block></view></view><view class="navHeight data-v-3ee39edc" style="{{'height:'+(statusBarHeight+navBareight+'px')+';'}}"></view></view>

unpackage/dist/build/mp-weixin/components/navBar/index.wxss

@@ -0,0 +1 @@
+.navbar.data-v-3ee39edc{background:green;position:relative}.navbar .narbar-flexd.data-v-3ee39edc{background:green;position:fixed;top:0;left:0;z-index:99;width:100%}.navbar .narbar-flexd .narbar-content.data-v-3ee39edc{padding:0 40rpx;display:flex;box-sizing:border-box;align-items:center}.navbar .narbar-flexd .narbar-content .left.data-v-3ee39edc{font-weight:600;display:flex;align-items:center}.navbar .narbar-flexd .narbar-content .title.data-v-3ee39edc{font-size:16px;color:#fff;font-weight:600}.navbar .navHeight.data-v-3ee39edc{height:60px}

unpackage/dist/build/mp-weixin/components/popup/index.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/popup/index"],{"1d23":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;e.default={props:["show","mode","round","dtitle"],methods:{close:function(){this.$emit("close")},open:function(){this.$emit("open")}}}},"30de":function(n,e,t){"use strict";var u=t("47a5"),o=t.n(u);o.a},"47a5":function(n,e,t){},"85fd":function(n,e,t){"use strict";t.r(e);var u=t("d4e5"),o=t("8cea");for(var i in o)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(i);t("30de");var c=t("f0c5"),r=Object(c["a"])(o["default"],u["b"],u["c"],!1,null,"7dea3bec",null,!1,u["a"],void 0);e["default"]=r.exports},"8cea":function(n,e,t){"use strict";t.r(e);var u=t("1d23"),o=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);e["default"]=o.a},d4e5:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return i})),t.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"50d6"))}},o=function(){var n=this.$createElement;this._self._c},i=[]}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'components/popup/index-create-component',
+    {
+        'components/popup/index-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("85fd"))
+        })
+    },
+    [['components/popup/index-create-component']]
+]);

unpackage/dist/build/mp-weixin/components/popup/index.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup"
+  },
+  "component": true
+}

unpackage/dist/build/mp-weixin/components/popup/index.wxml

@@ -0,0 +1 @@
+<view class="data-v-7dea3bec"><u-popup vue-id="9b043d7c-1" show="{{show}}" mode="{{mode}}" round="{{round}}" data-event-opts="{{[['^close',[['close']]],['^open',[['open']]]]}}" bind:close="__e" bind:open="__e" class="data-v-7dea3bec" bind:__l="__l" vue-slots="{{['default']}}"><view class="topBar data-v-7dea3bec"><view class="left data-v-7dea3bec">X</view><view class="cen data-v-7dea3bec">{{''+title+''}}</view><view class="close data-v-7dea3bec">X</view></view></u-popup></view>

unpackage/dist/build/mp-weixin/components/popup/index.wxss

@@ -0,0 +1 @@
+.topBar.data-v-7dea3bec{height:112rpx;background:#f9f9f9;border-radius:24rpx 24rpx 0rpx 0rpx;display:flex;align-items:center;justify-content:space-between}.topBar .left.data-v-7dea3bec{width:10%;display:flex;align-items:center;justify-content:center}.topBar .cen.data-v-7dea3bec{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333}.topBar .close.data-v-7dea3bec{width:24rpx;height:24rpx;color:#666;width:10%;display:flex;align-items:center;justify-content:center}

unpackage/dist/build/mp-weixin/components/privacyPopup/index.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/privacyPopup/index"],{"14bf":function(n,t,e){},7923:function(n,t,e){"use strict";e.d(t,"b",(function(){return i})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){return u}));var u={uniPopup:function(){return e.e("uni_modules/uni-popup/components/uni-popup/uni-popup").then(e.bind(null,"1c63"))}},i=function(){var n=this.$createElement;this._self._c},c=[]},"7c5e":function(n,t,e){"use strict";e.r(t);var u=e("7923"),i=e("ec66");for(var c in i)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return i[n]}))}(c);e("974c");var o=e("f0c5"),r=Object(o["a"])(i["default"],u["b"],u["c"],!1,null,"2f94559f",null,!1,u["a"],void 0);t["default"]=r.exports},"974c":function(n,t,e){"use strict";var u=e("14bf"),i=e.n(u);i.a},b6b5:function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{title:"用户隐私保护提示",desc1:"感谢您使用本产品，您使用本产品前应当仔细阅读并同意",urlTitle:"《小程序隐私保护指引》",desc2:"当您点击同意并开始使用产品服务时，即表示你已理解并同意该条款内容，该条款将对您产生法律约束力。如您拒绝，将无法更好的体验产品。"}},methods:{openPrivacyContract:function(){n.openPrivacyContract({})},handleAgreePrivacyAuthorization:function(){getApp().globalData.showPrivacy=!1,this.$emit("confirm"),this.$refs.popup.close()},handleDisagree:function(){this.$refs.popup.close()}}};t.default=e}).call(this,e("bc2e")["default"])},ec66:function(n,t,e){"use strict";e.r(t);var u=e("b6b5"),i=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=i.a}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'components/privacyPopup/index-create-component',
+    {
+        'components/privacyPopup/index-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("7c5e"))
+        })
+    },
+    [['components/privacyPopup/index-create-component']]
+]);

unpackage/dist/build/mp-weixin/components/privacyPopup/index.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup"
+  }
+}

unpackage/dist/build/mp-weixin/components/privacyPopup/index.wxml

@@ -0,0 +1 @@
+<uni-popup vue-id="4a802978-1" type="center" is-mask-click="{{false}}" data-ref="popup" class="data-v-2f94559f vue-ref" bind:__l="__l" vue-slots="{{['default']}}"><view class="popup-box data-v-2f94559f"><view class="weui-half-screen-dialog__hd data-v-2f94559f">{{''+title+''}}</view><view class="weui-half-screen-dialog__bd data-v-2f94559f"><text class="weui-half-screen-dialog__tips data-v-2f94559f">{{desc1}}</text><text data-event-opts="{{[['tap',[['openPrivacyContract',['$event']]]]]}}" class="weui-half-screen-dialog__tips color-8BC21F data-v-2f94559f" bindtap="__e">{{''+urlTitle+''}}</text><text class="weui-half-screen-dialog__tips data-v-2f94559f">{{desc2}}</text></view><view class="weui-half-screen-dialog__ft data-v-2f94559f"><button data-event-opts="{{[['tap',[['handleDisagree',['$event']]]]]}}" class="weui-btn data-v-2f94559f" bindtap="__e">拒绝</button><button class="weui-btn agree data-v-2f94559f" id="agree-btn" type="default" open-type="agreePrivacyAuthorization" data-event-opts="{{[['agreeprivacyauthorization',[['handleAgreePrivacyAuthorization',['$event']]]]]}}" bindagreeprivacyauthorization="__e">同意</button></view></view></uni-popup>

unpackage/dist/build/mp-weixin/components/privacyPopup/index.wxss

@@ -0,0 +1 @@
+.popup-box.data-v-2f94559f{width:80vw;overflow:hidden;background:#fff;padding:30rpx;border-radius:24rpx}.popup-box .weui-half-screen-dialog__hd.data-v-2f94559f{font-size:48rpx;font-family:Source Han Sans CN-Bold,Source Han Sans CN;font-weight:700;color:#000;line-height:56rpx}.popup-box .weui-half-screen-dialog__bd.data-v-2f94559f{margin-top:48rpx;text-indent:2em}.popup-box .weui-half-screen-dialog__bd .weui-half-screen-dialog__tips.data-v-2f94559f{font-size:28rpx;font-family:Source Han Sans CN-Normal,Source Han Sans CN;font-weight:400;color:#000;line-height:33rpx}.popup-box .weui-half-screen-dialog__ft.data-v-2f94559f{display:flex;justify-content:space-evenly;align-items:center;margin-top:48rpx}.popup-box .weui-half-screen-dialog__ft .weui-btn.data-v-2f94559f{padding:0 60rpx;margin:0;background:none;font-size:32rpx;font-family:Source Han Sans CN-Normal,Source Han Sans CN;font-weight:400;color:#000;line-height:80rpx}.popup-box .weui-half-screen-dialog__ft .agree.data-v-2f94559f{color:#fff;background:linear-gradient(90deg,#8bc21f,#7ab30a)}.popup-box .color-8BC21F.data-v-2f94559f{color:#8bc21f!important}

unpackage/dist/build/mp-weixin/components/wike-painter/wike-painter.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

unpackage/dist/build/mp-weixin/components/wike-painter/wike-painter.wxml

@@ -0,0 +1 @@
+<view data-ref="limepainter" class="lime-painter vue-ref"><block wx:if="{{canvasId&&size}}"><view style="{{(styles)}}"><block wx:if="{{use2dCanvas}}"><canvas class="lime-painter__canvas" style="{{(size)}}" id="{{canvasId}}" type="2d"></canvas></block><block wx:else><canvas class="lime-painter__canvas" style="{{(size)}}" canvas-id="{{canvasId}}" id="{{canvasId}}" width="{{boardWidth*dpr}}" height="{{boardHeight*dpr}}"></canvas></block></view></block><slot></slot></view>

unpackage/dist/build/mp-weixin/components/wike-painter/wike-painter.wxss

@@ -0,0 +1,2 @@
+.lime-painter,
+.lime-painter__canvas{width:100%}

unpackage/dist/build/mp-weixin/pages/index.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "首页",
+  "usingComponents": {
+    "u-swiper": "/uni_modules/uview-ui/components/u-swiper/u-swiper",
+    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/aiControlSys/index.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup",
+    "u-icon": "/uni_modules/uview-ui/components/u-icon/u-icon"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/aiControlSys_step2/index.json

@@ -0,0 +1,10 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup",
+    "u-icon": "/uni_modules/uview-ui/components/u-icon/u-icon",
+    "u--input": "/uni_modules/uview-ui/components/u--input/u--input",
+    "u--textarea": "/uni_modules/uview-ui/components/u--textarea/u--textarea"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/customMian/index.json

@@ -0,0 +1,11 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup",
+    "u-icon": "/uni_modules/uview-ui/components/u-icon/u-icon",
+    "u--input": "/uni_modules/uview-ui/components/u--input/u--input",
+    "u--textarea": "/uni_modules/uview-ui/components/u--textarea/u--textarea",
+    "u-modal": "/uni_modules/uview-ui/components/u-modal/u-modal"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/customMian_step1/index.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup",
+    "u-icon": "/uni_modules/uview-ui/components/u-icon/u-icon",
+    "u-modal": "/uni_modules/uview-ui/components/u-modal/u-modal"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/customNoMain/index.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-parse": "/uni_modules/uview-ui/components/u-parse/u-parse"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/customNoMain/index.wxml

@@ -0,0 +1 @@
+<view class="page data-v-013fded9"><nav-bar vue-id="121fdf82-1" title="定制我家的无主灯" back="{{true}}" color="black" background="white" class="data-v-013fded9" bind:__l="__l"></nav-bar><view class="con data-v-013fded9"><u-parse vue-id="121fdf82-2" content="{{content}}" class="data-v-013fded9" bind:__l="__l"></u-parse></view></view>

unpackage/dist/build/mp-weixin/pages/index/customNoMain/index.wxss

@@ -0,0 +1 @@
+.data-v-013fded9 .u-line{width:56rpx!important}.page.data-v-013fded9{padding-bottom:54rpx}.con.data-v-013fded9{padding:28rpx 32rpx}.con .item.data-v-013fded9{display:flex;flex-direction:column;align-items:center;margin-bottom:64rpx}.con .item .label.data-v-013fded9{font-size:36rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333;position:relative;margin-bottom:32rpx}.con .item .label image.data-v-013fded9{width:56rpx;height:20rpx;position:absolute;top:-10rpx;left:-10rpx}.con .item image.data-v-013fded9{height:686rpx;width:100%;border-radius:0 40rpx 0 40rpx}

unpackage/dist/build/mp-weixin/pages/index/customNoMian_step1/index.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup",
+    "u-icon": "/uni_modules/uview-ui/components/u-icon/u-icon"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/customNoMian_step2/index.json

@@ -0,0 +1,10 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup",
+    "u-icon": "/uni_modules/uview-ui/components/u-icon/u-icon",
+    "u--input": "/uni_modules/uview-ui/components/u--input/u--input",
+    "u--textarea": "/uni_modules/uview-ui/components/u--textarea/u--textarea"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi/index.json

@@ -0,0 +1,10 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup",
+    "u-icon": "/uni_modules/uview-ui/components/u-icon/u-icon",
+    "u--input": "/uni_modules/uview-ui/components/u--input/u--input",
+    "u--textarea": "/uni_modules/uview-ui/components/u--textarea/u--textarea"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi_step2/index.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}

unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi_step2/index.wxml

@@ -0,0 +1 @@
+<view class="page data-v-6fe0fa3c"><nav-bar vue-id="ed4b4408-1" backType="{{navBarTitle}}" title="{{navBarTitle?navBarTitle:'定制我家的全屋WIFI'}}" back="{{true}}" color="black" background="white" class="data-v-6fe0fa3c" bind:__l="__l"></nav-bar><image class="topImg data-v-6fe0fa3c" src="{{picUrl+'/static/other/c1.png'}}" mode></image><view class="cen data-v-6fe0fa3c"><image class="water data-v-6fe0fa3c" src="/static/index/water.png" mode></image><image class="halfC data-v-6fe0fa3c" src="/static/index/halfCircle_275.png" mode></image>定制我家的全屋WIFI</view><view class="parmasBox data-v-6fe0fa3c"><view class="con data-v-6fe0fa3c"><view class="top data-v-6fe0fa3c"><view class="item data-v-6fe0fa3c"><view class="name data-v-6fe0fa3c">户型</view><view class="des data-v-6fe0fa3c">{{''+selHx.value+''}}</view></view></view></view></view><view class="parmasBox data-v-6fe0fa3c"><view class="con data-v-6fe0fa3c"><view class="top data-v-6fe0fa3c"><view class="item data-v-6fe0fa3c"><view class="name data-v-6fe0fa3c">收货人</view><view class="des data-v-6fe0fa3c">{{''+shareCon.name+''}}</view></view><view class="item data-v-6fe0fa3c"><view class="name data-v-6fe0fa3c">电话</view><view class="des data-v-6fe0fa3c">{{''+shareCon.phone+''}}</view></view><view class="item data-v-6fe0fa3c"><view class="name data-v-6fe0fa3c">收货地址</view><view class="des data-v-6fe0fa3c">{{''+shareCon.address+''}}</view></view><view class="item data-v-6fe0fa3c"><view class="name data-v-6fe0fa3c">备注</view><view class="des data-v-6fe0fa3c">{{''+shareCon.remark+''}}</view></view></view></view></view></view>

unpackage/dist/build/mp-weixin/pages/index/mainDetail/index.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-swiper": "/uni_modules/uview-ui/components/u-swiper/u-swiper"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/mainList/index.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-empty": "/uni_modules/uview-ui/components/u-empty/u-empty",
+    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/mainList/index.wxml

@@ -0,0 +1 @@
+<view class="page data-v-7058d962"><nav-bar vue-id="03562e14-1" title="{{name}}" back="{{true}}" color="black" background="white" class="data-v-7058d962" bind:__l="__l"></nav-bar><block wx:if="{{$root.g0!=0}}"><view class="con data-v-7058d962"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0',index],[[['list','',index]]]]]]]}}" class="item data-v-7058d962" bindtap="__e"><view class="topBox data-v-7058d962"><image src="{{picBase+item.cover}}" mode class="data-v-7058d962"></image></view><view class="bottom data-v-7058d962"><view class="txt data-v-7058d962">{{''+item.name+''}}</view></view></view></block></view></block><block wx:else><view class="con data-v-7058d962" style="justify-content:center;"><u-empty vue-id="03562e14-2" mode="data" text="暂无数据" width="160" height="160" icon="{{picUrl+'/static/other/empty.png'}}" class="data-v-7058d962" bind:__l="__l"></u-empty></view></block><block wx:if="{{$root.g1!=0}}"><u-loadmore vue-id="03562e14-3" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-7058d962" bind:__l="__l"></u-loadmore></block></view>

unpackage/dist/build/mp-weixin/pages/index/mainList/index.wxss

@@ -0,0 +1 @@
+.data-v-7058d962 .u-line{width:56rpx!important}.page.data-v-7058d962{padding-bottom:54rpx}.con.data-v-7058d962{width:100%;display:flex;flex-wrap:wrap;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-7058d962{width:336rpx;background:#fff;border-radius:24rpx;border:2rpx solid #f1f1f1;margin-right:16rpx;margin-bottom:24rpx}.con .item .topBox.data-v-7058d962{position:relative}.con .item .topBox image.data-v-7058d962{width:100%;height:292rpx;border-radius:30rpx 30rpx 0 0}.con .item .bottom.data-v-7058d962{display:flex;justify-content:center;align-items:center;height:76rpx}.con .item .bottom .txt.data-v-7058d962{width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}

unpackage/dist/build/mp-weixin/pages/index/productLead/index.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-empty": "/uni_modules/uview-ui/components/u-empty/u-empty",
+    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/productLead/index.wxml

@@ -0,0 +1 @@
+<view class="page data-v-5338f2c5"><nav-bar vue-id="5d58823e-1" title="产品指南" back="{{true}}" color="black" background="white" class="data-v-5338f2c5" bind:__l="__l"></nav-bar><block wx:if="{{$root.g0!=0}}"><view class="con data-v-5338f2c5"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['list','',index]]]]]]]}}" class="item data-v-5338f2c5" bindtap="__e"><image src="{{picBase+item.image}}" mode class="data-v-5338f2c5"></image><view class="bottom data-v-5338f2c5"><view class="txt data-v-5338f2c5">{{''+item.title+''}}</view></view></view></block></view></block><block wx:else><view class="con data-v-5338f2c5" style="justify-content:center;"><u-empty vue-id="5d58823e-2" mode="data" text="暂无数据" width="160" height="160" icon="{{picUrl+'/static/other/empty.png'}}" class="data-v-5338f2c5" bind:__l="__l"></u-empty></view></block><block wx:if="{{$root.g1!=0}}"><u-loadmore vue-id="5d58823e-3" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-5338f2c5" bind:__l="__l"></u-loadmore></block></view>

unpackage/dist/build/mp-weixin/pages/index/productLead/index.wxss

@@ -0,0 +1 @@
+.data-v-5338f2c5 .u-line{width:56rpx!important}.page.data-v-5338f2c5{padding-bottom:54rpx}.con.data-v-5338f2c5{width:100%;display:flex;flex-wrap:wrap;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-5338f2c5{width:336rpx;background:#fff;border-radius:24rpx;border:2rpx solid #f1f1f1;margin-right:16rpx;margin-bottom:24rpx}.con .item image.data-v-5338f2c5{width:100%;height:292rpx;border-radius:30rpx 30rpx 0 0}.con .item .bottom.data-v-5338f2c5{display:flex;justify-content:center;align-items:center;height:76rpx}.con .item .bottom .txt.data-v-5338f2c5{width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}

unpackage/dist/build/mp-weixin/pages/index/productLeadDetail/index.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-parse": "/uni_modules/uview-ui/components/u-parse/u-parse"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/productLeadDetail/index.wxml

@@ -0,0 +1 @@
+<view class="page data-v-0c03d974"><nav-bar vue-id="76bf8a26-1" backType="{{navBarTitle}}" title="{{navBarTitle?navBarTitle:'产品指南'}}" back="{{true}}" color="black" background="white" class="data-v-0c03d974" bind:__l="__l"></nav-bar><view class="content data-v-0c03d974"><view class="title data-v-0c03d974">{{''+content.title+''}}</view><view class="p data-v-0c03d974"><u-parse vue-id="76bf8a26-2" content="{{content.content}}" class="data-v-0c03d974" bind:__l="__l"></u-parse></view><image style="margin-bottom:64rpx;" src="{{picBase+content.image}}" mode class="data-v-0c03d974"></image></view><block wx:if="{{showBtn}}"><view class="btnBox data-v-0c03d974"><button class="rBtn data-v-0c03d974" open-type="share">分享</button></view></block></view>

unpackage/dist/build/mp-weixin/pages/index/productLeadDetail/index.wxss

@@ -0,0 +1 @@
+.data-v-0c03d974 button::after{border:none!important}.page.data-v-0c03d974{padding-bottom:160rpx}.content.data-v-0c03d974{padding:48rpx 32rpx 0 32rpx}.content .title.data-v-0c03d974{font-size:40rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333;margin-bottom:50rpx}.content .p.data-v-0c03d974{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;color:#333;line-height:50rpx;margin-bottom:50rpx}.content image.data-v-0c03d974{width:686rpx;height:686rpx;border-radius:0 40rpx 0 40rpx}.btnBox.data-v-0c03d974{height:160rpx;background:#fff;box-shadow:0rpx 0rpx 8rpx 0rpx rgba(0,0,0,.16);position:fixed;bottom:0;width:calc(100% - 64rpx);display:flex;align-items:center;justify-content:space-between;padding:0 32rpx}.btnBox .rBtn.data-v-0c03d974{width:100%;height:96rpx;background:#333;border-radius:4rpx;border:2rpx solid #333;display:flex;justify-content:center;align-items:center;font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#fff}

unpackage/dist/build/mp-weixin/pages/index/rule/index.js

@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/index/rule/index"],{"18d0":function(n,e,t){"use strict";var u=t("2247"),o=t.n(u);o.a},"18fe":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={components:{},data:function(){return{content:""}},onLoad:function(n){this.content=getApp().content,console.log(this.content)},methods:{}};e.default=u},2247:function(n,e,t){},"449f":function(n,e,t){"use strict";t.r(e);var u=t("67f5"),o=t("ac81");for(var c in o)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(c);t("18d0");var r=t("f0c5"),a=Object(r["a"])(o["default"],u["b"],u["c"],!1,null,"2daba840",null,!1,u["a"],void 0);e["default"]=a.exports},"67f5":function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){return u}));var u={uParse:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-parse/u-parse")]).then(t.bind(null,"5d44"))}},o=function(){var n=this.$createElement;this._self._c},c=[]},6953:function(n,e,t){"use strict";(function(n,e){var u=t("4ea4");t("d716");u(t("66fd"));var o=u(t("449f"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},ac81:function(n,e,t){"use strict";t.r(e);var u=t("18fe"),o=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);e["default"]=o.a}},[["6953","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pages/index/rule/index.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-parse": "/uni_modules/uview-ui/components/u-parse/u-parse"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/rule/index.wxml

@@ -0,0 +1 @@
+<view class="page data-v-2daba840"><nav-bar vue-id="9790385e-1" title="挑选规则" back="{{true}}" color="black" background="white" class="data-v-2daba840" bind:__l="__l"></nav-bar><view class="content data-v-2daba840"><u-parse vue-id="9790385e-2" content="{{content}}" class="data-v-2daba840" bind:__l="__l"></u-parse></view></view>