9.13

common/config.js

@@ -1,11 +1,13 @@
 let configUrl = {}
 if (process.env.NODE_ENV === 'development') {
 	configUrl = {
-		baseUrl: 'http://t23.9026.com/index.php/api/upload',
+		baseUrl: 'https://t23.9026.com/index.php/api/upload',
+		picUrl: 'http://www.liwantao.top'
 	}
 } else {
 	configUrl = {
-		baseUrl: 'http://jmapi.tangyuhao.cn/index.php/api/api/v1/common/uploadFile',
+		baseUrl: 'https://t23.9026.com/index.php/api/upload',
+		picUrl: 'http://www.liwantao.top'
 	}
 }
 

main.js

@@ -15,6 +15,9 @@ Vue.use(uView)
 import store from 'store/index.js'
 Vue.prototype.$store = store
 
+import uploadUrl from '@/common/config.js'
+Vue.prototype.$picUrl = uploadUrl.picUrl
+
 // 常见功能函数封装
 Vue.prototype.$toast = (title, icon = "none", duration = 1500) => {
 	uni.showToast({

pages.json

@@ -1,31 +1,24 @@
 {
-	"pages": [
-		// {
-		// 	"path": "pages/home/index",
-		// 	"style": {
-		// 		"navigationBarTitleText": "自定义tabbar首页"
-		// 	}
-		// },
-		{
-			"path": "pages/index/index",
+	"pages": [{
+			"path": "pages/index",
 			"style": {
 				"navigationBarTitleText": "首页"
 			}
 		},
 		{
-			"path": "pages/mall/index",
+			"path": "pages/mall",
 			"style": {
 				"navigationBarTitleText": "分类"
 			}
 		},
 		{
-			"path": "pages/service/index",
+			"path": "pages/service",
 			"style": {
 				"navigationBarTitleText": "售后"
 			}
 		},
 		{
-			"path": "pages/my/index",
+			"path": "pages/my",
 			"style": {
 				"navigationBarTitleText": "我的"
 			}
@@ -53,166 +46,263 @@
 			"style": {
 				"navigationBarTitleText": "隐私弹窗页面"
 			}
+		}
+	],
+	"subPackages": [{
+			"root": "pages/index",
+			"pages": [{
+					"path": "customMian_step1/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "customNoMian_step1/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "customNoMian_step2/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "customMian/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "mainDetail/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "customNoMain/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "productLead/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "fullHouseWifi/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "aiControlSys/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "rule/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "mainList/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "productLeadDetail/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "aiControlSys_step2/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				}
+			]
 		},
 		{
-			"path": "pages/my/useLead/index",
-			"style": {
-				"navigationBarTitleText": "小程序使用指南"
-			}
-		},
-		{
-			"path": "pages/my/feedBack/index",
-			"style": {
-				"navigationBarTitleText": "用户反馈"
-			}
-		},
-		{
-			"path": "pages/my/chapinShip/index",
-			"style": {
-				"navigationBarTitleText": "兑奖信息"
-			}
-		},
-		{
-			"path": "pages/my/actGoods/index",
-			"style": {
-				"navigationBarTitleText": "活动商品"
-			}
-		},
-		{
-			"path": "pages/my/userInfo/index",
-			"style": {
-				"navigationBarTitleText": "个人资料"
-			}
-		},
-		{
-			"path": "pages/my/set/index",
-			"style": {
-				"navigationBarTitleText": "设置"
-			}
-		},
-		{
-			"path": "pages/my/sellAfter/index",
-			"style": {
-				"navigationBarTitleText": "售后"
-			}
-		},
-		{
-			"path": "pages/my/otherInfo/index",
-			"style": {
-				"navigationBarTitleText": "其他信息"
-			}
-		},
-		{
-			"path": "pages/my/sellAfterDefer/index",
-			"style": {
-				"navigationBarTitleText": "售后保障"
-			}
-		},
-		{
-			"path": "pages/my/sellAfterCon/index",
-			"style": {
-				"navigationBarTitleText": "售后联系"
-			}
-		},
-		{
-			"path": "pages/my/inviteDetail/index",
-			"style": {
-				"navigationBarTitleText": "邀约详情",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/index/fullHouseWifi/index",
-			"style": {
-				"navigationBarTitleText": "网络规划-全屋WiFi",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/index/aiControlSys/index",
-			"style": {
-				"navigationBarTitleText": "智能控制系统",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/my/collect/index",
-			"style": {
-				"navigationBarTitleText": "收藏",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/mall/pickKeting/index",
-			"style": {
-				"navigationBarTitleText": "挑选客厅灯",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/index/productLead/index",
-			"style": {
-				"navigationBarTitleText": "产品指南",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/index/customNoMain/index",
-			"style": {
-				"navigationBarTitleText": "定制我家的无主灯",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/index/detail/index",
-			"style": {
-				"navigationBarTitleText": "详情",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/index/customMian/index",
-			"style": {
-				"navigationBarTitleText": "定制我家的主灯",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/index/customMian_step2/index",
-			"style": {
-				"navigationBarTitleText": "定制我家的无主灯",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/index/customNoMian_step1/index",
-			"style": {
-				"navigationBarTitleText": "无主灯-通选套餐",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/index/customMian_step1/index",
-			"style": {
-				"navigationBarTitleText": "主灯-通选套餐",
-				"navigationBarTextStyle": "white"
-			}
+			"root": "pages/mall",
+			"pages": [{
+					"path": "detail/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pickKeting/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "goodsList/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				}
+			]
 		},
 		{
-			"path": "pages/mall/detail/index",
-			"style": {
-				"navigationBarTitleText": "商品详情",
-				"navigationBarTextStyle": "white"
-			}
+			"root": "pages/service",
+			"pages": [{
+					"path": "detail/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				}
+				// ,
+				// {
+				// 	"path": "pickKeting/index",
+				// 	"style": {
+				// 		"navigationBarTitleText": "",
+				// 		"enablePullDownRefresh": false
+				// 	}
+				// }
+			]
 		},
 		{
-			"path": "pages/my/actGoodsDetail/index",
-			"style": {
-				"navigationBarTitleText": "活动商品详情",
-				"navigationBarTextStyle": "white"
-			}
+			"root": "pages/my",
+			"pages": [{
+					"path": "actGoods/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "actGoodsDetail/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "chapinShip/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "collect/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "useLead/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "feedBack/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "userInfo/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "set/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "sellAfter/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "otherInfo/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "sellAfterDefer/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "sellAfterCon/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "inviteDetail/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "collectDetail/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "changeNewStep/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "changeNewGoods/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				}
+			]
 		}
-
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -244,7 +334,7 @@
 			// 	"selectedIconPath": "static/tabbar/index_a.png"
 			// },
 			{
-				"pagePath": "pages/index/index",
+				"pagePath": "pages/index",
 				"text": "首页",
 				"iconPath": "static/tabbar/index.png",
 				"selectedIconPath": "static/tabbar/index_a.png",
@@ -259,7 +349,7 @@
 				}
 			},
 			{
-				"pagePath": "pages/mall/index",
+				"pagePath": "pages/mall",
 				"text": "商城",
 				"iconPath": "static/tabbar/mall.png",
 				"selectedIconPath": "static/tabbar/mall_a.png",
@@ -272,7 +362,7 @@
 				}
 			},
 			{
-				"pagePath": "pages/service/index",
+				"pagePath": "pages/service",
 				"text": "服务",
 				"iconPath": "static/tabbar/service.png",
 				"selectedIconPath": "static/tabbar/service_a.png",
@@ -285,7 +375,7 @@
 				}
 			},
 			{
-				"pagePath": "pages/my/index",
+				"pagePath": "pages/my",
 				"text": "我的",
 				"iconPath": "static/tabbar/my.png",
 				"selectedIconPath": "static/tabbar/my_a.png",

pages/index/index.vue → pages/index.vue

@@ -12,14 +12,14 @@
 			</view>
 			<view class="bottomBtn">
 				<u-swiper type='img' class="swiper" :list="bannerList" keyName="img_url" indicator indicatorMode="line"
-					:autoplay="false" height="996rpx" imgMode="scaleToFill" circular
+					:autoplay="true" height="996rpx" imgMode="scaleToFill" circular
 					@change="e => currentNum = e.current">
 					<view slot="indicator">
 					</view>
 				</u-swiper>
 
 				<view class="bookingAndIndicator">
-					<view class="btn">
+					<view class="btn" @click="toList">
 						<text class="btnTxt">立即订购</text>
 						<image src="@/static/index/halfRight.png" mode="" style="width: 24rpx;height: 8rpx;"></image>
 					</view>
@@ -60,7 +60,7 @@
 					<image src="/static/index/more.png" mode="" style="width: 48rpx;height: 48rpx;"></image>
 				</view>
 				<view class="con">
-					<image src="/static/index/img1.png" mode=""></image>
+					<image :src="picUrl+'/static/other/index_img2.png'" mode=""></image>
 				</view>
 			</view>
 
@@ -81,10 +81,10 @@
 					<image src="/static/index/more.png" mode="" style="width: 48rpx;height: 48rpx;"></image>
 				</view>
 				<view class="con">
-					<view class="item" v-for="i in 3">
-						<image src="/static/index/img1.png" mode=""></image>
+					<view class="item" v-for="(item,index) in leadList">
+						<image :src="item.img" mode=""></image>
 						<view class="bottom">
-							灯具指南
+							{{item.name}}
 						</view>
 					</view>
 				</view>
@@ -100,7 +100,7 @@
 						</view>
 						<view class="bt">
 							<view class="title">
-								展厅地址
+								城市展厅
 							</view>
 							<image src="/static/index/addr.png" mode="" style="width: 26rpx;height: 36rpx;"></image>
 						</view>
@@ -110,7 +110,7 @@
 				<view class="conLast">
 
 					<u-swiper type='def' class="swiper" :defList="bannerList1" keyName="img_url" indicator
-						indicatorMode="line" :autoplay="false" previousMargin="30" nextMargin="30" height="490rpx"
+						indicatorMode="line" :autoplay="true" previousMargin="30" nextMargin="30" height="490rpx"
 						radius="40rpx" imgMode="scaleToFill" bgColor="rgba(255,255,255,0)" circular
 						@change="e => currentNum1 = e.current" @click1="jumpLink">
 						<view slot="indicator">
@@ -142,14 +142,25 @@
 	export default {
 		data() {
 			return {
+				picUrl: this.$picUrl,
+				leadList: [{
+						img: this.$picUrl + '/static/other/index_img3.png',
+						name: '灯具指南'
+					},
+					{
+						img: this.$picUrl + '/static/other/index_img4.png',
+						name: '安装指南'
+					},
+					{
+						img: this
+							.$picUrl + '/static/other/index_img3.png',
+						name: '灯具指南'
+					}
+				],
 				bannerList: [
-					require('@/static/index/main.png'),
-					require('@/static/index/main.png'),
-					require('@/static/index/main.png')
-					// 'https://img1.baidu.com/it/u=1890390320,3399874998&fm=253&fmt=auto&app=120&f=JPEG?w=1422&h=800',
-					// 'https://cdn.uviewui.com/uview/swiper/swiper3.png',
-					// 'https://cdn.uviewui.com/uview/swiper/swiper2.png',
-					// 'https://cdn.uviewui.com/uview/swiper/swiper1.png',
+					this.$picUrl + '/static/other/noMain_img3.png',
+					this.$picUrl + '/static/other/noMain_img3.png',
+					this.$picUrl + '/static/other/noMain_img3.png',
 				],
 				bannerList1: [{
 						name: '大众',
@@ -180,6 +191,19 @@
 			}
 		},
 		methods: {
+			toList() {
+				if (this.currTabIndex == 0) {
+					uni.navigateTo({
+						url: '/pages/index/customNoMian_step1/index'
+					})
+				} else if (this.currTabIndex == 1) {
+					uni.navigateTo({
+						url: '/pages/index/customMian_step1/index'
+					})
+				} else {
+
+				}
+			},
 			toPage(i) {
 				if (i == 2) {
 					uni.navigateTo({

pages/index/aiControlSys/index.scss

@@ -21,36 +21,64 @@
 		margin-top: -60rpx;
 		margin-left: 50%;
 		transform: translateX(-50%);
+		
 		z-index: 1;
 		position: relative;
-		.water{
-			font-size: 56rpx;
-			font-family: Arial-BoldMT, Arial;
-			font-weight: normal;
-			color: #eee;
-			position: absolute;
-			top: 0;
-			z-index: 0;
-		}
-		.water1{
-			position: absolute;
-			top: 0;
-			z-index: 0;
-			height: 56rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		
+		.lTxt{
+			.water{
+				font-size: 56rpx;
+				font-family: Arial-BoldMT, Arial;
+				font-weight: normal;
+				color: #eee;
+				position: absolute;
+				top: 0;
+				z-index: 0;
+			}
+			.water1{
+				position: absolute;
+				top: 0;
+				z-index: 0;
+				height: 56rpx;
+			}
+			.main{
+				height: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				position: relative;
+				z-index: 1;
+				margin-left: 52rpx;
+				image{
+					position: absolute;
+					z-index: 2;
+					left: -8%;
+				}
+			}
 		}
-		.main{
-			height: 100%;
+		.rDes{
+			margin-right: 32rpx;
+			width: 132rpx;
+			height: 48rpx;
+			border: 1rpx solid #333333;
+			
 			display: flex;
-			align-items: center;
 			justify-content: center;
-			position: relative;
-			z-index: 1;
+			align-items: center;
+			.con{
+				font-size: 24rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+			}
 			image{
-				position: absolute;
-				z-index: 2;
-				left: 38%;
+				margin-left: 8rpx;
 			}
 		}
+		
 	}
 	.label{
 		font-size: 36rpx;
@@ -211,6 +239,7 @@
 		.pupopCon{
 			padding: 48rpx 32rpx;
 			.item{
+				margin-bottom: 30rpx;
 				.top{
 					display: flex;
 					justify-content: space-between;
@@ -231,6 +260,8 @@
 					display: flex;
 					justify-content: space-between;
 					padding-left: 24rpx;
+					margin-bottom: 30rpx;
+					margin-top: 30rpx;
 					.name{
 						font-size: 32rpx;
 						font-family: PingFang-SC-Medium, PingFang-SC;

pages/index/aiControlSys/index.vue

@@ -2,14 +2,24 @@
 	<view class="page">
 		<navBar title="智能控制系统" :back="true" color="black" background="white" />
 
-		<image src="/static/index/img1.png" mode="" class="topBg"></image>
+		<image :src="picUrl + '/static/other/c1.png'" mode="" class="topBg"></image>
 
 		<view class="content">
 			<view class="topBox">
-				<image src="/static/index/water.png" mode="" class="water1"></image>
-				<view class="main">
-					<image src="/static/index/halfCircle_275.png" mode="" style="width: 56rpx;height: 56rpx;"></image>
-					<text style="z-index: 3;position: relative;">系统类别</text>
+				<view class="lTxt">
+					<image src="/static/index/water.png" mode="" class="water1"></image>
+					<view class="main">
+						<image src="/static/index/halfCircle_275.png" mode="" style="width: 56rpx;height: 56rpx;">
+						</image>
+						<text style="z-index: 3;position: relative;">定制我家的智能控制</text>
+					</view>
+				</view>
+				<view class="rDes">
+					<view class="con">
+						详情
+					</view>
+					<image src="/static/index/halfRight.png" mode="" style="width: 24rpx;height: 8rpx;">
+					</image>
 				</view>
 			</view>
 
@@ -116,20 +126,20 @@
 			</view>
 		</view>
 
-		<view class="rule">
+		<view class="rule" @click="toRule">
 			<image src="/static/index/ruleImg.png" mode=""></image>
 			<view class="txt">
 				挑选规则
 			</view>
 		</view>
 		<view class="bot">
-			<view class="left">
+			<view class="left" @click="showConfig=true">
 				<view class="price">
 					￥2099，9900
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
-			<view class="right" @click="showConfig=true">
+			<view class="right" @click="toNext">
 				预览配置
 			</view>
 		</view>
@@ -138,7 +148,6 @@
 		<u-popup :show="showConfig" @close="close" @open="open" round='10'>
 			<view class="topBar" style="">
 				<view class="left">
-
 				</view>
 				<view class="cen">
 					清单
@@ -148,7 +157,7 @@
 				</view>
 			</view>
 			<view class="pupopCon">
-				<view class="item" v-for="i in 3">
+				<view class="item">
 					<view class="top">
 						<view class="name">
 							户型
@@ -157,7 +166,18 @@
 							一室两厅
 						</view>
 					</view>
-					<view class="bottom" v-for="i in 3">
+				</view>
+
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							类别
+						</view>
+						<view class="info">
+							3系
+						</view>
+					</view>
+					<view class="bottom">
 						<view class="name">
 							智能锁
 						</view>
@@ -165,6 +185,33 @@
 							1
 						</view>
 					</view>
+
+					<view class="bottom">
+						<view class="name">
+							智能开关
+						</view>
+						<view class="info">
+							1
+						</view>
+					</view>
+					<view class="bottom">
+						<view class="name">
+							智能窗帘
+						</view>
+						<view class="info">
+							2
+						</view>
+					</view>
+				</view>
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							品牌
+						</view>
+						<view class="info">
+							启源
+						</view>
+					</view>
 				</view>
 			</view>
 		</u-popup>
@@ -178,13 +225,14 @@
 		},
 		data() {
 			return {
+				picUrl: this.$picUrl,
+
 				addOrLessIcon1: '/static/index/add.png',
 				addOrLessIcon2: '/static/index/add.png',
 				addOrLessIcon3: '/static/index/add.png',
 				addOrLessIcon4: '/static/index/add.png',
 				addOrLessIcon5: '/static/index/add.png',
 				addOrLessIcon6: '/static/index/add.png',
-				// lessIcon: require('/static/index/shortLine.png'),
 
 				show1: false,
 				show2: false,
@@ -234,6 +282,16 @@
 		},
 		onLoad(options) {},
 		methods: {
+			toRule() {
+				uni.navigateTo({
+					url: '/pages/index/rule/index?type=ctrl'
+				})
+			},
+			toNext() {
+				uni.navigateTo({
+					url: '/pages/index/aiControlSys_step2/index'
+				})
+			},
 			handleOpenOrClose(i) {
 				if (this['addOrLessIcon' + i] == '/static/index/shortLine.png') {
 					this['addOrLessIcon' + i] = '/static/index/add.png'

pages/index/customMian_step2/index.scss → pages/index/aiControlSys_step2/index.scss

@@ -297,4 +297,84 @@
 				}
 			}
 			
+		}	
+		
+		
+		
+		.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/aiControlSys_step2/index.vue

@@ -0,0 +1,225 @@
+<template>
+	<view class="page">
+		<navBar title="智能控制系统" :back="true" color="black" background="white" />
+		<image class="topImg" :src="picUrl + '/static/other/c2.png'" mode=""></image>
+
+		<view class="cen">
+			<image class="water" src="/static/index/water.png" mode=""></image>
+			<image class="halfC" src="/static/index/halfCircle_275.png" mode=""></image>
+			定制我家的智能控制系统
+		</view>
+
+		<view class="parmasBox">
+			<view class="con">
+				<view class="top">
+					<view class="item">
+						<view class="name">
+							品牌
+						</view>
+						<view class="des">
+							LANDBOND
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							户型
+						</view>
+						<view class="des">
+							一室两厅
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							智能锁
+						</view>
+						<view class="des">
+							指纹款
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							智能开关
+						</view>
+						<view class="des">
+							智能中控
+						</view>
+					</view>
+					<view class="item">
+						<view class="name">
+							智能窗帘
+						</view>
+						<view class="des">
+							4米内(单层)
+						</view>
+					</view>
+
+					<view class="item">
+						<view class="name">
+							智能空调
+						</view>
+						<view class="des">
+							挂机
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<image @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
+		<view class="bot">
+			<!-- <view class="left" @click="showPreviewConfig=true"> -->
+			<view class="left" @click="">
+				<view class="price">
+					￥2099，9900
+				</view>
+				<image v-if="!showPreviewConfig" src="/static/index/arrDown.png" mode=""
+					@click="showPreviewConfig=true"></image>
+				<image v-else src="/static/index/arrUp.png" mode="" @click="showPreviewConfig=false"></image>
+			</view>
+			<view class="right" @click="showFixInfo=true">
+				确认配置
+			</view>
+		</view>
+
+
+		<u-popup :show="showFixInfo" @close="close" @open="open" round='10'>
+			<view class="topBar" style="">
+				<view class="left">
+
+				</view>
+				<view class="cen">
+					信息填写
+				</view>
+				<view class="close" @click="showFixInfo=false">
+					<u-icon name="close"></u-icon>
+				</view>
+			</view>
+			<view class="pupopCon">
+				<view class="item">
+					<view class="label">
+						收货人
+					</view>
+					<u--input clearable placeholder="请输入收货人" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<view class="item">
+					<view class="label">
+						电话
+					</view>
+					<u--input clearable placeholder="请输入电话" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<view class="item" style="margin-bottom: 24rpx;height: auto;">
+					<view class="label">
+						收货地址
+					</view>
+					<u--textarea v-model="value1" placeholder="请输入收货地址"></u--textarea>
+				</view>
+
+				<view class="item" style="margin-bottom: 24rpx;">
+					<view class="label">
+						备注
+					</view>
+					<u--input clearable placeholder="请输入备注" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<u-button text="确认下单" color="#333" @click="showFixInfo=false"></u-button>
+			</view>
+		</u-popup>
+
+		<!-- 
+		<u-popup :show="showPreviewConfig" @close="close" @open="open" round='10'>
+			<view class="topBar" style="">
+				<view class="left">
+				</view>
+				<view class="cen">
+					清单
+				</view>
+				<view class="close" @click="showPreviewConfig=false">
+					<u-icon name="close"></u-icon>
+				</view>
+			</view>
+			<view class="pupopCon">
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							户型
+						</view>
+						<view class="info">
+							一室两厅
+						</view>
+					</view>
+				</view>
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							空间
+						</view>
+						<view class="info">
+							全屋
+						</view>
+					</view>
+				</view>
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							品牌
+						</view>
+						<view class="info">
+							XXX品牌
+						</view>
+					</view>
+				</view>
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							系列
+						</view>
+						<view class="info">
+							3系
+						</view>
+					</view>
+				</view>
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							版本
+						</view>
+						<view class="info">
+							标准版
+						</view>
+					</view>
+				</view>
+			</view>
+		</u-popup> -->
+
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				picUrl: this.$picUrl,
+
+				showFixInfo: false,
+
+				showPreviewConfig: false
+			}
+		},
+		onLoad(options) {},
+		methods: {
+			back() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/index/customMian/index.vue

@@ -110,7 +110,7 @@
 				</view>
 			</view>
 		</view>
-		<image src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
+		<image @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
 		<!-- <view class="rule">
 			<image src="/static/my/bj.png" mode=""></image>
 			<view class="txt">
@@ -122,7 +122,7 @@
 				<view class="price">
 					￥2099，9900
 				</view>
-				<image src="/static/my/bj.png" mode=""></image>
+				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
 			<view class="right" @click="showFixInfo=true">
 				确认配置
@@ -201,7 +201,9 @@
 		},
 		onLoad(options) {},
 		methods: {
-
+			back() {
+				uni.navigateBack()
+			}
 		}
 	}
 </script>

pages/index/customMian_step1/index.scss

@@ -1,6 +1,8 @@
 .page{
 	overflow-y: scroll;
 	padding-bottom: 240rpx;
+	
+	overflow-x: hidden;
 }
 .topBg{
 	width: 100vw;
@@ -21,36 +23,64 @@
 		margin-top: -60rpx;
 		margin-left: 50%;
 		transform: translateX(-50%);
+		
 		z-index: 1;
 		position: relative;
-		.water{
-			font-size: 56rpx;
-			font-family: Arial-BoldMT, Arial;
-			font-weight: normal;
-			color: #eee;
-			position: absolute;
-			top: 0;
-			z-index: 0;
-		}
-		.water1{
-			position: absolute;
-			top: 0;
-			z-index: 0;
-			height: 56rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		
+		.lTxt{
+			.water{
+				font-size: 56rpx;
+				font-family: Arial-BoldMT, Arial;
+				font-weight: normal;
+				color: #eee;
+				position: absolute;
+				top: 0;
+				z-index: 0;
+			}
+			.water1{
+				position: absolute;
+				top: 0;
+				z-index: 0;
+				height: 56rpx;
+			}
+			.main{
+				height: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				position: relative;
+				z-index: 1;
+				margin-left: 52rpx;
+				image{
+					position: absolute;
+					z-index: 2;
+					left: -8%;
+				}
+			}
 		}
-		.main{
-			height: 100%;
+		.rDes{
+			margin-right: 32rpx;
+			width: 132rpx;
+			height: 48rpx;
+			border: 1rpx solid #333333;
+			
 			display: flex;
-			align-items: center;
 			justify-content: center;
-			position: relative;
-			z-index: 1;
+			align-items: center;
+			.con{
+				font-size: 24rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+			}
 			image{
-				position: absolute;
-				z-index: 2;
-				left: 28%;
+				margin-left: 8rpx;
 			}
 		}
+		
 	}
 	.label{
 		font-size: 36rpx;

pages/index/customMian_step1/index.vue

@@ -2,14 +2,24 @@
 	<view class="page">
 		<navBar title="定制我家的主灯" :back="true" color="black" background="white" />
 
-		<image src="/static/index/img1.png" mode="" class="topBg"></image>
+		<image :src="picUrl+'/static/other/noMain_img3.png'" mode="" class="topBg"></image>
 
 		<view class="content">
 			<view class="topBox">
-				<image src="/static/index/water.png" mode="" class="water1"></image>
-				<view class="main">
-					<image src="/static/index/halfCircle_275.png" mode="" style="width: 56rpx;height: 56rpx;"></image>
-					<text style="z-index: 3;position: relative;">定制我家的主灯</text>
+				<view class="lTxt">
+					<image src="/static/index/water.png" mode="" class="water1"></image>
+					<view class="main">
+						<image src="/static/index/halfCircle_275.png" mode="" style="width: 56rpx;height: 56rpx;">
+						</image>
+						<text style="z-index: 3;position: relative;">定制我家的主灯</text>
+					</view>
+				</view>
+				<view class="rDes">
+					<view class="con">
+						详情
+					</view>
+					<image src="/static/index/halfRight.png" mode="" style="width: 24rpx;height: 8rpx;">
+					</image>
 				</view>
 			</view>
 
@@ -45,7 +55,7 @@
 				</view>
 			</view>
 
-			<view class="label" style="margin-bottom:32rpx;">
+			<view class="label" style="margin-bottom:32rpx;" @click="toSel">
 				<view class="txt">
 					挑选客厅灯
 				</view>
@@ -54,7 +64,7 @@
 			</view>
 
 			<view class="parms3">
-				<image @click="handleSelKeting(item,i)" class="item3 " src="/static/index/img1.png"
+				<image @click="handleSelKeting(item,i)" class="item3 " :src="picUrl+'/static/other/main_img1.png'"
 					:class="[currHouseIndex3==i?'act3':'']" v-for="i in 5">
 
 				</image>
@@ -69,7 +79,7 @@
 			</view>
 
 			<view class="parms3">
-				<image @click="currHouseIndex2=i" class="item3 " src="/static/index/img1.png"
+				<image @click="currHouseIndex2=i" class="item3 " :src="picUrl+'/static/other/main_img1.png'"
 					:class="[currHouseIndex2==i?'act3':'']" v-for="i in 5">
 
 				</image>
@@ -84,7 +94,7 @@
 			</view>
 
 			<view class="parms3">
-				<image @click="currHouseIndex4=i" class="item3 " src="/static/index/img1.png"
+				<image @click="currHouseIndex4=i" class="item3 " :src="picUrl+'/static/other/main_img1.png'"
 					:class="[currHouseIndex4==i?'act3':'']" v-for="i in 5">
 
 				</image>
@@ -99,7 +109,7 @@
 			</view>
 
 			<view class="parms3">
-				<image @click="currHouseIndex6=i" class="item3 " src="/static/index/img1.png"
+				<image @click="currHouseIndex6=i" class="item3 " :src="picUrl+'/static/other/main_img1.png'"
 					:class="[currHouseIndex6==i?'act3':'']" v-for="i in 5">
 
 				</image>
@@ -109,29 +119,29 @@
 
 		</view>
 
-		<view class="rule">
+		<view class="rule" @click="goRule">
 			<image src="/static/index/ruleImg.png" mode=""></image>
 			<view class="txt">
 				挑选规则
 			</view>
 		</view>
 		<view class="bot">
-			<view class="left">
+			<view class="left" @click="showConfig=true">
 				<view class="price">
 					￥2099，9900
 				</view>
-				<image src="/static/index/arrDown.png" mode=""></image>
+				<!-- <image src="/static/index/arrDown.png" mode=""></image> -->
+				<image v-if="!showConfig" src="/static/index/arrDown.png" mode="" @click="showConfig=true"></image>
+				<image v-else src="/static/index/arrUp.png" mode="" @click="showConfig=false"></image>
 			</view>
 			<view class="right" @click="previewConfig">
 				预览配置
 			</view>
 		</view>
 
-
 		<u-popup :show="showConfig" @close="close" @open="open" round='10'>
 			<view class="topBar" style="">
 				<view class="left">
-
 				</view>
 				<view class="cen">
 					清单
@@ -150,14 +160,6 @@
 							一室两厅
 						</view>
 					</view>
-					<!-- <view class="bottom" v-for="i in 3">
-						<view class="name">
-							智能锁
-						</view>
-						<view class="info">
-							1
-						</view>
-					</view> -->
 				</view>
 				<view class="item">
 					<view class="top">
@@ -256,6 +258,8 @@
 		},
 		data() {
 			return {
+				picUrl: this.$picUrl,
+
 				addOrLessIcon1: '/static/index/add.png',
 				addOrLessIcon2: '/static/index/add.png',
 				addOrLessIcon3: '/static/index/add.png',
@@ -320,6 +324,16 @@
 		},
 		onLoad(options) {},
 		methods: {
+			goRule() {
+				uni.navigateTo({
+					url: '/pages/index/rule/index?type=main'
+				})
+			},
+			toSel() {
+				uni.navigateTo({
+					url: '/pages/index/mainList/index'
+				})
+			},
 			handleOpenOrClose(i) {
 				if (this['addOrLessIcon' + i] == '/static/index/shortLine.png') {
 					this['addOrLessIcon' + i] = '/static/index/add.png'
@@ -343,7 +357,9 @@
 					this.showMissItem = true
 					return
 				} else {
-					this.showConfig = true
+					uni.navigateTo({
+						url: '/pages/index/customMian/index'
+					})
 				}
 			}
 		}

pages/index/customNoMain/index.scss

@@ -29,6 +29,7 @@
 				}
 				image{
 					height: 686rpx;
+					width: 100%;
 					border-radius: 0 40rpx 0 40rpx;
 				}
 			}	

pages/index/customNoMain/index.vue

@@ -3,12 +3,12 @@
 		<navBar title="定制我家的无主灯" :back="true" color="black" background="white" />
 
 		<view class="con">
-			<view class="item" v-for="i in 4">
+			<view class="item" v-for="(item,index) in typeList" @click="toNext">
 				<view class="label">
 					<image src="/static/index/part1_icon.png" mode=""></image>
-					灯型A
+					{{item.name}}
 				</view>
-				<image src="/static/index/img1.png" mode=""></image>
+				<image :src="item.img" mode=""></image>
 			</view>
 		</view>
 		<u-loadmore style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
@@ -22,12 +22,26 @@
 		},
 		data() {
 			return {
+				picUrl: this.$picUrl,
 
+				typeList: [{
+						name: '灯型A',
+						img: this.$picUrl + '/static/other/noMain_img2.png'
+					},
+					{
+						name: '灯型B',
+						img: this.$picUrl + '/static/other/noMain_img3.png'
+					},
+				]
 			}
 		},
 		onLoad(options) {},
 		methods: {
-
+			toNext() {
+				uni.navigateTo({
+					// url: '/pages/index/customNoMian_step1/index'
+				})
+			}
 		}
 	}
 </script>

pages/index/customNoMian_step1/index.scss

@@ -21,36 +21,64 @@
 		margin-top: -60rpx;
 		margin-left: 50%;
 		transform: translateX(-50%);
+		
 		z-index: 1;
 		position: relative;
-		.water{
-			font-size: 56rpx;
-			font-family: Arial-BoldMT, Arial;
-			font-weight: normal;
-			color: #eee;
-			position: absolute;
-			top: 0;
-			z-index: 0;
-		}
-		.water1{
-			position: absolute;
-			top: 0;
-			z-index: 0;
-			height: 56rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		
+		.lTxt{
+			.water{
+				font-size: 56rpx;
+				font-family: Arial-BoldMT, Arial;
+				font-weight: normal;
+				color: #eee;
+				position: absolute;
+				top: 0;
+				z-index: 0;
+			}
+			.water1{
+				position: absolute;
+				top: 0;
+				z-index: 0;
+				height: 56rpx;
+			}
+			.main{
+				height: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				position: relative;
+				z-index: 1;
+				margin-left: 52rpx;
+				image{
+					position: absolute;
+					z-index: 2;
+					left: -8%;
+				}
+			}
 		}
-		.main{
-			height: 100%;
+		.rDes{
+			margin-right: 32rpx;
+			width: 132rpx;
+			height: 48rpx;
+			border: 1rpx solid #333333;
+			
 			display: flex;
-			align-items: center;
 			justify-content: center;
-			position: relative;
-			z-index: 1;
+			align-items: center;
+			.con{
+				font-size: 24rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+			}
 			image{
-				position: absolute;
-				z-index: 2;
-				left: 28%;
+				margin-left: 8rpx;
 			}
 		}
+		
 	}
 	.label{
 		font-size: 36rpx;
@@ -214,7 +242,9 @@
 			
 		.pupopCon{
 			padding: 48rpx 32rpx;
+			padding-bottom: 84rpx;
 			.item{
+				margin-bottom: 40rpx;
 				.top{
 					display: flex;
 					justify-content: space-between;

pages/index/customNoMian_step1/index.vue

@@ -2,25 +2,34 @@
 	<view class="page">
 		<navBar title="定制我家的无主灯" :back="true" color="black" background="white" />
 
-		<image src="/static/index/img1.png" mode="" class="topBg"></image>
+		<image :src="picUrl+'/static/other/noMain_img4.png'" mode="" class="topBg"></image>
 
 		<view class="content">
 			<view class="topBox">
-				<!-- <view class="water">
-					CUSTOMIZED LIGHTING
-				</view> -->
-				<image src="/static/index/water.png" mode="" class="water1"></image>
-				<view class="main">
-					<image src="/static/index/halfCircle_275.png" mode="" style="width: 56rpx;height: 56rpx;"></image>
-					<text style="z-index: 3;position: relative;">定制我家的无主灯</text>
+				<view class="lTxt">
+					<image src="/static/index/water.png" mode="" class="water1"></image>
+					<view class="main">
+						<image src="/static/index/halfCircle_275.png" mode="" style="width: 56rpx;height: 56rpx;">
+						</image>
+						<text style="z-index: 3;position: relative;">定制我家的无主灯</text>
+					</view>
+				</view>
+				<view class="rDes">
+					<view class="con">
+						详情
+					</view>
+					<image src="/static/index/halfRight.png" mode="" style="width: 24rpx;height: 8rpx;">
+					</image>
 				</view>
+
 			</view>
 
 			<view class="label" @click="handleOpenOrClose(1)">
 				<view class="txt">
 					户型
 				</view>
-				<image :src="addOrLessIcon1" mode="" class="" style="width: 22rpx;height: 2rpx;margin-right: 56rpx;">
+				<image :src="addOrLessIcon1" mode="" class="" :style="{height:addOrLessIcon1=='/static/index/shortLine.png'
+					?'2rpx':'22rpx'}" style="width: 22rpx;margin-right: 56rpx;">
 				</image>
 			</view>
 
@@ -36,7 +45,8 @@
 				<view class="txt">
 					空间
 				</view>
-				<image :src="addOrLessIcon2" mode="" class="" style="width: 22rpx;height: 2rpx;margin-right: 56rpx;">
+				<image :src="addOrLessIcon2" mode="" class="" :style="{height:addOrLessIcon2=='/static/index/shortLine.png'
+					?'2rpx':'22rpx'}" style="width: 22rpx;margin-right: 56rpx;">
 				</image>
 			</view>
 
@@ -51,7 +61,8 @@
 				<view class="txt">
 					品牌
 				</view>
-				<image :src="addOrLessIcon3" mode="" class="" style="width: 22rpx;height: 2rpx;margin-right: 56rpx;">
+				<image :src="addOrLessIcon3" mode="" class="" :style="{height:addOrLessIcon3=='/static/index/shortLine.png'
+					?'2rpx':'22rpx'}" style="width: 22rpx;margin-right: 56rpx;">
 				</image>
 			</view>
 
@@ -66,7 +77,8 @@
 				<view class="txt">
 					系列
 				</view>
-				<image :src="addOrLessIcon5" mode="" class="" style="width: 22rpx;height: 2rpx;margin-right: 56rpx;">
+				<image :src="addOrLessIcon4" mode="" class="" :style="{height:addOrLessIcon4=='/static/index/shortLine.png'
+					?'2rpx':'22rpx'}" style="width: 22rpx;margin-right: 56rpx;">
 				</image>
 			</view>
 
@@ -82,7 +94,8 @@
 				<view class="txt">
 					版本
 				</view>
-				<image :src="addOrLessIcon5" mode="" class="" style="width: 22rpx;height: 2rpx;margin-right: 56rpx;">
+				<image :src="addOrLessIcon5" mode="" class="" :style="{height:addOrLessIcon5=='/static/index/shortLine.png'
+					?'2rpx':'22rpx'}" style="width: 22rpx;margin-right: 56rpx;">
 				</image>
 			</view>
 
@@ -99,7 +112,7 @@
 			</view>
 
 			<view class="parms2">
-				<view @click="currHouseIndex4=index" class="itemLast " :class="[currHouseIndex4==index?'act':'']"
+				<view @click="goPreview" class="itemLast " :class="[currHouseIndex4==index?'act':'']"
 					v-for="(item,index) in ktTypeList">
 					{{item}}
 				</view>
@@ -107,25 +120,25 @@
 
 		</view>
 
-		<view class="rule">
+		<view class="rule" @click="goRule">
 			<image src="/static/index/ruleImg.png" mode=""></image>
 			<view class="txt">
 				挑选规则
 			</view>
 		</view>
 		<view class="bot">
-			<view class="left">
+			<view class="left" @click="showConfig=true">
 				<view class="price">
 					￥2099，9900
 				</view>
-				<image src="/static/index/arrDown.png" mode=""></image>
+				<image v-if="!showConfig" src="/static/index/arrDown.png" mode="" @click="showConfig=true"></image>
+				<image v-else src="/static/index/arrUp.png" mode="" @click="showConfig=false"></image>
+
 			</view>
-			<view class="right" @click="showConfig=true">
+			<view class="right" @click="preConfig">
 				预览配置
 			</view>
 		</view>
-
-
 		<u-popup :show="showConfig" @close="close" @open="open" round='10'>
 			<view class="topBar" style="">
 				<view class="left">
@@ -139,7 +152,7 @@
 				</view>
 			</view>
 			<view class="pupopCon">
-				<view class="item" v-for="i in 3">
+				<view class="item">
 					<view class="top">
 						<view class="name">
 							户型
@@ -148,12 +161,44 @@
 							一室两厅
 						</view>
 					</view>
-					<view class="bottom" v-for="i in 3">
+				</view>
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							空间
+						</view>
+						<view class="info">
+							全屋
+						</view>
+					</view>
+				</view>
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							品牌
+						</view>
+						<view class="info">
+							XXX品牌
+						</view>
+					</view>
+				</view>
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							系列
+						</view>
+						<view class="info">
+							3系
+						</view>
+					</view>
+				</view>
+				<view class="item">
+					<view class="top">
 						<view class="name">
-							智能锁
+							版本
 						</view>
 						<view class="info">
-							1
+							标准版
 						</view>
 					</view>
 				</view>
@@ -169,12 +214,12 @@
 		},
 		data() {
 			return {
-				addOrLessIcon1: '/static/index/shortLine.png',
-				addOrLessIcon2: '/static/index/shortLine.png',
-				addOrLessIcon3: '/static/index/shortLine.png',
-				addOrLessIcon4: '/static/index/shortLine.png',
-				addOrLessIcon5: '/static/index/shortLine.png',
-				// lessIcon: require('/static/index/shortLine.png'),
+				picUrl: this.$picUrl,
+				addOrLessIcon1: '/static/index/add.png',
+				addOrLessIcon2: '/static/index/add.png',
+				addOrLessIcon3: '/static/index/add.png',
+				addOrLessIcon4: '/static/index/add.png',
+				addOrLessIcon5: '/static/index/add.png',
 
 				show1: false,
 				show2: false,
@@ -226,6 +271,16 @@
 		},
 		onLoad(options) {},
 		methods: {
+			preConfig() {
+				uni.navigateTo({
+					url: '/pages/index/customNoMian_step2/index'
+				})
+			},
+			goPreview() {
+				uni.navigateTo({
+					url: '/pages/index/customNoMain/index'
+				})
+			},
 			handleOpenOrClose(i) {
 				if (this['addOrLessIcon' + i] == '/static/index/shortLine.png') {
 					this['addOrLessIcon' + i] = '/static/index/add.png'
@@ -234,6 +289,11 @@
 					this['addOrLessIcon' + i] = '/static/index/shortLine.png'
 					this['show' + i] = false
 				}
+			},
+			goRule() {
+				uni.navigateTo({
+					url: '/pages/index/rule/index?type=noMain'
+				})
 			}
 		}
 	}

pages/index/customNoMian_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/customMian_step2/index.vue → pages/index/customNoMian_step2/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<navBar title="定制我家的无主灯" :back="true" color="black" background="white" />
-		<image class="topImg" src="/static/index/main.png" mode=""></image>
+		<image class="topImg" :src="picUrl + '/static/other/noMain_img4.png'" mode=""></image>
 
 		<view class="cen">
 			<image class="water" src="/static/index/water.png" mode=""></image>
@@ -53,116 +53,26 @@
 						</view>
 					</view>
 				</view>
-
-				<!-- <view class="part2">
-					包含灯型
-				</view>
-				<view class="type">
-					<view class="top2">
-						<view class="label">
-							客厅灯
-						</view>
-						<view class="num">
-							3盏
-						</view>
-					</view>
-					<view class="list">
-						<view class="item" v-for="i in 3">
-							<image src="/static/index/img1.png" mode=""></image>
-							<view class="name">
-								BNL12934
-							</view>
-						</view>
-					</view>
-				</view>
-
-				<view class="type">
-					<view class="top2">
-						<view class="label">
-							餐厅灯
-						</view>
-						<view class="num">
-							3盏
-						</view>
-					</view>
-					<view class="list">
-						<view class="item" v-for="i in 1">
-							<image src="/static/index/img1.png" mode=""></image>
-							<view class="name">
-								BNL12934
-							</view>
-						</view>
-					</view>
-				</view>
-
-				<view class="type">
-					<view class="top2">
-						<view class="label">
-							餐厅灯
-						</view>
-						<view class="num">
-							3盏
-						</view>
-					</view>
-					<view class="list">
-						<view class="item" v-for="i in 2">
-							<image src="/static/index/img1.png" mode=""></image>
-							<view class="name">
-								BNL12934
-							</view>
-						</view>
-					</view>
-				</view>
-
-				<view class="type">
-					<view class="top2">
-						<view class="label">
-							餐厅灯
-						</view>
-						<view class="num">
-							3盏
-						</view>
-					</view>
-					<view class="list">
-						<view class="item" v-for="i in 1">
-							<image src="/static/index/img1.png" mode=""></image>
-							<view class="name">
-								BNL12934
-							</view>
-						</view>
-					</view>
-				</view> -->
 			</view>
 		</view>
-		<!-- 	<view class="rule">
-			<image src="/static/my/bj.png" mode=""></image>
-			<view class="txt">
-				返回
-			</view>
-		</view> -->
 
-		<image src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
+
+		<image @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
 		<view class="bot">
-			<view class="left">
+			<!-- <view class="left" @click="showPreviewConfig=true"> -->
+			<view class="left" @click="">
 				<view class="price">
 					￥2099，9900
 				</view>
-				<image src="/static/my/bj.png" mode=""></image>
+				<image v-if="!showPreviewConfig" src="/static/index/arrDown.png" mode=""
+					@click="showPreviewConfig=true"></image>
+				<image v-else src="/static/index/arrUp.png" mode="" @click="showPreviewConfig=false"></image>
 			</view>
 			<view class="right" @click="showFixInfo=true">
 				确认配置
 			</view>
 		</view>
 
-		<!-- <view class="btnBox">
-			<view class="lBtn">
-				重新选择
-			</view>
-			<view class="rBtn">
-				选中
-			</view>
-		</view> -->
-
 
 		<u-popup :show="showFixInfo" @close="close" @open="open" round='10'>
 			<view class="topBar" style="">
@@ -195,8 +105,6 @@
 					<view class="label">
 						收货地址
 					</view>
-					<!-- <u--input clearable placeholder="请输入收货地址" border="surround" v-model="value"
-						@change="change"></u--input> -->
 					<u--textarea v-model="value1" placeholder="请输入收货地址"></u--textarea>
 				</view>
 
@@ -211,6 +119,72 @@
 			</view>
 		</u-popup>
 
+
+		<!-- <u-popup :show="showPreviewConfig" @close="close" @open="open" round='10'>
+			<view class="topBar" style="">
+				<view class="left">
+				</view>
+				<view class="cen">
+					清单
+				</view>
+				<view class="close" @click="showPreviewConfig=false">
+					<u-icon name="close"></u-icon>
+				</view>
+			</view>
+			<view class="pupopCon">
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							户型
+						</view>
+						<view class="info">
+							一室两厅
+						</view>
+					</view>
+				</view>
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							空间
+						</view>
+						<view class="info">
+							全屋
+						</view>
+					</view>
+				</view>
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							品牌
+						</view>
+						<view class="info">
+							XXX品牌
+						</view>
+					</view>
+				</view>
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							系列
+						</view>
+						<view class="info">
+							3系
+						</view>
+					</view>
+				</view>
+				<view class="item">
+					<view class="top">
+						<view class="name">
+							版本
+						</view>
+						<view class="info">
+							标准版
+						</view>
+					</view>
+				</view>
+			</view>
+		</u-popup> -->
+
 	</view>
 </template>
 
@@ -221,12 +195,18 @@
 		},
 		data() {
 			return {
-				showFixInfo: false
+				picUrl: this.$picUrl,
+
+				showFixInfo: false,
+
+				showPreviewConfig: false
 			}
 		},
 		onLoad(options) {},
 		methods: {
-
+			back() {
+				uni.navigateBack()
+			}
 		}
 	}
 </script>

pages/index/detail/index.vue

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

pages/index/fullHouseWifi/index.scss

@@ -20,36 +20,64 @@
 		margin-top: -60rpx;
 		margin-left: 50%;
 		transform: translateX(-50%);
+		
 		z-index: 1;
 		position: relative;
-		.water{
-			font-size: 56rpx;
-			font-family: Arial-BoldMT, Arial;
-			font-weight: normal;
-			color: #eee;
-			position: absolute;
-			top: 0;
-			z-index: 0;
-		}
-		.water1{
-			position: absolute;
-			top: 0;
-			z-index: 0;
-			height: 56rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		
+		.lTxt{
+			.water{
+				font-size: 56rpx;
+				font-family: Arial-BoldMT, Arial;
+				font-weight: normal;
+				color: #eee;
+				position: absolute;
+				top: 0;
+				z-index: 0;
+			}
+			.water1{
+				position: absolute;
+				top: 0;
+				z-index: 0;
+				height: 56rpx;
+			}
+			.main{
+				height: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				position: relative;
+				z-index: 1;
+				margin-left: 52rpx;
+				image{
+					position: absolute;
+					z-index: 2;
+					left: -8%;
+				}
+			}
 		}
-		.main{
-			height: 100%;
+		.rDes{
+			margin-right: 32rpx;
+			width: 132rpx;
+			height: 48rpx;
+			border: 1rpx solid #333333;
+			
 			display: flex;
-			align-items: center;
 			justify-content: center;
-			position: relative;
-			z-index: 1;
+			align-items: center;
+			.con{
+				font-size: 24rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+			}
 			image{
-				position: absolute;
-				z-index: 2;
-				left: 26%;
+				margin-left: 8rpx;
 			}
 		}
+		
 	}
 	.label{
 		font-size: 36rpx;

pages/index/fullHouseWifi/index.vue

@@ -2,14 +2,24 @@
 	<view class="page">
 		<navBar title="网络规划-全屋WiFi" :back="true" color="black" background="white" />
 
-		<image src="/static/index/img1.png" mode="" class="topBg"></image>
+		<image :src="picUrl + '/static/other/c1.png'" mode="" class="topBg"></image>
 
 		<view class="content">
 			<view class="topBox">
-				<image src="/static/index/water.png" mode="" class="water1"></image>
-				<view class="main">
-					<image src="/static/index/halfCircle_275.png" mode="" style="width: 56rpx;height: 56rpx;"></image>
-					<text style="z-index: 3;position: relative;">网络规划-全屋WiFi</text>
+				<view class="lTxt">
+					<image src="/static/index/water.png" mode="" class="water1"></image>
+					<view class="main">
+						<image src="/static/index/halfCircle_275.png" mode="" style="width: 56rpx;height: 56rpx;">
+						</image>
+						<text style="z-index: 3;position: relative;">定制我家的全屋WiFi</text>
+					</view>
+				</view>
+				<view class="rDes">
+					<view class="con">
+						详情
+					</view>
+					<image src="/static/index/halfRight.png" mode="" style="width: 24rpx;height: 8rpx;">
+					</image>
 				</view>
 			</view>
 
@@ -29,12 +39,12 @@
 				</view>
 			</view>
 		</view>
-		<view class="rule">
+		<!-- 	<view class="rule">
 			<image src="/static/index/ruleImg.png" mode=""></image>
 			<view class="txt">
 				挑选规则
 			</view>
-		</view>
+		</view> -->
 		<view class="bot">
 			<view class="left">
 				<view class="price">
@@ -56,6 +66,8 @@
 		},
 		data() {
 			return {
+				picUrl: this.$picUrl,
+
 				addOrLessIcon1: '/static/index/add.png',
 				addOrLessIcon2: '/static/index/add.png',
 				addOrLessIcon3: '/static/index/add.png',

pages/index/mainDetail/index.vue

@@ -0,0 +1,133 @@
+<template>
+	<view class="page">
+		<navBar title="详情" :back="true" color="black" background="white" />
+		<image class="topImg" :src="picUrl + '/static/other/noMain_img3.png'" mode="heightFix"></image>
+
+		<view class="cen">
+			<image class="water" src="/static/index/water.png" mode=""></image>
+			<image class="halfC" src="/static/index/halfCircle_275.png" mode=""></image>
+			灯具参数
+		</view>
+
+		<view class="parmasBox">
+			<view class="con">
+				<view class="item">
+					<view class="name">
+						型号
+					</view>
+					<view class="des">
+						BNL12934
+					</view>
+				</view>
+				<view class="item">
+					<view class="name">
+						灯体尺寸
+					</view>
+					<view class="des">
+						86cm*29cm
+					</view>
+				</view>
+				<view class="item">
+					<view class="name">
+						灯体颜色
+					</view>
+					<view class="des">
+						亮光黑+金
+					</view>
+				</view>
+				<view class="item">
+					<view class="name">
+						灯体材质
+					</view>
+					<view class="des">
+						铝材+亚克力
+					</view>
+				</view>
+				<view class="item">
+					<view class="name">
+						产品风格
+					</view>
+					<view class="des">
+						现代简约
+					</view>
+				</view>
+				<view class="item">
+					<view class="name">
+						使用空间
+					</view>
+					<view class="des">
+						客厅
+					</view>
+				</view>
+				<view class="item">
+					<view class="name">
+						功率
+					</view>
+					<view class="des">
+						108W
+					</view>
+				</view>
+
+				<view class="item">
+					<view class="name">
+						光源
+					</view>
+					<view class="des">
+						三色变光
+					</view>
+				</view>
+				<view class="item">
+					<view class="name">
+						使用面积
+					</view>
+					<view class="des">
+						20-25平方
+					</view>
+				</view>
+				<view class="item">
+					<view class="name">
+						售后保障
+					</view>
+					<view class="des">
+						非人为破坏质保2年
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="btnBox">
+			<view class="lBtn" @click="reset">
+				重新选择
+			</view>
+			<view class="rBtn">
+				选中
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				picUrl: this.$picUrl,
+			}
+		},
+		onLoad(options) {},
+		methods: {
+			reset() {
+				uni.navigateBack({
+					delta: 2
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/index/mainList/index.scss

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

pages/index/mainList/index.vue

@@ -0,0 +1,72 @@
+<template>
+	<view class="page">
+		<navBar title="挑选客厅灯" :back="true" color="black" background="white" />
+
+		<view class="con">
+			<view class="item" v-for="(item,index) in list" @click="goDetail">
+				<view class="topBox">
+					<image :src="item.pic" mode=""></image>
+				</view>
+				<view class="bottom">
+					<view class="txt">
+						灯具{{index+1}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-loadmore style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				picUrl: this.$picUrl,
+
+				list: [{
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l1.png'
+					}, {
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l2.png'
+					}, {
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l3.png'
+					}, {
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l4.png'
+					}, {
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l5.png'
+					}, {
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l6.png'
+					},
+					{
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l5.png'
+					}, {
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l6.png'
+					},
+				]
+			}
+		},
+		onLoad(options) {},
+		methods: {
+			goDetail() {
+				uni.navigateTo({
+					url: '/pages/index/mainDetail/index'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/index/productLead/index.vue

@@ -3,8 +3,8 @@
 		<navBar title="产品指南" :back="true" color="black" background="white" />
 
 		<view class="con">
-			<view class="item" v-for="i in 7">
-				<image src="/static/index/img1.png" mode=""></image>
+			<view class="item" v-for="(item,index) in list" @click="goDetail">
+				<image :src="item.pic" mode=""></image>
 				<view class="bottom">
 					<view class="txt">
 						灯具指南灯具指南灯具指南
@@ -23,12 +23,43 @@
 		},
 		data() {
 			return {
-
+				picUrl: this.$picUrl,
+				list: [{
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l1.png'
+					}, {
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l2.png'
+					}, {
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l3.png'
+					}, {
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l4.png'
+					}, {
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l5.png'
+					}, {
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l6.png'
+					},
+					{
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l5.png'
+					}, {
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l6.png'
+					},
+				]
 			}
 		},
 		onLoad(options) {},
 		methods: {
-
+			goDetail() {
+				uni.navigateTo({
+					url: '/pages/index/productLeadDetail/index'
+				})
+			}
 		}
 	}
 </script>

pages/index/productLeadDetail/index.scss

@@ -0,0 +1,56 @@
+.page{
+	padding-bottom: 160rpx;
+}
+.content{
+	padding: 48rpx 32rpx  0 32rpx;
+	.title{
+		font-size: 40rpx;
+		font-family: PingFang-SC-Bold, PingFang-SC;
+		font-weight: bold;
+		color: #333333;
+		margin-bottom: 50rpx;
+	}
+	.p{
+		font-size: 30rpx;
+		font-family: PingFang-SC-Bold, PingFang-SC;
+		// font-weight: bold;
+		color: #333333;
+		line-height: 50rpx;
+		text-indent: 2rem;
+		margin-bottom: 50rpx;
+	}
+	image{
+		width: 686rpx;
+		height: 686rpx;
+		border-radius: 0 40rpx 0 40rpx;
+	}
+}
+
+.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;
+
+	.rBtn{
+		width: 100%;
+		height: 96rpx;
+		background: #333333;
+		border-radius: 4rpx;
+		border: 2rpx solid #333333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+}

pages/index/productLeadDetail/index.vue

@@ -0,0 +1,43 @@
+<template>
+	<view class="page">
+		<navBar title="产品指南" :back="true" color="black" background="white" />
+
+		<view class="content">
+			<view class="title">
+				灯具指南
+			</view>
+			<view class="p" v-for="i in 2">
+				1、灯具装上后要注意维护，不能连续即开即关。可以时长检查，灯具装上后要注意维护，不能连续即开即关。可以时长检查。
+			</view>
+			<image :src="picUrl + '/static/other/x1.png'" mode="" style="margin-bottom: 64rpx;"></image>
+
+		</view>
+
+		<view class="btnBox">
+			<view class="rBtn">
+				一键分享
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				picUrl: this.$picUrl,
+			}
+		},
+		onLoad(options) {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/index/rule/index.scss

@@ -0,0 +1,24 @@
+.content{
+	padding: 48rpx 32rpx  0 32rpx;
+	.title{
+		font-size: 40rpx;
+		font-family: PingFang-SC-Bold, PingFang-SC;
+		font-weight: bold;
+		color: #333333;
+		margin-bottom: 50rpx;
+	}
+	.p{
+		font-size: 30rpx;
+		font-family: PingFang-SC-Bold, PingFang-SC;
+		// font-weight: bold;
+		color: #333333;
+		line-height: 50rpx;
+		text-indent: 2rem;
+		margin-bottom: 50rpx;
+	}
+	image{
+		width: 686rpx;
+		height: 686rpx;
+		border-radius: 0 40rpx 0 40rpx;
+	}
+}

pages/index/rule/index.vue

@@ -0,0 +1,37 @@
+<template>
+	<view class="page">
+		<navBar title="挑选规则" :back="true" color="black" background="white" />
+
+		<view class="content">
+			<view class="title">
+				规则指南
+			</view>
+			<view class="p" v-for="i in 2">
+				1、严格参照规则指南选择，没有参照可能会选择提交失败。严格参照规则指南选择，没有参照可能会选择提交失败。
+			</view>
+			<!-- <image src="/static/index/img1.png" mode=""></image> -->
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+
+			}
+		},
+		onLoad(options) {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/mall.scss

@@ -0,0 +1,84 @@
+::v-deep .u-sticky{
+	// top: 153rpx !important;
+}
+
+::v-deep .u-tabs__wrapper__nav__line{
+	background: #F7790C!important;
+}
+
+.searchAndTab{
+	background: white;
+	// background: red;
+	padding-top: 24rpx;
+	position: fixed;
+	width: 100%;
+	top:173rpx;
+	.searchBox{
+		padding: 0 32rpx;
+	}
+}
+
+.content{
+	display: flex;
+	margin-top: 190rpx;
+	.leftMenu{
+		width: 212rpx;
+		height: calc(100vh - 360rpx);
+		background:#fff ;
+		overflow-y: scroll;
+		.item{
+			height: 98rpx;
+			font-size: 28rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #080F18;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			
+			position: relative;
+		}
+		.halfCircle{
+			position: absolute;
+			right: 35rpx;
+			top: 40rpx;
+			z-index: 0;
+		}
+		.act{
+			background: #F2F2F2;
+		}
+	}
+	.rightDes{
+		width: 100%;
+		background:#F2F2F2;
+		padding: 48rpx 28rpx 52rpx 28rpx;
+		overflow-y: scroll;
+		box-sizing: border-box;
+		height: calc(100vh - 340rpx);
+		.item{
+			.top{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				.name{
+					
+				}
+				image{
+					
+				}
+			}
+			.bottom{
+				display: flex;
+				// justify-content: space-between;
+				flex-wrap: wrap;
+				margin-top: 32rpx;
+				image{
+					width: 136rpx;
+					height: 136rpx;
+					margin-right: 30rpx;
+					margin-bottom: 30rpx;
+				}
+			}
+		}
+	}
+}

pages/mall.vue

@@ -0,0 +1,98 @@
+<template>
+	<view class="">
+		<navBar title="商城" :back="false" color="black" flex="cen" background="#fff" />
+
+		<view class="searchAndTab">
+			<view class="searchBox">
+				<u-search shape="round" :showAction="false"></u-search>
+			</view>
+			<u-sticky bgColor="#fff">
+				<u-tabs :list="list1" :scrollable="true" :activeStyle='activeStyle'
+					:inactiveStyle="inactiveStyle"></u-tabs>
+			</u-sticky>
+		</view>
+
+		<view class="content">
+			<view class="leftMenu">
+				<view class="item" v-for="i in 20" :class="[i==currBrandIndex?'act':'']" @click="currBrandIndex=i">
+					<text style="position: relative;z-index: 1;">品牌{{i+1}}</text>
+					<image v-if="i==currBrandIndex" class="halfCircle" :src="picUrl+'/static/mall/circle.png'" mode=""
+						style="width: 30rpx;height: 30rpx;">
+					</image>
+				</view>
+			</view>
+			<view class="rightDes">
+				<view class="item" v-for="i in 10" :style="{marginTop:i>0?'22rpx':''}" @click="toDetail">
+					<view class="top">
+						<view class="name">
+							筒灯
+						</view>
+						<image src="/static/index/more.png" mode=""
+							style="width: 40rpx;height: 40rpx;margin-right: 4rpx;">
+						</image>
+					</view>
+					<view class="bottom">
+						<image :src="picUrl+'/static/other/main_img1.png'" mode="" style="" class="img" v-for="i in 5">
+						</image>
+					</view>
+
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import classifyData from '@/common/classify.data.js';
+	export default {
+		data() {
+			return {
+				picUrl: this.$picUrl,
+
+				currBrandIndex: 0,
+				list1: [{
+						name: '无主灯',
+					},
+					{
+						name: '主灯',
+					}, {
+						name: '开关插座'
+					},
+					{
+						name: '智能家装',
+					}, {
+						name: '智能锁'
+					},
+				],
+				activeStyle: {
+					color: '#F7790C'
+				},
+				inactiveStyle: {
+					color: '#080F18'
+				}
+
+			};
+		},
+		created() {
+
+		},
+		onLoad: function() {
+
+		},
+		onReady() {
+
+		},
+		methods: {
+			toDetail() {
+				uni.navigateTo({
+					url: '/pages/mall/goodsList/index'
+				})
+			}
+		},
+		components: {}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "./mall.scss";
+</style>

pages/mall/goodsList/index.scss

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

pages/mall/goodsList/index.vue

@@ -0,0 +1,71 @@
+<template>
+	<view class="page">
+		<navBar title="筒灯" :back="true" color="black" background="white" />
+
+		<view class="con">
+			<view class="item" v-for="(item,index) in list" @click="goDetail">
+				<view class="topBox">
+					<image :src="item.pic" mode=""></image>
+				</view>
+				<view class="bottom">
+					<view class="txt">
+						轻奢型灯具 纵享
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-loadmore style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				picUrl: this.$picUrl,
+				list: [{
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l1.png'
+					}, {
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l2.png'
+					}, {
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l3.png'
+					}, {
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l4.png'
+					}, {
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l5.png'
+					}, {
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l6.png'
+					},
+					{
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l5.png'
+					}, {
+						name: '灯具',
+						pic: this.$picUrl + '/static/other/l6.png'
+					},
+				]
+			}
+		},
+		onLoad(options) {},
+		methods: {
+			goDetail() {
+				uni.navigateTo({
+					url: '/pages/mall/detail/index'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/mall/index.vue

@@ -82,7 +82,7 @@
 		methods: {
 			toDetail() {
 				uni.navigateTo({
-					url: '/pages/mall/detail/index'
+					url: '/pages/mall/goodsList/index'
 				})
 			}
 		},

pages/mall/pickKeting/index.vue

@@ -3,7 +3,7 @@
 		<navBar title="挑选客厅灯" :back="true" color="black" background="white" />
 
 		<view class="con">
-			<view class="item" v-for="i in 7">
+			<view class="item" v-for="i in 7" @click="toDetail">
 				<image src="/static/index/img1.png" mode=""></image>
 				<view class="bottom">
 					<view class="txt">
@@ -28,7 +28,11 @@
 		},
 		onLoad(options) {},
 		methods: {
-
+			toDetail() {
+				uni.navigateTo({
+					url: '/pages/index/mainDetail/index'
+				})
+			}
 		}
 	}
 </script>

pages/my/index.scss → pages/my.scss

@@ -7,13 +7,12 @@
 	}
 	.content{
 		background:#F4F4F4 ;
-		// padding: 0 32rpx;
-		// padding-top: 24rpx;
 		.top{
 			padding: 0 32rpx;
 			padding-top: 24rpx;
-			background: #FFFFFF;
+			background: linear-gradient(to bottom,#FDEED5,#fff);
 			padding-bottom: 40rpx;
+			min-height: 240rpx;
 			.userInfo{
 				display: flex;
 				align-items: center;
@@ -42,6 +41,25 @@
 						color: #333333;
 						margin-left: 24rpx;
 					}
+					
+					.lMember{
+						margin-left: 24rpx;
+						padding-right: 30rpx;
+						.btn1{
+							font-size: 36rpx;
+							font-family: PingFang-SC-Heavy, PingFang-SC;
+							font-weight: 800;
+							color: #333333;
+							// margin-left: 24rpx;
+						}
+						.botDes{
+							margin-top: 8rpx;
+							font-size: 28rpx;
+							font-family: PingFang-SC-Medium, PingFang-SC;
+							font-weight: 500;
+							color: #333333;
+						}
+					}
 				}
 			}
 			

pages/my.vue

@@ -0,0 +1,490 @@
+<template>
+	<view class="container">
+		<navBar title="GIGESI 吉格斯" :back="false" color="black" background="#FDEED5" />
+		<view class="content">
+			<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>
+						<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>
+
+						<view class="lMember" v-if="token&&role=='lhy'">
+							<text class="btn1">XXXL会员</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="botDes">
+								17820937628
+							</view>
+						</view>
+
+						<view class="lMember" v-if="token&&role=='svip'">
+							<text class="btn1">XXXS-VIP</text>
+							<view class="botDes">
+								17820937628
+							</view>
+						</view>
+						<view class="lMember" v-if="token&&role=='yk'">
+							<text class="btn1">{{userInfo.nickname}}</text>
+							<view class="botDes">
+								{{userInfo.phone}}
+							</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=='superAdmin'">XXX超级管理员</text>
+
+
+					</view>
+					<navigator :url="'/pages/my/set/index?role=' + role">
+						<image src="/static/my/set2.png" mode=""
+							style="width: 37rpx;height: 41rpx;margin-right: 22rpx;">
+						</image>
+					</navigator>
+				</view>
+
+				<view class="invite" @click="show=true"
+					v-if="role=='sjkf'||role=='shkf'||role=='yw'||role=='superAdmin'||role==''">
+					<view class="left">
+						<image src="/static/my/vip.png" mode="" style="width: 27rpx;height: 30rpx;">
+						</image>
+						<text>邀约VIP</text>
+					</view>
+
+					<view class="right">
+						<text class="price">VIP享专属价格</text>
+						<image src="/static/my/yellowR.png" mode=""
+							style="width: 12rpx;height: 20rpx;margin-left: 8rpx;"></image>
+					</view>
+					<image :src="picUrl+'/static/my/diwen.png'" mode=""
+						style="width: 136rpx;height: 80rpx;position: absolute;z-index: 0;right: 0;right: 32rpx;border-radius: 0rpx 24rpx 8rpx 0rpx;">
+					</image>
+				</view>
+			</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>
+				</navigator>
+			</view>
+		</view>
+
+		<u-action-sheet :actions="list" :title="title" :show="show" cancelText="取消" @close="show=false"
+			@select="handleSel"></u-action-sheet>
+	</view>
+</template>
+
+<script>
+	import uploadUrl from '@/common/config.js'
+	import {
+		wxAuthLoginReq,
+		getUserInfoReq,
+		updateUserInfoReq,
+	} from '@/api/test/index.js'
+	export default {
+		// components: {
+		// 	navBar
+		// },
+		data() {
+			return {
+				picUrl: this.$picUrl,
+
+				token: uni.getStorageSync('token'),
+				// token: '',
+				// role: 'cydg',
+				// role: 'dg',
+
+				// role: 'hy',
+				// role: 'lhy',
+				// role: 'sjkf',
+				// role: 'shkf',
+				// role: 'yw',
+				// role: 'svip',
+				role: uni.getStorageSync('role'),
+				// role: 'superAdmin',
+				// role: '',
+
+				serList: [],
+
+				showPrivacy: true,
+
+				avatarUrl: '',
+				nickName: '',
+				PhoneCode: '',
+				imgUrl: '',
+				isPhone: false,
+
+				user_img: '', //微信头像
+				user_name: '',
+
+				show: false,
+				list: [{
+						name: '邀约VIP'
+					},
+					{
+						name: '邀约L会员'
+					},
+					{
+						name: '邀约会员'
+					},
+					{
+						name: '邀约电工'
+					},
+					{
+						name: '邀约活动用户'
+					}
+				],
+
+				userInfo: uni.getStorageSync('userInfo')
+			}
+		},
+		onLoad() {
+			// console.log('token', this.token);
+			wx.onNeedPrivacyAuthorization((resolve, eventInfo) => {
+				console.log('触发本次事件的接口是：' + eventInfo.referrer)
+				// 需要用户同意隐私授权时
+				// 弹出开发者自定义的隐私授权弹窗
+				this.showPrivacy = true
+
+				this.resolvePrivacyAuthorization = resolve
+			})
+
+			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/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 = [{
+						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 == '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') {
+					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'
+					}, ]
+				}
+
+				this.list = [{
+						name: '邀约VIP'
+					},
+					{
+						name: '邀约L会员'
+					},
+					{
+						name: '邀约活动用户'
+					}
+				]
+			} 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: '邀约会员'
+					},
+					{
+						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/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 == '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 {
+				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'
+				}, ]
+			}
+
+			// wx.getUserProfile({
+			// 	success: console.log,
+			// 	fail: console.error
+			// })
+		},
+		computed: {
+			// token() {
+			// 	return uni.getStorageSync('token')
+			// }
+		},
+		methods: {
+
+			login() {
+				let _this = this
+				uni.login({
+					provider: 'weixin',
+					success: async (res) => {
+						console.log('uni.login返回值：', res)
+						if (res.errMsg == 'login:ok') {
+							let res1 = await wxAuthLoginReq({
+								code: res.code
+							})
+							if (res1.code == 0) {
+								console.log('微信授权登陆返回值:', res1);
+
+								uni.setStorageSync('token', res1.data.token)
+								uni.setStorageSync('role', 'yk')
+								uni.setStorageSync('userInfo', res1.data.user_info)
+								console.log('微信授权登陆返回-用户信息:', res1.data.user_info);
+								uni.reLaunch({
+									url: '/pages/my'
+								})
+							} 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
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./my.scss";
+</style>

pages/my/actGoods/index.vue

@@ -6,7 +6,7 @@
 			<view class="item" v-for="i in 7" @click="goDetail">
 				<view class="topBox">
 					<image src="/static/index/img1.png" mode=""></image>
-					<view class="cutDown">
+					<!-- <view class="cutDown">
 						<view class="item2">
 							05
 						</view>
@@ -22,7 +22,7 @@
 						<view class=" item2">
 							38
 						</view>
-					</view>
+					</view> -->
 				</view>
 				<view class="bottom">
 					<view class="txt">

pages/my/actGoodsDetail/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<navBar title="详情" :back="true" color="black" background="white" />
-		<!-- <image class="topImg" src="/static/index/main.png" mode=""></image> -->
+		<image class="topImg" src="/static/index/main.png" mode=""></image>
 
 		<view class="cen">
 			<image class="water" src="/static/index/water.png" mode=""></image>

pages/my/changeNewGoods/index.scss

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

pages/my/changeNewGoods/index.vue

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

pages/my/changeNewStep/index.scss

@@ -0,0 +1,56 @@
+.page{
+	padding-bottom: 160rpx;
+}
+.content{
+	padding: 48rpx 32rpx  0 32rpx;
+	.title{
+		font-size: 40rpx;
+		font-family: PingFang-SC-Bold, PingFang-SC;
+		font-weight: bold;
+		color: #333333;
+		margin-bottom: 50rpx;
+	}
+	.p{
+		font-size: 30rpx;
+		font-family: PingFang-SC-Bold, PingFang-SC;
+		// font-weight: bold;
+		color: #333333;
+		line-height: 50rpx;
+		text-indent: 2rem;
+		margin-bottom: 50rpx;
+	}
+	image{
+		width: 686rpx;
+		height: 686rpx;
+		border-radius: 0 40rpx 0 40rpx;
+	}
+}
+
+.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;
+
+	.rBtn{
+		width: 100%;
+		height: 96rpx;
+		background: #333333;
+		border-radius: 4rpx;
+		border: 2rpx solid #333333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+}

pages/my/changeNewStep/index.vue

@@ -0,0 +1,50 @@
+<template>
+	<view class="page">
+		<navBar title="服务流程" :back="true" color="black" background="white" />
+
+		<view class="content">
+			<view class="title">
+				流程一
+			</view>
+			<view class="p" v-for="i in 2">
+				1、灯具装上后要注意维护，不能连续即开即关。可以时长检查，灯具装上后要注意维护，不能连续即开即关。可以时长检查。
+			</view>
+			<image src="/static/index/img1.png" mode="" 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>
+		</view>
+
+		<view class="btnBox">
+			<view class="rBtn">
+				一键分享
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+
+			}
+		},
+		onLoad(options) {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/my/collect/index.vue

@@ -3,7 +3,7 @@
 		<navBar title="收藏" :back="true" color="black" background="white" />
 
 		<view class="con">
-			<view class="item" v-for="i in 7">
+			<view class="item" v-for="i in 7" @click="goDetail">
 				<image src="/static/index/img1.png" mode=""></image>
 				<view class="bottom">
 					<view class="txt">
@@ -28,7 +28,11 @@
 		},
 		onLoad(options) {},
 		methods: {
-
+			goDetail() {
+				uni.navigateTo({
+					url: '/pages/my/collectDetail/index'
+				})
+			}
 		}
 	}
 </script>

pages/my/collectDetail/index.scss

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

pages/my/collectDetail/index.vue

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

pages/my/feedBack/index.vue

@@ -30,7 +30,7 @@
 				</view>
 				<view class="addpic" @click="addquesPic" v-show="pic_url.length<9">
 					<view class="addPicBox">
-						<image src="/static/my/add.png"></image>
+						<image :src="picUrl+'/static/my/add.png'"></image>
 					</view>
 
 				</view>
@@ -58,6 +58,7 @@
 		},
 		data() {
 			return {
+				picUrl: this.$picUrl,
 				value1: '',
 				pic_url: [
 					// 'https://oaigc.oss-cn-chengdu.aliyuncs.com/lamp/2023-09/2023090715235129503.png'

pages/my/index.vue

@@ -1,182 +0,0 @@
-<template>
-	<view class="container">
-		<navBar title="GIGESI 吉格斯" :back="false" color="black"
-			background="linear-gradient(to bottom, #FBDFAE, #f5f3ea)" />
-		<view class="content">
-			<view class="top">
-				<view class="userInfo">
-					<view class="left">
-						<navigator url="/pages/my/userInfo/index">
-							<!-- <button class="avatarBox" open-type="chooseAvatar" @chooseavatar="onChooseAvatar"> -->
-							<button class="avatarBox">
-								<!-- <image class="avatar" :src="avatarUrl"></image> -->
-								<image class="avatar" src="/static/index/img1.png"></image>
-								<!-- <image class="avatar" src="/static/index/img1.png"></image> -->
-							</button>
-						</navigator>
-						<text class="btn">请点击登录</text>
-					</view>
-					<navigator url="/pages/my/set/index">
-						<image src="/static/my/set.png" mode="" style="width: 37rpx;height: 41rpx;margin-right: 22rpx;">
-						</image>
-					</navigator>
-				</view>
-
-				<view class="invite" @click="show=true">
-					<view class="left">
-						<image src="/static/my/vip.png" mode="" style="width: 27rpx;height: 30rpx;">
-						</image>
-						<text>邀约VIP</text>
-					</view>
-
-					<view class="right">
-						<text class="price">VIP享专属价格</text>
-						<text class="ar">></text>
-						<!-- <image src="/static/my/set.png" mode="" style="width: 12rpx;height: 20rpx;"></image> -->
-
-
-					</view>
-					<!-- <image src="/static/index/img1.png" mode=""
-						style="width: 136rpx;height: 80rpx;position: absolute;z-index: 0;right: 0;right: 32rpx;border-radius: 0rpx 24rpx 8rpx 0rpx;">
-					</image> -->
-
-
-				</view>
-			</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>
-				</navigator>
-			</view>
-		</view>
-
-		<u-action-sheet :actions="list" :title="title" :show="show" cancelText="取消" @close="show=false"
-			@select="handleSel"></u-action-sheet>
-	</view>
-</template>
-
-<script>
-	// import navBar from '@/components/navBar/index.vue'
-	import uploadUrl from '@/common/config.js'
-	export default {
-		// components: {
-		// 	navBar
-		// },
-		data() {
-			return {
-				serList: [{
-						icon: require('@/static/my/mset.png'),
-						name: '设置',
-						url: '/pages/my/set/index'
-					},
-					{
-						icon: require('@/static/my/sh.png'),
-						name: '售后',
-						url: '/pages/my/sellAfter/index'
-					},
-					{
-						icon: require('@/static/my/hd.png'),
-						name: '活动商品',
-						url: '/pages/my/actGoods/index'
-					},
-					{
-						icon: require('@/static/my/sc.png'),
-						name: '收藏',
-						url: '/pages/my/collect/index'
-					},
-					{
-						icon: require('@/static/my/qt.png'),
-						name: '其他信息',
-						// url: '/pages/my/useLead/index'
-						url: '/pages/my/otherInfo/index'
-					},
-
-					{
-						icon: require('@/static/my/hd.png'),
-						name: '一键联系',
-						phone: '12983098478'
-					},
-					{
-						icon: require('@/static/my/sc.png'),
-						name: '兑奖信息',
-						url: '/pages/my/chapinShip/index'
-					},
-					{
-						icon: require('@/static/my/qt.png'),
-						name: '小程序使用指南',
-						url: '/pages/my/useLead/index'
-					},
-				],
-
-				showPrivacy: true,
-
-				avatarUrl: '',
-				nickName: '',
-				PhoneCode: '',
-				imgUrl: '',
-				isPhone: false,
-
-				user_img: '', //微信头像
-				user_name: '',
-
-				show: false,
-				list: [{
-						name: '邀约Vip会员'
-					},
-					{
-						name: '邀约LS会员'
-					},
-					{
-						name: '邀约产业电工'
-					}
-				],
-			}
-		},
-		onLoad() {
-			wx.onNeedPrivacyAuthorization((resolve, eventInfo) => {
-				console.log('触发本次事件的接口是：' + eventInfo.referrer)
-				// 需要用户同意隐私授权时
-				// 弹出开发者自定义的隐私授权弹窗
-				this.showPrivacy = true
-
-				this.resolvePrivacyAuthorization = resolve
-			})
-
-			// wx.getUserProfile({
-			// 	success: console.log,
-			// 	fail: console.error
-			// })
-		},
-		methods: {
-			handleSel(e) {
-				console.log('sheet选择参数：', e);
-				let type = -1
-
-				if (e.name == '邀约Vip会员') {
-					type = 'vip'
-				} else if (e.name == '邀约LS会员') {
-					type = 'ls'
-				} else if (e.name == '邀约产业电工') {
-					type = 'dg'
-				}
-				uni.navigateTo({
-					url: '/pages/my/inviteDetail/index?type=' + type
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "./index.scss";
-</style>

pages/my/inviteDetail/index.vue

@@ -6,7 +6,7 @@
 			<navBar title="" :back="true" color="white" background="rgba(0,0,0,0)" />
 
 			<view class="title">
-				{{type=='vip'?'邀约用户成为VIP':type=='ls'?'邀约用户成为LS会员':type=='dg'?'邀约用户成为产业电工':'邀约活动商品'}}
+				{{type=='vip'?'邀约用户成为VIP':type=='ls'?'邀约用户成为L会员':type=='dg'?'邀约用户成为产业电工':type=='hy'?'邀约用户成为会员':'邀约活动用户'}}
 			</view>
 			<view class="vipBox">
 				<view class="top">
@@ -14,12 +14,12 @@
 						{{type=='vip'?'CUSTOMIZED LIGHTING':type=='ls'?'CUSTOMIZED LIGHTING':type=='dg'?'CUSTOMIZED LIGHTING':'CUSTOMIZED LIGHTING'}}
 					</view>
 					<view class="con">
-						{{type=='vip'?'邀约VIP':type=='ls'?'邀约LS会员':type=='dg'?'邀约产业电工':'活动商品'}}
+						{{type=='vip'?'邀约VIP':type=='ls'?'邀约L会员':type=='dg'?'邀约电工':type=='hy'?'邀约会员':'活动商品'}}
 					</view>
 				</view>
 				<view class="bot">
 					<view class="price">
-						{{type=='vip'?'邀约用户查看会员价格':type=='ls'?'邀约用户临时查看会员价格':type=='dg'?'邀约用户成为产业电工':'邀约用户查看活动商品'}}
+						{{type=='vip'?'邀约用户查看VIP价':type=='ls'?'邀约用户临时查看会员价格':type=='dg'?'邀约用户成为产业电工':type=='hy'?'邀约用户查看会员价格':'邀约用户查看团购活动商品'}}
 					</view>
 					<view class="btnG" v-if="type=='vip'">
 						<view class="main">
@@ -37,7 +37,7 @@ height: 140rpx;"></image> -->
 					<view class="btnG" v-else-if="type=='ls'">
 						<view class="main">
 							<view class="btn1" @click="showLsPop=true">
-								邀约LS会员
+								邀约L会员
 							</view>
 						</view>
 						<!-- <image src="/static/index/img1.png" mode="" class="water" style="width: 288rpx;
@@ -48,7 +48,7 @@ height: 140rpx;"></image> -->
 					<view class="btnG" v-else-if="type=='dg'">
 						<view class="main">
 							<view class="btn1" @click="showDgPop=true">
-								兑奖
+								邀约电工
 							</view>
 						</view>
 						<!-- <image src="/static/index/img1.png" mode="" class="water" style="width: 288rpx;
@@ -56,10 +56,21 @@ height: 140rpx;"></image> -->
 
 					</view>
 
-					<view class="btnG" v-else>
+					<view class="btnG" v-if="type=='yh'">
 						<view class="main">
 							<view class="btn1">
-								邀约
+								邀约活动用户
+							</view>
+						</view>
+						<!-- <image src="/static/index/img1.png" mode="" class="water" style="width: 288rpx;
+					height: 140rpx;"></image> -->
+
+					</view>
+
+					<view class="btnG" v-if="type=='hy'">
+						<view class="main">
+							<view class="btn1" @click="showHyPop=true">
+								邀约会员
 							</view>
 						</view>
 						<!-- <image src="/static/index/img1.png" mode="" class="water" style="width: 288rpx;
@@ -83,7 +94,7 @@ height: 140rpx;"></image> -->
 				</view>
 			</view>
 
-			<!-- 邀约成功-->
+			<!-- 邀约成功 -->
 			<view class="scroll" style="overflow-y: scroll;height: calc(100% - 104rpx);" v-if="currTabIndex==0">
 				<view class="top1">
 					<view class="titleL">
@@ -99,7 +110,7 @@ height: 140rpx;"></image> -->
 					</view>
 				</view>
 
-				<uni-collapse style="" v-if="type=='vip'||type=='ls'">
+				<uni-collapse style="" v-if="type=='vip'||type=='ls'||type=='hy'">
 					<uni-collapse-item titleBorder="none" v-for="i in 10">
 						<template v-slot:title>
 							<view class="list2" :style="{'margin-bottom':i==-1?'208rpx':''}">
@@ -142,7 +153,7 @@ height: 140rpx;"></image> -->
 								</view>
 							</view>
 
-							<view class="con" v-if="type=='ls'" style="height: 84rpx;">
+							<view class="con" v-if="type=='ls'||type=='hy'" style="height: 84rpx;">
 								<view class="item">
 									<view class="label">
 										项目名称
@@ -173,7 +184,7 @@ height: 140rpx;"></image> -->
 			</view>
 
 
-			<!-- 邀约失败-->
+			<!--  邀约失败 -->
 			<view class="scroll" style="overflow-y: scroll;height: calc(100% - 104rpx);" v-if="currTabIndex==1">
 				<view class="top1">
 					<view class="titleL">
@@ -219,7 +230,7 @@ height: 140rpx;"></image> -->
 
 				</view>
 				<view class="cen">
-					LS会员标签
+					L会员标签
 				</view>
 				<view class="close" @click="showLsPop=false">
 					<u-icon name="close"></u-icon>
@@ -251,6 +262,44 @@ height: 140rpx;"></image> -->
 			</view>
 		</u-popup>
 
+		<u-popup :show="showHyPop" @close="close" @open="open" round='10'>
+			<view class="topBar" style="">
+				<view class="left">
+
+				</view>
+				<view class="cen">
+					会员标签
+				</view>
+				<view class="close" @click="showHyPop=false">
+					<u-icon name="close"></u-icon>
+				</view>
+			</view>
+			<view class="pupopCon">
+				<view class="item">
+					<view class="label">
+						*姓名
+					</view>
+					<u--input clearable placeholder="请输入姓名" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<view class="item">
+					<view class="label">
+						*电话
+					</view>
+					<u--input clearable placeholder="请输入电话" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<view class="item" style="margin-bottom: 24rpx;">
+					<view class="label">
+						项目名称
+					</view>
+					<u--input clearable placeholder="请输入项目名称" border="surround" v-model="value"
+						@change="change"></u--input>
+				</view>
+				<u-button text="确定" color="#333" @click="showHyPop=false"></u-button>
+			</view>
+		</u-popup>
+
 		<u-popup :show="showDgPop" @close="close" @open="open" round='10'>
 			<view class="topBar" style="">
 				<view class="left">
@@ -271,7 +320,7 @@ height: 140rpx;"></image> -->
 					<u--input clearable placeholder="请输入姓名" border="surround" v-model="value"
 						@change="change"></u--input>
 				</view>
-				<view class="item" style="margin-bottom: 24rpx;">
+				<view class="item">
 					<view class="label">
 						*电话
 					</view>
@@ -279,6 +328,21 @@ height: 140rpx;"></image> -->
 						@change="change"></u--input>
 				</view>
 
+				<view class="item">
+					<view class="label">
+						*来源
+					</view>
+					<uni-data-select placeholder="请选择来源" v-model="value" :localdata="range"
+						@change="change"></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>
+				</view>
+
 				<u-button text="确定" color="#333" @click="showDgPop=false"></u-button>
 			</view>
 		</u-popup>
@@ -317,7 +381,8 @@ height: 140rpx;"></image> -->
 					<view class="sel">
 						<u--input placeholder="请选择身份" border="surround" v-model="value" @change="change">
 						</u--input>
-						<image src="/static/my/selDw.png" mode="" style="width: 16rpx;height: 12rpx;"></image>
+						<image src="/static/index/arrDown.png" mode="" style="width: 16rpx;height: 12rpx;">
+						</image>
 					</view>
 
 				</view>
@@ -350,20 +415,40 @@ height: 140rpx;"></image> -->
 		data() {
 			return {
 				currTabIndex: 0,
-				type: 'vip',
+				type: '',
 
 				showLsPop: false,
 				showDgPop: false,
 				showVipPop: false,
+				showHyPop: false,
+
 
 				// inviteSuc: true
+
+				srcValue: 0,
+				range: [{
+						value: 0,
+						text: "来源1"
+					},
+					{
+						value: 1,
+						text: "来源2"
+					},
+					{
+						value: 2,
+						text: "来源3"
+					},
+				],
 			}
 		},
 		onLoad(o) {
 			this.type = o.type
+			// this.type = 'vip'
 		},
 		methods: {
-
+			change(e) {
+				console.log("e:", e);
+			},
 		}
 	}
 </script>

pages/my/otherInfo/index.vue

@@ -9,7 +9,7 @@
 							用户反馈
 						</view>
 						<view class="right">
-							<image src="/static/my/parr.png" mode="" style="width: 14rpx;height: 24rpx;"></image>
+							<image src="/static/my/arr_r.png" mode="" style="width: 14rpx;height: 24rpx;"></image>
 						</view>
 					</view>
 				</navigator>
@@ -19,7 +19,7 @@
 							使用指南
 						</view>
 						<view class="right">
-							<image src="/static/my/parr.png" mode="" style="width: 14rpx;height: 24rpx;"></image>
+							<image src="/static/my/arr_r.png" mode="" style="width: 14rpx;height: 24rpx;"></image>
 						</view>
 					</view>
 				</navigator>
@@ -29,7 +29,7 @@
 						用户协议
 					</view>
 					<view class="right">
-						<image src="/static/my/parr.png" mode="" style="width: 14rpx;height: 24rpx;"></image>
+						<image src="/static/my/arr_r.png" mode="" style="width: 14rpx;height: 24rpx;"></image>
 					</view>
 				</view>
 
@@ -38,7 +38,7 @@
 						隐私协议
 					</view>
 					<view class="right">
-						<image src="/static/my/parr.png" mode="" style="width: 14rpx;height: 24rpx;"></image>
+						<image src="/static/my/arr_r.png" mode="" style="width: 14rpx;height: 24rpx;"></image>
 					</view>
 				</view>
 			</view>

pages/my/sellAfter/index.vue

@@ -9,38 +9,35 @@
 							售后保障
 						</view>
 						<view class="right">
-							<image src="/static/my/parr.png" mode="" style="width: 14rpx;height: 24rpx;"></image>
+							<image src="/static/my/arr_r.png" mode="" style="width: 14rpx;height: 24rpx;"></image>
 						</view>
 					</view>
 				</navigator>
-				<view class="line">
+				<!-- <navigator url="/pages/my/changeNewGoods/index" style="border-bottom:2rpx solid #E6E6E6 ;"> -->
+				<view class="line" @click="toPage">
 					<view class="left">
-						服务流程
+						以旧换新
 					</view>
 					<view class="right">
-						<image src="/static/my/parr.png" mode="" style="width: 14rpx;height: 24rpx;"></image>
-					</view>
-				</view>
-				<view class="line">
-					<view class="left">
-						售后商品
-					</view>
-					<view class="right">
-						<image src="/static/my/parr.png" mode="" style="width: 14rpx;height: 24rpx;"></image>
+						<image src="/static/my/arr_r.png" mode="" style="width: 14rpx;height: 24rpx;"></image>
 					</view>
 				</view>
+				<!-- </navigator> -->
 				<navigator url="/pages/my/sellAfterCon/index">
 					<view class="line">
 						<view class="left">
 							售后联系
 						</view>
 						<view class="right">
-							<image src="/static/my/parr.png" mode="" style="width: 14rpx;height: 24rpx;"></image>
+							<image src="/static/my/arr_r.png" mode="" style="width: 14rpx;height: 24rpx;"></image>
 						</view>
 					</view>
 				</navigator>
 			</view>
 		</view>
+
+		<u-action-sheet :actions="list" :title="title" :show="showSheet" cancelText="取消" @close="showSheet=false"
+			@select="handleSel"></u-action-sheet>
 	</view>
 </template>
 
@@ -54,13 +51,37 @@
 				value: 0,
 				value1: 0,
 				value2: 0,
-
+				showSheet: false,
+				list: [{
+						name: '换新商品'
+					},
+					{
+						name: '换新流程'
+					},
+				],
 			}
 		},
 		onLoad(options) {},
 		methods: {
 			change() {
 
+			},
+			toPage() {
+				this.showSheet = true
+			},
+			handleSel(e) {
+				this.showSheet = false
+				if (e.name == "换新商品") {
+					uni.navigateTo({
+						url: '/pages/my/changeNewGoods/index'
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/my/changeNewStep/index'
+					})
+				}
+
+
 			}
 		}
 	}

pages/my/sellAfterCon/index.vue

@@ -2,13 +2,14 @@
 	<view class="page">
 		<navBar title="售后联系" :back="true" color="black" background="white" />
 		<view class="content">
-			<image src="/static/my/conBg.png" mode="" style="width: 100%;height: 384rpx;"></image>
+			<image :src="picUrl+'/static/my/conBg.png'" mode="" style="width: 100%;height: 384rpx;"></image>
 
 			<view class="box">
 				<view class="item">
 					<view class="part1">
 						<view class="left">
-							<image src="/static/my/dh.png" mode="" style="width: 26rpx;height: 26rpx;"></image>
+							<image :src="picUrl+'/static/my/phone.png'" mode="" style="width: 26rpx;height: 26rpx;">
+							</image>
 						</view>
 						<view class="cen">
 							<view class="water">
@@ -35,7 +36,8 @@
 				<view class="item">
 					<view class="part1">
 						<view class="left">
-							<image src="/static/my/wechat.png" mode="" style="width: 26rpx;height: 26rpx;"></image>
+							<image :src="picUrl+'/static/my/wechat.png'" mode="" style="width: 26rpx;height: 26rpx;">
+							</image>
 						</view>
 						<view class="cen">
 							<view class="water">
@@ -61,7 +63,8 @@
 				<view class="item" style="height: auto;padding-top: 34rpx;box-sizing: border-box;">
 					<view class="part1">
 						<view class="left">
-							<image src="/static/my/ewm.png" mode="" style="width: 26rpx;height: 26rpx;"></image>
+							<image :src="picUrl+'/static/my/code.png'" mode="" style="width: 26rpx;height: 26rpx;">
+							</image>
 						</view>
 						<view class="cen">
 							<view class="water">
@@ -74,7 +77,7 @@
 								<view class="top">
 									扫码了解
 								</view>
-								<image class="code" src="/static/my/code.png" mode=""
+								<image class="code" :src="picUrl+'/static/my/codePic.png'" mode=""
 									style="width: 250rpx;height: 250rpx;"></image>
 							</view>
 						</view>
@@ -92,7 +95,7 @@
 		},
 		data() {
 			return {
-
+				picUrl: this.$picUrl,
 			}
 		},
 		onLoad(options) {},

pages/my/set/index.vue

@@ -13,16 +13,16 @@
 							inactiveColor="#E6E6E6"></u-switch>
 					</view>
 				</view>
-				<view class="line">
+				<view class="line" v-if="role!='svip'">
 					<view class="left">
-						显示售价
+						显示会员价
 					</view>
 					<view class="right">
 						<u-switch v-model="value1" @change="change" activeColor="#F7790C"
 							inactiveColor="#E6E6E6"></u-switch>
 					</view>
 				</view>
-				<view class="line">
+				<view class="line" v-if="role!='cydg'">
 					<view class="left">
 						显示VIP价
 					</view>
@@ -43,13 +43,17 @@
 		},
 		data() {
 			return {
+				role: '',
+				role: '',
 				value: false,
 				value1: true,
 				value2: false,
 
 			}
 		},
-		onLoad(options) {},
+		onLoad(o) {
+			this.role = o.role
+		},
 		methods: {
 			change() {
 

pages/my/useLead/index.scss

@@ -1,3 +1,6 @@
+.page{
+	padding-bottom: 160rpx;
+}
 .content{
 	padding: 48rpx 32rpx  0 32rpx;
 	.title{
@@ -21,4 +24,33 @@
 		height: 686rpx;
 		border-radius: 0 40rpx 0 40rpx;
 	}
+}
+
+.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;
+
+	.rBtn{
+		width: 100%;
+		height: 96rpx;
+		background: #333333;
+		border-radius: 4rpx;
+		border: 2rpx solid #333333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #FFFFFF;
+	}
 }

pages/my/useLead/index.vue

@@ -11,6 +11,12 @@
 			</view>
 			<image src="/static/index/img1.png" mode=""></image>
 		</view>
+
+		<view class="btnBox">
+			<view class="rBtn">
+				一键分享
+			</view>
+		</view>
 	</view>
 </template>
 

pages/my/userInfo/index.scss

@@ -49,4 +49,6 @@
 			}
 		}
 	}
-}
+}
+
+

pages/my/userInfo/index.vue

@@ -9,53 +9,51 @@
 						头像
 					</view>
 					<view class="right">
-						<image :src="avatarUrl?avatarUrl:'/static/index/img1.png'" mode="" class="avatar"></image>
-						<image src="/static/my/parr.png" mode="" class="arr"></image>
+						<image :src="userInfo?userInfo.head:picUrl+'/static/other/defaultAvatar.png'" mode=""
+							class="avatar"></image>
+						<image src="/static/my/arr_r.png" mode="" class="arr"></image>
 					</view>
 				</view>
 				<view class="line">
 					<view class="left">
 						昵称
 					</view>
-					<view class="right">
-						<view class="">
-							王花花
-						</view>
-						<image src="/static/my/bj.png" mode="" class=""
+					<view class="right"
+						style="width: 80%;margin-left: 50rpx;display: flex;justify-content: space-between;">
+						<input ref='input' type="text" v-model="userInfo.nickname" placeholder="请输入昵称"
+							style="width: 90%;text-align: right;">
+						<image @click="updateNickName" :src="picUrl+'/static/my/bj.png'" mode="" class=""
 							style="width: 24rpx;height: 24rpx;margin-left: 8rpx;"></image>
 					</view>
 				</view>
-				<view class="line">
+				<view class="line" @click="showSex=true">
 					<view class="left">
 						性别
 					</view>
 					<view class="right">
 						<view class="" style="margin-right: 20rpx;">
-							男
+							{{userInfo.sex==0?'男':'女'}}
 						</view>
-						<image src="/static/my/parr.png" mode="" class="arr"></image>
+						<image src="/static/my/arr_r.png" mode="" class="arr"></image>
 					</view>
 				</view>
 			</view>
 
-
-
-
 			<view class="item" style="">
 				<view class="line">
 					<view class="left">
 						真实姓名
 					</view>
-					<view class="right">
-						刘花花
+					<view class="right" style="width: 70%;">
+						<input type="text" v-model="userInfo.name" style="width: 100%;text-align: right;">
 					</view>
 				</view>
-				<view class="line">
+				<view class="line" @click.stop="showDate=true">
 					<view class="left">
 						生日
 					</view>
 					<view class="right">
-						1930-03-29
+						{{userInfo.birthday}}
 					</view>
 				</view>
 				<view class="line">
@@ -63,27 +61,70 @@
 						手机号
 					</view>
 					<view class="right">
-						18298037860
+						{{userInfo.phone}}
 					</view>
 				</view>
 			</view>
 		</view>
+
+		<u-action-sheet :actions="list" :title="title" :show="showSex" cancelText="取消" @close="showSex=false"
+			@select="handleSelSex"></u-action-sheet>
+
+		<u-datetime-picker @confirm="confirmDate" :show="showDate" :minDate="new Date('1960-1-1').getTime()"
+			:maxDate="Date.now()" v-model="value1" mode="date" confirmColor="#E77817"></u-datetime-picker>
 	</view>
 </template>
 
 <script>
 	import uploadUrl from '@/common/config.js'
+
+	import {
+		getUserInfoReq,
+		updateUserInfoReq,
+	} from '@/api/test/index.js'
 	export default {
 		components: {
 
 		},
 		data() {
 			return {
-				avatarUrl: ''
+				showDate: false,
+				value1: Number(new Date()),
+
+				picUrl: this.$picUrl,
+				avatarUrl: '',
+				showSex: false,
+				nickName: '',
+				sex: '男',
+				list: [{
+						name: '男'
+					},
+					{
+						name: '女'
+					}
+				],
+
+				userInfo: uni.getStorageSync('userInfo')
 			}
 		},
 		onLoad(options) {},
 		methods: {
+			confirmDate(e) {
+				console.log(e);
+			},
+			updateNickName() {
+				// console.log(this.$refs);
+				// this.$refs.input.focus()
+			},
+			handleSelSex(e) {
+				if (e.name == '男') {
+					this.userInfo.sex = 0
+				} else {
+					this.userInfo.sex = 1
+				}
+				this.showSex = false
+			},
+
 			chooseAvatar() {
 				let _this = this
 				uni.chooseImage({
@@ -111,7 +152,7 @@
 					success: function(uploadRes) {
 						let result = JSON.parse(uploadRes.data)
 						if (result.code == 0) {
-							_this.avatarUrl = result.data.file
+							_this.userInfo.head = result.data.file
 							console.log('上传后的头像url地址', result.data.file)
 						}
 					},

pages/service.scss

@@ -0,0 +1,109 @@
+.list{
+	padding: 0rpx 32rpx 24rpx 32rpx;
+	display: flex;
+	flex-direction: column;
+	// background: ;
+	.item{
+		.topTitle{
+			font-size: 40rpx;
+			font-family: PingFang-SC-Bold, PingFang-SC;
+			font-weight: bold;
+			color: #333333;
+			margin-bottom: 32rpx;
+			margin-top: 70rpx;
+			position: relative;
+			text{
+				position: relative;
+				z-index: 1;
+			}
+			.water{
+				position: absolute;
+				left: 0;
+				top: -30rpx;
+				font-size: 52rpx;
+				font-family: PingFang-SC-Bold, PingFang-SC;
+				font-weight: bold;
+				color: #F0EFEF;
+				z-index: 0;
+			}
+		}
+		.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-size: 100% 100%;
+			background-size:cover;
+			display: flex;
+			flex-direction: column;
+			padding-left: 36rpx;
+			padding-right: 36rpx;
+			margin-bottom: 16rpx;
+			.label{
+				display: flex;
+				align-items: center;
+				margin-top: 48rpx;
+				position: relative;
+				.img{
+					width: 56rpx;
+					height: 28rpx;
+					position: absolute;
+					top: -12rpx;
+					left:  -10rpx;
+					
+				}
+				.item2{
+					font-size: 36rpx;
+					font-family: PingFang-SC-Bold, PingFang-SC;
+					font-weight: bold;
+					color: #FFFFFF;
+					margin-right: 16rpx;
+				}
+				.des{
+					font-size: 22rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #FFFFFF;
+					width: 60rpx;
+					height: 36rpx;
+					line-height: 36rpx;
+					background: linear-gradient(90deg, #FC8C1C 0%, #F7790C 100%);
+					border-radius: 2rpx;
+					display: flex;
+					justify-content: center;
+					// align-items: center;
+				}
+			}
+			.cen{
+				display: flex;
+				margin-top: 24rpx;
+				.item3{
+					min-width: 104rpx;
+					padding: 8rpx;
+					height: 36rpx;
+					background: #FFFFFF;
+					border-radius: 2rpx;
+					margin-right: 16rpx;
+					
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					font-size: 22rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #333333;
+					box-sizing: border-box;
+				}
+			}
+			.bot{
+				display: flex;
+				justify-content: flex-end;
+				margin-top: 70rpx;
+				.img2{
+					width: 48rpx;
+					height: 48rpx;
+				}
+			}
+		}
+	}
+	
+}

pages/service.vue

@@ -0,0 +1,70 @@
+<template>
+	<view class="container">
+		<navBar title="服务" :back="false" color="black" flex="cen" background="#fff" />
+
+		<view class="list">
+			<view class="item" v-for="i in 2">
+				<view class="topTitle">
+					<view class="water">
+						GIGESI
+					</view>
+					<text>智能设计</text>
+				</view>
+
+				<view class="con" @click="goDetail" v-for="i in 2">
+					<view class="label">
+						<image src="/static/index/part1_icon.png" mode="" class="img"></image>
+						<view class="item2">
+							智能设计
+						</view>
+						<view class="des">
+							详情
+						</view>
+					</view>
+					<view class="cen">
+						<view class="item3">
+							智能方案
+						</view>
+						<view class="item3">
+							设计优势
+						</view>
+						<view class="item3">
+							了解智能设计
+						</view>
+					</view>
+
+					<view class="bot">
+						<image class="img2" :src="picUrl+'/static/service/look.png'" mode=""
+							style="width: 48rpx;height: 48rpx;">
+						</image>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	// import navBar from '@/components/navBar/index.vue'
+	export default {
+		// components: {
+		// 	navBar
+		// },
+		data() {
+			return {
+				picUrl: this.$picUrl
+			}
+		},
+		methods: {
+			goDetail() {
+				uni.navigateTo({
+					url: '/pages/service/detail/index'
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./service.scss";
+</style>

pages/service/detail/index.scss

@@ -0,0 +1,53 @@
+.content{
+	padding: 48rpx 32rpx  0 32rpx;
+	.title{
+		font-size: 40rpx;
+		font-family: PingFang-SC-Bold, PingFang-SC;
+		font-weight: bold;
+		color: #333333;
+		margin-bottom: 50rpx;
+	}
+	.p{
+		font-size: 30rpx;
+		font-family: PingFang-SC-Bold, PingFang-SC;
+		// font-weight: bold;
+		color: #333333;
+		line-height: 50rpx;
+		text-indent: 2rem;
+		margin-bottom: 50rpx;
+	}
+	image{
+		width: 686rpx;
+		height: 686rpx;
+		border-radius: 0 40rpx 0 40rpx;
+	}
+}
+
+.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;
+
+	.rBtn{
+		width: 100%;
+		height: 96rpx;
+		background: #333333;
+		border-radius: 4rpx;
+		border: 2rpx solid #333333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+}

pages/service/detail/index.vue

@@ -0,0 +1,42 @@
+<template>
+	<view class="page">
+		<navBar title="服务" :back="true" color="black" background="white" />
+
+		<view class="content">
+			<view class="title">
+				灯光设计
+			</view>
+			<view class="p" v-for="i in 2">
+				1、灯具装上后要注意维护，不能连续即开即关。可以时长检查，灯具装上后要注意维护，不能连续即开即关。可以时长检查。
+			</view>
+			<image :src="picUrl + '/static/other/x1.png'" mode=""></image>
+		</view>
+
+		<view class="btnBox">
+			<view class="rBtn">
+				一键分享
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				picUrl: this.$picUrl,
+			}
+		},
+		onLoad(options) {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/service/index.scss

@@ -1,91 +0,0 @@
-.list{
-	padding: 24rpx 32rpx 24rpx 32rpx;
-	display: flex;
-	flex-direction: column;
-	// background: ;
-	.item{
-		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-size: 100% 100%;
-		background-size:cover;
-		display: flex;
-		flex-direction: column;
-		padding-left: 36rpx;
-		padding-right: 36rpx;
-		margin-bottom: 16rpx;
-		.label{
-			display: flex;
-			align-items: center;
-			margin-top: 48rpx;
-			position: relative;
-			.img{
-				width: 56rpx;
-				height: 28rpx;
-				position: absolute;
-				top: -12rpx;
-				left:  -10rpx;
-				
-			}
-			.item2{
-				font-size: 36rpx;
-				font-family: PingFang-SC-Bold, PingFang-SC;
-				font-weight: bold;
-				color: #FFFFFF;
-				margin-right: 16rpx;
-			}
-			.des{
-				font-size: 22rpx;
-				font-family: PingFang-SC-Medium, PingFang-SC;
-				font-weight: 500;
-				color: #FFFFFF;
-				width: 60rpx;
-				height: 36rpx;
-				line-height: 36rpx;
-				background: linear-gradient(90deg, #FC8C1C 0%, #F7790C 100%);
-				border-radius: 2rpx;
-				display: flex;
-				justify-content: center;
-				// align-items: center;
-			}
-		}
-		.cen{
-			display: flex;
-			margin-top: 24rpx;
-			.item3{
-				min-width: 104rpx;
-				padding: 8rpx;
-				height: 36rpx;
-				background: #FFFFFF;
-				border-radius: 2rpx;
-				margin-right: 16rpx;
-				
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				font-size: 22rpx;
-				font-family: PingFang-SC-Medium, PingFang-SC;
-				font-weight: 500;
-				color: #333333;
-				box-sizing: border-box;
-			}
-		}
-		.bot{
-			display: flex;
-			justify-content: flex-end;
-			margin-top: 70rpx;
-			.img2{
-				width: 48rpx;
-				height: 48rpx;
-				line-height: 48rpx;
-				border-radius: 38rpx;
-				border: 1rpx solid #FFFFFF;
-				color: #FFFFFF;
-				font-size: 26rpx;
-				display: flex;
-				justify-content: center;
-				// align-items: center;
-			}
-		}
-	}
-}

pages/service/index.vue

@@ -1,56 +0,0 @@
-<template>
-	<view class="container">
-		<navBar title="服务" :back="false" color="black" flex="cen" background="#fff" />
-
-		<view class="list">
-			<view class="item" v-for="i in 10">
-				<view class="label">
-					<image src="/static/index/part1_icon.png" mode="" class="img"></image>
-					<view class="item2">
-						智能设计
-					</view>
-					<view class="des">
-						详情
-					</view>
-				</view>
-				<view class="cen">
-					<view class="item3" v-for="i in 3">
-						智能方案
-					</view>
-				</view>
-				<!-- <image class="img2" src="/static/index/more.png" mode="" style="width: 48rpx;height: 48rpx;"></image>
-				 -->
-				<view class="bot">
-					<view class="img2">
-						>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	// import navBar from '@/components/navBar/index.vue'
-	export default {
-		// components: {
-		// 	navBar
-		// },
-		data() {
-			return {
-
-			}
-		},
-		methods: {
-			goDt() {
-				uni.navigateTo({
-					url: '/pages/map/index'
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "./index.scss";
-</style>