分包前提交

pages.json

@@ -134,6 +134,83 @@
 				"navigationBarTitleText": "智能控制系统",
 				"navigationBarTextStyle": "white"
 			}
+		},
+		{
+			"path": "pages/my/collect/index",
+			"style": {
+				"navigationBarTitleText": "收藏",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/mall/pickKeting/index",
+			"style": {
+				"navigationBarTitleText": "挑选客厅灯",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/index/productLead/index",
+			"style": {
+				"navigationBarTitleText": "产品指南",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/index/customNoMain/index",
+			"style": {
+				"navigationBarTitleText": "定制我家的无主灯",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/index/detail/index",
+			"style": {
+				"navigationBarTitleText": "详情",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/index/customMian/index",
+			"style": {
+				"navigationBarTitleText": "定制我家的主灯",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/index/customMian_step2/index",
+			"style": {
+				"navigationBarTitleText": "定制我家的无主灯",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/index/customNoMian_step1/index",
+			"style": {
+				"navigationBarTitleText": "无主灯-通选套餐",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/index/customMian_step1/index",
+			"style": {
+				"navigationBarTitleText": "主灯-通选套餐",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/mall/detail/index",
+			"style": {
+				"navigationBarTitleText": "商品详情",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/my/actGoodsDetail/index",
+			"style": {
+				"navigationBarTitleText": "活动商品详情",
+				"navigationBarTextStyle": "white"
+			}
 		}
 
 	],

pages/index/aiControlSys/index.scss

@@ -32,6 +32,12 @@
 			top: 0;
 			z-index: 0;
 		}
+		.water1{
+			position: absolute;
+			top: 0;
+			z-index: 0;
+			height: 56rpx;
+		}
 		.main{
 			height: 100%;
 			display: flex;
@@ -42,7 +48,7 @@
 			image{
 				position: absolute;
 				z-index: 2;
-				left: 35%;
+				left: 38%;
 			}
 		}
 	}
@@ -52,6 +58,9 @@
 		font-weight: bold;
 		color: #333333;
 		margin-top: 44rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
 	}
 	
 	.parms{

pages/index/aiControlSys/index.vue

@@ -6,81 +6,109 @@
 
 		<view class="content">
 			<view class="topBox">
-				<view class="water">
-					CUSTOMIZED LIGHTING
-				</view>
+				<image src="/static/index/water.png" mode="" class="water1"></image>
 				<view class="main">
-					<image src="/static/my/dh.png" mode="" style="width: 56rpx;height: 56rpx;"></image>
+					<image src="/static/index/halfCircle_275.png" mode="" style="width: 56rpx;height: 56rpx;"></image>
 					<text style="z-index: 3;position: relative;">系统类别</text>
 				</view>
 			</view>
 
-			<view class="label">
-				户型
+			<view class="label" @click="handleOpenOrClose(1)">
+				<view class="txt">
+					户型
+				</view>
+				<image :src="addOrLessIcon1" mode="" class="" :style="{height:addOrLessIcon1=='/static/index/shortLine.png'
+					?'2rpx':'22rpx'}" style="width: 22rpx;margin-right: 56rpx;">
+				</image>
 			</view>
 
 			<view class="parms">
-				<view @click="currHouseIndex=index" class="item " :class="[currHouseIndex==index?'act':'']"
+				<view v-if="show1" @click="currHouseIndex=index" class="item " :class="[currHouseIndex==index?'act':'']"
 					v-for="(item,index) in houseTypeList">
 					{{item}}
 				</view>
 			</view>
 
 
-			<view class="label">
-				生态-品牌
+			<view class="label" @click="handleOpenOrClose(2)">
+				<view class="txt">
+					生态-品牌
+				</view>
+				<image :src="addOrLessIcon2" mode="" class="" :style="{height:addOrLessIcon2=='/static/index/shortLine.png'
+					?'2rpx':'22rpx'}" style="width: 22rpx;margin-right: 56rpx;">
+				</image>
 			</view>
 
 			<view class="parms">
-				<view @click="currHouseIndex1=index" class="item " :class="[currHouseIndex1==index?'act':'']"
-					v-for="(item,index) in brandTypeList">
+				<view v-if="show2" @click="currHouseIndex1=index" class="item "
+					:class="[currHouseIndex1==index?'act':'']" v-for="(item,index) in brandTypeList">
 					{{item}}
 				</view>
 			</view>
 
-			<view class="label">
-				智能锁
+			<view class="label" @click="handleOpenOrClose(3)">
+				<view class="txt">
+					智能锁
+				</view>
+				<image :src="addOrLessIcon3" mode="" class="" :style="{height:addOrLessIcon3=='/static/index/shortLine.png'
+					?'2rpx':'22rpx'}" style="width: 22rpx;margin-right: 56rpx;">
+				</image>
 			</view>
 
 			<view class="parms">
-				<view @click="currHouseIndex2=index" class="item " :class="[currHouseIndex2==index?'act':'']"
-					v-for="(item,index) in lockTypeList">
+				<view v-if="show3" @click="currHouseIndex2=index" class="item "
+					:class="[currHouseIndex2==index?'act':'']" v-for="(item,index) in lockTypeList">
 					{{item}}
 				</view>
 			</view>
 
 
-			<view class="label">
-				智能面板
+			<view class="label" @click="handleOpenOrClose(4)">
+				<view class="txt">
+					智能面板
+				</view>
+				<image :src="addOrLessIcon4" mode="" class="" :style="{height:addOrLessIcon4=='/static/index/shortLine.png'
+					?'2rpx':'22rpx'}" style="width: 22rpx;margin-right: 56rpx;">
+				</image>
 			</view>
 
 			<view class="parms">
-				<view @click="currHouseIndex3=index" class="item " :class="[currHouseIndex3==index?'act':'']"
-					v-for="(item,index) in pannelTypeList">
+				<view v-if="show4" @click="currHouseIndex3=index" class="item "
+					:class="[currHouseIndex3==index?'act':'']" v-for="(item,index) in pannelTypeList">
 					{{item}}
 				</view>
 			</view>
 
 
-			<view class="label">
-				智能窗帘
+			<view class="label" @click="handleOpenOrClose(5)">
+				<view class="txt">
+					智能窗帘
+				</view>
+				<image :src="addOrLessIcon5" mode="" class="" :style="{height:addOrLessIcon5=='/static/index/shortLine.png'
+					?'2rpx':'22rpx'}" style="width: 22rpx;margin-right: 56rpx;">
+				</image>
 			</view>
 
 			<view class="parms">
-				<view @click="currHouseIndex4=index" class="item " :class="[currHouseIndex4==index?'act':'']"
-					v-for="(item,index) in chuanglianTypeList">
+				<view v-if="show5" @click="currHouseIndex4=index" class="item "
+					:class="[currHouseIndex4==index?'act':'']" v-for="(item,index) in chuanglianTypeList">
 					{{item}}
 				</view>
 			</view>
 
 
-			<view class="label">
-				智能窗帘
+			<view class="label" @click="handleOpenOrClose(6)">
+				<view class="txt">
+					智能空调
+				</view>
+				<image :src="addOrLessIcon6" mode="" class="" :style="{height:addOrLessIcon6=='/static/index/shortLine.png'
+					?'2rpx':'22rpx'}" style="width: 22rpx;margin-right: 56rpx;">
+				</image>
 			</view>
 
 			<view class="parms">
-				<view @click="currHouseIndex5=index" class="item " :class="[currHouseIndex5==index?'act':'']"
-					v-for="(item,index) in ktTypeList">
+				<view v-if="show6" @click="currHouseIndex5=index" class="item "
+					:class="[currHouseIndex5==index?'act':'']" v-for="(item,index) in ktTypeList">
 					{{item}}
 				</view>
 
@@ -89,7 +117,7 @@
 		</view>
 
 		<view class="rule">
-			<image src="/static/my/bj.png" mode=""></image>
+			<image src="/static/index/ruleImg.png" mode=""></image>
 			<view class="txt">
 				挑选规则
 			</view>
@@ -99,7 +127,7 @@
 				<view class="price">
 					￥2099，9900
 				</view>
-				<image src="/static/my/bj.png" mode=""></image>
+				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
 			<view class="right" @click="showConfig=true">
 				预览配置
@@ -150,6 +178,22 @@
 		},
 		data() {
 			return {
+				addOrLessIcon1: '/static/index/add.png',
+				addOrLessIcon2: '/static/index/add.png',
+				addOrLessIcon3: '/static/index/add.png',
+				addOrLessIcon4: '/static/index/add.png',
+				addOrLessIcon5: '/static/index/add.png',
+				addOrLessIcon6: '/static/index/add.png',
+				// lessIcon: require('/static/index/shortLine.png'),
+
+				show1: false,
+				show2: false,
+				show3: false,
+				show4: false,
+				show5: false,
+				show6: false,
+
+
 				showConfig: false,
 
 				currHouseIndex: 0,
@@ -190,7 +234,15 @@
 		},
 		onLoad(options) {},
 		methods: {
-
+			handleOpenOrClose(i) {
+				if (this['addOrLessIcon' + i] == '/static/index/shortLine.png') {
+					this['addOrLessIcon' + i] = '/static/index/add.png'
+					this['show' + i] = false
+				} else if (this['addOrLessIcon' + i] == '/static/index/add.png') {
+					this['addOrLessIcon' + i] = '/static/index/shortLine.png'
+					this['show' + i] = true
+				}
+			},
 		}
 	}
 </script>

pages/index/customMian/index.scss

@@ -0,0 +1,299 @@
+.page{
+	padding-bottom: 208rpx;
+}
+.topImg{
+	width: 100%;
+	height: 1124rpx;
+	border-radius: 0 0rpx 0 40rpx;
+	margin-bottom: 60rpx;
+}
+
+.cen{
+	position: relative;
+	padding-left: 40rpx;
+	font-size: 36rpx;
+	font-family: PingFang-SC-Bold, PingFang-SC;
+	font-weight: bold;
+	color: #333333;
+	.water{
+		width: 714rpx;
+		height: 50rpx;
+		position: absolute;
+		top: -24rpx;
+		left: 0;
+	}
+	.halfC{
+		width: 52rpx;
+		height: 56rpx;
+		position: absolute;
+		top: -18rpx;
+		left:16rpx;
+	}
+}
+.parmasBox{
+	padding: 0 32rpx;
+	.con{
+		// height: 776rpx;
+		background: #FFFFFF;
+		border-radius: 0rpx 24rpx 0rpx 24rpx;
+		border: 2rpx solid #E2E2E2;
+		margin-top: 48rpx;
+		padding: 48rpx 24rpx;
+		.top{
+			padding-bottom: 48rpx;
+			border-bottom: 2rpx solid #EAEAEA;
+			.item{
+				display: flex;
+				justify-content: space-between;
+				margin-bottom: 52rpx;
+				.name{
+					font-size: 28rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #666666;
+				}
+					
+				.des{
+					font-size: 32rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #333333;
+				}
+			}
+			.item:last-child{
+				margin-bottom: 0rpx;
+				// border-bottom: 2rpx solid #EAEAEA;
+			}
+		}
+		
+		.type{
+			.top2{
+				font-size: 32rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+				display: flex;
+				justify-content: space-between;
+				margin-top: 24rpx;
+				margin-bottom: 24rpx;
+				.label{
+					padding-left: 5rpx;
+				}
+				.num{
+					
+				}
+			}
+			
+			.list{
+				display: flex;
+				flex-wrap: wrap;
+				.item{
+					margin-right: 32rpx;
+					// margin-bottom: 14rpx;
+					image{
+						width: 128rpx;
+						height: 128rpx;
+					}
+					.name{
+						font-size: 28rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #333333;
+						width: 128rpx;
+						word-break: break-all;
+						word-wrap: break-word;
+						text-align: center;
+						margin-top: 14rpx;
+					}
+					.num{
+						
+					}
+				}
+				.item:nth-of-type(4n){
+					margin-right: 0;
+				}
+			}
+		}
+	}
+}
+
+.part2{
+	font-size: 36rpx;
+	font-family: PingFang-SC-Bold, PingFang-SC;
+	font-weight: bold;
+	color: #333333;
+	margin-top: 48rpx;
+}
+
+.btnBox{
+	height: 160rpx;
+	background: #FFFFFF;
+	box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.16);
+	
+	position: fixed;
+	bottom: 0;
+	width: calc(100% - 64rpx);
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 0 32rpx;
+	.lBtn{
+		width: 330rpx;
+		height: 96rpx;
+		border-radius: 4rpx;
+		border: 2rpx solid #333333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #333333;
+	}
+	.rBtn{
+		width: 330rpx;
+		height: 96rpx;
+		background: #333333;
+		border-radius: 4rpx;
+		border: 2rpx solid #333333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+}
+
+.bot{
+	height: 160rpx;
+	background: #FFFFFF;
+	box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.16);
+	position: fixed;
+	width: 100%;
+	bottom: 0;
+	
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	
+	padding: 0 40rpx;
+	.left{
+		display: flex;
+		align-items: center;
+		.price{
+			font-size: 42rpx;
+			font-family: DINAlternate-Bold, DINAlternate;
+			font-weight: bold;
+			color: #333333;
+		}
+		image{
+			width: 23rpx;
+			height: 12rpx;
+			margin-left: 16rpx;
+		}
+	}
+	.right{
+		width: 282rpx;
+		height: 96rpx;
+		background: #FFFFFF;
+		border-radius: 4rpx;
+		border: 2rpx solid #333333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		font-size: 32rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #333333;
+		margin-right: 96rpx;
+	}
+	
+}
+.rule_img{
+	position: fixed;
+	width: 128rpx;
+	height: 128rpx;
+	right: 18rpx;
+	bottom: 188rpx;
+}
+.rule{
+			position: fixed;
+			width: 96rpx;
+			height: 96rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 4rpx 24rpx -8rpx rgba(0,0,0,0.28);
+			border: 2rpx solid #FFFFFF;
+			right: 36rpx;
+			bottom: 216rpx;
+			border-radius: 50%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			image{
+				width: 32rpx;
+				height: 32rpx;
+				margin-bottom: 8rpx;
+			}
+			.txt{
+				font-size: 16rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+			}
+		}
+
+
+.topBar{
+			height: 112rpx;
+			background: #F9F9F9;
+			border-radius: 24rpx 24rpx 0rpx 0rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.left{
+				width: 10%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				height: 100%;
+			}
+			
+			.cen{
+				font-size: 32rpx;
+				font-family: PingFang-SC-Bold, PingFang-SC;
+				font-weight: bold;
+				color: #333333;
+			}
+			
+			.close{
+				width: 24rpx;
+				height: 24rpx;
+				color: #666666;
+				width: 10%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			height: 100%;
+			}
+		}
+		
+		.pupopCon{
+			padding: 48rpx 32rpx;
+			.item{
+				height: 184rpx;
+				.label{
+					font-size: 32rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #333333;
+					display: flex;
+					align-items: center;
+					margin-bottom: 24rpx;
+				}
+			}
+			
+		}	

pages/index/customMian/index.vue

@@ -0,0 +1,211 @@
+<template>
+	<view class="page">
+		<navBar title="定制我家的主灯" :back="true" color="black" background="white" />
+		<image class="topImg" src="/static/index/main.png" mode=""></image>
+
+		<view class="cen">
+			<image class="water" src="/static/index/water.png" mode=""></image>
+			<image class="halfC" src="/static/index/halfCircle_275.png" mode=""></image>
+			定制我家的主灯
+		</view>
+
+		<view class="parmasBox">
+			<view class="con">
+				<view class="top">
+					<view class="item" v-for="i in 2">
+						<view class="name">
+							户型
+						</view>
+						<view class="des">
+							一室两厅
+						</view>
+					</view>
+				</view>
+
+				<view class="part2">
+					包含灯型
+				</view>
+				<view class="type">
+					<view class="top2">
+						<view class="label">
+							客厅灯
+						</view>
+						<view class="num">
+							3盏
+						</view>
+					</view>
+					<view class="list">
+						<view class="item" v-for="i in 3">
+							<image src="/static/index/img1.png" mode=""></image>
+							<view class="name">
+								BNL12934
+							</view>
+							<!-- <view class="num">
+							</view> -->
+						</view>
+					</view>
+				</view>
+
+				<view class="type">
+					<view class="top2">
+						<view class="label">
+							餐厅灯
+						</view>
+						<view class="num">
+							3盏
+						</view>
+					</view>
+					<view class="list">
+						<view class="item" v-for="i in 1">
+							<image src="/static/index/img1.png" mode=""></image>
+							<view class="name">
+								BNL12934
+							</view>
+							<!-- <view class="num">
+							</view> -->
+						</view>
+					</view>
+				</view>
+
+				<view class="type">
+					<view class="top2">
+						<view class="label">
+							餐厅灯
+						</view>
+						<view class="num">
+							3盏
+						</view>
+					</view>
+					<view class="list">
+						<view class="item" v-for="i in 2">
+							<image src="/static/index/img1.png" mode=""></image>
+							<view class="name">
+								BNL12934
+							</view>
+							<!-- <view class="num">
+							</view> -->
+						</view>
+					</view>
+				</view>
+
+				<view class="type">
+					<view class="top2">
+						<view class="label">
+							餐厅灯
+						</view>
+						<view class="num">
+							3盏
+						</view>
+					</view>
+					<view class="list">
+						<view class="item" v-for="i in 1">
+							<image src="/static/index/img1.png" mode=""></image>
+							<view class="name">
+								BNL12934
+							</view>
+							<!-- <view class="num">
+							</view> -->
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<image src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
+		<!-- <view class="rule">
+			<image src="/static/my/bj.png" mode=""></image>
+			<view class="txt">
+				返回
+			</view>
+		</view> -->
+		<view class="bot">
+			<view class="left">
+				<view class="price">
+					￥2099，9900
+				</view>
+				<image src="/static/my/bj.png" mode=""></image>
+			</view>
+			<view class="right" @click="showFixInfo=true">
+				确认配置
+			</view>
+		</view>
+
+		<!-- <view class="btnBox">
+			<view class="lBtn">
+				重新选择
+			</view>
+			<view class="rBtn">
+				选中
+			</view>
+		</view> -->
+
+
+		<u-popup :show="showFixInfo" @close="close" @open="open" round='10'>
+			<view class="topBar" style="">
+				<view class="left">
+
+				</view>
+				<view class="cen">
+					信息填写
+				</view>
+				<view class="close" @click="showFixInfo=false">
+					<u-icon name="close"></u-icon>
+				</view>
+			</view>
+			<view class="pupopCon">
+				<view class="item">
+					<view class="label">
+						收货人
+					</view>
+					<u--input clearable placeholder="请输入收货人" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<view class="item">
+					<view class="label">
+						电话
+					</view>
+					<u--input clearable placeholder="请输入电话" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<view class="item" style="margin-bottom: 24rpx;height: auto;">
+					<view class="label">
+						收货地址
+					</view>
+					<!-- <u--input clearable placeholder="请输入收货地址" border="surround" v-model="value"
+						@change="change"></u--input> -->
+					<u--textarea v-model="value1" placeholder="请输入收货地址"></u--textarea>
+				</view>
+
+				<view class="item" style="margin-bottom: 24rpx;">
+					<view class="label">
+						备注
+					</view>
+					<u--input clearable placeholder="请输入备注" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<u-button text="一键下单" color="#333" @click="showFixInfo=false"></u-button>
+			</view>
+		</u-popup>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				showFixInfo: false
+			}
+		},
+		onLoad(options) {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/index/customMian_step1/index.scss

@@ -0,0 +1,389 @@
+.page{
+	overflow-y: scroll;
+	padding-bottom: 240rpx;
+}
+.topBg{
+	width: 100vw;
+	height: 800rpx;
+	position: relative;
+	z-index: 0;
+}
+.content{
+	// height: calc(100vh - 800rpx - 160rpx - 20rpx);
+	padding: 0 36rpx;
+	
+	.topBox{
+		width: 678rpx;
+		height: 120rpx;
+		background: #fff;
+		box-shadow: 0rpx 12rpx 56rpx -4rpx rgba(220,212,205,0.5);
+		border-radius: 24rpx 24rpx 24rpx 4rpx;
+		margin-top: -60rpx;
+		margin-left: 50%;
+		transform: translateX(-50%);
+		z-index: 1;
+		position: relative;
+		.water{
+			font-size: 56rpx;
+			font-family: Arial-BoldMT, Arial;
+			font-weight: normal;
+			color: #eee;
+			position: absolute;
+			top: 0;
+			z-index: 0;
+		}
+		.water1{
+			position: absolute;
+			top: 0;
+			z-index: 0;
+			height: 56rpx;
+		}
+		.main{
+			height: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			position: relative;
+			z-index: 1;
+			image{
+				position: absolute;
+				z-index: 2;
+				left: 28%;
+			}
+		}
+	}
+	.label{
+		font-size: 36rpx;
+		font-family: PingFang-SC-Bold, PingFang-SC;
+		font-weight: bold;
+		color: #333333;
+		margin-top: 44rpx;
+		
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		.txt{
+			
+		}
+	}
+	
+	.parms{
+		display: flex;
+		flex-wrap: wrap;
+		padding-top: 32rpx;
+		
+		border-bottom: 1rpx solid #EAEAEA;
+		padding-bottom: 46rpx;
+		position: relative;
+		
+		
+		.item{
+			width: 325rpx;
+			height: 96rpx;
+			border-radius: 4rpx;
+			border: 1rpx solid #999;
+			margin-right: 18rpx;
+			margin-bottom: 18rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 32rpx;
+			font-family: PingFang-SC-Medium, PingFang-SC;
+			font-weight: 500;
+			color: #999999;
+		}
+		.item:nth-of-type(2n){
+			margin-right: 0!important;
+		}
+		.act{
+			color:#333333 ;
+			border: 1rpx solid #333333;
+			}
+	}
+}
+
+.bot{
+	height: 160rpx;
+	background: #FFFFFF;
+	box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.16);
+	position: fixed;
+	width: 100%;
+	bottom: 0;
+	
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	
+	padding: 0 40rpx;
+	.left{
+		display: flex;
+		align-items: center;
+		.price{
+			font-size: 42rpx;
+			font-family: DINAlternate-Bold, DINAlternate;
+			font-weight: bold;
+			color: #333333;
+		}
+		image{
+			width: 23rpx;
+			height: 12rpx;
+			margin-left: 16rpx;
+		}
+	}
+	.right{
+		width: 282rpx;
+		height: 96rpx;
+		background: #FFFFFF;
+		border-radius: 4rpx;
+		border: 2rpx solid #333333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		font-size: 32rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #333333;
+		margin-right: 96rpx;
+	}
+	
+}
+
+.rule{
+			position: fixed;
+			width: 96rpx;
+			height: 96rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 4rpx 24rpx -8rpx rgba(0,0,0,0.28);
+			border: 2rpx solid #FFFFFF;
+			right: 36rpx;
+			bottom: 216rpx;
+			border-radius: 50%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			image{
+				width: 32rpx;
+				height: 32rpx;
+				margin-bottom: 8rpx;
+			}
+			.txt{
+				font-size: 16rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+			}
+		}
+		
+		
+		
+		.topBar{
+				height: 112rpx;
+				background: #F9F9F9;
+				border-radius: 24rpx 24rpx 0rpx 0rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				.left{
+					width: 10%;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					height: 100%;
+				}
+				
+				.cen{
+					font-size: 32rpx;
+					font-family: PingFang-SC-Bold, PingFang-SC;
+					font-weight: bold;
+					color: #333333;
+				}
+				
+				.close{
+					width: 24rpx;
+					height: 24rpx;
+					color: #666666;
+					width: 10%;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+				height: 100%;
+				}
+			}
+			
+		.pupopCon{
+			padding: 48rpx 32rpx;
+			.item{
+				margin-bottom: 40rpx;
+				.top{
+					display: flex;
+					justify-content: space-between;
+					.name{
+						font-size: 32rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #666666;
+					}
+					.info{
+						font-size: 32rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #333333;
+					}
+				}
+				.bottom{
+					display: flex;
+					justify-content: space-between;
+					padding-left: 24rpx;
+					.name{
+						font-size: 32rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #666666;
+					}
+					.info{
+						font-size: 32rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #333333;
+					}
+				}
+			}
+			
+		}	
+		
+		.aginInvite{
+			// width: 168rpx;
+			
+			height: 52rpx;
+			background: #FFFFFF;
+			border-radius: 4rpx;
+			border: 1rpx solid #333333;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			padding: 0 24rpx;
+		}
+		
+		
+		.sel{
+			position: relative;
+			image{
+				position: absolute;
+				right: 24rpx;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+		}
+		
+		
+		.parms2{
+			display: flex;
+			justify-content: space-between;
+			flex-wrap: wrap;
+			.itemLast{
+				background: red;
+				width: 150rpx;
+				height: 88rpx;
+				background: #333333;
+				border-radius: 4rpx;
+				border: 2rpx solid #333333;
+				font-size: 32rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #FFFFFF;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				text-align: center;
+				margin-bottom: 16rpx;
+			}
+		}
+		
+		
+		
+		.parms3{
+			display: flex;
+			flex-wrap: wrap;
+			border-bottom: 2rpx solid #EAEAEA;
+			padding-bottom: 46rpx;
+			.item3{
+				width: 152rpx;
+				height: 152rpx;
+				background: #FFFFFF;
+				border-radius: 4rpx;
+				border: 2rpx solid #EAEAEA;
+				margin-right: 18rpx;
+				margin-bottom: 18rpx;
+			}
+			.item3:nth-of-type(4n){
+				margin-right: 0;
+			}
+			.act3{
+				border-radius: 4rpx;
+				border: 2rpx solid #515151;
+			}
+		}
+		
+		.tipContent{
+			padding: 0 24rpx;
+			width: 100%;
+			margin-top: 38rpx;
+			.card{
+				padding: 0 20rpx;
+				height: 186rpx;
+				background: #F6F6F6;
+				border-radius: 8rpx;
+				padding-top: 34rpx;
+				display: flex;
+				flex-direction: column;
+				.item{
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					margin-bottom: 36rpx;
+					.left{
+						font-size: 32rpx;
+						font-family: PingFang-SC-Bold, PingFang-SC;
+						font-weight: bold;
+						color: #333333;
+					}
+					.right{
+						font-size: 36rpx;
+						font-family: PingFangSC-Semibold, PingFang SC;
+						font-weight: 600;
+						color: #333333;
+					}
+				}
+				.item:last-child{
+					margin-bottom: 0;
+				}
+			}
+			.tip{
+				display: flex;
+				align-items: center;
+				margin-top: 32rpx;
+				margin-bottom: 48rpx;
+				font-size: 28rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #999999;
+				image{
+					width: 28rpx;
+					height: 28rpx;
+					margin-right: 8rpx;
+				}
+			}
+		}
+		.tip2{
+			font-size: 32rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #606266;
+			height: 96rpx;
+			margin-top: 46rpx;
+		}
+		::v-deep .u-modal__content{
+			padding: 0 !important;
+		}

pages/index/customMian_step1/index.vue

@@ -0,0 +1,355 @@
+<template>
+	<view class="page">
+		<navBar title="定制我家的主灯" :back="true" color="black" background="white" />
+
+		<image src="/static/index/img1.png" mode="" class="topBg"></image>
+
+		<view class="content">
+			<view class="topBox">
+				<image src="/static/index/water.png" mode="" class="water1"></image>
+				<view class="main">
+					<image src="/static/index/halfCircle_275.png" mode="" style="width: 56rpx;height: 56rpx;"></image>
+					<text style="z-index: 3;position: relative;">定制我家的主灯</text>
+				</view>
+			</view>
+
+			<view class="label" @click="handleOpenOrClose(1)">
+				<view class="txt">
+					户型
+				</view>
+				<image :src="addOrLessIcon1" mode="" class="" :style="{height:addOrLessIcon1=='/static/index/shortLine.png'
+					?'2rpx':'22rpx'}" style="width: 22rpx;margin-right: 56rpx;">
+				</image>
+			</view>
+
+			<view class="parms">
+				<view v-if="show1" @click="handleSelHuxing(index)" class="item "
+					:class="[currHouseIndex==index?'act':'']" v-for="(item,index) in houseTypeList">
+					{{item}}
+				</view>
+			</view>
+
+			<view class="label" @click="handleOpenOrClose(2)">
+				<view class="txt">
+					系列
+				</view>
+				<image :src="addOrLessIcon2" mode="" class="" :style="{height:addOrLessIcon2=='/static/index/shortLine.png'
+					?'2rpx':'22rpx'}" style="width: 22rpx;margin-right: 56rpx;">
+				</image>
+			</view>
+
+			<view class="parms">
+				<view v-if="show2" @click="currHouseIndex5=index" class="item "
+					:class="[currHouseIndex5==index?'act':'']" v-for="(item,index) in serTypeList">
+					{{item}}
+				</view>
+			</view>
+
+			<view class="label" style="margin-bottom:32rpx;">
+				<view class="txt">
+					挑选客厅灯
+				</view>
+				<image src="/static/index/more.png" mode="" class="" style="width: 44rpx;height: 44rpx;">
+				</image>
+			</view>
+
+			<view class="parms3">
+				<image @click="handleSelKeting(item,i)" class="item3 " src="/static/index/img1.png"
+					:class="[currHouseIndex3==i?'act3':'']" v-for="i in 5">
+
+				</image>
+			</view>
+
+			<view class="label" style="margin-bottom:32rpx;">
+				<view class="txt">
+					挑选餐厅灯
+				</view>
+				<image src="/static/index/more.png" mode="" class="" style="width: 44rpx;height: 44rpx;">
+				</image>
+			</view>
+
+			<view class="parms3">
+				<image @click="currHouseIndex2=i" class="item3 " src="/static/index/img1.png"
+					:class="[currHouseIndex2==i?'act3':'']" v-for="i in 5">
+
+				</image>
+			</view>
+
+			<view class="label" style="margin-bottom:32rpx;">
+				<view class="txt">
+					挑选卧室灯
+				</view>
+				<image src="/static/index/more.png" mode="" class="" style="width: 44rpx;height: 44rpx;">
+				</image>
+			</view>
+
+			<view class="parms3">
+				<image @click="currHouseIndex4=i" class="item3 " src="/static/index/img1.png"
+					:class="[currHouseIndex4==i?'act3':'']" v-for="i in 5">
+
+				</image>
+			</view>
+
+			<view class="label" style="margin-bottom:32rpx;">
+				<view class="txt">
+					挑选阳台灯
+				</view>
+				<image src="/static/index/more.png" mode="" class="" style="width: 44rpx;height: 44rpx;">
+				</image>
+			</view>
+
+			<view class="parms3">
+				<image @click="currHouseIndex6=i" class="item3 " src="/static/index/img1.png"
+					:class="[currHouseIndex6==i?'act3':'']" v-for="i in 5">
+
+				</image>
+			</view>
+
+
+
+		</view>
+
+		<view class="rule">
+			<image src="/static/index/ruleImg.png" mode=""></image>
+			<view class="txt">
+				挑选规则
+			</view>
+		</view>
+		<view class="bot">
+			<view class="left">
+				<view class="price">
+					￥2099，9900
+				</view>
+				<image src="/static/index/arrDown.png" mode=""></image>
+			</view>
+			<view class="right" @click="previewConfig">
+				预览配置
+			</view>
+		</view>
+
+
+		<u-popup :show="showConfig" @close="close" @open="open" round='10'>
+			<view class="topBar" style="">
+				<view class="left">
+
+				</view>
+				<view class="cen">
+					清单
+				</view>
+				<view class="close" @click="showConfig=false">
+					<u-icon name="close"></u-icon>
+				</view>
+			</view>
+			<view class="pupopCon">
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							户型
+						</view>
+						<view class="info">
+							一室两厅
+						</view>
+					</view>
+					<!-- <view class="bottom" v-for="i in 3">
+						<view class="name">
+							智能锁
+						</view>
+						<view class="info">
+							1
+						</view>
+					</view> -->
+				</view>
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							系列
+						</view>
+						<view class="info">
+							3系
+						</view>
+					</view>
+				</view>
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							客厅灯
+						</view>
+						<view class="info">
+							1
+						</view>
+					</view>
+				</view>
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							餐厅灯
+						</view>
+						<view class="info">
+							1
+						</view>
+					</view>
+				</view>
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							卧室灯
+						</view>
+						<view class="info">
+							2
+						</view>
+					</view>
+				</view>
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							阳台灯
+						</view>
+						<view class="info">
+							1
+						</view>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+
+		<u-modal :show="showHuxing" @confirm="showHuxing=false" title="户型" :content='content' confirmColor="#F7790C">
+			<view class="tipContent">
+				<view class="card">
+					<view class="item">
+						<view class="left">
+							主灯全套定制
+						</view>
+						<view class="right">
+							￥2781.28
+						</view>
+					</view>
+
+					<view class="item">
+						<view class="left" style="font-weight: normal;">
+							灯具
+						</view>
+						<view class="right">
+							3
+						</view>
+					</view>
+				</view>
+
+				<view class="tip">
+					<image src="/static/index/more.png" mode=""></image>
+					这个套餐为一室两厅，包含3盏灯
+				</view>
+			</view>
+		</u-modal>
+
+		<u-modal :show="showMissItem" title="提示" @confirm="showMissItem=false" content='' confirmColor="#F7790C">
+			<view class="tip2">
+				客厅灯具少选1盏！
+			</view>
+		</u-modal>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				addOrLessIcon1: '/static/index/add.png',
+				addOrLessIcon2: '/static/index/add.png',
+				addOrLessIcon3: '/static/index/add.png',
+				addOrLessIcon4: '/static/index/add.png',
+				addOrLessIcon5: '/static/index/add.png',
+				// lessIcon: require('/static/index/shortLine.png'),
+
+				show1: false,
+				show2: false,
+				show3: false,
+				show4: false,
+				show5: false,
+
+				showConfig: false,
+
+				showHuxing: false,
+
+				showMissItem: false,
+
+				seledKetingItem: null,
+
+				currHouseIndex: 0,
+				currHouseIndex1: 0,
+				currHouseIndex2: 0,
+				currHouseIndex3: 0,
+				currHouseIndex4: 0,
+				currHouseIndex5: 0,
+				currHouseIndex6: 0,
+				houseTypeList: [
+					'一室两厅',
+					'两室两厅',
+					'三室两厅'
+				],
+				brandTypeList: [
+					'品牌1',
+					'品牌2',
+				],
+				lockTypeList: [
+					'全屋',
+					'客餐厅',
+					'主卧室',
+				],
+				pannelTypeList: [
+					'3系',
+					'5系',
+				],
+				chuanglianTypeList: [
+					'标准版',
+					'智能版',
+				],
+				ktTypeList: [
+					'筒灯',
+					'射灯',
+					'线性灯',
+					'磁吸轨道灯',
+				],
+				serTypeList: [
+					'3系',
+					'5系',
+				],
+			}
+		},
+		onLoad(options) {},
+		methods: {
+			handleOpenOrClose(i) {
+				if (this['addOrLessIcon' + i] == '/static/index/shortLine.png') {
+					this['addOrLessIcon' + i] = '/static/index/add.png'
+					this['show' + i] = false
+				} else if (this['addOrLessIcon' + i] == '/static/index/add.png') {
+					this['addOrLessIcon' + i] = '/static/index/shortLine.png'
+					this['show' + i] = true
+				}
+			},
+			handleSelHuxing(index) {
+				this.currHouseIndex = index
+				this.showHuxing = true
+			},
+			handleSelKeting(item, index) {
+				item = '1'
+				this.currHouseIndex3 = index
+				this.seledKetingItem = item
+			},
+			previewConfig() {
+				if (!this.seledKetingItem) {
+					this.showMissItem = true
+					return
+				} else {
+					this.showConfig = true
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/index/customMian_step2/index.scss

@@ -0,0 +1,300 @@
+.page{
+	padding-bottom: 208rpx;
+}
+.topImg{
+	width: 100%;
+	height: 1124rpx;
+	border-radius: 0 0rpx 0 40rpx;
+	margin-bottom: 60rpx;
+}
+
+.cen{
+	position: relative;
+	padding-left: 40rpx;
+	font-size: 36rpx;
+	font-family: PingFang-SC-Bold, PingFang-SC;
+	font-weight: bold;
+	color: #333333;
+	.water{
+		width: 714rpx;
+		height: 50rpx;
+		position: absolute;
+		top: -24rpx;
+		left: 0;
+	}
+	.halfC{
+		width: 52rpx;
+		height: 56rpx;
+		position: absolute;
+		top: -18rpx;
+		left:16rpx;
+	}
+}
+.parmasBox{
+	padding: 0 32rpx;
+	.con{
+		// height: 776rpx;
+		background: #FFFFFF;
+		border-radius: 0rpx 24rpx 0rpx 24rpx;
+		border: 2rpx solid #E2E2E2;
+		margin-top: 48rpx;
+		padding: 48rpx 24rpx;
+		.top{
+			// padding-bottom: 48rpx;
+			// border-bottom: 2rpx solid #EAEAEA;
+			.item{
+				display: flex;
+				justify-content: space-between;
+				margin-bottom: 52rpx;
+				.name{
+					font-size: 28rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #666666;
+				}
+					
+				.des{
+					font-size: 32rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #333333;
+				}
+			}
+			.item:last-child{
+				margin-bottom: 0rpx;
+				// border-bottom: 2rpx solid #EAEAEA;
+			}
+		}
+		
+		.type{
+			.top2{
+				font-size: 32rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+				display: flex;
+				justify-content: space-between;
+				margin-top: 24rpx;
+				margin-bottom: 24rpx;
+				.label{
+					padding-left: 5rpx;
+				}
+				.num{
+					
+				}
+			}
+			
+			.list{
+				display: flex;
+				flex-wrap: wrap;
+				.item{
+					margin-right: 32rpx;
+					// margin-bottom: 14rpx;
+					image{
+						width: 128rpx;
+						height: 128rpx;
+					}
+					.name{
+						font-size: 28rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #333333;
+						width: 128rpx;
+						word-break: break-all;
+						word-wrap: break-word;
+						text-align: center;
+						margin-top: 14rpx;
+					}
+					.num{
+						
+					}
+				}
+				.item:nth-of-type(4n){
+					margin-right: 0;
+				}
+			}
+		}
+	}
+}
+
+.part2{
+	font-size: 36rpx;
+	font-family: PingFang-SC-Bold, PingFang-SC;
+	font-weight: bold;
+	color: #333333;
+	margin-top: 48rpx;
+}
+
+.btnBox{
+	height: 160rpx;
+	background: #FFFFFF;
+	box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.16);
+	
+	position: fixed;
+	bottom: 0;
+	width: calc(100% - 64rpx);
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 0 32rpx;
+	.lBtn{
+		width: 330rpx;
+		height: 96rpx;
+		border-radius: 4rpx;
+		border: 2rpx solid #333333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #333333;
+	}
+	.rBtn{
+		width: 330rpx;
+		height: 96rpx;
+		background: #333333;
+		border-radius: 4rpx;
+		border: 2rpx solid #333333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+}
+
+.bot{
+	height: 160rpx;
+	background: #FFFFFF;
+	box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.16);
+	position: fixed;
+	width: 100%;
+	bottom: 0;
+	
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	
+	padding: 0 40rpx;
+	.left{
+		display: flex;
+		align-items: center;
+		.price{
+			font-size: 42rpx;
+			font-family: DINAlternate-Bold, DINAlternate;
+			font-weight: bold;
+			color: #333333;
+		}
+		image{
+			width: 23rpx;
+			height: 12rpx;
+			margin-left: 16rpx;
+		}
+	}
+	.right{
+		width: 282rpx;
+		height: 96rpx;
+		background: #FFFFFF;
+		border-radius: 4rpx;
+		border: 2rpx solid #333333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		font-size: 32rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #333333;
+		margin-right: 96rpx;
+	}
+	
+}
+.rule_img{
+	position: fixed;
+	width: 128rpx;
+	height: 128rpx;
+	right: 18rpx;
+	bottom: 188rpx;
+}
+
+.rule{
+			position: fixed;
+			width: 96rpx;
+			height: 96rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 4rpx 24rpx -8rpx rgba(0,0,0,0.28);
+			border: 2rpx solid #FFFFFF;
+			right: 36rpx;
+			bottom: 216rpx;
+			border-radius: 50%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			image{
+				width: 32rpx;
+				height: 32rpx;
+				margin-bottom: 8rpx;
+			}
+			.txt{
+				font-size: 16rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+			}
+		}
+
+
+.topBar{
+			height: 112rpx;
+			background: #F9F9F9;
+			border-radius: 24rpx 24rpx 0rpx 0rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.left{
+				width: 10%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				height: 100%;
+			}
+			
+			.cen{
+				font-size: 32rpx;
+				font-family: PingFang-SC-Bold, PingFang-SC;
+				font-weight: bold;
+				color: #333333;
+			}
+			
+			.close{
+				width: 24rpx;
+				height: 24rpx;
+				color: #666666;
+				width: 10%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			height: 100%;
+			}
+		}
+		
+		.pupopCon{
+			padding: 48rpx 32rpx;
+			.item{
+				height: 184rpx;
+				.label{
+					font-size: 32rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #333333;
+					display: flex;
+					align-items: center;
+					margin-bottom: 24rpx;
+				}
+			}
+			
+		}	

pages/index/customMian_step2/index.vue

@@ -0,0 +1,236 @@
+<template>
+	<view class="page">
+		<navBar title="定制我家的无主灯" :back="true" color="black" background="white" />
+		<image class="topImg" src="/static/index/main.png" mode=""></image>
+
+		<view class="cen">
+			<image class="water" src="/static/index/water.png" mode=""></image>
+			<image class="halfC" src="/static/index/halfCircle_275.png" mode=""></image>
+			定制我家的无主灯
+		</view>
+
+		<view class="parmasBox">
+			<view class="con">
+				<view class="top">
+					<view class="item">
+						<view class="name">
+							户型
+						</view>
+						<view class="des">
+							一室两厅
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							空间
+						</view>
+						<view class="des">
+							全屋
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							品牌
+						</view>
+						<view class="des">
+							LANDBOND
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							系列
+						</view>
+						<view class="des">
+							3系
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							版本
+						</view>
+						<view class="des">
+							标准版
+						</view>
+					</view>
+				</view>
+
+				<!-- <view class="part2">
+					包含灯型
+				</view>
+				<view class="type">
+					<view class="top2">
+						<view class="label">
+							客厅灯
+						</view>
+						<view class="num">
+							3盏
+						</view>
+					</view>
+					<view class="list">
+						<view class="item" v-for="i in 3">
+							<image src="/static/index/img1.png" mode=""></image>
+							<view class="name">
+								BNL12934
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="type">
+					<view class="top2">
+						<view class="label">
+							餐厅灯
+						</view>
+						<view class="num">
+							3盏
+						</view>
+					</view>
+					<view class="list">
+						<view class="item" v-for="i in 1">
+							<image src="/static/index/img1.png" mode=""></image>
+							<view class="name">
+								BNL12934
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="type">
+					<view class="top2">
+						<view class="label">
+							餐厅灯
+						</view>
+						<view class="num">
+							3盏
+						</view>
+					</view>
+					<view class="list">
+						<view class="item" v-for="i in 2">
+							<image src="/static/index/img1.png" mode=""></image>
+							<view class="name">
+								BNL12934
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="type">
+					<view class="top2">
+						<view class="label">
+							餐厅灯
+						</view>
+						<view class="num">
+							3盏
+						</view>
+					</view>
+					<view class="list">
+						<view class="item" v-for="i in 1">
+							<image src="/static/index/img1.png" mode=""></image>
+							<view class="name">
+								BNL12934
+							</view>
+						</view>
+					</view>
+				</view> -->
+			</view>
+		</view>
+		<!-- 	<view class="rule">
+			<image src="/static/my/bj.png" mode=""></image>
+			<view class="txt">
+				返回
+			</view>
+		</view> -->
+
+		<image src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
+		<view class="bot">
+			<view class="left">
+				<view class="price">
+					￥2099，9900
+				</view>
+				<image src="/static/my/bj.png" mode=""></image>
+			</view>
+			<view class="right" @click="showFixInfo=true">
+				确认配置
+			</view>
+		</view>
+
+		<!-- <view class="btnBox">
+			<view class="lBtn">
+				重新选择
+			</view>
+			<view class="rBtn">
+				选中
+			</view>
+		</view> -->
+
+
+		<u-popup :show="showFixInfo" @close="close" @open="open" round='10'>
+			<view class="topBar" style="">
+				<view class="left">
+
+				</view>
+				<view class="cen">
+					信息填写
+				</view>
+				<view class="close" @click="showFixInfo=false">
+					<u-icon name="close"></u-icon>
+				</view>
+			</view>
+			<view class="pupopCon">
+				<view class="item">
+					<view class="label">
+						收货人
+					</view>
+					<u--input clearable placeholder="请输入收货人" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<view class="item">
+					<view class="label">
+						电话
+					</view>
+					<u--input clearable placeholder="请输入电话" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<view class="item" style="margin-bottom: 24rpx;height: auto;">
+					<view class="label">
+						收货地址
+					</view>
+					<!-- <u--input clearable placeholder="请输入收货地址" border="surround" v-model="value"
+						@change="change"></u--input> -->
+					<u--textarea v-model="value1" placeholder="请输入收货地址"></u--textarea>
+				</view>
+
+				<view class="item" style="margin-bottom: 24rpx;">
+					<view class="label">
+						备注
+					</view>
+					<u--input clearable placeholder="请输入备注" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<u-button text="确认下单" color="#333" @click="showFixInfo=false"></u-button>
+			</view>
+		</u-popup>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				showFixInfo: false
+			}
+		},
+		onLoad(options) {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/index/customNoMain/index.scss

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

pages/index/customNoMain/index.vue

@@ -0,0 +1,37 @@
+<template>
+	<view class="page">
+		<navBar title="定制我家的无主灯" :back="true" color="black" background="white" />
+
+		<view class="con">
+			<view class="item" v-for="i in 4">
+				<view class="label">
+					<image src="/static/index/part1_icon.png" mode=""></image>
+					灯型A
+				</view>
+				<image src="/static/index/img1.png" mode=""></image>
+			</view>
+		</view>
+		<u-loadmore style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+
+			}
+		},
+		onLoad(options) {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/index/customNoMian_step1/index.scss

@@ -0,0 +1,301 @@
+.page{
+	overflow-y: scroll;
+	padding-bottom: 240rpx;
+}
+.topBg{
+	width: 100vw;
+	height: 800rpx;
+	position: relative;
+	z-index: 0;
+}
+.content{
+	// height: calc(100vh - 800rpx - 160rpx - 20rpx);
+	padding: 0 36rpx;
+	
+	.topBox{
+		width: 678rpx;
+		height: 120rpx;
+		background: #fff;
+		box-shadow: 0rpx 12rpx 56rpx -4rpx rgba(220,212,205,0.5);
+		border-radius: 24rpx 24rpx 24rpx 4rpx;
+		margin-top: -60rpx;
+		margin-left: 50%;
+		transform: translateX(-50%);
+		z-index: 1;
+		position: relative;
+		.water{
+			font-size: 56rpx;
+			font-family: Arial-BoldMT, Arial;
+			font-weight: normal;
+			color: #eee;
+			position: absolute;
+			top: 0;
+			z-index: 0;
+		}
+		.water1{
+			position: absolute;
+			top: 0;
+			z-index: 0;
+			height: 56rpx;
+		}
+		.main{
+			height: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			position: relative;
+			z-index: 1;
+			image{
+				position: absolute;
+				z-index: 2;
+				left: 28%;
+			}
+		}
+	}
+	.label{
+		font-size: 36rpx;
+		font-family: PingFang-SC-Bold, PingFang-SC;
+		font-weight: bold;
+		color: #333333;
+		margin-top: 44rpx;
+		
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		.txt{
+			
+		}
+	}
+	
+	.parms{
+		display: flex;
+		flex-wrap: wrap;
+		padding-top: 32rpx;
+		
+		border-bottom: 1rpx solid #EAEAEA;
+		padding-bottom: 46rpx;
+		position: relative;
+		
+		
+		.item{
+			width: 325rpx;
+			height: 96rpx;
+			border-radius: 4rpx;
+			border: 1rpx solid #999;
+			margin-right: 18rpx;
+			margin-bottom: 18rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 32rpx;
+			font-family: PingFang-SC-Medium, PingFang-SC;
+			font-weight: 500;
+			color: #999999;
+		}
+		.item:nth-of-type(2n){
+			margin-right: 0!important;
+		}
+		.act{
+			color:#333333 ;
+			border: 1rpx solid #333333;
+			}
+	}
+}
+
+.bot{
+	height: 160rpx;
+	background: #FFFFFF;
+	box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.16);
+	position: fixed;
+	width: 100%;
+	bottom: 0;
+	
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	
+	padding: 0 40rpx;
+	.left{
+		display: flex;
+		align-items: center;
+		.price{
+			font-size: 42rpx;
+			font-family: DINAlternate-Bold, DINAlternate;
+			font-weight: bold;
+			color: #333333;
+		}
+		image{
+			width: 23rpx;
+			height: 12rpx;
+			margin-left: 16rpx;
+		}
+	}
+	.right{
+		width: 282rpx;
+		height: 96rpx;
+		background: #FFFFFF;
+		border-radius: 4rpx;
+		border: 2rpx solid #333333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		font-size: 32rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #333333;
+		margin-right: 96rpx;
+	}
+	
+}
+
+.rule{
+			position: fixed;
+			width: 96rpx;
+			height: 96rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 4rpx 24rpx -8rpx rgba(0,0,0,0.28);
+			border: 2rpx solid #FFFFFF;
+			right: 36rpx;
+			bottom: 216rpx;
+			border-radius: 50%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			image{
+				width: 32rpx;
+				height: 32rpx;
+				margin-bottom: 8rpx;
+			}
+			.txt{
+				font-size: 16rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+			}
+		}
+		
+		
+		
+		.topBar{
+				height: 112rpx;
+				background: #F9F9F9;
+				border-radius: 24rpx 24rpx 0rpx 0rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				.left{
+					width: 10%;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					height: 100%;
+				}
+				
+				.cen{
+					font-size: 32rpx;
+					font-family: PingFang-SC-Bold, PingFang-SC;
+					font-weight: bold;
+					color: #333333;
+				}
+				
+				.close{
+					width: 24rpx;
+					height: 24rpx;
+					color: #666666;
+					width: 10%;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+				height: 100%;
+				}
+			}
+			
+		.pupopCon{
+			padding: 48rpx 32rpx;
+			.item{
+				.top{
+					display: flex;
+					justify-content: space-between;
+					.name{
+						font-size: 32rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #666666;
+					}
+					.info{
+						font-size: 32rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #333333;
+					}
+				}
+				.bottom{
+					display: flex;
+					justify-content: space-between;
+					padding-left: 24rpx;
+					.name{
+						font-size: 32rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #666666;
+					}
+					.info{
+						font-size: 32rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #333333;
+					}
+				}
+			}
+			
+		}	
+		
+		.aginInvite{
+			// width: 168rpx;
+			
+			height: 52rpx;
+			background: #FFFFFF;
+			border-radius: 4rpx;
+			border: 1rpx solid #333333;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			padding: 0 24rpx;
+		}
+		
+		
+		.sel{
+			position: relative;
+			image{
+				position: absolute;
+				right: 24rpx;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+		}
+		
+		
+		.parms2{
+			display: flex;
+			justify-content: space-between;
+			flex-wrap: wrap;
+			.itemLast{
+				background: red;
+				width: 150rpx;
+				height: 88rpx;
+				background: #333333;
+				border-radius: 4rpx;
+				border: 2rpx solid #333333;
+				font-size: 32rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #FFFFFF;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				text-align: center;
+				margin-bottom: 16rpx;
+			}
+		}

pages/index/customNoMian_step1/index.vue

@@ -0,0 +1,244 @@
+<template>
+	<view class="page">
+		<navBar title="定制我家的无主灯" :back="true" color="black" background="white" />
+
+		<image src="/static/index/img1.png" mode="" class="topBg"></image>
+
+		<view class="content">
+			<view class="topBox">
+				<!-- <view class="water">
+					CUSTOMIZED LIGHTING
+				</view> -->
+				<image src="/static/index/water.png" mode="" class="water1"></image>
+				<view class="main">
+					<image src="/static/index/halfCircle_275.png" mode="" style="width: 56rpx;height: 56rpx;"></image>
+					<text style="z-index: 3;position: relative;">定制我家的无主灯</text>
+				</view>
+			</view>
+
+			<view class="label" @click="handleOpenOrClose(1)">
+				<view class="txt">
+					户型
+				</view>
+				<image :src="addOrLessIcon1" mode="" class="" style="width: 22rpx;height: 2rpx;margin-right: 56rpx;">
+				</image>
+			</view>
+
+			<view class="parms">
+				<view v-if="show1" @click="currHouseIndex=index" class="item " :class="[currHouseIndex==index?'act':'']"
+					v-for="(item,index) in houseTypeList">
+					{{item}}
+				</view>
+			</view>
+
+
+			<view class="label" @click="handleOpenOrClose(2)">
+				<view class="txt">
+					空间
+				</view>
+				<image :src="addOrLessIcon2" mode="" class="" style="width: 22rpx;height: 2rpx;margin-right: 56rpx;">
+				</image>
+			</view>
+
+			<view class="parms">
+				<view v-if="show2" @click="currHouseIndex1=index" class="item "
+					:class="[currHouseIndex1==index?'act':'']" v-for="(item,index) in lockTypeList">
+					{{item}}
+				</view>
+			</view>
+
+			<view class="label" @click="handleOpenOrClose(3)">
+				<view class="txt">
+					品牌
+				</view>
+				<image :src="addOrLessIcon3" mode="" class="" style="width: 22rpx;height: 2rpx;margin-right: 56rpx;">
+				</image>
+			</view>
+
+			<view class="parms">
+				<view v-if="show3" @click="currHouseIndex2=index" class="item "
+					:class="[currHouseIndex2==index?'act':'']" v-for="(item,index) in brandTypeList">
+					{{item}}
+				</view>
+			</view>
+
+			<view class="label" @click="handleOpenOrClose(4)">
+				<view class="txt">
+					系列
+				</view>
+				<image :src="addOrLessIcon5" mode="" class="" style="width: 22rpx;height: 2rpx;margin-right: 56rpx;">
+				</image>
+			</view>
+
+			<view class="parms">
+				<view v-if="show4" @click="currHouseIndex5=index" class="item "
+					:class="[currHouseIndex5==index?'act':'']" v-for="(item,index) in serTypeList">
+					{{item}}
+				</view>
+			</view>
+
+
+			<view class="label" @click="handleOpenOrClose(5)">
+				<view class="txt">
+					版本
+				</view>
+				<image :src="addOrLessIcon5" mode="" class="" style="width: 22rpx;height: 2rpx;margin-right: 56rpx;">
+				</image>
+			</view>
+
+			<view class="parms">
+				<view v-if="show5" @click="currHouseIndex3=index" class="item "
+					:class="[currHouseIndex3==index?'act':'']" v-for="(item,index) in chuanglianTypeList">
+					{{item}}
+				</view>
+			</view>
+
+
+			<view class="label" style="margin-bottom: 32rpx;">
+				包含灯型
+			</view>
+
+			<view class="parms2">
+				<view @click="currHouseIndex4=index" class="itemLast " :class="[currHouseIndex4==index?'act':'']"
+					v-for="(item,index) in ktTypeList">
+					{{item}}
+				</view>
+			</view>
+
+		</view>
+
+		<view class="rule">
+			<image src="/static/index/ruleImg.png" mode=""></image>
+			<view class="txt">
+				挑选规则
+			</view>
+		</view>
+		<view class="bot">
+			<view class="left">
+				<view class="price">
+					￥2099，9900
+				</view>
+				<image src="/static/index/arrDown.png" mode=""></image>
+			</view>
+			<view class="right" @click="showConfig=true">
+				预览配置
+			</view>
+		</view>
+
+
+		<u-popup :show="showConfig" @close="close" @open="open" round='10'>
+			<view class="topBar" style="">
+				<view class="left">
+
+				</view>
+				<view class="cen">
+					清单
+				</view>
+				<view class="close" @click="showConfig=false">
+					<u-icon name="close"></u-icon>
+				</view>
+			</view>
+			<view class="pupopCon">
+				<view class="item" v-for="i in 3">
+					<view class="top">
+						<view class="name">
+							户型
+						</view>
+						<view class="info">
+							一室两厅
+						</view>
+					</view>
+					<view class="bottom" v-for="i in 3">
+						<view class="name">
+							智能锁
+						</view>
+						<view class="info">
+							1
+						</view>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				addOrLessIcon1: '/static/index/shortLine.png',
+				addOrLessIcon2: '/static/index/shortLine.png',
+				addOrLessIcon3: '/static/index/shortLine.png',
+				addOrLessIcon4: '/static/index/shortLine.png',
+				addOrLessIcon5: '/static/index/shortLine.png',
+				// lessIcon: require('/static/index/shortLine.png'),
+
+				show1: false,
+				show2: false,
+				show3: false,
+				show4: false,
+				show5: false,
+
+				showConfig: false,
+
+				currHouseIndex: 0,
+				currHouseIndex1: 0,
+				currHouseIndex2: 0,
+				currHouseIndex3: 0,
+				currHouseIndex4: 0,
+				currHouseIndex5: 0,
+				houseTypeList: [
+					'一室两厅',
+					'两室两厅',
+					'三室两厅'
+				],
+				brandTypeList: [
+					'品牌1',
+					'品牌2',
+				],
+				lockTypeList: [
+					'全屋',
+					'客餐厅',
+					'主卧室',
+				],
+				pannelTypeList: [
+					'3系',
+					'5系',
+				],
+				chuanglianTypeList: [
+					'标准版',
+					'智能版',
+				],
+				ktTypeList: [
+					'筒灯',
+					'射灯',
+					'线性灯',
+					'磁吸轨道灯',
+				],
+				serTypeList: [
+					'3系',
+					'5系',
+				],
+			}
+		},
+		onLoad(options) {},
+		methods: {
+			handleOpenOrClose(i) {
+				if (this['addOrLessIcon' + i] == '/static/index/shortLine.png') {
+					this['addOrLessIcon' + i] = '/static/index/add.png'
+					this['show' + i] = true
+				} else {
+					this['addOrLessIcon' + i] = '/static/index/shortLine.png'
+					this['show' + i] = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/index/detail/index.scss

@@ -0,0 +1,110 @@
+.page{
+	padding-bottom: 208rpx;
+}
+.topImg{
+	width: 100%;
+	height: 1124rpx;
+	border-radius: 0 0rpx 0 40rpx;
+	margin-bottom: 60rpx;
+}
+
+.cen{
+	position: relative;
+	padding-left: 40rpx;
+	font-size: 36rpx;
+	font-family: PingFang-SC-Bold, PingFang-SC;
+	font-weight: bold;
+	color: #333333;
+	.water{
+		width: 714rpx;
+		height: 50rpx;
+		position: absolute;
+		top: -24rpx;
+		left: 0;
+	}
+	.halfC{
+		width: 52rpx;
+		height: 56rpx;
+		position: absolute;
+		top: -18rpx;
+		left:16rpx;
+	}
+}
+.parmasBox{
+	padding: 0 32rpx;
+	// width: 100%;
+	.con{
+		height: 776rpx;
+		background: #FFFFFF;
+		border-radius: 0rpx 24rpx 0rpx 24rpx;
+		border: 2rpx solid #E2E2E2;
+		margin-top: 48rpx;
+		padding: 48rpx 24rpx;
+		// width: 100%;
+		
+		.item{
+			// width: 100%;
+			margin-bottom: 40rpx;
+			display: flex;
+			justify-content: space-between;
+			.name{
+				font-size: 32rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #666666;
+			}
+			.des{
+				font-size: 32rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+			}
+		}
+		
+		.item:last-child{
+			margin-bottom: 0;
+		}
+	}
+}
+
+.btnBox{
+	height: 160rpx;
+	background: #FFFFFF;
+	box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.16);
+	
+	position: fixed;
+	bottom: 0;
+	width: calc(100% - 64rpx);
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 0 32rpx;
+	.lBtn{
+		width: 330rpx;
+		height: 96rpx;
+		border-radius: 4rpx;
+		border: 2rpx solid #333333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #333333;
+	}
+	.rBtn{
+		width: 330rpx;
+		height: 96rpx;
+		background: #333333;
+		border-radius: 4rpx;
+		border: 2rpx solid #333333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+}
+

pages/index/detail/index.vue

@@ -0,0 +1,56 @@
+<template>
+	<view class="page">
+		<navBar title="详情" :back="true" color="black" background="white" />
+		<image class="topImg" src="/static/index/main.png" mode=""></image>
+
+		<view class="cen">
+			<image class="water" src="/static/index/water.png" mode=""></image>
+			<image class="halfC" src="/static/index/halfCircle_275.png" mode=""></image>
+			灯具参数
+		</view>
+
+		<view class="parmasBox">
+			<view class="con">
+				<view class="item" v-for="i in 10">
+					<view class="name">
+						型号
+					</view>
+					<view class="des">
+						BNL12934
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="btnBox">
+			<view class="lBtn">
+				重新选择
+			</view>
+			<view class="rBtn">
+				选中
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+
+			}
+		},
+		onLoad(options) {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/index/fullHouseWifi/index.scss

@@ -1,3 +1,6 @@
+.page{
+	padding-bottom: 160rpx;
+}
 .topBg{
 	width: 100vw;
 	height: 800rpx;
@@ -28,6 +31,12 @@
 			top: 0;
 			z-index: 0;
 		}
+		.water1{
+			position: absolute;
+			top: 0;
+			z-index: 0;
+			height: 56rpx;
+		}
 		.main{
 			height: 100%;
 			display: flex;
@@ -38,7 +47,7 @@
 			image{
 				position: absolute;
 				z-index: 2;
-				left: 25%;
+				left: 26%;
 			}
 		}
 	}
@@ -48,6 +57,9 @@
 		font-weight: bold;
 		color: #333333;
 		margin-top: 44rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
 	}
 	
 	.parms{
@@ -59,32 +71,7 @@
 		padding-bottom: 46rpx;
 		position: relative;
 		
-		.rule{
-			position: absolute;
-			width: 96rpx;
-			height: 96rpx;
-			background: #FFFFFF;
-			box-shadow: 0rpx 4rpx 24rpx -8rpx rgba(0,0,0,0.28);
-			border: 2rpx solid #FFFFFF;
-			right: 0;
-			bottom: 6rpx;
-			border-radius: 50%;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			flex-direction: column;
-			image{
-				width: 32rpx;
-				height: 32rpx;
-				margin-bottom: 8rpx;
-			}
-			.txt{
-				font-size: 16rpx;
-				font-family: PingFang-SC-Medium, PingFang-SC;
-				font-weight: 500;
-				color: #333333;
-			}
-		}
+		
 		.item{
 			width: 325rpx;
 			height: 96rpx;
@@ -152,4 +139,32 @@
 		margin-right: 96rpx;
 	}
 	
-}
+}
+
+
+.rule{
+			position: fixed;
+			width: 96rpx;
+			height: 96rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 4rpx 24rpx -8rpx rgba(0,0,0,0.28);
+			border: 2rpx solid #FFFFFF;
+			right: 36rpx;
+			bottom: 216rpx;
+			border-radius: 50%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			image{
+				width: 32rpx;
+				height: 32rpx;
+				margin-bottom: 8rpx;
+			}
+			.txt{
+				font-size: 16rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+			}
+		}

pages/index/fullHouseWifi/index.vue

@@ -6,32 +6,33 @@
 
 		<view class="content">
 			<view class="topBox">
-				<view class="water">
-					CUSTOMIZED LIGHTING
-				</view>
+				<image src="/static/index/water.png" mode="" class="water1"></image>
 				<view class="main">
-					<image src="/static/my/dh.png" mode="" style="width: 56rpx;height: 56rpx;"></image>
+					<image src="/static/index/halfCircle_275.png" mode="" style="width: 56rpx;height: 56rpx;"></image>
 					<text style="z-index: 3;position: relative;">网络规划-全屋WiFi</text>
 				</view>
 			</view>
 
-			<view class="label">
-				户型
+			<view class="label" @click="handleOpenOrClose(1)">
+				<view class="txt">
+					户型
+				</view>
+				<image :src="addOrLessIcon1" mode="" class="" :style="{height:addOrLessIcon1=='/static/index/shortLine.png'
+					?'2rpx':'22rpx'}" style="width: 22rpx;margin-right: 56rpx;">
+				</image>
 			</view>
 
 			<view class="parms">
-				<view @click="currHouseIndex=index" class="item " :class="[currHouseIndex==index?'act':'']"
+				<view v-if="show1" @click="currHouseIndex=index" class="item " :class="[currHouseIndex==index?'act':'']"
 					v-for="(item,index) in houseTypeList" :style="{'margin-right': index==1?'0':''}">
 					{{item}}
 				</view>
-
-
-				<view class="rule">
-					<image src="/static/my/bj.png" mode=""></image>
-					<view class="txt">
-						挑选规则
-					</view>
-				</view>
+			</view>
+		</view>
+		<view class="rule">
+			<image src="/static/index/ruleImg.png" mode=""></image>
+			<view class="txt">
+				挑选规则
 			</view>
 		</view>
 		<view class="bot">
@@ -39,7 +40,7 @@
 				<view class="price">
 					￥2099，9900
 				</view>
-				<image src="/static/my/bj.png" mode=""></image>
+				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
 			<view class="right">
 				一键下单
@@ -55,6 +56,19 @@
 		},
 		data() {
 			return {
+				addOrLessIcon1: '/static/index/add.png',
+				addOrLessIcon2: '/static/index/add.png',
+				addOrLessIcon3: '/static/index/add.png',
+				addOrLessIcon4: '/static/index/add.png',
+				addOrLessIcon5: '/static/index/add.png',
+				// lessIcon: require('/static/index/shortLine.png'),
+
+				show1: false,
+				show2: false,
+				show3: false,
+				show4: false,
+				show5: false,
+
 				currHouseIndex: 0,
 				houseTypeList: [
 					'一室两厅',
@@ -65,7 +79,15 @@
 		},
 		onLoad(options) {},
 		methods: {
-
+			handleOpenOrClose(i) {
+				if (this['addOrLessIcon' + i] == '/static/index/shortLine.png') {
+					this['addOrLessIcon' + i] = '/static/index/add.png'
+					this['show' + i] = false
+				} else if (this['addOrLessIcon' + i] == '/static/index/add.png') {
+					this['addOrLessIcon' + i] = '/static/index/shortLine.png'
+					this['show' + i] = true
+				}
+			},
 		}
 	}
 </script>

pages/index/index.vue

@@ -65,7 +65,7 @@
 			</view>
 
 			<!-- 产品指南 -->
-			<view class="productLead">
+			<view class="productLead" @click="toPage(3)">
 				<view class="top">
 					<view class="left">
 						<view class="bottomEng">
@@ -189,6 +189,10 @@
 					uni.navigateTo({
 						url: '/pages/index/aiControlSys/index'
 					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/index/productLead/index'
+					})
 				}
 			},
 

pages/index/productLead/index.scss

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

pages/index/productLead/index.vue

@@ -0,0 +1,38 @@
+<template>
+	<view class="page">
+		<navBar title="产品指南" :back="true" color="black" background="white" />
+
+		<view class="con">
+			<view class="item" v-for="i in 7">
+				<image src="/static/index/img1.png" mode=""></image>
+				<view class="bottom">
+					<view class="txt">
+						灯具指南灯具指南灯具指南
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-loadmore style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+
+			}
+		},
+		onLoad(options) {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/mall/detail/index.scss

@@ -0,0 +1,191 @@
+.page{
+	padding-bottom: 208rpx;
+}
+.topImg{
+	width: 100%;
+	height: 1124rpx;
+	border-radius: 0 0rpx 0 40rpx;
+	margin-bottom: 60rpx;
+}
+
+.cen{
+	position: relative;
+	padding-left: 40rpx;
+	font-size: 36rpx;
+	font-family: PingFang-SC-Bold, PingFang-SC;
+	font-weight: bold;
+	color: #333333;
+	padding-right: 34rpx;
+	
+	.love{
+		width: 96rpx;
+		height: 96rpx;
+		position: absolute;
+		right:40rpx;
+		top: -80rpx;
+	}
+	.water{
+		width: 714rpx;
+		height: 50rpx;
+		position: absolute;
+		top: -24rpx;
+		left: 0;
+	}
+	.halfC{
+		width: 52rpx;
+		height: 56rpx;
+		position: absolute;
+		top: -18rpx;
+		left:16rpx;
+	}
+	.txtBox{
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: flex-end;
+		.left{
+			
+		}
+		.right{
+			font-size: 24rpx;
+			font-family: PingFang-SC-Medium, PingFang-SC;
+			font-weight: 500;
+			color: #666666;
+		}
+	}
+}
+.parmasBox{
+	border-top: 2rpx solid #EAEAEA;
+	border-bottom: 2rpx solid #EAEAEA;
+	margin-top: 48rpx;
+	width: 100%;
+	.con{
+		padding: 0 32rpx;
+		background: #FFFFFF;
+		margin-top: 48rpx;
+		padding-bottom: 48rpx;
+	
+		.title{
+			font-size: 32rpx;
+			font-family: PingFang-SC-Bold, PingFang-SC;
+			font-weight: bold;
+			color: #333333;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.title1{
+			font-size: 32rpx;
+			font-family: PingFang-SC-Bold, PingFang-SC;
+			font-weight: bold;
+			color: #333333;
+			display: flex;
+			// justify-content: space-between;
+			align-items: center;
+			.txt{
+				width: 90%;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+			.add{
+				width: 22rpx;
+			}
+			
+		}
+		.des{
+			margin-top: 64rpx;
+			.title3{
+				
+				font-size: 30rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+				// margin-bottom: 24rpx;
+				
+			}
+			.img{
+				margin-top: 24rpx;
+				width: 100%;
+				height: 800rpx;
+			}
+		}
+		.list{
+			display: flex;
+			flex-wrap: wrap;
+			margin-top: 44rpx;
+			.item{
+				width: 32%;
+				height: 64rpx;
+				border-radius: 4rpx;
+				font-size: 30rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				margin-right: 10rpx;
+				margin-bottom: 20rpx;
+			}
+			.act{
+				color: #FFFEFE;
+				background: #333333;
+			}
+			.item:nth-of-type(3n){
+				margin-right: 0;
+				}
+		}
+			
+	}
+}
+
+
+.bot{
+	height: 160rpx;
+	background: #FFFFFF;
+	box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.16);
+	position: fixed;
+	width: 100%;
+	bottom: 0;
+	
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	
+	padding: 0 40rpx;
+	.left{
+		display: flex;
+		align-items: center;
+		.price{
+			font-size: 42rpx;
+			font-family: DINAlternate-Bold, DINAlternate;
+			font-weight: bold;
+			color: #333333;
+		}
+		image{
+			width: 23rpx;
+			height: 12rpx;
+			margin-left: 16rpx;
+		}
+	}
+	.right{
+		width: 282rpx;
+		height: 96rpx;
+		background: #333333;
+		border-radius: 4rpx;
+		border: 2rpx solid #333333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		font-size: 32rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #FFFFFF;
+		margin-right: 96rpx;
+	}
+	
+}
+
+

pages/mall/detail/index.vue

@@ -0,0 +1,132 @@
+<template>
+	<view class="page">
+		<navBar title="详情" :back="true" color="black" background="white" />
+		<image class="topImg" src="/static/index/main.png" mode=""></image>
+
+		<view class="cen">
+			<image class="water" src="/static/index/water.png" mode=""></image>
+			<image class="halfC" src="/static/index/halfCircle_275.png" mode=""></image>
+			<image class="love" :src="lovePic" mode="" @click="handleCol"></image>
+			<view class="txtBox">
+				<view class="left">
+					中式风造型灯具
+				</view>
+				<view class="right">
+					20人已赞
+				</view>
+			</view>
+		</view>
+
+		<view class="parmasBox">
+			<view class="con">
+				<view class="title">
+					选择灯型
+				</view>
+				<view class="list">
+					<view class="item" v-for="i in 5" :class="[i==currIndex?'act':'']" @click="currIndex=i">
+						BNL456
+					</view>
+				</view>
+
+
+			</view>
+			<view class="parmasBox">
+				<view class="con">
+					<view class="title">
+						灯体尺寸
+					</view>
+					<view class="list">
+						<view class="item" v-for="i in 5" :class="[i==currIndex1?'act':'']" @click="currIndex1=i">
+							86cm*29cm
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="parmasBox" style="border: none;">
+				<view class="con">
+					<view class="title">
+						灯体尺寸
+					</view>
+					<view class="list">
+						<view class="item" v-for="i in 5" :class="[i==currIndex2?'act':'']" @click="currIndex2=i">
+							86cm*29cm
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="parmasBox" style="border-bottom: none;">
+				<view class="con" @click="handleOpenOrClose(1)">
+					<view class="title1">
+						<view class="txt">
+							商品描述
+						</view>
+						<image class="add" :src="addOrLessIcon1" mode="" :style="{height:addOrLessIcon1=='/static/index/shortLine.png'
+					?'2rpx':'22rpx'}"></image>
+					</view>
+					<view class="des" v-if="show1">
+						<view class="title3">
+							这是一条商品描述，图文展示
+						</view>
+						<image src="/static/index/img1.png" class="img" mode=""></image>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="bot">
+			<view class="left">
+				<view class="price">
+					￥2099，9900
+				</view>
+				<image src="/static/index/arrDown.png" mode=""></image>
+			</view>
+			<view class="right" @click="previewConfig">
+				分享
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				currIndex: 0,
+				currIndex1: 0,
+				currIndex2: 0,
+				show1: false,
+				addOrLessIcon1: '/static/index/add.png',
+
+				lovePic: '/static/mall/love.png'
+			}
+		},
+		onLoad(options) {},
+		methods: {
+			handleCol() {
+				if (this.lovePic == "/static/mall/love.png") {
+					this.lovePic = "/static/mall/no_love.png"
+				} else {
+					this.lovePic = "/static/mall/love.png"
+				}
+			},
+			handleOpenOrClose(i) {
+				if (this['addOrLessIcon' + i] == '/static/index/shortLine.png') {
+					this['addOrLessIcon' + i] = '/static/index/add.png'
+					this['show' + i] = false
+				} else if (this['addOrLessIcon' + i] == '/static/index/add.png') {
+					this['addOrLessIcon' + i] = '/static/index/shortLine.png'
+					this['show' + i] = true
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/mall/index.vue

@@ -22,7 +22,7 @@
 				</view>
 			</view>
 			<view class="rightDes">
-				<view class="item" v-for="i in 10" :style="{marginTop:i>0?'22rpx':''}">
+				<view class="item" v-for="i in 10" :style="{marginTop:i>0?'22rpx':''}" @click="toDetail">
 					<view class="top">
 						<view class="name">
 							筒灯
@@ -80,7 +80,11 @@
 
 		},
 		methods: {
-
+			toDetail() {
+				uni.navigateTo({
+					url: '/pages/mall/detail/index'
+				})
+			}
 		},
 		components: {}
 	};

pages/mall/pickKeting/index.scss

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

pages/mall/pickKeting/index.vue

@@ -0,0 +1,38 @@
+<template>
+	<view class="page">
+		<navBar title="挑选客厅灯" :back="true" color="black" background="white" />
+
+		<view class="con">
+			<view class="item" v-for="i in 7">
+				<image src="/static/index/img1.png" mode=""></image>
+				<view class="bottom">
+					<view class="txt">
+						灯具指南灯具指南灯具指南
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-loadmore style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+
+			}
+		},
+		onLoad(options) {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/my/actGoods/index.scss

@@ -17,10 +17,51 @@
 				border: 2rpx solid #F1F1F1;
 				margin-right: 16rpx;
 				margin-bottom: 24rpx;
-				image{
-					width: 100%;
-					height: 292rpx;
-					border-radius: 30rpx 30rpx 0 0;
+				
+				.topBox{
+					position: relative;
+					image{
+						width: 100%;
+						height: 292rpx;
+						border-radius: 30rpx 30rpx 0 0;
+					}
+					.cutDown{
+						position: absolute;
+						top: 0;
+						left: 0;
+						width: 100%;
+						z-index: 1;
+						display: flex;
+						justify-content: center;
+						.item2{
+							width: 48rpx;
+							height: 48rpx;
+							background: rgba(0, 0, 0, .69);
+							border-radius: 4rpx;
+							margin-top: 24rpx;
+							
+							font-size: 24rpx;
+							font-family: PingFangSC-Regular, PingFang SC;
+							font-weight: 400;
+							color: #FFFFFF;
+							
+							display: flex;
+							justify-content: center;
+							align-items: center;
+						}
+						.item_d{
+							width: 12rpx;
+							height: 40rpx;
+							font-size: 28rpx;
+							font-family: PingFangSC-Regular, PingFang SC;
+							font-weight: 400;
+							color: #000000;
+							margin: 0 10rpx;
+							background:none;
+						}
+					}
+					
+					
 				}
 				.bottom{
 					display: flex;

pages/my/actGoods/index.vue

@@ -3,8 +3,27 @@
 		<navBar title="活动商品" :back="true" color="black" background="white" />
 
 		<view class="con">
-			<view class="item" v-for="i in 7">
-				<image src="/static/index/img1.png" mode=""></image>
+			<view class="item" v-for="i in 7" @click="goDetail">
+				<view class="topBox">
+					<image src="/static/index/img1.png" mode=""></image>
+					<view class="cutDown">
+						<view class="item2">
+							05
+						</view>
+						<view class="item2 item_d">
+							:
+						</view>
+						<view class="item2">
+							54
+						</view>
+						<view class="item2 item_d">
+							:
+						</view>
+						<view class=" item2">
+							38
+						</view>
+					</view>
+				</view>
 				<view class="bottom">
 					<view class="txt">
 						灯具指南灯具指南灯具指南
@@ -28,7 +47,11 @@
 		},
 		onLoad(options) {},
 		methods: {
-
+			goDetail() {
+				uni.navigateTo({
+					url: '/pages/my/actGoodsDetail/index'
+				})
+			}
 		}
 	}
 </script>

pages/my/actGoodsDetail/index.scss

@@ -0,0 +1,261 @@
+.page{
+	padding-bottom: 208rpx;
+}
+.topImg{
+	width: 100%;
+	height: 1124rpx;
+	border-radius: 0 0rpx 0 40rpx;
+	margin-bottom: 60rpx;
+}
+
+.cen{
+	position: relative;
+	padding-left: 40rpx;
+	font-size: 36rpx;
+	font-family: PingFang-SC-Bold, PingFang-SC;
+	font-weight: bold;
+	color: #333333;
+	padding-right: 34rpx;
+	
+	.love{
+		width: 96rpx;
+		height: 96rpx;
+		position: absolute;
+		right:40rpx;
+		top: -80rpx;
+	}
+	.water{
+		width: 714rpx;
+		height: 50rpx;
+		position: absolute;
+		top: -24rpx;
+		left: 0;
+	}
+	.halfC{
+		width: 52rpx;
+		height: 56rpx;
+		position: absolute;
+		top: -18rpx;
+		left:16rpx;
+	}
+	.txtBox{
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: flex-end;
+		.left{
+			
+		}
+		.right{
+			font-size: 24rpx;
+			font-family: PingFang-SC-Medium, PingFang-SC;
+			font-weight: 500;
+			color: #666666;
+		}
+	}
+}
+.parmasBox{
+	border-top: 2rpx solid #EAEAEA;
+	border-bottom: 2rpx solid #EAEAEA;
+	margin-top: 48rpx;
+	width: 100%;
+	.con{
+		padding: 0 32rpx;
+		background: #FFFFFF;
+		margin-top: 48rpx;
+		padding-bottom: 48rpx;
+	
+		.title{
+			font-size: 32rpx;
+			font-family: PingFang-SC-Bold, PingFang-SC;
+			font-weight: bold;
+			color: #333333;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.title1{
+			font-size: 32rpx;
+			font-family: PingFang-SC-Bold, PingFang-SC;
+			font-weight: bold;
+			color: #333333;
+			display: flex;
+			// justify-content: space-between;
+			align-items: center;
+			.txt{
+				width: 90%;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+			.add{
+				width: 22rpx;
+			}
+			
+		}
+		.des{
+			margin-top: 64rpx;
+			.title3{
+				
+				font-size: 30rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+				// margin-bottom: 24rpx;
+				
+			}
+			.img{
+				margin-top: 24rpx;
+				width: 100%;
+				height: 800rpx;
+			}
+		}
+		.list{
+			display: flex;
+			flex-wrap: wrap;
+			margin-top: 44rpx;
+			.item{
+				width: 32%;
+				height: 64rpx;
+				border-radius: 4rpx;
+				font-size: 30rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				margin-right: 10rpx;
+				margin-bottom: 20rpx;
+			}
+			.act{
+				color: #FFFEFE;
+				background: #333333;
+			}
+			.item:nth-of-type(3n){
+				margin-right: 0;
+				}
+		}
+			
+	}
+}
+
+
+.bot{
+	height: 160rpx;
+	background: #FFFFFF;
+	box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.16);
+	position: fixed;
+	width: 100%;
+	bottom: 0;
+	
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	
+	padding: 0 40rpx;
+	.left{
+		display: flex;
+		align-items: center;
+		.price{
+			font-size: 42rpx;
+			font-family: DINAlternate-Bold, DINAlternate;
+			font-weight: bold;
+			color: #333333;
+		}
+		image{
+			width: 23rpx;
+			height: 12rpx;
+			margin-left: 16rpx;
+		}
+	}
+	.right{
+		width: 282rpx;
+		height: 96rpx;
+		background: #333333;
+		border-radius: 4rpx;
+		border: 2rpx solid #333333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		font-size: 32rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #FFFFFF;
+		margin-right: 96rpx;
+	}
+	
+}
+
+
+
+.box{
+	padding-left: 32rpx;
+	padding-right: 66rpx;
+	margin-top: 24rpx;
+	box-sizing: border-box;
+	.cutDowncard{
+		height: 162rpx;
+		background: #F6F6F6;
+		border-radius: 8rpx;
+		padding: 32rpx 24rpx;
+		font-size: 28rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #666666;
+		box-sizing: border-box;
+		.top{
+			display: flex;
+			justify-content: space-between;
+			box-sizing: border-box;
+			.left{
+				box-sizing: border-box;
+			}
+			.right{
+				color: #333333;
+				box-sizing: border-box;
+			}
+		}
+		.boto{
+			display: flex;
+			justify-content: space-between;
+			margin-top: 22rpx;
+			box-sizing: border-box;
+			.left{
+				
+			}
+			.right{
+				display: flex;
+				align-items: center;
+				box-sizing: border-box;
+				.num{
+					width: 48rpx;
+					height: 48rpx;
+					background: rgba(0, 0, 0, .69);
+					border-radius: 4rpx;
+					// opacity: 0.69;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: 24rpx;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #FFFFFF;
+					box-sizing: border-box;
+				}
+				.div{
+					width: 12rpx;
+					height: 40rpx;
+					font-size: 28rpx;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #000000;
+					margin-left: 10rpx;
+					margin-right: 10rpx;
+					box-sizing: border-box;
+				}
+			}
+		}
+	}
+}

pages/my/actGoodsDetail/index.vue

@@ -0,0 +1,167 @@
+<template>
+	<view class="page">
+		<navBar title="详情" :back="true" color="black" background="white" />
+		<!-- <image class="topImg" src="/static/index/main.png" mode=""></image> -->
+
+		<view class="cen">
+			<image class="water" src="/static/index/water.png" mode=""></image>
+			<image class="halfC" src="/static/index/halfCircle_275.png" mode=""></image>
+			<image class="love" :src="lovePic" mode="" @click="handleCol"></image>
+			<view class="txtBox">
+				<view class="left">
+					中式风造型灯具
+				</view>
+				<view class="right">
+					20人已赞
+				</view>
+			</view>
+		</view>
+		<view class="box">
+			<view class="cutDowncard">
+				<view class="top">
+					<view class="left">
+						活动名称：
+					</view>
+					<view class="right">
+						中秋国庆大促销
+					</view>
+				</view>
+				<view class="boto">
+					<view class="left">
+						活动倒计时
+					</view>
+					<view class="right">
+						<view class="num">
+							05
+						</view>
+						<view class="div">
+							:
+						</view>
+						<view class="num">
+							54
+						</view>
+						<view class="div">
+							:
+						</view>
+						<view class="num">
+							38
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view class="parmasBox">
+			<view class="con">
+				<view class="title">
+					选择灯型
+				</view>
+				<view class="list">
+					<view class="item" v-for="i in 5" :class="[i==currIndex?'act':'']" @click="currIndex=i">
+						BNL456
+					</view>
+				</view>
+
+
+			</view>
+			<view class="parmasBox">
+				<view class="con">
+					<view class="title">
+						灯体尺寸
+					</view>
+					<view class="list">
+						<view class="item" v-for="i in 5" :class="[i==currIndex1?'act':'']" @click="currIndex1=i">
+							86cm*29cm
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="parmasBox" style="border: none;">
+				<view class="con">
+					<view class="title">
+						灯体尺寸
+					</view>
+					<view class="list">
+						<view class="item" v-for="i in 5" :class="[i==currIndex2?'act':'']" @click="currIndex2=i">
+							86cm*29cm
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="parmasBox" style="border-bottom: none;">
+				<view class="con" @click="handleOpenOrClose(1)">
+					<view class="title1">
+						<view class="txt">
+							商品描述
+						</view>
+						<image class="add" :src="addOrLessIcon1" mode="" :style="{height:addOrLessIcon1=='/static/index/shortLine.png'
+					?'2rpx':'22rpx'}"></image>
+					</view>
+					<view class="des" v-if="show1">
+						<view class="title3">
+							这是一条商品描述，图文展示
+						</view>
+						<image src="/static/index/img1.png" class="img" mode=""></image>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="bot">
+			<view class="left">
+				<view class="price">
+					￥2099，9900
+				</view>
+				<image src="/static/index/arrDown.png" mode=""></image>
+			</view>
+			<view class="right" @click="previewConfig">
+				分享
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				currIndex: 0,
+				currIndex1: 0,
+				currIndex2: 0,
+				show1: false,
+				addOrLessIcon1: '/static/index/add.png',
+
+				lovePic: '/static/mall/love.png'
+			}
+		},
+		onLoad(options) {},
+		methods: {
+			handleCol() {
+				if (this.lovePic == "/static/mall/love.png") {
+					this.lovePic = "/static/mall/no_love.png"
+				} else {
+					this.lovePic = "/static/mall/love.png"
+				}
+			},
+			handleOpenOrClose(i) {
+				if (this['addOrLessIcon' + i] == '/static/index/shortLine.png') {
+					this['addOrLessIcon' + i] = '/static/index/add.png'
+					this['show' + i] = false
+				} else if (this['addOrLessIcon' + i] == '/static/index/add.png') {
+					this['addOrLessIcon' + i] = '/static/index/shortLine.png'
+					this['show' + i] = true
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/my/collect/index.scss

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

pages/my/collect/index.vue

@@ -0,0 +1,38 @@
+<template>
+	<view class="page">
+		<navBar title="收藏" :back="true" color="black" background="white" />
+
+		<view class="con">
+			<view class="item" v-for="i in 7">
+				<image src="/static/index/img1.png" mode=""></image>
+				<view class="bottom">
+					<view class="txt">
+						灯具指南灯具指南灯具指南
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-loadmore style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+
+			}
+		},
+		onLoad(options) {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/my/index.vue

@@ -91,7 +91,8 @@
 					},
 					{
 						icon: require('@/static/my/sc.png'),
-						name: '收藏'
+						name: '收藏',
+						url: '/pages/my/collect/index'
 					},
 					{
 						icon: require('@/static/my/qt.png'),

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

@@ -17,7 +17,21 @@
     "pages/my/sellAfter/index",
     "pages/my/otherInfo/index",
     "pages/my/sellAfterDefer/index",
-    "pages/my/sellAfterCon/index"
+    "pages/my/sellAfterCon/index",
+    "pages/my/inviteDetail/index",
+    "pages/index/fullHouseWifi/index",
+    "pages/index/aiControlSys/index",
+    "pages/my/collect/index",
+    "pages/mall/pickKeting/index",
+    "pages/index/productLead/index",
+    "pages/index/customNoMain/index",
+    "pages/index/detail/index",
+    "pages/index/customMian/index",
+    "pages/index/customMian_step2/index",
+    "pages/index/customNoMian_step1/index",
+    "pages/index/customMian_step1/index",
+    "pages/mall/detail/index",
+    "pages/my/actGoodsDetail/index"
   ],
   "subPackages": [],
   "window": {

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

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/navBar/index"],{"0cd5":function(t,n,e){},"19a0":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:{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,c=a.left;this.navBareight=o-e+(u-e),this.windowWidth=c},methods:{onBack:function(){this.$emit("onBack"),t.navigateBack({delta:1})}}};n.default=e}).call(this,e("543d")["default"])},"1a4c":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,"f70d"))}},a=function(){var t=this.$createElement;this._self._c},u=[]},"3e05":function(t,n,e){"use strict";var i=e("0cd5"),a=e.n(i);a.a},"77ea":function(t,n,e){"use strict";e.r(n);var i=e("1a4c"),a=e("cb3a");for(var u in a)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(u);e("3e05");var o=e("f0c5"),c=Object(o["a"])(a["default"],i["b"],i["c"],!1,null,"ffe6e6c0",null,!1,i["a"],void 0);n["default"]=c.exports},cb3a:function(t,n,e){"use strict";e.r(n);var i=e("19a0"),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"],{"19a0":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:{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.$emit("onBack"),t.navigateBack({delta:1})}}};n.default=e}).call(this,e("543d")["default"])},"2e00":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,"f70d"))}},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=[]},"621b":function(t,n,e){"use strict";var i=e("c9ec"),a=e.n(i);a.a},"77ea":function(t,n,e){"use strict";e.r(n);var i=e("2e00"),a=e("cb3a");for(var u in a)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(u);e("621b");var o=e("f0c5"),r=Object(o["a"])(a["default"],i["b"],i["c"],!1,null,"fdb263d8",null,!1,i["a"],void 0);n["default"]=r.exports},c9ec:function(t,n,e){},cb3a:function(t,n,e){"use strict";e.r(n);var i=e("19a0"),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',
     {

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

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

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

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

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

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/popup/index"],{"1c2d":function(n,e,t){"use strict";t.r(e);var u=t("d889"),o=t("ef83");for(var i in o)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(i);t("f488");var f=t("f0c5"),c=Object(f["a"])(o["default"],u["b"],u["c"],!1,null,"768dd035",null,!1,u["a"],void 0);e["default"]=c.exports},"6f55":function(n,e,t){},d671:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;e.default={props:["show","mode","round"],methods:{close:function(){this.$emit("close")},open:function(){this.$emit("open")}}}},d889: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,"f56b"))}},o=function(){var n=this.$createElement;this._self._c},i=[]},ef83:function(n,e,t){"use strict";t.r(e);var u=t("d671"),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},f488:function(n,e,t){"use strict";var u=t("6f55"),o=t.n(u);o.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/popup/index"],{"03a4":function(n,e,t){"use strict";var u=t("f2cc"),o=t.n(u);o.a},"1c2d":function(n,e,t){"use strict";t.r(e);var u=t("3aa1"),o=t("ef83");for(var c in o)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(c);t("03a4");var i=t("f0c5"),r=Object(i["a"])(o["default"],u["b"],u["c"],!1,null,"7dea3bec",null,!1,u["a"],void 0);e["default"]=r.exports},"3aa1":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={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"f56b"))}},o=function(){var n=this.$createElement;this._self._c},c=[]},d671: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")}}}},ef83:function(n,e,t){"use strict";t.r(e);var u=t("d671"),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},f2cc:function(n,e,t){}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/popup/index-create-component',
     {

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

@@ -1 +1 @@
-<view class="data-v-768dd035"><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-768dd035" bind:__l="__l" vue-slots="{{['default']}}"><view class="topBar data-v-768dd035">按钮等<button data-event-opts="{{[['tap',[['close',['$event']]]]]}}" bindtap="__e" class="data-v-768dd035">关闭</button></view><slot name="content"></slot></u-popup></view>
+<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.json

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

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

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

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

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "智能控制系统",
+  "navigationBarTextStyle": "white",
+  "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/customMian/index.json

@@ -0,0 +1,11 @@
+{
+  "navigationBarTitleText": "定制我家的主灯",
+  "navigationBarTextStyle": "white",
+  "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_step1/index.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "主灯-通选套餐",
+  "navigationBarTextStyle": "white",
+  "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/customMian_step2/index.json

@@ -0,0 +1,11 @@
+{
+  "navigationBarTitleText": "定制我家的无主灯",
+  "navigationBarTextStyle": "white",
+  "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/customNoMain/index.js

@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/index/customNoMain/index"],{"1e40":function(n,e,t){"use strict";t.r(e);var u=t("cd23"),o=t("f734");for(var c in o)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(c);t("97c0");var a=t("f0c5"),r=Object(a["a"])(o["default"],u["b"],u["c"],!1,null,"1ea053e7",null,!1,u["a"],void 0);e["default"]=r.exports},"97c0":function(n,e,t){"use strict";var u=t("abd4"),o=t.n(u);o.a},a59f:function(n,e,t){"use strict";(function(n,e){var u=t("4ea4");t("2707");u(t("66fd"));var o=u(t("1e40"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},abd4:function(n,e,t){},cd23: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={uLoadmore:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-loadmore/u-loadmore")]).then(t.bind(null,"794b"))}},o=function(){var n=this.$createElement;this._self._c},c=[]},f734:function(n,e,t){"use strict";t.r(e);var u=t("fc90"),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},fc90:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;e.default={components:{},data:function(){return{}},onLoad:function(n){},methods:{}}}},[["a59f","common/runtime","common/vendor"]]]);

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

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "定制我家的无主灯",
+  "navigationBarTextStyle": "white",
+  "usingComponents": {
+    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore"
+  }
+}

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

@@ -0,0 +1 @@
+<view class="page data-v-1ea053e7"><nav-bar vue-id="121fdf82-1" title="定制我家的无主灯" back="{{true}}" color="black" background="white" class="data-v-1ea053e7" bind:__l="__l"></nav-bar><view class="con data-v-1ea053e7"><block wx:for="{{4}}" wx:for-item="i" wx:for-index="__i0__"><view class="item data-v-1ea053e7"><view class="label data-v-1ea053e7"><image src="/static/index/part1_icon.png" mode class="data-v-1ea053e7"></image>灯型A</view><image src="/static/index/img1.png" mode class="data-v-1ea053e7"></image></view></block></view><u-loadmore vue-id="121fdf82-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-1ea053e7" bind:__l="__l"></u-loadmore></view>

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

@@ -0,0 +1 @@
+.data-v-1ea053e7 .u-line{width:56rpx!important}.page.data-v-1ea053e7{padding-bottom:54rpx}.con.data-v-1ea053e7{padding:28rpx 32rpx}.con .item.data-v-1ea053e7{display:flex;flex-direction:column;align-items:center;margin-bottom:64rpx}.con .item .label.data-v-1ea053e7{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-1ea053e7{width:56rpx;height:20rpx;position:absolute;top:-10rpx;left:-10rpx}.con .item image.data-v-1ea053e7{height:686rpx;border-radius:0 40rpx 0 40rpx}

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

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "无主灯-通选套餐",
+  "navigationBarTextStyle": "white",
+  "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/detail/index.js

@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/index/detail/index"],{"0c3e":function(n,e,t){"use strict";var c=t("94b9"),u=t.n(c);u.a},"0e83":function(n,e,t){"use strict";t.d(e,"b",(function(){return c})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){}));var c=function(){var n=this.$createElement;this._self._c},u=[]},"2c72":function(n,e,t){"use strict";t.r(e);var c=t("b9d6"),u=t.n(c);for(var a in c)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return c[n]}))}(a);e["default"]=u.a},"94b9":function(n,e,t){},b9d6:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;e.default={components:{},data:function(){return{}},onLoad:function(n){},methods:{}}},dfc8:function(n,e,t){"use strict";(function(n,e){var c=t("4ea4");t("2707");c(t("66fd"));var u=c(t("fc54"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},fc54:function(n,e,t){"use strict";t.r(e);var c=t("0e83"),u=t("2c72");for(var a in u)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(a);t("0c3e");var f=t("f0c5"),i=Object(f["a"])(u["default"],c["b"],c["c"],!1,null,"2f82beb8",null,!1,c["a"],void 0);e["default"]=i.exports}},[["dfc8","common/runtime","common/vendor"]]]);

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

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "详情",
+  "navigationBarTextStyle": "white",
+  "usingComponents": {}
+}

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

@@ -0,0 +1 @@
+<view class="page data-v-2f82beb8"><nav-bar vue-id="00a3f2dc-1" title="详情" back="{{true}}" color="black" background="white" class="data-v-2f82beb8" bind:__l="__l"></nav-bar><image class="topImg data-v-2f82beb8" src="/static/index/main.png" mode></image><view class="cen data-v-2f82beb8"><image class="water data-v-2f82beb8" src="/static/index/water.png" mode></image><image class="halfC data-v-2f82beb8" src="/static/index/halfCircle_275.png" mode></image>灯具参数</view><view class="parmasBox data-v-2f82beb8"><view class="con data-v-2f82beb8"><block wx:for="{{10}}" wx:for-item="i" wx:for-index="__i0__"><view class="item data-v-2f82beb8"><view class="name data-v-2f82beb8">型号</view><view class="des data-v-2f82beb8">BNL12934</view></view></block></view></view><view class="btnBox data-v-2f82beb8"><view class="lBtn data-v-2f82beb8">重新选择</view><view class="rBtn data-v-2f82beb8">选中</view></view></view>

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

@@ -0,0 +1 @@
+.page.data-v-2f82beb8{padding-bottom:208rpx}.topImg.data-v-2f82beb8{width:100%;height:1124rpx;border-radius:0 0rpx 0 40rpx;margin-bottom:60rpx}.cen.data-v-2f82beb8{position:relative;padding-left:40rpx;font-size:36rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333}.cen .water.data-v-2f82beb8{width:714rpx;height:50rpx;position:absolute;top:-24rpx;left:0}.cen .halfC.data-v-2f82beb8{width:52rpx;height:56rpx;position:absolute;top:-18rpx;left:16rpx}.parmasBox.data-v-2f82beb8{padding:0 32rpx}.parmasBox .con.data-v-2f82beb8{height:776rpx;background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;border:2rpx solid #e2e2e2;margin-top:48rpx;padding:48rpx 24rpx}.parmasBox .con .item.data-v-2f82beb8{margin-bottom:40rpx;display:flex;justify-content:space-between}.parmasBox .con .item .name.data-v-2f82beb8{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666}.parmasBox .con .item .des.data-v-2f82beb8{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333}.parmasBox .con .item.data-v-2f82beb8:last-child{margin-bottom:0}.btnBox.data-v-2f82beb8{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 .lBtn.data-v-2f82beb8{width:330rpx;height:96rpx;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:#333}.btnBox .rBtn.data-v-2f82beb8{width:330rpx;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/fullHouseWifi/index.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "网络规划-全屋WiFi",
+  "navigationBarTextStyle": "white",
+  "usingComponents": {}
+}

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

@@ -0,0 +1 @@
+<view class="page data-v-9e975782"><nav-bar vue-id="1410d77a-1" title="网络规划-全屋WiFi" back="{{true}}" color="black" background="white" class="data-v-9e975782" bind:__l="__l"></nav-bar><image class="topBg data-v-9e975782" src="/static/index/img1.png" mode></image><view class="content data-v-9e975782"><view class="topBox data-v-9e975782"><image class="water1 data-v-9e975782" src="/static/index/water.png" mode></image><view class="main data-v-9e975782"><image style="width:56rpx;height:56rpx;" src="/static/index/halfCircle_275.png" mode class="data-v-9e975782"></image><text style="z-index:3;position:relative;" class="data-v-9e975782">网络规划-全屋WiFi</text></view></view><view data-event-opts="{{[['tap',[['handleOpenOrClose',[1]]]]]}}" class="label data-v-9e975782" bindtap="__e"><view class="txt data-v-9e975782">户型</view><image style="{{'width:22rpx;margin-right:56rpx;'+('height:'+(addOrLessIcon1=='/static/index/shortLine.png'?'2rpx':'22rpx')+';')}}" src="{{addOrLessIcon1}}" mode class="data-v-9e975782"></image></view><view class="parms data-v-9e975782"><block wx:for="{{houseTypeList}}" wx:for-item="item" wx:for-index="index"><block wx:if="{{show1}}"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" data-event-params="{{({index})}}" class="{{['item','','data-v-9e975782',currHouseIndex==index?'act':'']}}" style="{{'margin-right:'+(index==1?'0':'')+';'}}" bindtap="__e">{{''+item+''}}</view></block></block></view></view><view class="rule data-v-9e975782"><image src="/static/index/ruleImg.png" mode class="data-v-9e975782"></image><view class="txt data-v-9e975782">挑选规则</view></view><view class="bot data-v-9e975782"><view class="left data-v-9e975782"><view class="price data-v-9e975782">￥2099，9900</view><image src="/static/index/arrDown.png" mode class="data-v-9e975782"></image></view><view class="right data-v-9e975782">一键下单</view></view></view>

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

@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/index/productLead/index"],{"298e":function(n,e,t){"use strict";var u=t("a147"),o=t.n(u);o.a},"31c3":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;e.default={components:{},data:function(){return{}},onLoad:function(n){},methods:{}}},"5af5":function(n,e,t){"use strict";(function(n,e){var u=t("4ea4");t("2707");u(t("66fd"));var o=u(t("d330"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},a147:function(n,e,t){},d330:function(n,e,t){"use strict";t.r(e);var u=t("f4eb"),o=t("f028");for(var r in o)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(r);t("298e");var a=t("f0c5"),c=Object(a["a"])(o["default"],u["b"],u["c"],!1,null,"22b191cb",null,!1,u["a"],void 0);e["default"]=c.exports},f028:function(n,e,t){"use strict";t.r(e);var u=t("31c3"),o=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(r);e["default"]=o.a},f4eb:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return r})),t.d(e,"a",(function(){return u}));var u={uLoadmore:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-loadmore/u-loadmore")]).then(t.bind(null,"794b"))}},o=function(){var n=this.$createElement;this._self._c},r=[]}},[["5af5","common/runtime","common/vendor"]]]);

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

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "产品指南",
+  "navigationBarTextStyle": "white",
+  "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-22b191cb"><nav-bar vue-id="5d58823e-1" title="产品指南" back="{{true}}" color="black" background="white" class="data-v-22b191cb" bind:__l="__l"></nav-bar><view class="con data-v-22b191cb"><block wx:for="{{7}}" wx:for-item="i" wx:for-index="__i0__"><view class="item data-v-22b191cb"><image src="/static/index/img1.png" mode class="data-v-22b191cb"></image><view class="bottom data-v-22b191cb"><view class="txt data-v-22b191cb">灯具指南灯具指南灯具指南</view></view></view></block></view><u-loadmore vue-id="5d58823e-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-22b191cb" bind:__l="__l"></u-loadmore></view>

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

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

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

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "商品详情",
+  "navigationBarTextStyle": "white",
+  "usingComponents": {}
+}

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

@@ -1 +1 @@
-<view class="data-v-1d29f155"><nav-bar vue-id="78e1f036-1" title="商城" back="{{false}}" color="black" flex="cen" background="#fff" class="data-v-1d29f155" bind:__l="__l"></nav-bar><view class="searchAndTab data-v-1d29f155"><view class="searchBox data-v-1d29f155"><u-search vue-id="78e1f036-2" shape="round" showAction="{{false}}" class="data-v-1d29f155" bind:__l="__l"></u-search></view><u-sticky vue-id="78e1f036-3" bgColor="#fff" class="data-v-1d29f155" bind:__l="__l" vue-slots="{{['default']}}"><u-tabs vue-id="{{('78e1f036-4')+','+('78e1f036-3')}}" list="{{list1}}" scrollable="{{true}}" activeStyle="{{activeStyle}}" inactiveStyle="{{inactiveStyle}}" class="data-v-1d29f155" bind:__l="__l"></u-tabs></u-sticky></view><view class="content data-v-1d29f155"><view class="leftMenu data-v-1d29f155"><block wx:for="{{20}}" wx:for-item="i" wx:for-index="__i0__"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" data-event-params="{{({i})}}" class="{{['item','data-v-1d29f155',i==currBrandIndex?'act':'']}}" bindtap="__e"><text style="position:relative;z-index:1;" class="data-v-1d29f155">{{"品牌"+(i+1)}}</text><block wx:if="{{i==currBrandIndex}}"><view class="halfCircle data-v-1d29f155"></view></block></view></block></view><view class="rightDes data-v-1d29f155"><block wx:for="{{10}}" wx:for-item="i" wx:for-index="__i1__"><view class="item data-v-1d29f155" style="{{'margin-top:'+(i>0?'22rpx':'')+';'}}"><view class="top data-v-1d29f155"><view class="name data-v-1d29f155">筒灯</view><image style="width:40rpx;height:40rpx;margin-right:4rpx;" src="/static/index/more.png" mode class="data-v-1d29f155"></image></view><view class="bottom data-v-1d29f155"><block wx:for="{{5}}" wx:for-item="i" wx:for-index="__i2__"><image class="img data-v-1d29f155" src="/static/index/img1.png" mode></image></block></view></view></block></view></view></view>
+<view class="data-v-80834d16"><nav-bar vue-id="78e1f036-1" title="商城" back="{{false}}" color="black" flex="cen" background="#fff" class="data-v-80834d16" bind:__l="__l"></nav-bar><view class="searchAndTab data-v-80834d16"><view class="searchBox data-v-80834d16"><u-search vue-id="78e1f036-2" shape="round" showAction="{{false}}" class="data-v-80834d16" bind:__l="__l"></u-search></view><u-sticky vue-id="78e1f036-3" bgColor="#fff" class="data-v-80834d16" bind:__l="__l" vue-slots="{{['default']}}"><u-tabs vue-id="{{('78e1f036-4')+','+('78e1f036-3')}}" list="{{list1}}" scrollable="{{true}}" activeStyle="{{activeStyle}}" inactiveStyle="{{inactiveStyle}}" class="data-v-80834d16" bind:__l="__l"></u-tabs></u-sticky></view><view class="content data-v-80834d16"><view class="leftMenu data-v-80834d16"><block wx:for="{{20}}" wx:for-item="i" wx:for-index="__i0__"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" data-event-params="{{({i})}}" class="{{['item','data-v-80834d16',i==currBrandIndex?'act':'']}}" bindtap="__e"><text style="position:relative;z-index:1;" class="data-v-80834d16">{{"品牌"+(i+1)}}</text><block wx:if="{{i==currBrandIndex}}"><view class="halfCircle data-v-80834d16"></view></block></view></block></view><view class="rightDes data-v-80834d16"><block wx:for="{{10}}" wx:for-item="i" wx:for-index="__i1__"><view data-event-opts="{{[['tap',[['toDetail',['$event']]]]]}}" class="item data-v-80834d16" style="{{'margin-top:'+(i>0?'22rpx':'')+';'}}" bindtap="__e"><view class="top data-v-80834d16"><view class="name data-v-80834d16">筒灯</view><image style="width:40rpx;height:40rpx;margin-right:4rpx;" src="/static/index/more.png" mode class="data-v-80834d16"></image></view><view class="bottom data-v-80834d16"><block wx:for="{{5}}" wx:for-item="i" wx:for-index="__i2__"><image class="img data-v-80834d16" src="/static/index/img1.png" mode></image></block></view></view></block></view></view></view>

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

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

unpackage/dist/build/mp-weixin/pages/mall/pickKeting/index.js

@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/mall/pickKeting/index"],{"30b9":function(n,e,t){"use strict";t.r(e);var u=t("31b3"),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},"31b3":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;e.default={components:{},data:function(){return{}},onLoad:function(n){},methods:{}}},a138: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={uLoadmore:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-loadmore/u-loadmore")]).then(t.bind(null,"794b"))}},o=function(){var n=this.$createElement;this._self._c},c=[]},a396:function(n,e,t){"use strict";var u=t("d4cd"),o=t.n(u);o.a},bdc7:function(n,e,t){"use strict";t.r(e);var u=t("a138"),o=t("30b9");for(var c in o)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(c);t("a396");var a=t("f0c5"),r=Object(a["a"])(o["default"],u["b"],u["c"],!1,null,"75105ba1",null,!1,u["a"],void 0);e["default"]=r.exports},d4cd:function(n,e,t){},ffc6:function(n,e,t){"use strict";(function(n,e){var u=t("4ea4");t("2707");u(t("66fd"));var o=u(t("bdc7"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])}},[["ffc6","common/runtime","common/vendor"]]]);

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

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "挑选客厅灯",
+  "navigationBarTextStyle": "white",
+  "usingComponents": {
+    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore"
+  }
+}