9.8

components/navBar/index.scss

@@ -2,6 +2,8 @@
 			// background-image: url('https://img-home.csdnimg.cn/images/20230817060237.png') !important;
 			// background-size: 100% 100% !important;
 			background: green;
+			position: relative;
+			// z-index: 99;
 			.narbar-flexd {
 				// background-image: url('https://img-home.csdnimg.cn/images/20230817060237.png') !important;
 				// background-size: 100% 100% !important;

components/navBar/index.vue

@@ -13,8 +13,8 @@
 						@click="">
 					</image>
 				</view>
-				<view class="title" :style="[{color}]">
-					{{title}}
+				<view class="title" :style="[{color}]" v-if="title">
+					{{title.replace('true','')}}
 				</view>
 			</view>
 		</view>
@@ -42,7 +42,7 @@
 			},
 			title: { // 标题文字(默认为空)
 				type: String,
-				default: ''
+				default: ' '
 			},
 			color: { // 标题和返回按钮颜色(默认白色)
 				type: String,

components/popup/index.scss

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

components/popup/index.vue

@@ -1,17 +1,24 @@
 <template>
-	<view>
+	<view style="">
 		<u-popup :show="show" @close="close" @open="open" :mode="mode" :round="round">
 			<view class="topBar" style="">
-				按钮等<button @click="close">关闭</button>
+				<view class="left">
+					X
+				</view>
+				<view class="cen">
+					{{title}}
+				</view>
+				<view class="close">
+					X
+				</view>
 			</view>
-			<slot name="content"></slot>
 		</u-popup>
 	</view>
 </template>
 
 <script>
 	export default {
-		props: ['show', 'mode', 'round'],
+		props: ['show', 'mode', 'round', 'dtitle'],
 		methods: {
 			close() {
 				this.$emit('close')

pages.json

@@ -113,6 +113,27 @@
 			"style": {
 				"navigationBarTitleText": "售后联系"
 			}
+		},
+		{
+			"path": "pages/my/inviteDetail/index",
+			"style": {
+				"navigationBarTitleText": "邀约详情",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/index/fullHouseWifi/index",
+			"style": {
+				"navigationBarTitleText": "网络规划-全屋WiFi",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/index/aiControlSys/index",
+			"style": {
+				"navigationBarTitleText": "智能控制系统",
+				"navigationBarTextStyle": "white"
+			}
 		}
 
 	],

pages/index/aiControlSys/index.scss

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

pages/index/aiControlSys/index.vue

@@ -0,0 +1,200 @@
+<template>
+	<view class="page">
+		<navBar title="智能控制系统" :back="true" color="black" background="white" />
+
+		<image src="/static/index/img1.png" mode="" class="topBg"></image>
+
+		<view class="content">
+			<view class="topBox">
+				<view class="water">
+					CUSTOMIZED LIGHTING
+				</view>
+				<view class="main">
+					<image src="/static/my/dh.png" mode="" style="width: 56rpx;height: 56rpx;"></image>
+					<text style="z-index: 3;position: relative;">系统类别</text>
+				</view>
+			</view>
+
+			<view class="label">
+				户型
+			</view>
+
+			<view class="parms">
+				<view @click="currHouseIndex=index" class="item " :class="[currHouseIndex==index?'act':'']"
+					v-for="(item,index) in houseTypeList">
+					{{item}}
+				</view>
+			</view>
+
+
+			<view class="label">
+				生态-品牌
+			</view>
+
+			<view class="parms">
+				<view @click="currHouseIndex1=index" class="item " :class="[currHouseIndex1==index?'act':'']"
+					v-for="(item,index) in brandTypeList">
+					{{item}}
+				</view>
+			</view>
+
+			<view class="label">
+				智能锁
+			</view>
+
+			<view class="parms">
+				<view @click="currHouseIndex2=index" class="item " :class="[currHouseIndex2==index?'act':'']"
+					v-for="(item,index) in lockTypeList">
+					{{item}}
+				</view>
+			</view>
+
+
+			<view class="label">
+				智能面板
+			</view>
+
+			<view class="parms">
+				<view @click="currHouseIndex3=index" class="item " :class="[currHouseIndex3==index?'act':'']"
+					v-for="(item,index) in pannelTypeList">
+					{{item}}
+				</view>
+			</view>
+
+
+			<view class="label">
+				智能窗帘
+			</view>
+
+			<view class="parms">
+				<view @click="currHouseIndex4=index" class="item " :class="[currHouseIndex4==index?'act':'']"
+					v-for="(item,index) in chuanglianTypeList">
+					{{item}}
+				</view>
+			</view>
+
+
+			<view class="label">
+				智能窗帘
+			</view>
+
+			<view class="parms">
+				<view @click="currHouseIndex5=index" class="item " :class="[currHouseIndex5==index?'act':'']"
+					v-for="(item,index) in ktTypeList">
+					{{item}}
+				</view>
+
+
+			</view>
+		</view>
+
+		<view class="rule">
+			<image src="/static/my/bj.png" mode=""></image>
+			<view class="txt">
+				挑选规则
+			</view>
+		</view>
+		<view class="bot">
+			<view class="left">
+				<view class="price">
+					￥2099，9900
+				</view>
+				<image src="/static/my/bj.png" mode=""></image>
+			</view>
+			<view class="right" @click="showConfig=true">
+				预览配置
+			</view>
+		</view>
+
+
+		<u-popup :show="showConfig" @close="close" @open="open" round='10'>
+			<view class="topBar" style="">
+				<view class="left">
+
+				</view>
+				<view class="cen">
+					清单
+				</view>
+				<view class="close" @click="showConfig=false">
+					<u-icon name="close"></u-icon>
+				</view>
+			</view>
+			<view class="pupopCon">
+				<view class="item" v-for="i in 3">
+					<view class="top">
+						<view class="name">
+							户型
+						</view>
+						<view class="info">
+							一室两厅
+						</view>
+					</view>
+					<view class="bottom" v-for="i in 3">
+						<view class="name">
+							智能锁
+						</view>
+						<view class="info">
+							1
+						</view>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				showConfig: false,
+
+				currHouseIndex: 0,
+				currHouseIndex1: 0,
+				currHouseIndex2: 0,
+				currHouseIndex3: 0,
+				currHouseIndex4: 0,
+				currHouseIndex5: 0,
+				houseTypeList: [
+					'一室两厅',
+					'两室两厅',
+					'三室两厅'
+				],
+				brandTypeList: [
+					'品牌1',
+					'品牌2',
+				],
+				lockTypeList: [
+					'指纹款',
+					'人脸识别款',
+				],
+				pannelTypeList: [
+					'智能中控',
+					'智能开关',
+				],
+				chuanglianTypeList: [
+					'4米内(单层)',
+					'4米内(双层)',
+					'7米内(单层)',
+					'7米内(双层)',
+				],
+				ktTypeList: [
+					'柜机',
+					'挂机',
+					'风管机',
+				]
+			}
+		},
+		onLoad(options) {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/index/fullHouseWifi/index.scss

@@ -0,0 +1,155 @@
+.topBg{
+	width: 100vw;
+	height: 800rpx;
+	position: relative;
+	z-index: 0;
+}
+.content{
+	height: calc(100vh - 800rpx - 160rpx - 20rpx);
+	padding: 0 36rpx;
+	
+	.topBox{
+		width: 678rpx;
+		height: 120rpx;
+		background: #fff;
+		box-shadow: 0rpx 12rpx 56rpx -4rpx rgba(220,212,205,0.5);
+		border-radius: 24rpx 24rpx 24rpx 4rpx;
+		margin-top: -60rpx;
+		margin-left: 50%;
+		transform: translateX(-50%);
+		z-index: 1;
+		position: relative;
+		.water{
+			font-size: 56rpx;
+			font-family: Arial-BoldMT, Arial;
+			font-weight: normal;
+			color: #eee;
+			position: absolute;
+			top: 0;
+			z-index: 0;
+		}
+		.main{
+			height: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			position: relative;
+			z-index: 1;
+			image{
+				position: absolute;
+				z-index: 2;
+				left: 25%;
+			}
+		}
+	}
+	.label{
+		font-size: 36rpx;
+		font-family: PingFang-SC-Bold, PingFang-SC;
+		font-weight: bold;
+		color: #333333;
+		margin-top: 44rpx;
+	}
+	
+	.parms{
+		display: flex;
+		flex-wrap: wrap;
+		padding-top: 32rpx;
+		
+		border-bottom: 1rpx solid #EAEAEA;
+		padding-bottom: 46rpx;
+		position: relative;
+		
+		.rule{
+			position: absolute;
+			width: 96rpx;
+			height: 96rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 4rpx 24rpx -8rpx rgba(0,0,0,0.28);
+			border: 2rpx solid #FFFFFF;
+			right: 0;
+			bottom: 6rpx;
+			border-radius: 50%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			image{
+				width: 32rpx;
+				height: 32rpx;
+				margin-bottom: 8rpx;
+			}
+			.txt{
+				font-size: 16rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+			}
+		}
+		.item{
+			width: 325rpx;
+			height: 96rpx;
+			border-radius: 4rpx;
+			border: 1rpx solid #999;
+			margin-right: 18rpx;
+			margin-bottom: 18rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 32rpx;
+			font-family: PingFang-SC-Medium, PingFang-SC;
+			font-weight: 500;
+			color: #999999;
+		}
+		.act{
+			color:#333333 ;
+			border: 1rpx solid #333333;
+			}
+	}
+}
+
+.bot{
+	height: 160rpx;
+	background: #FFFFFF;
+	box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.16);
+	position: fixed;
+	width: 100%;
+	bottom: 0;
+	
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	
+	padding: 0 40rpx;
+	.left{
+		display: flex;
+		align-items: center;
+		.price{
+			font-size: 42rpx;
+			font-family: DINAlternate-Bold, DINAlternate;
+			font-weight: bold;
+			color: #333333;
+		}
+		image{
+			width: 23rpx;
+			height: 12rpx;
+			margin-left: 16rpx;
+		}
+	}
+	.right{
+		width: 282rpx;
+		height: 96rpx;
+		background: #FFFFFF;
+		border-radius: 4rpx;
+		border: 2rpx solid #333333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		font-size: 32rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #333333;
+		margin-right: 96rpx;
+	}
+	
+}

pages/index/fullHouseWifi/index.vue

@@ -0,0 +1,75 @@
+<template>
+	<view class="page">
+		<navBar title="网络规划-全屋WiFi" :back="true" color="black" background="white" />
+
+		<image src="/static/index/img1.png" mode="" class="topBg"></image>
+
+		<view class="content">
+			<view class="topBox">
+				<view class="water">
+					CUSTOMIZED LIGHTING
+				</view>
+				<view class="main">
+					<image src="/static/my/dh.png" mode="" style="width: 56rpx;height: 56rpx;"></image>
+					<text style="z-index: 3;position: relative;">网络规划-全屋WiFi</text>
+				</view>
+			</view>
+
+			<view class="label">
+				户型
+			</view>
+
+			<view class="parms">
+				<view @click="currHouseIndex=index" class="item " :class="[currHouseIndex==index?'act':'']"
+					v-for="(item,index) in houseTypeList" :style="{'margin-right': index==1?'0':''}">
+					{{item}}
+				</view>
+
+
+				<view class="rule">
+					<image src="/static/my/bj.png" mode=""></image>
+					<view class="txt">
+						挑选规则
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="bot">
+			<view class="left">
+				<view class="price">
+					￥2099，9900
+				</view>
+				<image src="/static/my/bj.png" mode=""></image>
+			</view>
+			<view class="right">
+				一键下单
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				currHouseIndex: 0,
+				houseTypeList: [
+					'一室两厅',
+					'两室两厅',
+					'三室两厅'
+				]
+			}
+		},
+		onLoad(options) {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/index/index.vue

@@ -34,7 +34,7 @@
 			</view>
 		</view>
 		<view class="bg" style="">
-			<view class="controlPart">
+			<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>
@@ -49,7 +49,7 @@
 				</view>
 			</view>
 
-			<view class="controlPart">
+			<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>
@@ -180,11 +180,24 @@
 			}
 		},
 		methods: {
+			toPage(i) {
+				if (i == 2) {
+					uni.navigateTo({
+						url: '/pages/index/fullHouseWifi/index'
+					})
+				} else if (i == 1) {
+					uni.navigateTo({
+						url: '/pages/index/aiControlSys/index'
+					})
+				}
+			},
+
 			async testReq() {
 				let res = await getActGoodsReq()
 				this.$toast(res.msg)
 				console.log('返回值', res);
 			},
+
 		}
 	}
 </script>

pages/mall/index.scss

@@ -8,10 +8,11 @@
 
 .searchAndTab{
 	background: white;
+	// background: red;
 	padding-top: 24rpx;
 	position: fixed;
 	width: 100%;
-	top:153rpx;
+	top:173rpx;
 	.searchBox{
 		padding: 0 32rpx;
 	}
@@ -19,10 +20,10 @@
 
 .content{
 	display: flex;
-	margin-top: 170rpx;
+	margin-top: 190rpx;
 	.leftMenu{
 		width: 212rpx;
-		height: calc(100vh - 340rpx);
+		height: calc(100vh - 360rpx);
 		background:#fff ;
 		overflow-y: scroll;
 		.item{

pages/my/index.scss

@@ -1,6 +1,10 @@
 	view {
 		box-sizing: border-box;
 	}
+	
+	::v-deep .u-safe-bottom{
+		height: 0!important;
+	}
 	.content{
 		background:#F4F4F4 ;
 		// padding: 0 32rpx;

pages/my/index.vue

@@ -22,7 +22,7 @@
 					</navigator>
 				</view>
 
-				<view class="invite">
+				<view class="invite" @click="show=true">
 					<view class="left">
 						<image src="/static/my/vip.png" mode="" style="width: 27rpx;height: 30rpx;">
 						</image>
@@ -59,6 +59,9 @@
 				</navigator>
 			</view>
 		</view>
+
+		<u-action-sheet :actions="list" :title="title" :show="show" cancelText="取消" @close="show=false"
+			@select="handleSel"></u-action-sheet>
 	</view>
 </template>
 
@@ -123,7 +126,19 @@
 				isPhone: false,
 
 				user_img: '', //微信头像
-				user_name: ''
+				user_name: '',
+
+				show: false,
+				list: [{
+						name: '邀约Vip会员'
+					},
+					{
+						name: '邀约LS会员'
+					},
+					{
+						name: '邀约产业电工'
+					}
+				],
 			}
 		},
 		onLoad() {
@@ -142,139 +157,20 @@
 			// })
 		},
 		methods: {
-			testchooseAndUp() {
-				let _this = this
-				uni.chooseImage({
-					success(res) {
-						console.log('res', res.tempFilePaths[0]);
-						_this.upImg(res.tempFilePaths[0])
-					}
-				})
-			},
-
-			handleAgreePrivacyAuthorization() {
-				// 用户点击同意按钮后
-				this.resolvePrivacyAuthorization({
-					buttonId: 'agree-btn',
-					event: 'agree'
-				})
-				// 用户点击同意后，开发者调用 resolve({ buttonId: 'agree-btn', event: 'agree' })  告知平台用户已经同意，参数传同意按钮的id。为确保用户有同意的操作，基础库在 resolve 被调用后，会去检查对应的同意按钮有没有被点击过。检查通过后，相关隐私接口会继续调用
-				// 用户点击拒绝后，开发者调用 resolve({ event:'disagree' }) 告知平台用户已经拒绝
-			},
-
-			testPrcBox() {
-				// wx.onNeedPrivacyAuthorization(function callback)
-				uni.navigateTo({
-					url: '/pages/privicyPopup/index'
-				})
-			},
-			genQr() {
+			handleSel(e) {
+				console.log('sheet选择参数：', e);
+				let type = -1
+
+				if (e.name == '邀约Vip会员') {
+					type = 'vip'
+				} else if (e.name == '邀约LS会员') {
+					type = 'ls'
+				} else if (e.name == '邀约产业电工') {
+					type = 'dg'
+				}
 				uni.navigateTo({
-					url: '/pages/qrPage/index'
+					url: '/pages/my/inviteDetail/index?type=' + type
 				})
-			},
-			get_user() { // 获取用户信息
-				let _this = this
-				// uni.getUserProfile({
-				// 	desc: '用户登录',
-				// 	success: res => {
-				// 		console.log(res) // 用户的信息
-				// 		this.user_img = res.userInfo.avatarUrl //微信头像
-				// 		this.user_name = res.userInfo.nickName // 微信昵称
-				// 	}
-				// })
-
-				uni.getUserInfo({
-					provider: 'weixin',
-					success: infoRes => {
-						console.log('getUserInfo返回值：', infoRes);
-						console.log('用户昵称为：' + infoRes.userInfo.nickName, infoRes.userInfo.avatarUrl);
-						this.user_img = infoRes.userInfo.avatarUrl //微信头像
-						this.user_name = infoRes.userInfo.nickName // 微信昵称
-
-						// _this.upImg(infoRes.userInfo.avatarUrl)
-					}
-				});
-			},
-
-			onChooseAvatar(e) {
-				console.log('onChooseAvatar返回值：', e);
-				// this.avatarUrl = e.detail.avatarUrl
-				this.upImg(e.detail.avatarUrl)
-			},
-			upImg(file) {
-				console.log('upImg的file', file)
-				let _this = this
-				uni.uploadFile({
-					url: uploadUrl.baseUrl, // 上传的 URL 地址
-					filePath: file, // 要上传的图片本地路径
-					name: 'file', // 上传图片时使用的字段名
-					header: { // 自定义请求头
-						'Content-Type': 'multipart/form-data'
-					},
-					formData: {
-						'fileType': 'images',
-						'dirName': 'cert',
-						'tag': 'lamp'
-					},
-					success: function(uploadRes) {
-						let result = JSON.parse(uploadRes.data)
-						// localStorage.set('imgUrl', result.data.fileUrl)
-						if (result.code == 0) {
-							_this.avatarUrl = result.data.file
-							// _this.user_img = result.data.url
-							console.log('上传后的头像url地址', result.data.file)
-						}
-					},
-					fail: function(err) {
-						console.log('upload failed:', err)
-					}
-				})
-			},
-
-			inputName(e) {
-				this.nickName = e.detail.value
-			},
-
-			testGetUserInfo() {
-				console.log('testGetUserInfo()------------');
-				uni.login({
-					provider: 'weixin',
-					success: res => {
-						console.log('uni.login返回值：', res)
-						if (res.errMsg == 'login:ok') {
-							// 获取密钥 === 需要登录才可以获取密钥
-							return
-							uni.request({
-								url: 'https://api.weixin.qq.com/sns/jscode2session', // 请求微信服务器
-								method: 'GET',
-								data: {
-									appid: 'wx98ab2939999e13de', //你的小程序的APPID
-									secret: '29bad412d9cc5a7f48ca88d2848db8d3', //你的小程序秘钥secret,  
-									js_code: res.code, //wx.login 登录成功后的code
-									grant_type: 'authorization_code' //此处为固定值
-								},
-								success: (res1) => {
-									console.log('uni.request获取信息', res1);
-
-									if (res1.errMsg == 'request:ok') {
-										console.log('openid和session_key', res1.data);
-									}
-								}
-							});
-						}
-
-					}
-				});
-			},
-			getphonenumber(e) {
-				console.log('getphonenumber返回值', e);
-				if (e.errMsg = 'getPhoneNumber:ok') {
-					console.log('getphonenumber需要传给后端的参数：', {
-						encryptedData: e.encryptedData,
-						iv: e.iv
-					});
-				}
 			}
 		}
 	}

pages/my/inviteDetail/index.scss

@@ -0,0 +1,301 @@
+.page{
+	
+}
+.top{
+	height: 764rpx;
+	background: url('https://oaigc.oss-cn-chengdu.aliyuncs.com/lamp/2023-09/2023090710392974226.png') no-repeat;
+	background-size: 100% 100%;
+	padding: 0 32rpx;
+	
+	.title{
+		font-size: 56rpx;
+		font-family: PingFangSC-Semibold, PingFang SC;
+		font-weight: 600;
+		color: #FFFFFF;
+		margin-top: 80rpx;
+	}
+	.vipBox{
+		margin-top: 48rpx;
+		.top{
+			height: 100rpx;
+			background: #FBE0B0;
+			// box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(196,93,0,0.1);
+			border-radius: 0rpx 24rpx 0rpx 0rpx;
+			
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			position: relative;
+			.txt{
+				font-size: 56rpx;
+				font-family: Arial-BoldMT, Arial;
+				font-weight: 600;
+				color: #ffe2af;
+				line-height: 64rpx;
+				text-shadow: 0px 4px 12px rgba(196,93,0,0.1);
+				position: absolute;
+				top: 0;
+				z-index: 0;
+			}
+			.con{
+				font-size: 36rpx;
+				font-family: PingFang-SC-Bold, PingFang-SC;
+				font-weight: bold;
+				color: #674E07;
+				z-index: 1;
+			}
+		}
+		
+		.bot{
+			background: #fff;
+			border-radius: 0rpx  0rpx 0rpx 24rpx;
+			.price{
+				height: 92rpx;
+				padding-left: 64rpx;
+				display: flex;
+				align-items: flex-end;
+			}
+			.btnG{
+				height: 140rpx;
+				padding: 0 64rpx;
+				position: relative;
+				// width: 100%;
+				.water{
+					position: absolute;
+					z-index: 0;
+					right: 0;
+					bottom: 0;
+				}
+				.main{
+					position: relative;
+					z-index: 1;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					padding-top: 32rpx;
+					
+					.btn1{
+						height: 72rpx;
+						background: linear-gradient(153deg, #F5C888 0%, #E3B060 100%);
+						border-radius: 4rpx 20rpx 4rpx 20rpx;
+						width: 558rpx;
+						font-size: 32rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #FFFFFF;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+					}
+					.btn{
+						width: 260rpx;
+						height: 72rpx;
+						background: linear-gradient(153deg, #F5C888 0%, #E3B060 100%);
+						border-radius: 4rpx 16rpx 4rpx 16rpx;
+						font-size: 32rpx;
+						font-family: PingFang-SC-Medium, PingFang-SC;
+						font-weight: 500;
+						color: #FFFFFF;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+					}
+				}
+			}
+		}
+	}
+}
+
+.botDes{
+	height: calc(56vh);
+	background: #FFFFFF;
+	border-radius: 24rpx 24rpx 0rpx 0rpx;
+	margin-top: -20rpx;
+	// padding: 0 32rpx;
+	
+	.tab{
+		height: 102rpx;
+		background: #FFFFFF;
+		border-radius: 24rpx 24rpx 0rpx 0rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		
+		border-bottom: 2rpx solid #E6E6E6;
+		.line{
+			width: 2rpx;
+			height: 52rpx;
+			background: #E6E6E6;
+		}
+		.item{
+			font-size: 32rpx;
+			font-family: PingFang-SC-Medium, PingFang-SC;
+			font-weight: 500;
+			color: #999999;
+			// position: relative;
+		}
+		.item:first-child{
+			margin-left: 32rpx;
+		}
+		.item:last-child{
+			margin-right: 32rpx;
+		}
+		.act{
+			position: relative;
+			font-weight: 800;
+			color: #333333;
+		}
+		.act::after{
+			content: '';
+			 position: absolute;
+			overflow: hidden;
+			width: 20rpx;
+			height: 8rpx;
+			background: #F7790C;
+			left: 50%;
+			transform: translateX(-50%);
+			bottom: -28rpx;
+		}
+	}
+	
+	.top1{
+		.titleL{
+			height: 108rpx;
+			display: flex;
+			align-items: center;
+			padding: 0 32rpx;
+		
+			.item1{
+				width: 224rpx;
+			}
+			.item1:last-child{
+				width: calc(100% - 448rpx);
+			}
+		}
+	}
+}
+
+.card{
+	padding: 0 32rpx;
+	.con{
+		height: 196rpx;
+		background: #F6F6F6;
+		border-radius: 0rpx 24rpx 0rpx 24rpx;
+		padding:32rpx 20rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-around;
+		box-sizing: border-box;
+		.item{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.label{
+				font-size: 28rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #666666;
+			}
+			.des{
+				font-size: 28rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+			}
+		}
+		}
+}
+
+.list2{
+			height: 108rpx;
+			display: flex;
+			align-items: center;
+			padding: 0 32rpx;
+			font-size: 28rpx;
+			font-family: PingFang-SC-Medium, PingFang-SC;
+			font-weight: 500;
+			color: #333333;
+			.item1{
+				width: 224rpx;
+			}
+			.item1:last-child{
+				width: calc(100% - 448rpx);
+				
+			}
+		}
+		
+		
+		.topBar{
+			height: 112rpx;
+			background: #F9F9F9;
+			border-radius: 24rpx 24rpx 0rpx 0rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.left{
+				width: 10%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				height: 100%;
+			}
+			
+			.cen{
+				font-size: 32rpx;
+				font-family: PingFang-SC-Bold, PingFang-SC;
+				font-weight: bold;
+				color: #333333;
+			}
+			
+			.close{
+				width: 24rpx;
+				height: 24rpx;
+				color: #666666;
+				width: 10%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			height: 100%;
+			}
+		}
+		
+	.pupopCon{
+		padding: 48rpx 32rpx;
+		.item{
+			height: 184rpx;
+			.label{
+				font-size: 32rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+				display: flex;
+				align-items: center;
+				margin-bottom: 24rpx;
+			}
+		}
+		
+	}	
+	
+	.aginInvite{
+		// width: 168rpx;
+		
+		height: 52rpx;
+		background: #FFFFFF;
+		border-radius: 4rpx;
+		border: 1rpx solid #333333;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 0 24rpx;
+	}
+	
+	
+	.sel{
+		position: relative;
+		image{
+			position: absolute;
+			right: 24rpx;
+			top: 50%;
+			transform: translateY(-50%);
+		}
+	}

pages/my/inviteDetail/index.vue

@@ -0,0 +1,373 @@
+<template>
+	<view class="page">
+		<!-- <dpupop :show="showLsPop" dtitle="LS会员标签" /> -->
+
+		<view class="top">
+			<navBar title="" :back="true" color="white" background="rgba(0,0,0,0)" />
+
+			<view class="title">
+				{{type=='vip'?'邀约用户成为VIP':type=='ls'?'邀约用户成为LS会员':type=='dg'?'邀约用户成为产业电工':'邀约活动商品'}}
+			</view>
+			<view class="vipBox">
+				<view class="top">
+					<view class="txt">
+						{{type=='vip'?'CUSTOMIZED LIGHTING':type=='ls'?'CUSTOMIZED LIGHTING':type=='dg'?'CUSTOMIZED LIGHTING':'CUSTOMIZED LIGHTING'}}
+					</view>
+					<view class="con">
+						{{type=='vip'?'邀约VIP':type=='ls'?'邀约LS会员':type=='dg'?'邀约产业电工':'活动商品'}}
+					</view>
+				</view>
+				<view class="bot">
+					<view class="price">
+						{{type=='vip'?'邀约用户查看会员价格':type=='ls'?'邀约用户临时查看会员价格':type=='dg'?'邀约用户成为产业电工':'邀约用户查看活动商品'}}
+					</view>
+					<view class="btnG" v-if="type=='vip'">
+						<view class="main">
+							<view class="btn" @click="showVipPop=true">
+								邀约S-VIP
+							</view>
+							<view class="btn" @click="showVipPop=true">
+								邀约G-VIP
+							</view>
+						</view>
+						<!-- <image src="/static/index/img1.png" mode="" class="water" style="width: 288rpx;
+height: 140rpx;"></image> -->
+
+					</view>
+					<view class="btnG" v-else-if="type=='ls'">
+						<view class="main">
+							<view class="btn1" @click="showLsPop=true">
+								邀约LS会员
+							</view>
+						</view>
+						<!-- <image src="/static/index/img1.png" mode="" class="water" style="width: 288rpx;
+					height: 140rpx;"></image> -->
+
+					</view>
+
+					<view class="btnG" v-else-if="type=='dg'">
+						<view class="main">
+							<view class="btn1" @click="showDgPop=true">
+								兑奖
+							</view>
+						</view>
+						<!-- <image src="/static/index/img1.png" mode="" class="water" style="width: 288rpx;
+					height: 140rpx;"></image> -->
+
+					</view>
+
+					<view class="btnG" v-else>
+						<view class="main">
+							<view class="btn1">
+								邀约
+							</view>
+						</view>
+						<!-- <image src="/static/index/img1.png" mode="" class="water" style="width: 288rpx;
+					height: 140rpx;"></image> -->
+
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="botDes">
+			<view class="tab">
+				<view class="item " :class="[currTabIndex==0?'act':'']" @click="currTabIndex=0">
+					邀约成功(23)
+				</view>
+				<view class="line">
+
+				</view>
+				<view class="item" :class="[currTabIndex==1?'act':'']" @click="currTabIndex=1">
+					邀约未成功(23)
+				</view>
+			</view>
+
+			<!-- 邀约成功-->
+			<view class="scroll" style="overflow-y: scroll;height: calc(100% - 104rpx);" v-if="currTabIndex==0">
+				<view class="top1">
+					<view class="titleL">
+						<view class="item1">
+							邀约时间
+						</view>
+						<view class="item1">
+							姓名
+						</view>
+						<view class="item1">
+							电话
+						</view>
+					</view>
+				</view>
+
+				<uni-collapse style="" v-if="type=='vip'||type=='ls'">
+					<uni-collapse-item titleBorder="none" v-for="i in 10">
+						<template v-slot:title>
+							<view class="list2" :style="{'margin-bottom':i==-1?'208rpx':''}">
+								<view class="item1">
+									2023-08-23
+								</view>
+								<view class="item1">
+									刘佳佳
+								</view>
+								<view class="item1">
+									<text>18209380928</text>
+								</view>
+							</view>
+						</template>
+						<view class="card">
+							<view class="con" v-if="type=='vip'">
+								<view class="item">
+									<view class="label">
+										任职公司
+									</view>
+									<view class="des">
+										家居公司
+									</view>
+								</view>
+								<view class="item">
+									<view class="label">
+										VIP
+									</view>
+									<view class="des">
+										S-VIP
+									</view>
+								</view>
+								<view class="item">
+									<view class="label">
+										备注
+									</view>
+									<view class="des">
+										你好，现邀请你成为S-VIP，查看专属价格！
+									</view>
+								</view>
+							</view>
+
+							<view class="con" v-if="type=='ls'" style="height: 84rpx;">
+								<view class="item">
+									<view class="label">
+										项目名称
+									</view>
+									<view class="des" style="color: #333;font-weight: bold;">
+										家装灯具选择
+									</view>
+								</view>
+							</view>
+						</view>
+					</uni-collapse-item>
+				</uni-collapse>
+
+				<view class="list2" :style="{'margin-bottom':i==-1?'208rpx':''}" v-else>
+					<view class="item1">
+						2023-08-23
+					</view>
+					<view class="item1">
+						刘佳佳
+					</view>
+					<view class="item1">
+						<text>18209380928</text>
+					</view>
+				</view>
+				<view class="pos" style="height:208rpx;">
+				</view>
+
+			</view>
+
+
+			<!-- 邀约失败-->
+			<view class="scroll" style="overflow-y: scroll;height: calc(100% - 104rpx);" v-if="currTabIndex==1">
+				<view class="top1">
+					<view class="titleL">
+						<view class="item1" style="width: 192rpx;font-size: 28rpx;font-weight: bold;color: #333333;">
+							邀约时间
+						</view>
+						<view class="item1" style="width: 90rpx;font-size: 28rpx;font-weight: bold;color: #333333;">
+							姓名
+						</view>
+						<view class="item1"
+							style="width: 120rpx;font-size: 28rpx;margin-left: 60rpx;font-weight: bold;color: #333333;">
+							VIP类别
+						</view>
+					</view>
+				</view>
+
+
+				<view class="list2" :style="{'margin-bottom':i==-1?'208rpx':''}">
+					<view class="item1" style="width: 192rpx;font-size: 28rpx;">
+						2023-08-23
+					</view>
+					<view class="item1" style="width: 90rpx;font-size: 28rpx;">
+						刘佳佳
+					</view>
+					<view class="item1" style="width: 120rpx;font-size: 28rpx;margin-left:60rpx;">
+						<text>S-VIP</text>
+					</view>
+
+					<view class="item1 aginInvite" style="width: 120rpx;font-size: 28rpx;margin-left: 50rpx;">
+						再次邀约
+					</view>
+				</view>
+
+				<view class="pos" style="height:208rpx;">
+				</view>
+
+			</view>
+		</view>
+
+		<u-popup :show="showLsPop" @close="close" @open="open" round='10'>
+			<view class="topBar" style="">
+				<view class="left">
+
+				</view>
+				<view class="cen">
+					LS会员标签
+				</view>
+				<view class="close" @click="showLsPop=false">
+					<u-icon name="close"></u-icon>
+				</view>
+			</view>
+			<view class="pupopCon">
+				<view class="item">
+					<view class="label">
+						*姓名
+					</view>
+					<u--input clearable placeholder="请输入姓名" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<view class="item">
+					<view class="label">
+						*电话
+					</view>
+					<u--input clearable placeholder="请输入电话" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<view class="item" style="margin-bottom: 24rpx;">
+					<view class="label">
+						项目名称
+					</view>
+					<u--input clearable placeholder="请输入项目名称" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<u-button text="确定" color="#333" @click="showLsPop=false"></u-button>
+			</view>
+		</u-popup>
+
+		<u-popup :show="showDgPop" @close="close" @open="open" round='10'>
+			<view class="topBar" style="">
+				<view class="left">
+
+				</view>
+				<view class="cen">
+					产业电工
+				</view>
+				<view class="close" @click="showDgPop=false">
+					<u-icon name="close"></u-icon>
+				</view>
+			</view>
+			<view class="pupopCon">
+				<view class="item">
+					<view class="label">
+						*姓名
+					</view>
+					<u--input clearable placeholder="请输入姓名" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<view class="item" style="margin-bottom: 24rpx;">
+					<view class="label">
+						*电话
+					</view>
+					<u--input clearable placeholder="请输入电话" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+
+				<u-button text="确定" color="#333" @click="showDgPop=false"></u-button>
+			</view>
+		</u-popup>
+
+		<u-popup :show="showVipPop" @close="close" @open="open" round='10'>
+			<view class="topBar" style="">
+				<view class="left">
+
+				</view>
+				<view class="cen">
+					VIP标签
+				</view>
+				<view class="close" @click="showVipPop=false">
+					<u-icon name="close"></u-icon>
+				</view>
+			</view>
+			<view class="pupopCon">
+				<view class="item">
+					<view class="label">
+						*姓名
+					</view>
+					<u--input clearable placeholder="请输入姓名" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<view class="item">
+					<view class="label">
+						*电话
+					</view>
+					<u--input clearable placeholder="请输入电话" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<view class="item">
+					<view class="label">
+						*身份
+					</view>
+					<view class="sel">
+						<u--input placeholder="请选择身份" border="surround" v-model="value" @change="change">
+						</u--input>
+						<image src="/static/my/selDw.png" mode="" style="width: 16rpx;height: 12rpx;"></image>
+					</view>
+
+				</view>
+				<view class="item" style="margin-bottom: 24rpx;">
+					<view class="label">
+						任职公司
+					</view>
+					<u--input clearable placeholder="请输入任职公司" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<view class="item" style="margin-bottom: 24rpx;">
+					<view class="label">
+						备注
+					</view>
+					<u--input clearable placeholder="请输入备注" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<u-button text="确定" color="#333" @click="showVipPop=false"></u-button>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	import dpupop from '@/components/popup/index.vue'
+	export default {
+		components: {
+			dpupop
+		},
+		data() {
+			return {
+				currTabIndex: 0,
+				type: 'vip',
+
+				showLsPop: false,
+				showDgPop: false,
+				showVipPop: false,
+
+				// inviteSuc: true
+			}
+		},
+		onLoad(o) {
+			this.type = o.type
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/my/sellAfterCon/index.scss

@@ -1,5 +1,5 @@
 .content{
-	height: 100vh;
+	height:calc(100vh - 170rpx );
 	background: #F1F1F1;
 	
 	.box{
@@ -7,7 +7,9 @@
 	flex-direction: column;
 		
 		width: 686rpx;
-		height: 784rpx;
+		// height: 784rpx;
+		padding-bottom:70rpx ;
+		padding-top: 20rpx;
 		background: #FFFFFF;
 		box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(0,0,0,0.06);
 		border-radius: 8rpx 24rpx 8rpx 24rpx;

pages/my/sellAfterCon/index.vue

@@ -2,13 +2,13 @@
 	<view class="page">
 		<navBar title="售后联系" :back="true" color="black" background="white" />
 		<view class="content">
-			<image src="/static/index/img1.png" mode="" style="width: 100%;height: 384rpx;"></image>
+			<image src="/static/my/conBg.png" mode="" style="width: 100%;height: 384rpx;"></image>
 
 			<view class="box">
 				<view class="item">
 					<view class="part1">
 						<view class="left">
-							<image src="/static/index/img1.png" mode="" style="width: 26rpx;height: 26rpx;"></image>
+							<image src="/static/my/dh.png" mode="" style="width: 26rpx;height: 26rpx;"></image>
 						</view>
 						<view class="cen">
 							<view class="water">
@@ -21,7 +21,7 @@
 								<view class="num">
 									18729838270
 								</view>
-								<view class="call">
+								<view class="call" @click="call('18729838270')">
 									拨号
 								</view>
 							</view>
@@ -35,21 +35,20 @@
 				<view class="item">
 					<view class="part1">
 						<view class="left">
-							<image src="/static/index/img1.png" mode="" style="width: 26rpx;height: 26rpx;"></image>
+							<image src="/static/my/wechat.png" mode="" style="width: 26rpx;height: 26rpx;"></image>
 						</view>
 						<view class="cen">
 							<view class="water">
-								PHONE
-							</view>
+								WECHAT </view>
 							<view class="top">
-								手机号
+								微信号
 							</view>
 							<view class="bot">
 								<view class="num">
 									18729838270
 								</view>
-								<view class="call">
-									拨号
+								<view class="call" @click="copy('18729838270')">
+									复制
 								</view>
 							</view>
 						</view>
@@ -59,31 +58,31 @@
 					</view>
 				</view>
 
-				<view class="item" style="height: auto;">
+				<view class="item" style="height: auto;padding-top: 34rpx;box-sizing: border-box;">
 					<view class="part1">
 						<view class="left">
-							<image src="/static/index/img1.png" mode="" style="width: 26rpx;height: 26rpx;"></image>
+							<image src="/static/my/ewm.png" mode="" style="width: 26rpx;height: 26rpx;"></image>
 						</view>
 						<view class="cen">
 							<view class="water">
-								PHONE
+								QR CODE
 							</view>
 							<view class="top">
-								手机号
+								微信二维码
 							</view>
 							<view class="bot1">
 								<view class="top">
-									微信二维码
+									扫码了解
 								</view>
-								<image class="code" src="/static/index/img1.png" mode=""
+								<image class="code" src="/static/my/code.png" mode=""
 									style="width: 250rpx;height: 250rpx;"></image>
 							</view>
 						</view>
 					</view>
 				</view>
 			</view>
-
 		</view>
+	</view>
 </template>
 
 <script>
@@ -98,7 +97,20 @@
 		},
 		onLoad(options) {},
 		methods: {
-
+			copy(data) {
+				let _this = this
+				uni.setClipboardData({
+					data,
+					success: function() {
+						_this.$toast('复制成功', 'success')
+					}
+				});
+			},
+			call(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
 		}
 	}
 </script>

pages/my/set/index.vue

@@ -9,8 +9,8 @@
 						显示售价
 					</view>
 					<view class="right">
-						<switch checked="false" @change="change" color="#F7790C" style="" />
-						<!-- <u-switch v-model="value" @change="change"></u-switch> -->
+						<u-switch v-model="value" @change="change" activeColor="#F7790C"
+							inactiveColor="#E6E6E6"></u-switch>
 					</view>
 				</view>
 				<view class="line">
@@ -18,8 +18,8 @@
 						显示售价
 					</view>
 					<view class="right">
-						<switch checked="true" @change="change" color="#F7790C" style="" />
-						<!-- <u-switch v-model="value1" @change="change"></u-switch> -->
+						<u-switch v-model="value1" @change="change" activeColor="#F7790C"
+							inactiveColor="#E6E6E6"></u-switch>
 					</view>
 				</view>
 				<view class="line">
@@ -27,8 +27,8 @@
 						显示VIP价
 					</view>
 					<view class="right">
-						<switch checked="false" @change="change" color="#F7790C" style="" />
-						<!-- <u-switch v-model="value2" @change="change"></u-switch> -->
+						<u-switch v-model="value2" @change="change" activeColor="#F7790C"
+							inactiveColor="#E6E6E6"></u-switch>
 					</view>
 				</view>
 			</view>
@@ -43,9 +43,9 @@
 		},
 		data() {
 			return {
-				value: 0,
-				value1: 0,
-				value2: 0,
+				value: false,
+				value1: true,
+				value2: false,
 
 			}
 		},

pages/my/userInfo/index.vue

@@ -4,12 +4,12 @@
 
 		<view class="content">
 			<view class="item" style="border-radius: 0rpx 0rpx 0rpx 24rpx;;">
-				<view class="line">
+				<view class="line" @click="chooseAvatar">
 					<view class="left">
 						头像
 					</view>
 					<view class="right">
-						<image src="/static/index/img1.png" mode="" class="avatar"></image>
+						<image :src="avatarUrl?avatarUrl:'/static/index/img1.png'" mode="" class="avatar"></image>
 						<image src="/static/my/parr.png" mode="" class="arr"></image>
 					</view>
 				</view>
@@ -72,19 +72,56 @@
 </template>
 
 <script>
+	import uploadUrl from '@/common/config.js'
 	export default {
 		components: {
 
 		},
 		data() {
 			return {
-
+				avatarUrl: ''
 			}
 		},
 		onLoad(options) {},
 		methods: {
+			chooseAvatar() {
+				let _this = this
+				uni.chooseImage({
+					success(res) {
+						console.log('res', res.tempFilePaths[0]);
+						_this.upImg(res.tempFilePaths[0])
+					}
+				})
+			},
+			upImg(file) {
+				console.log('upImg的file', file)
+				let _this = this
+				uni.uploadFile({
+					url: uploadUrl.baseUrl, // 上传的 URL 地址
+					filePath: file, // 要上传的图片本地路径
+					name: 'file', // 上传图片时使用的字段名
+					header: { // 自定义请求头
+						'Content-Type': 'multipart/form-data'
+					},
+					formData: {
+						'fileType': 'images',
+						'dirName': 'cert',
+						'tag': 'lamp'
+					},
+					success: function(uploadRes) {
+						let result = JSON.parse(uploadRes.data)
+						if (result.code == 0) {
+							_this.avatarUrl = result.data.file
+							console.log('上传后的头像url地址', result.data.file)
+						}
+					},
+					fail: function(err) {
+						console.log('upload failed:', err)
+					}
+				})
+			},
+		},
 
-		}
 	}
 </script>
 

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

@@ -1,44 +1,18 @@
 <template>
 	<view class="u-popup">
-		<u-overlay
-			:show="show"
-			@click="overlayClick"
-			v-if="overlay"
-			:duration="overlayDuration"
-			:customStyle="overlayStyle"
-			:opacity="overlayOpacity"
-		></u-overlay>
-		<u-transition
-			:show="show"
-			:customStyle="transitionStyle"
-			:mode="position"
-			:duration="duration"
-			@afterEnter="afterEnter"
-			@click="clickHandler"
-		>
-			<view
-				class="u-popup__content"
-				:style="[contentStyle]"
-				@tap.stop="noop"
-			>
+		<u-overlay :show="show" @click="overlayClick" v-if="overlay" :duration="overlayDuration"
+			:customStyle="overlayStyle" :opacity="overlayOpacity"></u-overlay>
+		<u-transition :show="show" :customStyle="transitionStyle" :mode="position" :duration="duration"
+			@afterEnter="afterEnter" @click="clickHandler">
+			<view class="u-popup__content" :style="[contentStyle]" @tap.stop="noop">
 				<u-status-bar v-if="safeAreaInsetTop"></u-status-bar>
 				<slot></slot>
-				<view
-					v-if="closeable"
-					@tap.stop="close"
-					class="u-popup__content__close"
-					:class="['u-popup__content__close--' + closeIconPos]"
-					hover-class="u-popup__content__close--hover"
-					hover-stay-time="150"
-				>
-					<u-icon
-						name="close"
-						color="#909399"
-						size="18"
-						bold
-					></u-icon>
+				<view v-if="closeable" @tap.stop="close" class="u-popup__content__close"
+					:class="['u-popup__content__close--' + closeIconPos]" hover-class="u-popup__content__close--hover"
+					hover-stay-time="150">
+					<u-icon name="close" color="#909399" size="18" bold></u-icon>
 				</view>
-				<u-safe-bottom v-if="safeAreaInsetBottom"></u-safe-bottom>
+				<!-- <u-safe-bottom v-if="safeAreaInsetBottom"></u-safe-bottom> -->
 			</view>
 		</u-transition>
 	</view>
@@ -142,17 +116,17 @@
 				if (this.bgColor) {
 					style.backgroundColor = this.bgColor
 				}
-				if(this.round) {
+				if (this.round) {
 					const value = uni.$u.addUnit(this.round)
-					if(this.mode === 'top') {
+					if (this.mode === 'top') {
 						style.borderBottomLeftRadius = value
 						style.borderBottomRightRadius = value
-					} else if(this.mode === 'bottom') {
+					} else if (this.mode === 'bottom') {
 						style.borderTopLeftRadius = value
 						style.borderTopRightRadius = value
-					} else if(this.mode === 'center') {
+					} else if (this.mode === 'center') {
 						style.borderRadius = value
-					} 
+					}
 				}
 				return uni.$u.deepMerge(style, uni.$u.addStyle(this.customStyle))
 			},
@@ -189,7 +163,7 @@
 			},
 			clickHandler() {
 				// 由于中部弹出时，其u-transition占据了整个页面相当于遮罩，此时需要发出遮罩点击事件，是否无法通过点击遮罩关闭弹窗
-				if(this.mode === 'center') {
+				if (this.mode === 'center') {
 					this.overlayClick()
 				}
 				this.$emit('click')
@@ -197,9 +171,12 @@
 			// #ifdef MP-WEIXIN
 			retryComputedComponentRect(children) {
 				// 组件内部需要计算节点的组件
-				const names = ['u-calendar-month', 'u-album', 'u-collapse-item', 'u-dropdown', 'u-index-item', 'u-index-list',
-					'u-line-progress', 'u-list-item', 'u-rate', 'u-read-more', 'u-row', 'u-row-notice', 'u-scroll-list',
-					'u-skeleton', 'u-slider', 'u-steps-item', 'u-sticky', 'u-subsection', 'u-swipe-action-item', 'u-tabbar',
+				const names = ['u-calendar-month', 'u-album', 'u-collapse-item', 'u-dropdown', 'u-index-item',
+					'u-index-list',
+					'u-line-progress', 'u-list-item', 'u-rate', 'u-read-more', 'u-row', 'u-row-notice',
+					'u-scroll-list',
+					'u-skeleton', 'u-slider', 'u-steps-item', 'u-sticky', 'u-subsection', 'u-swipe-action-item',
+					'u-tabbar',
 					'u-tabs', 'u-tooltip'
 				]
 				// 历遍所有的子组件节点
@@ -227,7 +204,7 @@
 
 <style lang="scss" scoped>
 	@import "../../libs/css/components.scss";
-	$u-popup-flex:1 !default;
+	$u-popup-flex: 1 !default;
 	$u-popup-content-background-color: #fff !default;
 
 	.u-popup {
@@ -301,4 +278,4 @@
 			}
 		}
 	}
-</style>
+</style>

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

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

unpackage/dist/build/mp-weixin/pages/my/sellAfterCon/index.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/sellAfterCon/index"],{"2ec0":function(e,n,t){"use strict";(function(e,n){var c=t("4ea4");t("2707");c(t("66fd"));var u=c(t("e7c4"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(u.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"54a1":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;n.default={components:{},data:function(){return{}},onLoad:function(e){},methods:{}}},"8d1b":function(e,n,t){"use strict";var c=t("e36d"),u=t.n(c);u.a},b7e1:function(e,n,t){"use strict";t.d(n,"b",(function(){return c})),t.d(n,"c",(function(){return u})),t.d(n,"a",(function(){}));var c=function(){var e=this.$createElement;this._self._c},u=[]},cb15:function(e,n,t){"use strict";t.r(n);var c=t("54a1"),u=t.n(c);for(var a in c)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return c[e]}))}(a);n["default"]=u.a},e36d:function(e,n,t){},e7c4:function(e,n,t){"use strict";t.r(n);var c=t("b7e1"),u=t("cb15");for(var a in u)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(a);t("8d1b");var o=t("f0c5"),r=Object(o["a"])(u["default"],c["b"],c["c"],!1,null,"9b84feda",null,!1,c["a"],void 0);n["default"]=r.exports}},[["2ec0","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/sellAfterCon/index"],{1634:function(n,e,t){},"2ec0":function(n,e,t){"use strict";(function(n,e){var c=t("4ea4");t("2707");c(t("66fd"));var a=c(t("e7c4"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(a.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"54a1":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:{}}},a9a7:function(n,e,t){"use strict";t.d(e,"b",(function(){return c})),t.d(e,"c",(function(){return a})),t.d(e,"a",(function(){}));var c=function(){var n=this.$createElement;this._self._c},a=[]},cb15:function(n,e,t){"use strict";t.r(e);var c=t("54a1"),a=t.n(c);for(var u in c)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return c[n]}))}(u);e["default"]=a.a},dc6c:function(n,e,t){"use strict";var c=t("1634"),a=t.n(c);a.a},e7c4:function(n,e,t){"use strict";t.r(e);var c=t("a9a7"),a=t("cb15");for(var u in a)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return a[n]}))}(u);t("dc6c");var o=t("f0c5"),r=Object(o["a"])(a["default"],c["b"],c["c"],!1,null,"68bc446e",null,!1,c["a"],void 0);e["default"]=r.exports}},[["2ec0","common/runtime","common/vendor"]]]);

unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/fullHouseWifi/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;;;;AAAA;AAGA;AACA;AAHA;AACAA,EAAE,CAACC,iCAAiC,GAAGC,mBAAmB;AAG1DC,UAAU,CAACC,cAAI,CAAC,C","file":"pages/my/fullHouseWifi/index.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pages/my/fullHouseWifi/index.vue'\ncreatePage(Page)"],"sourceRoot":""}

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

@@ -17,7 +17,10 @@
     "pages/my/sellAfter/index",
     "pages/my/otherInfo/index",
     "pages/my/sellAfterDefer/index",
-    "pages/my/sellAfterCon/index"
+    "pages/my/sellAfterCon/index",
+    "pages/my/inviteDetail/index",
+    "pages/index/fullHouseWifi/index",
+    "pages/index/aiControlSys/index"
   ],
   "subPackages": [],
   "window": {

unpackage/dist/dev/mp-weixin/common/main.js

@@ -23,13 +23,13 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 var navBar = function navBar() {
   __webpack_require__.e(/*! require.ensure | components/navBar/index */ "components/navBar/index").then((function () {
-    return resolve(__webpack_require__(/*! @/components/navBar/index.vue */ 326));
+    return resolve(__webpack_require__(/*! @/components/navBar/index.vue */ 350));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 _vue.default.component('navBar', navBar);
 var popup = function popup() {
   __webpack_require__.e(/*! require.ensure | components/popup/index */ "components/popup/index").then((function () {
-    return resolve(__webpack_require__(/*! @/components/popup/index.vue */ 333));
+    return resolve(__webpack_require__(/*! @/components/popup/index.vue */ 357));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 _vue.default.component('dpopup', popup);

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

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

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

@@ -3,6 +3,7 @@
 /* 水平间距 */
 .navbar.data-v-5f53d1a4 {
   background: green;
+  position: relative;
 }
 .navbar .narbar-flexd.data-v-5f53d1a4 {
   background: green;