9.15

api/test/index.js

@@ -20,7 +20,7 @@ export const updateUserInfoReq = (params, config = {}) => http.post('/api/users/
 
 // 首页相关
 // 获取首页配置
-export const getIndexConfigReq = (params, config = {}) => http.get('/api/getHomeData', params, config)
+export const getIndexConfigReq = (params, config = {}) => http.post('/api/getHomeData', params, config)
 
 
 
@@ -134,17 +134,17 @@ export const cancelCollReq = (params, config = {}) => http.post('/api/users/canc
 
 
 
-export const getGoodsPriceReq = (params, config = {}) => {
-	let apiUrl = '/api/goods/getGoodsPrice'
-	Object.keys(params).forEach((item, index) => {
-		if (index == 0) {
-			apiUrl += `?${item}=${JSON.stringify( params[item]) }`
-		} else {
-			apiUrl += `&${item}=${params[item]}`
-		}
-	})
-	console.log('处理后的apiUrl', apiUrl);
-	return http.get(apiUrl, params, config)
-}
+// export const getGoodsPriceReq = (params, config = {}) => {
+// 	let apiUrl = '/api/goods/getGoodsPrice'
+// 	Object.keys(params).forEach((item, index) => {
+// 		if (index == 0) {
+// 			apiUrl += `?${item}=${JSON.stringify( params[item]) }`
+// 		} else {
+// 			apiUrl += `&${item}=${params[item]}`
+// 		}
+// 	})
+// 	console.log('处理后的apiUrl', apiUrl);
+// 	return http.get(apiUrl, params, config)
+// }
 
-// export const getGoodsPriceReq = (params, config = {}) => http.post('/api/goods/getGoodsPrice', params, config)
+export const getGoodsPriceReq = (params, config = {}) => http.post('/api/goods/getGoodsPrice', params, config)

pages/index.vue

@@ -163,12 +163,12 @@
 					this.$picUrl + '/static/other/noMain_img3.png',
 					this.$picUrl + '/static/other/noMain_img3.png',
 				],
-				bannerList1: [
-				],
+				bannerList1: [],
 				currentNum: 0,
 				currentNum1: 0,
 
-				tabList: ['无主灯', '主灯', '吸顶灯'],
+				// tabList: ['无主灯', '主灯', '吸顶灯'],
+				tabList: ['无主灯', '主灯'],
 				currTabIndex: 0,
 
 				navImg: require('@/static/index/logo.png')

pages/index/aiControlSys/index.vue

@@ -33,9 +33,9 @@
 			</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 v-if="show1" @click="sel('hx', item, index)" class="item "
+					:class="[currHouseIndex==index?'act':'']" v-for="(item,index) in houseTypeList">
+					{{item.value}}
 				</view>
 			</view>
 
@@ -50,9 +50,9 @@
 			</view>
 
 			<view class="parms">
-				<view v-if="show2" @click="currHouseIndex1=index" class="item "
+				<view v-if="show2" @click="sel('pp', item, index)" class="item "
 					:class="[currHouseIndex1==index?'act':'']" v-for="(item,index) in brandTypeList">
-					{{item}}
+					{{item.value}}
 				</view>
 			</view>
 
@@ -66,9 +66,9 @@
 			</view>
 
 			<view class="parms">
-				<view v-if="show3" @click="currHouseIndex2=index" class="item "
+				<view v-if="show3" @click="sel('suo', item, index)" class="item "
 					:class="[currHouseIndex2==index?'act':'']" v-for="(item,index) in lockTypeList">
-					{{item}}
+					{{item.value}}
 				</view>
 			</view>
 
@@ -83,9 +83,9 @@
 			</view>
 
 			<view class="parms">
-				<view v-if="show4" @click="currHouseIndex3=index" class="item "
+				<view v-if="show4" @click="sel('mb', item, index)" class="item "
 					:class="[currHouseIndex3==index?'act':'']" v-for="(item,index) in pannelTypeList">
-					{{item}}
+					{{item.value}}
 				</view>
 			</view>
 
@@ -100,9 +100,9 @@
 			</view>
 
 			<view class="parms">
-				<view v-if="show5" @click="currHouseIndex4=index" class="item "
+				<view v-if="show5" @click="sel('cl', item, index)" class="item "
 					:class="[currHouseIndex4==index?'act':'']" v-for="(item,index) in chuanglianTypeList">
-					{{item}}
+					{{item.value}}
 				</view>
 			</view>
 
@@ -117,9 +117,9 @@
 			</view>
 
 			<view class="parms">
-				<view v-if="show6" @click="currHouseIndex5=index" class="item "
+				<view v-if="show6" @click="sel('kt', item, index)" class="item "
 					:class="[currHouseIndex5==index?'act':'']" v-for="(item,index) in ktTypeList">
-					{{item}}
+					{{item.value}}
 				</view>
 
 
@@ -135,7 +135,7 @@
 		<view class="bot">
 			<view class="left" @click="showConfig=true">
 				<view class="price">
-					￥2099，9900
+					￥{{totalPrice.toFixed(2)}}
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
@@ -219,6 +219,12 @@
 </template>
 
 <script>
+	import {
+		getIndexConfigReq,
+	} from '@/api/test/index.js'
+	import {
+		getDataMoneyReq
+	} from '@/api/index/index.js'
 	export default {
 		components: {
 
@@ -226,6 +232,7 @@
 		data() {
 			return {
 				picUrl: this.$picUrl,
+				picBase: this.$picBase,
 
 				addOrLessIcon1: '/static/index/add.png',
 				addOrLessIcon2: '/static/index/add.png',
@@ -250,44 +257,126 @@
 				currHouseIndex3: 0,
 				currHouseIndex4: 0,
 				currHouseIndex5: 0,
-				houseTypeList: [
-					'一室两厅',
-					'两室两厅',
-					'三室两厅'
-				],
+				houseTypeList: [],
 				brandTypeList: [
-					'品牌1',
-					'品牌2',
+
 				],
 				lockTypeList: [
-					'指纹款',
-					'人脸识别款',
+
 				],
 				pannelTypeList: [
-					'智能中控',
-					'智能开关',
+
 				],
 				chuanglianTypeList: [
-					'4米内(单层)',
-					'4米内(双层)',
-					'7米内(单层)',
-					'7米内(双层)',
+
 				],
 				ktTypeList: [
-					'柜机',
-					'挂机',
-					'风管机',
-				]
+
+				],
+				rule: null,
+
+				totalPrice: 0,
+
+				selHx: null,
+				selPp: [],
+				selSuo: null,
+				selMb: [],
+				selCl: [],
+				selkt: [],
+				pConfig: -1
+			}
+		},
+		async onLoad(options) {
+			let res = await getIndexConfigReq({
+				type: 3
+			})
+			if (res.code == 0) {
+				console.log('获取首页配置返回值-智控: ', res);
+
+				this.houseTypeList = res.data.house_type
+				this.brandTypeList = res.data.brand
+				this.lockTypeList = res.data.mind_lock
+				this.pannelTypeList = res.data.mind_switch
+				this.chuanglianTypeList = res.data.mind_curtain
+				this.ktTypeList = res.data.mind_air_conditioner
+
+				// this.rule = res.data.rule.content
+
+				this.selHx = res.data.house_type[0]
+				this.selPp = res.data.brand[0]
+				this.selSuo = res.data.mind_lock[0]
+				this.selMb = res.data.mind_switch[0]
+				this.selCl = res.data.mind_curtain[0]
+				this.selKt = res.data.mind_air_conditioner[0]
+				this.getPrice(3, this.selHx.id, this.selPp.id, this.selSuo.id, this.selMb.id, this.selCl.id, this.selKt
+					.id)
 			}
 		},
-		onLoad(options) {},
 		methods: {
+			sel(type, item, index) {
+				if (type == 'hx') {
+					this.currHouseIndex = index
+					this.selHx = item
+				} else if (type == 'pp') {
+					this.currHouseIndex1 = index
+					this.selPp = item
+				} else if (type == 'suo') {
+					this.currHouseIndex2 = index
+					this.selSuo = item
+				} else if (type == 'mb') {
+					this.currHouseIndex3 = index
+					this.selMb = item
+				} else if (type == 'cl') {
+					this.currHouseIndex4 = index
+					this.selCl = item
+				} else if (type == 'kt') {
+					this.currHouseIndex5 = index
+					this.selKt = item
+				}
+
+				this.getPrice(3, this.selHx.id, this.selPp.id, this.selSuo.id, this.selMb.id, this.selCl.id, this.selKt
+					.id)
+			},
+
+			async getPrice(type = 3, house_type, brand, mind_lock, mind_switch, mind_curtain, mind_air_conditioner) {
+				let res = await getDataMoneyReq({
+					type,
+					house_type,
+					brand,
+					mind_lock,
+					mind_switch,
+					mind_curtain,
+					mind_air_conditioner
+				})
+				if (res.code == 0) {
+					console.log('配置价格-智控: ', res)
+					this.totalPrice = res.data.money
+					this.pConfig = res.data.id
+
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+
 			toRule() {
+				getApp().content = this.rule
 				uni.navigateTo({
 					url: '/pages/index/rule/index?type=ctrl'
 				})
 			},
 			toNext() {
+				getApp().selHx = this.selHx
+				getApp().selPp = this.selPp
+				getApp().selSuo = this.selSuo
+				getApp().selMb = this.selMb
+				getApp().selCl = this.selCl
+				getApp().selKt = this.selKt
+				getApp().totalPrice = this.totalPrice
+
+				getApp().pConfig = this.pConfig
 				uni.navigateTo({
 					url: '/pages/index/aiControlSys_step2/index'
 				})

pages/index/aiControlSys_step2/index.vue

@@ -14,26 +14,27 @@
 				<view class="top">
 					<view class="item">
 						<view class="name">
-							品牌
+							户型
 						</view>
 						<view class="des">
-							LANDBOND
+							{{selHx.value}}
 						</view>
 					</view>
 					<view class="item">
 						<view class="name">
-							户型
+							品牌
 						</view>
 						<view class="des">
-							一室两厅
+							{{selPp.value}}
 						</view>
 					</view>
+
 					<view class="item">
 						<view class="name">
 							智能锁
 						</view>
 						<view class="des">
-							指纹款
+							{{selSuo.value}}
 						</view>
 					</view>
 					<view class="item">
@@ -41,7 +42,7 @@
 							智能开关
 						</view>
 						<view class="des">
-							智能中控
+							{{selMb.value}}
 						</view>
 					</view>
 					<view class="item">
@@ -49,7 +50,7 @@
 							智能窗帘
 						</view>
 						<view class="des">
-							4米内(单层)
+							{{selCl.value}}
 						</view>
 					</view>
 
@@ -58,7 +59,7 @@
 							智能空调
 						</view>
 						<view class="des">
-							挂机
+							{{selKt.value}}
 						</view>
 					</view>
 				</view>
@@ -71,7 +72,7 @@
 			<!-- <view class="left" @click="showPreviewConfig=true"> -->
 			<view class="left" @click="">
 				<view class="price">
-					￥2099，9900
+					￥{{totalPrice.toFixed(2)}}
 				</view>
 				<image v-if="!showPreviewConfig" src="/static/index/arrDown.png" mode=""
 					@click="showPreviewConfig=true"></image>
@@ -100,104 +101,40 @@
 					<view class="label">
 						收货人
 					</view>
-					<u--input clearable placeholder="请输入收货人" border="surround" v-model="value"
+					<u--input clearable placeholder="请输入收货人" border="surround" v-model="name"
 						@change="change"></u--input>
 				</view>
 				<view class="item">
 					<view class="label">
 						电话
 					</view>
-					<u--input clearable placeholder="请输入电话" border="surround" v-model="value"
+					<u--input clearable placeholder="请输入电话" border="surround" v-model="phone"
 						@change="change"></u--input>
 				</view>
 				<view class="item" style="margin-bottom: 24rpx;height: auto;">
 					<view class="label">
 						收货地址
 					</view>
-					<u--textarea v-model="value1" placeholder="请输入收货地址"></u--textarea>
+					<u--textarea v-model="addr" placeholder="请输入收货地址"></u--textarea>
 				</view>
 
 				<view class="item" style="margin-bottom: 24rpx;">
 					<view class="label">
 						备注
 					</view>
-					<u--input clearable placeholder="请输入备注" border="surround" v-model="value"
+					<u--input clearable placeholder="请输入备注" border="surround" v-model="remark"
 						@change="change"></u--input>
 				</view>
-				<u-button text="确认下单" color="#333" @click="showFixInfo=false"></u-button>
+				<u-button text="确认下单" color="#333" @click="postOrder"></u-button>
 			</view>
 		</u-popup>
-
-		<!-- 
-		<u-popup :show="showPreviewConfig" @close="close" @open="open" round='10'>
-			<view class="topBar" style="">
-				<view class="left">
-				</view>
-				<view class="cen">
-					清单
-				</view>
-				<view class="close" @click="showPreviewConfig=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>
-				<view class="item">
-					<view class="top">
-						<view class="name">
-							空间
-						</view>
-						<view class="info">
-							全屋
-						</view>
-					</view>
-				</view>
-				<view class="item">
-					<view class="top">
-						<view class="name">
-							品牌
-						</view>
-						<view class="info">
-							XXX品牌
-						</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">
-							标准版
-						</view>
-					</view>
-				</view>
-			</view>
-		</u-popup> -->
-
 	</view>
 </template>
 
 <script>
+	import {
+		postOrderReq,
+	} from '@/api/test/index.js'
 	export default {
 		components: {
 
@@ -208,11 +145,73 @@
 
 				showFixInfo: false,
 
-				showPreviewConfig: false
+				showPreviewConfig: false,
+
+				selHx: null,
+				selPp: null,
+				selSuo: null,
+				selMb: null,
+				selCl: null,
+				selKt: null,
+				totalPrice: null,
+
+				name: '',
+				phone: '',
+				addr: '',
+				remark: '',
+
+				orderId: '',
+
+				pConfig: -1
 			}
 		},
-		onLoad(options) {},
+		onLoad(options) {
+
+			this.selHx = getApp().selHx
+			this.selPp = getApp().selPp
+			this.selSuo = getApp().selSuo
+			this.selMb = getApp().selMb
+			this.selCl = getApp().selCl
+			this.selKt = getApp().selKt
+			this.totalPrice = getApp().totalPrice
+
+			this.pConfig = getApp().pConfig
+		},
 		methods: {
+			async postOrder() {
+				console.log('智控下单参数', {
+					address: this.addr,
+					phone: this.phone,
+					name: this.name,
+					remark: this.remark,
+					config_id: this.selHx.id + ',' + this.selPp.id + ',' + this.selSuo.id + ',' + this.selMb
+						.id + ',' + this.selCl.id + ',' + this.selKt.id,
+					type: 3
+				});
+				let res = await postOrderReq({
+					address: this.addr,
+					phone: this.phone,
+					name: this.name,
+					remark: this.remark,
+					// config_id: this.selHx.id + ',' + this.selPp.id + ',' + this.selSuo.id + ',' + this.selMb
+					// 	.id + ',' + this.selCl.id + ',' + this.selKt.id,
+					config_id: this.pConfig,
+
+					type: 3
+				})
+				if (res.code == 0) {
+					console.log('提交订单返回值: ', res);
+					this.$toast('提交成功')
+
+					this.orderId = res.data.orderId
+					this.showFixInfo = false
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
 			back() {
 				uni.navigateBack()
 			}

pages/index/customMian/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<navBar title="定制我家的主灯" :back="true" color="black" background="white" />
-		<image class="topImg" src="/static/index/main.png" mode=""></image>
+		<image class="topImg" :src="picUrl+'/static/other/noMain_img3.png'" mode=""></image>
 
 		<view class="cen">
 			<image class="water" src="/static/index/water.png" mode=""></image>
@@ -12,12 +12,20 @@
 		<view class="parmasBox">
 			<view class="con">
 				<view class="top">
-					<view class="item" v-for="i in 2">
+					<view class="item">
 						<view class="name">
 							户型
 						</view>
 						<view class="des">
-							一室两厅
+							{{mainPreviewInfo.hx.value}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							系列
+						</view>
+						<view class="des">
+							{{mainPreviewInfo.xl.value}}
 						</view>
 					</view>
 				</view>
@@ -31,17 +39,15 @@
 							客厅灯
 						</view>
 						<view class="num">
-							3盏
+							{{mainPreviewInfo.kt.length}}盏
 						</view>
 					</view>
 					<view class="list">
-						<view class="item" v-for="i in 3">
-							<image src="/static/index/img1.png" mode=""></image>
+						<view class="item" v-for="(item,index) in mainPreviewInfo.kt">
+							<image :src="picBase+item.cover" mode=""></image>
 							<view class="name">
-								BNL12934
+								{{item.model_number}}
 							</view>
-							<!-- <view class="num">
-							</view> -->
 						</view>
 					</view>
 				</view>
@@ -52,17 +58,15 @@
 							餐厅灯
 						</view>
 						<view class="num">
-							3盏
+							{{mainPreviewInfo.ct.length}}盏
 						</view>
 					</view>
 					<view class="list">
-						<view class="item" v-for="i in 1">
-							<image src="/static/index/img1.png" mode=""></image>
+						<view class="item" v-for="(item,index) in mainPreviewInfo.ct">
+							<image :src="picBase+item.cover" mode=""></image>
 							<view class="name">
-								BNL12934
+								{{item.model_number}}
 							</view>
-							<!-- <view class="num">
-							</view> -->
 						</view>
 					</view>
 				</view>
@@ -70,20 +74,18 @@
 				<view class="type">
 					<view class="top2">
 						<view class="label">
-							餐厅灯
+							卧室灯
 						</view>
 						<view class="num">
-							3盏
+							{{mainPreviewInfo.ws.length}}盏
 						</view>
 					</view>
 					<view class="list">
-						<view class="item" v-for="i in 2">
-							<image src="/static/index/img1.png" mode=""></image>
+						<view class="item" v-for="(item,index) in mainPreviewInfo.ws">
+							<image :src="picBase+item.cover" mode=""></image>
 							<view class="name">
-								BNL12934
+								{{item.model_number}}
 							</view>
-							<!-- <view class="num">
-							</view> -->
 						</view>
 					</view>
 				</view>
@@ -91,36 +93,28 @@
 				<view class="type">
 					<view class="top2">
 						<view class="label">
-							餐厅灯
+							阳台灯
 						</view>
 						<view class="num">
-							3盏
+							{{mainPreviewInfo.yt.length}}盏
 						</view>
 					</view>
 					<view class="list">
-						<view class="item" v-for="i in 1">
-							<image src="/static/index/img1.png" mode=""></image>
+						<view class="item" v-for="(item,index) in mainPreviewInfo.yt">
+							<image :src="picBase+item.cover" mode=""></image>
 							<view class="name">
-								BNL12934
+								{{item.model_number}}
 							</view>
-							<!-- <view class="num">
-							</view> -->
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
 		<image @click="back" 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
+					￥{{mainPreviewInfo.totalPrice?mainPreviewInfo.totalPrice.toFixed(2):'0.00'}}
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
@@ -128,21 +122,9 @@
 				确认配置
 			</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">
 					信息填写
@@ -156,33 +138,31 @@
 					<view class="label">
 						收货人
 					</view>
-					<u--input clearable placeholder="请输入收货人" border="surround" v-model="value"
+					<u--input clearable placeholder="请输入收货人" border="surround" v-model="name"
 						@change="change"></u--input>
 				</view>
 				<view class="item">
 					<view class="label">
 						电话
 					</view>
-					<u--input clearable placeholder="请输入电话" border="surround" v-model="value"
+					<u--input clearable placeholder="请输入电话" border="surround" v-model="phone"
 						@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>
+					<u--textarea v-model="addr" placeholder="请输入收货地址"></u--textarea>
 				</view>
 
 				<view class="item" style="margin-bottom: 24rpx;">
 					<view class="label">
 						备注
 					</view>
-					<u--input clearable placeholder="请输入备注" border="surround" v-model="value"
+					<u--input clearable placeholder="请输入备注" border="surround" v-model="remark"
 						@change="change"></u--input>
 				</view>
-				<u-button text="一键下单" color="#333" @click="showFixInfo=false"></u-button>
+				<u-button text="一键下单" color="#333" @click="postOrder"></u-button>
 			</view>
 		</u-popup>
 
@@ -190,19 +170,95 @@
 </template>
 
 <script>
+	import {
+		postOrderReq,
+	} from '@/api/test/index.js'
 	export default {
 		components: {
 
 		},
 		data() {
 			return {
-				showFixInfo: false
+				picUrl: this.$picUrl,
+				picBase: this.$picBase,
+				showFixInfo: false,
+				mainPreviewInfo: null,
+
+				name: '',
+				phone: '',
+				addr: '',
+				remark: '',
+
+				orderId: '',
+				ids: '',
+
+				pConfig: -1
 			}
 		},
-		onLoad(options) {},
+		onLoad(options) {
+			this.pConfig = getApp().pConfig
+
+			this.mainPreviewInfo = getApp().mainPreviewInfo
+			let tempids = []
+			getApp().mainPreviewInfo.kt.forEach((item, index) => {
+				tempids.push(item.id)
+			})
+			getApp().mainPreviewInfo.ct.forEach((item, index) => {
+				tempids.push(item.id)
+			})
+			getApp().mainPreviewInfo.ws.forEach((item, index) => {
+				tempids.push(item.id)
+			})
+			getApp().mainPreviewInfo.yt.forEach((item, index) => {
+				tempids.push(item.id)
+			})
+			tempids.forEach((item, index) => {
+				if (index == tempids.length - 1) {
+					this.ids += item
+				} else {
+					this.ids += (item + ',')
+				}
+			})
+
+			console.log('预览配置信息', this.mainPreviewInfo);
+			console.log('所有灯id', this.ids);
+		},
 		methods: {
 			back() {
 				uni.navigateBack()
+			},
+			async postOrder() {
+				console.log('无主灯下单参数', {
+					address: this.addr,
+					phone: this.phone,
+					name: this.name,
+					remark: this.remark,
+					config_id: this.mainPreviewInfo.hx.id + ',' + this.mainPreviewInfo.xl.id,
+					lamp_id: this.ids,
+					type: 2
+				});
+				let res = await postOrderReq({
+					address: this.addr,
+					phone: this.phone,
+					name: this.name,
+					remark: this.remark,
+					// config_id: this.mainPreviewInfo.hx.id + ',' + this.mainPreviewInfo.xl.id,
+					config_id: this.pConfig,
+					// lamp_id: this.ids,
+					type: 2
+				})
+				if (res.code == 0) {
+					console.log('提交订单返回值: ', res);
+					this.$toast('提交成功')
+
+					this.orderId = res.data.orderId
+					this.showFixInfo = false
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
 			}
 		}
 	}

pages/index/customMian_step1/index.vue

@@ -33,9 +33,9 @@
 			</view>
 
 			<view class="parms">
-				<view v-if="show1" @click="handleSelHuxing(index)" class="item "
+				<view v-if="show1" @click="handleSel1('hx',item,index)" class="item "
 					:class="[currHouseIndex==index?'act':'']" v-for="(item,index) in houseTypeList">
-					{{item}}
+					{{item.value}}
 				</view>
 			</view>
 
@@ -49,13 +49,13 @@
 			</view>
 
 			<view class="parms">
-				<view v-if="show2" @click="currHouseIndex5=index" class="item "
+				<view v-if="show2" @click="handleSel1('xl',item,index)" class="item "
 					:class="[currHouseIndex5==index?'act':'']" v-for="(item,index) in serTypeList">
-					{{item}}
+					{{item.value}}
 				</view>
 			</view>
 
-			<view class="label" style="margin-bottom:32rpx;" @click="toSel">
+			<view class="label" style="margin-bottom:32rpx;" @click="toSel('挑选客厅灯',1)">
 				<view class="txt">
 					挑选客厅灯
 				</view>
@@ -64,13 +64,13 @@
 			</view>
 
 			<view class="parms3">
-				<image @click="handleSelKeting(item,i)" class="item3 " :src="picUrl+'/static/other/main_img1.png'"
-					:class="[currHouseIndex3==i?'act3':'']" v-for="i in 5">
+				<image @click="handleSel('kt',item,index)" class="item3 " :src="picBase+item.cover"
+					:class="[selKt.includes(item)?'act3':'']" v-for="(item,index) in brandTypeList">
 
 				</image>
 			</view>
 
-			<view class="label" style="margin-bottom:32rpx;">
+			<view class="label" style="margin-bottom:32rpx;" @click="toSel('挑选餐厅灯',2)">
 				<view class="txt">
 					挑选餐厅灯
 				</view>
@@ -79,13 +79,13 @@
 			</view>
 
 			<view class="parms3">
-				<image @click="currHouseIndex2=i" class="item3 " :src="picUrl+'/static/other/main_img1.png'"
-					:class="[currHouseIndex2==i?'act3':'']" v-for="i in 5">
+				<image @click="handleSel('ct',item,index)" class="item3 " :src="picBase+item.cover"
+					:class="[selCt.includes(item)?'act3':'']" v-for="(item,index) in lockTypeList">
 
 				</image>
 			</view>
 
-			<view class="label" style="margin-bottom:32rpx;">
+			<view class="label" style="margin-bottom:32rpx;" @click="toSel('挑选卧室灯',3)">
 				<view class="txt">
 					挑选卧室灯
 				</view>
@@ -94,13 +94,13 @@
 			</view>
 
 			<view class="parms3">
-				<image @click="currHouseIndex4=i" class="item3 " :src="picUrl+'/static/other/main_img1.png'"
-					:class="[currHouseIndex4==i?'act3':'']" v-for="i in 5">
+				<image @click="handleSel('ws',item,index)" class="item3 " :src="picBase+item.cover"
+					:class="[selWs.includes(item)?'act3':'']" v-for="(item,index) in chuanglianTypeList">
 
 				</image>
 			</view>
 
-			<view class="label" style="margin-bottom:32rpx;">
+			<view class="label" style="margin-bottom:32rpx;" @click="toSel('挑选阳台灯',4)">
 				<view class="txt">
 					挑选阳台灯
 				</view>
@@ -109,8 +109,8 @@
 			</view>
 
 			<view class="parms3">
-				<image @click="currHouseIndex6=i" class="item3 " :src="picUrl+'/static/other/main_img1.png'"
-					:class="[currHouseIndex6==i?'act3':'']" v-for="i in 5">
+				<image @click="handleSel('yt',item,index)" class="item3 " :src="picBase+item.cover"
+					:class="[selYt.includes(item)?'act3':'']" v-for="(item,index) in pannelTypeList">
 
 				</image>
 			</view>
@@ -128,7 +128,7 @@
 		<view class="bot">
 			<view class="left" @click="showConfig=true">
 				<view class="price">
-					￥2099，9900
+					￥{{totalPrice.toFixed(2)}}
 				</view>
 				<!-- <image src="/static/index/arrDown.png" mode=""></image> -->
 				<image v-if="!showConfig" src="/static/index/arrDown.png" mode="" @click="showConfig=true"></image>
@@ -157,7 +157,7 @@
 							户型
 						</view>
 						<view class="info">
-							一室两厅
+							{{selHx.value}}
 						</view>
 					</view>
 				</view>
@@ -167,7 +167,7 @@
 							系列
 						</view>
 						<view class="info">
-							3系
+							{{selXl.value}}
 						</view>
 					</view>
 				</view>
@@ -177,7 +177,7 @@
 							客厅灯
 						</view>
 						<view class="info">
-							1
+							{{selKt?1:0}}
 						</view>
 					</view>
 				</view>
@@ -187,7 +187,7 @@
 							餐厅灯
 						</view>
 						<view class="info">
-							1
+							{{selCt?1:0}}
 						</view>
 					</view>
 				</view>
@@ -197,7 +197,7 @@
 							卧室灯
 						</view>
 						<view class="info">
-							2
+							{{selWs.length}}
 						</view>
 					</view>
 				</view>
@@ -207,7 +207,7 @@
 							阳台灯
 						</view>
 						<view class="info">
-							1
+							{{selYt?1:0}}
 						</view>
 					</view>
 				</view>
@@ -219,10 +219,10 @@
 				<view class="card">
 					<view class="item">
 						<view class="left">
-							主灯全套定制
+							{{selHx.extend.title}}
 						</view>
 						<view class="right">
-							￥2781.28
+							￥{{selHx.extend.money}}
 						</view>
 					</view>
 
@@ -231,14 +231,14 @@
 							灯具
 						</view>
 						<view class="right">
-							3
+							{{selHx.extend.lampCount}}
 						</view>
 					</view>
 				</view>
 
 				<view class="tip">
 					<image src="/static/index/more.png" mode=""></image>
-					这个套餐为一室两厅，包含3盏灯
+					{{selHx.extend.remark}}
 				</view>
 			</view>
 		</u-modal>
@@ -254,7 +254,11 @@
 <script>
 	import {
 		getIndexConfigReq,
+
 	} from '@/api/test/index.js'
+	import {
+		getDataMoneyReq
+	} from '@/api/index/index.js'
 	export default {
 		components: {
 
@@ -262,6 +266,7 @@
 		data() {
 			return {
 				picUrl: this.$picUrl,
+				picBase: this.$picBase,
 
 				addOrLessIcon1: '/static/index/add.png',
 				addOrLessIcon2: '/static/index/add.png',
@@ -291,38 +296,25 @@
 				currHouseIndex4: 0,
 				currHouseIndex5: 0,
 				currHouseIndex6: 0,
-				houseTypeList: [
-					'一室两厅',
-					'两室两厅',
-					'三室两厅'
-				],
-				brandTypeList: [
-					'品牌1',
-					'品牌2',
-				],
-				lockTypeList: [
-					'全屋',
-					'客餐厅',
-					'主卧室',
-				],
-				pannelTypeList: [
-					'3系',
-					'5系',
-				],
-				chuanglianTypeList: [
-					'标准版',
-					'智能版',
-				],
-				ktTypeList: [
-					'筒灯',
-					'射灯',
-					'线性灯',
-					'磁吸轨道灯',
-				],
+				houseTypeList: [],
+				brandTypeList: [],
+				lockTypeList: [],
+				pannelTypeList: [],
+				chuanglianTypeList: [],
 				serTypeList: [
-					'3系',
-					'5系',
+
 				],
+				rule: null,
+
+				selHx: null,
+				selXl: null,
+				selKt: [],
+				selCt: [],
+				selWs: [],
+				selYt: [],
+				totalPrice: 0,
+
+				pConfig: -1
 			}
 		},
 		async onLoad(o) {
@@ -331,20 +323,45 @@
 			})
 			if (res.code == 0) {
 				console.log('获取首页配置返回值-主灯: ', res);
-				// this.houseTypeList = res.data.house_type
-				// this.brandTypeList = res.data.brand
-				// this.lockTypeList = res.data.space
-				// this.serTypeList = res.data.series
-				// this.chuanglianTypeList = res.data.version
-
-				// this.selHx = res.data.house_type[0]
-				// this.selKj = res.data.space[0]
-				// this.selPp = res.data.brand[0]
-				// this.selXl = res.data.series[0]
-				// this.selBb = res.data.version[0]
+				this.houseTypeList = res.data.house_type
+				this.brandTypeList = res.data.living_room
+				this.lockTypeList = res.data.dining_room_light
+				this.serTypeList = res.data.series
+				this.chuanglianTypeList = res.data.bedroom_lamp
+				this.pannelTypeList = res.data.balcony_light
+
 				// this.rule = res.data.rule.content
 
-				// this.getPrice(1, this.selHx.id, this.selKj.id, this.selPp.id, this.selXl.id, this.selBb.id)
+				this.selHx = res.data.house_type[0]
+				this.selXl = res.data.series[0]
+				this.selKt = [res.data.living_room[0]]
+				this.selCt = [res.data.dining_room_light[0]]
+				this.selWs = [res.data.bedroom_lamp[0]]
+				this.selYt = [res.data.balcony_light[0]]
+
+
+
+				let wsIds1 = []
+				this.selKt.forEach((item, index) => {
+					wsIds1.push(item.id)
+				})
+
+				let wsIds2 = []
+				this.selCt.forEach((item, index) => {
+					wsIds2.push(item.id)
+				})
+				let wsIds3 = []
+				this.selWs.forEach((item, index) => {
+					wsIds3.push(item.id)
+				})
+				let wsIds4 = []
+				this.selYt.forEach((item, index) => {
+					wsIds4.push(item.id)
+				})
+
+				this.getPrice(2, this.selHx.id, this.selXl.id, wsIds1.sort().join(','), wsIds2.sort().join(','), wsIds3
+					.sort().join(','),
+					wsIds4.sort().join(','))
 
 			} else {
 				uni.showToast({
@@ -354,15 +371,69 @@
 			}
 
 		},
+		onShow() {
+			console.log('确定选择的那一项', getApp().chooseItem_kt);
+			if (getApp().chooseItem_kt) {
+				let index = getApp().index_kt
+				let item = getApp().chooseItem_kt
+				let type = ''
+				if (getApp().chooseType == '挑选客厅灯') {
+					type = 'kt'
+				} else if (getApp().chooseType == '挑选餐厅灯') {
+					type = 'ct'
+				} else if (getApp().chooseType == '挑选卧室灯') {
+					type = 'ws'
+				} else {
+					type = 'yt'
+				}
+				this.handleSel(type, item, index, 2)
+				getApp().chooseItem_kt = null
+				getApp().index_kt = null
+				getApp().chooseType = null
+			}
+		},
 		methods: {
+			async getPrice(type = 2, house_type, series, drawing_lamp, canteen_lamp, bedroom_lamp, balcony_lamp) {
+				let res = await getDataMoneyReq({
+					type,
+					house_type,
+					series,
+					drawing_lamp,
+					canteen_lamp,
+					bedroom_lamp,
+					balcony_lamp
+				})
+				if (res.code == 0) {
+					console.log('配置价格-主灯: ', res)
+					this.totalPrice = res.data.money
+					this.pConfig = res.data.id
+
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+
 			goRule() {
+				getApp().content = this.rule
 				uni.navigateTo({
 					url: '/pages/index/rule/index?type=main'
 				})
 			},
-			toSel() {
+			toSel(name, type) {
+				if (type == 1) {
+					getApp().typeList = this.brandTypeList
+				} else if (type == 2) {
+					getApp().typeList = this.lockTypeList
+				} else if (type == 3) {
+					getApp().typeList = this.chuanglianTypeList
+				} else {
+					getApp().typeList = this.pannelTypeList
+				}
 				uni.navigateTo({
-					url: '/pages/index/mainList/index'
+					url: '/pages/index/mainList/index?name=' + name
 				})
 			},
 			handleOpenOrClose(i) {
@@ -374,24 +445,137 @@
 					this['show' + i] = true
 				}
 			},
-			handleSelHuxing(index) {
-				this.currHouseIndex = index
-				this.showHuxing = true
+			handleSel1(type, item, index) {
+				if (type == 'hx') {
+					this.currHouseIndex = index
+					this.selHx = item
+				} else {
+					this.currHouseIndex5 = index
+					this.selXl = item
+				}
+				let wsIds1 = []
+				this.selKt.forEach((item, index) => {
+					wsIds1.push(item.id)
+				})
+
+				let wsIds2 = []
+				this.selCt.forEach((item, index) => {
+					wsIds2.push(item.id)
+				})
+				let wsIds3 = []
+				this.selWs.forEach((item, index) => {
+					wsIds3.push(item.id)
+				})
+				let wsIds4 = []
+				this.selYt.forEach((item, index) => {
+					wsIds4.push(item.id)
+				})
+
+				this.getPrice(2, this.selHx.id, this.selXl.id, wsIds1.sort().join(','), wsIds2.sort().join(','), wsIds3
+					.sort().join(','),
+					wsIds4.sort().join(','))
 			},
-			handleSelKeting(item, index) {
-				item = '1'
-				this.currHouseIndex3 = index
-				this.seledKetingItem = item
+			handleSel(type, item, index, mode = 1) {
+				if (type == 'kt') {
+					this.currHouseIndex3 = index
+					if (!this.selKt.includes(item)) {
+						this.selKt.push(item)
+					} else {
+						if (mode == 1) {
+							let i = this.selKt.findIndex((item1, index1) => {
+								return item1 == item
+							})
+							this.selKt.splice(i, 1)
+						}
+					}
+				} else if (type == 'ct') {
+					this.currHouseIndex2 = index
+					if (!this.selCt.includes(item)) {
+						this.selCt.push(item)
+					} else {
+						if (mode == 1) {
+							let i = this.selCt.findIndex((item1, index1) => {
+								return item1 == item
+							})
+							this.selCt.splice(i, 1)
+						}
+					}
+				} else if (type == 'ws') {
+					this.currHouseIndex4 = index
+					if (!this.selWs.includes(item)) {
+						this.selWs.push(item)
+					} else {
+						if (mode == 1) {
+							let i = this.selWs.findIndex((item1, index1) => {
+								return item1 == item
+							})
+							this.selWs.splice(i, 1)
+						}
+					}
+				} else if (type == 'yt') {
+					this.currHouseIndex6 = index
+					if (!this.selYt.includes(item)) {
+						this.selYt.push(item)
+					} else {
+						if (mode == 1) {
+							let i = this.selYt.findIndex((item1, index1) => {
+								return item1 == item
+							})
+							this.selYt.splice(i, 1)
+						}
+					}
+				}
+				let wsIds1 = []
+				this.selKt.forEach((item, index) => {
+					wsIds1.push(item.id)
+				})
+
+				let wsIds2 = []
+				this.selCt.forEach((item, index) => {
+					wsIds2.push(item.id)
+				})
+				let wsIds3 = []
+				this.selWs.forEach((item, index) => {
+					wsIds3.push(item.id)
+				})
+				let wsIds4 = []
+				this.selYt.forEach((item, index) => {
+					wsIds4.push(item.id)
+				})
+
+				this.getPrice(2, this.selHx.id, this.selXl.id, wsIds1.sort().join(','), wsIds2.sort().join(','), wsIds3
+					.sort().join(','),
+					wsIds4.sort().join(','))
 			},
 			previewConfig() {
-				if (!this.seledKetingItem) {
+				if (!this.selKt) {
 					this.showMissItem = true
 					return
-				} else {
-					uni.navigateTo({
-						url: '/pages/index/customMian/index'
-					})
 				}
+				if (this.selHx.value == '一室两厅' && this.selWs.length < 1) {
+					this.showHuxing = true
+					return
+				} else if (this.selHx.value == '两室两厅' && this.selWs.length < 2) {
+					this.showHuxing = true
+					return
+				} else if (this.selHx.value == '三室两厅' && this.selWs.length < 3) {
+					this.showHuxing = true
+					return
+				}
+
+				getApp().mainPreviewInfo = {
+					hx: this.selHx,
+					xl: this.selXl,
+					kt: this.selKt,
+					ct: this.selCt,
+					ws: this.selWs,
+					yt: this.selYt,
+					price: this.totalPrice
+				}
+				getApp().pConfig = this.pConfig
+				uni.navigateTo({
+					url: '/pages/index/customMian/index'
+				})
 			}
 		}
 	}

pages/index/customNoMian_step1/index.vue

@@ -280,7 +280,9 @@
 
 				rule: '',
 
-				totalPrice: 0
+				totalPrice: 0,
+
+				pConfig: -1
 			}
 		},
 		async onLoad(o) {
@@ -326,6 +328,7 @@
 				if (res.code == 0) {
 					console.log('配置价格-无主灯: ', res)
 					this.totalPrice = res.data.money
+					this.pConfig = res.data.id
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -362,6 +365,7 @@
 				getApp().selXl = this.selXl
 				getApp().selBb = this.selBb
 
+				getApp().pConfig = this.pConfig
 
 				getApp().totalPrice = this.totalPrice
 				uni.navigateTo({

pages/index/customNoMian_step2/index.vue

@@ -118,73 +118,6 @@
 				<u-button text="确认下单" color="#333" @click="postOrder"></u-button>
 			</view>
 		</u-popup>
-
-
-		<!-- <u-popup :show="showPreviewConfig" @close="close" @open="open" round='10'>
-			<view class="topBar" style="">
-				<view class="left">
-				</view>
-				<view class="cen">
-					清单
-				</view>
-				<view class="close" @click="showPreviewConfig=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>
-				<view class="item">
-					<view class="top">
-						<view class="name">
-							空间
-						</view>
-						<view class="info">
-							全屋
-						</view>
-					</view>
-				</view>
-				<view class="item">
-					<view class="top">
-						<view class="name">
-							品牌
-						</view>
-						<view class="info">
-							XXX品牌
-						</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">
-							标准版
-						</view>
-					</view>
-				</view>
-			</view>
-		</u-popup> -->
-
 	</view>
 </template>
 
@@ -217,7 +150,8 @@
 				addr: '',
 				remark: '',
 
-				orderId: ''
+				orderId: '',
+				pConfig: -1
 			}
 		},
 		onLoad(options) {
@@ -228,6 +162,8 @@
 			this.selXl = getApp().selXl
 			this.selBb = getApp().selBb
 
+			this.pConfig = getApp().pConfig
+
 			this.totalPrice = getApp().totalPrice
 		},
 		methods: {
@@ -240,8 +176,9 @@
 					phone: this.phone,
 					name: this.name,
 					remark: this.remark,
-					config_id: this.selHx.id + ',' + this.selKj.id + ',' + this.selPp.id + ',' + this.selXl
-						.id + ',' + this.selBb.id,
+					// config_id: this.selHx.id + ',' + this.selKj.id + ',' + this.selPp.id + ',' + this.selXl
+					// 	.id + ',' + this.selBb.id,
+					config_id: this.pConfig,
 					type: 1
 					// lamp_id: '2,4,6'
 				});
@@ -250,8 +187,7 @@
 					phone: this.phone,
 					name: this.name,
 					remark: this.remark,
-					config_id: this.selHx.id + ',' + this.selKj.id + ',' + this.selPp.id + ',' + this.selXl
-						.id + ',' + this.selBb.id,
+					config_id: this.pConfig,
 					type: 1
 					// lamp_id: '2,4,6'
 				})

pages/index/fullHouseWifi/index.scss

@@ -119,6 +119,10 @@
 			color:#333333 ;
 			border: 1rpx solid #333333;
 			}
+			
+			.item:nth-of-type(2n){
+				margin-right: 0!important;
+			}
 	}
 }
 
@@ -195,4 +199,82 @@
 				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;
+			box-sizing: border-box;
+			.item{
+				margin-bottom: 40rpx;
+				box-sizing: border-box;
+				height: auto;
+				.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;
+					}
+				}
+			}
+			
+		}	

pages/index/fullHouseWifi/index.vue

@@ -33,9 +33,9 @@
 			</view>
 
 			<view class="parms">
-				<view v-if="show1" @click="currHouseIndex=index" class="item " :class="[currHouseIndex==index?'act':'']"
+				<view v-if="show1" @click="sel(item, index)" class="item " :class="[currHouseIndex==index?'act':'']"
 					v-for="(item,index) in houseTypeList" :style="{'margin-right': index==1?'0':''}">
-					{{item}}
+					{{item.value}}
 				</view>
 			</view>
 		</view>
@@ -48,18 +48,70 @@
 		<view class="bot">
 			<view class="left">
 				<view class="price">
-					￥2099，9900
+					￥{{totalPrice.toFixed(2)}}
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
-			<view class="right">
+			<view class="right" @click="showFixInfo=true">
 				一键下单
 			</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="name"
+						@change="change"></u--input>
+				</view>
+				<view class="item">
+					<view class="label">
+						电话
+					</view>
+					<u--input clearable placeholder="请输入电话" border="surround" v-model="phone"
+						@change="change"></u--input>
+				</view>
+				<view class="item" style="margin-bottom: 24rpx;height: auto;">
+					<view class="label">
+						收货地址
+					</view>
+					<u--textarea v-model="addr" placeholder="请输入收货地址"></u--textarea>
+				</view>
+
+				<view class="item" style="margin-bottom: 24rpx;">
+					<view class="label">
+						备注
+					</view>
+					<u--input clearable placeholder="请输入备注" border="surround" v-model="remark"
+						@change="change"></u--input>
+				</view>
+				<u-button text="确认下单" color="#333" @click="postOrder"></u-button>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
 <script>
+	import {
+		getIndexConfigReq,
+		postOrderReq,
+	} from '@/api/test/index.js'
+	import {
+		getDataMoneyReq
+	} from '@/api/index/index.js'
 	export default {
 		components: {
 
@@ -68,6 +120,8 @@
 			return {
 				picUrl: this.$picUrl,
 
+				showFixInfo: false,
+
 				addOrLessIcon1: '/static/index/add.png',
 				addOrLessIcon2: '/static/index/add.png',
 				addOrLessIcon3: '/static/index/add.png',
@@ -82,15 +136,89 @@
 				show5: false,
 
 				currHouseIndex: 0,
-				houseTypeList: [
-					'一室两厅',
-					'两室两厅',
-					'三室两厅'
-				]
+				houseTypeList: [],
+
+				selHx: null,
+
+				totalPrice: 0,
+
+				name: '',
+				phone: '',
+				addr: '',
+				remark: '',
+
+				orderId: '',
+				pConfig: -1
+			}
+		},
+		async onLoad(options) {
+			let res = await getIndexConfigReq({
+				type: 4
+			})
+			if (res.code == 0) {
+				console.log('获取首页配置返回值-全屋WiFi: ', res);
+				this.houseTypeList = res.data.house_type
+
+				this.selHx = res.data.house_type[0]
+
+				this.getPrice(4, this.selHx.id)
 			}
 		},
-		onLoad(options) {},
 		methods: {
+			async postOrder() {
+				console.log('wifi下单参数', {
+					address: this.addr,
+					phone: this.phone,
+					name: this.name,
+					remark: this.remark,
+					config_id: this.selHx.id,
+					type: 4
+				});
+				let res = await postOrderReq({
+					address: this.addr,
+					phone: this.phone,
+					name: this.name,
+					remark: this.remark,
+					// config_id: String(this.selHx.id),
+					config_id: this.pConfig,
+					type: 4
+				})
+				if (res.code == 0) {
+					console.log('提交订单返回值: ', res);
+					this.$toast('提交成功')
+
+					this.orderId = res.data.orderId
+					this.showFixInfo = false
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			sel(item, index) {
+				this.currHouseIndex = index
+				this.selHx = item
+				this.getPrice(4, this.selHx.id)
+			},
+
+			async getPrice(type = 4, house_type) {
+				let res = await getDataMoneyReq({
+					type,
+					house_type,
+				})
+				if (res.code == 0) {
+					console.log('配置价格-wifi: ', res)
+					this.totalPrice = res.data.money
+
+					this.pConfig = res.data.id
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
 			handleOpenOrClose(i) {
 				if (this['addOrLessIcon' + i] == '/static/index/shortLine.png') {
 					this['addOrLessIcon' + i] = '/static/index/add.png'

pages/index/mainDetail/index.scss

@@ -6,6 +6,50 @@
 	height: 1124rpx;
 	border-radius: 0 0rpx 0 40rpx;
 	margin-bottom: 60rpx;
+	position: relative;
+	.indicatorBox1{
+					position: absolute;
+					z-index: 3;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					margin-top: 32rpx;
+					margin-bottom: 34rpx;
+					left: 50%;
+					bottom: 20rpx;
+					.indicator1 {
+					       @include flex(row);
+					       justify-content: center;
+							position: absolute;
+							top: 10rpx;
+					       &__dot1 {
+								width: 24rpx;
+								height: 8rpx;
+								border-radius: 4rpx;
+					            margin: 0 8rpx;
+					            transition: background-color 0.3s;				 
+								 background: #D4D4D4;
+								 // border-radius: 10rpx;
+					           &--active1 {
+					                background-color:#E77817;
+									width: 60rpx;
+					            }
+					       }
+					   }
+					   .indicator-num1 {
+					       padding: 2px 0;
+					       background-color: blue;
+					       border-radius: 100px;
+					       width: 35px;
+					       @include flex;
+					       justify-content: center;
+					
+					       &__text1 {
+					            color: red;
+					            font-size: 12px;
+					        }
+					   }
+				}
 }
 
 .cen{

pages/index/mainDetail/index.vue

@@ -1,12 +1,29 @@
 <template>
 	<view class="page">
 		<navBar title="详情" :back="true" color="black" background="white" />
-		<image class="topImg" :src="picUrl + '/static/other/noMain_img3.png'" mode="heightFix"></image>
+		<view class="topImg">
+			<u-swiper type='img' radius="0rpx 0rpx 0rpx 40rpx" :list="bannerList" keyName="image" indicator
+				indicatorMode="line" :autoplay="true" height="1124rpx" imgMode="heightFix" circular
+				@change="bannerChange">
+				<view slot="indicator">
+				</view>
+			</u-swiper>
+
+			<view class="indicatorBox1">
+				<view class="indicator1">
+					<view class="indicator1__dot1" style="" v-for="(item, index) in bannerList" :key="index"
+						:class="[index === currentNum ?'indicator1__dot1--active1':'']">
+					</view>
+				</view>
+			</view>
+		</view>
 
 		<view class="cen">
 			<image class="water" src="/static/index/water.png" mode=""></image>
 			<image class="halfC" src="/static/index/halfCircle_275.png" mode=""></image>
-			灯具参数
+			<!-- 灯具参数 -->
+
+			{{item.name}}
 		</view>
 
 		<view class="parmasBox">
@@ -16,7 +33,7 @@
 						型号
 					</view>
 					<view class="des">
-						BNL12934
+						{{item.model_number}}
 					</view>
 				</view>
 				<view class="item">
@@ -24,7 +41,7 @@
 						灯体尺寸
 					</view>
 					<view class="des">
-						86cm*29cm
+						{{item.size}}
 					</view>
 				</view>
 				<view class="item">
@@ -32,7 +49,7 @@
 						灯体颜色
 					</view>
 					<view class="des">
-						亮光黑+金
+						{{item.color}}
 					</view>
 				</view>
 				<view class="item">
@@ -40,7 +57,7 @@
 						灯体材质
 					</view>
 					<view class="des">
-						铝材+亚克力
+						{{item.texture}}
 					</view>
 				</view>
 				<view class="item">
@@ -48,7 +65,7 @@
 						产品风格
 					</view>
 					<view class="des">
-						现代简约
+						{{item.style}}
 					</view>
 				</view>
 				<view class="item">
@@ -56,7 +73,7 @@
 						使用空间
 					</view>
 					<view class="des">
-						客厅
+						{{item.space}}
 					</view>
 				</view>
 				<view class="item">
@@ -64,7 +81,7 @@
 						功率
 					</view>
 					<view class="des">
-						108W
+						{{item.power}}
 					</view>
 				</view>
 
@@ -73,7 +90,7 @@
 						光源
 					</view>
 					<view class="des">
-						三色变光
+						{{item.source}}
 					</view>
 				</view>
 				<view class="item">
@@ -81,7 +98,7 @@
 						使用面积
 					</view>
 					<view class="des">
-						20-25平方
+						{{item.area}}
 					</view>
 				</view>
 				<view class="item">
@@ -89,7 +106,7 @@
 						售后保障
 					</view>
 					<view class="des">
-						非人为破坏质保2年
+						{{item.after_sale}}
 					</view>
 				</view>
 			</view>
@@ -99,7 +116,7 @@
 			<view class="lBtn" @click="reset">
 				重新选择
 			</view>
-			<view class="rBtn">
+			<view class="rBtn" @click="chooseConfirm">
 				选中
 			</view>
 		</view>
@@ -115,11 +132,44 @@
 		data() {
 			return {
 				picUrl: this.$picUrl,
+				picBase: this.$picBase,
+				item: null,
+				bannerList: ['/static/index/halfCircle_275.png'],
+				currentNum: 0,
+
+				currIndex: -1,
+
+				name: ''
 			}
 		},
-		onLoad(options) {},
+		onLoad(options) {
+
+			this.item = getApp().ktItem
+			this.currIndex = getApp().ktIndex
+			this.name = getApp().ktName
+			let images = []
+
+			getApp().ktItem.image.forEach((item, index) => {
+				images.push(this.$picBase + item)
+			})
+
+			this.bannerList = images
+
+			console.log('最终收到的详情数据', this.item, this.bannerList);
+		},
 		methods: {
 			reset() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			bannerChange(e) {
+				this.currentNum = e.current
+			},
+			chooseConfirm() {
+				getApp().chooseItem_kt = this.item
+				getApp().index_kt = this.currIndex
+				getApp().chooseType = this.name
 				uni.navigateBack({
 					delta: 2
 				})

pages/index/mainList/index.vue

@@ -1,15 +1,15 @@
 <template>
 	<view class="page">
-		<navBar title="挑选客厅灯" :back="true" color="black" background="white" />
+		<navBar :title="name" :back="true" color="black" background="white" />
 
 		<view class="con">
-			<view class="item" v-for="(item,index) in list" @click="goDetail">
+			<view class="item" v-for="(item,index) in list" @click="goDetail(item,index)">
 				<view class="topBox">
-					<image :src="item.pic" mode=""></image>
+					<image :src="picBase+item.cover" mode=""></image>
 				</view>
 				<view class="bottom">
 					<view class="txt">
-						灯具{{index+1}}
+						{{item.name}}
 					</view>
 				</view>
 			</view>
@@ -26,39 +26,24 @@
 		data() {
 			return {
 				picUrl: this.$picUrl,
+				picBase: this.$picBase,
 
-				list: [{
-						name: '灯具',
-						pic: this.$picUrl + '/static/other/l1.png'
-					}, {
-						name: '灯具',
-						pic: this.$picUrl + '/static/other/l2.png'
-					}, {
-						name: '灯具',
-						pic: this.$picUrl + '/static/other/l3.png'
-					}, {
-						name: '灯具',
-						pic: this.$picUrl + '/static/other/l4.png'
-					}, {
-						name: '灯具',
-						pic: this.$picUrl + '/static/other/l5.png'
-					}, {
-						name: '灯具',
-						pic: this.$picUrl + '/static/other/l6.png'
-					},
-					{
-						name: '灯具',
-						pic: this.$picUrl + '/static/other/l5.png'
-					}, {
-						name: '灯具',
-						pic: this.$picUrl + '/static/other/l6.png'
-					},
-				]
+				list: [],
+				name: '',
 			}
 		},
-		onLoad(options) {},
+		onLoad(o) {
+			this.name = o.name
+
+			this.list = getApp().typeList
+
+			console.log('传过来的列表', this.list);
+		},
 		methods: {
-			goDetail() {
+			goDetail(item, index) {
+				getApp().ktItem = item
+				getApp().ktIndex = index
+				getApp().ktName = this.name
 				uni.navigateTo({
 					url: '/pages/index/mainDetail/index'
 				})

pages/mall.vue

@@ -117,6 +117,9 @@
 
 		},
 		async onLoad() {
+
+		},
+		async onShow() {
 			let res = await getMallCatReq()
 			if (res.code == 0) {
 				console.log('获取商城分类数据返回值: ', res);
@@ -200,8 +203,9 @@
 			},
 			goDetail(item) {
 				// console.log('item');
+				getApp().mallItem = item
 				uni.navigateTo({
-					url: '/pages/mall/detail/index?item=' + JSON.stringify(item)
+					url: '/pages/mall/detail/index'
 				})
 			}
 		},

pages/mall/detail/index.vue

@@ -29,7 +29,7 @@
 						{{content.name}}
 					</view>
 					<view class="right">
-						{{content.collect_total_count}}人已收藏
+						{{totalCount}}人已收藏
 					</view>
 				</view>
 			</view>
@@ -126,15 +126,18 @@
 
 				checkFullSel1: [],
 				checkFullSel: 0,
-				totalPrice: 0
+				totalPrice: 0,
+
+				totalCount: 0
 			}
 		},
 		onLoad(o) {
 			this.content = getApp().mallItem
 			this.bannerList = getApp().mallItem.images
 
-			this.parmsList = getApp().mallItem.skuParams
 
+			this.parmsList = getApp().mallItem.skuParams
+			this.totalCount = this.content.collect_total_count
 
 			this.parmsList.forEach((item, index) => {
 				this.parmsObj[item.title] = null
@@ -149,7 +152,7 @@
 			} else {
 				this.lovePic = "/static/mall/no_love.png"
 			}
-			console.log('接收的需求参数', this.content);
+			console.log('接收的需求参数', this.content, this.bannerList);
 		},
 
 		watch: {
@@ -159,18 +162,19 @@
 						return item == 1
 					})
 					if (res) {
-						this.$toast('参数已全部选择完毕！')
 						let parms = []
 						Object.keys(this.parmsObj).forEach((item4, index8) => {
 							parms.push(this.parmsObj[item4])
 						})
 						console.log(parms);
-						this.totalPrice = 99
 						let res = await getGoodsPriceReq({
+							goods_id: this.content.id,
 							stock: parms
 						})
 						if (res.code == 0) {
 							console.log(res);
+
+							this.totalPrice = res.data
 						} else {
 							uni.showToast({
 								title: res.message,
@@ -196,26 +200,7 @@
 							classify: item[index1].title,
 							value: item[index1].data
 						}
-
-						// let parms = []
-						// Object.keys(this.parmsObj).forEach((item4, index8) => {
-						// 	parms.push(this.parmsObj[item4])
-						// })
-						// console.log(parms);
-
 						this.checkFullSel1[pindex] = 1
-						// let res = await getGoodsPriceReq({
-						// 	stock: parms
-						// })
-						// if (res.code == 0) {
-						// 	console.log(res);
-						// } else {
-						// 	uni.showToast({
-						// 		title: res.message,
-						// 		icon: 'none'
-						// 	})
-						// }
-						// this.totalPrice = 99
 					}
 				})
 			},
@@ -230,6 +215,7 @@
 					if (res.code == 0) {
 						console.log('添加收藏返回值: ', res);
 						this.$toast('收藏成功')
+						this.totalCount += 1
 						if (this.lovePic == "/static/mall/love.png") {
 							this.lovePic = "/static/mall/no_love.png"
 						} else {
@@ -248,6 +234,7 @@
 					if (res.code == 0) {
 						console.log('取消收藏返回值: ', res);
 						this.$toast('取消收藏成功')
+						this.totalCount -= 1
 						if (this.lovePic == "/static/mall/love.png") {
 							this.lovePic = "/static/mall/no_love.png"
 						} else {

pages/mall/goodsList/index.vue

@@ -31,17 +31,25 @@
 				picUrl: this.$picUrl,
 				picBase: this.$picBase,
 				list: [],
-				name: ''
+				name: '',
+
+				brand: 0,
+				type: 0,
+				typeNameId: 0
 			}
 		},
 		async onLoad(o) {
 			console.log('typeNameId ', o.typeNameId);
 			this.name = o.name
+			this.typeNameId = o.typeNameId
+			this.brand = o.brand
+			this.type = o.type
+		},
+		async onShow() {
 			let res = await getMallReq({
-				typeNameId: o.typeNameId,
-				// typeNameId: 11,
-				brand: o.brand,
-				type: o.type,
+				typeNameId: this.typeNameId,
+				brand: this.brand,
+				type: this.type,
 			})
 			if (res.code == 0) {
 				this.list = res.data

pages/my/inviteDetail/index.vue

@@ -111,17 +111,17 @@ height: 140rpx;"></image> -->
 				</view>
 
 				<uni-collapse style="" v-if="type=='vip'||type=='ls'||type=='hy'">
-					<uni-collapse-item titleBorder="none" v-for="i in 10">
+					<uni-collapse-item titleBorder="none" v-for="(item,index) in sucList">
 						<template v-slot:title>
-							<view class="list2" :style="{'margin-bottom':i==-1?'208rpx':''}">
+							<view class="list2" :style="{'margin-bottom':index==-1?'208rpx':''}">
 								<view class="item1">
 									2023-08-23
 								</view>
 								<view class="item1">
-									刘佳佳
+									{{item.name}}
 								</view>
 								<view class="item1">
-									<text>18209380928</text>
+									<text>{{item.phone}}</text>
 								</view>
 							</view>
 						</template>
@@ -132,7 +132,7 @@ height: 140rpx;"></image> -->
 										任职公司
 									</view>
 									<view class="des">
-										家居公司
+										{{item.company}}
 									</view>
 								</view>
 								<view class="item">
@@ -140,7 +140,7 @@ height: 140rpx;"></image> -->
 										VIP
 									</view>
 									<view class="des">
-										S-VIP
+										{{item.status}}
 									</view>
 								</view>
 								<view class="item">
@@ -148,7 +148,7 @@ height: 140rpx;"></image> -->
 										备注
 									</view>
 									<view class="des">
-										你好，现邀请你成为S-VIP，查看专属价格！
+										{{item.remark}}
 									</view>
 								</view>
 							</view>
@@ -167,15 +167,15 @@ height: 140rpx;"></image> -->
 					</uni-collapse-item>
 				</uni-collapse>
 
-				<view class="list2" :style="{'margin-bottom':i==-1?'208rpx':''}" v-else>
+				<view class="list2" :style="{'margin-bottom':index==-1?'208rpx':''}" v-else>
 					<view class="item1">
 						2023-08-23
 					</view>
 					<view class="item1">
-						刘佳佳
+						{{item.name}}
 					</view>
 					<view class="item1">
-						<text>18209380928</text>
+						<text>{{item.phone}}</text>
 					</view>
 				</view>
 				<view class="pos" style="height:208rpx;">
@@ -202,15 +202,15 @@ height: 140rpx;"></image> -->
 				</view>
 
 
-				<view class="list2" :style="{'margin-bottom':i==-1?'208rpx':''}">
+				<view class="list2" :style="{'margin-bottom':index==-1?'208rpx':''}" v-for="(item,index) in failList">
 					<view class="item1" style="width: 192rpx;font-size: 28rpx;">
 						2023-08-23
 					</view>
 					<view class="item1" style="width: 90rpx;font-size: 28rpx;">
-						刘佳佳
+						{{item.name}}
 					</view>
 					<view class="item1" style="width: 120rpx;font-size: 28rpx;margin-left:60rpx;">
-						<text>S-VIP</text>
+						<text>{{item.status}}</text>
 					</view>
 
 					<view class="item1 aginInvite" style="width: 120rpx;font-size: 28rpx;margin-left: 50rpx;">
@@ -364,14 +364,14 @@ height: 140rpx;"></image> -->
 					<view class="label">
 						*姓名
 					</view>
-					<u--input clearable placeholder="请输入姓名" border="surround" v-model="value"
+					<u--input clearable placeholder="请输入姓名" border="surround" v-model="v_xm"
 						@change="change"></u--input>
 				</view>
 				<view class="item">
 					<view class="label">
 						*电话
 					</view>
-					<u--input clearable placeholder="请输入电话" border="surround" v-model="value"
+					<u--input clearable placeholder="请输入电话" border="surround" v-model="v_dh"
 						@change="change"></u--input>
 				</view>
 				<view class="item">
@@ -379,10 +379,8 @@ height: 140rpx;"></image> -->
 						*身份
 					</view>
 					<view class="sel">
-						<u--input placeholder="请选择身份" border="surround" v-model="value" @change="change">
-						</u--input>
-						<image src="/static/index/arrDown.png" mode="" style="width: 16rpx;height: 12rpx;">
-						</image>
+						<uni-data-select placeholder="请选择身份" :clear="true" v-model="v_sf" :localdata="range2"
+							@change="change2"></uni-data-select>
 					</view>
 
 				</view>
@@ -390,17 +388,17 @@ height: 140rpx;"></image> -->
 					<view class="label">
 						任职公司
 					</view>
-					<u--input clearable placeholder="请输入任职公司" border="surround" v-model="value"
+					<u--input clearable placeholder="请输入任职公司" border="surround" v-model="v_gs"
 						@change="change"></u--input>
 				</view>
 				<view class="item" style="margin-bottom: 24rpx;">
 					<view class="label">
 						备注
 					</view>
-					<u--input clearable placeholder="请输入备注" border="surround" v-model="value"
+					<u--input clearable placeholder="请输入备注" border="surround" v-model="v_bz"
 						@change="change"></u--input>
 				</view>
-				<u-button text="确定" color="#333" @click="showVipPop=false"></u-button>
+				<u-button text="确定" color="#333" @click="inviteVip"></u-button>
 			</view>
 		</u-popup>
 	</view>
@@ -408,6 +406,11 @@ height: 140rpx;"></image> -->
 
 <script>
 	import dpupop from '@/components/popup/index.vue'
+	import {
+		postInviteReq,
+		getMyInviteReq,
+		addInviteReq,
+	} from '@/api/test/index.js'
 	export default {
 		components: {
 			dpupop
@@ -426,6 +429,7 @@ height: 140rpx;"></image> -->
 				// inviteSuc: true
 
 				srcValue: 0,
+				value1: 0,
 				range: [{
 						value: 0,
 						text: "来源1"
@@ -439,16 +443,118 @@ height: 140rpx;"></image> -->
 						text: "来源3"
 					},
 				],
+				v_sf: -1,
+				v_xm: '',
+				v_dh: '',
+				v_gs: '',
+				v_bz: '',
+				range2: [{
+						value: 0,
+						text: "S-VIP"
+					},
+					{
+						value: 1,
+						text: "G-VIP"
+					}
+				],
+				failList: [],
+				sucList: [],
+
 			}
 		},
 		onLoad(o) {
 			this.type = o.type
+
+			this.getList()
 			// this.type = 'vip'
 		},
 		methods: {
-			change(e) {
-				console.log("e:", e);
+
+			async inviteVip() {
+				if (!this.v_xm) {
+					return this.$toast('请输入姓名')
+				}
+				if (!this.v_dh) {
+					return this.$toast('请输入电话')
+				}
+				if (this.v_sf == -1) {
+					return this.$toast('请选择身份')
+				}
+				console.log('参数', {
+					// 1VIP，2临时VIP（L），3产业电工，4邀请活动，5，兑换
+					type: 1,
+					name: this.v_xm,
+					phone: this.v_dh,
+					status: this.v_sf ? 'Gvip' : 'Svip',
+					company: this.v_gs,
+					remark: this.v_bz,
+					// project_name: 'project_name'
+				});
+				let res = await postInviteReq({
+					type: 1,
+					name: this.v_xm,
+					phone: this.v_dh,
+					status: this.v_sf ? 'Gvip' : 'Svip',
+					company: this.v_gs,
+					remark: this.v_bz,
+					// project_name: 'project_name'
+				})
+				if (res.code == 0) {
+					this.$toast('邀约成功')
+					console.log('提交vip邀请返回值: ', res);
+					this.showVipPop = false
+					this.v_sf = -1
+					this.v_xm = ''
+					this.v_dh = ''
+					this.v_gs = ''
+					this.v_bz = ''
+
+					this.getList()
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
 			},
+			// change(e) {
+			// 	console.log("e:", e);
+			// },
+
+			change2(e) {
+				// console.log("e:", e, this.v_sf);
+			},
+
+			async getList() {
+				let res1 = await getMyInviteReq({
+					type: 1,
+					state: 0,
+				})
+				if (res1.code == 0) {
+					console.log('获取我的邀请返回值-失败: ', res1);
+
+					this.failList = res1.data.data
+				} else {
+					uni.showToast({
+						title: res1.message,
+						icon: 'none'
+					})
+				}
+				let res2 = await getMyInviteReq({
+					type: 1,
+					state: 1,
+				})
+				if (res2.code == 0) {
+					console.log('获取我的邀请返回值-成功: ', res2);
+
+					this.sucList = res2.data.data
+				} else {
+					uni.showToast({
+						title: res2.message,
+						icon: 'none'
+					})
+				}
+			}
 		}
 	}
 </script>

pages/my/userInfo/index.vue

@@ -48,6 +48,7 @@
 						<input type="text" v-model="userInfo.name" style="width: 100%;text-align: right;">
 					</view>
 				</view>
+
 				<view class="line" @click.stop="showDate=true">
 					<view class="left">
 						生日
@@ -56,6 +57,7 @@
 						{{userInfo.birthday}}
 					</view>
 				</view>
+
 				<view class="line">
 					<view class="left">
 						手机号
@@ -69,12 +71,14 @@
 		</view>
 
 
+
 		<u-action-sheet :actions="list" :title="title" :show="showSex" cancelText="取消" @close="showSex=false"
 			@select="handleSelSex"></u-action-sheet>
 
-		<u-datetime-picker @cancel="showDate = false" @confirm="confirmDate" :show="showDate"
-			:minDate="new Date('1960-1-1').getTime()" :maxDate="Date.now()" v-model="value1" mode="date"
-			confirmColor="#E77817"></u-datetime-picker>
+		<u-datetime-picker ref="datetimePicker" :formatter="formatter" @cancel="showDate = false" @confirm="confirmDate"
+			:show="showDate" :minDate="new Date('1960-1-1').getTime()" :maxDate="Date.now()" v-model="value1"
+			mode="date" confirmColor="#E77817"></u-datetime-picker>
+
 	</view>
 </template>
 
@@ -86,7 +90,9 @@
 		updateUserInfoReq,
 	} from '@/api/test/index.js'
 	export default {
-		components: {},
+		components: {
+
+		},
 		data() {
 			return {
 				showDate: false,
@@ -104,7 +110,7 @@
 					}
 				],
 
-				userInfo: null
+				userInfo: null,
 			}
 		},
 		async onLoad(o) {
@@ -146,7 +152,7 @@
 				}
 			},
 			confirmDate(e) {
-				this.userInfo.birthday = moment(e).format("YYYY-MM-DD")
+				this.userInfo.birthday = moment(this.$refs.datetimePicker.innerValue).format("YYYY-MM-DD")
 				this.showDate = false
 			},
 			handleSelSex(e) {

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

@@ -2,6 +2,6 @@
   "navigationBarTitleText": "",
   "enablePullDownRefresh": false,
   "usingComponents": {
-    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore"
+    "u-parse": "/uni_modules/uview-ui/components/u-parse/u-parse"
   }
 }

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

@@ -1 +1 @@
-<view class="page data-v-59be64d4"><nav-bar vue-id="121fdf82-1" title="定制我家的无主灯" back="{{true}}" color="black" background="white" class="data-v-59be64d4" bind:__l="__l"></nav-bar><view class="con data-v-59be64d4"><block wx:for="{{typeList}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['toNext',['$event']]]]]}}" class="item data-v-59be64d4" bindtap="__e"><view class="label data-v-59be64d4"><image src="/static/index/part1_icon.png" mode class="data-v-59be64d4"></image>{{''+item.name+''}}</view><image src="{{item.img}}" mode class="data-v-59be64d4"></image></view></block></view><u-loadmore vue-id="121fdf82-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-59be64d4" bind:__l="__l"></u-loadmore></view>
+<view class="page data-v-013fded9"><nav-bar vue-id="121fdf82-1" title="定制我家的无主灯" back="{{true}}" color="black" background="white" class="data-v-013fded9" bind:__l="__l"></nav-bar><view class="con data-v-013fded9"><u-parse vue-id="121fdf82-2" content="{{content}}" class="data-v-013fded9" bind:__l="__l"></u-parse></view></view>

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

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

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

@@ -1,5 +1,11 @@
 {
   "navigationBarTitleText": "",
   "enablePullDownRefresh": false,
-  "usingComponents": {}
+  "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/mainDetail/index.json

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

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

@@ -1 +1 @@
-<view class="page data-v-dc8c39a6"><nav-bar vue-id="03562e14-1" title="挑选客厅灯" back="{{true}}" color="black" background="white" class="data-v-dc8c39a6" bind:__l="__l"></nav-bar><view class="con data-v-dc8c39a6"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$event']]]]]}}" class="item data-v-dc8c39a6" bindtap="__e"><view class="topBox data-v-dc8c39a6"><image src="{{item.pic}}" mode class="data-v-dc8c39a6"></image></view><view class="bottom data-v-dc8c39a6"><view class="txt data-v-dc8c39a6">{{'灯具'+(index+1)+''}}</view></view></view></block></view><u-loadmore vue-id="03562e14-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-dc8c39a6" bind:__l="__l"></u-loadmore></view>
+<view class="page data-v-22fe0046"><nav-bar vue-id="03562e14-1" title="{{name}}" back="{{true}}" color="black" background="white" class="data-v-22fe0046" bind:__l="__l"></nav-bar><view class="con data-v-22fe0046"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0',index],[[['list','',index]]]]]]]}}" class="item data-v-22fe0046" bindtap="__e"><view class="topBox data-v-22fe0046"><image src="{{picBase+item.cover}}" mode class="data-v-22fe0046"></image></view><view class="bottom data-v-22fe0046"><view class="txt data-v-22fe0046">{{''+item.name+''}}</view></view></view></block></view><u-loadmore vue-id="03562e14-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-22fe0046" bind:__l="__l"></u-loadmore></view>

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

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

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

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

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

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

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

@@ -1 +1 @@
-<view class="page data-v-b762c016"><nav-bar vue-id="9790385e-1" title="挑选规则" back="{{true}}" color="black" background="white" class="data-v-b762c016" bind:__l="__l"></nav-bar><view class="content data-v-b762c016"><view class="title data-v-b762c016">规则指南</view><block wx:for="{{2}}" wx:for-item="i" wx:for-index="__i0__"><view class="p data-v-b762c016">1、严格参照规则指南选择，没有参照可能会选择提交失败。严格参照规则指南选择，没有参照可能会选择提交失败。</view></block></view></view>
+<view class="page data-v-3f190a87"><nav-bar vue-id="9790385e-1" title="挑选规则" back="{{true}}" color="black" background="white" class="data-v-3f190a87" bind:__l="__l"></nav-bar><view class="content data-v-3f190a87"><u-parse vue-id="9790385e-2" content="{{content}}" class="data-v-3f190a87" bind:__l="__l"></u-parse></view></view>

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

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

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

@@ -1 +1 @@
-.data-v-9927b80e .u-tabs__wrapper__nav__line{background:#f7790c!important}.searchAndTab.data-v-9927b80e{background:#fff;padding-top:24rpx;position:fixed;width:100%;top:173rpx}.searchAndTab .searchBox.data-v-9927b80e{padding:0 32rpx}.content.data-v-9927b80e{display:flex;margin-top:190rpx}.content .leftMenu.data-v-9927b80e{width:212rpx;height:calc(100vh - 360rpx);background:#fff;overflow-y:scroll}.content .leftMenu .item.data-v-9927b80e{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-9927b80e{position:absolute;right:35rpx;top:40rpx;z-index:0}.content .leftMenu .act.data-v-9927b80e{background:#f2f2f2}.content .rightDes.data-v-9927b80e{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-9927b80e{display:flex;align-items:center;justify-content:space-between}.content .rightDes .item .bottom.data-v-9927b80e{display:flex;flex-wrap:wrap;margin-top:32rpx}.content .rightDes .item .bottom image.data-v-9927b80e{width:136rpx;height:136rpx;margin-right:30rpx;margin-bottom:30rpx}
+.data-v-61b0ab50 .u-tabs__wrapper__nav__line{background:#f7790c!important}.searchAndTab.data-v-61b0ab50{background:#fff;padding-top:24rpx;position:fixed;width:100%;top:173rpx}.searchAndTab .searchBox.data-v-61b0ab50{padding:0 32rpx}.content.data-v-61b0ab50{display:flex}.content .leftMenu.data-v-61b0ab50{width:212rpx;height:calc(100vh - 360rpx);background:#fff;overflow-y:scroll}.content .leftMenu .item.data-v-61b0ab50{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-61b0ab50{position:absolute;right:35rpx;top:40rpx;z-index:0}.content .leftMenu .act.data-v-61b0ab50{background:#f2f2f2}.content .rightDes.data-v-61b0ab50{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-61b0ab50{display:flex;align-items:center;justify-content:space-between}.content .rightDes .item .bottom.data-v-61b0ab50{display:flex;flex-wrap:wrap;margin-top:32rpx}.content .rightDes .item .bottom image.data-v-61b0ab50{width:136rpx;height:136rpx;margin-right:30rpx;margin-bottom:30rpx}

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

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

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

@@ -1 +1 @@
-<view class="page data-v-681faa4a"><nav-bar vue-id="f45278de-1" title="筒灯" back="{{true}}" color="black" background="white" class="data-v-681faa4a" bind:__l="__l"></nav-bar><view class="con data-v-681faa4a"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$event']]]]]}}" class="item data-v-681faa4a" bindtap="__e"><view class="topBox data-v-681faa4a"><image src="{{item.pic}}" mode class="data-v-681faa4a"></image></view><view class="bottom data-v-681faa4a"><view class="txt data-v-681faa4a">轻奢型灯具 纵享</view></view></view></block></view><u-loadmore vue-id="f45278de-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-681faa4a" bind:__l="__l"></u-loadmore></view>
+<view class="page data-v-d3bda564"><nav-bar vue-id="f45278de-1" title="{{name}}" back="{{true}}" color="black" background="white" class="data-v-d3bda564" bind:__l="__l"></nav-bar><view class="con data-v-d3bda564"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['list','',index]]]]]]]}}" class="item data-v-d3bda564" bindtap="__e"><view class="topBox data-v-d3bda564"><image src="{{picBase+item.cover}}" mode class="data-v-d3bda564"></image></view><view class="bottom data-v-d3bda564"><view class="txt data-v-d3bda564">{{''+item.name+''}}</view></view></view></block></view><u-loadmore vue-id="f45278de-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-d3bda564" bind:__l="__l"></u-loadmore></view>

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

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

unpackage/dist/build/mp-weixin/pages/my/userInfo/index.wxss

@@ -1 +1 @@
-.content.data-v-4c2817a4{background:#f1f1f1;min-height:calc(100vh - 200rpx);padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-4c2817a4{background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;margin-bottom:24rpx}.content .item .line.data-v-4c2817a4:last-child{border-bottom:none}.content .item .line.data-v-4c2817a4{display:flex;justify-content:space-between;align-items:center;border-bottom:2rpx solid #e6e6e6;height:140rpx}.content .item .line .left.data-v-4c2817a4{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333}.content .item .line .right.data-v-4c2817a4{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333;display:flex;align-items:center}.content .item .line .right .avatar.data-v-4c2817a4{width:100rpx;height:100rpx;border-radius:50%;margin-right:20rpx}.content .item .line .right .arr.data-v-4c2817a4{width:14rpx;height:24rpx}
+.content.data-v-d9cb35f6{background:#f1f1f1;min-height:calc(100vh - 200rpx);padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-d9cb35f6{background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;margin-bottom:24rpx}.content .item .line.data-v-d9cb35f6:last-child{border-bottom:none}.content .item .line.data-v-d9cb35f6{display:flex;justify-content:space-between;align-items:center;border-bottom:2rpx solid #e6e6e6;height:140rpx}.content .item .line .left.data-v-d9cb35f6{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333}.content .item .line .right.data-v-d9cb35f6{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333;display:flex;align-items:center}.content .item .line .right .avatar.data-v-d9cb35f6{width:100rpx;height:100rpx;border-radius:50%;margin-right:20rpx}.content .item .line .right .arr.data-v-d9cb35f6{width:14rpx;height:24rpx}

unpackage/dist/build/mp-weixin/uni_modules/uview-ui/components/u-modal/u-modal.json

@@ -1,8 +1,8 @@
 {
-  "component": true,
   "usingComponents": {
     "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup",
     "u-line": "/uni_modules/uview-ui/components/u-line/u-line",
     "u-loading-icon": "/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon"
-  }
+  },
+  "component": true
 }

unpackage/dist/dev/.sourcemap/mp-weixin/components/gpp-datePicker/gpp-datePicker.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":"","file":"components/gpp-datePicker/gpp-datePicker.js","sourceRoot":""}