9.19

api/my/index.js

@@ -14,4 +14,19 @@ export const getAboutReq = (params, config = {}) => http.get('/api/getAbout', pa
 
 
 // 获取我的收藏
-export const getMyCollectDataReq = (params, config = {}) => http.get('/api/users/getMyCollectData', params, config)
+export const getMyCollectDataReq = (params, config = {}) => http.get('/api/users/getMyCollectData', params, config)
+
+// 获取我的收藏
+export const getMyCollectDetailReq = (params, config = {}) => {
+
+	let apiUrl = '/api/goods/getGoodsDetail'
+	Object.keys(params).forEach((item, index) => {
+		if (index == 0) {
+			apiUrl += `?${item}=${params[item]}`
+		} else {
+			apiUrl += `&${item}=${params[item]}`
+		}
+	})
+	console.log('处理后的apiUrl', apiUrl);
+	return http.get(apiUrl, params, config)
+}

api/test/index.js

@@ -80,6 +80,9 @@ export const getSerBackReq = (params, config = {}) => http.get('/api/users/getMy
 // 获取我的服务流程
 export const getSerStepReq = (params, config = {}) => http.get('/api/users/getMyServiceProcess', params, config)
 
+// 获取我的换新流程
+export const getChangeStepReq = (params, config = {}) => http.get('/api/users/getRenewFlow', params, config)
+
 // 获取我的售后商品
 export const getSerBackGoodsReq = (params, config = {}) => {
 
@@ -132,19 +135,37 @@ export const addCollReq = (params, config = {}) => http.post('/api/users/addColl
 // 取消收藏
 export const cancelCollReq = (params, config = {}) => http.post('/api/users/cancelCollect', params, config)
 
+export const getGoodsPriceReq = (params, config = {}) => http.post('/api/goods/getGoodsPrice', params, config)
+
+
+
+
+//获取服务文档
+export const getServerDataReq = (params, config = {}) => http.get('/api/server/getServerData', params, config)
+
+// 提交反馈
+export const submitFeedbackReq = (params, config = {}) => http.post('/api/users/submitFeedback', params, config)
+
+
+//获取兑奖信息
+export const getAwardDataReq = (params, config = {}) => http.get('/api/users/getAwardData', params, config)
+
+
+export const getConfigTextByTypeReq = (params, config = {}) => {
+
+	let apiUrl = '/api/common/getConfigTextByType'
+	Object.keys(params).forEach((item, index) => {
+		if (index == 0) {
+			apiUrl += `?${item}=${params[item]}`
+		} else {
+			apiUrl += `&${item}=${params[item]}`
+		}
+	})
+	console.log('处理后的apiUrl', apiUrl);
+	return http.get(apiUrl, params, config)
+}
 
 
-// export const getGoodsPriceReq = (params, config = {}) => {
-// 	let apiUrl = '/api/goods/getGoodsPrice'
-// 	Object.keys(params).forEach((item, index) => {
-// 		if (index == 0) {
-// 			apiUrl += `?${item}=${JSON.stringify( params[item]) }`
-// 		} else {
-// 			apiUrl += `&${item}=${params[item]}`
-// 		}
-// 	})
-// 	console.log('处理后的apiUrl', apiUrl);
-// 	return http.get(apiUrl, params, config)
-// }
 
-export const getGoodsPriceReq = (params, config = {}) => http.post('/api/goods/getGoodsPrice', params, config)
+// 提交反馈
+export const getWxQrCodeReq = (params, config = {}) => http.post('/api/common/getWxQrCode', params, config)

pages.json

@@ -106,6 +106,13 @@
 						"enablePullDownRefresh": false
 					}
 				},
+				{
+					"path": "fullHouseWifi_step2/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
 				{
 					"path": "aiControlSys/index",
 					"style": {
@@ -307,6 +314,20 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": false
 					}
+				},
+				{
+					"path": "protocol/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "duijiang/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
 				}
 			]
 		}

pages/index/aiControlSys_step2/index.vue

@@ -66,9 +66,46 @@
 			</view>
 		</view>
 
-
+		<view class="parmasBox" v-if="orderId">
+			<view class="con">
+				<view class="top">
+					<view class="item">
+						<view class="name">
+							收货人
+						</view>
+						<view class="des">
+							{{shareCon.name}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							电话
+						</view>
+						<view class="des">
+							{{shareCon.phone}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							收货地址
+						</view>
+						<view class="des">
+							{{shareCon.address}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							备注
+						</view>
+						<view class="des">
+							{{shareCon.remark}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
 		<image @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
-		<view class="bot">
+		<view class="bot" v-if="!orderId">
 			<!-- <view class="left" @click="showPreviewConfig=true"> -->
 			<view class="left" @click="">
 				<view class="price">
@@ -134,6 +171,8 @@
 <script>
 	import {
 		postOrderReq,
+
+		getOrderDetailReq
 	} from '@/api/test/index.js'
 	export default {
 		components: {
@@ -162,20 +201,47 @@
 
 				orderId: '',
 
-				pConfig: -1
+				pConfig: -1,
+				shareCon: null
 			}
 		},
-		onLoad(options) {
+		async onLoad(o) {
+			// o.orderId = '43c43ced14b312fb69d80cedbd7b23f4'
+			if (o.orderId) {
+				this.orderId = o.orderId
+				console.log('o.orderId', o.orderId);
 
-			this.selHx = getApp().selHx
-			this.selPp = getApp().selPp
-			this.selSuo = getApp().selSuo
-			this.selMb = getApp().selMb
-			this.selCl = getApp().selCl
-			this.selKt = getApp().selKt
-			this.totalPrice = getApp().totalPrice
+				let res = await getOrderDetailReq({
+					orderId: o.orderId
+				})
+				if (res.code == 0) {
+					console.log('邀请订单详情返回值-智能控制系统: ', res);
+
+					this.shareCon = res.data
+
+					this.selHx = res.data.config.house_type
+					this.selPp = res.data.config.brand
+					this.selSuo = res.data.config.mind_lock
+					this.selMb = res.data.config.mind_switch
+					this.selCl = res.data.config.mind_curtain
+					this.selKt = res.data.config.mind_air_conditioner
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			} else {
+				this.selHx = getApp().selHx
+				this.selPp = getApp().selPp
+				this.selSuo = getApp().selSuo
+				this.selMb = getApp().selMb
+				this.selCl = getApp().selCl
+				this.selKt = getApp().selKt
+				this.totalPrice = getApp().totalPrice
 
-			this.pConfig = getApp().pConfig
+				this.pConfig = getApp().pConfig
+			}
 		},
 		methods: {
 			async postOrder() {

pages/index/customMian/index.vue

@@ -44,7 +44,7 @@
 					</view>
 					<view class="list">
 						<view class="item" v-for="(item,index) in mainPreviewInfo.kt">
-							<image :src="picBase+item.cover" mode=""></image>
+							<image :src="picBase+item.image[0]" mode=""></image>
 							<view class="name">
 								{{item.model_number}}
 							</view>
@@ -63,7 +63,7 @@
 					</view>
 					<view class="list">
 						<view class="item" v-for="(item,index) in mainPreviewInfo.ct">
-							<image :src="picBase+item.cover" mode=""></image>
+							<image :src="picBase+item.image[0]" mode=""></image>
 							<view class="name">
 								{{item.model_number}}
 							</view>
@@ -82,7 +82,7 @@
 					</view>
 					<view class="list">
 						<view class="item" v-for="(item,index) in mainPreviewInfo.ws">
-							<image :src="picBase+item.cover" mode=""></image>
+							<image :src="picBase+item.image[0]" mode=""></image>
 							<view class="name">
 								{{item.model_number}}
 							</view>
@@ -101,7 +101,7 @@
 					</view>
 					<view class="list">
 						<view class="item" v-for="(item,index) in mainPreviewInfo.yt">
-							<image :src="picBase+item.cover" mode=""></image>
+							<image :src="picBase+item.image[0]" mode=""></image>
 							<view class="name">
 								{{item.model_number}}
 							</view>
@@ -110,11 +110,50 @@
 				</view>
 			</view>
 		</view>
+
+		<view class="parmasBox" v-if="orderId">
+			<view class="con">
+				<view class="top">
+					<view class="item">
+						<view class="name">
+							收货人
+						</view>
+						<view class="des">
+							{{shareCon.name}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							电话
+						</view>
+						<view class="des">
+							{{shareCon.phone}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							收货地址
+						</view>
+						<view class="des">
+							{{shareCon.address}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							备注
+						</view>
+						<view class="des">
+							{{shareCon.remark}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
 		<image @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
-		<view class="bot">
+		<view class="bot" v-if="!orderId">
 			<view class="left">
 				<view class="price">
-					￥{{mainPreviewInfo.totalPrice?mainPreviewInfo.totalPrice.toFixed(2):'0.00'}}
+					￥{{mainPreviewInfo.price?mainPreviewInfo.price.toFixed(2):'0.00'}}
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
@@ -165,20 +204,26 @@
 				<u-button text="一键下单" color="#333" @click="postOrder"></u-button>
 			</view>
 		</u-popup>
-
+		<u-modal :show="showShare" title="请长按图片保存小程序二维码至相册以分享" @confirm="showShare=false" content='' confirmText="关闭"
+			confirmColor="#F7790C">
+			<image :src="picBase+linkPic" mode="" style="width: 500rpx;height: 500rpx;"></image>
+		</u-modal>
 	</view>
 </template>
 
 <script>
 	import {
 		postOrderReq,
+		getOrderDetailReq,
+		getWxQrCodeReq
 	} from '@/api/test/index.js'
 	export default {
-		components: {
-
-		},
+		components: {},
 		data() {
 			return {
+				showShare: false,
+				linkPic: '',
+
 				picUrl: this.$picUrl,
 				picBase: this.$picBase,
 				showFixInfo: false,
@@ -192,36 +237,66 @@
 				orderId: '',
 				ids: '',
 
-				pConfig: -1
+				pConfig: -1,
+
+				shareCon: null
 			}
 		},
-		onLoad(options) {
-			this.pConfig = getApp().pConfig
+		async onLoad(o) {
+			// o.orderId = '5c3455b568c5409270e0d99cbb6057e6'
+			if (o.orderId) {
+				this.orderId = o.orderId
+				console.log('o.orderId', o.orderId);
 
-			this.mainPreviewInfo = getApp().mainPreviewInfo
-			let tempids = []
-			getApp().mainPreviewInfo.kt.forEach((item, index) => {
-				tempids.push(item.id)
-			})
-			getApp().mainPreviewInfo.ct.forEach((item, index) => {
-				tempids.push(item.id)
-			})
-			getApp().mainPreviewInfo.ws.forEach((item, index) => {
-				tempids.push(item.id)
-			})
-			getApp().mainPreviewInfo.yt.forEach((item, index) => {
-				tempids.push(item.id)
-			})
-			tempids.forEach((item, index) => {
-				if (index == tempids.length - 1) {
-					this.ids += item
+				let res = await getOrderDetailReq({
+					orderId: o.orderId
+				})
+				if (res.code == 0) {
+					console.log('邀请订单详情返回值-无主灯: ', res);
+					this.shareCon = res.data
+					this.mainPreviewInfo = {
+						hx: res.data.config.house_type_data,
+						xl: res.data.config.series_data,
+						kt: res.data.config.lamp.living_room.list,
+						ct: res.data.config.lamp.dining_room_light.list,
+						ws: res.data.config.lamp.bedroom_lamp.list,
+						yt: res.data.config.lamp.balcony_light.list,
+					}
 				} else {
-					this.ids += (item + ',')
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				}
-			})
+			} else {
+				this.pConfig = getApp().pConfig
+
+				this.mainPreviewInfo = getApp().mainPreviewInfo
+
+				let tempids = []
+				getApp().mainPreviewInfo.kt.forEach((item, index) => {
+					tempids.push(item.id)
+				})
+				getApp().mainPreviewInfo.ct.forEach((item, index) => {
+					tempids.push(item.id)
+				})
+				getApp().mainPreviewInfo.ws.forEach((item, index) => {
+					tempids.push(item.id)
+				})
+				getApp().mainPreviewInfo.yt.forEach((item, index) => {
+					tempids.push(item.id)
+				})
+				tempids.forEach((item, index) => {
+					if (index == tempids.length - 1) {
+						this.ids += item
+					} else {
+						this.ids += (item + ',')
+					}
+				})
 
-			console.log('预览配置信息', this.mainPreviewInfo);
-			console.log('所有灯id', this.ids);
+				console.log('预览配置信息', this.mainPreviewInfo);
+				console.log('所有灯id', this.ids);
+			}
 		},
 		methods: {
 			back() {
@@ -253,6 +328,21 @@
 
 					this.orderId = res.data.orderId
 					this.showFixInfo = false
+
+					let res1 = await getWxQrCodeReq({
+						page: 'pages/index/index',
+						id: this.orderId
+					})
+					if (res1.code == 0) {
+						console.log('获取小程序码返回值: ', res1);
+						this.linkPic = res1.data.url
+						this.showShare = true
+					} else {
+						uni.showToast({
+							title: res1.message,
+							icon: 'none'
+						})
+					}
 				} else {
 					uni.showToast({
 						title: res.message,

pages/index/customNoMian_step2/index.vue

@@ -56,9 +56,48 @@
 			</view>
 		</view>
 
+		<view class="parmasBox" v-if="orderId">
+			<view class="con">
+				<view class="top">
+					<view class="item">
+						<view class="name">
+							收货人
+						</view>
+						<view class="des">
+							{{shareCon.name}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							电话
+						</view>
+						<view class="des">
+							{{shareCon.phone}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							收货地址
+						</view>
+						<view class="des">
+							{{shareCon.address}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							备注
+						</view>
+						<view class="des">
+							{{shareCon.remark}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
 
 		<image @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
-		<view class="bot">
+		<view class="bot" v-if="!orderId">
 			<!-- <view class="left" @click="showPreviewConfig=true"> -->
 			<view class="left" @click="">
 				<view class="price">
@@ -74,6 +113,8 @@
 		</view>
 
 
+
+
 		<u-popup :show="showFixInfo" @close="close" @open="open" round='10'>
 			<view class="topBar" style="">
 				<view class="left">
@@ -124,7 +165,11 @@
 <script>
 	import {
 		postOrderReq,
+
+		getOrderDetailReq
 	} from '@/api/test/index.js'
+
+
 	export default {
 		components: {
 
@@ -151,20 +196,47 @@
 				remark: '',
 
 				orderId: '',
-				pConfig: -1
+				pConfig: -1,
+
+				shareCon: null
 			}
 		},
-		onLoad(options) {
+		async onLoad(o) {
+			// o.orderId = '0583586cf846a460cdc6948a9f83ba24'
+			if (o.orderId) {
+				this.orderId = o.orderId
+				console.log('o.orderId', o.orderId);
 
-			this.selHx = getApp().selHx
-			this.selKj = getApp().selKj
-			this.selPp = getApp().selPp
-			this.selXl = getApp().selXl
-			this.selBb = getApp().selBb
+				let res = await getOrderDetailReq({
+					orderId: o.orderId
+				})
+				if (res.code == 0) {
+					console.log('邀请订单详情返回值-无主灯: ', res);
 
-			this.pConfig = getApp().pConfig
+					this.shareCon = res.data
 
-			this.totalPrice = getApp().totalPrice
+					this.selHx = res.data.config.house_type
+					this.selKj = res.data.config.space
+					this.selPp = res.data.config.brand
+					this.selXl = res.data.config.series
+					this.selBb = res.data.config.version
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			} else {
+				this.selHx = getApp().selHx
+				this.selKj = getApp().selKj
+				this.selPp = getApp().selPp
+				this.selXl = getApp().selXl
+				this.selBb = getApp().selBb
+
+				this.pConfig = getApp().pConfig
+
+				this.totalPrice = getApp().totalPrice
+			}
 		},
 		methods: {
 			back() {

pages/index/fullHouseWifi_step2/index.scss

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

pages/index/fullHouseWifi_step2/index.vue

@@ -0,0 +1,167 @@
+<template>
+	<view class="page">
+		<navBar title="定制我家的全屋WIFI" :back="true" color="black" background="white" />
+		<image class="topImg" :src="picUrl + '/static/other/noMain_img4.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>
+			定制我家的全屋WIFI
+		</view>
+
+		<view class="parmasBox">
+			<view class="con">
+				<view class="top">
+					<view class="item">
+						<view class="name">
+							户型
+						</view>
+						<view class="des">
+							{{selHx.value}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="parmasBox" v-if="orderId">
+			<view class="con">
+				<view class="top">
+					<view class="item">
+						<view class="name">
+							收货人
+						</view>
+						<view class="des">
+							{{shareCon.name}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							电话
+						</view>
+						<view class="des">
+							{{shareCon.phone}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							收货地址
+						</view>
+						<view class="des">
+							{{shareCon.address}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							备注
+						</view>
+						<view class="des">
+							{{shareCon.remark}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<image @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
+
+		<u-modal :show="showShare" title="分享链接" :content='content'></u-modal>
+	</view>
+	</view>
+</template>
+
+<script>
+	import {
+		postOrderReq,
+
+		getOrderDetailReq
+	} from '@/api/test/index.js'
+
+
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				showShare: true,
+
+				picUrl: this.$picUrl,
+				selHx: null,
+				orderId: '',
+				shareCon: null,
+
+				options: null,
+				options1: null,
+				query: null
+			}
+		},
+		async onLoad(o) {
+			// o.orderId = '08e2d44b34b4bc182882242f02837797'
+			const that = this;
+			// 获取当前页面实例
+			const pages = getCurrentPages();
+			const currentPage = pages[pages.length - 1];
+			// 获取页面链接携带的参数
+			const urlParams = currentPage.options;
+			console.log('urlParams', urlParams);
+
+			this.$toast('全屋WiFi页面测试数o数据:' + o.orderId + '|' + o.testData + '|' + JSON.stringify(o) + '||' + JSON
+				.stringify(urlParams), 'none', 5000)
+			// this.options = o
+			// this.options1 = JSON.stringify(o)
+
+			// 获取小程序启动时的参数
+			let obj = wx.getLaunchOptionsSync();
+			let query = null;
+
+			if (o.scene || obj.query.scene) {
+				// 这里是用开发者工具模拟的时候要先用 encodeURIComponent 编译，模拟真实传递参数的效果，项目发布审核的时候这句话要注释掉
+				// query = options ? encodeURIComponent(options.scene) : encodeURIComponent(obj.query.scene);
+				query = o ? decodeURIComponent(o.scene) : decodeURIComponent(obj.query.scene);
+				// query =  decodeURIComponent(obj.query.scene);
+				// this.query = query
+				//解析参数
+				let orderId = query.split("-")[0];
+				let testData = query.split("-")[1];
+
+				setTimeout(() => {
+					this.$toast('全屋WiFi页面测试数o2数据:' + orderId + '|' + testData + '|' + JSON.stringify(query),
+						'none', 5000)
+				}, 6000)
+			}
+
+			return
+			if (o.orderId) {
+				this.orderId = o.orderId
+				console.log('o.orderId', o.orderId);
+
+				let res = await getOrderDetailReq({
+					orderId: o.orderId
+				})
+				if (res.code == 0) {
+					console.log('邀请订单详情返回值-无主灯: ', res);
+
+					this.shareCon = res.data
+
+					this.selHx = res.data.config.house_type
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			}
+		},
+		methods: {
+			back() {
+				uni.navigateBack()
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/mall/detail/index.scss

@@ -100,7 +100,7 @@
 }
 .parmasBox{
 	border-top: 2rpx solid #EAEAEA;
-	border-bottom: 2rpx solid #EAEAEA;
+	// border-bottom: 2rpx solid #EAEAEA;
 	margin-top: 48rpx;
 	width: 100%;
 	.con{

pages/my.vue

@@ -5,34 +5,32 @@
 			<view class="top">
 				<view class="userInfo">
 					<view class="left">
-						<navigator url="/pages/my/userInfo/index">
-							<button class="avatarBox">
-								<image class="avatar"
-									:src="userInfo?userInfo.head:picUrl+'/static/other/defaultAvatar.png'"></image>
-							</button>
-						</navigator>
+						<button class="avatarBox" @click="toPage('info')">
+							<image class="avatar"
+								:src="userInfo?userInfo.head:picUrl+'/static/other/defaultAvatar.png'"></image>
+						</button>
 						<text class="btn" v-if="!token" @click="login">请点击登录</text>
-						<text class="btn" v-if="token&&role=='cydg'">XXX电工</text>
-						<text class="btn" v-if="token&&role=='hy'">XXX会员</text>
+						<text class="btn" v-if="token&&role=='cydg'">{{userInfo.nickname}}</text>
+						<text class="btn" v-if="token&&role=='hy'">{{userInfo.nickname}}</text>
 
 						<view class="lMember" v-if="token&&role=='lhy'">
-							<text class="btn1">XXXL会员</text>
+							<text class="btn1">{{userInfo.nickname}}</text>
 							<view class="botDes">
 								查看商品会员价，72小时后自动恢复
 								为售价。会员价格还剩 00:05:59
 							</view>
 						</view>
-						<view class="lMember" v-if="token&&role=='dg'">
-							<text class="btn1">陈冰冰CBb</text>
+						<view class="lMember" v-if="token&&role=='hdhy'">
+							<text class="btn1">{{userInfo.nickname}}</text>
 							<view class="botDes">
-								17820937628
+								{{userInfo.phone}}
 							</view>
 						</view>
 
 						<view class="lMember" v-if="token&&role=='svip'">
-							<text class="btn1">XXXS-VIP</text>
+							<text class="btn1">{{userInfo.nickname}}</text>
 							<view class="botDes">
-								17820937628
+								{{userInfo.phone}}
 							</view>
 						</view>
 						<view class="lMember" v-if="token&&role=='yk'">
@@ -42,23 +40,21 @@
 							</view>
 						</view>
 
-						<text class="btn" v-if="token&&role=='sjkf'">XXX设计客服</text>
-						<text class="btn" v-if="token&&role=='shkf'">XXX售后客服</text>
-						<text class="btn" v-if="token&&role=='yw'">XXX业务</text>
+						<text class="btn" v-if="token&&role=='sjkf'">{{userInfo.nickname}}</text>
+						<text class="btn" v-if="token&&role=='shkf'">{{userInfo.nickname}}</text>
+						<text class="btn" v-if="token&&role=='yw'">{{userInfo.nickname}}</text>
 
-						<text class="btn" v-if="token&&role=='superAdmin'">XXX超级管理员</text>
+						<text class="btn" v-if="token&&role=='superAdmin'">{{userInfo.nickname}}</text>
 
 
 					</view>
-					<navigator :url="'/pages/my/set/index?role=' + role">
-						<image :src="picUrl+'/static/my/set2.png'" mode=""
-							style="width: 37rpx;height: 41rpx;margin-right: 22rpx;">
-						</image>
-					</navigator>
+					<image :src="picUrl+'/static/my/set2.png'" mode="" @click="toPage('set')"
+						style="width: 37rpx;height: 41rpx;margin-right: 22rpx;">
+					</image>
 				</view>
 
-				<view class="invite" @click="show=true"
-					v-if="role=='sjkf'||role=='shkf'||role=='yw'||role=='superAdmin'||role=='yk'||role==''">
+				<view class="invite" @click="token?show=true:$toast('请先登录')"
+					v-if="role=='sjkf'||role=='shkf'||role=='yw'||role=='superAdmin'||role=='yk'||!role">
 					<view class="left">
 						<image :src="picUrl+'/static/my/vip.png'" mode="" style="width: 27rpx;height: 30rpx;">
 						</image>
@@ -77,18 +73,16 @@
 			</view>
 
 			<view class="serList">
-				<navigator :url="item.url" v-for="(item,index) in serList">
-					<view class="item">
-						<view class="left">
-							<image :src="item.icon" mode="" style="height: 31rpx;width: 35rpx;"></image>
-							<text>{{item.name}}</text>
-						</view>
-						<view class="right">
-							<text class="num" v-if="item.phone">{{item.phone}}</text>
-							<image src="/static/my/arr_r.png" mode="" style="height: 24rpx;width: 14rpx;"></image>
-						</view>
+				<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>
+						<text>{{item.name}}</text>
+					</view>
+					<view class="right">
+						<text class="num" v-if="item.phone">{{item.phone}}</text>
+						<image src="/static/my/arr_r.png" mode="" style="height: 24rpx;width: 14rpx;"></image>
 					</view>
-				</navigator>
+				</view>
 			</view>
 		</view>
 
@@ -113,44 +107,61 @@
 				picUrl: this.$picUrl,
 
 				token: uni.getStorageSync('token'),
-				role: uni.getStorageSync('role'),
-				// token: null,
-				// role: null,
-				// role: 'cydg',
-				// role: 'dg',
+				// role: uni.getStorageSync('role'),
+
+				role: null,
+
+				// status==1
+				// role: 'cydg',3
+				// role: 'hy', 5
+				// role: 'lhy',2
+				// role: 'svip',type==1
+				// role: 'hdyh',type==4
+				// role: 'youke',type==0
+
 
-				// role: 'hy',
-				// role: 'lhy',
+				// status==0
+				// role: 'yw',
 				// role: 'sjkf',
 				// role: 'shkf',
-				// role: 'yw',
-				// role: 'svip',
 				// role: 'superAdmin',
 
 				serList: [{
 						icon: this.$picUrl + '/static/my/set.png',
 						name: '设置',
 						url: '/pages/my/set/index?role=' + this.role
-					},
-					{
+					}, {
 						icon: this.$picUrl + '/static/my/sh.png',
 						name: '售后',
 						url: '/pages/my/sellAfter/index'
-					},
-					{
+					}, {
 						icon: this.$picUrl + '/static/my/tg.png',
 						name: '团购商品',
 						url: '/pages/my/actGoods/index'
-					},
-					{
+					}, {
 						icon: this.$picUrl + '/static/my/sc.png',
 						name: '收藏',
 						url: '/pages/my/collect/index'
-					},
-					{
+					}, {
 						icon: this.$picUrl + '/static/my/qt.png',
 						name: '其他信息',
 						url: '/pages/my/otherInfo/index'
+					},
+					{
+						icon: this.$picUrl + '/static/my/yjlx.png',
+						name: '一键联系',
+						phone: '12983098478'
+					},
+					{
+						icon: this.$picUrl + '/static/my/jiang.png',
+						name: '兑奖信息',
+						url: '/pages/my/duijiang/index'
+						// phone: '12983098478'
+					},
+					{
+						icon: this.$picUrl + '/static/my/qt.png',
+						name: '小程序使用指南',
+						url: '/pages/my/useLead/index'
 					}
 				],
 
@@ -166,30 +177,57 @@
 				user_name: '',
 
 				show: false,
-				list: [{
-						name: '邀约VIP'
-					},
-					{
-						name: '邀约L会员'
-					},
-					{
-						name: '邀约会员'
-					},
-					{
-						name: '邀约电工'
-					},
-					{
-						name: '邀约活动用户'
-					}
-				],
+				list: [],
 				userInfo: null
 			}
 		},
-		async onLoad() {
+		async onShow() {
 			if (uni.getStorageSync('token')) {
 				let res = await getUserInfoReq()
 				if (res.code == 0) {
 					this.userInfo = res.data
+					console.log('用户信息', this.userInfo);
+					// this.role = 'cydg'
+					if (res.data.status) {
+						switch (res.data.type) {
+							case 0:
+								this.role = 'yk'
+								break
+							case 1:
+								this.role = 'svip'
+								break
+							case 2:
+								this.role = 'lhy'
+								break
+							case 3:
+								this.role = 'cydg'
+								break
+							case 4:
+								this.role = 'hdyh'
+								break
+							case 5:
+								this.role = 'hy'
+								break
+						}
+						console.log('当前用户角色', this.role);
+					} else {
+						switch (res.data.type) {
+							case 1:
+								this.role = 'superAdmin'
+								break
+							case 2:
+								this.role = 'sjkf'
+								break
+							case 3:
+								this.role = 'shkf'
+								break
+							case 4:
+								this.role = 'yw'
+								break
+						}
+					}
+					console.log('当前员工角色', this.role);
+					// this.checkRole()
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -197,8 +235,8 @@
 					})
 				}
 			}
-
-
+		},
+		async onLoad() {
 			wx.onNeedPrivacyAuthorization((resolve, eventInfo) => {
 				console.log('触发本次事件的接口是：' + eventInfo.referrer)
 				// 需要用户同意隐私授权时
@@ -208,33 +246,136 @@
 				this.resolvePrivacyAuthorization = resolve
 			})
 
-			if (this.role == 'cydg') {
-				this.serList = [{
-						icon: this.picUrl + '/static/my/set.png',
-						name: '设置',
+			// wx.getUserProfile({
+			// 	success: console.log,
+			// 	fail: console.error
+			// })
+		},
+		computed: {},
+		methods: {
+			call(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+			toPage(page) {
+				if (!this.token && page != '/pages/my/otherInfo/index' && !page.phone) {
+					return this.$toast('请先登录')
+				}
+				if (page == 'set') {
+					uni.navigateTo({
 						url: '/pages/my/set/index?role=' + this.role
-					},
-					{
-						icon: this.picUrl + '/static/my/sc.png',
-						name: '收藏',
-						url: '/pages/my/collect/index'
-					},
-					{
-						icon: this.picUrl + '/static/my/qt.png',
-						name: '小程序使用指南',
-						url: '/pages/my/useLead/index'
-					},
-					{
-						icon: this.picUrl + '/static/my/yjlx.png',
-						name: '一键联系',
-						phone: '12983098478'
-					},
-				]
-			} else if (this.role == 'hy') {
-				this.serList = [{
+					})
+				} else if (page == 'info') {
+					uni.navigateTo({
+						url: '/pages/my/userInfo/index'
+					})
+				} else if (page.phone) {
+					this.call(page.phone)
+				} else {
+					uni.navigateTo({
+						url: page.url
+					})
+				}
+			},
+			login() {
+				let _this = this
+				uni.login({
+					provider: 'weixin',
+					success: async (res) => {
+						if (res.errMsg == 'login:ok') {
+							let res1 = await wxAuthLoginReq({
+								code: res.code
+							})
+							if (res1.code == 0) {
+								uni.setStorageSync('token', res1.data.token)
+								// uni.setStorageSync('role', 'yk')
+								// uni.setStorageSync('userInfo', res1.data.user_info)
+								_this.$toast('登录成功')
+								setTimeout(() => {
+									uni.reLaunch({
+										url: '/pages/my'
+									})
+								}, 1500)
+							} else {
+								uni.showToast({
+									title: res1.message,
+									icon: 'none'
+								})
+							}
+						}
+					}
+				});
+			},
+
+			handleSel(e) {
+				console.log('sheet选择参数：', e);
+				let type = -1
+				if (e.name == '邀约VIP') {
+					type = 'vip'
+				} else if (e.name == '邀约L会员') {
+					type = 'ls'
+				} else if (e.name == '邀约会员') {
+					type = 'hy'
+				} else if (e.name == '邀约活动用户') {
+					type = 'yh'
+				} else if (e.name == '邀约电工') {
+					type = 'dg'
+				}
+				uni.navigateTo({
+					url: '/pages/my/inviteDetail/index?type=' + type
+				})
+			},
+			checkRole() {
+				if (this.role == 'yk') {
+					this.serList = [{
+							icon: this.picUrl + '/static/my/tg.png',
+							name: '活动商城',
+							url: '/pages/my/actGoods/index'
+						}, {
+							icon: this.picUrl + '/static/my/sc.png',
+							name: '收藏',
+							url: '/pages/my/collect/index'
+						}, {
+							icon: this.picUrl + '/static/my/qt.png',
+							name: '小程序使用指南',
+							url: '/pages/my/useLead/index'
+						},
+						{
+							icon: this.picUrl + '/static/other/aboutMe.png',
+							name: '关于我们',
+							url: '/pages/my/aboutMe/index'
+						},
+					]
+				} else if (this.role == 'svip') {
+					this.serList = [{
+							icon: this.picUrl + '/static/my/set.png',
+							name: '设置',
+							url: '/pages/my/set/index?role=' + this.role
+						}, {
+							icon: this.picUrl + '/static/my/sc.png',
+							name: '收藏',
+							url: '/pages/my/collect/index'
+						}, {
+							icon: this.picUrl + '/static/my/yjlx.png',
+							name: '一键联系',
+							phone: '12983098478'
+						}, {
+							icon: this.picUrl + '/static/my/qt.png',
+							name: '小程序使用指南',
+							url: '/pages/my/useLead/index'
+						},
+						{
+							icon: this.picUrl + '/static/other/aboutMe.png',
+							name: '关于我们',
+							url: '/pages/my/aboutMe/index'
+						},
+					]
+				} else if (this.role == 'lhy') {
+					this.serList = [{
 						icon: this.picUrl + '/static/my/sh.png',
 						name: '售后',
-						url: '/pages/my/sellAfter/index'
+						url: '/pages/my/sellAfterCon/index'
 					}, {
 						icon: this.picUrl + '/static/my/sc.png',
 						name: '收藏',
@@ -243,47 +384,78 @@
 						icon: this.picUrl + '/static/my/qt.png',
 						name: '小程序使用指南',
 						url: '/pages/my/useLead/index'
-					},
-					{
-						icon: this.picUrl + '/static/my/yjlx.png',
-						name: '一键联系',
-						phone: '12983098478'
-					},
-				]
-			} else if (this.role == 'lhy') {
-				this.serList = [{
-					icon: this.picUrl + '/static/my/sh.png',
-					name: '售后',
-					url: '/pages/my/sellAfterCon/index'
-				}, {
-					icon: this.picUrl + '/static/my/sc.png',
-					name: '收藏',
-					url: '/pages/my/collect/index'
-				}, {
-					icon: this.picUrl + '/static/my/qt.png',
-					name: '小程序使用指南',
-					url: '/pages/my/useLead/index'
-				}, ]
-			} else if (this.role == 'sjkf' || this.role == 'yw') {
-				if (this.role == 'sjkf') {
+					}, ]
+				} else if (this.role == 'cydg') {
+					this.serList = [{
+							icon: this.picUrl + '/static/my/set.png',
+							name: '设置',
+							url: '/pages/my/set/index?role=' + this.role
+						},
+						{
+							icon: this.picUrl + '/static/my/sc.png',
+							name: '收藏',
+							url: '/pages/my/collect/index'
+						},
+						{
+							icon: this.picUrl + '/static/my/yjlx.png',
+							name: '一键联系',
+							phone: '12983098478'
+						},
+						{
+							icon: this.picUrl + '/static/my/jiang.png',
+							name: '兑奖信息',
+							// phone: '12983098478'
+						},
+						{
+							icon: this.picUrl + '/static/my/qt.png',
+							name: '小程序使用指南',
+							url: '/pages/my/useLead/index'
+						},
+
+					]
+				} else if (this.role == 'hdhy') {
 					this.serList = [{
 						icon: this.picUrl + '/static/my/set.png',
 						name: '设置',
 						url: '/pages/my/set/index?role=' + this.role
-					}, {
-						icon: this.picUrl + '/static/my/sh.png',
-						name: '售后',
-						url: '/pages/my/sellAfter/index'
 					}, {
 						icon: this.picUrl + '/static/my/sc.png',
 						name: '收藏',
 						url: '/pages/my/collect/index'
+					}, {
+						icon: this.picUrl + '/static/my/yjlx.png',
+						name: '一键联系',
+						phone: '12983098478'
+					}, {
+						icon: this.picUrl + '/static/my/jiang.png',
+						name: '兑奖信息',
+						url: '/pages/my/chapinShip/index'
 					}, {
 						icon: this.picUrl + '/static/my/qt.png',
 						name: '小程序使用指南',
 						url: '/pages/my/useLead/index'
 					}, ]
-				} else {
+				} else if (this.role == 'hy') {
+					this.serList = [{
+							icon: this.picUrl + '/static/my/sh.png',
+							name: '售后',
+							url: '/pages/my/sellAfter/index'
+						}, {
+							icon: this.picUrl + '/static/my/sc.png',
+							name: '收藏',
+							url: '/pages/my/collect/index'
+						}, {
+							icon: this.picUrl + '/static/my/qt.png',
+							name: '小程序使用指南',
+							url: '/pages/my/useLead/index'
+						},
+						{
+							icon: this.picUrl + '/static/my/yjlx.png',
+							name: '一键联系',
+							phone: '12983098478'
+						},
+					]
+				} else if (this.role == 'superAdmin') {
 					this.serList = [{
 						icon: this.picUrl + '/static/my/set.png',
 						name: '设置',
@@ -302,111 +474,91 @@
 						url: '/pages/my/collect/index'
 					}, {
 						icon: this.picUrl + '/static/my/qt.png',
-						name: '小程序使用指南',
-						url: '/pages/my/useLead/index'
+						name: '其他信息',
+						url: '/pages/my/otherInfo/index'
 					}, ]
-				}
 
-				this.list = [{
-						name: '邀约VIP'
-					},
-					{
-						name: '邀约L会员'
-					},
-					{
-						name: '邀约活动用户'
+					this.list = [{
+							name: '邀约VIP'
+						},
+						{
+							name: '邀约L会员'
+						},
+						{
+							name: '邀约会员'
+						},
+						{
+							name: '邀约电工'
+						},
+						{
+							name: '邀约活动用户'
+						}
+					]
+				} else if (this.role == 'sjkf' || this.role == 'yw') {
+					if (this.role == 'sjkf') {
+						this.serList = [{
+							icon: this.picUrl + '/static/my/set.png',
+							name: '设置',
+							url: '/pages/my/set/index?role=' + this.role
+						}, {
+							icon: this.picUrl + '/static/my/sh.png',
+							name: '售后',
+							url: '/pages/my/sellAfter/index'
+						}, {
+							icon: this.picUrl + '/static/my/sc.png',
+							name: '收藏',
+							url: '/pages/my/collect/index'
+						}, {
+							icon: this.picUrl + '/static/my/qt.png',
+							name: '小程序使用指南',
+							url: '/pages/my/useLead/index'
+						}, ]
+					} else {
+						this.serList = [{
+							icon: this.picUrl + '/static/my/set.png',
+							name: '设置',
+							url: '/pages/my/set/index?role=' + this.role
+						}, {
+							icon: this.picUrl + '/static/my/sh.png',
+							name: '售后',
+							url: '/pages/my/sellAfter/index'
+						}, {
+							icon: this.picUrl + '/static/my/tg.png',
+							name: '团购商品',
+							url: '/pages/my/actGoods/index'
+						}, {
+							icon: this.picUrl + '/static/my/sc.png',
+							name: '收藏',
+							url: '/pages/my/collect/index'
+						}, {
+							icon: this.picUrl + '/static/my/qt.png',
+							name: '小程序使用指南',
+							url: '/pages/my/useLead/index'
+						}, ]
 					}
-				]
-			} else if (this.role == 'shkf') {
-				this.serList = [{
-					icon: this.picUrl + '/static/my/set.png',
-					name: '设置',
-					url: '/pages/my/set/index?role=' + this.role
-				}, {
-					icon: this.picUrl + '/static/my/sh.png',
-					name: '售后',
-					url: '/pages/my/sellAfter/index'
-				}, {
-					icon: this.picUrl + '/static/my/tg.png',
-					name: '团购商品',
-					url: '/pages/my/actGoods/index'
-				}, {
-					icon: this.picUrl + '/static/my/sc.png',
-					name: '收藏',
-					url: '/pages/my/collect/index'
-				}, {
-					icon: this.picUrl + '/static/my/qt.png',
-					name: '小程序使用指南',
-					url: '/pages/my/useLead/index'
-				}, ]
+					this.list = [{
+							name: '邀约VIP'
+						},
+						{
+							name: '邀约L会员'
+						},
+						{
+							name: '邀约活动用户'
+						}
+					]
 
-				this.list = [{
-						name: '邀约VIP'
-					},
-					{
-						name: '邀约L会员'
-					},
-					{
-						name: '邀约会员'
-					},
-					{
-						name: '邀约活动用户'
-					}
-				]
-			} else if (this.role == 'dg') {
-				this.serList = [{
-					icon: this.picUrl + '/static/my/set.png',
-					name: '设置',
-					url: '/pages/my/set/index?role=' + this.role
-				}, {
-					icon: this.picUrl + '/static/my/sc.png',
-					name: '收藏',
-					url: '/pages/my/collect/index'
-				}, {
-					icon: this.picUrl + '/static/my/yjlx.png',
-					name: '一键联系',
-					phone: '12983098478'
-				}, {
-					icon: this.picUrl + '/static/my/jiang.png',
-					name: '兑奖信息',
-					url: '/pages/my/chapinShip/index'
-				}, {
-					icon: this.picUrl + '/static/my/qt.png',
-					name: '小程序使用指南',
-					url: '/pages/my/useLead/index'
-				}, ]
-			} else if (this.role == 'svip') {
-				this.serList = [{
-					icon: this.picUrl + '/static/my/set.png',
-					name: '设置',
-					url: '/pages/my/set/index?role=' + this.role
-				}, {
-					icon: this.picUrl + '/static/my/sc.png',
-					name: '收藏',
-					url: '/pages/my/collect/index'
-				}, {
-					icon: this.picUrl + '/static/my/yjlx.png',
-					name: '一键联系',
-					phone: '12983098478'
-				}, {
-					icon: this.picUrl + '/static/my/qt.png',
-					name: '小程序使用指南',
-					url: '/pages/my/useLead/index'
-				}, ]
-			} else if (this.role == 'yk') {
-				this.serList = [{
-						icon: this.$picUrl + '/static/my/set.png',
+				} else if (this.role == 'shkf') {
+					this.serList = [{
+						icon: this.picUrl + '/static/my/set.png',
 						name: '设置',
 						url: '/pages/my/set/index?role=' + this.role
-					},
-					{
-						icon: this.$picUrl + '/static/my/sh.png',
+					}, {
+						icon: this.picUrl + '/static/my/sh.png',
 						name: '售后',
 						url: '/pages/my/sellAfter/index'
-					},
-					{
+					}, {
 						icon: this.picUrl + '/static/my/tg.png',
-						name: '活动商城',
+						name: '团购商品',
 						url: '/pages/my/actGoods/index'
 					}, {
 						icon: this.picUrl + '/static/my/sc.png',
@@ -416,94 +568,24 @@
 						icon: this.picUrl + '/static/my/qt.png',
 						name: '小程序使用指南',
 						url: '/pages/my/useLead/index'
-					},
-					{
-						icon: this.$picUrl + '/static/my/qt.png',
-						name: '其他信息',
-						url: '/pages/my/otherInfo/index'
-					}
-				]
-			} else if (this.role == 'superAdmin') {
-				this.serList = [{
-					icon: this.picUrl + '/static/my/set.png',
-					name: '设置',
-					url: '/pages/my/set/index?role=' + this.role
-				}, {
-					icon: this.picUrl + '/static/my/sh.png',
-					name: '售后',
-					url: '/pages/my/sellAfter/index'
-				}, {
-					icon: this.picUrl + '/static/my/tg.png',
-					name: '团购商品',
-					url: '/pages/my/actGoods/index'
-				}, {
-					icon: this.picUrl + '/static/my/sc.png',
-					name: '收藏',
-					url: '/pages/my/collect/index'
-				}, {
-					icon: this.picUrl + '/static/my/qt.png',
-					name: '其他信息',
-					url: '/pages/my/otherInfo/index'
-				}, ]
-			} else {
-
-			}
-
-			// wx.getUserProfile({
-			// 	success: console.log,
-			// 	fail: console.error
-			// })
-		},
-		computed: {},
-		methods: {
+					}, ]
 
-			login() {
-				let _this = this
-				uni.login({
-					provider: 'weixin',
-					success: async (res) => {
-						if (res.errMsg == 'login:ok') {
-							let res1 = await wxAuthLoginReq({
-								code: res.code
-							})
-							if (res1.code == 0) {
-								uni.setStorageSync('token', res1.data.token)
-								uni.setStorageSync('role', 'yk')
-								uni.setStorageSync('userInfo', res1.data.user_info)
-								_this.$toast('登录成功')
-								setTimeout(() => {
-									uni.reLaunch({
-										url: '/pages/my'
-									})
-								}, 1500)
-							} else {
-								uni.showToast({
-									title: res1.message,
-									icon: 'none'
-								})
-							}
+					this.list = [{
+							name: '邀约VIP'
+						},
+						{
+							name: '邀约L会员'
+						},
+						{
+							name: '邀约会员'
+						},
+						{
+							name: '邀约活动用户'
 						}
-					}
-				});
-			},
+					]
+				} else {
 
-			handleSel(e) {
-				console.log('sheet选择参数：', e);
-				let type = -1
-				if (e.name == '邀约VIP') {
-					type = 'vip'
-				} else if (e.name == '邀约L会员') {
-					type = 'ls'
-				} else if (e.name == '邀约会员') {
-					type = 'hy'
-				} else if (e.name == '邀约活动用户') {
-					type = 'yh'
-				} else if (e.name == '邀约电工') {
-					type = 'dg'
 				}
-				uni.navigateTo({
-					url: '/pages/my/inviteDetail/index?type=' + type
-				})
 			}
 		}
 	}

pages/my/actGoods/index.vue

@@ -3,30 +3,13 @@
 		<navBar title="活动商品" :back="true" color="black" background="white" />
 
 		<view class="con">
-			<view class="item" v-for="(item,index) in list" @click="goDetail">
+			<view class="item" v-for="(item,index) in list" @click="goDetail(item)">
 				<view class="topBox">
-					<image :src="picBase+item.image" mode=""></image>
-					<!-- <view class="cutDown">
-						<view class="item2">
-							05
-						</view>
-						<view class="item2 item_d">
-							:
-						</view>
-						<view class="item2">
-							54
-						</view>
-						<view class="item2 item_d">
-							:
-						</view>
-						<view class=" item2">
-							38
-						</view>
-					</view> -->
+					<image :src="picBase+item.cover" mode=""></image>
 				</view>
 				<view class="bottom">
 					<view class="txt">
-						{{item.title}}
+						{{item.name}}
 					</view>
 				</view>
 			</view>
@@ -37,8 +20,8 @@
 
 <script>
 	import {
-		getActivityDataReq,
-	} from '@/api/my/index.js'
+		getMallReq,
+	} from '@/api/test/index.js'
 	export default {
 		components: {},
 		data() {
@@ -51,10 +34,12 @@
 
 		},
 		async onShow() {
-			let res = await getActivityDataReq()
+			let res = await getMallReq({
+				isActivity: 1
+			})
 			if (res.code == 0) {
 				this.list = res.data
-				console.log('活动商品返回值:', res.data, this.picBase);
+				console.log('活动商品返回值:', res.data);
 			} else {
 				uni.showToast({
 					title: res.message,
@@ -63,7 +48,10 @@
 			}
 		},
 		methods: {
-			goDetail() {
+			goDetail(item) {
+				getApp().isSellBack = true
+				getApp().mallItem = item
+
 				uni.navigateTo({
 					url: '/pages/my/actGoodsDetail/index'
 				})

pages/my/actGoodsDetail/index.scss

@@ -6,6 +6,50 @@
 	height: 1124rpx;
 	border-radius: 0 0rpx 0 40rpx;
 	margin-bottom: 60rpx;
+	position: relative;
+	.indicatorBox1{
+					position: absolute;
+					z-index: 3;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					margin-top: 32rpx;
+					margin-bottom: 34rpx;
+					left: 50%;
+					bottom: 20rpx;
+					.indicator1 {
+					       @include flex(row);
+					       justify-content: center;
+							position: absolute;
+							top: 10rpx;
+					       &__dot1 {
+								width: 24rpx;
+								height: 8rpx;
+								border-radius: 4rpx;
+					            margin: 0 8rpx;
+					            transition: background-color 0.3s;				 
+								 background: #D4D4D4;
+								 // border-radius: 10rpx;
+					           &--active1 {
+					                background-color:#E77817;
+									width: 60rpx;
+					            }
+					       }
+					   }
+					   .indicator-num1 {
+					       padding: 2px 0;
+					       background-color: blue;
+					       border-radius: 100px;
+					       width: 35px;
+					       @include flex;
+					       justify-content: center;
+					
+					       &__text1 {
+					            color: red;
+					            font-size: 12px;
+					        }
+					   }
+				}
 }
 
 .cen{
@@ -56,7 +100,7 @@
 }
 .parmasBox{
 	border-top: 2rpx solid #EAEAEA;
-	border-bottom: 2rpx solid #EAEAEA;
+	// border-bottom: 2rpx solid #EAEAEA;
 	margin-top: 48rpx;
 	width: 100%;
 	.con{
@@ -208,6 +252,7 @@
 		.top{
 			display: flex;
 			justify-content: space-between;
+			align-items: center;
 			box-sizing: border-box;
 			.left{
 				box-sizing: border-box;
@@ -220,6 +265,7 @@
 		.boto{
 			display: flex;
 			justify-content: space-between;
+			align-items: center;
 			margin-top: 22rpx;
 			box-sizing: border-box;
 			.left{
@@ -259,3 +305,43 @@
 		}
 	}
 }
+
+
+
+// 倒计时
+
+.time {
+    @include flex;
+    align-items: center;
+
+    &__custom {
+         margin-top: 4px;
+         width: 22px;
+         height: 22px;
+         // background-color: $u-primary;
+         background-color: #4A4A4A;
+         border-radius: 4px;
+         /* #ifndef APP-NVUE */
+         display: flex;
+         /* #endif */
+         justify-content: center;
+         align-items: center;
+    
+        &__item {
+             color: #fff;
+             font-size: 12px;
+             text-align: center;
+         }
+    }
+    
+    &__doc {
+         color: #000000;
+         padding: 0px 4px;
+     }
+    
+    &__item {
+         color: #606266;
+         font-size: 15px;
+         margin-right: 4px;
+     }
+}

pages/my/actGoodsDetail/index.vue

@@ -1,7 +1,23 @@
 <template>
 	<view class="page">
 		<navBar title="详情" :back="true" color="black" background="white" />
-		<image class="topImg" :src="picUrl + '/static/other/noMain_img3.png'" mode=""></image>
+		<!-- <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
+				@change="bannerChange">
+				<view slot="indicator">
+				</view>
+			</u-swiper>
+
+			<view class="indicatorBox1">
+				<view class="indicator1">
+					<view class="indicator1__dot1" style="" v-for="(item, index) in bannerList" :key="index"
+						:class="[index === currentNum ?'indicator1__dot1--active1':'']">
+					</view>
+				</view>
+			</view>
+		</view>
 
 		<view class="cen">
 			<image class="water" src="/static/index/water.png" mode=""></image>
@@ -9,21 +25,21 @@
 			<image class="love" :src="lovePic" mode="" @click="handleCol"></image>
 			<view class="txtBox">
 				<view class="left">
-					中式风造型灯具
+					{{content.name}}
 				</view>
 				<view class="right">
-					20人已赞
+					{{totalCount}}人已收藏
 				</view>
 			</view>
 		</view>
-		<view class="box">
+		<view class="box" v-if="isSellBack" v-for="(item,index) in actData" :key="index">
 			<view class="cutDowncard">
 				<view class="top">
 					<view class="left">
 						活动名称：
 					</view>
 					<view class="right">
-						中秋国庆大促销
+						{{item.name}}
 					</view>
 				</view>
 				<view class="boto">
@@ -31,89 +47,64 @@
 						活动倒计时
 					</view>
 					<view class="right">
-						<view class="num">
-							05
-						</view>
-						<view class="div">
-							:
-						</view>
-						<view class="num">
-							54
-						</view>
-						<view class="div">
-							:
-						</view>
-						<view class="num">
-							38
-						</view>
+						<u-count-down :time="cutDownTime" format="DD:HH:mm:ss" autoStart millisecond @change="onChange">
+							<view class="time">
+								<view class="time__custom">
+									<text class="time__custom__item">{{ timeData.days }}</text>
+								</view>
+								<text class="time__doc">&nbsp;天:</text>
+								<view class="time__custom">
+									<text
+										class="time__custom__item">{{ timeData.hours>10?timeData.hours:'0'+timeData.hours}}</text>
+								</view>
+								<text class="time__doc">:</text>
+								<view class="time__custom">
+									<text class="time__custom__item">{{ timeData.minutes }}</text>
+								</view>
+								<text class="time__doc">:</text>
+								<view class="time__custom">
+									<text class="time__custom__item">{{ timeData.seconds }}</text>
+								</view>
+							</view>
+						</u-count-down>
 					</view>
 				</view>
 			</view>
 		</view>
-
-
-		<view class="parmasBox">
+		<view class="parmasBox" v-for="(item,index) in parmsList" :key="index">
 			<view class="con">
 				<view class="title">
-					选择灯型
+					{{item.title}}
 				</view>
 				<view class="list">
-					<view class="item" v-for="i in 5" :class="[i==currIndex?'act':'']" @click="currIndex=i">
-						BNL456
-					</view>
-				</view>
-
-
-			</view>
-			<view class="parmasBox">
-				<view class="con">
-					<view class="title">
-						灯体尺寸
-					</view>
-					<view class="list">
-						<view class="item" v-for="i in 5" :class="[i==currIndex1?'act':'']" @click="currIndex1=i">
-							86cm*29cm
-						</view>
+					<view class="item" v-for="(item1,index1) in item.list" :class="[item1.isSelect?'act':'']"
+						@click="handleSel(item.list,index1,item[index],index)" :key="index1">
+						{{item1.data}}
 					</view>
 				</view>
 			</view>
+		</view>
 
-			<view class="parmasBox" style="border: none;">
-				<view class="con">
-					<view class="title">
-						灯体尺寸
-					</view>
-					<view class="list">
-						<view class="item" v-for="i in 5" :class="[i==currIndex2?'act':'']" @click="currIndex2=i">
-							86cm*29cm
-						</view>
+		<view class="parmasBox" style="border-bottom: none;">
+			<view class="con" @click="handleOpenOrClose(1)">
+				<view class="title1">
+					<view class="txt">
+						商品描述
 					</view>
-				</view>
-			</view>
-
-			<view class="parmasBox" style="border-bottom: none;">
-				<view class="con" @click="handleOpenOrClose(1)">
-					<view class="title1">
-						<view class="txt">
-							商品描述
-						</view>
-						<image class="add" :src="addOrLessIcon1" mode="" :style="{height:addOrLessIcon1=='/static/index/shortLine.png'
+					<image class="add" :src="addOrLessIcon1" mode="" :style="{height:addOrLessIcon1=='/static/index/shortLine.png'
 					?'2rpx':'22rpx'}"></image>
-					</view>
-					<view class="des" v-if="show1">
-						<view class="title3">
-							这是一条商品描述，图文展示
-						</view>
-						<image src="/static/index/img1.png" class="img" mode=""></image>
-					</view>
+				</view>
+				<view class="des" v-if="show1">
+					<u-parse :content="content1"></u-parse>
 				</view>
 			</view>
 		</view>
+		<!-- </view> -->
 
 		<view class="bot">
 			<view class="left">
 				<view class="price">
-					￥2099，9900
+					￥{{totalPrice.toFixed(2)}}
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
@@ -125,13 +116,25 @@
 </template>
 
 <script>
+	import {
+		addCollReq,
+		cancelCollReq,
+		getGoodsPriceReq
+	} from '@/api/test/index.js'
 	export default {
 		components: {
 
 		},
 		data() {
 			return {
+				timeData: {},
+
+				currentNum: 0,
+				content: null,
+				totalCount: 0,
+
 				picUrl: this.$picUrl,
+				picBase: this.$picBase,
 
 				currIndex: 0,
 				currIndex1: 0,
@@ -139,17 +142,158 @@
 				show1: false,
 				addOrLessIcon1: '/static/index/add.png',
 
-				lovePic: '/static/mall/love.png'
+				lovePic: '/static/mall/love.png',
+
+				bannerList: [],
+
+				isSellBack: true,
+				content1: '',
+
+				parmsList: [],
+
+				checkFullSel1: [],
+				checkFullSel: 0,
+				totalPrice: 0,
+				parmsObj: {},
+
+				actData: [],
+
+				cutDownTime: 0
+			}
+		},
+		onLoad(o) {
+			this.content = getApp().mallItem
+			this.bannerList = getApp().mallItem.images
+			this.totalCount = this.content.collect_total_count
+
+			console.log('售后商品详情', this.content);
+			if (this.content.isCollect) {
+				this.lovePic = "/static/mall/love.png"
+			} else {
+				this.lovePic = "/static/mall/no_love.png"
+			}
+			this.isSellBack = getApp().isSellBack
+
+			this.content1 = getApp().mallItem.content
+
+			this.parmsList = getApp().mallItem.skuParams
+
+			this.parmsList.forEach((item, index) => {
+				this.parmsObj[item.title] = null
+				this.checkFullSel1.push(0)
+
+			})
+
+
+			if (getApp().isSellBack) {
+				this.actData = getApp().mallItem.activity_data
+
+				this.handleRemianTime(this.actData[0].date)
+			}
+			console.log('是否展示活动倒计时', getApp().isSellBack);
+		},
+		watch: {
+			checkFullSel: {
+				async handler(n, o) {
+					let res = this.checkFullSel1.every((item, index) => {
+						return item == 1
+					})
+					if (res) {
+						let parms = []
+						Object.keys(this.parmsObj).forEach((item4, index8) => {
+							parms.push(this.parmsObj[item4])
+						})
+						console.log(parms);
+						let res = await getGoodsPriceReq({
+							goods_id: this.content.id,
+							stock: parms
+						})
+						if (res.code == 0) {
+							console.log(res);
+
+							this.totalPrice = res.data
+						} else {
+							uni.showToast({
+								title: res.message,
+								icon: 'none'
+							})
+						}
+					}
+
+				},
 			}
 		},
-		onLoad(options) {},
 		methods: {
-			handleCol() {
-				if (this.lovePic == "/static/mall/love.png") {
-					this.lovePic = "/static/mall/no_love.png"
+			handleRemianTime(expireTime) {
+				console.log('活动开始时间', expireTime);
+				this.cutDownTime = (new Date(expireTime).getTime()) - Date.now()
+			},
+
+			onChange(e) {
+				this.timeData = e
+			},
+			handleSel(item, index1, outer, pindex) {
+				console.log('this.checkFullSel1', this.checkFullSel1);
+
+				this.checkFullSel = Date.now()
+				item.forEach(async (item2, index) => {
+					item2.isSelect = 0
+					if (index == index1) {
+						item[index1].isSelect = 1
+
+						this.parmsObj[item[index1].title] = {
+							classify: item[index1].title,
+							value: item[index1].data
+						}
+						this.checkFullSel1[pindex] = 1
+					}
+				})
+			},
+			bannerChange(e) {
+				this.currentNum = e.current
+			},
+
+			async handleCol() {
+				if (this.lovePic == "/static/mall/no_love.png") {
+					let res = await addCollReq({
+						id: this.content.id,
+					})
+					if (res.code == 0) {
+						console.log('添加收藏返回值: ', res);
+						this.$toast('收藏成功')
+						this.totalCount += 1
+						if (this.lovePic == "/static/mall/love.png") {
+							this.lovePic = "/static/mall/no_love.png"
+						} else {
+							this.lovePic = "/static/mall/love.png"
+						}
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
 				} else {
-					this.lovePic = "/static/mall/love.png"
+					let res = await cancelCollReq({
+						id: this.content.id,
+					})
+					if (res.code == 0) {
+						console.log('取消收藏返回值: ', res);
+						this.$toast('取消收藏成功')
+						this.totalCount -= 1
+						if (this.lovePic == "/static/mall/love.png") {
+							this.lovePic = "/static/mall/no_love.png"
+						} else {
+							this.lovePic = "/static/mall/love.png"
+						}
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
 				}
+
 			},
 			handleOpenOrClose(i) {
 				if (this['addOrLessIcon' + i] == '/static/index/shortLine.png') {

pages/my/changeNewGoods/index.vue

@@ -3,13 +3,13 @@
 		<navBar title="换新商品" :back="true" color="black" background="white" />
 
 		<view class="con">
-			<view class="item" v-for="i in 7" @click="goDetail">
+			<view class="item" v-for="(item,index) in list" @click="goDetail(item)">
 				<view class="topBox">
-					<image src="/static/index/img1.png" mode=""></image>
+					<image :src="picBase+item.cover" mode=""></image>
 				</view>
 				<view class="bottom">
 					<view class="txt">
-						灯具指南灯具指南灯具指南
+						{{item.name}}
 					</view>
 				</view>
 			</view>
@@ -19,18 +19,41 @@
 </template>
 
 <script>
+	import {
+		getSerBackGoodsReq,
+		getMallReq,
+	} from '@/api/test/index.js'
 	export default {
 		components: {
 
 		},
 		data() {
 			return {
+				list: [],
+				picBase: this.$picBase
+			}
+		},
+		async onLoad(options) {
 
+		},
+		async onShow() {
+			let res = await getMallReq({
+				isAfterSale: 1
+			})
+			if (res.code == 0) {
+				console.log('售后商品列表返回值:', res);
+				this.list = res.data
+			} else {
+				uni.showToast({
+					title: res.message,
+					icon: 'none'
+				})
 			}
 		},
-		onLoad(options) {},
 		methods: {
-			goDetail() {
+			goDetail(item) {
+				getApp().mallItem = item
+				getApp().isSellBack = false
 				uni.navigateTo({
 					url: '/pages/my/actGoodsDetail/index'
 				})

pages/my/changeNewStep/index.vue

@@ -1,23 +1,9 @@
 <template>
 	<view class="page">
-		<navBar title="服务流程" :back="true" color="black" background="white" />
+		<navBar :title="tTitle" :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="" style="margin-bottom: 64rpx;"></image>
-
-			<view class="title">
-				流程一
-			</view>
-			<view class="p" v-for="i in 2">
-				1、灯具装上后要注意维护，不能连续即开即关。可以时长检查，灯具装上后要注意维护，不能连续即开即关。可以时长检查。
-			</view>
-			<image src="/static/index/img1.png" mode="" style="margin-bottom: 64rpx;"></image>
+			<u-parse :content="content.content"></u-parse>
 		</view>
 
 		<view class="btnBox">
@@ -29,16 +15,37 @@
 </template>
 
 <script>
+	import {
+		getSerStepReq,
+		getChangeStepReq,
+	} from '@/api/test/index.js'
 	export default {
 		components: {
 
 		},
 		data() {
 			return {
-
+				tTitle: '',
+				title: '',
+				content: null
+			}
+		},
+		async onLoad(o) {
+			this.tTitle = getApp().stepName
+			if (getApp().stepName == '换新流程') {
+				let res = await getChangeStepReq()
+				if (res.code == 0) {
+					console.log('换新流程返回值: ', res, res.data.content);
+					this.title = res.data.title
+					this.content = res.data
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
 			}
 		},
-		onLoad(options) {},
 		methods: {
 
 		}

pages/my/collect/index.vue

@@ -32,6 +32,9 @@
 			}
 		},
 		async onLoad(o) {
+
+		},
+		async onShow() {
 			let res = await getMyCollectDataReq()
 			if (res.code == 0) {
 				this.list = res.data.data
@@ -45,8 +48,9 @@
 		},
 		methods: {
 			goDetail(item) {
+				getApp().Sid = item.goods_id
 				uni.navigateTo({
-					url: '/pages/my/collectDetail/index?item=' + JSON.stringify(item)
+					url: '/pages/my/collectDetail/index'
 				})
 			}
 		}

pages/my/collectDetail/index.scss

@@ -100,7 +100,7 @@
 }
 .parmasBox{
 	border-top: 2rpx solid #EAEAEA;
-	border-bottom: 2rpx solid #EAEAEA;
+	// border-bottom: 2rpx solid #EAEAEA;
 	margin-top: 48rpx;
 	width: 100%;
 	.con{

pages/my/collectDetail/index.vue

@@ -1,71 +1,47 @@
 <template>
-	<view class="page">
-		<navBar title="详情" :back="true" color="black" 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
-				@change="e => currentNum = e.current">
-				<view slot="indicator">
-				</view>
-			</u-swiper>
-
-			<view class="indicatorBox1">
-				<view class="indicator1">
-					<view class="indicator1__dot1" style="" v-for="(item, index) in bannerList" :key="index"
-						:class="[index === currentNum ?'indicator1__dot1--active1':'']">
+	<view class="">
+		<view class="page">
+			<navBar title="详情" :back="true" color="black" 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
+					@change="e => currentNum = e.current">
+					<view slot="indicator">
 					</view>
-				</view>
-			</view>
-		</view>
-
+				</u-swiper>
 
-		<view class="cen">
-			<image class="water" src="/static/index/water.png" mode=""></image>
-			<image class="halfC" src="/static/index/halfCircle_275.png" mode=""></image>
-			<image class="love" :src="lovePic" mode="" @click="handleCol"></image>
-			<view class="txtBox">
-				<view class="left">
-					轻奢型灯具 纵享美好生活
-				</view>
-				<view class="right">
-					20人已赞
-				</view>
-			</view>
-		</view>
-		<view class="parmasBox">
-			<view class="con">
-				<view class="title">
-					选择灯型
-				</view>
-				<view class="list">
-					<view class="item" v-for="i in 5" :class="[i==currIndex?'act':'']" @click="currIndex=i">
-						BNL456
+				<view class="indicatorBox1">
+					<view class="indicator1">
+						<view class="indicator1__dot1" style="" v-for="(item, index) in bannerList" :key="index"
+							:class="[index === currentNum ?'indicator1__dot1--active1':'']">
+						</view>
 					</view>
 				</view>
+			</view>
 
 
-			</view>
-			<view class="parmasBox">
-				<view class="con">
-					<view class="title">
-						灯体尺寸
+			<view class="cen">
+				<image class="water" src="/static/index/water.png" mode=""></image>
+				<image class="halfC" src="/static/index/halfCircle_275.png" mode=""></image>
+				<image class="love" :src="lovePic" mode="" @click="handleCol"></image>
+				<view class="txtBox">
+					<view class="left">
+						{{content.name}}
 					</view>
-					<view class="list">
-						<view class="item" v-for="i in 5" :class="[i==currIndex1?'act':'']" @click="currIndex1=i">
-							86cm*29cm
-						</view>
+					<view class="right">
+						{{totalCount}}人已收藏
 					</view>
 				</view>
 			</view>
-
-			<view class="parmasBox" style="border: none;">
+			<view class="parmasBox" v-for="(item,index) in parmsList" :key="index">
 				<view class="con">
 					<view class="title">
-						灯体尺寸
+						{{item.title}}
 					</view>
 					<view class="list">
-						<view class="item" v-for="i in 5" :class="[i==currIndex2?'act':'']" @click="currIndex2=i">
-							86cm*29cm
+						<view class="item" v-for="(item1,index1) in item.list" :class="[item1.isSelect?'act':'']"
+							@click="handleSel(item.list,index1,item[index],index)" :key="index1">
+							{{item1.data}}
 						</view>
 					</view>
 				</view>
@@ -81,10 +57,7 @@
 					?'2rpx':'22rpx'}"></image>
 					</view>
 					<view class="des" v-if="show1">
-						<view class="title3">
-							这是一条商品描述，图文展示
-						</view>
-						<image src="/static/index/img1.png" class="img" mode=""></image>
+						<u-parse :content="content1"></u-parse>
 					</view>
 				</view>
 			</view>
@@ -93,7 +66,7 @@
 		<view class="bot">
 			<view class="left">
 				<view class="price">
-					￥2099，9900
+					￥{{totalPrice.toFixed(2)}}
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
@@ -102,9 +75,18 @@
 			</view>
 		</view>
 	</view>
+	</view>
 </template>
 
 <script>
+	import {
+		getMyCollectDetailReq,
+	} from '@/api/my/index.js'
+	import {
+		addCollReq,
+		cancelCollReq,
+		getGoodsPriceReq
+	} from '@/api/test/index.js'
 	export default {
 		components: {
 
@@ -125,20 +107,140 @@
 
 				currentNum: 0,
 				bannerList: [],
+				totalCount: 0,
+				content1: '',
+
+				parmsList: [],
+
+				checkFullSel1: [],
+				checkFullSel: 0,
+				totalPrice: 0,
+				parmsObj: {},
+			}
+		},
+		async onLoad(o) {
+			let res = await getMyCollectDetailReq({
+				id: getApp().Sid
+			})
+			if (res.code == 0) {
+				console.log('我的收藏详情', res);
+				this.content = res.data
+				this.bannerList = this.content.images
+				this.totalCount = this.content.collect_total_count
+
+				if (this.content.isCollect) {
+					this.lovePic = "/static/mall/love.png"
+				} else {
+					this.lovePic = "/static/mall/no_love.png"
+				}
+
+				this.content1 = this.content.content
+
+				this.parmsList = this.content.skuParams
+
+				this.parmsList.forEach((item, index) => {
+					this.parmsObj[item.title] = null
+					this.checkFullSel1.push(0)
+
+				})
+
+			} else {
+				uni.showToast({
+					title: res.message,
+					icon: 'none'
+				})
 			}
 		},
-		onLoad(o) {
-			this.content = JSON.parse(o.item)
-			this.bannerList = JSON.parse(o.item).goods.images
-			console.log('传过来的收藏详情', this.content);
+		watch: {
+			checkFullSel: {
+				async handler(n, o) {
+					let res = this.checkFullSel1.every((item, index) => {
+						return item == 1
+					})
+					if (res) {
+						let parms = []
+						Object.keys(this.parmsObj).forEach((item4, index8) => {
+							parms.push(this.parmsObj[item4])
+						})
+						console.log(parms);
+						let res = await getGoodsPriceReq({
+							goods_id: this.content.id,
+							stock: parms
+						})
+						if (res.code == 0) {
+							console.log(res);
+
+							this.totalPrice = res.data
+						} else {
+							uni.showToast({
+								title: res.message,
+								icon: 'none'
+							})
+						}
+					}
+
+				},
+			}
 		},
 		methods: {
-			handleCol() {
-				if (this.lovePic == "/static/mall/love.png") {
-					this.lovePic = "/static/mall/no_love.png"
+			handleSel(item, index1, outer, pindex) {
+				console.log('this.checkFullSel1', this.checkFullSel1);
+
+				this.checkFullSel = Date.now()
+				item.forEach(async (item2, index) => {
+					item2.isSelect = 0
+					if (index == index1) {
+						item[index1].isSelect = 1
+
+						this.parmsObj[item[index1].title] = {
+							classify: item[index1].title,
+							value: item[index1].data
+						}
+						this.checkFullSel1[pindex] = 1
+					}
+				})
+			},
+			async handleCol() {
+				if (this.lovePic == "/static/mall/no_love.png") {
+					let res = await addCollReq({
+						id: this.content.id,
+					})
+					if (res.code == 0) {
+						console.log('添加收藏返回值: ', res);
+						this.$toast('收藏成功')
+						this.totalCount += 1
+						if (this.lovePic == "/static/mall/love.png") {
+							this.lovePic = "/static/mall/no_love.png"
+						} else {
+							this.lovePic = "/static/mall/love.png"
+						}
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
 				} else {
-					this.lovePic = "/static/mall/love.png"
+					let res = await cancelCollReq({
+						id: this.content.id,
+					})
+					if (res.code == 0) {
+						console.log('取消收藏返回值: ', res);
+						this.$toast('取消收藏成功')
+						this.totalCount -= 1
+						if (this.lovePic == "/static/mall/love.png") {
+							this.lovePic = "/static/mall/no_love.png"
+						} else {
+							this.lovePic = "/static/mall/love.png"
+						}
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
 				}
+
 			},
 			handleOpenOrClose(i) {
 				if (this['addOrLessIcon' + i] == '/static/index/shortLine.png') {

pages/my/duijiang/index.scss

@@ -0,0 +1,34 @@
+.content{
+	background: #F1F1F1;
+	min-height: 100vh;
+	padding: 0 32rpx;
+	padding-top: 24rpx;
+	padding-bottom: 24rpx;
+	.item{
+		height: 432rpx;
+		background: #FFFFFF;
+		border-radius: 0rpx 24rpx 0rpx 24rpx;
+		// margin-top: 24rpx;
+		padding: 0 24rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-around;
+		margin-bottom: 24rpx;
+		.line{
+			display: flex;
+			justify-content:space-between;
+			.left{
+				font-size: 28rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #666666;
+			}
+			.right{
+				font-size: 32rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+			}
+		}
+	}
+}

pages/my/duijiang/index.vue

@@ -0,0 +1,93 @@
+<template>
+	<view class="page">
+		<navBar title="兑奖信息" :back="true" color="black" background="white" />
+
+		<view class="content">
+			<view class="item" v-for="(item,index) in list">
+				<view class="line">
+					<view class="left">
+						姓名
+					</view>
+					<view class="right">
+						{{item.name}}
+					</view>
+				</view>
+				<view class="line">
+					<view class="left">
+						手机号
+					</view>
+					<view class="right">
+						{{item.phone}}
+					</view>
+				</view>
+				<view class="line">
+					<view class="left">
+						兑奖信息
+					</view>
+					<view class="right">
+						{{item.award_content}}
+					</view>
+				</view>
+				<view class="line">
+					<view class="left">
+						联系电话
+					</view>
+					<view class="right">
+						{{item.phone}}
+					</view>
+				</view>
+				<view class="line">
+					<view class="left">
+						是否邀约成功
+					</view>
+					<view class="right">
+						{{item.state}}
+					</view>
+				</view>
+				<view class="line">
+					<view class="left">
+						时间
+					</view>
+					<view class="right">
+						{{item.created_at}}
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getAwardDataReq,
+	} from '@/api/test/index.js'
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				list: []
+			}
+		},
+		async onLoad(options) {
+			let res = await getAwardDataReq()
+			if (res.code == 0) {
+				console.log('获取我的兑奖信息返回值: ', res);
+				this.list = res.data
+			} else {
+				uni.showToast({
+					title: res.message,
+					icon: 'none'
+				})
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/my/feedBack/index.vue

@@ -5,7 +5,7 @@
 			<view class="title">
 				意见反馈
 			</view>
-			<u--textarea maxlength="100" :focus="true" v-model="value1" :disabled="false" placeholder="请描述您遇到的问题" count
+			<u--textarea maxlength="100" :focus="true" v-model="content" :disabled="false" placeholder="请描述您遇到的问题" count
 				border="none" height="256rpx"></u--textarea>
 
 
@@ -15,7 +15,7 @@
 				</view>
 
 				<view class="count">
-					<text style="color: #161717;">0</text>/1
+					<text style="color: #161717;">{{pic_url.length}}</text>/1
 				</view>
 			</view>
 
@@ -40,10 +40,10 @@
 			<view class="title" style="margin-top: 52rpx;">
 				联系方式
 			</view>
-			<input type="number" class="phone" placeholder="电话">
+			<input type="number" class="phone" placeholder="电话" v-model="phone">
 
 
-			<view class="btn">
+			<view class="btn" @click="post()">
 				确定
 			</view>
 		</view>
@@ -52,6 +52,9 @@
 
 <script>
 	import uploadUrl from '@/common/config.js'
+	import {
+		submitFeedbackReq,
+	} from '@/api/test/index.js'
 	export default {
 		components: {
 
@@ -59,14 +62,53 @@
 		data() {
 			return {
 				picUrl: this.$picUrl,
-				value1: '',
-				pic_url: [
-					// 'https://oaigc.oss-cn-chengdu.aliyuncs.com/lamp/2023-09/2023090715235129503.png'
-				],
+				content: '',
+				phone: '',
+				pic_url: [],
 			}
 		},
 		onLoad(options) {},
 		methods: {
+			async post() {
+				let phoneReg = /^[1][3,4,5,7,8,9][0-9]{9}$/
+				if (this.content == '') {
+					return this.$toast('请输入反馈内容')
+				}
+				if (this.phone == '') {
+					return this.$toast('请输入联系方式')
+				}
+				if (!phoneReg.test(this.phone)) {
+					return this.$toast('请输入合法的手机号')
+				}
+				let image = ''
+				this.pic_url.forEach((item, index) => {
+					if (index == this.pic_url.length - 1) {
+						image += item
+					} else {
+						image += (item + ',')
+					}
+				})
+
+				let res = await submitFeedbackReq({
+					phone: this.phone,
+					content: this.content,
+					image
+				})
+				if (res.code == 0) {
+					console.log('反馈返回值', res);
+					this.$toast('提交成功')
+
+					setTimeout(() => {
+						uni.navigateBack()
+					}, 1500)
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+
 			//删除图片
 			delectImg(i) {
 				this.pic_url.splice(i, 1)
@@ -98,7 +140,7 @@
 							imgList.forEach((item, index) => {
 								uni.uploadFile({
 									//后端接口地址
-									url: uploadUrl.baseUrl,
+									url: uploadUrl.baseUrl + '/api/upload',
 									//图片临时地址
 									filePath: imgList[index],
 									//上传文件类型
@@ -109,18 +151,11 @@
 									},
 									success: (uploadRes) => {
 										let result = JSON.parse(uploadRes.data)
-										// localStorage.set('imgUrl', result.data.fileUrl)
 										if (result.code == 0) {
 											_this.pic_url = _this.pic_url
 												.concat(result.data.file)
 											console.log('上传后的头像url地址', result.data.file)
 										}
-
-
-										//后端返回的图片名称
-										// let data = JSON.parse(res.data)
-										// _this.pic_url = _this.pic_url
-										// 	.concat(data.data.url)
 									},
 								})
 							})

pages/my/inviteDetail/index.vue

@@ -23,10 +23,10 @@
 					</view>
 					<view class="btnG" v-if="type=='vip'">
 						<view class="main">
-							<view class="btn" @click="showVipPop=true">
+							<view class="btn" @click="showBox('vip')">
 								邀约S-VIP
 							</view>
-							<view class="btn" @click="showVipPop=true">
+							<view class="btn" @click="showBox('vip')">
 								邀约G-VIP
 							</view>
 						</view>
@@ -36,7 +36,7 @@ height: 140rpx;"></image> -->
 					</view>
 					<view class="btnG" v-else-if="type=='ls'">
 						<view class="main">
-							<view class="btn1" @click="showLsPop=true">
+							<view class="btn1" @click="showBox('ls')">
 								邀约L会员
 							</view>
 						</view>
@@ -47,7 +47,7 @@ height: 140rpx;"></image> -->
 
 					<view class="btnG" v-else-if="type=='dg'">
 						<view class="main">
-							<view class="btn1" @click="showDgPop=true">
+							<view class="btn1" @click="showBox('dg')">
 								邀约电工
 							</view>
 						</view>
@@ -56,7 +56,7 @@ height: 140rpx;"></image> -->
 
 					</view>
 
-					<view class="btnG" v-if="type=='yh'">
+					<view class="btnG" v-if="type=='yh'" @click="showBox('yh')">
 						<view class="main">
 							<view class="btn1">
 								邀约活动用户
@@ -69,7 +69,7 @@ height: 140rpx;"></image> -->
 
 					<view class="btnG" v-if="type=='hy'">
 						<view class="main">
-							<view class="btn1" @click="showHyPop=true">
+							<view class="btn1" @click="showBox('hy')">
 								邀约会员
 							</view>
 						</view>
@@ -115,7 +115,7 @@ height: 140rpx;"></image> -->
 						<template v-slot:title>
 							<view class="list2" :style="{'margin-bottom':index==-1?'208rpx':''}">
 								<view class="item1">
-									2023-08-23
+									{{item.invite_time}}
 								</view>
 								<view class="item1">
 									{{item.name}}
@@ -159,7 +159,7 @@ height: 140rpx;"></image> -->
 										项目名称
 									</view>
 									<view class="des" style="color: #333;font-weight: bold;">
-										家装灯具选择
+										{{item.project_name}}
 									</view>
 								</view>
 							</view>
@@ -167,9 +167,10 @@ height: 140rpx;"></image> -->
 					</uni-collapse-item>
 				</uni-collapse>
 
-				<view class="list2" :style="{'margin-bottom':index==-1?'208rpx':''}" v-else>
+				<view class="list2" :style="{'margin-bottom':index==-1?'208rpx':''}" v-else
+					v-for="(item,index) in sucList">
 					<view class="item1">
-						2023-08-23
+						{{item.invite_time}}
 					</view>
 					<view class="item1">
 						{{item.name}}
@@ -204,7 +205,7 @@ height: 140rpx;"></image> -->
 
 				<view class="list2" :style="{'margin-bottom':index==-1?'208rpx':''}" v-for="(item,index) in failList">
 					<view class="item1" style="width: 192rpx;font-size: 28rpx;">
-						2023-08-23
+						{{item.invite_time}}
 					</view>
 					<view class="item1" style="width: 90rpx;font-size: 28rpx;">
 						{{item.name}}
@@ -213,7 +214,8 @@ height: 140rpx;"></image> -->
 						<text>{{item.status}}</text>
 					</view>
 
-					<view class="item1 aginInvite" style="width: 120rpx;font-size: 28rpx;margin-left: 50rpx;">
+					<view class="item1 aginInvite" style="width: 120rpx;font-size: 28rpx;margin-left: 50rpx;"
+						@click="secondInvite(item)">
 						再次邀约
 					</view>
 				</view>
@@ -241,24 +243,62 @@ height: 140rpx;"></image> -->
 					<view class="label">
 						*姓名
 					</view>
-					<u--input clearable placeholder="请输入姓名" border="surround" v-model="value"
+					<u--input clearable placeholder="请输入姓名" border="surround" v-model="l_xm"
 						@change="change"></u--input>
 				</view>
 				<view class="item">
 					<view class="label">
 						*电话
 					</view>
-					<u--input clearable placeholder="请输入电话" border="surround" v-model="value"
+					<u--input clearable placeholder="请输入电话" border="surround" v-model="l_dh"
 						@change="change"></u--input>
 				</view>
 				<view class="item" style="margin-bottom: 24rpx;">
 					<view class="label">
 						项目名称
 					</view>
-					<u--input clearable placeholder="请输入项目名称" border="surround" v-model="value"
+					<u--input clearable placeholder="请输入项目名称" border="surround" v-model="l_xmmc"
 						@change="change"></u--input>
 				</view>
-				<u-button text="确定" color="#333" @click="showLsPop=false"></u-button>
+				<u-button text="确定" color="#333" @click="inviteLVip"></u-button>
+			</view>
+		</u-popup>
+
+		<u-popup :show="showYhPop" @close="close" @open="open" round='10'>
+			<view class="topBar" style="">
+				<view class="left">
+
+				</view>
+				<view class="cen">
+					活动用户
+				</view>
+				<view class="close" @click="showYhPop=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="y_xm"
+						@change="change"></u--input>
+				</view>
+				<view class="item">
+					<view class="label">
+						*电话
+					</view>
+					<u--input clearable placeholder="请输入电话" border="surround" v-model="y_dh"
+						@change="change"></u--input>
+				</view>
+				<!-- <view class="item" style="margin-bottom: 24rpx;">
+					<view class="label">
+						项目名称
+					</view>
+					<u--input clearable placeholder="请输入项目名称" border="surround" v-model="l_xmmc"
+						@change="change"></u--input>
+				</view> -->
+				<u-button text="确定" color="#333" @click="inviteYhVip"></u-button>
 			</view>
 		</u-popup>
 
@@ -279,31 +319,30 @@ height: 140rpx;"></image> -->
 					<view class="label">
 						*姓名
 					</view>
-					<u--input clearable placeholder="请输入姓名" border="surround" v-model="value"
+					<u--input clearable placeholder="请输入姓名" border="surround" v-model="h_xm"
 						@change="change"></u--input>
 				</view>
 				<view class="item">
 					<view class="label">
 						*电话
 					</view>
-					<u--input clearable placeholder="请输入电话" border="surround" v-model="value"
+					<u--input clearable placeholder="请输入电话" border="surround" v-model="h_dh"
 						@change="change"></u--input>
 				</view>
 				<view class="item" style="margin-bottom: 24rpx;">
 					<view class="label">
 						项目名称
 					</view>
-					<u--input clearable placeholder="请输入项目名称" border="surround" v-model="value"
+					<u--input clearable placeholder="请输入项目名称" border="surround" v-model="h_xmmc"
 						@change="change"></u--input>
 				</view>
-				<u-button text="确定" color="#333" @click="showHyPop=false"></u-button>
+				<u-button text="确定" color="#333" @click="inviteHyVip"></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">
 					产业电工
@@ -317,14 +356,14 @@ height: 140rpx;"></image> -->
 					<view class="label">
 						*姓名
 					</view>
-					<u--input clearable placeholder="请输入姓名" border="surround" v-model="value"
+					<u--input clearable placeholder="请输入姓名" border="surround" v-model="d_xm"
 						@change="change"></u--input>
 				</view>
 				<view class="item">
 					<view class="label">
 						*电话
 					</view>
-					<u--input clearable placeholder="请输入电话" border="surround" v-model="value"
+					<u--input clearable placeholder="请输入电话" border="surround" v-model="d_dh"
 						@change="change"></u--input>
 				</view>
 
@@ -332,18 +371,18 @@ height: 140rpx;"></image> -->
 					<view class="label">
 						*来源
 					</view>
-					<uni-data-select placeholder="请选择来源" v-model="value" :localdata="range"
-						@change="change"></uni-data-select>
+					<uni-data-select placeholder="请选择来源" v-model="d_ly" :localdata="range3"
+						@change="change3"></uni-data-select>
 				</view>
 
 				<view class="item" style="margin-bottom: 24rpx;height: auto;">
 					<view class="label">
 						*兑奖信息
 					</view>
-					<u--textarea v-model="value1" placeholder="请输入兑奖信息"></u--textarea>
+					<u--textarea v-model="d_djxx" placeholder="请输入兑奖信息"></u--textarea>
 				</view>
 
-				<u-button text="确定" color="#333" @click="showDgPop=false"></u-button>
+				<u-button text="确定" color="#333" @click="inviteDgVip(item)"></u-button>
 			</view>
 		</u-popup>
 
@@ -424,25 +463,14 @@ height: 140rpx;"></image> -->
 				showDgPop: false,
 				showVipPop: false,
 				showHyPop: false,
+				showYhPop: false,
 
 
 				// inviteSuc: true
 
 				srcValue: 0,
 				value1: 0,
-				range: [{
-						value: 0,
-						text: "来源1"
-					},
-					{
-						value: 1,
-						text: "来源2"
-					},
-					{
-						value: 2,
-						text: "来源3"
-					},
-				],
+
 				v_sf: -1,
 				v_xm: '',
 				v_dh: '',
@@ -460,45 +488,356 @@ height: 140rpx;"></image> -->
 				failList: [],
 				sucList: [],
 
+				user_roleType: 1,
+
+
+				l_xm: '',
+				l_dh: '',
+				l_xmmc: '',
+
+
+				y_xm: '',
+				y_dh: '',
+
+				h_xm: '',
+				h_dh: '',
+				h_xmmc: '',
+
+				d_xm: '',
+				d_dh: '',
+				d_djxx: '',
+				range3: [{
+						value: 0,
+						text: "兑奖"
+					},
+					{
+						value: 1,
+						text: "到店"
+					},
+					{
+						value: 2,
+						text: "朋友"
+					},
+					{
+						value: 3,
+						text: "其他"
+					},
+				],
+				d_ly: -1,
 			}
 		},
 		onLoad(o) {
 			this.type = o.type
 
+			if (o.type == 'vip') {
+				this.user_roleType = 1
+			} else if (o.type == 'ls') {
+				this.user_roleType = 2
+			} else if (o.type == 'hy') {
+				this.user_roleType = 5
+			} else if (o.type == 'yh') {
+				this.user_roleType = 4
+			} else if (o.type == 'dg') {
+				this.user_roleType = 3
+			}
+
 			this.getList()
 			// this.type = 'vip'
 		},
 		methods: {
+			secondInvite(item) {
+				// console.log('13123234324', item);
+				if (this.user_roleType == 1) {
+					this.inviteVip(item)
+				} else if (this.user_roleType == 2) {
+					this.inviteLVip(item)
+				} else if (this.user_roleType == 4) {
+					this.inviteYhVip(item)
+				} else if (this.user_roleType == 5) {
+					this.inviteHyVip(item)
+				} else if (this.user_roleType == 3) {
+					this.inviteDgVip(item)
+				}
+			},
+
+			showBox(type) {
+				if (type == 'vip') {
+					this.v_sf = -1
+					this.v_xm = ''
+					this.v_dh = ''
+					this.v_gs = ''
+					this.v_bz = ''
+					this.showVipPop = true
+				} else if (type == 'ls') {
+					this.l_xm = ''
+					this.l_dh = ''
+					this.l_xmmc = ''
+					this.showLsPop = true
+				} else if (type == 'hy') {
+					this.h_xm = ''
+					this.h_dh = ''
+					this.h_xmmc = ''
+					this.showHyPop = true
+				} else if (type == 'yh') {
+					this.y_xm = ''
+					this.y_dh = ''
+					this.showYhPop = true
+				} else if (type == 'dg') {
+					this.d_ly = -1
+					this.d_xm = ''
+					this.d_dh = ''
+					this.d_djxx = ''
+					this.showDgPop = true
+				}
+			},
 
-			async inviteVip() {
-				if (!this.v_xm) {
-					return this.$toast('请输入姓名')
+			async inviteDgVip(item) {
+				let parms = {}
+				if (item) {
+					// parms = {
+					// 	type: this.user_roleType,
+					// 	name: item.name,
+					// 	phone: item.phone,
+					// 	status: item.status,
+					// 	award_content: item.award
+					// }
+					this.d_xm = item.name
+					this.d_dh = item.phone
+					this.d_djxx = item.award_data.award_content
+					this.d_ly = item.source - 1
+
+					this.showDgPop = true
+					return
+				} else {
+					if (!this.d_xm) {
+						return this.$toast('请输入姓名')
+					}
+					if (!this.d_dh) {
+						return this.$toast('请输入电话')
+					}
+					if (this.d_ly == -1) {
+						return this.$toast('请选择来源')
+					}
+					if (this.d_djxx == '') {
+						return this.$toast('请输入兑奖信息')
+					}
+					parms = {
+						type: this.user_roleType,
+						name: this.d_xm,
+						phone: this.d_dh,
+						// status: this.d_ly == 0 ? '兑奖' : this.d_ly == 1 ? '到店' : this.d_ly == 2 ? '朋友' : '其他',
+						source: this.d_ly + 1,
+						status: '产业电工',
+						award_content: this.d_djxx
+					}
 				}
-				if (!this.v_dh) {
-					return this.$toast('请输入电话')
+				let res = await postInviteReq(parms)
+				if (res.code == 0) {
+					this.$toast('邀约成功')
+					console.log('提交电工邀请返回值: ', res);
+					this.showDgPop = false
+					this.d_ly = -1
+					this.d_xm = ''
+					this.d_dh = ''
+					this.d_djxx = ''
+					this.getList()
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				}
-				if (this.v_sf == -1) {
-					return this.$toast('请选择身份')
+			},
+			async inviteHyVip(item) {
+				let parms = {}
+				if (item) {
+					// parms = {
+					// 	type: this.user_roleType,
+					// 	name: item.name,
+					// 	phone: item.phone,
+					// 	project_name: item.project_name,
+					// 	status: item.status
+					// }
+
+					this.h_xm = item.name
+					this.h_dh = item.phone
+					this.h_xmmc = item.project_name
+					this.showHyPop = true
+					return
+				} else {
+					if (!this.h_xm) {
+						return this.$toast('请输入姓名')
+					}
+					if (!this.h_dh) {
+						return this.$toast('请输入电话')
+					}
+					parms = {
+						type: this.user_roleType,
+						name: this.h_xm,
+						phone: this.h_dh,
+						project_name: this.h_xmmc,
+						status: '会员'
+					}
 				}
-				console.log('参数', {
-					// 1VIP，2临时VIP（L），3产业电工，4邀请活动，5，兑换
-					type: 1,
-					name: this.v_xm,
-					phone: this.v_dh,
-					status: this.v_sf ? 'Gvip' : 'Svip',
-					company: this.v_gs,
-					remark: this.v_bz,
-					// project_name: 'project_name'
-				});
-				let res = await postInviteReq({
-					type: 1,
-					name: this.v_xm,
-					phone: this.v_dh,
-					status: this.v_sf ? 'Gvip' : 'Svip',
-					company: this.v_gs,
-					remark: this.v_bz,
-					// project_name: 'project_name'
-				})
+				let res = await postInviteReq(parms)
+				if (res.code == 0) {
+					this.$toast('邀约成功')
+					console.log('提交会员vip邀请返回值: ', res);
+					this.showHyPop = false
+					this.h_xm = ''
+					this.h_dh = ''
+					this.h_xmmc = ''
+					this.getList()
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async inviteYhVip(item) {
+				let parms = {}
+				if (item) {
+					// parms = {
+					// 	type: this.user_roleType,
+					// 	name: item.name,
+					// 	phone: item.phone,
+					// 	status: item.status
+					// }
+					this.y_xm = item.name
+					this.y_dh = item.phone
+					this.showYhPop = true
+					return
+				} else {
+					if (!this.y_xm) {
+						return this.$toast('请输入姓名')
+					}
+					if (!this.y_dh) {
+						return this.$toast('请输入电话')
+					}
+					parms = {
+						type: this.user_roleType,
+						name: this.y_xm,
+						phone: this.y_dh,
+						status: '活动用户'
+					}
+				}
+				let res = await postInviteReq(parms)
+				if (res.code == 0) {
+					this.$toast('邀约成功')
+					console.log('提交活动用户vip邀请返回值: ', res);
+					this.showYhPop = false
+					this.y_xm = ''
+					this.y_dh = ''
+					this.getList()
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async inviteLVip(item) {
+				let parms = {}
+				if (item) {
+					// parms = {
+					// 	type: this.user_roleType,
+					// 	name: item.name,
+					// 	phone: item.phone,
+					// 	project_name: item.project_name
+					// }
+
+					this.l_xm = item.name
+					this.l_dh = item.phone
+					this.l_xmmc = item.project_name
+					this.showLsPop = true
+					return
+				} else {
+					if (!this.l_xm) {
+						return this.$toast('请输入姓名')
+					}
+					if (!this.l_dh) {
+						return this.$toast('请输入电话')
+					}
+					parms = {
+						type: this.user_roleType,
+						name: this.l_xm,
+						phone: this.l_dh,
+						project_name: this.l_xmmc,
+					}
+				}
+				let res = await postInviteReq(parms)
+				if (res.code == 0) {
+					this.$toast('邀约成功')
+					console.log('提交Lvip邀请返回值: ', res);
+					this.showLsPop = false
+					this.l_xm = ''
+					this.l_dh = ''
+					this.l_xmmc = ''
+					this.getList()
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async inviteVip(item) {
+
+				// console.log('参数', {
+				// 1VIP，2临时VIP（L），3产业电工，4邀请活动，5，兑换
+				// type: 1,
+				// name: this.v_xm,
+				// phone: this.v_dh,
+				// status: this.v_sf ? 'Gvip' : 'Svip',
+				// company: this.v_gs,
+				// remark: this.v_bz,
+				// project_name: 'project_name'
+				// });
+
+				let parms = {}
+				if (item) {
+					// parms = {
+					// 	type: this.user_roleType,
+					// 	name: item.name,
+					// 	phone: item.phone,
+					// 	status: item.status,
+					// 	company: item.company,
+					// 	remark: item.remark,
+					// }
+					this.v_xm = item.name
+					this.v_dh = item.phone
+					this.v_gs = item.company
+					this.v_bz = item.remark
+
+					if (item.status == 'Svip') {
+						this.v_sf = 0
+					} else {
+						this.v_sf = 1
+					}
+					this.showVipPop = true
+					return
+
+				} else {
+					if (!this.v_xm) {
+						return this.$toast('请输入姓名')
+					}
+					if (!this.v_dh) {
+						return this.$toast('请输入电话')
+					}
+					if (this.v_sf == -1) {
+						return this.$toast('请选择身份')
+					}
+					parms = {
+						type: this.user_roleType,
+						name: this.v_xm,
+						phone: this.v_dh,
+						status: this.v_sf ? 'Gvip' : 'Svip',
+						company: this.v_gs,
+						remark: this.v_bz,
+					}
+				}
+				let res = await postInviteReq(parms)
 				if (res.code == 0) {
 					this.$toast('邀约成功')
 					console.log('提交vip邀请返回值: ', res);
@@ -517,9 +856,9 @@ height: 140rpx;"></image> -->
 					})
 				}
 			},
-			// change(e) {
-			// 	console.log("e:", e);
-			// },
+			change3(e) {
+				console.log("e:", e, this.d_ly);
+			},
 
 			change2(e) {
 				// console.log("e:", e, this.v_sf);
@@ -527,7 +866,7 @@ height: 140rpx;"></image> -->
 
 			async getList() {
 				let res1 = await getMyInviteReq({
-					type: 1,
+					type: this.user_roleType,
 					state: 0,
 				})
 				if (res1.code == 0) {
@@ -541,7 +880,7 @@ height: 140rpx;"></image> -->
 					})
 				}
 				let res2 = await getMyInviteReq({
-					type: 1,
+					type: this.user_roleType,
 					state: 1,
 				})
 				if (res2.code == 0) {

pages/my/otherInfo/index.vue

@@ -33,24 +33,28 @@
 						</view>
 					</view>
 				</navigator>
-
-				<view class="line">
-					<view class="left">
-						用户协议
-					</view>
-					<view class="right">
-						<image src="/static/my/arr_r.png" mode="" style="width: 14rpx;height: 24rpx;"></image>
-					</view>
-				</view>
-
-				<view class="line">
-					<view class="left">
-						隐私协议
+				<navigator url="/pages/my/protocol/index?type=用户" style="border-bottom:2rpx solid #E6E6E6 ;">
+					<!-- <view class="line" @click="toPage('/pages/my/protocol/index?type=用户')"> -->
+					<view class="line">
+						<view class="left">
+							用户协议
+						</view>
+						<view class="right">
+							<image src="/static/my/arr_r.png" mode="" style="width: 14rpx;height: 24rpx;"></image>
+						</view>
 					</view>
-					<view class="right">
-						<image src="/static/my/arr_r.png" mode="" style="width: 14rpx;height: 24rpx;"></image>
+				</navigator>
+				<navigator url="/pages/my/protocol/index?type=隐私" style="border-bottom:2rpx solid #E6E6E6 ;">
+					<!-- <view class="line" @click="toPage('/pages/my/protocol/index?type=隐私')"> -->
+					<view class="line">
+						<view class="left">
+							隐私协议
+						</view>
+						<view class="right">
+							<image src="/static/my/arr_r.png" mode="" style="width: 14rpx;height: 24rpx;"></image>
+						</view>
 					</view>
-				</view>
+				</navigator>
 			</view>
 		</view>
 	</view>
@@ -71,6 +75,11 @@
 		},
 		onLoad(options) {},
 		methods: {
+			toPage(url) {
+				uni.navigateTo({
+					url
+				})
+			},
 			change() {
 
 			}

pages/my/protocol/index.scss

@@ -0,0 +1,3 @@
+.page{
+	padding: 32rpx;
+}

pages/my/protocol/index.vue

@@ -0,0 +1,48 @@
+<template>
+	<view class="page">
+		<navBar :title="type+'协议'" :back="true" color="black" background="white" />
+
+		<u-parse :content="content.content"></u-parse>
+	</view>
+</template>
+
+<script>
+	import {
+		getConfigTextByTypeReq,
+	} from '@/api/test/index.js'
+
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				picBase: this.$picBase,
+				content: null,
+				type: '用户'
+			}
+		},
+		async onLoad(o) {
+			this.type = o.type
+			let res = await getConfigTextByTypeReq({
+				type: o.type == '用户' ? 9 : 10
+			})
+			if (res.code == 0) {
+				this.content = res.data
+				console.log('关于我们返回值', this.content);
+			} else {
+				uni.showToast({
+					title: res.message,
+					icon: 'none'
+				})
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/my/sellAfter/index.vue

@@ -76,6 +76,7 @@
 						url: '/pages/my/changeNewGoods/index'
 					})
 				} else {
+					getApp().stepName = '换新流程'
 					uni.navigateTo({
 						url: '/pages/my/changeNewStep/index'
 					})

pages/my/sellAfterCon/index.vue

@@ -20,9 +20,9 @@
 							</view>
 							<view class="bot">
 								<view class="num">
-									18729838270
+									{{con.phone}}
 								</view>
-								<view class="call" @click="call('18729838270')">
+								<view class="call" @click="call(con.phone)">
 									拨号
 								</view>
 							</view>
@@ -47,9 +47,9 @@
 							</view>
 							<view class="bot">
 								<view class="num">
-									18729838270
+									{{con.wxNumber}}
 								</view>
-								<view class="call" @click="copy('18729838270')">
+								<view class="call" @click="copy(con.wxNumber)">
 									复制
 								</view>
 							</view>
@@ -77,8 +77,9 @@
 								<view class="top">
 									扫码了解
 								</view>
-								<image class="code" :src="picUrl+'/static/my/codePic.png'" mode=""
-									style="width: 250rpx;height: 250rpx;"></image>
+								<image class="code" :src="picBase+con.wxCode" mode=""
+									style="width: 250rpx;height: 250rpx;">
+								</image>
 							</view>
 						</view>
 					</view>
@@ -89,6 +90,9 @@
 </template>
 
 <script>
+	import {
+		getSerBackConReq,
+	} from '@/api/test/index.js'
 	export default {
 		components: {
 
@@ -96,9 +100,24 @@
 		data() {
 			return {
 				picUrl: this.$picUrl,
+				picBase: this.$picBase,
+
+				con: null
+			}
+		},
+		async onLoad(options) {
+			let res = await getSerBackConReq()
+			if (res.code == 0) {
+				console.log('获取我的售后联系返回值: ', res);
+
+				this.con = res.data.content[0]
+			} else {
+				uni.showToast({
+					title: res.message,
+					icon: 'none'
+				})
 			}
 		},
-		onLoad(options) {},
 		methods: {
 			copy(data) {
 				let _this = this

pages/my/sellAfterDefer/index.vue

@@ -3,21 +3,21 @@
 		<navBar title="售后保障" :back="true" color="black" background="white" />
 
 		<view class="content">
-			<view class="item" v-for="i in 6">
+			<view class="item" v-for="(item,index) in list">
 				<view class="line">
 					<view class="left">
 						产品名称
 					</view>
 					<view class="right">
-						无主灯套餐选择
+						{{item.product}}
 					</view>
 				</view>
 				<view class="line">
 					<view class="left">
-						服务流程
+						产品型号
 					</view>
 					<view class="right">
-						XL2353578
+						{{item.model_number}}
 					</view>
 				</view>
 				<view class="line">
@@ -25,7 +25,7 @@
 						业主姓名
 					</view>
 					<view class="right">
-						张冰彬
+						{{item.name}}
 					</view>
 				</view>
 				<view class="line">
@@ -33,7 +33,7 @@
 						联系电话
 					</view>
 					<view class="right">
-						19820983290
+						{{item.phone}}
 					</view>
 				</view>
 				<view class="line">
@@ -41,7 +41,7 @@
 						项目地址
 					</view>
 					<view class="right">
-						XX省XX市XX区XX路XX号
+						{{item.address}}
 					</view>
 				</view>
 				<view class="line">
@@ -49,7 +49,7 @@
 						质保剩余时间
 					</view>
 					<view class="right">
-						6天
+						{{item.dayCount}}天
 					</view>
 				</view>
 			</view>
@@ -58,16 +58,30 @@
 </template>
 
 <script>
+	import {
+		getSerBackReq,
+	} from '@/api/test/index.js'
 	export default {
 		components: {
 
 		},
 		data() {
 			return {
-
+				list: []
+			}
+		},
+		async onLoad(options) {
+			let res = await getSerBackReq()
+			if (res.code == 0) {
+				console.log('获取我的售后保障返回值: ', res);
+				this.list = res.data.data
+			} else {
+				uni.showToast({
+					title: res.message,
+					icon: 'none'
+				})
 			}
 		},
-		onLoad(options) {},
 		methods: {
 
 		}

pages/qrPage/index.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<navBar title="二维码进入的页面" :back="true" color="white" background="green" />
 		<button @click="getAccessToken">生成AccessToken</button>
-		<button @click="genQr">生成进入小程序的二维码</button>
+		<button @click="getAccessToken">生成进入小程序的二维码</button>
 		<button @click="createPoster">测试生成海报</button>
 
 		<image @click="previewPic" :src="testUrl" mode=""></image>
@@ -142,7 +142,7 @@
 			getAccessToken() {
 				let that = this
 				let appId = 'wx98ab2939999e13de'
-				let secret = '29bad412d9cc5a7f48ca88d2848db8d3'
+				let secret = '841f428c4d3e550e800d8ad0fd5e0354'
 				wx.request({
 					url: `https://api.weixin.qq.com/cgi-bin/token?appid=${appId}&secret=${secret}&grant_type=client_credential`,
 					data: {},
@@ -162,10 +162,10 @@
 					url: `https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=${access_token}`,
 					responseType: 'arraybuffer',
 					data: JSON.stringify({
-						// scene: 'kcardCode=123456',
-						// page: 'pages/qrPage/index',
-						scene: 'a=1-b=2-c=李万涛',
-						page: 'pages/my/index',
+						scene: 'kcardCode=123456',
+						// page: 'pages/index/index',
+						// scene: 'a=1-b=2-c=李万涛',
+						page: 'pages/index/index',
 						check_path: false
 					}),
 					header: {

pages/service.scss

@@ -30,9 +30,10 @@
 		.con{
 			height: 300rpx;
 			border-radius: 8rpx 24rpx 8rpx 24rpx;
-			background: url('https://oaigc.oss-cn-chengdu.aliyuncs.com/lamp/2023-09/2023090710392974226.png') no-repeat;
+			// background: url('https://oaigc.oss-cn-chengdu.aliyuncs.com/lamp/2023-09/2023090710392974226.png') no-repeat;
 			// background-size: 100% 100%;
-			background-size:cover;
+			background-repeat: no-repeat!important;
+			background-size:cover!important;
 			display: flex;
 			flex-direction: column;
 			padding-left: 36rpx;

pages/service.vue

@@ -3,33 +3,28 @@
 		<navBar title="服务" :back="false" color="black" flex="cen" background="#fff" />
 
 		<view class="list">
-			<view class="item" v-for="i in 2">
+			<view class="item" v-for="(item,index) in list">
 				<view class="topTitle">
 					<view class="water">
 						GIGESI
 					</view>
-					<text>智能设计</text>
+					<text>{{item.title}}</text>
 				</view>
 
-				<view class="con" @click="goDetail" v-for="i in 2">
+				<view class="con" @click="goDetail(item1.content,item1.title)" v-for="(item1,index1) in item.list"
+					:style="{background:`url(${picBase+item1.image}) ` }">
 					<view class="label">
 						<image src="/static/index/part1_icon.png" mode="" class="img"></image>
 						<view class="item2">
-							智能设计
+							{{item1.title}}
 						</view>
 						<view class="des">
 							详情
 						</view>
 					</view>
 					<view class="cen">
-						<view class="item3">
-							智能方案
-						</view>
-						<view class="item3">
-							设计优势
-						</view>
-						<view class="item3">
-							了解智能设计
+						<view class="item3" v-for="(item2,index2) in item1.label">
+							{{item2.title}}
 						</view>
 					</view>
 
@@ -45,18 +40,31 @@
 </template>
 
 <script>
-	// import navBar from '@/components/navBar/index.vue'
+	import {
+		getServerDataReq
+	} from '@/api/test/index.js'
 	export default {
 		// components: {
 		// 	navBar
 		// },
 		data() {
 			return {
-				picUrl: this.$picUrl
+				picUrl: this.$picUrl,
+				picBase: this.$picBase,
+				list: [],
+			}
+		},
+		async onLoad(options) {
+			let res = await getServerDataReq({})
+			if (res.code == 0) {
+				this.list = res.data
+				console.log('服务列表: ', res, this.list);
 			}
 		},
 		methods: {
-			goDetail() {
+			goDetail(content, title) {
+				getApp().serCon = content
+				getApp().sTitle = title
 				uni.navigateTo({
 					url: '/pages/service/detail/index'
 				})

pages/service/detail/index.vue

@@ -4,12 +4,9 @@
 
 		<view class="content">
 			<view class="title">
-				灯光设计
+				{{title}}
 			</view>
-			<view class="p" v-for="i in 2">
-				1、灯具装上后要注意维护，不能连续即开即关。可以时长检查，灯具装上后要注意维护，不能连续即开即关。可以时长检查。
-			</view>
-			<image :src="picUrl + '/static/other/x1.png'" mode=""></image>
+			<u-parse :content="content"></u-parse>
 		</view>
 
 		<view class="btnBox">
@@ -21,6 +18,9 @@
 </template>
 
 <script>
+	import {
+		getServerDataReq
+	} from '@/api/test/index.js'
 	export default {
 		components: {
 
@@ -28,9 +28,14 @@
 		data() {
 			return {
 				picUrl: this.$picUrl,
+				content: null,
+				title: null
 			}
 		},
-		onLoad(options) {},
+		async onLoad(options) {
+			this.content = getApp().serCon
+			this.title = getApp().sTitle
+		},
 		methods: {
 
 		}

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

@@ -21,6 +21,7 @@
         "customNoMain/index",
         "productLead/index",
         "fullHouseWifi/index",
+        "fullHouseWifi_step2/index",
         "aiControlSys/index",
         "rule/index",
         "mainList/index",
@@ -61,7 +62,9 @@
         "collectDetail/index",
         "changeNewStep/index",
         "changeNewGoods/index",
-        "aboutMe/index"
+        "aboutMe/index",
+        "protocol/index",
+        "duijiang/index"
       ]
     }
   ],

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

@@ -6,6 +6,7 @@
     "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-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/fullHouseWifi_step2/index.json

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

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

@@ -0,0 +1 @@
+<view class="page data-v-12fe2787"><nav-bar vue-id="ed4b4408-1" title="定制我家的全屋WIFI" back="{{true}}" color="black" background="white" class="data-v-12fe2787" bind:__l="__l"></nav-bar><image class="topImg data-v-12fe2787" src="{{picUrl+'/static/other/noMain_img4.png'}}" mode></image><view class="cen data-v-12fe2787"><image class="water data-v-12fe2787" src="/static/index/water.png" mode></image><image class="halfC data-v-12fe2787" src="/static/index/halfCircle_275.png" mode></image>定制我家的全屋WIFI</view><view class="parmasBox data-v-12fe2787"><view class="con data-v-12fe2787"><view class="top data-v-12fe2787"><view class="item data-v-12fe2787"><view class="name data-v-12fe2787">户型</view><view class="des data-v-12fe2787">{{''+selHx.value+''}}</view></view></view></view></view><block wx:if="{{orderId}}"><view class="parmasBox data-v-12fe2787"><view class="con data-v-12fe2787"><view class="top data-v-12fe2787"><view class="item data-v-12fe2787"><view class="name data-v-12fe2787">收货人</view><view class="des data-v-12fe2787">{{''+shareCon.name+''}}</view></view><view class="item data-v-12fe2787"><view class="name data-v-12fe2787">电话</view><view class="des data-v-12fe2787">{{''+shareCon.phone+''}}</view></view><view class="item data-v-12fe2787"><view class="name data-v-12fe2787">收货地址</view><view class="des data-v-12fe2787">{{''+shareCon.address+''}}</view></view><view class="item data-v-12fe2787"><view class="name data-v-12fe2787">备注</view><view class="des data-v-12fe2787">{{''+shareCon.remark+''}}</view></view></view></view></view></block><image class="rule_img data-v-12fe2787" src="/static/index/backBtnImg.png" mode data-event-opts="{{[['tap',[['back',['$event']]]]]}}" bindtap="__e"></image><u-modal vue-id="ed4b4408-2" show="{{showShare}}" title="分享链接" content="{{content}}" class="data-v-12fe2787" bind:__l="__l"></u-modal></view>

unpackage/dist/build/mp-weixin/pages/my/actGoods/index.wxml

@@ -1 +1 @@
-<view class="page data-v-cf7b714c"><nav-bar vue-id="1c6c9da5-1" title="活动商品" back="{{true}}" color="black" background="white" class="data-v-cf7b714c" bind:__l="__l"></nav-bar><view class="con data-v-cf7b714c"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$event']]]]]}}" class="item data-v-cf7b714c" bindtap="__e"><view class="topBox data-v-cf7b714c"><image src="{{picBase+item.image}}" mode class="data-v-cf7b714c"></image></view><view class="bottom data-v-cf7b714c"><view class="txt data-v-cf7b714c">{{''+item.title+''}}</view></view></view></block></view><u-loadmore vue-id="1c6c9da5-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-cf7b714c" bind:__l="__l"></u-loadmore></view>
+<view class="page data-v-c4bfde3e"><nav-bar vue-id="1c6c9da5-1" title="活动商品" back="{{true}}" color="black" background="white" class="data-v-c4bfde3e" bind:__l="__l"></nav-bar><view class="con data-v-c4bfde3e"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['list','',index]]]]]]]}}" class="item data-v-c4bfde3e" bindtap="__e"><view class="topBox data-v-c4bfde3e"><image src="{{picBase+item.cover}}" mode class="data-v-c4bfde3e"></image></view><view class="bottom data-v-c4bfde3e"><view class="txt data-v-c4bfde3e">{{''+item.name+''}}</view></view></view></block></view><u-loadmore vue-id="1c6c9da5-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-c4bfde3e" bind:__l="__l"></u-loadmore></view>

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

@@ -1 +1 @@
-.data-v-cf7b714c .u-line{width:56rpx!important}.page.data-v-cf7b714c{padding-bottom:54rpx}.con.data-v-cf7b714c{width:100%;display:flex;flex-wrap:wrap;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-cf7b714c{width:336rpx;background:#fff;border-radius:24rpx;border:2rpx solid #f1f1f1;margin-right:16rpx;margin-bottom:24rpx}.con .item .topBox.data-v-cf7b714c{position:relative}.con .item .topBox image.data-v-cf7b714c{width:100%;height:292rpx;border-radius:30rpx 30rpx 0 0}.con .item .topBox .cutDown.data-v-cf7b714c{position:absolute;top:0;left:0;width:100%;z-index:1;display:flex;justify-content:center}.con .item .topBox .cutDown .item2.data-v-cf7b714c{width:48rpx;height:48rpx;background:rgba(0,0,0,.69);border-radius:4rpx;margin-top:24rpx;font-size:24rpx;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#fff;display:flex;justify-content:center;align-items:center}.con .item .topBox .cutDown .item_d.data-v-cf7b714c{width:12rpx;height:40rpx;font-size:28rpx;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#000;margin:0 10rpx;background:none}.con .item .bottom.data-v-cf7b714c{display:flex;justify-content:center;align-items:center;height:76rpx}.con .item .bottom .txt.data-v-cf7b714c{width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.data-v-c4bfde3e .u-line{width:56rpx!important}.page.data-v-c4bfde3e{padding-bottom:54rpx}.con.data-v-c4bfde3e{width:100%;display:flex;flex-wrap:wrap;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-c4bfde3e{width:336rpx;background:#fff;border-radius:24rpx;border:2rpx solid #f1f1f1;margin-right:16rpx;margin-bottom:24rpx}.con .item .topBox.data-v-c4bfde3e{position:relative}.con .item .topBox image.data-v-c4bfde3e{width:100%;height:292rpx;border-radius:30rpx 30rpx 0 0}.con .item .topBox .cutDown.data-v-c4bfde3e{position:absolute;top:0;left:0;width:100%;z-index:1;display:flex;justify-content:center}.con .item .topBox .cutDown .item2.data-v-c4bfde3e{width:48rpx;height:48rpx;background:rgba(0,0,0,.69);border-radius:4rpx;margin-top:24rpx;font-size:24rpx;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#fff;display:flex;justify-content:center;align-items:center}.con .item .topBox .cutDown .item_d.data-v-c4bfde3e{width:12rpx;height:40rpx;font-size:28rpx;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#000;margin:0 10rpx;background:none}.con .item .bottom.data-v-c4bfde3e{display:flex;justify-content:center;align-items:center;height:76rpx}.con .item .bottom .txt.data-v-c4bfde3e{width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}

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

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

unpackage/dist/build/mp-weixin/pages/my/changeNewGoods/index.wxml

@@ -1 +1 @@
-<view class="page data-v-3d646a66"><nav-bar vue-id="51da2263-1" title="换新商品" back="{{true}}" color="black" background="white" class="data-v-3d646a66" bind:__l="__l"></nav-bar><view class="con data-v-3d646a66"><block wx:for="{{7}}" wx:for-item="i" wx:for-index="__i0__"><view data-event-opts="{{[['tap',[['goDetail',['$event']]]]]}}" class="item data-v-3d646a66" bindtap="__e"><view class="topBox data-v-3d646a66"><image src="/static/index/img1.png" mode class="data-v-3d646a66"></image></view><view class="bottom data-v-3d646a66"><view class="txt data-v-3d646a66">灯具指南灯具指南灯具指南</view></view></view></block></view><u-loadmore vue-id="51da2263-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-3d646a66" bind:__l="__l"></u-loadmore></view>
+<view class="page data-v-3dde48b2"><nav-bar vue-id="51da2263-1" title="换新商品" back="{{true}}" color="black" background="white" class="data-v-3dde48b2" bind:__l="__l"></nav-bar><view class="con data-v-3dde48b2"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['list','',index]]]]]]]}}" class="item data-v-3dde48b2" bindtap="__e"><view class="topBox data-v-3dde48b2"><image src="{{picBase+item.cover}}" mode class="data-v-3dde48b2"></image></view><view class="bottom data-v-3dde48b2"><view class="txt data-v-3dde48b2">{{''+item.name+''}}</view></view></view></block></view><u-loadmore vue-id="51da2263-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-3dde48b2" bind:__l="__l"></u-loadmore></view>

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

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

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

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

unpackage/dist/build/mp-weixin/pages/my/changeNewStep/index.wxml

@@ -1 +1 @@
-<view class="page data-v-48ec5e44"><nav-bar vue-id="6ade19de-1" title="服务流程" back="{{true}}" color="black" background="white" class="data-v-48ec5e44" bind:__l="__l"></nav-bar><view class="content data-v-48ec5e44"><view class="title data-v-48ec5e44">流程一</view><block wx:for="{{2}}" wx:for-item="i" wx:for-index="__i0__"><view class="p data-v-48ec5e44">1、灯具装上后要注意维护，不能连续即开即关。可以时长检查，灯具装上后要注意维护，不能连续即开即关。可以时长检查。</view></block><image style="margin-bottom:64rpx;" src="/static/index/img1.png" mode class="data-v-48ec5e44"></image><view class="title data-v-48ec5e44">流程一</view><block wx:for="{{2}}" wx:for-item="i" wx:for-index="__i1__"><view class="p data-v-48ec5e44">1、灯具装上后要注意维护，不能连续即开即关。可以时长检查，灯具装上后要注意维护，不能连续即开即关。可以时长检查。</view></block><image style="margin-bottom:64rpx;" src="/static/index/img1.png" mode class="data-v-48ec5e44"></image></view><view class="btnBox data-v-48ec5e44"><view class="rBtn data-v-48ec5e44">一键分享</view></view></view>
+<view class="page data-v-999984a4"><nav-bar vue-id="6ade19de-1" title="{{tTitle}}" back="{{true}}" color="black" background="white" class="data-v-999984a4" bind:__l="__l"></nav-bar><view class="content data-v-999984a4"><u-parse vue-id="6ade19de-2" content="{{content.content}}" class="data-v-999984a4" bind:__l="__l"></u-parse></view><view class="btnBox data-v-999984a4"><view class="rBtn data-v-999984a4">一键分享</view></view></view>

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

@@ -1 +1 @@
-.page.data-v-48ec5e44{padding-bottom:160rpx}.content.data-v-48ec5e44{padding:48rpx 32rpx 0 32rpx}.content .title.data-v-48ec5e44{font-size:40rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333;margin-bottom:50rpx}.content .p.data-v-48ec5e44{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;color:#333;line-height:50rpx;text-indent:2rem;margin-bottom:50rpx}.content image.data-v-48ec5e44{width:686rpx;height:686rpx;border-radius:0 40rpx 0 40rpx}.btnBox.data-v-48ec5e44{height:160rpx;background:#fff;box-shadow:0rpx 0rpx 8rpx 0rpx rgba(0,0,0,.16);position:fixed;bottom:0;width:calc(100% - 64rpx);display:flex;align-items:center;justify-content:space-between;padding:0 32rpx}.btnBox .rBtn.data-v-48ec5e44{width:100%;height:96rpx;background:#333;border-radius:4rpx;border:2rpx solid #333;display:flex;justify-content:center;align-items:center;font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#fff}
+.page.data-v-999984a4{padding-bottom:160rpx}.content.data-v-999984a4{padding:48rpx 32rpx 0 32rpx}.content .title.data-v-999984a4{font-size:40rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333;margin-bottom:50rpx}.content .p.data-v-999984a4{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;color:#333;line-height:50rpx;text-indent:2rem;margin-bottom:50rpx}.content image.data-v-999984a4{width:686rpx;height:686rpx;border-radius:0 40rpx 0 40rpx}.btnBox.data-v-999984a4{height:160rpx;background:#fff;box-shadow:0rpx 0rpx 8rpx 0rpx rgba(0,0,0,.16);position:fixed;bottom:0;width:calc(100% - 64rpx);display:flex;align-items:center;justify-content:space-between;padding:0 32rpx}.btnBox .rBtn.data-v-999984a4{width:100%;height:96rpx;background:#333;border-radius:4rpx;border:2rpx solid #333;display:flex;justify-content:center;align-items:center;font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#fff}

unpackage/dist/build/mp-weixin/pages/my/collect/index.wxml

@@ -1 +1 @@
-<view class="page data-v-43c9b522"><nav-bar vue-id="7ebb5d63-1" title="收藏" back="{{true}}" color="black" background="white" class="data-v-43c9b522" bind:__l="__l"></nav-bar><view class="con data-v-43c9b522"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['list','',index]]]]]]]}}" class="item data-v-43c9b522" bindtap="__e"><image src="{{picBase+item.goods.cover}}" mode class="data-v-43c9b522"></image><view class="bottom data-v-43c9b522"><view class="txt data-v-43c9b522">{{''+item.goods.name+''}}</view></view></view></block></view><u-loadmore vue-id="7ebb5d63-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-43c9b522" bind:__l="__l"></u-loadmore></view>
+<view class="page data-v-2355dc30"><nav-bar vue-id="7ebb5d63-1" title="收藏" back="{{true}}" color="black" background="white" class="data-v-2355dc30" bind:__l="__l"></nav-bar><view class="con data-v-2355dc30"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['list','',index]]]]]]]}}" class="item data-v-2355dc30" bindtap="__e"><image src="{{picBase+item.goods.cover}}" mode class="data-v-2355dc30"></image><view class="bottom data-v-2355dc30"><view class="txt data-v-2355dc30">{{''+item.goods.name+''}}</view></view></view></block></view><u-loadmore vue-id="7ebb5d63-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-2355dc30" bind:__l="__l"></u-loadmore></view>

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

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

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

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

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

@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/duijiang/index"],{"0651":function(t,e,n){},1136:function(t,e,n){"use strict";(function(t,e){var a=n("4ea4");n("d716");a(n("66fd"));var c=a(n("cc79"));t.__webpack_require_UNI_MP_PLUGIN__=n,e(c.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])},"1ab2":function(t,e,n){"use strict";n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return c})),n.d(e,"a",(function(){}));var a=function(){var t=this.$createElement;this._self._c},c=[]},4236:function(t,e,n){"use strict";n.r(e);var a=n("bbd3"),c=n.n(a);for(var u in a)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(u);e["default"]=c.a},"8a82":function(t,e,n){"use strict";var a=n("0651"),c=n.n(a);c.a},bbd3:function(t,e,n){"use strict";(function(t){var a=n("4ea4");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var c=a(n("2eee")),u=a(n("c973")),r=n("9ca2"),o={components:{},data:function(){return{list:[]}},onLoad:function(e){var n=this;return(0,u.default)(c.default.mark((function e(){var a;return c.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,(0,r.getAwardDataReq)();case 2:a=e.sent,0==a.code?(console.log("获取我的兑奖信息返回值: ",a),n.list=a.data):t.showToast({title:a.message,icon:"none"});case 4:case"end":return e.stop()}}),e)})))()},methods:{}};e.default=o}).call(this,n("543d")["default"])},cc79:function(t,e,n){"use strict";n.r(e);var a=n("1ab2"),c=n("4236");for(var u in c)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return c[t]}))}(u);n("8a82");var r=n("f0c5"),o=Object(r["a"])(c["default"],a["b"],a["c"],!1,null,"d3de50b0",null,!1,a["a"],void 0);e["default"]=o.exports}},[["1136","common/runtime","common/vendor"]]]);

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

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

unpackage/dist/build/mp-weixin/pages/my/duijiang/index.wxml

@@ -0,0 +1 @@
+<view class="page data-v-d3de50b0"><nav-bar vue-id="36d770e6-1" title="兑奖信息" back="{{true}}" color="black" background="white" class="data-v-d3de50b0" bind:__l="__l"></nav-bar><view class="content data-v-d3de50b0"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view class="item data-v-d3de50b0"><view class="line data-v-d3de50b0"><view class="left data-v-d3de50b0">姓名</view><view class="right data-v-d3de50b0">{{''+item.name+''}}</view></view><view class="line data-v-d3de50b0"><view class="left data-v-d3de50b0">手机号</view><view class="right data-v-d3de50b0">{{''+item.phone+''}}</view></view><view class="line data-v-d3de50b0"><view class="left data-v-d3de50b0">兑奖信息</view><view class="right data-v-d3de50b0">{{''+item.award_content+''}}</view></view><view class="line data-v-d3de50b0"><view class="left data-v-d3de50b0">联系电话</view><view class="right data-v-d3de50b0">{{''+item.phone+''}}</view></view><view class="line data-v-d3de50b0"><view class="left data-v-d3de50b0">是否邀约成功</view><view class="right data-v-d3de50b0">{{''+item.state+''}}</view></view><view class="line data-v-d3de50b0"><view class="left data-v-d3de50b0">时间</view><view class="right data-v-d3de50b0">{{''+item.created_at+''}}</view></view></view></block></view></view>

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

@@ -0,0 +1 @@
+.content.data-v-d3de50b0{background:#f1f1f1;min-height:100vh;padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-d3de50b0{height:432rpx;background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;justify-content:space-around;margin-bottom:24rpx}.content .item .line.data-v-d3de50b0{display:flex;justify-content:space-between}.content .item .line .left.data-v-d3de50b0{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666}.content .item .line .right.data-v-d3de50b0{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333}

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

@@ -1 +1 @@
-.data-v-488447b7 .u-textarea{background:#f4f4f4!important;border-radius:8rpx}.data-v-488447b7 .u-textarea__count{background:#f4f4f4!important;font-size:28rpx!important}.content.data-v-488447b7{padding:64rpx 32rpx}.content .title.data-v-488447b7{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#080f18;margin-bottom:36rpx}.content .picTop.data-v-488447b7{display:flex;justify-content:space-between;align-items:center}.content .picTop .count.data-v-488447b7{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#999}.content .phone.data-v-488447b7{border-bottom:1rpx solid #999;padding-bottom:26rpx}.content .btn.data-v-488447b7{height:96rpx;background:#333;border-radius:4rpx;border:2rpx solid #333;display:flex;justify-content:center;align-items:center;font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#fff;margin-top:300rpx}.chooscontainer.data-v-488447b7{display:flex;flex-wrap:wrap;position:relative;margin-bottom:48rpx}.chooscontainer .addpicall.data-v-488447b7{width:31%;margin-right:6rpx;margin-left:6rpx;margin-top:15rpx;position:relative;z-index:10}.chooscontainer .addpicall.data-v-488447b7:nth-child(3n){margin-right:0}.chooscontainer .addpicall image.data-v-488447b7{width:100%;height:100%}.chooscontainer .addpicall .del_btn.data-v-488447b7{font-size:48rpx;position:absolute;top:0rpx;right:30rpx;width:44rpx;height:44rpx;line-height:44rpx;background:rgba(0,0,0,.41);color:#fff;display:flex;justify-content:center;border-radius:0 15rpx 0 15rpx}.addpic.data-v-488447b7{display:flex;justify-content:center;align-items:center;width:210rpx;height:210rpx}.addpic .addPicBox.data-v-488447b7{width:184rpx;height:186rpx;border:1rpx dashed #e6e6e6;display:flex;justify-content:center;align-items:center;background:#f7f8fa}.addpic .addPicBox image.data-v-488447b7{width:40rpx;height:40rpx}.addpic text.data-v-488447b7{display:block;padding:0;font-size:60rpx}
+.data-v-ab9c6882 .u-textarea{background:#f4f4f4!important;border-radius:8rpx}.data-v-ab9c6882 .u-textarea__count{background:#f4f4f4!important;font-size:28rpx!important}.content.data-v-ab9c6882{padding:64rpx 32rpx}.content .title.data-v-ab9c6882{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#080f18;margin-bottom:36rpx}.content .picTop.data-v-ab9c6882{display:flex;justify-content:space-between;align-items:center}.content .picTop .count.data-v-ab9c6882{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#999}.content .phone.data-v-ab9c6882{border-bottom:1rpx solid #999;padding-bottom:26rpx}.content .btn.data-v-ab9c6882{height:96rpx;background:#333;border-radius:4rpx;border:2rpx solid #333;display:flex;justify-content:center;align-items:center;font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#fff;margin-top:300rpx}.chooscontainer.data-v-ab9c6882{display:flex;flex-wrap:wrap;position:relative;margin-bottom:48rpx}.chooscontainer .addpicall.data-v-ab9c6882{width:31%;margin-right:6rpx;margin-left:6rpx;margin-top:15rpx;position:relative;z-index:10}.chooscontainer .addpicall.data-v-ab9c6882:nth-child(3n){margin-right:0}.chooscontainer .addpicall image.data-v-ab9c6882{width:100%;height:100%}.chooscontainer .addpicall .del_btn.data-v-ab9c6882{font-size:48rpx;position:absolute;top:0rpx;right:30rpx;width:44rpx;height:44rpx;line-height:44rpx;background:rgba(0,0,0,.41);color:#fff;display:flex;justify-content:center;border-radius:0 15rpx 0 15rpx}.addpic.data-v-ab9c6882{display:flex;justify-content:center;align-items:center;width:210rpx;height:210rpx}.addpic .addPicBox.data-v-ab9c6882{width:184rpx;height:186rpx;border:1rpx dashed #e6e6e6;display:flex;justify-content:center;align-items:center;background:#f7f8fa}.addpic .addPicBox image.data-v-ab9c6882{width:40rpx;height:40rpx}.addpic text.data-v-ab9c6882{display:block;padding:0;font-size:60rpx}

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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/otherInfo/index"],{"3f81":function(e,n,t){"use strict";(function(e,n){var u=t("4ea4");t("d716");u(t("66fd"));var a=u(t("fc46"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},a0c0:function(e,n,t){"use strict";t.d(n,"b",(function(){return u})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){}));var u=function(){var e=this.$createElement;this._self._c},a=[]},e0ea:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;n.default={components:{},data:function(){return{value:0,value1:0,value2:0}},onLoad:function(e){},methods:{change:function(){}}}},e494:function(e,n,t){},ee96:function(e,n,t){"use strict";var u=t("e494"),a=t.n(u);a.a},f135:function(e,n,t){"use strict";t.r(n);var u=t("e0ea"),a=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(c);n["default"]=a.a},fc46:function(e,n,t){"use strict";t.r(n);var u=t("a0c0"),a=t("f135");for(var c in a)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(c);t("ee96");var f=t("f0c5"),o=Object(f["a"])(a["default"],u["b"],u["c"],!1,null,"65b7fc74",null,!1,u["a"],void 0);n["default"]=o.exports}},[["3f81","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/otherInfo/index"],{"012e":function(n,e,t){"use strict";t.d(e,"b",(function(){return u})),t.d(e,"c",(function(){return a})),t.d(e,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},a=[]},"3f81":function(n,e,t){"use strict";(function(n,e){var u=t("4ea4");t("d716");u(t("66fd"));var a=u(t("fc46"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(a.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"5d83":function(n,e,t){"use strict";var u=t("6477"),a=t.n(u);a.a},6477:function(n,e,t){},e0ea:function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={components:{},data:function(){return{value:0,value1:0,value2:0}},onLoad:function(n){},methods:{toPage:function(e){n.navigateTo({url:e})},change:function(){}}};e.default=t}).call(this,t("543d")["default"])},f135:function(n,e,t){"use strict";t.r(e);var u=t("e0ea"),a=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);e["default"]=a.a},fc46:function(n,e,t){"use strict";t.r(e);var u=t("012e"),a=t("f135");for(var c in a)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return a[n]}))}(c);t("5d83");var f=t("f0c5"),o=Object(f["a"])(a["default"],u["b"],u["c"],!1,null,"2826769b",null,!1,u["a"],void 0);e["default"]=o.exports}},[["3f81","common/runtime","common/vendor"]]]);

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

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

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

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

unpackage/dist/build/mp-weixin/pages/my/protocol/index.wxml

@@ -0,0 +1 @@
+<view class="page data-v-3288f6e8"><nav-bar vue-id="34a79071-1" title="{{type+'协议'}}" back="{{true}}" color="black" background="white" class="data-v-3288f6e8" bind:__l="__l"></nav-bar><u-parse vue-id="34a79071-2" content="{{content.content}}" class="data-v-3288f6e8" bind:__l="__l"></u-parse></view>

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

@@ -0,0 +1 @@
+.page.data-v-3288f6e8{padding:32rpx}

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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/sellAfter/index"],{"1a2d":function(e,n,t){"use strict";var u=t("9eee"),a=t.n(u);a.a},"3b65":function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var t={components:{},data:function(){return{value:0,value1:0,value2:0,showSheet:!1,list:[{name:"换新商品"},{name:"换新流程"}]}},onLoad:function(e){},methods:{change:function(){},toPage:function(){this.showSheet=!0},handleSel:function(n){this.showSheet=!1,"换新商品"==n.name?e.navigateTo({url:"/pages/my/changeNewGoods/index"}):e.navigateTo({url:"/pages/my/changeNewStep/index"})}}};n.default=t}).call(this,t("543d")["default"])},"72b6":function(e,n,t){"use strict";(function(e,n){var u=t("4ea4");t("d716");u(t("66fd"));var a=u(t("9c8c"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"9c8c":function(e,n,t){"use strict";t.r(n);var u=t("fd4d"),a=t("bb8f");for(var o in a)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(o);t("1a2d");var c=t("f0c5"),i=Object(c["a"])(a["default"],u["b"],u["c"],!1,null,"5a48d3be",null,!1,u["a"],void 0);n["default"]=i.exports},"9eee":function(e,n,t){},bb8f:function(e,n,t){"use strict";t.r(n);var u=t("3b65"),a=t.n(u);for(var o in u)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(o);n["default"]=a.a},fd4d:function(e,n,t){"use strict";t.d(n,"b",(function(){return a})),t.d(n,"c",(function(){return o})),t.d(n,"a",(function(){return u}));var u={uActionSheet:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-action-sheet/u-action-sheet")]).then(t.bind(null,"3734"))}},a=function(){var e=this,n=e.$createElement;e._self._c;e._isMounted||(e.e0=function(n){e.showSheet=!1})},o=[]}},[["72b6","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/sellAfter/index"],{"3b65":function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var t={components:{},data:function(){return{value:0,value1:0,value2:0,showSheet:!1,list:[{name:"换新商品"},{name:"换新流程"}]}},onLoad:function(e){},methods:{change:function(){},toPage:function(){this.showSheet=!0},handleSel:function(n){this.showSheet=!1,"换新商品"==n.name?e.navigateTo({url:"/pages/my/changeNewGoods/index"}):(getApp().stepName="换新流程",e.navigateTo({url:"/pages/my/changeNewStep/index"}))}}};n.default=t}).call(this,t("543d")["default"])},"632c":function(e,n,t){},"72b6":function(e,n,t){"use strict";(function(e,n){var u=t("4ea4");t("d716");u(t("66fd"));var o=u(t("9c8c"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"9c8c":function(e,n,t){"use strict";t.r(n);var u=t("b2dd"),o=t("bb8f");for(var c in o)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(c);t("9edc");var a=t("f0c5"),i=Object(a["a"])(o["default"],u["b"],u["c"],!1,null,"2cd59290",null,!1,u["a"],void 0);n["default"]=i.exports},"9edc":function(e,n,t){"use strict";var u=t("632c"),o=t.n(u);o.a},b2dd:function(e,n,t){"use strict";t.d(n,"b",(function(){return o})),t.d(n,"c",(function(){return c})),t.d(n,"a",(function(){return u}));var u={uActionSheet:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-action-sheet/u-action-sheet")]).then(t.bind(null,"3734"))}},o=function(){var e=this,n=e.$createElement;e._self._c;e._isMounted||(e.e0=function(n){e.showSheet=!1})},c=[]},bb8f:function(e,n,t){"use strict";t.r(n);var u=t("3b65"),o=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(c);n["default"]=o.a}},[["72b6","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pages/my/sellAfter/index.wxml

@@ -1 +1 @@
-<view class="page data-v-5a48d3be"><nav-bar vue-id="a454e73a-1" title="售后" back="{{true}}" color="black" background="white" class="data-v-5a48d3be" bind:__l="__l"></nav-bar><view class="content data-v-5a48d3be"><view class="item data-v-5a48d3be" style="border-radius:0rpx 0rpx 0rpx 24rpx;"><navigator style="border-bottom:2rpx solid #E6E6E6;" url="/pages/my/sellAfterDefer/index" class="data-v-5a48d3be"><view class="line data-v-5a48d3be"><view class="left data-v-5a48d3be">售后保障</view><view class="right data-v-5a48d3be"><image style="width:14rpx;height:24rpx;" src="/static/my/arr_r.png" mode class="data-v-5a48d3be"></image></view></view></navigator><view data-event-opts="{{[['tap',[['toPage',['$event']]]]]}}" class="line data-v-5a48d3be" bindtap="__e"><view class="left data-v-5a48d3be">以旧换新</view><view class="right data-v-5a48d3be"><image style="width:14rpx;height:24rpx;" src="/static/my/arr_r.png" mode class="data-v-5a48d3be"></image></view></view><navigator url="/pages/my/sellAfterCon/index" class="data-v-5a48d3be"><view class="line data-v-5a48d3be"><view class="left data-v-5a48d3be">售后联系</view><view class="right data-v-5a48d3be"><image style="width:14rpx;height:24rpx;" src="/static/my/arr_r.png" mode class="data-v-5a48d3be"></image></view></view></navigator></view></view><u-action-sheet vue-id="a454e73a-2" actions="{{list}}" title="{{title}}" show="{{showSheet}}" cancelText="取消" data-event-opts="{{[['^close',[['e0']]],['^select',[['handleSel']]]]}}" bind:close="__e" bind:select="__e" class="data-v-5a48d3be" bind:__l="__l"></u-action-sheet></view>
+<view class="page data-v-2cd59290"><nav-bar vue-id="a454e73a-1" title="售后" back="{{true}}" color="black" background="white" class="data-v-2cd59290" bind:__l="__l"></nav-bar><view class="content data-v-2cd59290"><view class="item data-v-2cd59290" style="border-radius:0rpx 0rpx 0rpx 24rpx;"><navigator style="border-bottom:2rpx solid #E6E6E6;" url="/pages/my/sellAfterDefer/index" class="data-v-2cd59290"><view class="line data-v-2cd59290"><view class="left data-v-2cd59290">售后保障</view><view class="right data-v-2cd59290"><image style="width:14rpx;height:24rpx;" src="/static/my/arr_r.png" mode class="data-v-2cd59290"></image></view></view></navigator><view data-event-opts="{{[['tap',[['toPage',['$event']]]]]}}" class="line data-v-2cd59290" bindtap="__e"><view class="left data-v-2cd59290">以旧换新</view><view class="right data-v-2cd59290"><image style="width:14rpx;height:24rpx;" src="/static/my/arr_r.png" mode class="data-v-2cd59290"></image></view></view><navigator url="/pages/my/sellAfterCon/index" class="data-v-2cd59290"><view class="line data-v-2cd59290"><view class="left data-v-2cd59290">售后联系</view><view class="right data-v-2cd59290"><image style="width:14rpx;height:24rpx;" src="/static/my/arr_r.png" mode class="data-v-2cd59290"></image></view></view></navigator></view></view><u-action-sheet vue-id="a454e73a-2" actions="{{list}}" title="{{title}}" show="{{showSheet}}" cancelText="取消" data-event-opts="{{[['^close',[['e0']]],['^select',[['handleSel']]]]}}" bind:close="__e" bind:select="__e" class="data-v-2cd59290" bind:__l="__l"></u-action-sheet></view>

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

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

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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/sellAfterCon/index"],{"28f8":function(n,t,e){"use strict";var a=e("6644"),c=e.n(a);c.a},"56fc":function(n,t,e){"use strict";e.d(t,"b",(function(){return a})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){}));var a=function(){var n=this.$createElement;this._self._c},c=[]},6644:function(n,t,e){},"66a4":function(n,t,e){"use strict";(function(n,t){var a=e("4ea4");e("d716");a(e("66fd"));var c=a(e("d7e8"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(c.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},"9bc6":function(n,t,e){"use strict";e.r(t);var a=e("ada6"),c=e.n(a);for(var u in a)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(u);t["default"]=c.a},ada6:function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={components:{},data:function(){return{picUrl:this.$picUrl}},onLoad:function(n){},methods:{copy:function(t){var e=this;n.setClipboardData({data:t,success:function(){e.$toast("复制成功","success")}})},call:function(t){n.makePhoneCall({phoneNumber:t})}}};t.default=e}).call(this,e("543d")["default"])},d7e8:function(n,t,e){"use strict";e.r(t);var a=e("56fc"),c=e("9bc6");for(var u in c)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return c[n]}))}(u);e("28f8");var o=e("f0c5"),i=Object(o["a"])(c["default"],a["b"],a["c"],!1,null,"0dcfb276",null,!1,a["a"],void 0);t["default"]=i.exports}},[["66a4","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/sellAfterCon/index"],{"022b":function(e,t,n){},"31ff":function(e,t,n){"use strict";n.d(t,"b",(function(){return a})),n.d(t,"c",(function(){return c})),n.d(t,"a",(function(){}));var a=function(){var e=this.$createElement;this._self._c},c=[]},"66a4":function(e,t,n){"use strict";(function(e,t){var a=n("4ea4");n("d716");a(n("66fd"));var c=a(n("d7e8"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(c.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])},"9bc6":function(e,t,n){"use strict";n.r(t);var a=n("ada6"),c=n.n(a);for(var o in a)["default"].indexOf(o)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(o);t["default"]=c.a},ada6:function(e,t,n){"use strict";(function(e){var a=n("4ea4");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var c=a(n("2eee")),o=a(n("c973")),u=n("9ca2"),r={components:{},data:function(){return{picUrl:this.$picUrl,picBase:this.$picBase,con:null}},onLoad:function(t){var n=this;return(0,o.default)(c.default.mark((function t(){var a;return c.default.wrap((function(t){while(1)switch(t.prev=t.next){case 0:return t.next=2,(0,u.getSerBackConReq)();case 2:a=t.sent,0==a.code?(console.log("获取我的售后联系返回值: ",a),n.con=a.data.content[0]):e.showToast({title:a.message,icon:"none"});case 4:case"end":return t.stop()}}),t)})))()},methods:{copy:function(t){var n=this;e.setClipboardData({data:t,success:function(){n.$toast("复制成功","success")}})},call:function(t){e.makePhoneCall({phoneNumber:t})}}};t.default=r}).call(this,n("543d")["default"])},d7e8:function(e,t,n){"use strict";n.r(t);var a=n("31ff"),c=n("9bc6");for(var o in c)["default"].indexOf(o)<0&&function(e){n.d(t,e,(function(){return c[e]}))}(o);n("f43c");var u=n("f0c5"),r=Object(u["a"])(c["default"],a["b"],a["c"],!1,null,"6f2db07a",null,!1,a["a"],void 0);t["default"]=r.exports},f43c:function(e,t,n){"use strict";var a=n("022b"),c=n.n(a);c.a}},[["66a4","common/runtime","common/vendor"]]]);

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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/sellAfterDefer/index"],{7204:function(n,e,t){"use strict";t.d(e,"b",(function(){return a})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){}));var a=function(){var n=this.$createElement;this._self._c},u=[]},"7d3e":function(n,e,t){"use strict";t.r(e);var a=t("eb66"),u=t.n(a);for(var r in a)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return a[n]}))}(r);e["default"]=u.a},"918b":function(n,e,t){"use strict";(function(n,e){var a=t("4ea4");t("d716");a(t("66fd"));var u=a(t("a0d1"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},a0d1:function(n,e,t){"use strict";t.r(e);var a=t("7204"),u=t("7d3e");for(var r in u)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(r);t("a613");var c=t("f0c5"),f=Object(c["a"])(u["default"],a["b"],a["c"],!1,null,"32aa5df5",null,!1,a["a"],void 0);e["default"]=f.exports},a613:function(n,e,t){"use strict";var a=t("a9fb"),u=t.n(a);u.a},a9fb:function(n,e,t){},eb66: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:{}}}},[["918b","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/sellAfterDefer/index"],{"01f5":function(e,t,n){"use strict";n.d(t,"b",(function(){return a})),n.d(t,"c",(function(){return c})),n.d(t,"a",(function(){}));var a=function(){var e=this.$createElement;this._self._c},c=[]},"7d3e":function(e,t,n){"use strict";n.r(t);var a=n("eb66"),c=n.n(a);for(var r in a)["default"].indexOf(r)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(r);t["default"]=c.a},"918b":function(e,t,n){"use strict";(function(e,t){var a=n("4ea4");n("d716");a(n("66fd"));var c=a(n("a0d1"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(c.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])},a0d1:function(e,t,n){"use strict";n.r(t);var a=n("01f5"),c=n("7d3e");for(var r in c)["default"].indexOf(r)<0&&function(e){n.d(t,e,(function(){return c[e]}))}(r);n("f19b");var u=n("f0c5"),o=Object(u["a"])(c["default"],a["b"],a["c"],!1,null,"e570ea0c",null,!1,a["a"],void 0);t["default"]=o.exports},d9cf:function(e,t,n){},eb66:function(e,t,n){"use strict";(function(e){var a=n("4ea4");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var c=a(n("2eee")),r=a(n("c973")),u=n("9ca2"),o={components:{},data:function(){return{list:[]}},onLoad:function(t){var n=this;return(0,r.default)(c.default.mark((function t(){var a;return c.default.wrap((function(t){while(1)switch(t.prev=t.next){case 0:return t.next=2,(0,u.getSerBackReq)();case 2:a=t.sent,0==a.code?(console.log("获取我的售后保障返回值: ",a),n.list=a.data.data):e.showToast({title:a.message,icon:"none"});case 4:case"end":return t.stop()}}),t)})))()},methods:{}};t.default=o}).call(this,n("543d")["default"])},f19b:function(e,t,n){"use strict";var a=n("d9cf"),c=n.n(a);c.a}},[["918b","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pages/my/sellAfterDefer/index.wxml

@@ -1 +1 @@
-<view class="page data-v-32aa5df5"><nav-bar vue-id="e0d6fabe-1" title="售后保障" back="{{true}}" color="black" background="white" class="data-v-32aa5df5" bind:__l="__l"></nav-bar><view class="content data-v-32aa5df5"><block wx:for="{{6}}" wx:for-item="i" wx:for-index="__i0__"><view class="item data-v-32aa5df5"><view class="line data-v-32aa5df5"><view class="left data-v-32aa5df5">产品名称</view><view class="right data-v-32aa5df5">无主灯套餐选择</view></view><view class="line data-v-32aa5df5"><view class="left data-v-32aa5df5">服务流程</view><view class="right data-v-32aa5df5">XL2353578</view></view><view class="line data-v-32aa5df5"><view class="left data-v-32aa5df5">业主姓名</view><view class="right data-v-32aa5df5">张冰彬</view></view><view class="line data-v-32aa5df5"><view class="left data-v-32aa5df5">联系电话</view><view class="right data-v-32aa5df5">19820983290</view></view><view class="line data-v-32aa5df5"><view class="left data-v-32aa5df5">项目地址</view><view class="right data-v-32aa5df5">XX省XX市XX区XX路XX号</view></view><view class="line data-v-32aa5df5"><view class="left data-v-32aa5df5">质保剩余时间</view><view class="right data-v-32aa5df5">6天</view></view></view></block></view></view>
+<view class="page data-v-e570ea0c"><nav-bar vue-id="e0d6fabe-1" title="售后保障" back="{{true}}" color="black" background="white" class="data-v-e570ea0c" bind:__l="__l"></nav-bar><view class="content data-v-e570ea0c"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view class="item data-v-e570ea0c"><view class="line data-v-e570ea0c"><view class="left data-v-e570ea0c">产品名称</view><view class="right data-v-e570ea0c">{{''+item.product+''}}</view></view><view class="line data-v-e570ea0c"><view class="left data-v-e570ea0c">产品型号</view><view class="right data-v-e570ea0c">{{''+item.model_number+''}}</view></view><view class="line data-v-e570ea0c"><view class="left data-v-e570ea0c">业主姓名</view><view class="right data-v-e570ea0c">{{''+item.name+''}}</view></view><view class="line data-v-e570ea0c"><view class="left data-v-e570ea0c">联系电话</view><view class="right data-v-e570ea0c">{{''+item.phone+''}}</view></view><view class="line data-v-e570ea0c"><view class="left data-v-e570ea0c">项目地址</view><view class="right data-v-e570ea0c">{{''+item.address+''}}</view></view><view class="line data-v-e570ea0c"><view class="left data-v-e570ea0c">质保剩余时间</view><view class="right data-v-e570ea0c">{{''+item.dayCount+'天'}}</view></view></view></block></view></view>

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

@@ -1 +1 @@
-.content.data-v-32aa5df5{background:#f1f1f1;min-height:100vh;padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-32aa5df5{height:432rpx;background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;justify-content:space-around;margin-bottom:24rpx}.content .item .line.data-v-32aa5df5{display:flex;justify-content:space-between}.content .item .line .left.data-v-32aa5df5{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666}.content .item .line .right.data-v-32aa5df5{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333}
+.content.data-v-e570ea0c{background:#f1f1f1;min-height:100vh;padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-e570ea0c{height:432rpx;background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;justify-content:space-around;margin-bottom:24rpx}.content .item .line.data-v-e570ea0c{display:flex;justify-content:space-between}.content .item .line .left.data-v-e570ea0c{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666}.content .item .line .right.data-v-e570ea0c{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333}