9.23

api/test/index.js

@@ -22,6 +22,20 @@ export const updateUserInfoReq = (params, config = {}) => http.post('/api/users/
 // 获取首页配置
 export const getIndexConfigReq = (params, config = {}) => http.post('/api/getHomeData', params, config)
 
+// 获取首页配置2
+export const getHomeDataNextReq = (params, config = {}) => {
+	let apiUrl = '/api/getHomeDataNext'
+	Object.keys(params).forEach((item, index) => {
+		if (index == 0) {
+			apiUrl += `?${item}=${params[item]}`
+		} else {
+			apiUrl += `&${item}=${params[item]}`
+		}
+	})
+	console.log('处理后的apiUrl', apiUrl);
+
+	return http.get(apiUrl, params, config)
+}
 
 
 // 订单相关相关
@@ -45,8 +59,23 @@ export const getOrderDetailReq = (params, config = {}) => {
 
 
 // 获取商城分类数据
-export const getMallCatReq = (params, config = {}) => http.get('/api/goods/getClassifyData', params, config)
+// export const getMallCatReq = (params, config = {}) => http.get('/api/goods/getClassifyData', params, config)
+
+export const getMallCatReq = (params, config = {}) => {
+	let apiUrl = '/api/goods/getClassifyData'
+	if (params) {
+		Object.keys(params).forEach((item, index) => {
+			if (index == 0) {
+				apiUrl += `?${item}=${params[item]}`
+			} else {
+				apiUrl += `&${item}=${params[item]}`
+			}
+		})
+	}
 
+	console.log('处理后的apiUrl', apiUrl);
+	return http.get(apiUrl, params, config)
+}
 
 // 获取商城数据
 export const getMallReq = (params, config = {}) => {

main.js

@@ -19,7 +19,7 @@ Vue.use(uView)
 import store from 'store/index.js'
 Vue.prototype.$store = store
 Vue.prototype.$appId = 'wx98ab2939999e13de'
-Vue.prototype.$shareType = 1
+Vue.prototype.$shareType = 2
 
 import uploadUrl from '@/common/config.js'
 Vue.prototype.$picUrl = uploadUrl.picUrl

pages/index.vue

@@ -169,7 +169,13 @@
 				// priceConfig: {}
 			}
 		},
-		async onLoad() {
+		async onLoad(o) {
+			// o.inviteId = ''
+			if (o.inviteId) {
+				uni.setStorageSync('inviteId', o.inviteId)
+				console.log('接收到的o.inviteId', o.inviteId);
+			}
+
 			let res = await getBannerDataReq()
 			if (res.code == 0) {
 				this.bannerList = res.data

pages/index/aiControlSys/index.vue

@@ -157,7 +157,7 @@
 				</view>
 			</view>
 			<view class="pupopCon">
-				<view class="item">
+				<view class="item" v-if="selHx">
 					<view class="top">
 						<view class="name">
 							户型
@@ -169,7 +169,7 @@
 				</view>
 
 				<view class="item">
-					<view class="top">
+					<view class="top" v-if="selPp">
 						<view class="name">
 							品牌
 						</view>
@@ -177,7 +177,7 @@
 							{{selPp.value}}
 						</view>
 					</view>
-					<view class="top">
+					<view class="top" v-if="selSuo">
 						<view class="name">
 							智能锁
 						</view>
@@ -186,7 +186,7 @@
 						</view>
 					</view>
 
-					<view class="top">
+					<view class="top" v-if="selMb">
 						<view class="name">
 							智能开关
 						</view>
@@ -194,7 +194,7 @@
 							{{selMb.value}}
 						</view>
 					</view>
-					<view class="top">
+					<view class="top" v-if="selCl">
 						<view class="name">
 							智能窗帘
 						</view>
@@ -202,7 +202,7 @@
 							{{selCl.value}}
 						</view>
 					</view>
-					<view class="top">
+					<view class="top" v-if="selKt">
 						<view class="name">
 							智能空调
 						</view>
@@ -229,6 +229,7 @@
 <script>
 	import {
 		getIndexConfigReq,
+		getHomeDataNextReq
 	} from '@/api/test/index.js'
 	import {
 		getDataMoneyReq
@@ -259,12 +260,12 @@
 
 				showConfig: false,
 
-				currHouseIndex: 0,
-				currHouseIndex1: 0,
-				currHouseIndex2: 0,
-				currHouseIndex3: 0,
-				currHouseIndex4: 0,
-				currHouseIndex5: 0,
+				currHouseIndex: -1,
+				currHouseIndex1: -1,
+				currHouseIndex2: -1,
+				currHouseIndex3: -1,
+				currHouseIndex4: -1,
+				currHouseIndex5: -1,
 				houseTypeList: [],
 				brandTypeList: [
 
@@ -286,11 +287,11 @@
 				totalPrice: 0,
 
 				selHx: null,
-				selPp: [],
+				selPp: null,
 				selSuo: null,
-				selMb: [],
-				selCl: [],
-				selKt: [],
+				selMb: null,
+				selCl: null,
+				selKt: null,
 				pConfig: -1,
 				cutdownRatio: 1
 			}
@@ -311,55 +312,295 @@
 
 				this.rule = res.data.rule.content
 
-				this.selHx = res.data.house_type[0]
-				this.selPp = res.data.brand[0]
-				this.selSuo = res.data.mind_lock[0]
-				this.selMb = res.data.mind_switch[0]
-				this.selCl = res.data.mind_curtain[0]
-				this.selKt = res.data.mind_air_conditioner[0]
-				this.getPrice(3, this.selHx.id, this.selPp.id, this.selSuo.id, this.selMb.id, this.selCl.id, this.selKt
-					.id)
+				// this.selHx = res.data.house_type[0]
+				// this.selPp = res.data.brand[0]
+				// this.selSuo = res.data.mind_lock[0]
+				// this.selMb = res.data.mind_switch[0]
+				// this.selCl = res.data.mind_curtain[0]
+				// this.selKt = res.data.mind_air_conditioner[0]
+				// this.getPrice(3, this.selHx.id, this.selPp.id, this.selSuo.id, this.selMb.id, this.selCl.id, this.selKt
+				// 	.id)
 			}
 		},
 		onShow() {
 			this.cutdownRatio = this.$getCutDown()
 		},
 		methods: {
-			sel(type, item, index) {
+			async sel(type, item, index) {
 				if (type == 'hx') {
-					this.currHouseIndex = index
+					this.currHouseIndex = -1
+					this.currHouseIndex1 = -1
+					this.currHouseIndex2 = -1
+					this.currHouseIndex3 = -1
+					this.currHouseIndex4 = -1
+					this.currHouseIndex5 = -1
+
+					this.selHx = null,
+						this.selPp = null,
+						this.selSuo = null,
+						this.selMb = null,
+						this.selCl = null,
+						this.selKt = null,
+
+						this.currHouseIndex = index
 					this.selHx = item
+
+					let p = {
+						type: 3,
+						house_type: this.selHx.id
+					}
+
+					if (this.selHx && this.selPp && this.selSuo && this.selMb && this.selCl && this.selKt) {
+						this.getPrice(p)
+					} else {
+						this.totalPrice = 0
+					}
+
+
+					let res = await getHomeDataNextReq(p)
+					if (res.code == 0) {
+						this.brandTypeList = res.data.brand
+						this.lockTypeList = res.data.mind_lock
+						this.pannelTypeList = res.data.mind_switch
+						this.chuanglianTypeList = res.data.mind_curtain
+						this.ktTypeList = res.data.mind_air_conditioner
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
 				} else if (type == 'pp') {
-					this.currHouseIndex1 = index
+					if (!this.selHx) {
+						return this.$toast('请先选择户型')
+					}
+					this.currHouseIndex1 = -1
+					this.currHouseIndex2 = -1
+					this.currHouseIndex3 = -1
+					this.currHouseIndex4 = -1
+					this.currHouseIndex5 = -1
+
+					this.selPp = null,
+						this.selSuo = null,
+						this.selMb = null,
+						this.selCl = null,
+						this.selKt = null,
+
+
+
+						this.currHouseIndex1 = index
 					this.selPp = item
+
+					let p = {
+						type: 3,
+						house_type: this.selHx.id,
+						brand: this.selPp.id
+					}
+
+					if (this.selHx && this.selPp && this.selSuo && this.selMb && this.selCl && this.selKt) {
+						this.getPrice(p)
+					} else {
+						this.totalPrice = 0
+					}
+
+
+					let res = await getHomeDataNextReq(p)
+					if (res.code == 0) {
+						this.lockTypeList = res.data.mind_lock
+						this.pannelTypeList = res.data.mind_switch
+						this.chuanglianTypeList = res.data.mind_curtain
+						this.ktTypeList = res.data.mind_air_conditioner
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
 				} else if (type == 'suo') {
-					this.currHouseIndex2 = index
+					if (!this.selHx) {
+						return this.$toast('请先选择户型')
+					} else if (!this.selPp) {
+						return this.$toast('请先选择品牌')
+					}
+					this.currHouseIndex2 = -1
+					this.currHouseIndex3 = -1
+					this.currHouseIndex4 = -1
+					this.currHouseIndex5 = -1
+
+					this.selSuo = null,
+						this.selMb = null,
+						this.selCl = null,
+						this.selKt = null,
+
+
+						this.currHouseIndex2 = index
 					this.selSuo = item
+
+					let p = {
+						type: 3,
+						house_type: this.selHx.id,
+						brand: this.selPp.id,
+						mind_lock: this.selSuo.id,
+					}
+
+					if (this.selHx && this.selPp && this.selSuo && this.selMb && this.selCl && this.selKt) {
+						this.getPrice(p)
+					} else {
+						this.totalPrice = 0
+					}
+
+
+					let res = await getHomeDataNextReq(p)
+					if (res.code == 0) {
+						this.pannelTypeList = res.data.mind_switch
+						this.chuanglianTypeList = res.data.mind_curtain
+						this.ktTypeList = res.data.mind_air_conditioner
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
 				} else if (type == 'mb') {
-					this.currHouseIndex3 = index
+					if (!this.selHx) {
+						return this.$toast('请先选择户型')
+					} else if (!this.selPp) {
+						return this.$toast('请先选择品牌')
+					} else if (!this.selSuo) {
+						return this.$toast('请先选择智能锁')
+					}
+					this.currHouseIndex3 = -1
+					this.currHouseIndex4 = -1
+					this.currHouseIndex5 = -1
+
+					this.selMb = null,
+						this.selCl = null,
+						this.selKt = null,
+
+						this.currHouseIndex3 = index
 					this.selMb = item
+
+					let p = {
+						type: 3,
+						house_type: this.selHx.id,
+						brand: this.selPp.id,
+						mind_lock: this.selSuo.id,
+						mind_switch: this.selMb.id,
+					}
+
+					if (this.selHx && this.selPp && this.selSuo && this.selMb && this.selCl && this.selKt) {
+						this.getPrice(p)
+					} else {
+						this.totalPrice = 0
+					}
+
+
+					let res = await getHomeDataNextReq(p)
+					if (res.code == 0) {
+						this.chuanglianTypeList = res.data.mind_curtain
+						this.ktTypeList = res.data.mind_air_conditioner
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
 				} else if (type == 'cl') {
-					this.currHouseIndex4 = index
+					if (!this.selHx) {
+						return this.$toast('请先选择户型')
+					} else if (!this.selPp) {
+						return this.$toast('请先选择品牌')
+					} else if (!this.selSuo) {
+						return this.$toast('请先选择智能锁')
+					} else if (!this.selMb) {
+						return this.$toast('请先选择智能面板')
+					}
+					this.currHouseIndex4 = -1
+					this.currHouseIndex5 = -1
+
+
+					this.selCl = null,
+						this.selKt = null,
+
+						this.currHouseIndex4 = index
 					this.selCl = item
+
+					let p = {
+						type: 3,
+						house_type: this.selHx.id,
+						brand: this.selPp.id,
+						mind_lock: this.selSuo.id,
+						mind_switch: this.selMb.id,
+						mind_curtain: this.selCl.id,
+					}
+
+					if (this.selHx && this.selPp && this.selSuo && this.selMb && this.selCl && this.selKt) {
+						this.getPrice(p)
+					} else {
+						this.totalPrice = 0
+					}
+
+
+					let res = await getHomeDataNextReq(p)
+					if (res.code == 0) {
+						this.ktTypeList = res.data.mind_air_conditioner
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
 				} else if (type == 'kt') {
-					this.currHouseIndex5 = index
+					if (!this.selHx) {
+						return this.$toast('请先选择户型')
+					} else if (!this.selPp) {
+						return this.$toast('请先选择品牌')
+					} else if (!this.selSuo) {
+						return this.$toast('请先选择智能锁')
+					} else if (!this.selMb) {
+						return this.$toast('请先选择智能面板')
+					} else if (!this.selCl) {
+						return this.$toast('请先选择智能窗帘')
+					}
+					this.currHouseIndex5 = -1
+
+					this.selKt = null,
+
+						this.currHouseIndex5 = index
 					this.selKt = item
+					let p = {
+						type: 3,
+						house_type: this.selHx.id,
+						brand: this.selPp.id,
+						mind_lock: this.selSuo.id,
+						mind_switch: this.selMb.id,
+						mind_curtain: this.selCl.id,
+						mind_air_conditioner: this.selKt.id,
+					}
+
+					if (this.selHx && this.selPp && this.selSuo && this.selMb && this.selCl && this.selKt) {
+						this.getPrice(p)
+					} else {
+						this.totalPrice = 0
+					}
+
+
+					let res = await getHomeDataNextReq(p)
+					if (res.code == 0) {
+						// this.ktTypeList = res.data.mind_air_conditioner
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
 				}
 
-				this.getPrice(3, this.selHx.id, this.selPp.id, this.selSuo.id, this.selMb.id, this.selCl.id, this.selKt
-					.id)
+				// this.getPrice(prmas)
 			},
 
-			async getPrice(type = 3, house_type, brand, mind_lock, mind_switch, mind_curtain, mind_air_conditioner) {
-				let res = await getDataMoneyReq({
-					type,
-					house_type,
-					brand,
-					mind_lock,
-					mind_switch,
-					mind_curtain,
-					mind_air_conditioner
-				})
+			async getPrice(prmas) {
+				let res = await getDataMoneyReq(prmas)
 				if (res.code == 0) {
 					console.log('配置价格-智控: ', res)
 					this.totalPrice = res.data.money * this.cutdownRatio
@@ -380,6 +621,16 @@
 				})
 			},
 			toNext() {
+				if (this.houseTypeList.length == 0 || this.brandTypeList.length == 0 || this.lockTypeList.length == 0 ||
+					this.pannelTypeList.length == 0 || this.chuanglianTypeList.length == 0 || this.ktTypeList.length == 0
+				) {
+					return this.$toast('抱歉！参数配置缺失，暂无法预览配置')
+				}
+
+				if (!(this.selHx && this.selSuo && this.selPp && this.selMb && this.selCl && this.selKt)) {
+					return this.$toast('请全部选择后预览配置')
+				}
+
 				getApp().selHx = this.selHx
 				getApp().selPp = this.selPp
 				getApp().selSuo = this.selSuo

pages/index/customMian_step1/index.vue

@@ -34,7 +34,7 @@
 
 			<view class="parms">
 				<view v-if="show1" @click="handleSel1('hx',item,index)" class="item "
-					:class="[currHouseIndex==index?'act':'']" v-for="(item,index) in houseTypeList">
+					:class="[currHouseIndex1==index?'act':'']" v-for="(item,index) in houseTypeList">
 					{{item.value}}
 				</view>
 			</view>
@@ -50,7 +50,7 @@
 
 			<view class="parms">
 				<view v-if="show2" @click="handleSel1('xl',item,index)" class="item "
-					:class="[currHouseIndex5==index?'act':'']" v-for="(item,index) in serTypeList">
+					:class="[currHouseIndex2==index?'act':'']" v-for="(item,index) in serTypeList">
 					{{item.value}}
 				</view>
 			</view>
@@ -151,7 +151,7 @@
 				</view>
 			</view>
 			<view class="pupopCon">
-				<view class="item">
+				<view class="item" v-if="selHx">
 					<view class="top">
 						<view class="name">
 							户型
@@ -161,7 +161,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="item">
+				<view class="item" v-if="selXl">
 					<view class="top">
 						<view class="name">
 							系列
@@ -171,27 +171,27 @@
 						</view>
 					</view>
 				</view>
-				<view class="item">
+				<view class="item" v-if="selKt.length!=0">
 					<view class="top">
 						<view class="name">
 							客厅灯
 						</view>
 						<view class="info">
-							{{selKt?1:0}}
+							{{selKt.length}}
 						</view>
 					</view>
 				</view>
-				<view class="item">
+				<view class="item" v-if="selCt.length!=0">
 					<view class="top">
 						<view class="name">
 							餐厅灯
 						</view>
 						<view class="info">
-							{{selCt?1:0}}
+							{{selCt.length}}
 						</view>
 					</view>
 				</view>
-				<view class="item">
+				<view class="item" v-if="selWs.length!=0">
 					<view class="top">
 						<view class="name">
 							卧室灯
@@ -201,13 +201,13 @@
 						</view>
 					</view>
 				</view>
-				<view class="item">
+				<view class="item" v-if="selYt.length!=0">
 					<view class="top">
 						<view class="name">
 							阳台灯
 						</view>
 						<view class="info">
-							{{selYt?1:0}}
+							{{selCt.length}}
 						</view>
 					</view>
 				</view>
@@ -245,7 +245,7 @@
 
 		<u-modal :show="showMissItem" title="提示" @confirm="showMissItem=false" content='' confirmColor="#F7790C">
 			<view class="tip2">
-				客厅灯具少选1盏！
+				{{tipTxt}}
 			</view>
 		</u-modal>
 	</view>
@@ -254,7 +254,7 @@
 <script>
 	import {
 		getIndexConfigReq,
-
+		getHomeDataNextReq
 	} from '@/api/test/index.js'
 	import {
 		getDataMoneyReq
@@ -289,13 +289,8 @@
 
 				seledKetingItem: null,
 
-				currHouseIndex: 0,
-				currHouseIndex1: 0,
-				currHouseIndex2: 0,
-				currHouseIndex3: 0,
-				currHouseIndex4: 0,
-				currHouseIndex5: 0,
-				currHouseIndex6: 0,
+				currHouseIndex1: -1,
+				currHouseIndex2: -1,
 				houseTypeList: [],
 				brandTypeList: [],
 				lockTypeList: [],
@@ -317,10 +312,12 @@
 				pConfig: -1,
 				cutdownRatio: 1,
 
-				type: 0
+				type: 0,
+				tipTxt: ''
 			}
 		},
 		async onLoad(o) {
+
 			if (o.type) {
 				this.type = o.type
 			}
@@ -338,15 +335,6 @@
 
 				this.rule = res.data.rule.content
 
-				this.selHx = res.data.house_type[0]
-				this.selXl = res.data.series[0]
-				this.selKt = [res.data.living_room[0]]
-				this.selCt = [res.data.dining_room_light[0]]
-				this.selWs = [res.data.bedroom_lamp[0]]
-				this.selYt = [res.data.balcony_light[0]]
-
-
-
 				let wsIds1 = []
 				this.selKt.forEach((item, index) => {
 					wsIds1.push(item.id)
@@ -364,11 +352,6 @@
 				this.selYt.forEach((item, index) => {
 					wsIds4.push(item.id)
 				})
-
-				this.getPrice(2, this.selHx.id, this.selXl.id, wsIds1.sort().join(','), wsIds2.sort().join(','), wsIds3
-					.sort().join(','),
-					wsIds4.sort().join(','))
-
 			} else {
 				uni.showToast({
 					title: res.message,
@@ -401,16 +384,8 @@
 			}
 		},
 		methods: {
-			async getPrice(type = 2, house_type, series, drawing_lamp, canteen_lamp, bedroom_lamp, balcony_lamp) {
-				let res = await getDataMoneyReq({
-					type,
-					house_type,
-					series,
-					drawing_lamp,
-					canteen_lamp,
-					bedroom_lamp,
-					balcony_lamp
-				})
+			async getPrice(parmas) {
+				let res = await getDataMoneyReq(parmas)
 				if (res.code == 0) {
 					console.log('配置价格-主灯: ', res)
 					this.totalPrice = res.data.money * this.cutdownRatio
@@ -453,13 +428,42 @@
 					this['show' + i] = true
 				}
 			},
-			handleSel1(type, item, index) {
+			// 仅选择户型和系列
+			async handleSel1(type, item, index) {
 				if (type == 'hx') {
-					this.currHouseIndex = index
+					this.currHouseIndex1 = -1
+					this.currHouseIndex2 = -1
+
+					this.selXl = null
+					this.selHx = null
+					this.currHouseIndex1 = index
 					this.selHx = item
+
+					let p = {
+						type: this.type ? this.type : 2,
+						house_type: this.selHx.id
+					}
+					let res = await getHomeDataNextReq(p)
+					if (res.code == 0) {
+						console.log('新户型返回值', res);
+						this.serTypeList = res.data.series
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
 				} else {
-					this.currHouseIndex5 = index
+					if (!this.selHx) {
+						return this.$toast('请先选择户型')
+					}
+
+					this.currHouseIndex2 = -1
+
+					this.selXl = null
+					this.currHouseIndex2 = index
 					this.selXl = item
+
 				}
 				let wsIds1 = []
 				this.selKt.forEach((item, index) => {
@@ -479,13 +483,23 @@
 					wsIds4.push(item.id)
 				})
 
-				this.getPrice(2, this.selHx.id, this.selXl.id, wsIds1.sort().join(','), wsIds2.sort().join(','), wsIds3
-					.sort().join(','),
-					wsIds4.sort().join(','))
+				if (this.selHx && this.selXl && this.selKt.length != 0 && this.selCt.length != 0 && this
+					.selWs.length != 0 && this.selYt.length != 0) {
+					this.getPrice({
+						type: this.type ? this.type : 2,
+						house_type: this.selHx.id,
+						series: this.selXl.id,
+						drawing_lamp: wsIds1.sort().join(','),
+						canteen_lamp: wsIds2.sort().join(','),
+						bedroom_lamp: wsIds3.sort().join(','),
+						balcony_lamp: wsIds4.sort().join(',')
+					})
+				} else {
+					this.totalPrice = 0
+				}
 			},
 			handleSel(type, item, index, mode = 1) {
 				if (type == 'kt') {
-					this.currHouseIndex3 = index
 					if (!this.selKt.includes(item)) {
 						this.selKt.push(item)
 					} else {
@@ -496,8 +510,8 @@
 							this.selKt.splice(i, 1)
 						}
 					}
+
 				} else if (type == 'ct') {
-					this.currHouseIndex2 = index
 					if (!this.selCt.includes(item)) {
 						this.selCt.push(item)
 					} else {
@@ -509,7 +523,6 @@
 						}
 					}
 				} else if (type == 'ws') {
-					this.currHouseIndex4 = index
 					if (!this.selWs.includes(item)) {
 						this.selWs.push(item)
 					} else {
@@ -521,7 +534,6 @@
 						}
 					}
 				} else if (type == 'yt') {
-					this.currHouseIndex6 = index
 					if (!this.selYt.includes(item)) {
 						this.selYt.push(item)
 					} else {
@@ -550,16 +562,34 @@
 				this.selYt.forEach((item, index) => {
 					wsIds4.push(item.id)
 				})
+				if (this.selHx && this.selXl && this.selKt.length != 0 && this.selCt.length != 0 && this
+					.selWs.length != 0 && this.selYt.length != 0) {
+					this.getPrice({
+						type: this.type ? this.type : 2,
+						house_type: this.selHx.id,
+						series: this.selXl.id,
+						drawing_lamp: wsIds1.sort().join(','),
+						canteen_lamp: wsIds2.sort().join(','),
+						bedroom_lamp: wsIds3.sort().join(','),
+						balcony_lamp: wsIds4.sort().join(',')
+					})
+				} else {
+					this.totalPrice = 0
+				}
 
-				this.getPrice(2, this.selHx.id, this.selXl.id, wsIds1.sort().join(','), wsIds2.sort().join(','), wsIds3
-					.sort().join(','),
-					wsIds4.sort().join(','))
 			},
 			previewConfig() {
-				if (!this.selKt) {
+				if (this.selKt.length == 0) {
 					this.showMissItem = true
+					this.tipTxt = '客厅灯至少选1盏！'
 					return
 				}
+				if (this.selCt.length == 0) {
+					this.showMissItem = true
+					this.tipTxt = '餐厅灯至少选1盏！'
+					return
+				}
+
 				if (this.selHx.value == '一室两厅' && this.selWs.length < 1) {
 					this.showHuxing = true
 					return
@@ -570,6 +600,25 @@
 					this.showHuxing = true
 					return
 				}
+				if (this.selYt.length == 0) {
+					this.showMissItem = true
+					this.tipTxt = '阳台灯至少选1盏！'
+					return
+				}
+
+				if (!this.selHx || !this.selXl) {
+					this.showMissItem = true
+					this.tipTxt = '抱歉！参数配置缺失，暂无法预览配置'
+					return
+				}
+				if (this.selYt.length == 0 || this.selKt.length == 0 || this.selCt.length == 0 || this.selWs.length == 0 ||
+					!this.selHx || !this.selXl) {
+					this.showMissItem = true
+					this.tipTxt = '所有选项请确认是否选择完整'
+					return
+				}
+
+
 
 				getApp().mainPreviewInfo = {
 					hx: this.selHx,

pages/index/customNoMian_step1/index.vue

@@ -84,7 +84,7 @@
 
 			<view class="parms">
 				<view v-if="show4" @click="sel('xl',item,index)" class="item "
-					:class="[currHouseIndex5==index?'act':'']" v-for="(item,index) in serTypeList">
+					:class="[currHouseIndex3==index?'act':'']" v-for="(item,index) in serTypeList">
 					{{item.value}}
 				</view>
 			</view>
@@ -101,7 +101,7 @@
 
 			<view class="parms">
 				<view v-if="show5" @click="sel('bb',item,index)" class="item "
-					:class="[currHouseIndex3==index?'act':'']" v-for="(item,index) in chuanglianTypeList">
+					:class="[currHouseIndex4==index?'act':'']" v-for="(item,index) in chuanglianTypeList">
 					{{item.value}}
 				</view>
 			</view>
@@ -152,7 +152,7 @@
 				</view>
 			</view>
 			<view class="pupopCon">
-				<view class="item">
+				<view class="item" v-if='selHx'>
 					<view class="top">
 						<view class="name">
 							户型
@@ -162,7 +162,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="item">
+				<view class="item" v-if='selKj'>
 					<view class="top">
 						<view class="name">
 							空间
@@ -172,7 +172,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="item">
+				<view class="item" v-if='selPp'>
 					<view class="top">
 						<view class="name">
 							品牌
@@ -182,7 +182,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="item">
+				<view class="item" v-if='selXl'>
 					<view class="top">
 						<view class="name">
 							系列
@@ -192,7 +192,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="item">
+				<view class="item" v-if='selBb'>
 					<view class="top">
 						<view class="name">
 							版本
@@ -210,6 +210,7 @@
 <script>
 	import {
 		getIndexConfigReq,
+		getHomeDataNextReq
 	} from '@/api/test/index.js'
 	import {
 		getDataMoneyReq
@@ -235,12 +236,11 @@
 
 				showConfig: false,
 
-				currHouseIndex: 0,
-				currHouseIndex1: 0,
-				currHouseIndex2: 0,
-				currHouseIndex3: 0,
-				currHouseIndex4: 0,
-				currHouseIndex5: 0,
+				currHouseIndex: -1,
+				currHouseIndex1: -1,
+				currHouseIndex2: -1,
+				currHouseIndex3: -1,
+				currHouseIndex4: -1,
 				houseTypeList: [
 
 				],
@@ -298,14 +298,14 @@
 				this.serTypeList = res.data.series
 				this.chuanglianTypeList = res.data.version
 
-				this.selHx = res.data.house_type[0]
-				this.selKj = res.data.space[0]
-				this.selPp = res.data.brand[0]
-				this.selXl = res.data.series[0]
-				this.selBb = res.data.version[0]
-				this.rule = res.data.rule.content
+				// this.selHx = res.data.house_type[0]
+				// this.selKj = res.data.space[0]
+				// this.selPp = res.data.brand[0]
+				// this.selXl = res.data.series[0]
+				// this.selBb = res.data.version[0]
+				// this.rule = res.data.rule.content
 
-				this.getPrice(1, this.selHx.id, this.selKj.id, this.selPp.id, this.selXl.id, this.selBb.id)
+				// this.getPrice(1, this.selHx.id, this.selKj.id, this.selPp.id, this.selXl.id, this.selBb.id)
 
 			} else {
 				uni.showToast({
@@ -320,15 +320,8 @@
 		},
 		computed: {},
 		methods: {
-			async getPrice(type = 1, house_type, space, brand, series, version) {
-				let res = await getDataMoneyReq({
-					type,
-					house_type,
-					space,
-					brand,
-					series,
-					version
-				})
+			async getPrice(pramas) {
+				let res = await getDataMoneyReq(pramas)
 				if (res.code == 0) {
 					console.log('配置价格-无主灯: ', res)
 					this.totalPrice = res.data.money * this.cutdownRatio
@@ -341,28 +334,229 @@
 				}
 			},
 
-			sel(type, item, index) {
+			async sel(type, item, index) {
 				if (type == 'hx') {
+					this.currHouseIndex = -1
+					this.currHouseIndex1 = -1
+					this.currHouseIndex2 = -1
+					this.currHouseIndex3 = -1
+					this.currHouseIndex4 = -1
+
+					this.selHx = null
+					this.selKj = null
+					this.selPp = null
+					this.selXl = null
+					this.selBb = null
+
+
 					this.currHouseIndex = index
 					this.selHx = item
+
+					let p = {
+						type: 1,
+						house_type: this.selHx.id
+					}
+
+					if (this.selHx && this.selKj && this.selPp && this.selXl && this.selBb) {
+						this.getPrice(p)
+					} else {
+						this.totalPrice = 0
+					}
+
+
+					let res = await getHomeDataNextReq(p)
+					if (res.code == 0) {
+						this.brandTypeList = res.data.brand
+						this.lockTypeList = res.data.space
+						this.serTypeList = res.data.series
+						this.chuanglianTypeList = res.data.version
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
 				} else if (type == 'kj') {
+					if (!this.selHx) {
+						return this.$toast('请先选择户型')
+					}
+					this.currHouseIndex1 = -1
+					this.currHouseIndex2 = -1
+					this.currHouseIndex3 = -1
+					this.currHouseIndex4 = -1
+
+					this.selKj = null
+					this.selPp = null
+					this.selXl = null
+					this.selBb = null
+
+
 					this.currHouseIndex1 = index
 					this.selKj = item
+
+					let p = {
+						type: 1,
+						house_type: this.selHx.id,
+						space: this.selKj.id
+					}
+
+					if (this.selHx && this.selKj && this.selPp && this.selXl && this.selBb) {
+						this.getPrice(p)
+					} else {
+						this.totalPrice = 0
+					}
+
+					let res = await getHomeDataNextReq(p)
+					if (res.code == 0) {
+						this.brandTypeList = res.data.brand
+						// this.lockTypeList = res.data.space
+						this.serTypeList = res.data.series
+						this.chuanglianTypeList = res.data.version
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
 				} else if (type == 'pp') {
+					if (!this.selHx) {
+						return this.$toast('请先选择户型')
+					} else if (!this.selKj) {
+						return this.$toast('请先选择空间')
+					}
+					this.currHouseIndex2 = -1
+					this.currHouseIndex3 = -1
+					this.currHouseIndex4 = -1
+
+					this.selPp = null
+					this.selXl = null
+					this.selBb = null
+
+
 					this.currHouseIndex2 = index
 					this.selPp = item
+
+					let p = {
+						type: 1,
+						house_type: this.selHx.id,
+						space: this.selKj.id,
+						brand: this.selPp.id
+					}
+
+					if (this.selHx && this.selKj && this.selPp && this.selXl && this.selBb) {
+						this.getPrice(p)
+					} else {
+						this.totalPrice = 0
+					}
+
+					let res = await getHomeDataNextReq(p)
+					if (res.code == 0) {
+
+						console.log('系列返回值：', res);
+						this.serTypeList = res.data.series
+						this.chuanglianTypeList = res.data.version
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
 				} else if (type == 'xl') {
-					this.currHouseIndex5 = index
+					if (!this.selHx) {
+						return this.$toast('请先选择户型')
+					} else if (!this.selKj) {
+						return this.$toast('请先选择空间')
+					} else if (!this.selPp) {
+						return this.$toast('请先选择品牌')
+					}
+					this.currHouseIndex3 = -1
+					this.currHouseIndex4 = -1
+
+					this.selXl = null
+					this.selBb = null
+
+
+					this.currHouseIndex3 = index
 					this.selXl = item
+					let p = {
+						type: 1,
+						house_type: this.selHx.id,
+						space: this.selKj.id,
+						brand: this.selPp.id,
+						series: this.selXl.id
+					}
+
+					if (this.selHx && this.selKj && this.selPp && this.selXl && this.selBb) {
+						this.getPrice(p)
+					} else {
+						this.totalPrice = 0
+					}
+
+					let res = await getHomeDataNextReq(p)
+					if (res.code == 0) {
+						this.chuanglianTypeList = res.data.version
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
 				} else if (type == 'bb') {
-					this.currHouseIndex3 = index
+					if (!this.selHx) {
+						return this.$toast('请先选择户型')
+					} else if (!this.selKj) {
+						return this.$toast('请先选择空间')
+					} else if (!this.selPp) {
+						return this.$toast('请先选择品牌')
+					} else if (!this.selXl) {
+						return this.$toast('请先选择系列')
+					}
+					this.currHouseIndex4 = -1
+
+					this.selBb = null
+
+
+					this.currHouseIndex4 = index
 					this.selBb = item
+
+					let p = {
+						type: 1,
+						house_type: this.selHx.id,
+						space: this.selKj.id,
+						brand: this.selPp.id,
+						series: this.selXl.id,
+						version: this.selBb.id
+					}
+
+					if (this.selHx && this.selKj && this.selPp && this.selXl && this.selBb) {
+						this.getPrice(p)
+					} else {
+						this.totalPrice = 0
+					}
+
+					let res = await getHomeDataNextReq(p)
+					if (res.code == 0) {
+						// this.chuanglianTypeList = res.data.version
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
 				}
 
-				this.getPrice(1, this.selHx.id, this.selKj.id, this.selPp.id, this.selXl.id, this.selBb.id)
 			},
 
 			preConfig() {
+				if (this.houseTypeList.length == 0 || this.brandTypeList.length == 0 || this.lockTypeList.length == 0 ||
+					this.serTypeList.length == 0 || this.chuanglianTypeList.length == 0) {
+					return this.$toast('抱歉！参数配置缺失，暂无法预览配置')
+				}
+
+				if (!(this.selHx && this.selKj && this.selPp && this.selXl && this.selBb)) {
+					return this.$toast('请全部选择后预览配置')
+				}
+
 				getApp().selHx = this.selHx
 				getApp().selKj = this.selKj
 				getApp().selPp = this.selPp
@@ -395,6 +589,19 @@
 				uni.navigateTo({
 					url: '/pages/index/rule/index?type=noMain'
 				})
+			},
+			cheSel() {
+				if (!this.selHx) {
+					return this.$toast('请先选择户型')
+				} else if (!this.selKj) {
+					return this.$toast('请先选择空间')
+				} else if (!this.selPp) {
+					return this.$toast('请先选择品牌')
+				} else if (!this.selXl) {
+					return this.$toast('请先选择系列')
+				} else if (!this.selBb) {
+					return this.$toast('请先选择版本')
+				}
 			}
 		}
 	}

pages/index/fullHouseWifi/index.vue

@@ -139,7 +139,7 @@
 				show4: false,
 				show5: false,
 
-				currHouseIndex: 0,
+				currHouseIndex: -1,
 				houseTypeList: [],
 
 				selHx: null,
@@ -167,10 +167,10 @@
 				console.log('获取首页配置返回值-全屋WiFi: ', res);
 				this.houseTypeList = res.data.house_type
 
-				this.selHx = res.data.house_type[0]
+				// this.selHx = res.data.house_type[0]
 				this.rule = res.data.rule.content
 
-				this.getPrice(4, this.selHx.id)
+				// this.getPrice(4, this.selHx.id)
 			}
 		},
 		onShow() {

pages/mall.scss

@@ -23,10 +23,8 @@
 
 .content{
 	display: flex;
-	// margin-top: 190rpx;
 	.leftMenu{
 		width: 212rpx;
-		// height: calc(100vh - 400rpx);
 		height: calc(100vh - 380rpx);
 		background:#fff ;
 		overflow-y: scroll;

pages/mall.vue

@@ -7,37 +7,37 @@
 				<u-search shape="round" :showAction="false" v-model="searchKey"></u-search>
 			</view>
 			<u-sticky bgColor="#fff" v-if="!searchKey">
-				<u-tabs :list="list1" :scrollable="true" :activeStyle='activeStyle' :inactiveStyle="inactiveStyle"
-					@change="change"></u-tabs>
+				<u-tabs @click="handle1" :list="list1" :scrollable="true" :activeStyle='activeStyle'
+					:inactiveStyle="inactiveStyle" @change="change"></u-tabs>
 			</u-sticky>
 		</view>
 
 
 		<view class="content" v-if="searchKey" style="margin-top: 140rpx;">
 			<view class="rightDes" style="height: calc(100vh - 330rpx)">
-				<view class="item" v-for="(item,index) in allTypes" :style="{marginTop:index>0?'22rpx':''}">
-					<view class="top" @click="toList(item,allTypesValues[index])">
+				<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> -->
 					<view class="bottom">
 						<image @click="goDetail(item1)" :src="picBase+item1.cover" mode="" style="" class="img"
-							v-for="(item1,index) in resList[item]">
+							v-for="(item1,index) in resList">
 						</image>
 					</view>
 				</view>
 			</view>
 		</view>
 
-		<view class="content" v-else style="margin-top: 190rpx;">
+		<view class="content" v-else style="margin-top: 200rpx;">
 			<!-- <view class="content" v-else style="margin-top: 158rpx;"> -->
 			<view class="leftMenu">
 				<view class="item" v-for="(item,index) in list2" :class="[index==currBrandIndex?'act':'']"
-					@click=" change2(item,index)">
+					@click=" change2(item.id,index)">
 					<text style="position: relative;z-index: 1;">{{item.title}}</text>
 					<image v-if="index==currBrandIndex" class="halfCircle" :src="picUrl+'/static/mall/circle.png'"
 						mode="" style="width: 30rpx;height: 30rpx;">
@@ -81,20 +81,7 @@
 				picBase: this.$picBase,
 
 				currBrandIndex: 0,
-				list1: [{
-						name: '无主灯',
-					},
-					{
-						name: '主灯',
-					}, {
-						name: '开关插座'
-					},
-					{
-						name: '智能家装',
-					}, {
-						name: '智能锁'
-					},
-				],
+				list1: [],
 				list2: [],
 				activeStyle: {
 					color: '#F7790C'
@@ -110,7 +97,8 @@
 				resList: [],
 
 				allTypes: [],
-				allTypesValues: []
+				allTypesValues: [],
+				tOList: []
 
 			};
 		},
@@ -118,24 +106,25 @@
 
 		},
 		async onLoad() {
+			// this.handle1({
+			// 	id: 1
+			// })
+
 			let res = await getMallCatReq()
 			if (res.code == 0) {
-				console.log('获取商城分类数据返回值: ', res);
-				let rlist = []
-				res.data.classify.forEach((item, index) => {
-					rlist.push({
-						name: item.title,
+				console.log('获取商城顶部分类数据返回值: ', res);
+				this.handle1({
+					id: res.data[0].id
+				})
+				this.tOList = res.data
+				let tL = []
+				res.data.forEach((item, index) => {
+					tL.push({
 						id: item.id,
-						type: item.type
+						name: item.title
 					})
 				})
-				this.list1 = rlist
-				this.list2 = res.data.brand
-
-				this.selTab.type = res.data.classify[0].id
-				this.selTab.brand = res.data.brand[0].id
-
-				this.getMall(this.selTab.type, this.selTab.brand)
+				this.list1 = tL
 			} else {
 				uni.showToast({
 					title: res.message,
@@ -150,18 +139,31 @@
 
 		},
 		methods: {
-			async getMall(type, brand) {
+			async handle1(e) {
+				console.log('e', e.id);
+				let res = await getMallCatReq({
+					pid: e.id
+				})
+				if (res.code == 0) {
+
+					this.list2 = res.data
+					console.log('zhongxiang', res);
+
+					this.getMall(res.data[0].id)
+				}
+			},
+
+
+			async getMall(id) {
 				let res = await getMallReq({
-					// page: 1,
-					type,
-					brand,
+					pid: id
 				})
 				if (res.code == 0) {
 					console.log('获取商城数据返回值: ', res);
 					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, this.typesList);
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -175,11 +177,9 @@
 					search,
 				})
 				if (res.code == 0) {
-					console.log('获取商城数据返回值2: ', res);
-					this.allTypes = Object.keys(res.data.typeName)
-					this.allTypesValues = Object.values(res.data.typeName)
+					console.log('获取商城数据返回值2: ', res.data);
 					this.resList = res.data
-					console.log('获取商城数据返回值列表2: ', this.resList, this.allTypes, this.allTypesValues, this.typesList);
+					console.log('获取商城数据返回值列表2: ', this.resList);
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -188,12 +188,9 @@
 				}
 			},
 
-			change(e) {
-				this.selTab.type = e.id
-			},
-			change2(item, index) {
+			change2(id, index) {
 				this.currBrandIndex = index
-				this.selTab.brand = item.id
+				this.getMall(id)
 			},
 
 			toList(id, name) {
@@ -224,14 +221,13 @@
 					this.getMall2(n)
 				}, 1000)
 			},
-			selTab: {
-				handler(n, o) {
-					console.log('n, o', n);
-					this.getMall(n.type, n.brand)
-				},
-				// immediate: true,
-				deep: true
-			}
+			// selTab: {
+			// 	handler(n, o) {
+			// 		console.log('n, o', n);
+			// 		this.getMall(n.type, n.brand)
+			// 	},
+			// 	deep: true
+			// }
 		},
 		components: {}
 	};

pages/my.vue

@@ -4,7 +4,7 @@
 			background="linear-gradient(to bottom,#FDEDD2,#FEF9ED)" />
 		<view class="content">
 			<view class="top">
-				<image class="myW" :src="picUrl+'/static/other/myW.png'" mode=""></image>
+				<!-- <image class="myW" :src="picUrl+'/static/other/myW.png'" mode=""></image> -->
 				<view class="userInfo">
 					<view class="left">
 						<!-- <button class="avatarBox" @click="toPage('info')">
@@ -13,44 +13,51 @@
 						</button> -->
 						<view class="avatarBox" @click="toPage('info')">
 							<image class="avatar"
-								:src="userInfo?userInfo.head:picUrl+'/static/other/defaultAvatar.png'"></image>
+								:src="userInfo&&userInfo.head?userInfo.head:picUrl+'/static/other/defaultAvatar.png'">
+							</image>
 						</view>
 						<text class="btn" v-if="!token" @click="login">请点击登录</text>
-						<text class="btn" v-if="token&&role=='cydg'">{{userInfo.nickname}}</text>
-						<text class="btn" v-if="token&&role=='hy'">{{userInfo.nickname}}</text>
+						<text class="btn"
+							v-if="token&&role=='cydg'">{{userInfo.nickname?userInfo.nickname:'默认用户(产业电工)'}}</text>
+						<text class="btn"
+							v-if="token&&role=='hy'">{{userInfo.nickname?userInfo.nickname:'默认用户(会员)'}}</text>
 
 						<view class="lMember" v-if="token&&role=='lhy'">
-							<text class="btn1">{{userInfo.nickname}}</text>
+							<text class="btn1">{{userInfo.nickname?userInfo.nickname:'默认用户(L会员)'}}</text>
 							<view class="botDes">
 								查看商品会员价，72小时后自动恢复
 								为售价。会员价格还剩 00:05:59
 							</view>
 						</view>
 						<view class="lMember" v-if="token&&role=='hdhy'">
-							<text class="btn1">{{userInfo.nickname}}</text>
-							<view class="botDes">
+							<text class="btn1">{{userInfo.nickname?userInfo.nickname:'默认用户(活动会员)'}}</text>
+							<view class="botDes" v-if="userInfo.phone">
 								{{userInfo.phone}}
 							</view>
 						</view>
 
 						<view class="lMember" v-if="token&&role=='svip'">
-							<text class="btn1">{{userInfo.nickname}}</text>
-							<view class="botDes">
+							<text class="btn1">{{userInfo.nickname?userInfo.nickname:'默认用户(S-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}}</text>
-							<view class="botDes">
+							<text class="btn1">{{userInfo.nickname?userInfo.nickname:'默认用户(游客)'}}</text>
+							<view class="botDes" v-if="userInfo.phone">
 								{{userInfo.phone}}
 							</view>
 						</view>
 
-						<text class="btn" v-if="token&&role=='sjkf'">{{userInfo.nickname}}</text>
-						<text class="btn" v-if="token&&role=='shkf'">{{userInfo.nickname}}</text>
-						<text class="btn" v-if="token&&role=='yw'">{{userInfo.nickname}}</text>
+						<text class="btn"
+							v-if="token&&role=='sjkf'">{{userInfo.nickname?userInfo.nickname:'默认用户(设计客服)'}}</text>
+						<text class="btn"
+							v-if="token&&role=='shkf'">{{userInfo.nickname?userInfo.nickname:'默认用户(售后客服)'}}</text>
+						<text class="btn"
+							v-if="token&&role=='yw'">{{userInfo.nickname?userInfo.nickname:'默认用户(业务客服)'}}</text>
 
-						<text class="btn" v-if="token&&role=='superAdmin'">{{userInfo.nickname}}</text>
+						<text class="btn"
+							v-if="token&&role=='superAdmin'">{{userInfo.nickname?userInfo.nickname:'默认用户(超级管理员)'}}</text>
 
 
 					</view>
@@ -103,6 +110,7 @@
 		wxAuthLoginReq,
 		getUserInfoReq,
 		updateUserInfoReq,
+		addInviteReq
 	} from '@/api/test/index.js'
 	export default {
 		// components: {
@@ -132,23 +140,34 @@
 				// role: 'shkf',
 				// role: 'superAdmin',
 
-				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'
-					}, {
+				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/jiang.png',
+					// 	name: '兑奖信息',
+					// 	url: '/pages/my/duijiang/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'
@@ -158,12 +177,6 @@
 						name: '一键联系',
 						phone: '12983098478'
 					},
-					{
-						icon: this.$picUrl + '/static/my/jiang.png',
-						name: '兑奖信息',
-						url: '/pages/my/duijiang/index'
-						// phone: '12983098478'
-					},
 					{
 						icon: this.$picUrl + '/static/my/qt.png',
 						name: '小程序使用指南',
@@ -192,6 +205,15 @@
 				let res = await getUserInfoReq()
 				if (res.code == 0) {
 					this.userInfo = res.data
+
+					// this.userInfo = {
+					// 	head: null,
+					// 	name: null,
+					// 	nickname: null,
+					// 	birthday: null,
+					// 	phone: null,
+					// 	sex: null,
+					// }
 					console.log('用户信息', this.userInfo);
 					// this.role = 'cydg'
 					if (res.data.status) {
@@ -298,6 +320,21 @@
 								// 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)
+									}
+								}
+
 								setTimeout(() => {
 									uni.reLaunch({
 										url: '/pages/my'

pages/my/inviteDetail/index.scss

@@ -1,6 +1,9 @@
 ::v-deep .uni-collapse-item__wrap-content.uni-collapse-item--border{
 	border-color: #fff!important;
 }
+::v-deep button::after{
+	border: none!important;
+}
 .page{
 	
 }

pages/my/inviteDetail/index.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<!-- <dpupop :show="showLsPop" dtitle="LS会员标签" /> -->
 
-		<view class="top" :style="{background: `url(${picUrl+'/static/other/inviteBg.png'}) no-repeat;`}">
+		<view class="top" :style="{background: `url(${picUrl+'/static/other/inviteBg.jpg'}) no-repeat;`}">
 			<navBar title="" :back="true" color="white" background="rgba(0,0,0,0)" />
 
 			<view class="title">
@@ -23,12 +23,18 @@
 					</view>
 					<view class="btnG" v-if="type=='vip'">
 						<view class="main">
-							<view class="btn" @click="showBox('vip')">
+							<view class="btn" @click="showBox('vip',1)" v-if="!inviteSvipSuc">
 								邀约S-VIP
 							</view>
-							<view class="btn" @click="showBox('vip')">
+							<button open-type="share" class="btn" v-else>
+								分享
+							</button>
+							<view class="btn" @click="showBox('vip',0)" v-if="!inviteGvipSuc">
 								邀约G-VIP
 							</view>
+							<button open-type="share" class="btn" v-else>
+								分享
+							</button>
 						</view>
 						<image :src="picUrl+'/static/other/inviteW.png'" mode="" class="water" style="width: 288rpx;
 height: 140rpx;"></image>
@@ -36,7 +42,10 @@ height: 140rpx;"></image>
 					</view>
 					<view class="btnG" v-else-if="type=='ls'">
 						<view class="main">
-							<view class="btn1" @click="showBox('ls')">
+							<button open-type="share" class="btn1" v-if="showLshareBtn">
+								分享
+							</button>
+							<view class="btn1" @click="showBox('ls')" v-else>
 								邀约L会员
 							</view>
 						</view>
@@ -47,7 +56,10 @@ height: 140rpx;"></image>
 
 					<view class="btnG" v-else-if="type=='dg'">
 						<view class="main">
-							<view class="btn1" @click="showBox('dg')">
+							<button open-type="share" class="btn1" v-if="showDgshareBtn">
+								分享
+							</button>
+							<view class="btn1" @click="showBox('dg')" v-else>
 								邀约电工
 							</view>
 						</view>
@@ -56,9 +68,12 @@ height: 140rpx;"></image>
 
 					</view>
 
-					<view class="btnG" v-if="type=='yh'" @click="showBox('yh')">
+					<view class="btnG" v-if="type=='yh'">
 						<view class="main">
-							<view class="btn1">
+							<button open-type="share" class="btn1" v-if="showYhshareBtn">
+								分享
+							</button>
+							<view class="btn1" v-else @click="showBox('yh')">
 								邀约活动用户
 							</view>
 						</view>
@@ -69,7 +84,10 @@ height: 140rpx;"></image>
 
 					<view class="btnG" v-if="type=='hy'">
 						<view class="main">
-							<view class="btn1" @click="showBox('hy')">
+							<button open-type="share" class="btn1" v-if="showHyshareBtn">
+								分享
+							</button>
+							<view class="btn1" @click="showBox('hy')" v-else>
 								邀约会员
 							</view>
 						</view>
@@ -84,17 +102,17 @@ height: 140rpx;"></image>
 		<view class="botDes">
 			<view class="tab">
 				<view class="item " :class="[currTabIndex==0?'act':'']" @click="currTabIndex=0">
-					邀约成功(23)
+					邀约成功({{sucList.length}})
 				</view>
 				<view class="line">
 
 				</view>
 				<view class="item" :class="[currTabIndex==1?'act':'']" @click="currTabIndex=1">
-					邀约未成功(23)
+					邀约未成功({{failList.length}})
 				</view>
 			</view>
 
-			<!-- 邀约成功 -->
+			<!-- 提交邀约申请成功，请点击上方分享按钮分享至微信 -->
 			<view class="scroll" style="overflow-y: scroll;height: calc(100% - 104rpx);" v-if="currTabIndex==0">
 				<view class="top1">
 					<view class="titleL">
@@ -465,6 +483,10 @@ height: 140rpx;"></image>
 				showVipPop: false,
 				showHyPop: false,
 				showYhPop: false,
+				showLshareBtn: false,
+				showYhshareBtn: false,
+				showHyshareBtn: false,
+				showDgshareBtn: false,
 
 
 				// inviteSuc: true
@@ -525,6 +547,12 @@ height: 140rpx;"></image>
 					},
 				],
 				d_ly: -1,
+
+				inviteSvipSuc: false,
+				inviteGvipSuc: false,
+				fromBtn: -1,
+
+				inviteId: ''
 			}
 		},
 		onLoad(o) {
@@ -545,8 +573,37 @@ height: 140rpx;"></image>
 			this.getList()
 			// this.type = 'vip'
 		},
+		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,
+				}
+			}
+		},
 		methods: {
 			secondInvite(item) {
+				this.showLshareBtn = false
+				this.showYhshareBtn = false
+				this.showHyshareBtn = false
+				this.showDgshareBtn = false
+
+				this.inviteSvipSuc = false
+				this.inviteGvipSuc = false
+
+				if (item.status == 'Svip') {
+					this.fromBtn = 1
+				} else {
+					this.fromBtn = 0
+				}
+
 				// console.log('13123234324', item);
 				if (this.user_roleType == 1) {
 					this.inviteVip(item)
@@ -561,7 +618,7 @@ height: 140rpx;"></image>
 				}
 			},
 
-			showBox(type) {
+			showBox(type, fromBtn) {
 				if (type == 'vip') {
 					this.v_sf = -1
 					this.v_xm = ''
@@ -569,6 +626,8 @@ height: 140rpx;"></image>
 					this.v_gs = ''
 					this.v_bz = ''
 					this.showVipPop = true
+
+					this.fromBtn = fromBtn
 				} else if (type == 'ls') {
 					this.l_xm = ''
 					this.l_dh = ''
@@ -634,7 +693,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
@@ -642,6 +701,9 @@ height: 140rpx;"></image>
 					this.d_dh = ''
 					this.d_djxx = ''
 					this.getList()
+
+					this.inviteId = res.data.inviteId
+					this.showDgshareBtn = true
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -682,13 +744,15 @@ 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 = ''
 					this.h_dh = ''
 					this.h_xmmc = ''
 					this.getList()
+					this.inviteId = res.data.inviteId
+					this.showHyshareBtn = true
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -725,12 +789,14 @@ 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
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -769,13 +835,16 @@ 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 = ''
 					this.l_dh = ''
 					this.l_xmmc = ''
 					this.getList()
+					this.inviteId = res.data.inviteId
+
+					this.showLshareBtn = true
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -840,7 +909,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
@@ -850,6 +919,13 @@ height: 140rpx;"></image>
 					this.v_bz = ''
 
 					this.getList()
+					this.inviteId = res.data.inviteId
+
+					if (this.fromBtn) {
+						this.inviteSvipSuc = true
+					} else {
+						this.inviteGvipSuc = true
+					}
 				} else {
 					uni.showToast({
 						title: res.message,

pages/my/userInfo/index.vue

@@ -9,8 +9,8 @@
 						头像
 					</view>
 					<view class="right">
-						<image :src="userInfo?userInfo.head:picUrl+'/static/other/defaultAvatar.png'" mode=""
-							class="avatar"></image>
+						<image :src="userInfo&&userInfo.head?userInfo.head:picUrl+'/static/other/defaultAvatar.png'"
+							mode="" class="avatar"></image>
 						<image src="/static/my/arr_r.png" mode="" class="arr"></image>
 					</view>
 				</view>
@@ -45,7 +45,8 @@
 						真实姓名
 					</view>
 					<view class="right" style="width: 70%;">
-						<input type="text" v-model="userInfo.name" style="width: 100%;text-align: right;">
+						<input type="text" v-model="userInfo.name" placeholder="请输入真实姓名"
+							style="width: 100%;text-align: right;">
 					</view>
 				</view>
 
@@ -54,7 +55,7 @@
 						生日
 					</view>
 					<view class="right">
-						{{userInfo.birthday}}
+						{{userInfo.birthday?userInfo.birthday:'请选择'}}
 					</view>
 				</view>
 
@@ -63,7 +64,8 @@
 						手机号
 					</view>
 					<view class="right" style="width: 70%;">
-						<input type="text" v-model="userInfo.phone" style="width: 100%;text-align: right;">
+						<input type="text" v-model="userInfo.phone" placeholder="请输入手机号"
+							style="width: 100%;text-align: right;">
 					</view>
 				</view>
 			</view>
@@ -111,6 +113,7 @@
 				],
 
 				userInfo: null,
+
 			}
 		},
 		async onLoad(o) {

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,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-button": "/uni_modules/uview-ui/components/u-button/u-button"
+  }
+}

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

@@ -0,0 +1,12 @@
+{
+  "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-button": "/uni_modules/uview-ui/components/u-button/u-button",
+    "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,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-button": "/uni_modules/uview-ui/components/u-button/u-button"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi/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-button": "/uni_modules/uview-ui/components/u-button/u-button"
+  }
+}

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.js

@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/index/mainList/index"],{"1c46":function(e,t,n){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var n={components:{},data:function(){return{picUrl:this.$picUrl,picBase:this.$picBase,list:[],name:""}},onLoad:function(e){this.name=e.name,this.list=getApp().typeList,console.log("传过来的列表",this.list)},methods:{goDetail:function(t,n){getApp().ktItem=t,getApp().ktIndex=n,getApp().ktName=this.name,e.navigateTo({url:"/pages/index/mainDetail/index"})}}};t.default=n}).call(this,n("543d")["default"])},3591:function(e,t,n){"use strict";n.d(t,"b",(function(){return a})),n.d(t,"c",(function(){return o})),n.d(t,"a",(function(){return i}));var i={uLoadmore:function(){return Promise.all([n.e("common/vendor"),n.e("uni_modules/uview-ui/components/u-loadmore/u-loadmore")]).then(n.bind(null,"c6fd2"))}},a=function(){var e=this.$createElement;this._self._c},o=[]},7316:function(e,t,n){"use strict";n.r(t);var i=n("1c46"),a=n.n(i);for(var o in i)["default"].indexOf(o)<0&&function(e){n.d(t,e,(function(){return i[e]}))}(o);t["default"]=a.a},"77ab":function(e,t,n){"use strict";(function(e,t){var i=n("4ea4");n("d716");i(n("66fd"));var a=i(n("bb90"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(a.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])},9389:function(e,t,n){"use strict";var i=n("efb5"),a=n.n(i);a.a},bb90:function(e,t,n){"use strict";n.r(t);var i=n("3591"),a=n("7316");for(var o in a)["default"].indexOf(o)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(o);n("9389");var u=n("f0c5"),c=Object(u["a"])(a["default"],i["b"],i["c"],!1,null,"22fe0046",null,!1,i["a"],void 0);t["default"]=c.exports},efb5:function(e,t,n){}},[["77ab","common/runtime","common/vendor"]]]);

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

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "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-22fe0046"><nav-bar vue-id="03562e14-1" title="{{name}}" back="{{true}}" color="black" background="white" class="data-v-22fe0046" bind:__l="__l"></nav-bar><view class="con data-v-22fe0046"><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-22fe0046" bindtap="__e"><view class="topBox data-v-22fe0046"><image src="{{picBase+item.cover}}" mode class="data-v-22fe0046"></image></view><view class="bottom data-v-22fe0046"><view class="txt data-v-22fe0046">{{''+item.name+''}}</view></view></view></block></view><u-loadmore vue-id="03562e14-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-22fe0046" bind:__l="__l"></u-loadmore></view>

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

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

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

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "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-b43a20ac"><nav-bar vue-id="5d58823e-1" title="产品指南" back="{{true}}" color="black" background="white" class="data-v-b43a20ac" bind:__l="__l"></nav-bar><view class="con data-v-b43a20ac"><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-b43a20ac" bindtap="__e"><image src="{{picBase+item.image}}" mode class="data-v-b43a20ac"></image><view class="bottom data-v-b43a20ac"><view class="txt data-v-b43a20ac">{{''+item.title+''}}</view></view></view></block></view><u-loadmore vue-id="5d58823e-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-b43a20ac" bind:__l="__l"></u-loadmore></view>

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

@@ -0,0 +1 @@
+.data-v-b43a20ac .u-line{width:56rpx!important}.page.data-v-b43a20ac{padding-bottom:54rpx}.con.data-v-b43a20ac{width:100%;display:flex;flex-wrap:wrap;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-b43a20ac{width:336rpx;background:#fff;border-radius:24rpx;border:2rpx solid #f1f1f1;margin-right:16rpx;margin-bottom:24rpx}.con .item image.data-v-b43a20ac{width:100%;height:292rpx;border-radius:30rpx 30rpx 0 0}.con .item .bottom.data-v-b43a20ac{display:flex;justify-content:center;align-items:center;height:76rpx}.con .item .bottom .txt.data-v-b43a20ac{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>

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

@@ -0,0 +1 @@
+.content.data-v-2daba840{padding:48rpx 32rpx 0 32rpx}.content .title.data-v-2daba840{font-size:40rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333;margin-bottom:50rpx}.content .p.data-v-2daba840{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;color:#333;line-height:50rpx;text-indent:2rem;margin-bottom:50rpx}.content image.data-v-2daba840{width:686rpx;height:686rpx;border-radius:0 40rpx 0 40rpx}

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

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "分类",
+  "usingComponents": {
+    "u-search": "/uni_modules/uview-ui/components/u-search/u-search",
+    "u-sticky": "/uni_modules/uview-ui/components/u-sticky/u-sticky",
+    "u-tabs": "/uni_modules/uview-ui/components/u-tabs/u-tabs"
+  }
+}

unpackage/dist/build/mp-weixin/pages/mall.wxss

@@ -0,0 +1 @@
+.data-v-6844eab8 .u-tabs__wrapper__nav__line{background:#f7790c!important}.searchAndTab.data-v-6844eab8{background:#fff;padding-top:24rpx;position:fixed;width:100%;top:173rpx}.searchAndTab .searchBox.data-v-6844eab8{padding:0 32rpx}.content.data-v-6844eab8{display:flex}.content .leftMenu.data-v-6844eab8{width:212rpx;height:calc(100vh - 380rpx);background:#fff;overflow-y:scroll}.content .leftMenu .item.data-v-6844eab8{height:98rpx;font-size:28rpx;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#080f18;display:flex;align-items:center;justify-content:flex-start;padding:0 20rpx;word-wrap:break-word;word-break:break-all;position:relative}.content .leftMenu .halfCircle.data-v-6844eab8{position:absolute;right:0rpx;top:40rpx;z-index:0}.content .leftMenu .act.data-v-6844eab8{background:#f2f2f2}.content .rightDes.data-v-6844eab8{width:100%;background:#f2f2f2;padding:48rpx 28rpx 52rpx 28rpx;overflow-y:scroll;box-sizing:border-box;height:calc(100vh - 380rpx)}.content .rightDes .item .top.data-v-6844eab8{display:flex;align-items:center;justify-content:space-between}.content .rightDes .item .bottom.data-v-6844eab8{display:flex;flex-wrap:wrap;margin-top:32rpx}.content .rightDes .item .bottom image.data-v-6844eab8{width:136rpx;height:136rpx;margin-right:30rpx;margin-bottom:30rpx;border-radius:12rpx}