9.21

pages.json

@@ -347,7 +347,7 @@
 		"color": "#CBC8C7", //字体颜色
 		"selectedColor": "#F7790C", //选中时字体颜色
 		"borderStyle": "black", //底部的上边框线条
-		"backgroundColor": "#F8F8F8", //底部背景色
+		"backgroundColor": "#fff", //底部背景色
 		"fontSize": "22rpx", //字体大小
 		"spacing": "5px", //字体到图标的距离
 		"height": "50px", //底部高

pages/index.scss

@@ -11,6 +11,10 @@
  
  .container{
 	 padding-bottom: 62rpx;
+	 
+	 overflow-x: hidden;
+	 
+	 // background: red;
  }
 .swiperAndBook{
 	position: relative;
@@ -131,7 +135,7 @@
 				align-items: flex-start;
 				flex-direction: column;
 				image{
-					margin-bottom: -20rpx;
+					margin-bottom: -10rpx;
 					margin-left: -20rpx;
 				}
 				.title{
@@ -171,11 +175,11 @@
 					font-size: 44rpx;
 					font-family: PingFang-SC-Bold, PingFang-SC;
 					font-weight: bold;
-					color:#E1DDDB;
+					color:#E4E0DE;
 					position: absolute;
 					z-index: 1;
 					min-width: 568rpx;
-					top:-35rpx;
+					top:-38rpx;
 					// letter-spacing: 10rpx;
 				}
 				.bt{

pages/index.vue

@@ -1,5 +1,6 @@
 <template>
-	<view class="container">
+	<view class="container" :style="{background:`url(${picUrl+'/static/other/indexB.png'}) no-repeat;`}">
+		<!-- <view class="container"> -->
 		<navBar title="GIGESI 吉格斯" :navImg="navImg" :back="false" color="#333333" background="#FFFFFF" />
 
 		<!-- 轮播和订购区 -->
@@ -12,16 +13,16 @@
 			</view>
 			<view class="bottomBtn">
 				<u-swiper type='img' class="swiper" :list="bannerList" keyName="cover" indicator indicatorMode="line"
-					:autoplay="true" height="996rpx" imgMode="scaleToFill" circular
-					@change="e => currentNum = e.current">
+					:autoplay="true" height="996rpx" imgMode="widthFix" circular @change="e => currentNum = e.current">
 					<view slot="indicator">
 					</view>
 				</u-swiper>
 
 				<view class="bookingAndIndicator">
 					<view class="btn" @click="toList">
-						<text class="btnTxt">立即订购</text>
-						<image src="@/static/index/halfRight.png" mode="" style="width: 24rpx;height: 8rpx;"></image>
+						<text class="btnTxt">一键定制</text>
+						<image src="@/static/index/halfRight.png" mode="" style="width: 24rpx;height: 8rpx;">
+						</image>
 					</view>
 					<view class="indicatorBox">
 						<view class="indicator">
@@ -37,7 +38,8 @@
 			<view class="controlPart" @click="toPage(1)">
 				<view class="top">
 					<view class="left">
-						<image src="/static/index/part1_icon.png" mode="" style="width: 56rpx;height: 28rpx;"></image>
+						<image src="/static/index/part1_icon.png" mode="" style="width: 56rpx;height: 28rpx;">
+						</image>
 						<view class="title">
 							智能控制系统
 						</view>
@@ -52,7 +54,8 @@
 			<view class="controlPart" @click="toPage(2)">
 				<view class="top">
 					<view class="left">
-						<image src="/static/index/part1_icon.png" mode="" style="width: 56rpx;height: 28rpx;"></image>
+						<image src="/static/index/part1_icon.png" mode="" style="width: 56rpx;height: 28rpx;">
+						</image>
 						<view class="title">
 							网络规划-全屋WiFi
 						</view>
@@ -75,7 +78,8 @@
 							<view class="title">
 								产品指南
 							</view>
-							<image src="/static/index/zhinan.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
+							<image src="/static/index/zhinan.png" mode="" style="width: 32rpx;height: 32rpx;">
+							</image>
 						</view>
 					</view>
 					<image src="/static/index/more.png" mode="" style="width: 48rpx;height: 48rpx;"></image>
@@ -92,7 +96,7 @@
 
 
 			<!-- 展厅地址 -->
-			<view class="productLead">
+			<view class="productLead" style="padding-left: 0;">
 				<view class="top">
 					<view class="left">
 						<view class="bottomEng">
@@ -155,8 +159,8 @@
 				currentNum: 0,
 				currentNum1: 0,
 
-				// tabList: ['无主灯', '主灯', '吸顶灯'],
-				tabList: ['无主灯', '主灯'],
+				tabList: ['无主灯', '主灯', '吸顶灯'],
+				// tabList: ['无主灯', '主灯'],
 				currTabIndex: 0,
 
 				navImg: require('@/static/index/logo.png'),
@@ -223,7 +227,9 @@
 						url: '/pages/index/customMian_step1/index'
 					})
 				} else {
-
+					uni.navigateTo({
+						url: '/pages/index/customMian_step1/index?type=5'
+					})
 				}
 			},
 			toPage(i) {

pages/index/aiControlSys/index.scss

@@ -243,6 +243,7 @@
 				.top{
 					display: flex;
 					justify-content: space-between;
+					margin-bottom: 30rpx;
 					.name{
 						font-size: 32rpx;
 						font-family: PingFang-SC-Medium, PingFang-SC;

pages/index/aiControlSys/index.vue

@@ -14,11 +14,11 @@
 						<text style="z-index: 3;position: relative;">定制我家的智能控制</text>
 					</view>
 				</view>
-				<view class="rDes">
+				<view class="rDes" @click="toRule">
 					<view class="con">
 						详情
 					</view>
-					<image src="/static/index/halfRight.png" mode="" style="width: 24rpx;height: 8rpx;">
+					<image :src="picUrl+'/static/other/r_whitebg.png'" mode="" style="width: 24rpx;height: 8rpx;">
 					</image>
 				</view>
 			</view>
@@ -126,12 +126,12 @@
 			</view>
 		</view>
 
-		<view class="rule" @click="toRule">
+		<!-- 	<view class="rule" @click="toRule">
 			<image src="/static/index/ruleImg.png" mode=""></image>
 			<view class="txt">
 				挑选规则
 			</view>
-		</view>
+		</view> -->
 		<view class="bot">
 			<view class="left" @click="showConfig=true">
 				<view class="price">
@@ -163,7 +163,7 @@
 							户型
 						</view>
 						<view class="info">
-							一室两厅
+							{{selHx.value}}
 						</view>
 					</view>
 				</view>
@@ -171,48 +171,56 @@
 				<view class="item">
 					<view class="top">
 						<view class="name">
-							类别
+							品牌
 						</view>
 						<view class="info">
-							3系
+							{{selPp.value}}
 						</view>
 					</view>
-					<view class="bottom">
+					<view class="top">
 						<view class="name">
 							智能锁
 						</view>
 						<view class="info">
-							1
+							{{selSuo.value}}
 						</view>
 					</view>
 
-					<view class="bottom">
+					<view class="top">
 						<view class="name">
 							智能开关
 						</view>
 						<view class="info">
-							1
+							{{selMb.value}}
 						</view>
 					</view>
-					<view class="bottom">
+					<view class="top">
 						<view class="name">
 							智能窗帘
 						</view>
 						<view class="info">
-							2
+							{{selCl.value}}
 						</view>
 					</view>
-				</view>
-				<view class="item">
 					<view class="top">
 						<view class="name">
-							品牌
+							智能空调
 						</view>
 						<view class="info">
-							启源
+							{{selKt.value}}
 						</view>
 					</view>
 				</view>
+				<!-- 	<view class="item">
+					<view class="top">
+						<view class="name">
+							智能空调
+						</view>
+						<view class="info">
+							{{selkt.value}}
+						</view>
+					</view>
+				</view> -->
 			</view>
 		</u-popup>
 	</view>
@@ -234,19 +242,19 @@
 				picUrl: this.$picUrl,
 				picBase: this.$picBase,
 
-				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',
+				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',
+				addOrLessIcon6: '/static/index/shortLine.png',
 
-				show1: false,
-				show2: false,
-				show3: false,
-				show4: false,
-				show5: false,
-				show6: false,
+				show1: true,
+				show2: true,
+				show3: true,
+				show4: true,
+				show5: true,
+				show6: true,
 
 
 				showConfig: false,
@@ -282,7 +290,7 @@
 				selSuo: null,
 				selMb: [],
 				selCl: [],
-				selkt: [],
+				selKt: [],
 				pConfig: -1,
 				cutdownRatio: 1
 			}
@@ -301,7 +309,7 @@
 				this.chuanglianTypeList = res.data.mind_curtain
 				this.ktTypeList = res.data.mind_air_conditioner
 
-				// this.rule = res.data.rule.content
+				this.rule = res.data.rule.content
 
 				this.selHx = res.data.house_type[0]
 				this.selPp = res.data.brand[0]

pages/index/aiControlSys_step2/index.scss

@@ -199,20 +199,21 @@
 		}
 	}
 	.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;
+		display: flex;
+		.btn{
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 4rpx;
+			border: 2rpx solid #333333;
+			width: 180rpx;
+			height: 96rpx;
+		}
 	}
 	
 }

pages/index/aiControlSys_step2/index.vue

@@ -105,7 +105,7 @@
 				</view>
 			</view>
 		</view>
-		<image v-if="!navBarTitle" @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
+		<!-- <image v-if="!navBarTitle" @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image> -->
 		<view class="bot" v-if="!navBarTitle">
 			<!-- <view class="left" @click="showPreviewConfig=true"> -->
 			<view class="left" @click="">
@@ -116,12 +116,16 @@
 					@click="showPreviewConfig=true"></image>
 				<image v-else src="/static/index/arrUp.png" mode="" @click="showPreviewConfig=false"></image>
 			</view>
-			<button open-type="share" v-if="orderSuc" class="right">
-				分享
-			</button>
-
-			<view class="right" v-else @click="showFixInfo=true">
-				确认配置
+			<view class="right">
+				<button open-type="share" v-if="orderSuc" class="btn">
+					分享
+				</button>
+				<view class="btn" v-else @click="showFixInfo=true">
+					确认配置
+				</view>
+				<view class="btn" v-if="!navBarTitle" @click="back" style="margin-left: 20rpx;">
+					返回
+				</view>
 			</view>
 		</view>
 

pages/index/customMian/index.scss

@@ -199,22 +199,22 @@
 		}
 	}
 	.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;
+		display: flex;
+		.btn{
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 4rpx;
+			border: 2rpx solid #333333;
+			width: 180rpx;
+			height: 96rpx;
+		}
 	}
-	
 }
 .rule_img{
 	position: fixed;

pages/index/customMian/index.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="page">
-		<navBar :backType="navBarTitle" :title="navBarTitle?navBarTitle:'定制我家的主灯'" :back="true" color="black"
-			background="white" />
+		<navBar :backType="navBarTitle" :title="navBarTitle?navBarTitle:dType?'定制我家的吸顶灯':'定制我家的主灯'" :back="true"
+			color="black" background="white" />
 		<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>
 			<image class="halfC" src="/static/index/halfCircle_275.png" mode=""></image>
-			定制我家的主灯
+			{{dType?'定制我家的吸顶灯':'定制我家的主灯'}}
 		</view>
 
 		<view class="parmasBox">
@@ -150,7 +150,7 @@
 				</view>
 			</view>
 		</view>
-		<image v-if="!navBarTitle" @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
+		<!-- <image v-if="!navBarTitle" @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image> -->
 		<view class="bot" v-if="!navBarTitle">
 			<view class="left">
 				<view class="price">
@@ -158,12 +158,16 @@
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
-			<button open-type="share" v-if="orderSuc" class="right">
-				分享
-			</button>
-
-			<view class="right" v-else @click="showFixInfo=true">
-				确认配置
+			<view class="right">
+				<button open-type="share" v-if="orderSuc" class="btn">
+					分享
+				</button>
+				<view class="btn" v-else @click="showFixInfo=true">
+					确认配置
+				</view>
+				<view class="btn" v-if="!navBarTitle" @click="back" style="margin-left: 20rpx;">
+					返回
+				</view>
 			</view>
 
 		</view>
@@ -200,7 +204,7 @@
 					<u--textarea v-model="addr" placeholder="请输入收货地址"></u--textarea>
 				</view>
 
-				<view class="item" style="margin-bottom: 24rpx;">
+				<view class="item" style="margin-bottom: 54rpx;height: auto;">
 					<view class="label">
 						备注
 					</view>
@@ -249,11 +253,19 @@
 
 				orderSuc: false,
 
-				navBarTitle: ''
+				navBarTitle: '',
+				dType: 0
 			}
 		},
 		async onLoad(o) {
 			// o.orderId = '5c3455b568c5409270e0d99cbb6057e6'
+			// if (getApp().dType) {
+			// 	this.dType = getApp().dType
+			// }
+			this.dType = Number(o.dType)
+
+			console.log('this.dType', this.dType);
+
 			if (o.orderId) {
 				this.orderId = o.orderId
 				this.navBarTitle = '首页'
@@ -314,7 +326,7 @@
 				return {
 					title: '定制我家的主灯',
 					imageUrl: this.picUrl + '/static/other/noMain_img3.png',
-					path: '/pages/index/customMian/index?orderId=' + this.orderId,
+					path: '/pages/index/customMian/index?orderId=' + this.orderId + "&dType=" + this.dType,
 					mpId: this.$appId,
 					type: this.$shareType,
 				}
@@ -342,7 +354,7 @@
 					// config_id: this.mainPreviewInfo.hx.id + ',' + this.mainPreviewInfo.xl.id,
 					config_id: this.pConfig,
 					// lamp_id: this.ids,
-					type: 2
+					type: 5
 				})
 				if (res.code == 0) {
 					console.log('提交订单返回值: ', res);

pages/index/customMian_step1/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<navBar title="定制我家的主灯" :back="true" color="black" background="white" />
+		<navBar :title="type ? '定制我家的吸顶灯' : '定制我家的主灯'" :back="true" color="black" background="white" />
 
 		<image :src="picUrl+'/static/other/noMain_img3.png'" mode="" class="topBg"></image>
 
@@ -11,14 +11,14 @@
 					<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>
+						<text style="z-index: 3;position: relative;">{{type ? '定制我家的吸顶灯' : '定制我家的主灯'}}</text>
 					</view>
 				</view>
-				<view class="rDes">
+				<view class="rDes" @click="goRule">
 					<view class="con">
 						详情
 					</view>
-					<image src="/static/index/halfRight.png" mode="" style="width: 24rpx;height: 8rpx;">
+					<image :src="picUrl+'/static/other/r_whitebg.png'" mode="" style="width: 24rpx;height: 8rpx;">
 					</image>
 				</view>
 			</view>
@@ -118,13 +118,13 @@
 
 
 		</view>
-
+		<!-- 
 		<view class="rule" @click="goRule">
 			<image src="/static/index/ruleImg.png" mode=""></image>
 			<view class="txt">
 				挑选规则
 			</view>
-		</view>
+		</view> -->
 		<view class="bot">
 			<view class="left" @click="showConfig=true">
 				<view class="price">
@@ -268,18 +268,18 @@
 				picUrl: this.$picUrl,
 				picBase: this.$picBase,
 
-				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',
+				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,
+				show1: true,
+				show2: true,
+				show3: true,
+				show4: true,
+				show5: true,
 
 				showConfig: false,
 
@@ -315,12 +315,17 @@
 				totalPrice: 0,
 
 				pConfig: -1,
-				cutdownRatio: 1
+				cutdownRatio: 1,
+
+				type: 0
 			}
 		},
 		async onLoad(o) {
+			if (o.type) {
+				this.type = o.type
+			}
 			let res = await getIndexConfigReq({
-				type: 2
+				type: o.type ? Number(o.type) : 2
 			})
 			if (res.code == 0) {
 				console.log('获取首页配置返回值-主灯: ', res);
@@ -331,7 +336,7 @@
 				this.chuanglianTypeList = res.data.bedroom_lamp
 				this.pannelTypeList = res.data.balcony_light
 
-				// this.rule = res.data.rule.content
+				this.rule = res.data.rule.content
 
 				this.selHx = res.data.house_type[0]
 				this.selXl = res.data.series[0]
@@ -576,8 +581,9 @@
 					price: this.totalPrice
 				}
 				getApp().pConfig = this.pConfig
+				// getApp().dType = 5
 				uni.navigateTo({
-					url: '/pages/index/customMian/index'
+					url: '/pages/index/customMian/index?dType=' + this.type
 				})
 			}
 		}

pages/index/customNoMian_step1/index.scss

@@ -4,7 +4,7 @@
 }
 .topBg{
 	width: 100vw;
-	height: 800rpx;
+	height: 850rpx;
 	position: relative;
 	z-index: 0;
 }
@@ -55,7 +55,8 @@
 				image{
 					position: absolute;
 					z-index: 2;
-					left: -8%;
+					left: -10%;
+					top: -20rpx;
 				}
 			}
 		}
@@ -85,7 +86,7 @@
 		font-family: PingFang-SC-Bold, PingFang-SC;
 		font-weight: bold;
 		color: #333333;
-		margin-top: 44rpx;
+		margin-top: 64rpx;
 		
 		display: flex;
 		align-items: center;
@@ -98,10 +99,10 @@
 	.parms{
 		display: flex;
 		flex-wrap: wrap;
-		padding-top: 32rpx;
+		padding-top:32rpx;
 		
 		border-bottom: 1rpx solid #EAEAEA;
-		padding-bottom: 46rpx;
+		padding-bottom: 50rpx;
 		position: relative;
 		
 		

pages/index/customNoMian_step1/index.vue

@@ -14,11 +14,11 @@
 						<text style="z-index: 3;position: relative;">定制我家的无主灯</text>
 					</view>
 				</view>
-				<view class="rDes">
+				<view class="rDes" @click="goRule">
 					<view class="con">
 						详情
 					</view>
-					<image src="/static/index/halfRight.png" mode="" style="width: 24rpx;height: 8rpx;">
+					<image :src="picUrl+'/static/other/r_whitebg.png'" mode="" style="width: 24rpx;height: 8rpx;">
 					</image>
 				</view>
 
@@ -120,12 +120,12 @@
 
 		</view>
 
-		<view class="rule" @click="goRule">
+		<!-- <view class="rule" @click="goRule">
 			<image src="/static/index/ruleImg.png" mode=""></image>
 			<view class="txt">
 				挑选规则
 			</view>
-		</view>
+		</view> -->
 		<view class="bot">
 			<view class="left" @click="showConfig=true">
 				<view class="price" style="min-width: 200rpx;">
@@ -221,17 +221,17 @@
 		data() {
 			return {
 				picUrl: this.$picUrl,
-				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',
-
-				show1: false,
-				show2: false,
-				show3: false,
-				show4: false,
-				show5: false,
+				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',
+
+				show1: true,
+				show2: true,
+				show3: true,
+				show4: true,
+				show5: true,
 
 				showConfig: false,
 

pages/index/customNoMian_step2/index.scss

@@ -48,7 +48,7 @@
 			.item{
 				display: flex;
 				justify-content: space-between;
-				margin-bottom: 52rpx;
+				margin-bottom: 40rpx;
 				.name{
 					font-size: 28rpx;
 					font-family: PingFang-SC-Medium, PingFang-SC;
@@ -198,20 +198,21 @@
 		}
 	}
 	.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;
+		display: flex;
+		.btn{
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 4rpx;
+			border: 2rpx solid #333333;
+			width: 180rpx;
+			height: 96rpx;
+		}
 	}
 	
 }

pages/index/customNoMian_step2/index.vue

@@ -97,7 +97,7 @@
 		</view>
 
 
-		<image v-if="!navBarTitle" @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
+		<!-- <image v-if="!navBarTitle" @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image> -->
 		<view class="bot" v-if="!navBarTitle">
 			<!-- <view class="left" @click="showPreviewConfig=true"> -->
 			<view class="left" @click="">
@@ -108,12 +108,18 @@
 					@click="showPreviewConfig=true"></image>
 				<image v-else src="/static/index/arrUp.png" mode="" @click="showPreviewConfig=false"></image>
 			</view>
-			<button open-type="share" v-if="orderSuc" class="right">
-				分享
-			</button>
 
-			<view class="right" v-else @click="showFixInfo=true">
-				确认配置
+
+			<view class="right">
+				<button open-type="share" v-if="orderSuc" class="btn">
+					分享
+				</button>
+				<view class="btn" v-else @click="showFixInfo=true">
+					确认配置
+				</view>
+				<view class="btn" v-if="!navBarTitle" @click="back" style="margin-left: 20rpx;">
+					返回
+				</view>
 			</view>
 		</view>
 
@@ -154,7 +160,7 @@
 					<u--textarea v-model="addr" placeholder="请输入收货地址"></u--textarea>
 				</view>
 
-				<view class="item" style="margin-bottom: 24rpx;">
+				<view class="item" style="margin-bottom: 56rpx;">
 					<view class="label">
 						备注
 					</view>

pages/index/fullHouseWifi/index.vue

@@ -14,11 +14,11 @@
 						<text style="z-index: 3;position: relative;">定制我家的全屋WiFi</text>
 					</view>
 				</view>
-				<view class="rDes">
+				<view class="rDes" @click="toRule">
 					<view class="con">
 						详情
 					</view>
-					<image src="/static/index/halfRight.png" mode="" style="width: 24rpx;height: 8rpx;">
+					<image :src="picUrl+'/static/other/r_whitebg.png'" mode="" style="width: 24rpx;height: 8rpx;">
 					</image>
 				</view>
 			</view>
@@ -126,14 +126,14 @@
 
 				showFixInfo: false,
 
-				addOrLessIcon1: '/static/index/add.png',
+				addOrLessIcon1: '/static/index/shortLine.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,
+				show1: true,
 				show2: false,
 				show3: false,
 				show4: false,
@@ -155,7 +155,8 @@
 				pConfig: -1,
 
 				orderSuc: false,
-				cutdownRatio: 1
+				cutdownRatio: 1,
+				rule: ''
 			}
 		},
 		async onLoad(options) {
@@ -167,6 +168,7 @@
 				this.houseTypeList = res.data.house_type
 
 				this.selHx = res.data.house_type[0]
+				this.rule = res.data.rule.content
 
 				this.getPrice(4, this.selHx.id)
 			}
@@ -186,6 +188,12 @@
 			}
 		},
 		methods: {
+			toRule() {
+				getApp().content = this.rule
+				uni.navigateTo({
+					url: '/pages/index/rule/index?type=wifi'
+				})
+			},
 			async postOrder() {
 				console.log('wifi下单参数', {
 					address: this.addr,

pages/index/rule/index.vue

@@ -3,15 +3,7 @@
 		<navBar title="挑选规则" :back="true" color="black" background="white" />
 
 		<view class="content">
-			<!-- 	<view class="title">
-				规则指南
-			</view>
-			<view class="p" v-for="i in 2">
-				1、严格参照规则指南选择，没有参照可能会选择提交失败。严格参照规则指南选择，没有参照可能会选择提交失败。
-			</view> -->
-			<!-- <image src="/static/index/img1.png" mode=""></image> -->
 			<u-parse :content="content"></u-parse>
-
 		</view>
 
 	</view>
@@ -19,12 +11,10 @@
 
 <script>
 	export default {
-		components: {
-			content: ''
-		},
+		components: {},
 		data() {
 			return {
-
+				content: ''
 			}
 		},
 		onLoad(options) {

pages/mall.scss

@@ -13,6 +13,9 @@
 	position: fixed;
 	width: 100%;
 	top:173rpx;
+	
+	// top:152rpx;
+	// box-shadow: 0px 0px 28px 0px #999;
 	.searchBox{
 		padding: 0 32rpx;
 	}
@@ -35,15 +38,15 @@
 			color: #080F18;
 			display: flex;
 			align-items: center;
-			justify-content: center;
-			padding: 0 10rpx;
+			justify-content: flex-start;
+			padding: 0 20rpx;
 			word-wrap: break-word;
 				word-break: break-all;
 			position: relative;
 		}
 		.halfCircle{
 			position: absolute;
-			right: 35rpx;
+			right: 0rpx;
 			top: 40rpx;
 			z-index: 0;
 		}
@@ -80,6 +83,7 @@
 					height: 136rpx;
 					margin-right: 30rpx;
 					margin-bottom: 30rpx;
+					border-radius: 12rpx;
 				}
 			}
 		}

pages/mall.vue

@@ -34,6 +34,7 @@
 		</view>
 
 		<view class="content" v-else style="margin-top: 190rpx;">
+			<!-- <view class="content" v-else style="margin-top: 158rpx;"> -->
 			<view class="leftMenu">
 				<view class="item" v-for="(item,index) in list2" :class="[index==currBrandIndex?'act':'']"
 					@click=" change2(item,index)">

pages/mall/detail/index.scss

@@ -6,9 +6,9 @@
 }
 .topImg{
 	width: 100%;
-	height: 1124rpx;
+	height: 850rpx;
 	border-radius: 0 0rpx 0 40rpx;
-	margin-bottom: 60rpx;
+	margin-bottom: 56rpx;
 	position: relative;
 	.indicatorBox1{
 					position: absolute;
@@ -64,12 +64,13 @@
 	color: #333333;
 	padding-right: 34rpx;
 	
+	padding-bottom: 48rpx;
 	.love{
-		width: 96rpx;
-		height: 96rpx;
+		width: 128rpx;
+		height: 128rpx;
 		position: absolute;
-		right:40rpx;
-		top: -80rpx;
+		right:48rpx;
+		top: -115rpx;
 	}
 	.water{
 		width: 714rpx;
@@ -98,19 +99,21 @@
 			font-family: PingFang-SC-Medium, PingFang-SC;
 			font-weight: 500;
 			color: #666666;
+			padding-right: 30rpx;
 		}
 	}
 }
 .parmasBox{
 	border-top: 2rpx solid #EAEAEA;
 	// border-bottom: 2rpx solid #EAEAEA;
-	margin-top: 48rpx;
+	// margin-top: 48rpx;
 	width: 100%;
+	padding: 64rpx 0;
 	.con{
 		padding: 0 32rpx;
 		background: #FFFFFF;
-		margin-top: 48rpx;
-		padding-bottom: 48rpx;
+		margin-top: 0rpx;
+		padding-bottom: 0rpx;
 	
 		.title{
 			font-size: 32rpx;
@@ -173,7 +176,7 @@
 				justify-content: center;
 				align-items: center;
 				margin-right: 10rpx;
-				margin-bottom: 20rpx;
+				// margin-bottom: 20rpx;
 			}
 			.act{
 				color: #FFFEFE;

pages/mall/detail/index.vue

@@ -5,7 +5,7 @@
 				background="white" />
 			<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
+					indicatorMode="line" :autoplay="true" height="850rpx" imgMode="heightFix" circular
 					@change="bannerChange">
 					<view slot="indicator">
 					</view>
@@ -34,7 +34,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="parmasBox" v-for="(item,index) in parmsList" v-if="navBarTitle">
+			<!-- 	<view class="parmasBox" v-for="(item,index) in parmsList" v-if="navBarTitle">
 				<view class="con">
 					<view class="title">
 						{{item.title}}
@@ -46,8 +46,8 @@
 						</view>
 					</view>
 				</view>
-			</view>
-			<view class="parmasBox" v-for="(item,index) in parmsList" v-if="!navBarTitle">
+			</view> -->
+			<view class="parmasBox" v-for="(item,index) in parmsList">
 				<view class="con">
 					<view class="title">
 						{{item.title}}
@@ -76,10 +76,7 @@
 				</view>
 			</view>
 		</view>
-
-		<!-- <button >ces</button> -->
-
-		<view class="bot" v-if="!navBarTitle">
+		<view class="bot">
 			<view class="left">
 				<view class="price">
 					￥{{totalPrice.toFixed(2)}}
@@ -87,7 +84,7 @@
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
 			<button open-type="share" class="right">
-				分享
+				一键下单
 			</button>
 			<!-- 	<view class="right" @click="testShare">
 				分享
@@ -141,9 +138,9 @@
 			}
 		},
 		async onLoad(o) {
-			// o.id = 17
+			// o.id = 20
 			if (o.id) {
-				this.ids = JSON.parse(o.ids)
+				// this.ids = JSON.parse(o.ids)
 				this.navBarTitle = '首页'
 				let res = await getMyGoodsDetailReq({
 					id: o.id
@@ -161,6 +158,11 @@
 					} else {
 						this.lovePic = "/static/mall/no_love.png"
 					}
+					this.parmsList.forEach((item, index) => {
+						this.parmsObj[item.title] = null
+						this.checkFullSel1.push(0)
+
+					})
 
 				} else {
 					uni.showToast({
@@ -191,6 +193,8 @@
 
 					})
 
+
+
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -305,6 +309,7 @@
 						this.checkFullSel1[pindex] = 1
 					}
 				})
+				console.log('this.parmsObj', this.parmsObj);
 			},
 			bannerChange(e) {
 				this.currentNum = e.current

pages/my.scss

@@ -5,18 +5,33 @@
 	::v-deep .u-safe-bottom{
 		height: 0!important;
 	}
+	::v-deep button::after{
+		border: none!important;
+	}
 	.content{
 		background:#F4F4F4 ;
 		.top{
 			padding: 0 32rpx;
 			padding-top: 24rpx;
-			background: linear-gradient(to bottom,#FDEED5,#fff);
+			background: linear-gradient(to bottom,#FEF9ED,#fff);
+			// background:#fff;
 			padding-bottom: 40rpx;
 			min-height: 240rpx;
+			position: relative;
+			.myW{
+				width: 298rpx;
+				height: 280rpx;
+				position: absolute;
+				z-index: 0;
+				right: 0;
+				bottom: 0rpx;
+			}
 			.userInfo{
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
+				position: relative;
+				z-index: 1;
 				.left{
 					display: flex;
 					align-items: center;
@@ -74,6 +89,8 @@
 				// padding: 0 32rpx;
 				padding-left: 32rpx;
 				margin-top: 48rpx;
+				position: relative;
+				z-index: 1;
 				.left{
 					display: flex;
 					align-items: center;

pages/my.vue

@@ -1,14 +1,20 @@
 <template>
 	<view class="container">
-		<navBar title="GIGESI 吉格斯" :back="false" color="black" background="#FDEED5" />
+		<navBar title="GIGESI 吉格斯" :back="false" color="black"
+			background="linear-gradient(to bottom,#FDEDD2,#FEF9ED)" />
 		<view class="content">
 			<view class="top">
+				<image class="myW" :src="picUrl+'/static/other/myW.png'" mode=""></image>
 				<view class="userInfo">
 					<view class="left">
-						<button class="avatarBox" @click="toPage('info')">
+						<!-- <button class="avatarBox" @click="toPage('info')">
 							<image class="avatar"
 								:src="userInfo?userInfo.head:picUrl+'/static/other/defaultAvatar.png'"></image>
-						</button>
+						</button> -->
+						<view class="avatarBox" @click="toPage('info')">
+							<image class="avatar"
+								:src="userInfo?userInfo.head:picUrl+'/static/other/defaultAvatar.png'"></image>
+						</view>
 						<text class="btn" v-if="!token" @click="login">请点击登录</text>
 						<text class="btn" v-if="token&&role=='cydg'">{{userInfo.nickname}}</text>
 						<text class="btn" v-if="token&&role=='hy'">{{userInfo.nickname}}</text>
@@ -58,11 +64,11 @@
 					<view class="left">
 						<image :src="picUrl+'/static/my/vip.png'" mode="" style="width: 27rpx;height: 30rpx;">
 						</image>
-						<text>邀约VIP</text>
+						<text>邀约用户</text>
 					</view>
 
 					<view class="right">
-						<text class="price">VIP享专属价格</text>
+						<text class="price">尊享专属价</text>
 						<image :src="picUrl+'/static/my/yellowR.png'" mode=""
 							style="width: 12rpx;height: 20rpx;margin-left: 8rpx;"></image>
 					</view>
@@ -75,7 +81,7 @@
 			<view class="serList">
 				<view class="item" @click="toPage(item)" v-for="(item,index) in serList">
 					<view class="left">
-						<image :src="item.icon" mode="" style="height: 31rpx;width: 35rpx;"></image>
+						<image :src="item.icon" mode="heightFix" style="height: 31rpx;width: 36rpx;"></image>
 						<text>{{item.name}}</text>
 					</view>
 					<view class="right">
@@ -227,7 +233,7 @@
 						}
 					}
 					console.log('当前员工角色', this.role);
-					// this.checkRole()
+					this.checkRole()
 				} else {
 					uni.showToast({
 						title: res.message,

pages/my/actGoodsDetail/index.scss

@@ -6,9 +6,9 @@
 }
 .topImg{
 	width: 100%;
-	height: 1124rpx;
+	height: 850rpx;
 	border-radius: 0 0rpx 0 40rpx;
-	margin-bottom: 60rpx;
+	margin-bottom: 56rpx;
 	position: relative;
 	.indicatorBox1{
 					position: absolute;
@@ -64,12 +64,14 @@
 	color: #333333;
 	padding-right: 34rpx;
 	
+	padding-bottom: 48rpx;
+	
 	.love{
-		width: 96rpx;
-		height: 96rpx;
+		width: 128rpx;
+		height: 128rpx;
 		position: absolute;
-		right:40rpx;
-		top: -80rpx;
+		right:48rpx;
+		top: -115rpx;
 	}
 	.water{
 		width: 714rpx;
@@ -98,19 +100,21 @@
 			font-family: PingFang-SC-Medium, PingFang-SC;
 			font-weight: 500;
 			color: #666666;
+			padding-right: 30rpx;
 		}
 	}
 }
 .parmasBox{
 	border-top: 2rpx solid #EAEAEA;
 	// border-bottom: 2rpx solid #EAEAEA;
-	margin-top: 48rpx;
+	// margin-top: 48rpx;
 	width: 100%;
+	padding: 64rpx 0;
 	.con{
 		padding: 0 32rpx;
 		background: #FFFFFF;
-		margin-top: 48rpx;
-		padding-bottom: 48rpx;
+		// margin-top: 48rpx;
+		// padding-bottom: 48rpx;
 	
 		.title{
 			font-size: 32rpx;
@@ -173,7 +177,7 @@
 				justify-content: center;
 				align-items: center;
 				margin-right: 10rpx;
-				margin-bottom: 20rpx;
+				// margin-bottom: 20rpx;
 			}
 			.act{
 				color: #FFFEFE;

pages/my/actGoodsDetail/index.vue

@@ -5,7 +5,7 @@
 		<!-- <image class="topImg" :src="picUrl + '/static/other/noMain_img3.png'" mode=""></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
+				indicatorMode="line" :autoplay="true" height="850rpx" imgMode="heightFix" circular
 				@change="bannerChange">
 				<view slot="indicator">
 				</view>
@@ -72,7 +72,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="parmasBox" v-for="(item,index) in parmsList" v-if="navBarTitle" :key="index">
+		<!-- 	<view class="parmasBox" v-for="(item,index) in parmsList" v-if="navBarTitle" :key="index">
 			<view class="con">
 				<view class="title">
 					{{item.title}}
@@ -84,8 +84,8 @@
 					</view>
 				</view>
 			</view>
-		</view>
-		<view class="parmasBox" v-for="(item,index) in parmsList" :key="index" v-if="!navBarTitle">
+		</view> -->
+		<view class="parmasBox" v-for="(item,index) in parmsList" :key="index">
 			<view class="con">
 				<view class="title">
 					{{item.title}}
@@ -115,7 +115,7 @@
 		</view>
 		<!-- </view> -->
 
-		<view class="bot" v-if="!navBarTitle">
+		<view class="bot">
 			<view class="left">
 				<view class="price">
 					￥{{totalPrice.toFixed(2)}}
@@ -123,7 +123,7 @@
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
 			<button open-type="share" class="right">
-				分享
+				一键下单
 			</button>
 		</view>
 	</view>
@@ -182,8 +182,9 @@
 			}
 		},
 		async onLoad(o) {
+			// o.id = 23
 			if (o.id) {
-				this.ids = JSON.parse(o.ids)
+				// this.ids = JSON.parse(o.ids)
 				this.navBarTitle = '首页'
 				let res = await getMyGoodsDetailReq({
 					id: o.id
@@ -210,6 +211,13 @@
 
 						this.handleRemianTime(this.actData[0].date)
 					}
+					this.parmsList = res.data.skuParams
+
+					this.parmsList.forEach((item, index) => {
+						this.parmsObj[item.title] = null
+						this.checkFullSel1.push(0)
+
+					})
 				} else {
 					uni.showToast({
 						title: res.message,

pages/my/collectDetail/index.scss

@@ -6,9 +6,9 @@
 }
 .topImg{
 	width: 100%;
-	height: 1124rpx;
+	height: 850rpx;
 	border-radius: 0 0rpx 0 40rpx;
-	margin-bottom: 60rpx;
+	margin-bottom: 56rpx;
 	position: relative;
 	.indicatorBox1{
 					position: absolute;
@@ -64,12 +64,14 @@
 	color: #333333;
 	padding-right: 34rpx;
 	
+	padding-bottom: 48rpx;
+	
 	.love{
-		width: 96rpx;
-		height: 96rpx;
+		width: 128rpx;
+		height: 128rpx;
 		position: absolute;
-		right:40rpx;
-		top: -80rpx;
+		right:48rpx;
+		top: -115rpx;
 	}
 	.water{
 		width: 714rpx;
@@ -98,19 +100,21 @@
 			font-family: PingFang-SC-Medium, PingFang-SC;
 			font-weight: 500;
 			color: #666666;
+			padding-right: 30rpx;
 		}
 	}
 }
 .parmasBox{
 	border-top: 2rpx solid #EAEAEA;
 	// border-bottom: 2rpx solid #EAEAEA;
-	margin-top: 48rpx;
+	// margin-top: 48rpx;
 	width: 100%;
+	padding: 64rpx 0;
 	.con{
 		padding: 0 32rpx;
 		background: #FFFFFF;
-		margin-top: 48rpx;
-		padding-bottom: 48rpx;
+		// margin-top: 48rpx;
+		// padding-bottom: 48rpx;
 	
 		.title{
 			font-size: 32rpx;
@@ -173,7 +177,7 @@
 				justify-content: center;
 				align-items: center;
 				margin-right: 10rpx;
-				margin-bottom: 20rpx;
+				// margin-bottom: 20rpx;
 			}
 			.act{
 				color: #FFFEFE;

pages/my/collectDetail/index.vue

@@ -5,7 +5,7 @@
 				background="white" />
 			<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
+					indicatorMode="line" :autoplay="true" height="850rpx" imgMode="heightFix" circular
 					@change="e => currentNum = e.current">
 					<view slot="indicator">
 					</view>
@@ -34,7 +34,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="parmasBox" v-for="(item,index) in parmsList" v-if="navBarTitle" :key="index">
+			<!-- <view class="parmasBox" v-for="(item,index) in parmsList" v-if="navBarTitle" :key="index">
 				<view class="con">
 					<view class="title">
 						{{item.title}}
@@ -46,8 +46,8 @@
 						</view>
 					</view>
 				</view>
-			</view>
-			<view class="parmasBox" v-for="(item,index) in parmsList" :key="index" v-if="!navBarTitle">
+			</view> -->
+			<view class="parmasBox" v-for="(item,index) in parmsList" :key="index">
 				<view class="con">
 					<view class="title">
 						{{item.title}}
@@ -77,7 +77,7 @@
 			</view>
 		</view>
 
-		<view class="bot" v-if="!navBarTitle">
+		<view class="bot">
 			<view class="left">
 				<view class="price">
 					￥{{totalPrice.toFixed(2)}}
@@ -85,7 +85,7 @@
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
 			<button open-type="share" class="right">
-				分享
+				一键下单
 			</button>
 		</view>
 	</view>
@@ -138,9 +138,9 @@
 			}
 		},
 		async onLoad(o) {
-			// o.id = 1
+			// o.id = 23
 			if (o.id) {
-				this.ids = JSON.parse(o.ids)
+				// this.ids = JSON.parse(o.ids)
 				this.navBarTitle = '首页'
 				let res = await getMyCollectDetailReq({
 					id: o.id

pages/my/feedBack/index.scss

@@ -6,6 +6,9 @@
 ::v-deep .u-textarea__count{
 	background: #F4F4F4!important;
 	font-size: 28rpx!important;
+	right: 24rpx!important;
+	bottom:16rpx!important;
+	padding: 0!important;
 }
 .content{
 	padding: 64rpx 32rpx;
@@ -45,7 +48,9 @@
 		font-family: PingFang-SC-Medium, PingFang-SC;
 		font-weight: 500;
 		color: #FFFFFF;
-		margin-top: 300rpx;
+		width: calc(100% - 64rpx);
+		position: fixed;
+		bottom: 72rpx;
 	}
 }
 
@@ -56,7 +61,7 @@
 		flex-wrap: wrap;
 		position: relative;
 		// border-bottom: 1rpx solid #EDEDED;
-		margin-bottom: 48rpx;
+		margin-bottom: 30rpx;
 		.addpicall {
 			width: 31%;
 			margin-right: 6rpx;
@@ -103,7 +108,7 @@
 		.addPicBox{
 			width: 184rpx;
 			height:186rpx;
-			// border-radius: 24rpx;
+			border-radius: 24rpx;
 			border: 1rpx dashed #E6E6E6;
 			display: flex;
 			justify-content: center;

pages/my/feedBack/index.vue

@@ -10,12 +10,12 @@
 
 
 			<view class="picTop">
-				<view class="title" style="margin-top: 52rpx;">
+				<view class="title" style="margin-top: 52rpx;margin-bottom: 30;">
 					问题图片
 				</view>
 
 				<view class="count">
-					<text style="color: #161717;">{{pic_url.length}}</text>/1
+					<text style="color: #161717;">{{pic_url.length}}</text>/9
 				</view>
 			</view>
 
@@ -37,7 +37,7 @@
 			</view>
 
 
-			<view class="title" style="margin-top: 52rpx;">
+			<view class="title" style="margin-top: 0rpx;">
 				联系方式
 			</view>
 			<input type="number" class="phone" placeholder="电话" v-model="phone">

pages/my/inviteDetail/index.scss

@@ -1,10 +1,14 @@
+::v-deep .uni-collapse-item__wrap-content.uni-collapse-item--border{
+	border-color: #fff!important;
+}
 .page{
 	
 }
 .top{
 	height: 764rpx;
-	background: url('https://oaigc.oss-cn-chengdu.aliyuncs.com/lamp/2023-09/2023090710392974226.png') no-repeat;
-	background-size: 100% 100%;
+	// height:690rpx;
+	// background: url('https://oaigc.oss-cn-chengdu.aliyuncs.com/lamp/2023-09/2023090710392974226.png') no-repeat;
+	background-size: cover;
 	padding: 0 32rpx;
 	
 	.title{
@@ -30,9 +34,9 @@
 				font-size: 56rpx;
 				font-family: Arial-BoldMT, Arial;
 				font-weight: 600;
-				color: #ffe2af;
+				color: #F6DBA9;
 				line-height: 64rpx;
-				text-shadow: 0px 4px 12px rgba(196,93,0,0.1);
+				// text-shadow: 0px 4px 12px rgba(196,93,0,0.1);
 				position: absolute;
 				top: 0;
 				z-index: 0;
@@ -110,7 +114,7 @@
 	height: calc(56vh);
 	background: #FFFFFF;
 	border-radius: 24rpx 24rpx 0rpx 0rpx;
-	margin-top: -20rpx;
+	margin-top: -36rpx;
 	// padding: 0 32rpx;
 	
 	.tab{
@@ -130,7 +134,7 @@
 		.item{
 			font-size: 32rpx;
 			font-family: PingFang-SC-Medium, PingFang-SC;
-			font-weight: 500;
+			font-weight: 300;
 			color: #999999;
 			// position: relative;
 		}
@@ -149,12 +153,12 @@
 			content: '';
 			 position: absolute;
 			overflow: hidden;
-			width: 20rpx;
+			width: 40rpx;
 			height: 8rpx;
 			background: #F7790C;
 			left: 50%;
 			transform: translateX(-50%);
-			bottom: -28rpx;
+			bottom: -32rpx;
 		}
 	}
 	

pages/my/inviteDetail/index.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<!-- <dpupop :show="showLsPop" dtitle="LS会员标签" /> -->
 
-		<view class="top">
+		<view class="top" :style="{background: `url(${picUrl+'/static/other/inviteBg.png'}) no-repeat;`}">
 			<navBar title="" :back="true" color="white" background="rgba(0,0,0,0)" />
 
 			<view class="title">
@@ -30,8 +30,8 @@
 								邀约G-VIP
 							</view>
 						</view>
-						<!-- <image src="/static/index/img1.png" mode="" class="water" style="width: 288rpx;
-height: 140rpx;"></image> -->
+						<image :src="picUrl+'/static/other/inviteW.png'" mode="" class="water" style="width: 288rpx;
+height: 140rpx;"></image>
 
 					</view>
 					<view class="btnG" v-else-if="type=='ls'">
@@ -456,6 +456,7 @@ height: 140rpx;"></image> -->
 		},
 		data() {
 			return {
+				picUrl: this.$picUrl,
 				currTabIndex: 0,
 				type: '',
 

pages/my/otherInfo/index.scss

@@ -26,7 +26,7 @@
 			.left{
 				font-size: 32rpx;
 				font-family: PingFang-SC-Bold, PingFang-SC;
-				font-weight: bold;
+				// font-weight: bold;
 				color: #333333;
 			}
 			.right{

pages/my/sellAfter/index.scss

@@ -26,13 +26,13 @@
 			.left{
 				font-size: 32rpx;
 				font-family: PingFang-SC-Bold, PingFang-SC;
-				font-weight: bold;
+				// font-weight: bold;
 				color: #333333;
 			}
 			.right{
 				font-size: 32rpx;
 				font-family: PingFang-SC-Medium, PingFang-SC;
-				font-weight: 500;
+				// font-weight: 500;
 				color: #333333;
 				display: flex;
 				align-items: center;

pages/my/sellAfter/index.vue

@@ -53,7 +53,7 @@
 				value2: 0,
 				showSheet: false,
 				list: [{
-						name: '换新商品'
+						name: '换新商城'
 					},
 					{
 						name: '换新流程'
@@ -71,7 +71,7 @@
 			},
 			handleSel(e) {
 				this.showSheet = false
-				if (e.name == "换新商品") {
+				if (e.name == "换新商城") {
 					uni.navigateTo({
 						url: '/pages/my/changeNewGoods/index'
 					})

pages/my/sellAfterCon/index.scss

@@ -44,7 +44,7 @@
 						font-size: 64rpx;
 						font-family: Arial-BoldMT, Arial;
 						font-weight: 600;
-						color: #eee;
+						color:#F6F6F6;
 						margin-top: -30rpx;
 					}
 					.top{
@@ -56,9 +56,10 @@
 						position: relative;
 					}
 					.bot1{
+						box-sizing: border-box;
 						margin-top: 18rpx;
-						width: 252rpx;
-						height: 308rpx;
+						width: 250rpx;
+						// height: 308rpx;
 						background: #333333;
 						border-radius: 24rpx;
 						display: flex;
@@ -73,6 +74,7 @@
 							align-items: center;
 							justify-content: center;
 							height: 56rpx;
+							box-sizing: border-box;
 						}
 						.code{
 							box-sizing: border-box;
@@ -80,6 +82,7 @@
 							border-left:4rpx solid #999;
 							border-right:4rpx solid #999;
 							border-bottom:4rpx solid #999;
+							box-sizing: border-box;
 						}
 					}
 					.bot{

pages/my/sellAfterCon/index.vue

@@ -8,7 +8,8 @@
 				<view class="item">
 					<view class="part1">
 						<view class="left">
-							<image :src="picUrl+'/static/my/phone.png'" mode="" style="width: 26rpx;height: 26rpx;">
+							<image :src="picUrl+'/static/my/phone.png'" mode="heightFix"
+								style="width: 26rpx;height: 26rpx;">
 							</image>
 						</view>
 						<view class="cen">
@@ -36,7 +37,8 @@
 				<view class="item">
 					<view class="part1">
 						<view class="left">
-							<image :src="picUrl+'/static/my/wechat.png'" mode="" style="width: 26rpx;height: 26rpx;">
+							<image :src="picUrl+'/static/my/wechat.png'" mode="heightFix"
+								style="width: 26rpx;height: 26rpx;">
 							</image>
 						</view>
 						<view class="cen">
@@ -63,7 +65,8 @@
 				<view class="item" style="height: auto;padding-top: 34rpx;box-sizing: border-box;">
 					<view class="part1">
 						<view class="left">
-							<image :src="picUrl+'/static/my/code.png'" mode="" style="width: 26rpx;height: 26rpx;">
+							<image :src="picUrl+'/static/my/code.png'" mode="heightFix"
+								style="width: 26rpx;height: 26rpx;">
 							</image>
 						</view>
 						<view class="cen">
@@ -78,7 +81,7 @@
 									扫码了解
 								</view>
 								<image class="code" :src="picBase+con.wxCode" mode=""
-									style="width: 250rpx;height: 250rpx;">
+									style="width: 100%;height: 250rpx;">
 								</image>
 							</view>
 						</view>

pages/my/sellAfterDefer/index.scss

@@ -1,3 +1,5 @@
+
+
 .content{
 	background: #F1F1F1;
 	min-height: 100vh;
@@ -9,24 +11,32 @@
 		background: #FFFFFF;
 		border-radius: 0rpx 24rpx 0rpx 24rpx;
 		// margin-top: 24rpx;
-		padding: 0 24rpx;
+		padding: 8rpx 24rpx;
 		display: flex;
 		flex-direction: column;
 		justify-content: space-around;
 		margin-bottom: 24rpx;
+		.t1{
+			justify-content:center!important;
+			font-size: 34rpx;
+			font-weight: bold;
+			text{
+				color: #F7790C;
+			}
+		}
 		.line{
 			display: flex;
 			justify-content:space-between;
 			.left{
 				font-size: 28rpx;
 				font-family: PingFang-SC-Medium, PingFang-SC;
-				font-weight: 500;
+				font-weight: 300;
 				color: #666666;
 			}
 			.right{
 				font-size: 32rpx;
 				font-family: PingFang-SC-Medium, PingFang-SC;
-				font-weight: 500;
+				font-weight:300;
 				color: #333333;
 			}
 		}

pages/my/sellAfterDefer/index.vue

@@ -4,6 +4,10 @@
 
 		<view class="content">
 			<view class="item" v-for="(item,index) in list">
+
+				<view class="line t1">
+					质保到期还剩：<text> {{item.dayCount}}天</text>
+				</view>
 				<view class="line">
 					<view class="left">
 						产品名称
@@ -44,14 +48,6 @@
 						{{item.address}}
 					</view>
 				</view>
-				<view class="line">
-					<view class="left">
-						质保剩余时间
-					</view>
-					<view class="right">
-						{{item.dayCount}}天
-					</view>
-				</view>
 			</view>
 		</view>
 	</view>

pages/my/set/index.scss

@@ -26,7 +26,7 @@
 			.left{
 				font-size: 32rpx;
 				font-family: PingFang-SC-Bold, PingFang-SC;
-				font-weight: bold;
+				// font-weight: bold;
 				color: #333333;
 			}
 			.right{

pages/my/set/index.vue

@@ -32,6 +32,7 @@
 					</view>
 				</view>
 			</view>
+			<u-button text="退出登录" @click="logoOut" color="#333"></u-button>
 		</view>
 	</view>
 </template>
@@ -67,6 +68,24 @@
 			}
 		},
 		methods: {
+			logoOut() {
+				uni.showModal({
+					title: '提示',
+					content: '确认退出?',
+					confirmColor: '#F7790C',
+					success: function(res) {
+						if (res.confirm) {
+							uni.removeStorageSync('token')
+							uni.setStorageSync('switchs', [1, 0, 0])
+							uni.reLaunch({
+								url: '/pages/my'
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
 			change1(e) {
 				if (e) {
 					this.switchs[0] = 1

pages/service.scss

@@ -10,7 +10,7 @@
 			font-weight: bold;
 			color: #333333;
 			margin-bottom: 32rpx;
-			margin-top: 70rpx;
+			margin-top: 50rpx;
 			position: relative;
 			text{
 				position: relative;

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

@@ -41,7 +41,7 @@
 			<swiper-item class="u-swiper__wrapper__item" v-for="(item, index) in defList" :key="index">
 				<view class="u-swiper__wrapper__item__wrapper" :style="[itemStyle(index)]">
 					<view class="u-swiper__wrapper__item__wrapper__image cartDef"
-						style="background: #FDFBFA;background-size: cover;" :style="{
+						style="background:#FDFBFA;background-size: cover;" :style="{
 						height: $u.addUnit(height),
 					}">
 						<!-- background:' url('+picBase+item.cover+') no-repeat;' -->
@@ -213,7 +213,7 @@
 			},
 			// 获取目标路径，可能数组中为字符串，对象的形式，额外可指定对象的目标属性名keyName
 			getSource(item) {
-				if (typeof item === 'string') return  item
+				if (typeof item === 'string') return item
 				if (typeof item === 'object' && this.keyName) return this.picBase + item[this.keyName]
 				else uni.$u.error('请按格式传递列表参数')
 				return ''

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

@@ -1,239 +1,220 @@
 <template>
-    <view class="u-textarea" :class="textareaClass" :style="[textareaStyle]">
-        <textarea
-            class="u-textarea__field"
-            :value="innerValue"
-            :style="{ height: $u.addUnit(height) }"
-            :placeholder="placeholder"
-            :placeholder-style="$u.addStyle(placeholderStyle, 'string')"
-            :placeholder-class="placeholderClass"
-            :disabled="disabled"
-            :focus="focus"
-            :autoHeight="autoHeight"
-            :fixed="fixed"
-            :cursorSpacing="cursorSpacing"
-            :cursor="cursor"
-            :showConfirmBar="showConfirmBar"
-            :selectionStart="selectionStart"
-            :selectionEnd="selectionEnd"
-            :adjustPosition="adjustPosition"
-            :disableDefaultPadding="disableDefaultPadding"
-            :holdKeyboard="holdKeyboard"
-            :maxlength="maxlength"
-            :confirmType="confirmType"
-            :ignoreCompositionEvent="ignoreCompositionEvent"
-            @focus="onFocus"
-            @blur="onBlur"
-            @linechange="onLinechange"
-            @input="onInput"
-            @confirm="onConfirm"
-            @keyboardheightchange="onKeyboardheightchange"
-        ></textarea>
-        <text
-            class="u-textarea__count"
-            :style="{
+	<view class="u-textarea" :class="textareaClass" :style="[textareaStyle]">
+		<textarea class="u-textarea__field" :value="innerValue" :style="{ height: $u.addUnit(height) }"
+			:placeholder="placeholder" :placeholder-style="$u.addStyle(placeholderStyle, 'string')"
+			:placeholder-class="placeholderClass" :disabled="disabled" :focus="focus" :autoHeight="autoHeight"
+			:fixed="fixed" :cursorSpacing="cursorSpacing" :cursor="cursor" :showConfirmBar="showConfirmBar"
+			:selectionStart="selectionStart" :selectionEnd="selectionEnd" :adjustPosition="adjustPosition"
+			:disableDefaultPadding="disableDefaultPadding" :holdKeyboard="holdKeyboard" :maxlength="maxlength"
+			:confirmType="confirmType" :ignoreCompositionEvent="ignoreCompositionEvent" @focus="onFocus" @blur="onBlur"
+			@linechange="onLinechange" @input="onInput" @confirm="onConfirm"
+			@keyboardheightchange="onKeyboardheightchange"></textarea>
+		<text class="u-textarea__count" :style="{
                 'background-color': disabled ? 'transparent' : '#fff',
-            }"
-            v-if="count"
-            >{{ innerValue.length }}/{{ maxlength }}</text
-        >
-    </view>
+            }" v-if="count"><text style="color: black;">{{ innerValue.length }}</text>/{{ maxlength }}</text>
+	</view>
 </template>
 
 <script>
-import props from "./props.js";
-/**
- * Textarea 文本域
- * @description 文本域此组件满足了可能出现的表单信息补充，编辑等实际逻辑的功能，内置了字数校验等
- * @tutorial https://www.uviewui.com/components/textarea.html
- *
- * @property {String | Number} 		value					输入框的内容
- * @property {String | Number}		placeholder				输入框为空时占位符
- * @property {String}			    placeholderClass		指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写/deep/ （ 默认 'input-placeholder' ）
- * @property {String | Object}	    placeholderStyle		指定placeholder的样式，字符串/对象形式，如"color: red;"
- * @property {String | Number}		height					输入框高度（默认 70 ）
- * @property {String}				confirmType				设置键盘右下角按钮的文字，仅微信小程序，App-vue和H5有效（默认 'done' ）
- * @property {Boolean}				disabled				是否禁用（默认 false ）
- * @property {Boolean}				count					是否显示统计字数（默认 false ）
- * @property {Boolean}				focus					是否自动获取焦点，nvue不支持，H5取决于浏览器的实现（默认 false ）
- * @property {Boolean | Function}	autoHeight				是否自动增加高度（默认 false ）
- * @property {Boolean}				fixed					如果textarea是在一个position:fixed的区域，需要显示指定属性fixed为true（默认 false ）
- * @property {Number}				cursorSpacing			指定光标与键盘的距离（默认 0 ）
- * @property {String | Number}		cursor					指定focus时的光标位置
- * @property {Function}			    formatter			    内容式化函数
- * @property {Boolean}				showConfirmBar			是否显示键盘上方带有”完成“按钮那一栏，（默认 true ）
- * @property {Number}				selectionStart			光标起始位置，自动聚焦时有效，需与selection-end搭配使用，（默认 -1 ）
- * @property {Number | Number}		selectionEnd			光标结束位置，自动聚焦时有效，需与selection-start搭配使用（默认 -1 ）
- * @property {Boolean}				adjustPosition			键盘弹起时，是否自动上推页面（默认 true ）
- * @property {Boolean | Number}		disableDefaultPadding	是否去掉 iOS 下的默认内边距，只微信小程序有效（默认 false ）
- * @property {Boolean}				holdKeyboard			focus时，点击页面的时候不收起键盘，只微信小程序有效（默认 false ）
- * @property {String | Number}		maxlength				最大输入长度，设置为 -1 的时候不限制最大长度（默认 140 ）
- * @property {String}				border					边框类型，surround-四周边框，none-无边框，bottom-底部边框（默认 'surround' ）
- * @property {Boolean}				ignoreCompositionEvent	是否忽略组件内对文本合成系统事件的处理
- *
- * @event {Function(e)} focus					输入框聚焦时触发，event.detail = { value, height }，height 为键盘高度
- * @event {Function(e)} blur					输入框失去焦点时触发，event.detail = {value, cursor}
- * @event {Function(e)} linechange				输入框行数变化时调用，event.detail = {height: 0, heightRpx: 0, lineCount: 0}
- * @event {Function(e)} input					当键盘输入时，触发 input 事件
- * @event {Function(e)} confirm					点击完成时， 触发 confirm 事件
- * @event {Function(e)} keyboardheightchange	键盘高度发生变化的时候触发此事件
- * @example <u--textarea v-model="value1" placeholder="请输入内容" ></u--textarea>
- */
-export default {
-    name: "u-textarea",
-    mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
-	data() {
-		return {
-			// 输入框的值
-			innerValue: "",
-			// 是否处于获得焦点状态
-			focused: false,
-			// value是否第一次变化，在watch中，由于加入immediate属性，会在第一次触发，此时不应该认为value发生了变化
-			firstChange: true,
-			// value绑定值的变化是由内部还是外部引起的
-			changeFromInner: false,
-			// 过滤处理方法
-			innerFormatter: value => value
-		}
-	},
-	watch: {
-	    value: {
-	        immediate: true,
-	        handler(newVal, oldVal) {
-	            this.innerValue = newVal;
-	            /* #ifdef H5 */
-	            // 在H5中，外部value变化后，修改input中的值，不会触发@input事件，此时手动调用值变化方法
-	            if (
-	                this.firstChange === false &&
-	                this.changeFromInner === false
-	            ) {
-	                this.valueChange();
-	            }
-	            /* #endif */
-	            this.firstChange = false;
-	            // 重置changeFromInner的值为false，标识下一次引起默认为外部引起的
-	            this.changeFromInner = false;
-	        },
-	    },
-	},
-    computed: {
-        // 组件的类名
-        textareaClass() {
-            let classes = [],
-                { border, disabled, shape } = this;
-            border === "surround" &&
-                (classes = classes.concat(["u-border", "u-textarea--radius"]));
-            border === "bottom" &&
-                (classes = classes.concat([
-                    "u-border-bottom",
-                    "u-textarea--no-radius",
-                ]));
-            disabled && classes.push("u-textarea--disabled");
-            return classes.join(" ");
-        },
-        // 组件的样式
-        textareaStyle() {
-            const style = {};
-            // #ifdef APP-NVUE
-            // 由于textarea在安卓nvue上的差异性，需要额外再调整其内边距
-            if (uni.$u.os() === "android") {
-                style.paddingTop = "6px";
-                style.paddingLeft = "9px";
-                style.paddingBottom = "3px";
-                style.paddingRight = "6px";
-            }
-            // #endif
-            return uni.$u.deepMerge(style, uni.$u.addStyle(this.customStyle));
-        },
-    },
-    methods: {
-		// 在微信小程序中，不支持将函数当做props参数，故只能通过ref形式调用
-		setFormatter(e) {
-			this.innerFormatter = e
+	import props from "./props.js";
+	/**
+	 * Textarea 文本域
+	 * @description 文本域此组件满足了可能出现的表单信息补充，编辑等实际逻辑的功能，内置了字数校验等
+	 * @tutorial https://www.uviewui.com/components/textarea.html
+	 *
+	 * @property {String | Number} 		value					输入框的内容
+	 * @property {String | Number}		placeholder				输入框为空时占位符
+	 * @property {String}			    placeholderClass		指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写/deep/ （ 默认 'input-placeholder' ）
+	 * @property {String | Object}	    placeholderStyle		指定placeholder的样式，字符串/对象形式，如"color: red;"
+	 * @property {String | Number}		height					输入框高度（默认 70 ）
+	 * @property {String}				confirmType				设置键盘右下角按钮的文字，仅微信小程序，App-vue和H5有效（默认 'done' ）
+	 * @property {Boolean}				disabled				是否禁用（默认 false ）
+	 * @property {Boolean}				count					是否显示统计字数（默认 false ）
+	 * @property {Boolean}				focus					是否自动获取焦点，nvue不支持，H5取决于浏览器的实现（默认 false ）
+	 * @property {Boolean | Function}	autoHeight				是否自动增加高度（默认 false ）
+	 * @property {Boolean}				fixed					如果textarea是在一个position:fixed的区域，需要显示指定属性fixed为true（默认 false ）
+	 * @property {Number}				cursorSpacing			指定光标与键盘的距离（默认 0 ）
+	 * @property {String | Number}		cursor					指定focus时的光标位置
+	 * @property {Function}			    formatter			    内容式化函数
+	 * @property {Boolean}				showConfirmBar			是否显示键盘上方带有”完成“按钮那一栏，（默认 true ）
+	 * @property {Number}				selectionStart			光标起始位置，自动聚焦时有效，需与selection-end搭配使用，（默认 -1 ）
+	 * @property {Number | Number}		selectionEnd			光标结束位置，自动聚焦时有效，需与selection-start搭配使用（默认 -1 ）
+	 * @property {Boolean}				adjustPosition			键盘弹起时，是否自动上推页面（默认 true ）
+	 * @property {Boolean | Number}		disableDefaultPadding	是否去掉 iOS 下的默认内边距，只微信小程序有效（默认 false ）
+	 * @property {Boolean}				holdKeyboard			focus时，点击页面的时候不收起键盘，只微信小程序有效（默认 false ）
+	 * @property {String | Number}		maxlength				最大输入长度，设置为 -1 的时候不限制最大长度（默认 140 ）
+	 * @property {String}				border					边框类型，surround-四周边框，none-无边框，bottom-底部边框（默认 'surround' ）
+	 * @property {Boolean}				ignoreCompositionEvent	是否忽略组件内对文本合成系统事件的处理
+	 *
+	 * @event {Function(e)} focus					输入框聚焦时触发，event.detail = { value, height }，height 为键盘高度
+	 * @event {Function(e)} blur					输入框失去焦点时触发，event.detail = {value, cursor}
+	 * @event {Function(e)} linechange				输入框行数变化时调用，event.detail = {height: 0, heightRpx: 0, lineCount: 0}
+	 * @event {Function(e)} input					当键盘输入时，触发 input 事件
+	 * @event {Function(e)} confirm					点击完成时， 触发 confirm 事件
+	 * @event {Function(e)} keyboardheightchange	键盘高度发生变化的时候触发此事件
+	 * @example <u--textarea v-model="value1" placeholder="请输入内容" ></u--textarea>
+	 */
+	export default {
+		name: "u-textarea",
+		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
+		data() {
+			return {
+				// 输入框的值
+				innerValue: "",
+				// 是否处于获得焦点状态
+				focused: false,
+				// value是否第一次变化，在watch中，由于加入immediate属性，会在第一次触发，此时不应该认为value发生了变化
+				firstChange: true,
+				// value绑定值的变化是由内部还是外部引起的
+				changeFromInner: false,
+				// 过滤处理方法
+				innerFormatter: value => value
+			}
+		},
+		watch: {
+			value: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					this.innerValue = newVal;
+					/* #ifdef H5 */
+					// 在H5中，外部value变化后，修改input中的值，不会触发@input事件，此时手动调用值变化方法
+					if (
+						this.firstChange === false &&
+						this.changeFromInner === false
+					) {
+						this.valueChange();
+					}
+					/* #endif */
+					this.firstChange = false;
+					// 重置changeFromInner的值为false，标识下一次引起默认为外部引起的
+					this.changeFromInner = false;
+				},
+			},
 		},
-        onFocus(e) {
-            this.$emit("focus", e);
-        },
-        onBlur(e) {
-            this.$emit("blur", e);
-            // 尝试调用u-form的验证方法
-            uni.$u.formValidate(this, "blur");
-        },
-        onLinechange(e) {
-            this.$emit("linechange", e);
-        },
-        onInput(e) {
-			let { value = "" } = e.detail || {};
-			// 格式化过滤方法
-			const formatter = this.formatter || this.innerFormatter
-			const formatValue = formatter(value)
-			// 为了避免props的单向数据流特性，需要先将innerValue值设置为当前值，再在$nextTick中重新赋予设置后的值才有效
-			this.innerValue = value
-			this.$nextTick(() => {
-				this.innerValue = formatValue;
-				this.valueChange();
-			})
-        },
-		// 内容发生变化，进行处理
-		valueChange() {
-		    const value = this.innerValue;
-		    this.$nextTick(() => {
-		        this.$emit("input", value);
-		        // 标识value值的变化是由内部引起的
-		        this.changeFromInner = true;
-		        this.$emit("change", value);
-		        // 尝试调用u-form的验证方法
-		        uni.$u.formValidate(this, "change");
-		    });
+		computed: {
+			// 组件的类名
+			textareaClass() {
+				let classes = [],
+					{
+						border,
+						disabled,
+						shape
+					} = this;
+				border === "surround" &&
+					(classes = classes.concat(["u-border", "u-textarea--radius"]));
+				border === "bottom" &&
+					(classes = classes.concat([
+						"u-border-bottom",
+						"u-textarea--no-radius",
+					]));
+				disabled && classes.push("u-textarea--disabled");
+				return classes.join(" ");
+			},
+			// 组件的样式
+			textareaStyle() {
+				const style = {};
+				// #ifdef APP-NVUE
+				// 由于textarea在安卓nvue上的差异性，需要额外再调整其内边距
+				if (uni.$u.os() === "android") {
+					style.paddingTop = "6px";
+					style.paddingLeft = "9px";
+					style.paddingBottom = "3px";
+					style.paddingRight = "6px";
+				}
+				// #endif
+				return uni.$u.deepMerge(style, uni.$u.addStyle(this.customStyle));
+			},
 		},
-        onConfirm(e) {
-            this.$emit("confirm", e);
-        },
-        onKeyboardheightchange(e) {
-            this.$emit("keyboardheightchange", e);
-        },
-    },
-};
+		methods: {
+			// 在微信小程序中，不支持将函数当做props参数，故只能通过ref形式调用
+			setFormatter(e) {
+				this.innerFormatter = e
+			},
+			onFocus(e) {
+				this.$emit("focus", e);
+			},
+			onBlur(e) {
+				this.$emit("blur", e);
+				// 尝试调用u-form的验证方法
+				uni.$u.formValidate(this, "blur");
+			},
+			onLinechange(e) {
+				this.$emit("linechange", e);
+			},
+			onInput(e) {
+				let {
+					value = ""
+				} = e.detail || {};
+				// 格式化过滤方法
+				const formatter = this.formatter || this.innerFormatter
+				const formatValue = formatter(value)
+				// 为了避免props的单向数据流特性，需要先将innerValue值设置为当前值，再在$nextTick中重新赋予设置后的值才有效
+				this.innerValue = value
+				this.$nextTick(() => {
+					this.innerValue = formatValue;
+					this.valueChange();
+				})
+			},
+			// 内容发生变化，进行处理
+			valueChange() {
+				const value = this.innerValue;
+				this.$nextTick(() => {
+					this.$emit("input", value);
+					// 标识value值的变化是由内部引起的
+					this.changeFromInner = true;
+					this.$emit("change", value);
+					// 尝试调用u-form的验证方法
+					uni.$u.formValidate(this, "change");
+				});
+			},
+			onConfirm(e) {
+				this.$emit("confirm", e);
+			},
+			onKeyboardheightchange(e) {
+				this.$emit("keyboardheightchange", e);
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
+	@import "../../libs/css/components.scss";
 
-.u-textarea {
-    border-radius: 4px;
-    background-color: #fff;
-    position: relative;
-    @include flex;
-    flex: 1;
-	padding: 9px;
+	.u-textarea {
+		border-radius: 4px;
+		background-color: #fff;
+		position: relative;
+		@include flex;
+		flex: 1;
+		padding: 9px;
 
-    &--radius {
-        border-radius: 4px;
-    }
+		&--radius {
+			border-radius: 4px;
+		}
 
-    &--no-radius {
-        border-radius: 0;
-    }
+		&--no-radius {
+			border-radius: 0;
+		}
 
-    &--disabled {
-        background-color: #f5f7fa;
-    }
+		&--disabled {
+			background-color: #f5f7fa;
+		}
 
-    &__field {
-        flex: 1;
-        font-size: 15px;
-        color: $u-content-color;
-		width: 100%;
-    }
+		&__field {
+			flex: 1;
+			font-size: 15px;
+			color: $u-content-color;
+			width: 100%;
+		}
 
-    &__count {
-        position: absolute;
-        right: 5px;
-        bottom: 2px;
-        font-size: 12px;
-        color: $u-tips-color;
-        background-color: #ffffff;
-        padding: 1px 4px;
-    }
-}
-</style>
+		&__count {
+			position: absolute;
+			right: 5px;
+			bottom: 2px;
+			font-size: 12px;
+			color: $u-tips-color;
+			background-color: #ffffff;
+			padding: 1px 4px;
+		}
+	}
+</style>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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