9.25

pages/index/aiControlSys/index.scss

@@ -4,7 +4,7 @@
 }
 .topBg{
 	width: 100vw;
-	height: 800rpx;
+	height: 850rpx;
 	position: relative;
 	z-index: 0;
 }
@@ -55,7 +55,8 @@
 				image{
 					position: absolute;
 					z-index: 2;
-					left: -8%;
+					left: -10%;
+					top: -20rpx;
 				}
 			}
 		}
@@ -94,7 +95,7 @@
 	.parms{
 		display: flex;
 		flex-wrap: wrap;
-		padding-top: 32rpx;
+		padding-top:32rpx;
 		
 		border-bottom: 1rpx solid #EAEAEA;
 		padding-bottom: 46rpx;
@@ -121,7 +122,7 @@
 		}
 		.act{
 			color:#333333 ;
-			border: 1rpx solid #333333;
+			border: 4rpx solid black;
 			}
 	}
 }
@@ -169,6 +170,7 @@
 		font-weight: 500;
 		color: #333333;
 		margin-right: 96rpx;
+		
 	}
 	
 }

pages/index/aiControlSys_step2/index.scss

@@ -1,7 +1,16 @@
 ::v-deep button::after{
 	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;
+}
 .page{
 	padding-bottom: 208rpx;
 }
@@ -42,14 +51,15 @@
 		border-radius: 0rpx 24rpx 0rpx 24rpx;
 		border: 2rpx solid #E2E2E2;
 		margin-top: 48rpx;
-		padding: 48rpx 24rpx;
+		padding: 40rpx 24rpx;
+		padding-bottom: 22rpx;
 		.top{
 			// padding-bottom: 48rpx;
 			// border-bottom: 2rpx solid #EAEAEA;
 			.item{
 				display: flex;
 				justify-content: space-between;
-				margin-bottom: 52rpx;
+				margin-bottom: 30rpx;
 				.name{
 					font-size: 28rpx;
 					font-family: PingFang-SC-Medium, PingFang-SC;
@@ -213,6 +223,7 @@
 			border: 2rpx solid #333333;
 			width: 180rpx;
 			height: 96rpx;
+			box-sizing: border-box;
 		}
 	}
 	

pages/index/aiControlSys_step2/index.vue

@@ -117,7 +117,7 @@
 				<image v-else src="/static/index/arrUp.png" mode="" @click="showPreviewConfig=false"></image>
 			</view>
 			<view class="right">
-				<button open-type="share" v-if="orderSuc" class="btn">
+				<button open-type="share" v-if="orderSuc" class="btn" :plain="true">
 					分享
 				</button>
 				<view class="btn" v-else @click="showFixInfo=true">
@@ -164,7 +164,7 @@
 					<u--textarea v-model="addr" placeholder="请输入收货地址"></u--textarea>
 				</view>
 
-				<view class="item" style="margin-bottom: 24rpx;">
+				<view class="item" style="margin-bottom: 64rpx;">
 					<view class="label">
 						备注
 					</view>
@@ -269,6 +269,23 @@
 		},
 		methods: {
 			async postOrder() {
+				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('请填写备注')
+				}
+
 				console.log('智控下单参数', {
 					address: this.addr,
 					phone: this.phone,

pages/index/customMian/index.scss

@@ -1,7 +1,13 @@
 ::v-deep button::after{
 	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;
+}
 .page{
 	padding-bottom: 208rpx;
 }
@@ -42,14 +48,15 @@
 		border-radius: 0rpx 24rpx 0rpx 24rpx;
 		border: 2rpx solid #E2E2E2;
 		margin-top: 48rpx;
-		padding: 48rpx 24rpx;
+		padding: 40rpx 24rpx;
+		padding-bottom: 40rpx;
 		.top{
-			padding-bottom: 48rpx;
+			padding-bottom: 35rpx;
 			border-bottom: 2rpx solid #EAEAEA;
 			.item{
 				display: flex;
 				justify-content: space-between;
-				margin-bottom: 52rpx;
+				margin-bottom: 30rpx;
 				.name{
 					font-size: 28rpx;
 					font-family: PingFang-SC-Medium, PingFang-SC;
@@ -78,7 +85,7 @@
 				color: #333333;
 				display: flex;
 				justify-content: space-between;
-				margin-top: 24rpx;
+				margin-top: 38rpx;
 				margin-bottom: 24rpx;
 				.label{
 					padding-left: 5rpx;
@@ -97,11 +104,13 @@
 					image{
 						width: 128rpx;
 						height: 128rpx;
+						border-radius: 12rpx;
+						// border: 1rpx solid red;
 					}
 					.name{
 						font-size: 28rpx;
 						font-family: PingFang-SC-Medium, PingFang-SC;
-						font-weight: 500;
+						font-weight:normal;
 						color: #333333;
 						width: 128rpx;
 						word-break: break-all;
@@ -127,6 +136,7 @@
 	font-weight: bold;
 	color: #333333;
 	margin-top: 48rpx;
+	margin-bottom: 10rpx;
 }
 
 .btnBox{
@@ -213,6 +223,8 @@
 			border: 2rpx solid #333333;
 			width: 180rpx;
 			height: 96rpx;
+			
+			box-sizing: border-box;
 		}
 	}
 }

pages/index/customMian/index.vue

@@ -114,7 +114,7 @@
 
 		<view class="parmasBox" v-if="navBarTitle">
 			<view class="con">
-				<view class="top">
+				<view class="top" style="border-bottom: 0; padding-bottom: 0rpx;">
 					<view class="item">
 						<view class="name">
 							收货人
@@ -159,7 +159,7 @@
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
 			<view class="right">
-				<button open-type="share" v-if="orderSuc" class="btn">
+				<button open-type="share" v-if="orderSuc" class="btn" :plain="true">
 					分享
 				</button>
 				<view class="btn" v-else @click="showFixInfo=true">
@@ -204,7 +204,7 @@
 					<u--textarea v-model="addr" placeholder="请输入收货地址"></u--textarea>
 				</view>
 
-				<view class="item" style="margin-bottom: 54rpx;height: auto;">
+				<view class="item" style="margin-bottom: 64rpx;height: auto;">
 					<view class="label">
 						备注
 					</view>
@@ -339,6 +339,23 @@
 				uni.navigateBack()
 			},
 			async postOrder() {
+				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('请填写备注')
+				}
+
 				console.log('主灯/吸顶灯下单参数', {
 					address: this.addr,
 					phone: this.phone,

pages/index/customMian_step1/index.scss

@@ -54,11 +54,12 @@
 				position: relative;
 				z-index: 1;
 				margin-left: 52rpx;
-				image{
-					position: absolute;
-					z-index: 2;
-					left: -8%;
-				}
+			image{
+				position: absolute;
+				z-index: 2;
+				left: -10%;
+				top: -20rpx;
+			}
 			}
 		}
 		.rDes{
@@ -127,7 +128,7 @@
 		}
 		.act{
 			color:#333333 ;
-			border: 1rpx solid #333333;
+			border: 4rpx solid black;
 			}
 	}
 }
@@ -352,7 +353,7 @@
 			}
 			.act3{
 				border-radius: 4rpx;
-				border: 2rpx solid #515151;
+				border: 4rpx solid black;
 			}
 		}
 		

pages/index/customMian_step1/index.vue

@@ -500,29 +500,37 @@
 			},
 			handleSel(type, item, index, mode = 1) {
 				if (type == 'kt') {
-					if (!this.selKt.includes(item)) {
-						this.selKt.push(item)
-					} else {
-						if (mode == 1) {
-							let i = this.selKt.findIndex((item1, index1) => {
-								return item1 == item
-							})
-							this.selKt.splice(i, 1)
-						}
-					}
+					// 只能单选
+					this.selKt = [item]
+
+					// 支持对选与取消当前选择
+					// if (!this.selKt.includes(item)) {
+					// 	this.selKt.push(item)
+					// } else {
+					// 	if (mode == 1) {
+					// 		let i = this.selKt.findIndex((item1, index1) => {
+					// 			return item1 == item
+					// 		})
+					// 		this.selKt.splice(i, 1)
+					// 	}
+					// }
 
 				} else if (type == 'ct') {
-					if (!this.selCt.includes(item)) {
-						this.selCt.push(item)
-					} else {
-						if (mode == 1) {
-							let i = this.selCt.findIndex((item1, index1) => {
-								return item1 == item
-							})
-							this.selCt.splice(i, 1)
-						}
-					}
+					this.selCt = [item]
+
+					// if (!this.selCt.includes(item)) {
+					// 	this.selCt.push(item)
+					// } else {
+					// 	if (mode == 1) {
+					// 		let i = this.selCt.findIndex((item1, index1) => {
+					// 			return item1 == item
+					// 		})
+					// 		this.selCt.splice(i, 1)
+					// 	}
+					// }
 				} else if (type == 'ws') {
+					// this.selWs = [item]
+
 					if (!this.selWs.includes(item)) {
 						this.selWs.push(item)
 					} else {
@@ -534,16 +542,18 @@
 						}
 					}
 				} else if (type == 'yt') {
-					if (!this.selYt.includes(item)) {
-						this.selYt.push(item)
-					} else {
-						if (mode == 1) {
-							let i = this.selYt.findIndex((item1, index1) => {
-								return item1 == item
-							})
-							this.selYt.splice(i, 1)
-						}
-					}
+					this.selYt = [item]
+
+					// if (!this.selYt.includes(item)) {
+					// 	this.selYt.push(item)
+					// } else {
+					// 	if (mode == 1) {
+					// 		let i = this.selYt.findIndex((item1, index1) => {
+					// 			return item1 == item
+					// 		})
+					// 		this.selYt.splice(i, 1)
+					// 	}
+					// }
 				}
 				let wsIds1 = []
 				this.selKt.forEach((item, index) => {
@@ -601,13 +611,13 @@
 					return
 				}
 
-				if (this.selHx.value == '一室两厅' && this.selWs.length < 1) {
+				if (this.selHx.value == '一室两厅' && this.selWs.length != 1) {
 					this.showHuxing = true
 					return
-				} else if (this.selHx.value == '两室两厅' && this.selWs.length < 2) {
+				} else if (this.selHx.value == '两室两厅' && this.selWs.length != 2) {
 					this.showHuxing = true
 					return
-				} else if (this.selHx.value == '三室两厅' && this.selWs.length < 3) {
+				} else if (this.selHx.value == '三室两厅' && this.selWs.length != 3) {
 					this.showHuxing = true
 					return
 				}

pages/index/customNoMian_step1/index.scss

@@ -126,7 +126,7 @@
 		}
 		.act{
 			color:#333333 ;
-			border: 1rpx solid #333333;
+			border: 4rpx solid black;
 			}
 	}
 }

pages/index/customNoMian_step2/index.scss

@@ -1,5 +1,14 @@
+
 ::v-deep button::after{
 	border: none!important;
+	// 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;
 }
 .page{
 	padding-bottom: 208rpx;
@@ -41,14 +50,15 @@
 		border-radius: 0rpx 24rpx 0rpx 24rpx;
 		border: 2rpx solid #E2E2E2;
 		margin-top: 48rpx;
-		padding: 48rpx 24rpx;
+		padding: 40rpx 24rpx;
+		padding-bottom: 22rpx;
 		.top{
 			// padding-bottom: 48rpx;
 			// border-bottom: 2rpx solid #EAEAEA;
 			.item{
 				display: flex;
 				justify-content: space-between;
-				margin-bottom: 40rpx;
+				margin-bottom: 30rpx;
 				.name{
 					font-size: 28rpx;
 					font-family: PingFang-SC-Medium, PingFang-SC;
@@ -212,6 +222,8 @@
 			border: 2rpx solid #333333;
 			width: 180rpx;
 			height: 96rpx;
+			
+			box-sizing: border-box;
 		}
 	}
 	

pages/index/customNoMian_step2/index.vue

@@ -111,10 +111,10 @@
 
 
 			<view class="right">
-				<button open-type="share" v-if="orderSuc" class="btn">
+				<button open-type="share" v-if="orderSuc" class="btn" :plain="true">
 					分享
 				</button>
-				<view class="btn" v-else @click="showFixInfo=true">
+				<view class=" btn" v-else @click="showFixInfo=true">
 					确认配置
 				</view>
 				<view class="btn" v-if="!navBarTitle" @click="back" style="margin-left: 20rpx;">
@@ -160,13 +160,14 @@
 					<u--textarea v-model="addr" placeholder="请输入收货地址"></u--textarea>
 				</view>
 
-				<view class="item" style="margin-bottom: 56rpx;">
+				<view class="item" style="margin-bottom: 64rpx;">
 					<view class="label">
 						备注
 					</view>
 					<u--input clearable placeholder="请输入备注" border="surround" v-model="remark"
 						@change="change"></u--input>
 				</view>
+
 				<u-button text="确认下单" color="#333" @click="postOrder"></u-button>
 			</view>
 		</u-popup>
@@ -215,7 +216,7 @@
 			}
 		},
 		async onLoad(o) {
-			o.orderId = '66d7ccae1853d0194d84e62f59f17671'
+			// o.orderId = '66d7ccae1853d0194d84e62f59f17671'
 			if (o.orderId) {
 				this.orderId = o.orderId
 				this.navBarTitle = '首页'
@@ -268,6 +269,23 @@
 				uni.navigateBack()
 			},
 			async postOrder() {
+				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('请填写备注')
+				}
+
 				console.log('无主灯下单参数', {
 					address: this.addr,
 					phone: this.phone,

pages/index/fullHouseWifi/index.scss

@@ -1,12 +1,19 @@
 ::v-deep button::after{
 	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;
+}
 .page{
 	padding-bottom: 160rpx;
 }
 .topBg{
 	width: 100vw;
-	height: 800rpx;
+	height: 850rpx;
 	position: relative;
 	z-index: 0;
 }
@@ -57,7 +64,8 @@
 				image{
 					position: absolute;
 					z-index: 2;
-					left: -8%;
+					left: -10%;
+					top: -20rpx;
 				}
 			}
 		}
@@ -120,7 +128,7 @@
 		}
 		.act{
 			color:#333333 ;
-			border: 1rpx solid #333333;
+			border: 4rpx solid black;
 			}
 			
 			.item:nth-of-type(2n){
@@ -172,6 +180,7 @@
 		font-weight: 500;
 		color: #333333;
 		margin-right: 96rpx;
+		box-sizing: border-box;
 	}
 	
 }
@@ -245,6 +254,9 @@
 				margin-bottom: 40rpx;
 				box-sizing: border-box;
 				height: auto;
+				.label{
+					margin-bottom: 24rpx;
+				}
 				.top{
 					display: flex;
 					justify-content: space-between;

pages/index/fullHouseWifi/index.vue

@@ -52,7 +52,7 @@
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
-			<button open-type="share" v-if="orderSuc" class="right">
+			<button open-type="share" v-if="orderSuc" class="right" :plain="true">
 				分享
 			</button>
 
@@ -95,7 +95,7 @@
 					<u--textarea v-model="addr" placeholder="请输入收货地址"></u--textarea>
 				</view>
 
-				<view class="item" style="margin-bottom: 24rpx;">
+				<view class="item" style="margin-bottom: 64rpx;">
 					<view class="label">
 						备注
 					</view>

pages/index/fullHouseWifi_step2/index.scss

@@ -38,14 +38,15 @@
 		border-radius: 0rpx 24rpx 0rpx 24rpx;
 		border: 2rpx solid #E2E2E2;
 		margin-top: 48rpx;
-		padding: 48rpx 24rpx;
+		padding: 52rpx 24rpx;
+		padding-bottom: 40rpx;
 		.top{
 			// padding-bottom: 48rpx;
 			// border-bottom: 2rpx solid #EAEAEA;
 			.item{
 				display: flex;
 				justify-content: space-between;
-				margin-bottom: 52rpx;
+				margin-bottom: 30rpx;
 				.name{
 					font-size: 28rpx;
 					font-family: PingFang-SC-Medium, PingFang-SC;

pages/index/mainList/index.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<navBar :title="name" :back="true" color="black" background="white" />
 
-		<view class="con">
+		<view class="con" v-if="list.length!=0">
 			<view class="item" v-for="(item,index) in list" @click="goDetail(item,index)">
 				<view class="topBox">
 					<image :src="picBase+item.cover" mode=""></image>
@@ -14,7 +14,11 @@
 				</view>
 			</view>
 		</view>
-		<u-loadmore style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+		<view class="con" v-else style="justify-content: center;">
+			<u-empty mode="data" text="暂无数据" width="160" height="160" :icon="picUrl+'/static/other/empty.png'">
+			</u-empty>
+		</view>
+		<u-loadmore v-if="list.length!=0" style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
 	</view>
 </template>
 

pages/index/productLead/index.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<navBar title="产品指南" :back="true" color="black" background="white" />
 
-		<view class="con">
+		<view class="con" v-if="list.length!=0">
 			<view class="item" v-for="(item,index) in list" @click="goDetail(item)">
 				<image :src="picBase+item.image" mode=""></image>
 				<view class="bottom">
@@ -12,7 +12,11 @@
 				</view>
 			</view>
 		</view>
-		<u-loadmore style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+		<view class="con" v-else style="justify-content: center;">
+			<u-empty mode="data" text="暂无数据" width="160" height="160" :icon="picUrl+'/static/other/empty.png'">
+			</u-empty>
+		</view>
+		<u-loadmore v-if="list.length!=0" style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
 	</view>
 </template>
 

pages/mall.vue

@@ -34,7 +34,6 @@
 		</view>
 
 		<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.id,index)">
@@ -45,6 +44,8 @@
 				</view>
 			</view>
 			<view class="rightDes">
+
+
 				<view class="item" v-for="(item,index) in allTypes" :style="{marginTop:index>0?'22rpx':''}">
 					<view class="top" @click="toList(item,allTypesValues[index])">
 						<view class="name">
@@ -54,12 +55,23 @@
 							style="width: 40rpx;height: 40rpx;margin-right: 4rpx;">
 						</image>
 					</view>
-					<view class="bottom">
+
+
+
+					<view class="bottom" v-if="resList[item].length!=0">
 						<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[item] ">
 						</image>
 					</view>
+
+					<view class="bottom" v-else style="justify-content: center;">
+						<u-empty mode="data" text="暂无数据" width="100" height="100"
+							:icon="picUrl+'/static/other/empty.png'">
+						</u-empty>
+					</view>
 				</view>
+
+
 			</view>
 		</view>
 	</view>
@@ -98,7 +110,9 @@
 
 				allTypes: [],
 				allTypesValues: [],
-				tOList: []
+				tOList: [],
+
+				pid: -1
 
 			};
 		},
@@ -149,17 +163,21 @@
 					this.list2 = res.data
 					console.log('zhongxiang', res);
 
+					// this.pid = res.data[0].id
+
 					this.getMall(res.data[0].id)
 				}
 			},
 
 
 			async getMall(id) {
+				this.pid = id
 				let res = await getMallReq({
 					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
@@ -195,8 +213,7 @@
 
 			toList(id, name) {
 				uni.navigateTo({
-					url: '/pages/mall/goodsList/index?typeNameId=' + id + '&name=' + name + '&brand=' + this.selTab
-						.brand + '&type=' + this.selTab.type
+					url: '/pages/mall/goodsList/index?typeNameId=' + id + '&pid=' + this.pid
 				})
 			},
 			goDetail(item) {

pages/mall/detail/index.vue

@@ -34,19 +34,7 @@
 					</view>
 				</view>
 			</view>
-			<!-- 	<view class="parmasBox" v-for="(item,index) in parmsList" v-if="navBarTitle">
-				<view class="con">
-					<view class="title">
-						{{item.title}}
-					</view>
-					<view class="list">
-						<view class="item" v-for="(item1,index1) in item.list" :class="[index1==ids[index]?'act':'']"
-							@click="">
-							{{item1.data}}
-						</view>
-					</view>
-				</view>
-			</view> -->
+
 			<view class="parmasBox" v-for="(item,index) in Object.keys(skuParams.attrs)">
 				<view class="con">
 					<view class="title">
@@ -62,7 +50,8 @@
 				</view>
 			</view>
 
-			<view class="parmasBox" style="border-bottom: none;">
+			<!-- <view class="parmasBox" style="border-bottom: none;"> -->
+			<view class="parmasBox" style="border-bottom:1rpx solid #EAEAEA">
 				<view class="con" @click="handleOpenOrClose(1)">
 					<view class="title1">
 						<view class="txt">
@@ -113,8 +102,8 @@
 				currIndex1: 0,
 
 				currentNum: 0,
-				show1: false,
-				addOrLessIcon1: '/static/index/add.png',
+				show1: true,
+				addOrLessIcon1: '/static/index/shortLine.png',
 
 				lovePic: '',
 

pages/mall/goodsList/index.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<navBar :title="name" :back="true" color="black" background="white" />
 
-		<view class="con">
+		<view class="con" v-if="list.length!=0">
 			<view class="item" v-for="(item,index) in list" @click="goDetail(item)">
 				<view class="topBox">
 					<image :src="picBase+item.cover" mode=""></image>
@@ -14,7 +14,13 @@
 				</view>
 			</view>
 		</view>
-		<u-loadmore style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+		<view class="con" v-else style="justify-content: center;">
+			<u-empty mode="data" text="暂无数据" width="160" height="160" :icon="picUrl+'/static/other/empty.png'">
+			</u-empty>
+		</view>
+
+
+		<u-loadmore v-if="list.length!=0" style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
 	</view>
 </template>
 
@@ -35,11 +41,13 @@
 
 				brand: 0,
 				type: 0,
-				typeNameId: 0
+				typeNameId: 0,
+				pid: -1
 			}
 		},
 		async onLoad(o) {
-			console.log('typeNameId ', o.typeNameId);
+			console.log('typeNameId ', o.typeNameId, 'pId ', o.pid);
+			this.pid = o.pid
 			this.name = o.name
 			this.typeNameId = o.typeNameId
 			this.brand = o.brand
@@ -48,8 +56,9 @@
 		async onShow() {
 			let res = await getMallReq({
 				typeNameId: this.typeNameId,
-				brand: this.brand,
-				type: this.type,
+				pid: this.pid
+				// brand: this.brand,
+				// type: this.type,
 			})
 			if (res.code == 0) {
 				this.list = res.data

pages/my.vue

@@ -61,13 +61,13 @@
 
 
 					</view>
-					<image :src="picUrl+'/static/my/set2.png'" mode="" @click="toPage('set')"
+					<image :src="picUrl+'/static/my/set2.png'" mode="" @click="toPage('info')"
 						style="width: 37rpx;height: 41rpx;margin-right: 22rpx;">
 					</image>
 				</view>
 
 				<view class="invite" @click="token?show=true:$toast('请先登录')"
-					v-if="role=='sjkf'||role=='shkf'||role=='yw'||role=='superAdmin'||role=='yk'||!role">
+					v-if="role=='sjkf'||role=='shkf'||role=='yw'||role=='superAdmin'">
 					<view class="left">
 						<image :src="picUrl+'/static/my/vip.png'" mode="" style="width: 27rpx;height: 30rpx;">
 						</image>
@@ -140,48 +140,26 @@
 				// 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'
-					// }, 
-					// {
-					// 	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'
+				serList: [{
+						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'
+						name: '小程序使用指南',
+						url: '/pages/my/useLead/index'
 					},
 					{
-						icon: this.$picUrl + '/static/my/yjlx.png',
-						name: '一键联系',
-						phone: '12983098478'
+						icon: this.$picUrl + '/static/other/aboutMe.png',
+						name: '关于我们',
+						url: '/pages/my/aboutMe/index'
 					},
 					{
 						icon: this.$picUrl + '/static/my/qt.png',
-						name: '小程序使用指南',
-						url: '/pages/my/useLead/index'
-					}
+						name: '其他信息',
+						url: '/pages/my/otherInfo/index'
+					},
 				],
 
 				showPrivacy: true,
@@ -216,6 +194,8 @@
 					// }
 					console.log('用户信息', this.userInfo);
 					// this.role = 'cydg'
+					// this.checkRole()
+					// return
 					if (res.data.status) {
 						switch (res.data.type) {
 							case 0:
@@ -287,6 +267,7 @@
 				})
 			},
 			toPage(page) {
+				console.log('page----------------', page);
 				if (!this.token && page != '/pages/my/otherInfo/index' && !page.phone) {
 					return this.$toast('请先登录')
 				}
@@ -372,14 +353,11 @@
 			checkRole() {
 				if (this.role == 'yk') {
 					this.serList = [{
-							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'
@@ -447,6 +425,7 @@
 						{
 							icon: this.picUrl + '/static/my/jiang.png',
 							name: '兑奖信息',
+							url: '/pages/my/duijiang/index'
 							// phone: '12983098478'
 						},
 						{
@@ -472,7 +451,7 @@
 					}, {
 						icon: this.picUrl + '/static/my/jiang.png',
 						name: '兑奖信息',
-						url: '/pages/my/chapinShip/index'
+						url: '/pages/my/duijiang/index'
 					}, {
 						icon: this.picUrl + '/static/my/qt.png',
 						name: '小程序使用指南',

pages/my/actGoods/index.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<navBar title="活动商品" :back="true" color="black" background="white" />
 
-		<view class="con">
+		<view class="con" v-if="list.length!=0">
 			<view class="item" v-for="(item,index) in list" @click="goDetail(item)">
 				<view class="topBox">
 					<image :src="picBase+item.cover" mode=""></image>
@@ -14,7 +14,11 @@
 				</view>
 			</view>
 		</view>
-		<u-loadmore style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+		<view class="con" v-else style="justify-content: center;">
+			<u-empty mode="data" text="暂无数据" width="160" height="160" :icon="picUrl+'/static/other/empty.png'">
+			</u-empty>
+		</view>
+		<u-loadmore v-if="list.length!=0" style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
 	</view>
 </template>
 
@@ -26,6 +30,7 @@
 		components: {},
 		data() {
 			return {
+				picUrl: this.$picUrl,
 				picBase: this.$picBase,
 				list: []
 			}

pages/my/actGoodsDetail/index.vue

@@ -72,19 +72,6 @@
 				</view>
 			</view>
 		</view>
-		<!-- 	<view class="parmasBox" v-for="(item,index) in parmsList" v-if="navBarTitle" :key="index">
-			<view class="con">
-				<view class="title">
-					{{item.title}}
-				</view>
-				<view class="list">
-					<view class="item" v-for="(item1,index1) in item.list" :class="[index1==ids[index]?'act':'']"
-						@click="">
-						{{item1.data}}
-					</view>
-				</view>
-			</view>
-		</view> -->
 		<view class="parmasBox" v-for="(item,index) in Object.keys(skuParams.attrs)">
 			<view class="con">
 				<view class="title">
@@ -99,7 +86,7 @@
 			</view>
 		</view>
 
-		<view class="parmasBox" style="border-bottom: none;">
+		<view class="parmasBox" style="border-bottom:1rpx solid #EAEAEA">
 			<view class="con" @click="handleOpenOrClose(1)">
 				<view class="title1">
 					<view class="txt">
@@ -155,8 +142,8 @@
 				currIndex: 0,
 				currIndex1: 0,
 				currIndex2: 0,
-				show1: false,
-				addOrLessIcon1: '/static/index/add.png',
+				show1: true,
+				addOrLessIcon1: '/static/index/shortLine.png',
 
 				lovePic: '/static/mall/love.png',
 

pages/my/changeNewGoods/index.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="page">
-		<navBar title="换新商品" :back="true" color="black" background="white" />
+		<navBar title="换新商城" :back="true" color="black" background="white" />
 
-		<view class="con">
+		<view class="con" v-if="list.length!=0">
 			<view class="item" v-for="(item,index) in list" @click="goDetail(item)">
 				<view class="topBox">
 					<image :src="picBase+item.cover" mode=""></image>
@@ -14,7 +14,11 @@
 				</view>
 			</view>
 		</view>
-		<u-loadmore style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+		<view class="con" v-else style="justify-content: center;">
+			<u-empty mode="data" text="暂无数据" width="160" height="160" :icon="picUrl+'/static/other/empty.png'">
+			</u-empty>
+		</view>
+		<u-loadmore v-if="list.length!=0" style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
 	</view>
 </template>
 
@@ -29,6 +33,7 @@
 		},
 		data() {
 			return {
+				picUrl: this.$picUrl,
 				list: [],
 				picBase: this.$picBase
 			}

pages/my/collect/index.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<navBar title="收藏" :back="true" color="black" background="white" />
 
-		<view class="con">
+		<view class="con" v-if="list.length!=0">
 			<view class="item" v-for="(item,index) in list" @click="goDetail(item)">
 				<image :src="picBase+item.goods.cover" mode=""></image>
 				<view class="bottom">
@@ -12,7 +12,11 @@
 				</view>
 			</view>
 		</view>
-		<u-loadmore style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+		<view class="con" v-else style="justify-content: center;">
+			<u-empty mode="data" text="暂无数据" width="160" height="160" :icon="picUrl+'/static/other/empty.png'">
+			</u-empty>
+		</view>
+		<u-loadmore v-if="list.length!=0" style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
 	</view>
 </template>
 
@@ -27,6 +31,7 @@
 		},
 		data() {
 			return {
+				picUrl: this.$picUrl,
 				picBase: this.$picBase,
 				list: []
 			}

pages/my/collectDetail/index.vue

@@ -62,7 +62,7 @@
 				</view>
 			</view>
 
-			<view class="parmasBox" style="border-bottom: none;">
+			<view class="parmasBox" style="border-bottom:1rpx solid #EAEAEA;">
 				<view class="con" @click="handleOpenOrClose(1)">
 					<view class="title1">
 						<view class="txt">
@@ -114,8 +114,8 @@
 				currIndex: 0,
 				currIndex1: 0,
 				currIndex2: 0,
-				show1: false,
-				addOrLessIcon1: '/static/index/add.png',
+				show1: true,
+				addOrLessIcon1: '/static/index/shortLine.png',
 
 				lovePic: '/static/mall/love.png',
 

pages/my/duijiang/index.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<navBar title="兑奖信息" :back="true" color="black" background="white" />
 
-		<view class="content">
+		<view class="content" v-if="list.length!=0">
 			<view class="item" v-for="(item,index) in list">
 				<view class="line">
 					<view class="left">
@@ -53,6 +53,11 @@
 					</view>
 				</view>
 			</view>
+			<u-loadmore v-if="list.length!=0" style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+		</view>
+		<view class="content" v-else>
+			<u-empty mode="data" text="暂无数据" width="160" height="160" :icon="picUrl+'/static/other/empty.png'">
+			</u-empty>
 		</view>
 	</view>
 </template>
@@ -67,6 +72,8 @@
 		},
 		data() {
 			return {
+				picUrl: this.$picUrl,
+				picBase: this.$picBase,
 				list: []
 			}
 		},

pages/my/feedBack/index.scss

@@ -101,7 +101,7 @@
 	
 	.addpic {
 		display: flex;
-		justify-content: center;
+		justify-content: flex-start;
 		align-items: center;
 		width: 210rpx;
 		height: 210rpx;
@@ -109,7 +109,7 @@
 			width: 184rpx;
 			height:186rpx;
 			border-radius: 24rpx;
-			border: 1rpx dashed #E6E6E6;
+			// border: 1rpx dashed #E6E6E6;
 			display: flex;
 			justify-content: center;
 			align-items: center;

pages/my/set/index.scss

@@ -1,3 +1,7 @@
+.u-switch--disabled{
+	opacity: 1!important;
+}
+
 .content{
 	background: #F1F1F1;
 	min-height: 100vh;

pages/my/set/index.vue

@@ -9,7 +9,7 @@
 						显示售价
 					</view>
 					<view class="right">
-						<u-switch v-model="value1" @change="change1" activeColor="#F7790C"
+						<u-switch v-model="value1" @change="asyncChange1" :disabled="disAbled1" activeColor="#F7790C"
 							inactiveColor="#E6E6E6"></u-switch>
 					</view>
 				</view>
@@ -18,7 +18,7 @@
 						显示会员价
 					</view>
 					<view class="right">
-						<u-switch v-model="value2" @change="change2" activeColor="#F7790C"
+						<u-switch v-model="value2" @change="asyncChange2" :disabled="disAbled2" activeColor="#F7790C"
 							inactiveColor="#E6E6E6"></u-switch>
 					</view>
 				</view>
@@ -27,12 +27,11 @@
 						显示VIP价
 					</view>
 					<view class="right">
-						<u-switch v-model="value3" @change="change3" activeColor="#F7790C"
+						<u-switch v-model="value3" @change="asyncChange3" :disabled="disAbled3" activeColor="#F7790C"
 							inactiveColor="#E6E6E6"></u-switch>
 					</view>
 				</view>
 			</view>
-			<u-button text="退出登录" @click="logoOut" color="#333"></u-button>
 		</view>
 	</view>
 </template>
@@ -54,6 +53,8 @@
 		},
 		onLoad(o) {
 			this.role = o.role
+
+			console.log(this.disAbled1, this.disAbled2, this.disAbled3);
 		},
 		onShow() {
 			this.value1 = Boolean(this.switchs[0])
@@ -65,28 +66,31 @@
 		computed: {
 			switchs() {
 				return uni.getStorageSync('switchs')
-			}
+			},
+			disAbled1() {
+				if (!this.value2 && !this.value3 && this.value1) {
+					return true
+				} else {
+					return false
+				}
+			},
+			disAbled2() {
+				if (!this.value1 && !this.value3 && this.value2) {
+					return true
+				} else {
+					return false
+				}
+			},
+			disAbled3() {
+				if (!this.value2 && !this.value1 && this.value3) {
+					return true
+				} else {
+					return false
+				}
+			},
 		},
 		methods: {
-			logoOut() {
-				uni.showModal({
-					title: '提示',
-					content: '确认退出?',
-					confirmColor: '#F7790C',
-					success: function(res) {
-						if (res.confirm) {
-							uni.removeStorageSync('token')
-							uni.setStorageSync('switchs', [1, 0, 0])
-							uni.reLaunch({
-								url: '/pages/my'
-							})
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
-			},
-			change1(e) {
+			asyncChange1(e) {
 				if (e) {
 					this.switchs[0] = 1
 					if (this.value2) {
@@ -103,7 +107,7 @@
 				uni.setStorageSync('switchs', this.switchs)
 				console.log(this.switchs);
 			},
-			change2(e) {
+			asyncChange2(e) {
 				if (e) {
 					this.switchs[1] = 1
 					if (this.value1) {
@@ -120,7 +124,7 @@
 				uni.setStorageSync('switchs', this.switchs)
 				console.log(this.switchs);
 			},
-			change3(e) {
+			asyncChange3(e) {
 				if (e) {
 					this.switchs[2] = 1
 					if (this.value1) {
@@ -142,5 +146,9 @@
 </script>
 
 <style lang="scss" scoped>
+	.u-switch--disabled {
+		opacity: 1 !important;
+	}
+
 	@import "./index.scss";
 </style>

pages/my/userInfo/index.vue

@@ -70,6 +70,10 @@
 				</view>
 			</view>
 			<u-button text="修改" @click="update" color="#333"></u-button>
+
+			<view class="" style="margin-top: 20rpx;">
+				<u-button text="退出登录" @click="logoOut" color="#333"></u-button>
+			</view>
 		</view>
 
 
@@ -128,6 +132,24 @@
 			}
 		},
 		methods: {
+			logoOut() {
+				uni.showModal({
+					title: '提示',
+					content: '确认退出?',
+					confirmColor: '#F7790C',
+					success: function(res) {
+						if (res.confirm) {
+							uni.removeStorageSync('token')
+							uni.setStorageSync('switchs', [1, 0, 0])
+							uni.reLaunch({
+								url: '/pages/my'
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
 			async update() {
 				let res = await updateUserInfoReq({
 					nickname: this.userInfo.nickname,

uni_modules/uview-ui/components/u-swiper/index.scss

@@ -55,6 +55,7 @@
 			font-weight: 500;
 			color: #666666;
 			margin-left: 8rpx;
+			
 		}
 	}
 	
@@ -62,12 +63,15 @@
 		display: flex;
 		align-items: center;
 		flex-direction: row;
+		justify-content: center;
 		.txt{
 			font-size: 28rpx;
 			font-family: PingFang-SC-Medium, PingFang-SC;
 			font-weight: 500;
 			color: #333333;
 			margin-right: 16rpx;
+			
+			max-width: 500rpx;
 		}
 	}
 }

uni_modules/uview-ui/components/u-swiper/u-swiper.vue

@@ -80,7 +80,7 @@
 							<view class="txt">
 								{{item.address}}
 							</view>
-							<image @click="daohang(item.address)" src="@/static/index/daohang.png" mode=""
+							<image @click="daohang(item)" src="@/static/index/daohang.png" mode=""
 								style="width: 36rpx;height: 36rpx;display: inline-block;"></image>
 						</view>
 
@@ -175,31 +175,49 @@
 					phoneNumber: phone,
 				})
 			},
-			daohang(addr) {
+			daohang(item) {
 				// 实例化API核心类
-				qqmapsdk = new QQMapWX({
-					key: 'W4IBZ-EVOCV-GJVPF-5QVLU-5ZJTJ-CNFUD'
-				});
+				// qqmapsdk = new QQMapWX({
+				// 	key: 'W4IBZ-EVOCV-GJVPF-5QVLU-5ZJTJ-CNFUD'
+				// });
 
-				qqmapsdk.geocoder({
-					address: addr,
-					success: function(res) {
-						console.log('根据地名解析得到的经纬度信息：', res)
-						uni.openLocation({
-							name: addr,
-							address: res.result.address_components.province + res.result
-								.address_components.city + res.result.address_components.district + res
-								.result.address_components.street + res.result.address_components
-								.street_number + '号',
-							latitude: res.result.location.lat,
-							longitude: res.result.location.lng,
-							success: function() {
-								console.log('success');
-							}
-						});
-					},
-					complete: res => {}
-				})
+				// qqmapsdk.geocoder({
+				// 	address: '四川省成都市金牛区长平街70号',
+				// 	success: function(res) {
+				// 		console.log('根据地名解析得到的经纬度信息：', res)
+				// 		uni.openLocation({
+				// 			name: '四川省成都市金牛区长平街70号',
+				// 			address: res.result.address_components.province + res.result
+				// 				.address_components.city + res.result.address_components.district + res
+				// 				.result.address_components.street + res.result.address_components
+				// 				.street_number + '号',
+				// 			latitude: res.result.location.lat,
+				// 			longitude: res.result.location.lng,
+				// 			success: function() {
+				// 				console.log('success');
+				// 			}
+				// 		});
+				// 	},
+				// 	complete: res => {}
+				// })
+
+
+
+				console.log('item', item, {
+					name: item.company,
+					address: item.address,
+					latitude: item.latitude,
+					longitude: item.longitude,
+				});
+				uni.openLocation({
+					name: item.company,
+					address: item.address,
+					latitude: Number(item.latitude),
+					longitude: Number(item.longitude),
+					success: function() {
+						console.log('success');
+					}
+				});
 			},
 
 			getItemType(item) {

uni_modules/uview-ui/components/u-switch/u-switch.vue

@@ -1,28 +1,11 @@
 <template>
-	<view
-	    class="u-switch"
-	    :class="[disabled && 'u-switch--disabled']"
-	    :style="[switchStyle, $u.addStyle(customStyle)]"
-	    @tap="clickHandler"
-	>
-		<view
-		    class="u-switch__bg"
-		    :style="[bgStyle]"
-		>
+	<view class="u-switch" :class="[disabled && 'u-switch--disabled']" :style="[switchStyle, $u.addStyle(customStyle)]"
+		@tap="clickHandler">
+		<view class="u-switch__bg" :style="[bgStyle]">
 		</view>
-		<view
-		    class="u-switch__node"
-		    :class="[value && 'u-switch__node--on']"
-		    :style="[nodeStyle]"
-		    ref="u-switch__node"
-		>
-			<u-loading-icon
-			    :show="loading"
-			    mode="circle"
-			    timingFunction='linear'
-			    :color="value ? activeColor : '#AAABAD'"
-			    :size="size * 0.6"
-			/>
+		<view class="u-switch__node" :class="[value && 'u-switch__node--on']" :style="[nodeStyle]" ref="u-switch__node">
+			<u-loading-icon :show="loading" mode="circle" timingFunction='linear'
+				:color="value ? activeColor : '#AAABAD'" :size="size * 0.6" />
 		</view>
 	</view>
 </template>
@@ -50,12 +33,12 @@
 	 */
 	export default {
 		name: "u-switch",
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
+		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
 		watch: {
 			value: {
 				immediate: true,
 				handler(n) {
-					if(n !== this.inactiveValue && n !== this.activeValue) {
+					if (n !== this.inactiveValue && n !== this.activeValue) {
 						uni.$u.error('v-model绑定的值必须为inactiveValue、activeValue二者之一')
 					}
 				}
@@ -67,7 +50,7 @@
 			}
 		},
 		computed: {
-			isActive(){
+			isActive() {
 				return this.value === this.activeValue;
 			},
 			switchStyle() {
@@ -78,7 +61,7 @@
 				// style.borderColor = this.value ? 'rgba(0, 0, 0, 0)' : 'rgba(0, 0, 0, 0.12)'
 				// 如果自定义了“非激活”演示，name边框颜色设置为透明(跟非激活颜色一致)
 				// 这里不能简单的设置为非激活的颜色，否则打开状态时，会有边框，所以需要透明
-				if(this.customInactiveColor) {
+				if (this.customInactiveColor) {
 					style.borderColor = 'rgba(0, 0, 0, 0)'
 				}
 				style.backgroundColor = this.isActive ? this.activeColor : this.inactiveColor
@@ -110,9 +93,24 @@
 		},
 		methods: {
 			clickHandler() {
+				if (this.disabled) {
+					uni.showModal({
+						title: "提示",
+						showCancel: false,
+						confirmColor: '#F7790C',
+						content: '同一时间有且只有一种价格显示哦',
+						success: (res) => {
+							if (res.confirm) {
+
+							}
+						}
+					})
+					return
+				}
+
 				if (!this.disabled && !this.loading) {
 					const oldValue = this.isActive ? this.inactiveValue : this.activeValue
-					if(!this.asyncChange) {
+					if (!this.asyncChange) {
 						this.$emit('input', oldValue)
 					}
 					// 放到下一个生命周期，因为双向绑定的value修改父组件状态需要时间，且是异步的
@@ -171,7 +169,8 @@
 		}
 
 		&--disabled {
-			opacity: 0.6;
+			// opacity: 0.6;
+			opacity: 1;
 		}
 	}
-</style>
+</style>

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

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

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

@@ -1,157 +0,0 @@
-{
-  "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

@@ -1,3 +0,0 @@
-@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

@@ -1,10 +0,0 @@
-(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

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

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

@@ -1 +0,0 @@
-<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

@@ -1 +0,0 @@
-.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

@@ -1,10 +0,0 @@
-(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

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

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

@@ -1 +0,0 @@
-<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

@@ -1 +0,0 @@
-.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

@@ -1,10 +0,0 @@
-(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

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

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

@@ -1 +0,0 @@
-<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

@@ -1 +0,0 @@
-.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

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

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

@@ -1 +0,0 @@
-<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

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

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

@@ -1,7 +0,0 @@
-{
-  "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

@@ -1,8 +0,0 @@
-{
-  "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

@@ -1,11 +0,0 @@
-{
-  "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

@@ -1,12 +0,0 @@
-{
-  "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

@@ -1,9 +0,0 @@
-{
-  "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

@@ -1,7 +0,0 @@
-{
-  "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

@@ -1 +0,0 @@
-<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

@@ -1 +0,0 @@
-.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

@@ -1,8 +0,0 @@
-{
-  "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

@@ -1,11 +0,0 @@
-{
-  "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

@@ -1,11 +0,0 @@
-{
-  "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

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

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

@@ -1 +0,0 @@
-<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

@@ -1,7 +0,0 @@
-{
-  "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

@@ -1 +0,0 @@
-(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"]]]);