9.27

App.vue

@@ -37,6 +37,17 @@
 				}
 			})
 
+			// uni.request({
+			// 	url: uploadUrl.baseUrl + '/api/common/getBannerData',
+			// 	method: "GET",
+			// 	success: (res) => {
+			// 		if (res.data.code == 0) {
+			// 			console.log('app.vue中获取的项目静态图片配置数据', res.data.data)
+			// 			uni.setStorageSync('staticImgConf', res.data.data)
+			// 		}
+			// 	}
+			// })
+
 		},
 		async onShow() {},
 		onHide: function() {

api/test/index.js

@@ -5,9 +5,13 @@ const {
 
 
 //用户相关
-
 export const getAfterSaleCon = (params, config = {}) => http.post('/api/users/bindingAfterSale', params, config)
 
+// 请求首页顶部轮播
+export const getIndexTopPics = (params, config = {}) => http.post('/api/users/bindingAfterSale', params, config)
+
+
+
 // 微信授权登陆
 export const wxAuthLoginReq = (params, config = {}) => http.post('/api/auth/mnplogin', params, config)
 

common/config.js

@@ -2,14 +2,20 @@ let configUrl = {}
 if (process.env.NODE_ENV === 'development') {
 	configUrl = {
 		baseUrl: 'https://t23.9026.com',
-		picUrl: 'http://www.liwantao.top',
-		picBase: 'https://t23.9026.com/uploads/'
+		picUrl: 'https://t23.9026.com',
+		picBase: 'https://t23.9026.com/uploads/',
+
+		appId: 'wx98ab2939999e13de',
+		shareModel: 2
 	}
 } else {
 	configUrl = {
 		baseUrl: 'https://t23.9026.com',
-		picUrl: 'http://www.liwantao.top',
-		picBase: 'https://t23.9026.com/uploads/'
+		picUrl: 'https://t23.9026.com',
+		picBase: 'https://t23.9026.com/uploads/',
+
+		appId: 'wx98ab2939999e13de',
+		shareModel: 2
 	}
 }
 

main.js

@@ -3,9 +3,6 @@ import Vue from 'vue'
 import App from './App'
 import navBar from '@/components/navBar/index.vue'
 
-// import shareAppMessage from './core/shareAppMessage.js';
-
-// Vue.prototype.$shareAppMessage = shareAppMessage; //分享
 Vue.component('navBar', navBar)
 
 import popup from '@/components/popup/index.vue'
@@ -18,13 +15,17 @@ Vue.use(uView)
 
 import store from 'store/index.js'
 Vue.prototype.$store = store
-Vue.prototype.$appId = 'wx98ab2939999e13de'
-Vue.prototype.$shareType = 2
 
+
+
+// console.log('uploadUrl----', uploadUrl);
 import uploadUrl from '@/common/config.js'
 Vue.prototype.$picUrl = uploadUrl.picUrl
 Vue.prototype.$picBase = uploadUrl.picBase
 
+Vue.prototype.$appId = uploadUrl.appId
+Vue.prototype.$shareType = uploadUrl.shareModel
+
 Vue.prototype.$getCutDown = () => {
 	if (uni.getStorageSync('switchs')[0]) {
 		return 1

pages.json

@@ -147,6 +147,13 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": false
 					}
+				},
+				{
+					"path": "addrList/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
 				}
 			]
 		},

pages/index.scss

@@ -1,5 +1,4 @@
-// .swiper{
-// 	}
+
 // 自定义指示器样式
 
 ::v-deep .u-swiper{

pages/index.vue

@@ -1,19 +1,31 @@
 <template>
 	<view class="container" :style="{background:`url(${picUrl+'/static/other/indexB.png'}) no-repeat;`}">
-		<!-- <view class="container"> -->
 		<navBar title="GIGESI 吉格斯" :navImg="navImg" :back="false" color="#333333" background="#FFFFFF" />
 
 		<!-- 轮播和订购区 -->
 		<view class="swiperAndBook">
 			<view class="tab">
 				<view class="item" v-for="(item,index) in tabList" :class="[currTabIndex==index?'itemA':'']"
-					@click="currTabIndex=index">
+					@click="tabChange(item,index)">
 					{{item}}
 				</view>
 			</view>
 			<view class="bottomBtn">
-				<u-swiper type='img' class="swiper" :list="bannerList" keyName="cover" indicator indicatorMode="line"
-					:autoplay="true" height="996rpx" imgMode="widthFix" circular @change="e => currentNum = e.current">
+				<u-swiper v-if="currTabIndex==0" type='img' class="swiper" :list="bannerList11" keyName="cover"
+					indicator indicatorMode="line" :autoplay="false" height="996rpx" imgMode="widthFix" circular
+					@change="e => currentNum = e.current">
+					<view slot="indicator">
+					</view>
+				</u-swiper>
+				<u-swiper v-if="currTabIndex==1" type='img' class="swiper" :list="bannerList22" keyName="cover"
+					indicator indicatorMode="line" :autoplay="false" height="996rpx" imgMode="widthFix" circular
+					@change="e => currentNum = e.current">
+					<view slot="indicator">
+					</view>
+				</u-swiper>
+				<u-swiper v-if="currTabIndex==2" type='img' class="swiper" :list="bannerList33" keyName="cover"
+					indicator indicatorMode="line" :autoplay="false" height="996rpx" imgMode="widthFix" circular
+					@change="e => currentNum = e.current">
 					<view slot="indicator">
 					</view>
 				</u-swiper>
@@ -26,8 +38,8 @@
 					</view>
 					<view class="indicatorBox">
 						<view class="indicator">
-							<view class="indicator__dot" style="" v-for="(item, index) in bannerList" :key="index"
-								:class="[index === currentNum ?'indicator__dot--active':'']">
+							<view class="indicator__dot" style="" v-for="(item, index) in tabList" :key="index"
+								:class="[index === currTabIndex ?'indicator__dot--active':'']">
 							</view>
 						</view>
 					</view>
@@ -47,7 +59,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="picBase+bannerList44[0].cover" mode=""></image>
 				</view>
 			</view>
 
@@ -63,7 +75,7 @@
 					<image src="/static/index/more.png" mode="" style="width: 48rpx;height: 48rpx;"></image>
 				</view>
 				<view class="con">
-					<image :src="picUrl+'/static/other/index_img2.png'" mode=""></image>
+					<image :src="picBase+bannerList55[0].cover" mode=""></image>
 				</view>
 			</view>
 
@@ -97,7 +109,7 @@
 
 			<!-- 展厅地址 -->
 			<view class="productLead" style="padding-left: 0;">
-				<view class="top" style="padding-left: 32rpx;">
+				<view class="top" style="padding-left: 32rpx;" @click="toAddrList">
 					<view class="left">
 						<view class="bottomEng">
 							ADDRESS
@@ -147,21 +159,32 @@
 	} from '@/api/index/index.js'
 	import {
 		getPricePercentReq,
-		getAfterSaleCon
+		getAfterSaleCon,
+		getIndexTopPics,
+		addInviteReq
 	} from '@/api/test/index.js'
 	export default {
 		data() {
 			return {
+				// staticImgConf: uni.getStorageSync('staticImgConf'),
+				staticImgConf: null,
+
 				picUrl: this.$picUrl,
 				picBase: this.$picBase,
 				leadList: [],
-				bannerList: [],
+
+				bannerList11: [],
+				bannerList22: [],
+				bannerList33: [],
+				bannerList44: [],
+				bannerList55: [],
+
+
 				bannerList1: [],
 				currentNum: 0,
 				currentNum1: 0,
 
 				tabList: ['无主灯', '主灯', '吸顶灯'],
-				// tabList: ['无主灯', '主灯'],
 				currTabIndex: 0,
 
 				navImg: require('@/static/index/logo.png'),
@@ -172,6 +195,8 @@
 		},
 		async onLoad(o) {
 			// o.inviteId = ''
+
+			console.log('首页静态资源配置数据', this.staticImgConf);
 			if (o.inviteId) {
 				uni.setStorageSync('inviteId', o.inviteId)
 				console.log('接收到的o.inviteId', o.inviteId);
@@ -192,15 +217,53 @@
 					this.$toast(res88.message)
 				}
 			}
+			if (uni.getStorageSync('token') && o.inviteId) {
+				let res99 = await addInviteReq({
+					// id: o.inviteId
+					inviteId: o.inviteId
+				})
+				if (res99.code == 0) {
+					console.log('测试邀请登录态-----o.inviteId:', res99);
+				} else {
+					this.$toast(res99.message)
+				}
+			}
 			console.log('首页收到的o:', JSON.stringify(o));
-			let res = await getBannerDataReq()
-			if (res.code == 0) {
-				this.bannerList = res.data
-				console.log('顶部轮播图数据', this.bannerList);
+
+			let res55 = await getBannerDataReq()
+			if (res55.code == 0) {
+				console.log('首页全局配置数据:', res55);
+
+				this.bannerList11 = [res55.data.find((item, index) => {
+					return item.title == '无主灯'
+				})]
+				this.bannerList22 = [res55.data.find((item, index) => {
+					return item.title == '主灯'
+				})]
+				this.bannerList33 = [res55.data.find((item, index) => {
+					return item.title == '吸顶灯'
+				})]
+
+				this.bannerList44 = [res55.data.find((item, index) => {
+					return item.title == '智能控制系统'
+				})]
+				this.bannerList55 = [res55.data.find((item, index) => {
+					return item.title == '网络规划-全屋WiFi'
+				})]
+				console.log('全局静态资源数据', this.bannerList11, this.bannerList22, this.bannerList33, this
+					.bannerList44, this.bannerList55);
 			} else {
-				this.$toast(res.message)
+				this.$toast(res55.message)
 			}
 
+			// let res = await getBannerDataReq()
+			// if (res.code == 0) {
+			// 	this.bannerList = res.data
+			// 	console.log('顶部轮播图数据', this.bannerList);
+			// } else {
+			// 	this.$toast(res.message)
+			// }
+
 			let res1 = await getAddressDataReq()
 			if (res1.code == 0) {
 				this.bannerList1 = res1.data
@@ -220,20 +283,30 @@
 					icon: 'none'
 				})
 			}
-
-			// let res3 = await getPricePercentReq()
-			// if (res3.code == 0) {
-			// 	this.priceConfig = res3.data
-			// 	uni.setStorageSync('priceConfig', this.priceConfig)
-			// 	console.log('获取的价格百分比', this.priceConfig);
-			// } else {
-			// 	uni.showToast({
-			// 		title: res3.message,
-			// 		icon: 'none'
-			// 	})
-			// }
 		},
 		methods: {
+			tabChange(item, index) {
+				this.currTabIndex = index
+				// if (index == 0) {
+				// 	this.bannerList = [this.staticImgConf.find((item, index) => {
+				// 		return item.title == '无主灯'
+				// 	})]
+				// } else if (index == 1) {
+				// 	this.bannerList = [this.staticImgConf.find((item, index) => {
+				// 		return item.title == '主灯'
+				// 	})]
+				// } else {
+				// 	this.bannerList = [this.staticImgConf.find((item, index) => {
+				// 		return item.title == '吸顶灯'
+				// 	})]
+				// }
+				// console.log('当前tab图', this.bannerList);
+			},
+			toAddrList() {
+				uni.navigateTo({
+					url: '/pages/index/addrList/index'
+				})
+			},
 			toLeadDetail(item) {
 				getApp().Litem = item
 				uni.navigateTo({
@@ -242,14 +315,18 @@
 			},
 			toList() {
 				if (this.currTabIndex == 0) {
+					getApp().noMainImg = this.bannerList11[0]
 					uni.navigateTo({
 						url: '/pages/index/customNoMian_step1/index'
 					})
+
 				} else if (this.currTabIndex == 1) {
+					getApp().noMainImg = this.bannerList22[0]
 					uni.navigateTo({
 						url: '/pages/index/customMian_step1/index'
 					})
 				} else {
+					getApp().noMainImg = this.bannerList33[0]
 					uni.navigateTo({
 						url: '/pages/index/customMian_step1/index?type=5'
 					})
@@ -257,10 +334,12 @@
 			},
 			toPage(i) {
 				if (i == 2) {
+					getApp().noMainImg = this.bannerList55[0]
 					uni.navigateTo({
 						url: '/pages/index/fullHouseWifi/index'
 					})
 				} else if (i == 1) {
+					getApp().noMainImg = this.bannerList44[0]
 					uni.navigateTo({
 						url: '/pages/index/aiControlSys/index'
 					})

pages/index/addrList/index.scss

@@ -0,0 +1,97 @@
+.page{
+	background: #fff;
+	min-height: 100vh;
+	padding-bottom: 32rpx;
+}
+.content{
+	padding: 32rpx;
+	// padding-top: 32rpx;
+	box-sizing: border-box;
+	.cartDef{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		background:#fdf2e9;
+		margin-bottom: 32rpx;
+		border-radius: 24rpx;
+		box-sizing: border-box;
+		padding-bottom: 64rpx;
+		.companyName{
+			box-sizing: border-box;
+			font-size: 32rpx;
+			font-family: PingFang-SC-Bold, PingFang-SC;
+			font-weight: bold;
+			color: #333333;
+			margin-top: 22rpx;
+		}
+		.connect{
+			box-sizing: border-box;
+			
+			display: flex;
+			align-items: center;
+			flex-direction: row;
+			margin-top: 32rpx;
+			.txt{
+				font-size: 28rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #666666;
+				display: inline-block;
+				margin-left: 8rpx;
+			}
+		}
+		
+		.connectDes{
+			box-sizing: border-box;
+			display: flex;
+			align-items: center;
+			flex-direction: row;
+			margin-top: 12rpx;
+			.num{
+				font-size: 28rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+				margin-right: 24rpx;
+			}
+			.callBtn{
+				font-size: 28rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #E77817;
+			}
+		}
+		
+		.addr{
+			display: flex;
+			align-items: center;
+			flex-direction: row;
+			margin-top: 32rpx;
+			.txt{
+				font-size: 28rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #666666;
+				margin-left: 8rpx;
+				
+			}
+		}
+		
+		.addrInfo{
+			display: flex;
+			align-items: center;
+			flex-direction: row;
+			justify-content: center;
+			padding-top: 12rpx;
+			.txt{
+				font-size: 28rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+				margin-right: 16rpx;
+				
+				max-width: 500rpx;
+			}
+		}
+	}
+}

pages/index/addrList/index.vue

@@ -0,0 +1,107 @@
+<template>
+	<view class="page">
+		<navBar title="城市展厅" :back="true" color="black" background="white" />
+
+		<view class="content">
+			<view class="cartDef" style="" v-for="(item,index) in bannerList1">
+				<!-- background:' url('+picBase+item.cover+') no-repeat;' -->
+				<image :src="picBase+item.logo" mode=""
+					style="width: 104rpx;height: 104rpx;margin-top: 64rpx;border-radius: 50%;">
+				</image>
+				<view class="companyName">
+					吉格斯
+				</view>
+				<view class="connect">
+					<image src="@/static/index/dianhua.png" mode=""
+						style="width: 30rpx;height: 30rpx;display: inline-block;"></image>
+					<view class="txt">
+						联系电话
+					</view>
+				</view>
+
+				<view class="connectDes">
+					<view class="num">
+						{{item.phone}}
+					</view>
+					<view class="callBtn" @click="call(item.phone)">
+						拨号
+					</view>
+				</view>
+
+				<view class="addr">
+					<image src="@/static/index/weizhi.png" mode=""
+						style="width: 24rpx;height: 32rpx;display: inline-block;"></image>
+					<view class="txt">
+						{{item.company}}
+					</view>
+				</view>
+
+				<view class="addrInfo">
+					<view class="txt">
+						{{item.address}}
+					</view>
+					<image @click="daohang(item)" src="@/static/index/daohang.png" mode=""
+						style="width: 36rpx;height: 36rpx;display: inline-block;"></image>
+				</view>
+
+			</view>
+		</view>
+		<u-loadmore style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+	</view>
+</template>
+
+<script>
+	import {
+		getAddressDataReq,
+	} from '@/api/index/index.js'
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				picUrl: this.$picUrl,
+				picBase: this.$picBase,
+				bannerList1: []
+			}
+		},
+		async onLoad(options) {
+			let res1 = await getAddressDataReq()
+			if (res1.code == 0) {
+				this.bannerList1 = res1.data
+				console.log('地址轮播图数据-列表页', this.bannerList1);
+			} else {
+				this.$toast(res1.message)
+			}
+
+		},
+		methods: {
+			call(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+			daohang(item) {
+				console.log('item', item, {
+					name: item.company,
+					address: item.address,
+					latitude: item.latitude,
+					longitude: item.longitude,
+				});
+				uni.openLocation({
+					name: item.company,
+					address: item.address,
+					latitude: Number(item.latitude),
+					longitude: Number(item.longitude),
+					success: function() {
+						console.log('success');
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/index/aiControlSys/index.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<navBar title="智能控制系统" :back="true" color="black" background="white" />
 
-		<image :src="picUrl + '/static/other/c1.png'" mode="" class="topBg"></image>
+		<image :src="picBase+topPic" mode="" class="topBg"></image>
 
 		<view class="content">
 			<view class="topBox">
@@ -135,7 +135,7 @@
 		<view class="bot">
 			<view class="left" @click="showConfig=true">
 				<view class="price">
-					￥{{totalPrice.toFixed(2)}}
+					￥{{totalPrice.toFixed(0)}}
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
@@ -293,10 +293,14 @@
 				selCl: null,
 				selKt: null,
 				pConfig: -1,
-				cutdownRatio: 1
+				cutdownRatio: 1,
+
+				topPic: ''
 			}
 		},
 		async onLoad(options) {
+			this.topPic = getApp().noMainImg.head_image
+			console.log('3this.topPic', this.topPic);
 			let res = await getIndexConfigReq({
 				type: 3
 			})

pages/index/aiControlSys_step2/index.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<navBar :backType="navBarTitle" :title="navBarTitle?navBarTitle:'智能控制系统'" :back="true" color="black"
 			background="white" />
-		<image class="topImg" :src="picUrl + '/static/other/c2.png'" mode=""></image>
+		<image class="topImg" :src="picBase + topPic" mode=""></image>
 
 		<view class="cen">
 			<image class="water" src="/static/index/water.png" mode=""></image>
@@ -110,7 +110,7 @@
 			<!-- <view class="left" @click="showPreviewConfig=true"> -->
 			<view class="left" @click="">
 				<view class="price">
-					￥{{totalPrice.toFixed(2)}}
+					￥{{totalPrice.toFixed(0)}}
 				</view>
 				<image v-if="!showPreviewConfig" src="/static/index/arrDown.png" mode=""
 					@click="showPreviewConfig=true"></image>
@@ -185,6 +185,9 @@
 
 		getOrderDetailReq
 	} from '@/api/test/index.js'
+	import {
+		getBannerDataReq,
+	} from '@/api/index/index.js'
 	export default {
 		components: {
 
@@ -192,6 +195,8 @@
 		data() {
 			return {
 				picUrl: this.$picUrl,
+				picBase: this.$picBase,
+				topPic: '',
 
 				showFixInfo: false,
 
@@ -220,6 +225,17 @@
 			}
 		},
 		async onLoad(o) {
+			let res11 = await getBannerDataReq()
+			if (res11.code == 0) {
+				console.log('1-----图片配置数据', res11);
+
+				this.topPic = res11.data.find((item, index) => {
+					return item.title == '智能控制系统'
+				}).head_image
+			} else {
+				this.$toast(res11.message)
+			}
+
 			// o.orderId = '43c43ced14b312fb69d80cedbd7b23f4'
 			if (o.orderId) {
 				this.orderId = o.orderId
@@ -235,11 +251,11 @@
 					this.shareCon = res.data
 
 					this.selHx = res.data.config.house_type_data
-					this.selPp = res.data.config.brand
-					this.selSuo = res.data.config.mind_lock
-					this.selMb = res.data.config.mind_switch
-					this.selCl = res.data.config.mind_curtain
-					this.selKt = res.data.config.mind_air_conditioner
+					this.selPp = res.data.config.brand_data
+					this.selSuo = res.data.config.mind_lock_data
+					this.selMb = res.data.config.mind_switch_data
+					this.selCl = res.data.config.mind_curtain_data
+					this.selKt = res.data.config.mind_air_conditioner_data
 				} else {
 					uni.showToast({
 						title: res.message,

pages/index/customMian/index.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<navBar :backType="navBarTitle" :title="navBarTitle?navBarTitle:dType?'定制我家的吸顶灯':'定制我家的主灯'" :back="true"
 			color="black" background="white" />
-		<image class="topImg" :src="picUrl+'/static/other/noMain_img3.png'" mode=""></image>
+		<image class="topImg" :src="picBase + topPic" mode=""></image>
 
 		<view class="cen">
 			<image class="water" src="/static/index/water.png" mode=""></image>
@@ -47,7 +47,7 @@
 						<view class="item" v-for="(item,index) in mainPreviewInfo.kt">
 							<image :src="picBase+item.image[0]" mode=""></image>
 							<view class="name">
-								{{item.model_number}}
+								{{item.name}}
 							</view>
 						</view>
 					</view>
@@ -66,7 +66,7 @@
 						<view class="item" v-for="(item,index) in mainPreviewInfo.ct">
 							<image :src="picBase+item.image[0]" mode=""></image>
 							<view class="name">
-								{{item.model_number}}
+								{{item.name}}
 							</view>
 						</view>
 					</view>
@@ -85,7 +85,7 @@
 						<view class="item" v-for="(item,index) in mainPreviewInfo.ws">
 							<image :src="picBase+item.image[0]" mode=""></image>
 							<view class="name">
-								{{item.model_number}}
+								{{item.name}}
 							</view>
 						</view>
 					</view>
@@ -104,7 +104,7 @@
 						<view class="item" v-for="(item,index) in mainPreviewInfo.yt">
 							<image :src="picBase+item.image[0]" mode=""></image>
 							<view class="name">
-								{{item.model_number}}
+								{{item.name}}
 							</view>
 						</view>
 					</view>
@@ -154,7 +154,7 @@
 		<view class="bot" v-if="!navBarTitle">
 			<view class="left">
 				<view class="price">
-					￥{{mainPreviewInfo.price?mainPreviewInfo.price.toFixed(2):'0.00'}}
+					￥{{mainPreviewInfo.price?mainPreviewInfo.price.toFixed(0):'0'}}
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
@@ -229,10 +229,14 @@
 		getOrderDetailReq,
 		getWxQrCodeReq
 	} from '@/api/test/index.js'
+	import {
+		getBannerDataReq,
+	} from '@/api/index/index.js'
 	export default {
 		components: {},
 		data() {
 			return {
+				topPic: '',
 				showShare: false,
 				linkPic: '',
 
@@ -260,6 +264,18 @@
 			}
 		},
 		async onLoad(o) {
+			let res11 = await getBannerDataReq()
+			if (res11.code == 0) {
+				console.log('2-----图片配置数据', res11);
+
+				this.topPic = res11.data.find((item, index) => {
+					return item.title == '主灯'
+				}).head_image
+				console.log('2-----图片配置数据this.topPic', this.topPic);
+			} else {
+				this.$toast(res11.message)
+			}
+
 			// o.orderId = '5c3455b568c5409270e0d99cbb6057e6'
 			// if (getApp().dType) {
 			// 	this.dType = getApp().dType

pages/index/customMian_step1/index.scss

@@ -12,7 +12,7 @@
 }
 .content{
 	// height: calc(100vh - 800rpx - 160rpx - 20rpx);
-	padding: 0 36rpx;
+	// padding: 0 36rpx;
 	
 	.topBox{
 		width: 678rpx;
@@ -24,6 +24,7 @@
 		margin-left: 50%;
 		transform: translateX(-50%);
 		
+		
 		z-index: 1;
 		position: relative;
 		display: flex;
@@ -88,11 +89,15 @@
 		font-family: PingFang-SC-Bold, PingFang-SC;
 		font-weight: bold;
 		color: #333333;
-		margin-top: 44rpx;
 		
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
+		
+		padding-top: 44rpx;
+		padding-bottom: 32rpx;
+		padding-left: 36rpx;
+		padding-right: 36rpx;
 		.txt{
 			
 		}
@@ -101,11 +106,12 @@
 	.parms{
 		display: flex;
 		flex-wrap: wrap;
-		padding-top: 32rpx;
+		padding-top: 0rpx;
 		
 		border-bottom: 1rpx solid #EAEAEA;
 		padding-bottom: 46rpx;
 		position: relative;
+		padding: 0 36rpx;
 		
 		
 		.item{
@@ -339,6 +345,9 @@
 			flex-wrap: wrap;
 			border-bottom: 2rpx solid #EAEAEA;
 			padding-bottom: 46rpx;
+			
+			padding-left: 36rpx;
+			padding-right: 36rpx;
 			.item3{
 				width: 152rpx;
 				height: 152rpx;

pages/index/customMian_step1/index.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<navBar :title="type ? '定制我家的吸顶灯' : '定制我家的主灯'" :back="true" color="black" background="white" />
 
-		<image :src="picUrl+'/static/other/noMain_img3.png'" mode="" class="topBg"></image>
+		<image :src="picBase+topPic" mode="" class="topBg"></image>
 
 		<view class="content">
 			<view class="topBox">
@@ -56,6 +56,7 @@
 			</view>
 
 			<view class="label" style="margin-bottom:32rpx;" @click="toSel('挑选客厅灯',1)">
+				<!-- <view class="label" style="margin-bottom:32rpx;" @click="toKtDetail('挑选客厅灯',1)"> -->
 				<view class="txt">
 					挑选客厅灯
 				</view>
@@ -64,7 +65,10 @@
 			</view>
 
 			<view class="parms3">
-				<image @click="handleSel('kt',item,index)" class="item3 " :src="picBase+item.cover"
+				<!-- <image @click="handleSel('kt',item,index)" class="item3 " :src="picBase+item.cover"
+					:class="[selKt.includes(item)?'act3':'']" v-for="(item,index) in brandTypeList"> -->
+
+				<image @click="goDetail(item,index,'挑选客厅灯')" class="item3 " :src="picBase+item.cover"
 					:class="[selKt.includes(item)?'act3':'']" v-for="(item,index) in brandTypeList">
 
 				</image>
@@ -79,9 +83,11 @@
 			</view>
 
 			<view class="parms3">
-				<image @click="handleSel('ct',item,index)" class="item3 " :src="picBase+item.cover"
+				<!-- <image @click="handleSel('ct',item,index)" class="item3 " :src="picBase+item.cover"
+					:class="[selCt.includes(item)?'act3':'']" v-for="(item,index) in lockTypeList">
+				</image> -->
+				<image @click="goDetail(item,index,'挑选餐厅灯')" class="item3 " :src="picBase+item.cover"
 					:class="[selCt.includes(item)?'act3':'']" v-for="(item,index) in lockTypeList">
-
 				</image>
 			</view>
 
@@ -94,9 +100,11 @@
 			</view>
 
 			<view class="parms3">
-				<image @click="handleSel('ws',item,index)" class="item3 " :src="picBase+item.cover"
+				<!-- <image @click="handleSel('ws',item,index)" class="item3 " :src="picBase+item.cover"
+					:class="[selWs.includes(item)?'act3':'']" v-for="(item,index) in chuanglianTypeList">
+				</image> -->
+				<image @click="goDetail(item,index,'挑选卧室灯')" class="item3 " :src="picBase+item.cover"
 					:class="[selWs.includes(item)?'act3':'']" v-for="(item,index) in chuanglianTypeList">
-
 				</image>
 			</view>
 
@@ -109,26 +117,22 @@
 			</view>
 
 			<view class="parms3">
-				<image @click="handleSel('yt',item,index)" class="item3 " :src="picBase+item.cover"
+				<!-- <image @click="handleSel('yt',item,index)" class="item3 " :src="picBase+item.cover"
 					:class="[selYt.includes(item)?'act3':'']" v-for="(item,index) in pannelTypeList">
+				</image> -->
 
+				<image @click="goDetail(item,index,'挑选阳台灯')" class="item3 " :src="picBase+item.cover"
+					:class="[selYt.includes(item)?'act3':'']" v-for="(item,index) in pannelTypeList">
 				</image>
 			</view>
 
 
 
 		</view>
-		<!-- 
-		<view class="rule" @click="goRule">
-			<image src="/static/index/ruleImg.png" mode=""></image>
-			<view class="txt">
-				挑选规则
-			</view>
-		</view> -->
 		<view class="bot">
 			<view class="left" @click="showConfig=true">
 				<view class="price">
-					￥{{totalPrice.toFixed(2)}}
+					￥{{totalPrice.toFixed(0)}}
 				</view>
 				<!-- <image src="/static/index/arrDown.png" mode=""></image> -->
 				<image v-if="!showConfig" src="/static/index/arrDown.png" mode="" @click="showConfig=true"></image>
@@ -313,11 +317,13 @@
 				cutdownRatio: 1,
 
 				type: 0,
-				tipTxt: ''
+				tipTxt: '',
+				topPic: ''
 			}
 		},
 		async onLoad(o) {
-
+			this.topPic = getApp().noMainImg.head_image
+			console.log('2this.topPic', this.topPic);
 			if (o.type) {
 				this.type = o.type
 			}
@@ -377,13 +383,50 @@
 				} else {
 					type = 'yt'
 				}
-				this.handleSel(type, item, index, 2)
 				getApp().chooseItem_kt = null
 				getApp().index_kt = null
 				getApp().chooseType = null
+				this.handleSel(type, item, index, 2)
 			}
 		},
 		methods: {
+			goDetail(item, index, name) {
+				if (this.houseTypeList.length == 0 || this.serTypeList.length == 0) {
+					this.showMissItem = true
+					this.tipTxt = '抱歉！参数配置缺失，暂无法预览配置'
+					return
+				}
+
+				if (!this.selHx) {
+					return this.$toast('请选择户型')
+				}
+				if (!this.selXl) {
+					return this.$toast('请选择系列')
+				}
+
+				if (name == '挑选卧室灯') {
+					if (this.selHx.value == '一室两厅' && this.selWs.length == 1) {
+						this.showHuxing = true
+						return
+					} else if (this.selHx.value == '两室两厅' && this.selWs.length == 2) {
+						this.showHuxing = true
+						return
+					} else if (this.selHx.value == '三室两厅' && this.selWs.length == 3) {
+						this.showHuxing = true
+						return
+					}
+				}
+
+				getApp().ktItem = item
+				getApp().ktIndex = index
+				getApp().ktName = name
+
+				// getApp().mianFromType = 'pic'
+				uni.navigateTo({
+					url: '/pages/index/mainDetail/index?mianFromType=1'
+				})
+			},
+
 			async getPrice(parmas) {
 				let res = await getDataMoneyReq(parmas)
 				if (res.code == 0) {
@@ -406,6 +449,31 @@
 				})
 			},
 			toSel(name, type) {
+				console.log('name, type', name, type);
+				if (this.houseTypeList.length == 0 || this.serTypeList.length == 0) {
+					this.showMissItem = true
+					this.tipTxt = '抱歉！参数配置缺失，暂无法预览配置'
+					return
+				}
+				if (!this.selHx) {
+					return this.$toast('请选择户型')
+				}
+				if (!this.selXl) {
+					return this.$toast('请选择系列')
+				}
+				if (type == 3) {
+					if (this.selHx.value == '一室两厅' && this.selWs.length == 1) {
+						this.showHuxing = true
+						return
+					} else if (this.selHx.value == '两室两厅' && this.selWs.length == 2) {
+						this.showHuxing = true
+						return
+					} else if (this.selHx.value == '三室两厅' && this.selWs.length == 3) {
+						this.showHuxing = true
+						return
+					}
+				}
+
 				if (type == 1) {
 					getApp().typeList = this.brandTypeList
 				} else if (type == 2) {
@@ -499,6 +567,8 @@
 				}
 			},
 			handleSel(type, item, index, mode = 1) {
+				// 卧室灯数量校验
+
 				if (type == 'kt') {
 					// 只能单选
 					this.selKt = [item]

pages/index/customNoMian_step1/index.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<navBar title="定制我家的无主灯" :back="true" color="black" background="white" />
 
-		<image :src="picUrl+'/static/other/noMain_img4.png'" mode="" class="topBg"></image>
+		<image :src="picBase+topPic" mode="" class="topBg"></image>
 
 		<view class="content">
 			<view class="topBox">
@@ -120,16 +120,10 @@
 
 		</view>
 
-		<!-- <view class="rule" @click="goRule">
-			<image src="/static/index/ruleImg.png" mode=""></image>
-			<view class="txt">
-				挑选规则
-			</view>
-		</view> -->
 		<view class="bot">
 			<view class="left" @click="showConfig=true">
-				<view class="price" style="min-width: 200rpx;">
-					￥{{totalPrice.toFixed(2)}}
+				<view class="price" style="min-width: 0rpx;">
+					￥{{totalPrice.toFixed(0)}}
 				</view>
 				<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>
@@ -210,10 +204,11 @@
 <script>
 	import {
 		getIndexConfigReq,
-		getHomeDataNextReq
+		getHomeDataNextReq,
+
 	} from '@/api/test/index.js'
 	import {
-		getDataMoneyReq
+		getDataMoneyReq,
 	} from '@/api/index/index.js'
 	export default {
 		components: {
@@ -222,6 +217,7 @@
 		data() {
 			return {
 				picUrl: this.$picUrl,
+				picBase: this.$picBase,
 				addOrLessIcon1: '/static/index/shortLine.png',
 				addOrLessIcon2: '/static/index/shortLine.png',
 				addOrLessIcon3: '/static/index/shortLine.png',
@@ -283,10 +279,15 @@
 				totalPrice: 0,
 
 				pConfig: -1,
-				cutdownRatio: 1
+				cutdownRatio: 1,
+
+				topPic: ''
 			}
 		},
 		async onLoad(o) {
+			this.topPic = getApp().noMainImg.head_image
+			console.log('1this.topPic', this.topPic);
+
 			let res = await getIndexConfigReq({
 				type: 1
 			})

pages/index/customNoMian_step2/index.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<navBar :backType="navBarTitle" :title="navBarTitle?navBarTitle:'定制我家的无主灯'" :back="true" color="black"
 			background="white" />
-		<image class="topImg" :src="picUrl + '/static/other/noMain_img4.png'" mode=""></image>
+		<image class="topImg" :src="picBase + topPic" mode=""></image>
 
 		<view class="cen">
 			<image class="water" src="/static/index/water.png" mode=""></image>
@@ -102,7 +102,7 @@
 			<!-- <view class="left" @click="showPreviewConfig=true"> -->
 			<view class="left" @click="">
 				<view class="price">
-					￥{{totalPrice.toFixed(2)}}
+					￥{{totalPrice.toFixed(0)}}
 				</view>
 				<image v-if="!showPreviewConfig" src="/static/index/arrDown.png" mode=""
 					@click="showPreviewConfig=true"></image>
@@ -183,7 +183,9 @@
 		getOrderDetailReq
 	} from '@/api/test/index.js'
 
-
+	import {
+		getBannerDataReq,
+	} from '@/api/index/index.js'
 	export default {
 		components: {
 
@@ -191,6 +193,7 @@
 		data() {
 			return {
 				picUrl: this.$picUrl,
+				picBase: this.$picBase,
 
 				showFixInfo: false,
 
@@ -215,9 +218,23 @@
 				shareCon: null,
 				navBarTitle: '',
 				orderSuc: false,
+				topPic: ''
 			}
 		},
 		async onLoad(o) {
+			let res11 = await getBannerDataReq()
+			if (res11.code == 0) {
+				console.log('1-----图片配置数据', res11);
+
+				this.topPic = res11.data.find((item, index) => {
+					return item.title == '无主灯'
+				}).head_image
+			} else {
+				this.$toast(res11.message)
+			}
+
+
+
 			// o.orderId = '66d7ccae1853d0194d84e62f59f17671'
 			if (o.orderId) {
 				this.orderId = o.orderId
@@ -234,9 +251,9 @@
 
 					this.selHx = res.data.config.house_type_data
 					this.selKj = res.data.config.space_data
-					this.selPp = res.data.config.brand
+					this.selPp = res.data.config.brand_data
 					this.selXl = res.data.config.series_data
-					this.selBb = res.data.config.version
+					this.selBb = res.data.config.version_data
 				} else {
 					uni.showToast({
 						title: res.message,

pages/index/fullHouseWifi/index.vue

@@ -2,7 +2,8 @@
 	<view class="page">
 		<navBar title="网络规划-全屋WiFi" :back="true" color="black" background="white" />
 
-		<image :src="picUrl + '/static/other/c1.png'" mode="" class="topBg"></image>
+		<!-- <image :src="picUrl + '/static/other/c1.png'" mode="" class="topBg"></image> -->
+		<image :src="picBase+topPic" mode="" class="topBg"></image>
 
 		<view class="content">
 			<view class="topBox">
@@ -42,7 +43,7 @@
 		<view class="bot">
 			<view class="left">
 				<view class="price">
-					￥{{totalPrice.toFixed(2)}}
+					￥{{totalPrice.toFixed(0)}}
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
@@ -121,6 +122,8 @@
 			return {
 				picUrl: this.$picUrl,
 
+				picBase: this.$picBase,
+
 				showFixInfo: false,
 
 				addOrLessIcon1: '/static/index/shortLine.png',
@@ -153,10 +156,14 @@
 
 				orderSuc: false,
 				cutdownRatio: 1,
-				rule: ''
+				rule: '',
+
+				topPic: ''
 			}
 		},
 		async onLoad(options) {
+			this.topPic = getApp().noMainImg.head_image
+			console.log('4this.topPic', this.topPic);
 			let res = await getIndexConfigReq({
 				type: 4
 			})

pages/index/fullHouseWifi_step2/index.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<navBar :backType="navBarTitle" :title="navBarTitle?navBarTitle:'定制我家的全屋WIFI'" :back="true" color="black"
 			background="white" />
-		<image class="topImg" :src="picUrl + '/static/other/c1.png'" mode=""></image>
+		<image class="topImg" :src="picBase + topPic" mode=""></image>
 
 		<view class="cen">
 			<image class="water" src="/static/index/water.png" mode=""></image>
@@ -79,7 +79,9 @@
 		getOrderDetailReq
 	} from '@/api/test/index.js'
 
-
+	import {
+		getBannerDataReq,
+	} from '@/api/index/index.js'
 	export default {
 		components: {
 
@@ -89,6 +91,8 @@
 				// showShare: true,
 
 				picUrl: this.$picUrl,
+				picBase: this.$picBase,
+				topPic: '',
 				selHx: null,
 				orderId: '',
 				shareCon: null,
@@ -103,6 +107,17 @@
 			}
 		},
 		async onLoad(o) {
+			let res11 = await getBannerDataReq()
+			if (res11.code == 0) {
+				console.log('5-----图片配置数据', res11);
+
+				this.topPic = res11.data.find((item, index) => {
+					return item.title == '网络规划-全屋WiFi'
+				}).head_image
+				console.log('5-----this.topPic', this.topPic);
+			} else {
+				this.$toast(res11.message)
+			}
 			// o.orderId = '1'
 			if (o.orderId) {
 				this.orderId = o.orderId

pages/index/mainDetail/index.scss

@@ -78,7 +78,7 @@
 	padding: 0 32rpx;
 	// width: 100%;
 	.con{
-		height: 776rpx;
+		// height: 776rpx;
 		background: #FFFFFF;
 		border-radius: 0rpx 24rpx 0rpx 24rpx;
 		border: 2rpx solid #E2E2E2;

pages/index/mainDetail/index.vue

@@ -28,85 +28,12 @@
 
 		<view class="parmasBox">
 			<view class="con">
-				<view class="item">
+				<view class="item" v-for="(item,index) in  item.params">
 					<view class="name">
-						型号
+						{{item.event}}
 					</view>
 					<view class="des">
-						{{item.model_number}}
-					</view>
-				</view>
-				<view class="item">
-					<view class="name">
-						灯体尺寸
-					</view>
-					<view class="des">
-						{{item.size}}
-					</view>
-				</view>
-				<view class="item">
-					<view class="name">
-						灯体颜色
-					</view>
-					<view class="des">
-						{{item.color}}
-					</view>
-				</view>
-				<view class="item">
-					<view class="name">
-						灯体材质
-					</view>
-					<view class="des">
-						{{item.texture}}
-					</view>
-				</view>
-				<view class="item">
-					<view class="name">
-						产品风格
-					</view>
-					<view class="des">
-						{{item.style}}
-					</view>
-				</view>
-				<view class="item">
-					<view class="name">
-						使用空间
-					</view>
-					<view class="des">
-						{{item.space}}
-					</view>
-				</view>
-				<view class="item">
-					<view class="name">
-						功率
-					</view>
-					<view class="des">
-						{{item.power}}
-					</view>
-				</view>
-
-				<view class="item">
-					<view class="name">
-						光源
-					</view>
-					<view class="des">
-						{{item.source}}
-					</view>
-				</view>
-				<view class="item">
-					<view class="name">
-						使用面积
-					</view>
-					<view class="des">
-						{{item.area}}
-					</view>
-				</view>
-				<view class="item">
-					<view class="name">
-						售后保障
-					</view>
-					<view class="des">
-						{{item.after_sale}}
+						{{item.value}}
 					</view>
 				</view>
 			</view>
@@ -139,11 +66,13 @@
 
 				currIndex: -1,
 
-				name: ''
+				name: '',
+
+				mianFromType: ''
 			}
 		},
-		onLoad(options) {
-
+		onLoad(o) {
+			this.mianFromType = o.mianFromType
 			this.item = getApp().ktItem
 			this.currIndex = getApp().ktIndex
 			this.name = getApp().ktName
@@ -170,9 +99,18 @@
 				getApp().chooseItem_kt = this.item
 				getApp().index_kt = this.currIndex
 				getApp().chooseType = this.name
-				uni.navigateBack({
-					delta: 2
-				})
+
+
+				console.log('this.mianFromType', this.mianFromType);
+				if (this.mianFromType == 1) {
+					uni.navigateBack({
+						delta: 1
+					})
+				} else if (this.mianFromType == 2) {
+					uni.navigateBack({
+						delta: 2
+					})
+				}
 			}
 		}
 	}

pages/index/mainList/index.vue

@@ -48,8 +48,10 @@
 				getApp().ktItem = item
 				getApp().ktIndex = index
 				getApp().ktName = this.name
+
+				// getApp().mianFromType = 'list'
 				uni.navigateTo({
-					url: '/pages/index/mainDetail/index'
+					url: '/pages/index/mainDetail/index?mianFromType=2'
 				})
 			}
 		}

pages/mall/detail/index.vue

@@ -69,16 +69,13 @@
 		<view class="bot">
 			<view class="left">
 				<view class="price">
-					￥{{Number( totalPrice).toFixed(2)}}
+					￥{{Number( totalPrice).toFixed(0)}}
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
 			<button open-type="share" class="right">
 				一键下单
 			</button>
-			<!-- 	<view class="right" @click="testShare">
-				分享
-			</view> -->
 		</view>
 	</view>
 	</view>
@@ -130,10 +127,16 @@
 				fullCheckArr: [],
 				watchValue: null,
 				conditions: [],
+
+
+				cutdownRatio: 1,
 			}
 		},
 		async onLoad(o) {
 			// o.id = 17
+
+			this.cutdownRatio = this.$getCutDown()
+			console.log('哪种折扣价格-商城详情', this.cutdownRatio);
 			if (o.id) {
 				// this.ids = JSON.parse(o.ids)
 				this.navBarTitle = '首页'
@@ -235,7 +238,7 @@
 						});
 					});
 
-					this.totalPrice = filterResult[0].price
+					this.totalPrice = filterResult[0].price * this.cutdownRatio
 					// console.log('所求价格:', filterResult[0].price);
 				}
 			}

pages/my.scss

@@ -14,7 +14,12 @@
 			padding: 0 32rpx;
 			padding-top: 24rpx;
 			background: linear-gradient(to bottom,#FEF9ED,#fff);
-			// background:#fff;
+			
+			// background-position: right bottom; 
+			// background-size: 35% 100%;
+			// background-blend-mode: color-burn;
+			
+			
 			padding-bottom: 40rpx;
 			min-height: 240rpx;
 			position: relative;

pages/my.vue

@@ -3,14 +3,12 @@
 		<navBar title="GIGESI 吉格斯" :back="false" color="black"
 			background="linear-gradient(to bottom,#FDEDD2,#FEF9ED)" />
 		<view class="content">
+			<!-- <view class="top"
+				:style="{'background':`linear-gradient(to bottom,#FEF9ED,#fff) ,url(${picUrl}/static/other/myW.png) no-repeat`}"> -->
+			<!-- <image class="myW" :src="picUrl+'/static/other/myW.png'" mode=""></image> -->
 			<view class="top">
-				<!-- <image class="myW" :src="picUrl+'/static/other/myW.png'" mode=""></image> -->
 				<view class="userInfo">
 					<view class="left">
-						<!-- <button class="avatarBox" @click="toPage('info')">
-							<image class="avatar"
-								:src="userInfo?userInfo.head:picUrl+'/static/other/defaultAvatar.png'"></image>
-						</button> -->
 						<view class="avatarBox" @click="toPage('info')">
 							<image class="avatar"
 								:src="userInfo&&userInfo.head?userInfo.head:picUrl+'/static/other/defaultAvatar.png'">
@@ -98,7 +96,9 @@
 			<view class="serList">
 				<view class="item" @click="toPage(item)" v-for="(item,index) in serList">
 					<view class="left">
-						<image :src="item.icon" mode="heightFix" style="height: 31rpx;width: 36rpx;"></image>
+						<!-- <image :src="item.icon" mode="heightFix" style="height: 31rpx;width: 36rpx;" ></image> -->
+						<image :src="item.icon" :mode="item.name!='关于我们'?'heightFix':'widthFix'" style="width: 36rpx;"
+							:style="{height:item.name=='关于我们'?'36rpx':'31rpx'}"></image>
 						<text>{{item.name}}</text>
 					</view>
 					<view class="right">
@@ -132,7 +132,6 @@
 				picUrl: this.$picUrl,
 
 				token: uni.getStorageSync('token'),
-				// role: uni.getStorageSync('role'),
 
 				role: null,
 
@@ -164,7 +163,7 @@
 					{
 						icon: this.$picUrl + '/static/other/aboutMe.png',
 						name: '关于我们',
-						url: '/pages/my/aboutMe/index'
+						url: '/pages/my/aboutMe/index',
 					},
 					{
 						icon: this.$picUrl + '/static/my/qt.png',
@@ -332,11 +331,6 @@
 					return this.$toast('请先登录')
 				}
 
-				// if (!this.token && page != '/pages/my/otherInfo/index' && !page.phone) {
-				// 	return this.$toast('请先登录')
-				// }
-
-
 				if (page == 'set') {
 					uni.navigateTo({
 						url: '/pages/my/set/index?role=' + this.role
@@ -376,20 +370,6 @@
 							if (res1.code == 0) {
 								uni.setStorageSync('token', res1.data.token)
 								_this.$toast('登录成功')
-								// console.log('登录时返回的用户信息', res1.data.user_info);
-								// if (res1.data.user_info.status && res1.data.user_info.type == 0) {
-								// 	console.log('当前登录的用户是游客,此时的邀请id', uni.getStorageSync('inviteId'));
-								// 	let res3 = await addInviteReq({
-								// 		inviteId: uni.getStorageSync('inviteId') || ''
-								// 	})
-								// 	if (res3.code == 0) {
-								// 		console.log('登录时提交邀请返回值', res3);
-
-								// 		uni.removeStorageSync('inviteId')
-								// 	} else {
-								// 		_this.$toast(res3.message)
-								// 	}
-								// }
 								uni.removeStorageSync('inviteId')
 								uni.removeStorageSync('afterSaleId')
 								setTimeout(() => {
@@ -448,7 +428,6 @@
 							name: '其他信息',
 							url: '/pages/my/otherInfo/index'
 						},
-
 					]
 					if (this.userInfo.role == 1) {
 						this.serList.push({
@@ -492,6 +471,20 @@
 							url: '/pages/my/otherInfo/index'
 						},
 					]
+
+					if (this.userInfo.role == 1) {
+						this.serList.push({
+							icon: this.picUrl + '/static/my/tg.png',
+							name: '团购商品',
+							url: '/pages/my/actGoods/index'
+						})
+					} else if (this.userInfo.role == 2) {
+						this.serList.push({
+							icon: this.picUrl + '/static/my/sh.png',
+							name: '售后',
+							url: '/pages/my/sellAfter/index'
+						})
+					}
 				} else if (this.role == 'gvip') {
 					this.serList = [{
 							icon: this.picUrl + '/static/my/set.png',
@@ -521,6 +514,19 @@
 							url: '/pages/my/otherInfo/index'
 						},
 					]
+					if (this.userInfo.role == 1) {
+						this.serList.push({
+							icon: this.picUrl + '/static/my/tg.png',
+							name: '团购商品',
+							url: '/pages/my/actGoods/index'
+						})
+					} else if (this.userInfo.role == 2) {
+						this.serList.push({
+							icon: this.picUrl + '/static/my/sh.png',
+							name: '售后',
+							url: '/pages/my/sellAfter/index'
+						})
+					}
 				} else if (this.role == 'lhy') {
 					this.serList = [{
 							icon: this.picUrl + '/static/my/sc.png',
@@ -548,6 +554,19 @@
 							url: '/pages/my/otherInfo/index'
 						},
 					]
+					if (this.userInfo.role == 1) {
+						this.serList.push({
+							icon: this.picUrl + '/static/my/tg.png',
+							name: '团购商品',
+							url: '/pages/my/actGoods/index'
+						})
+					} else if (this.userInfo.role == 2) {
+						this.serList.push({
+							icon: this.picUrl + '/static/my/sh.png',
+							name: '售后',
+							url: '/pages/my/sellAfter/index'
+						})
+					}
 				} else if (this.role == 'hy') {
 					this.serList = [{
 							icon: this.picUrl + '/static/my/sc.png',
@@ -575,6 +594,19 @@
 							url: '/pages/my/otherInfo/index'
 						},
 					]
+					if (this.userInfo.role == 1) {
+						this.serList.push({
+							icon: this.picUrl + '/static/my/tg.png',
+							name: '团购商品',
+							url: '/pages/my/actGoods/index'
+						})
+					} else if (this.userInfo.role == 2) {
+						this.serList.push({
+							icon: this.picUrl + '/static/my/sh.png',
+							name: '售后',
+							url: '/pages/my/sellAfter/index'
+						})
+					}
 				} else if (this.role == 'cydg') {
 					this.serList = [{
 							icon: this.picUrl + '/static/my/set.png',
@@ -591,12 +623,6 @@
 							name: '一键联系',
 							phone: this.userInfo.invitePhone
 						},
-						// {
-						// 	icon: this.picUrl + '/static/my/jiang.png',
-						// 	name: '兑奖信息',
-						// 	url: '/pages/my/duijiang/index'
-						// 	// phone: '12983098478'
-						// },
 						{
 							icon: this.picUrl + '/static/my/qt.png',
 							name: '小程序使用指南',
@@ -613,28 +639,43 @@
 							url: '/pages/my/otherInfo/index'
 						},
 					]
+					if (this.userInfo.role == 1) {
+						this.serList.push({
+							icon: this.picUrl + '/static/my/tg.png',
+							name: '团购商品',
+							url: '/pages/my/actGoods/index'
+						})
+					} else if (this.userInfo.role == 2) {
+						this.serList.push({
+							icon: this.picUrl + '/static/my/sh.png',
+							name: '售后',
+							url: '/pages/my/sellAfter/index'
+						})
+					}
 				} else if (this.role == 'hdhy') {
-					this.serList = [{
-						icon: this.picUrl + '/static/my/set.png',
-						name: '设置',
-						url: '/pages/my/set/index?role=' + this.role
-					}, {
-						icon: this.picUrl + '/static/my/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/duijiang/index'
-					}, {
-						icon: this.picUrl + '/static/my/qt.png',
-						name: '小程序使用指南',
-						url: '/pages/my/useLead/index'
-					}, ]
+					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/duijiang/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',
@@ -646,6 +687,11 @@
 							name: '售后',
 							url: '/pages/my/sellAfter/index'
 						},
+						{
+							icon: this.picUrl + '/static/my/jiang.png',
+							name: '兑奖信息',
+							url: '/pages/my/duijiang/index'
+						},
 						{
 							icon: this.picUrl + '/static/my/tg.png',
 							name: '团购商品',
@@ -733,13 +779,7 @@
 					]
 
 				} else if (this.role == 'shkf') {
-					this.serList = [
-						// 	{
-						// 	icon: this.picUrl + '/static/my/set.png',
-						// 	name: '设置',
-						// 	url: '/pages/my/set/index?role=' + this.role
-						// }, 
-						{
+					this.serList = [{
 							icon: this.picUrl + '/static/my/sh.png',
 							name: '售后',
 							url: '/pages/my/sellAfter/index'

pages/my/actGoodsDetail/index.vue

@@ -105,7 +105,7 @@
 		<view class="bot">
 			<view class="left">
 				<view class="price">
-					￥{{Number( totalPrice).toFixed(2)}}
+					￥{{Number( totalPrice).toFixed(0)}}
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
@@ -273,6 +273,7 @@
 		},
 		onShow() {
 			this.cutdownRatio = this.$getCutDown()
+			console.log('哪种折扣价格-换新、团购详情', this.cutdownRatio);
 		},
 		onShareAppMessage(params) {
 			if (params.from === 'button' || params.from === 'menu') {
@@ -300,7 +301,7 @@
 						});
 					});
 
-					this.totalPrice = filterResult[0].price
+					this.totalPrice = filterResult[0].price * this.cutdownRatio
 					// console.log('所求价格:', filterResult[0].price);
 				}
 			}

pages/my/collectDetail/index.vue

@@ -81,7 +81,7 @@
 		<view class="bot">
 			<view class="left">
 				<view class="price">
-					￥{{Number( totalPrice).toFixed(2)}}
+					￥{{Number( totalPrice).toFixed(0)}}
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
@@ -266,7 +266,7 @@
 						});
 					});
 
-					this.totalPrice = filterResult[0].price
+					this.totalPrice = filterResult[0].price * this.cutdownRatio
 					// console.log('所求价格:', filterResult[0].price);
 				}
 			}

pages/my/feedBack/index.scss

@@ -17,7 +17,8 @@
 		font-family: PingFang-SC-Bold, PingFang-SC;
 		font-weight: bold;
 		color: #080F18;
-		margin-bottom: 36rpx;
+		// margin-bottom: 36rpx;
+		margin-bottom: 18px;
 	}
 	.picTop{
 		display: flex;
@@ -67,7 +68,7 @@
 			margin-right: 6rpx;
 			margin-left: 6rpx;
 			margin-top: 15rpx;
-			// margin-bottom: 20rpx;
+			margin-bottom: 20rpx;
 			position: relative;
 			z-index: 10;
 
@@ -104,11 +105,11 @@
 		justify-content: flex-start;
 		align-items: center;
 		width: 210rpx;
-		height: 210rpx;
+		// height: 210rpx;
 		.addPicBox{
 			width: 184rpx;
 			height:186rpx;
-			border-radius: 24rpx;
+			border-radius: 8rpx;
 			// border: 1rpx dashed #E6E6E6;
 			display: flex;
 			justify-content: center;

pages/my/feedBack/index.vue

@@ -10,7 +10,7 @@
 
 
 			<view class="picTop">
-				<view class="title" style="margin-top: 52rpx;margin-bottom: 30;">
+				<view class="title" style="margin-top: 52rpx;margin-bottom: 18px;">
 					问题图片
 				</view>
 

pages/my/otherInfo/index.scss

@@ -5,28 +5,22 @@
 	padding-top: 24rpx;
 	padding-bottom: 24rpx;
 	.item{
-		// height: 432rpx;
 		background: #FFFFFF;
 		border-radius: 0rpx 24rpx 0rpx 24rpx;
-		// margin-top: 24rpx;
 		padding: 0 24rpx;
 		display: flex;
 		flex-direction: column;
-		// justify-content: space-around;
 		margin-bottom: 24rpx;
-		.line:last-child{
-			border-bottom: none;
-		}
+		
 		.line{
 			display: flex;
 			justify-content:space-between;
 			align-items: center;
-			border-bottom:2rpx solid #E6E6E6 ;
+			// border-bottom:2rpx solid #E6E6E6 ;
 			height: 140rpx;
 			.left{
 				font-size: 32rpx;
 				font-family: PingFang-SC-Bold, PingFang-SC;
-				// font-weight: bold;
 				color: #333333;
 			}
 			.right{
@@ -48,6 +42,9 @@
 				}
 			}
 		}
+		.line:last-child{
+			border-bottom: none;
+		}
 	}
 }
 

pages/my/otherInfo/index.vue

@@ -44,7 +44,7 @@
 						</view>
 					</view>
 				</navigator>
-				<navigator url="/pages/my/protocol/index?type=隐私" style="border-bottom:2rpx solid #E6E6E6 ;">
+				<navigator url="/pages/my/protocol/index?type=隐私" style="">
 					<!-- <view class="line" @click="toPage('/pages/my/protocol/index?type=隐私')"> -->
 					<view class="line">
 						<view class="left">

pages/my/sellAfterDefer/index.scss

@@ -7,15 +7,19 @@
 	padding-top: 24rpx;
 	padding-bottom: 24rpx;
 	.item{
-		height: 432rpx;
+		// height: 432rpx;
 		background: #FFFFFF;
 		border-radius: 0rpx 24rpx 0rpx 24rpx;
 		// margin-top: 24rpx;
 		padding: 8rpx 24rpx;
+		
+		padding-top: 10px;
+		padding-bottom: 15px;
 		display: flex;
 		flex-direction: column;
 		justify-content: space-around;
 		margin-bottom: 24rpx;
+		
 		.t1{
 			justify-content:center!important;
 			font-size: 34rpx;
@@ -27,11 +31,14 @@
 		.line{
 			display: flex;
 			justify-content:space-between;
+			margin-bottom:16rpx ;
 			.left{
 				font-size: 28rpx;
 				font-family: PingFang-SC-Medium, PingFang-SC;
 				font-weight: 300;
 				color: #666666;
+				display: flex;
+				align-items: center;
 			}
 			.right{
 				font-size: 32rpx;
@@ -40,5 +47,8 @@
 				color: #333333;
 			}
 		}
+		.line:last-child{
+			margin-bottom: 0;
+		}
 	}
 }

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

@@ -26,7 +26,8 @@
         "rule/index",
         "mainList/index",
         "productLeadDetail/index",
-        "aiControlSys_step2/index"
+        "aiControlSys_step2/index",
+        "addrList/index"
       ]
     },
     {

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

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

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

@@ -0,0 +1 @@
+<view class="page data-v-6a70bc40"><nav-bar vue-id="c9f7c884-1" title="城市展厅" back="{{true}}" color="black" background="white" class="data-v-6a70bc40" bind:__l="__l"></nav-bar><view class="content data-v-6a70bc40"><block wx:for="{{bannerList1}}" wx:for-item="item" wx:for-index="index"><view class="cartDef data-v-6a70bc40"><image style="width:104rpx;height:104rpx;margin-top:64rpx;border-radius:50%;" src="{{picBase+item.logo}}" mode class="data-v-6a70bc40"></image><view class="companyName data-v-6a70bc40">吉格斯</view><view class="connect data-v-6a70bc40"><image style="width:30rpx;height:30rpx;display:inline-block;" src="/static/index/dianhua.png" mode class="data-v-6a70bc40"></image><view class="txt data-v-6a70bc40">联系电话</view></view><view class="connectDes data-v-6a70bc40"><view class="num data-v-6a70bc40">{{''+item.phone+''}}</view><view data-event-opts="{{[['tap',[['call',['$0'],[[['bannerList1','',index,'phone']]]]]]]}}" class="callBtn data-v-6a70bc40" bindtap="__e">拨号</view></view><view class="addr data-v-6a70bc40"><image style="width:24rpx;height:32rpx;display:inline-block;" src="/static/index/weizhi.png" mode class="data-v-6a70bc40"></image><view class="txt data-v-6a70bc40">{{''+item.company+''}}</view></view><view class="addrInfo data-v-6a70bc40"><view class="txt data-v-6a70bc40">{{''+item.address+''}}</view><image style="width:36rpx;height:36rpx;display:inline-block;" src="/static/index/daohang.png" mode data-event-opts="{{[['tap',[['daohang',['$0'],[[['bannerList1','',index]]]]]]]}}" bindtap="__e" class="data-v-6a70bc40"></image></view></view></block></view><u-loadmore vue-id="c9f7c884-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-6a70bc40" bind:__l="__l"></u-loadmore></view>

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

@@ -0,0 +1 @@
+.page.data-v-6a70bc40{background:#fff;min-height:100vh;padding-bottom:32rpx}.content.data-v-6a70bc40{padding:32rpx;box-sizing:border-box}.content .cartDef.data-v-6a70bc40{display:flex;flex-direction:column;align-items:center;background:#fdf2e9;margin-bottom:32rpx;border-radius:24rpx;box-sizing:border-box;padding-bottom:64rpx}.content .cartDef .companyName.data-v-6a70bc40{box-sizing:border-box;font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333;margin-top:22rpx}.content .cartDef .connect.data-v-6a70bc40{box-sizing:border-box;display:flex;align-items:center;flex-direction:row;margin-top:32rpx}.content .cartDef .connect .txt.data-v-6a70bc40{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666;display:inline-block;margin-left:8rpx}.content .cartDef .connectDes.data-v-6a70bc40{box-sizing:border-box;display:flex;align-items:center;flex-direction:row;margin-top:12rpx}.content .cartDef .connectDes .num.data-v-6a70bc40{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333;margin-right:24rpx}.content .cartDef .connectDes .callBtn.data-v-6a70bc40{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#e77817}.content .cartDef .addr.data-v-6a70bc40{display:flex;align-items:center;flex-direction:row;margin-top:32rpx}.content .cartDef .addr .txt.data-v-6a70bc40{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666;margin-left:8rpx}.content .cartDef .addrInfo.data-v-6a70bc40{display:flex;align-items:center;flex-direction:row;justify-content:center;padding-top:12rpx}.content .cartDef .addrInfo .txt.data-v-6a70bc40{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333;margin-right:16rpx;max-width:500rpx}

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

@@ -1 +1 @@
-<view class="page data-v-6fe0fa3c"><nav-bar vue-id="ed4b4408-1" backType="{{navBarTitle}}" title="{{navBarTitle?navBarTitle:'定制我家的全屋WIFI'}}" back="{{true}}" color="black" background="white" class="data-v-6fe0fa3c" bind:__l="__l"></nav-bar><image class="topImg data-v-6fe0fa3c" src="{{picUrl+'/static/other/c1.png'}}" mode></image><view class="cen data-v-6fe0fa3c"><image class="water data-v-6fe0fa3c" src="/static/index/water.png" mode></image><image class="halfC data-v-6fe0fa3c" src="/static/index/halfCircle_275.png" mode></image>定制我家的全屋WIFI</view><view class="parmasBox data-v-6fe0fa3c"><view class="con data-v-6fe0fa3c"><view class="top data-v-6fe0fa3c"><view class="item data-v-6fe0fa3c"><view class="name data-v-6fe0fa3c">户型</view><view class="des data-v-6fe0fa3c">{{''+selHx.value+''}}</view></view></view></view></view><view class="parmasBox data-v-6fe0fa3c"><view class="con data-v-6fe0fa3c"><view class="top data-v-6fe0fa3c"><view class="item data-v-6fe0fa3c"><view class="name data-v-6fe0fa3c">收货人</view><view class="des data-v-6fe0fa3c">{{''+shareCon.name+''}}</view></view><view class="item data-v-6fe0fa3c"><view class="name data-v-6fe0fa3c">电话</view><view class="des data-v-6fe0fa3c">{{''+shareCon.phone+''}}</view></view><view class="item data-v-6fe0fa3c"><view class="name data-v-6fe0fa3c">收货地址</view><view class="des data-v-6fe0fa3c">{{''+shareCon.address+''}}</view></view><view class="item data-v-6fe0fa3c"><view class="name data-v-6fe0fa3c">备注</view><view class="des data-v-6fe0fa3c">{{''+shareCon.remark+''}}</view></view></view></view></view></view>
+<view class="page data-v-9c1c4988"><nav-bar vue-id="ed4b4408-1" backType="{{navBarTitle}}" title="{{navBarTitle?navBarTitle:'定制我家的全屋WIFI'}}" back="{{true}}" color="black" background="white" class="data-v-9c1c4988" bind:__l="__l"></nav-bar><image class="topImg data-v-9c1c4988" src="{{picBase+topPic}}" mode></image><view class="cen data-v-9c1c4988"><image class="water data-v-9c1c4988" src="/static/index/water.png" mode></image><image class="halfC data-v-9c1c4988" src="/static/index/halfCircle_275.png" mode></image>定制我家的全屋WIFI</view><view class="parmasBox data-v-9c1c4988"><view class="con data-v-9c1c4988"><view class="top data-v-9c1c4988"><view class="item data-v-9c1c4988"><view class="name data-v-9c1c4988">户型</view><view class="des data-v-9c1c4988">{{''+selHx.value+''}}</view></view></view></view></view><view class="parmasBox data-v-9c1c4988"><view class="con data-v-9c1c4988"><view class="top data-v-9c1c4988"><view class="item data-v-9c1c4988"><view class="name data-v-9c1c4988">收货人</view><view class="des data-v-9c1c4988">{{''+shareCon.name+''}}</view></view><view class="item data-v-9c1c4988"><view class="name data-v-9c1c4988">电话</view><view class="des data-v-9c1c4988">{{''+shareCon.phone+''}}</view></view><view class="item data-v-9c1c4988"><view class="name data-v-9c1c4988">收货地址</view><view class="des data-v-9c1c4988">{{''+shareCon.address+''}}</view></view><view class="item data-v-9c1c4988"><view class="name data-v-9c1c4988">备注</view><view class="des data-v-9c1c4988">{{''+shareCon.remark+''}}</view></view></view></view></view></view>

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

@@ -1 +1 @@
-<view class="page data-v-7058d962"><nav-bar vue-id="03562e14-1" title="{{name}}" back="{{true}}" color="black" background="white" class="data-v-7058d962" bind:__l="__l"></nav-bar><block wx:if="{{$root.g0!=0}}"><view class="con data-v-7058d962"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0',index],[[['list','',index]]]]]]]}}" class="item data-v-7058d962" bindtap="__e"><view class="topBox data-v-7058d962"><image src="{{picBase+item.cover}}" mode class="data-v-7058d962"></image></view><view class="bottom data-v-7058d962"><view class="txt data-v-7058d962">{{''+item.name+''}}</view></view></view></block></view></block><block wx:else><view class="con data-v-7058d962" style="justify-content:center;"><u-empty vue-id="03562e14-2" mode="data" text="暂无数据" width="160" height="160" icon="{{picUrl+'/static/other/empty.png'}}" class="data-v-7058d962" bind:__l="__l"></u-empty></view></block><block wx:if="{{$root.g1!=0}}"><u-loadmore vue-id="03562e14-3" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-7058d962" bind:__l="__l"></u-loadmore></block></view>
+<view class="page data-v-345ac5b5"><nav-bar vue-id="03562e14-1" title="{{name}}" back="{{true}}" color="black" background="white" class="data-v-345ac5b5" bind:__l="__l"></nav-bar><block wx:if="{{$root.g0!=0}}"><view class="con data-v-345ac5b5"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0',index],[[['list','',index]]]]]]]}}" class="item data-v-345ac5b5" bindtap="__e"><view class="topBox data-v-345ac5b5"><image src="{{picBase+item.cover}}" mode class="data-v-345ac5b5"></image></view><view class="bottom data-v-345ac5b5"><view class="txt data-v-345ac5b5">{{''+item.name+''}}</view></view></view></block></view></block><block wx:else><view class="con data-v-345ac5b5" style="justify-content:center;"><u-empty vue-id="03562e14-2" mode="data" text="暂无数据" width="160" height="160" icon="{{picUrl+'/static/other/empty.png'}}" class="data-v-345ac5b5" bind:__l="__l"></u-empty></view></block><block wx:if="{{$root.g1!=0}}"><u-loadmore vue-id="03562e14-3" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-345ac5b5" bind:__l="__l"></u-loadmore></block></view>

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

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

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

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

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

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

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

@@ -1 +1 @@
-.content.data-v-2b92be5e{background:#f1f1f1;min-height:100vh;padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-2b92be5e{height:432rpx;background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:8rpx 24rpx;display:flex;flex-direction:column;justify-content:space-around;margin-bottom:24rpx}.content .item .t1.data-v-2b92be5e{justify-content:center!important;font-size:34rpx;font-weight:700}.content .item .t1 text.data-v-2b92be5e{color:#f7790c}.content .item .line.data-v-2b92be5e{display:flex;justify-content:space-between}.content .item .line .left.data-v-2b92be5e{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:300;color:#666}.content .item .line .right.data-v-2b92be5e{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:300;color:#333}
+.content.data-v-2b92be5e{background:#f1f1f1;min-height:100vh;padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-2b92be5e{background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:8rpx 24rpx;padding-top:10px;padding-bottom:15px;display:flex;flex-direction:column;justify-content:space-around;margin-bottom:24rpx}.content .item .t1.data-v-2b92be5e{justify-content:center!important;font-size:34rpx;font-weight:700}.content .item .t1 text.data-v-2b92be5e{color:#f7790c}.content .item .line.data-v-2b92be5e{display:flex;justify-content:space-between;margin-bottom:16rpx}.content .item .line .left.data-v-2b92be5e{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:300;color:#666;display:flex;align-items:center}.content .item .line .right.data-v-2b92be5e{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:300;color:#333}.content .item .line.data-v-2b92be5e:last-child{margin-bottom:0}

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

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

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

@@ -1,9 +1,9 @@
 {
-  "component": true,
   "usingComponents": {
     "u-overlay": "/uni_modules/uview-ui/components/u-overlay/u-overlay",
     "u-transition": "/uni_modules/uview-ui/components/u-transition/u-transition",
     "u-status-bar": "/uni_modules/uview-ui/components/u-status-bar/u-status-bar",
     "u-icon": "/uni_modules/uview-ui/components/u-icon/u-icon"
-  }
+  },
+  "component": true
 }

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

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

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

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

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

@@ -1,7 +1,7 @@
 {
-  "component": true,
   "usingComponents": {
     "u-loading-icon": "/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon",
     "u-swiper-indicator": "/uni_modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator"
-  }
+  },
+  "component": true
 }