9.20

App.vue

@@ -1,9 +1,14 @@
 <script>
+	// import {
+	// 	getPricePercentReq,
+	// } from '@/api/test/index.js'
 	export default {
 		globalData: {
-			showPrivacy: false
+			showPrivacy: false,
+
+			priceConfig: {}
 		},
-		onLaunch: function(options) {
+		async onLaunch(options) {
 			if (uni.getPrivacySetting) {
 				uni.getPrivacySetting({
 					success: res => {
@@ -18,9 +23,31 @@
 					complete: () => {},
 				})
 			}
+
+			uni.setStorageSync('switchs', [1, 0, 0])
+
+			// let res = await getPricePercentReq()
+			// if (res.code == 0) {
+			// 	this.priceConfig = res.data
+			// 	console.log('获取的价格百分比', this.priceConfig);
+			// } else {
+			// 	uni.showToast({
+			// 		title: res.message,
+			// 		icon: 'none'
+			// 	})
+			// }
 		},
-		onShow: function() {
-			// console.log('App Show')
+		async onShow() {
+			// let res = await getPricePercentReq()
+			// if (res.code == 0) {
+			// 	this.priceConfig = res.data
+			// 	console.log('获取的价格百分比', this.priceConfig);
+			// } else {
+			// 	uni.showToast({
+			// 		title: res.message,
+			// 		icon: 'none'
+			// 	})
+			// }
 		},
 		onHide: function() {
 			// console.log('App Hide')

api/test/index.js

@@ -168,4 +168,34 @@ export const getConfigTextByTypeReq = (params, config = {}) => {
 
 
 // 提交反馈
-export const getWxQrCodeReq = (params, config = {}) => http.post('/api/common/getWxQrCode', params, config)
+export const getWxQrCodeReq = (params, config = {}) => http.post('/api/common/getWxQrCode', params, config)
+
+
+
+export const getConfigTextByIdReq = (params, config = {}) => {
+
+	let apiUrl = '/api/common/getConfigTextById'
+	Object.keys(params).forEach((item, index) => {
+		if (index == 0) {
+			apiUrl += `?${item}=${params[item]}`
+		} else {
+			apiUrl += `&${item}=${params[item]}`
+		}
+	})
+	console.log('处理后的apiUrl', apiUrl);
+	return http.get(apiUrl, params, config)
+}
+
+export const getMyGoodsDetailReq = (params, config = {}) => {
+
+	let apiUrl = '/api/goods/getGoodsDetail'
+	Object.keys(params).forEach((item, index) => {
+		if (index == 0) {
+			apiUrl += `?${item}=${params[item]}`
+		} else {
+			apiUrl += `&${item}=${params[item]}`
+		}
+	})
+	console.log('处理后的apiUrl', apiUrl);
+	return http.get(apiUrl, params, config)
+}

components/navBar/index.vue

@@ -32,6 +32,10 @@
 			};
 		},
 		props: {
+			backType: { // 标题文字(默认为空)
+				type: String,
+				default: ''
+			},
 			navImg: { // 标题文字(默认为空)
 				type: String,
 				default: ''
@@ -84,11 +88,16 @@
 		methods: {
 			// 左侧返回按钮调用
 			onBack() {
-				this.$emit("onBack");
-				uni.navigateBack({
-					delta: 1, //返回层数，2则上上页
-				})
-
+				if (this.backType) {
+					uni.switchTab({
+						url: '/pages/index'
+					})
+				} else {
+					this.$emit("onBack");
+					uni.navigateBack({
+						delta: 1, //返回层数，2则上上页
+					})
+				}
 			}
 		}
 

main.js

@@ -18,6 +18,8 @@ Vue.use(uView)
 
 import store from 'store/index.js'
 Vue.prototype.$store = store
+Vue.prototype.$appId = 'wx98ab2939999e13de'
+Vue.prototype.$shareType = 1
 
 import uploadUrl from '@/common/config.js'
 Vue.prototype.$picUrl = uploadUrl.picUrl

pages/index.vue

@@ -65,8 +65,8 @@
 			</view>
 
 			<!-- 产品指南 -->
-			<view class="productLead" @click="toPage(3)">
-				<view class="top">
+			<view class="productLead">
+				<view class="top" @click="toPage(3)">
 					<view class="left">
 						<view class="bottomEng">
 							PRODUCT GUIDE
@@ -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="(item,index) in leadList">
-						<image :src="item.img" mode=""></image>
+					<view class="item" v-for="(item,index) in leadList" @click="toLeadDetail(item)">
+						<image :src="picBase+item.image" mode=""></image>
 						<view class="bottom">
-							{{item.name}}
+							{{item.title}}
 						</view>
 					</view>
 				</view>
@@ -138,31 +138,19 @@
 <script>
 	import {
 		getBannerDataReq,
-		getAddressDataReq
+		getAddressDataReq,
+		getGuideDataReq,
 	} from '@/api/index/index.js'
+	import {
+		getPricePercentReq,
+	} from '@/api/test/index.js'
 	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: [
-					// this.$picUrl + '/static/other/noMain_img3.png',
-					// this.$picUrl + '/static/other/noMain_img3.png',
-					// this.$picUrl + '/static/other/noMain_img3.png',
-				],
+				picBase: this.$picBase,
+				leadList: [],
+				bannerList: [],
 				bannerList1: [],
 				currentNum: 0,
 				currentNum1: 0,
@@ -171,7 +159,10 @@
 				tabList: ['无主灯', '主灯'],
 				currTabIndex: 0,
 
-				navImg: require('@/static/index/logo.png')
+				navImg: require('@/static/index/logo.png'),
+				list: [],
+
+				priceConfig: {}
 			}
 		},
 		async onLoad() {
@@ -190,8 +181,38 @@
 			} else {
 				this.$toast(res1.message)
 			}
+
+
+			let res2 = await getGuideDataReq()
+			if (res2.code == 0) {
+				this.leadList = res2.data
+				console.log('首页产品指南列表返回值：', this.leadList);
+			} else {
+				uni.showToast({
+					title: res2.message,
+					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: {
+			toLeadDetail(item) {
+				getApp().Litem = item
+				uni.navigateTo({
+					url: '/pages/index/productLeadDetail/index'
+				})
+			},
 			toList() {
 				if (this.currTabIndex == 0) {
 					uni.navigateTo({

pages/index/aiControlSys_step2/index.scss

@@ -1,3 +1,7 @@
+::v-deep button::after{
+	border: none!important;
+}
+
 .page{
 	padding-bottom: 208rpx;
 }

pages/index/aiControlSys_step2/index.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="page">
-		<navBar title="智能控制系统" :back="true" color="black" background="white" />
+		<navBar :backType="navBarTitle" :title="navBarTitle?navBarTitle:'智能控制系统'" :back="true" color="black"
+			background="white" />
 		<image class="topImg" :src="picUrl + '/static/other/c2.png'" mode=""></image>
 
 		<view class="cen">
@@ -66,7 +67,7 @@
 			</view>
 		</view>
 
-		<view class="parmasBox" v-if="orderId">
+		<view class="parmasBox" v-if="navBarTitle">
 			<view class="con">
 				<view class="top">
 					<view class="item">
@@ -104,8 +105,8 @@
 				</view>
 			</view>
 		</view>
-		<image @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
-		<view class="bot" v-if="!orderId">
+		<image v-if="!navBarTitle" @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
+		<view class="bot" v-if="!navBarTitle">
 			<!-- <view class="left" @click="showPreviewConfig=true"> -->
 			<view class="left" @click="">
 				<view class="price">
@@ -115,7 +116,11 @@
 					@click="showPreviewConfig=true"></image>
 				<image v-else src="/static/index/arrUp.png" mode="" @click="showPreviewConfig=false"></image>
 			</view>
-			<view class="right" @click="showFixInfo=true">
+			<button open-type="share" v-if="orderSuc" class="right">
+				分享
+			</button>
+
+			<view class="right" v-else @click="showFixInfo=true">
 				确认配置
 			</view>
 		</view>
@@ -202,13 +207,17 @@
 				orderId: '',
 
 				pConfig: -1,
-				shareCon: null
+				shareCon: null,
+
+				navBarTitle: '',
+				orderSuc: false,
 			}
 		},
 		async onLoad(o) {
 			// o.orderId = '43c43ced14b312fb69d80cedbd7b23f4'
 			if (o.orderId) {
 				this.orderId = o.orderId
+				this.navBarTitle = '首页'
 				console.log('o.orderId', o.orderId);
 
 				let res = await getOrderDetailReq({
@@ -219,7 +228,7 @@
 
 					this.shareCon = res.data
 
-					this.selHx = res.data.config.house_type
+					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
@@ -243,6 +252,17 @@
 				this.pConfig = getApp().pConfig
 			}
 		},
+		onShareAppMessage(params) {
+			if (params.from === 'button' || params.from === 'menu') {
+				return {
+					title: '定制我家的智能控制系统',
+					imageUrl: this.picUrl + '/static/other/c2.png',
+					path: '/pages/index/aiControlSys_step2/index?orderId=' + this.orderId,
+					mpId: this.$appId,
+					type: this.$shareType,
+				}
+			}
+		},
 		methods: {
 			async postOrder() {
 				console.log('智控下单参数', {
@@ -271,6 +291,7 @@
 
 					this.orderId = res.data.orderId
 					this.showFixInfo = false
+					this.orderSuc = true
 				} else {
 					uni.showToast({
 						title: res.message,

pages/index/customMian/index.scss

@@ -1,3 +1,7 @@
+::v-deep button::after{
+	border: none!important;
+}
+
 .page{
 	padding-bottom: 208rpx;
 }

pages/index/customMian/index.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="page">
-		<navBar title="定制我家的主灯" :back="true" color="black" background="white" />
+		<navBar :backType="navBarTitle" :title="navBarTitle?navBarTitle:'定制我家的主灯'" :back="true" color="black"
+			background="white" />
 		<image class="topImg" :src="picUrl+'/static/other/noMain_img3.png'" mode=""></image>
 
 		<view class="cen">
@@ -111,7 +112,7 @@
 			</view>
 		</view>
 
-		<view class="parmasBox" v-if="orderId">
+		<view class="parmasBox" v-if="navBarTitle">
 			<view class="con">
 				<view class="top">
 					<view class="item">
@@ -149,18 +150,16 @@
 				</view>
 			</view>
 		</view>
-		<image @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
-		<view class="bot" v-if="!orderId">
+		<image v-if="!navBarTitle" @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
+		<view class="bot" v-if="!navBarTitle">
 			<view class="left">
 				<view class="price">
 					￥{{mainPreviewInfo.price?mainPreviewInfo.price.toFixed(2):'0.00'}}
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
-			<button open-type="share" v-if="orderSuc">
-				<view class="right" @click="shareToWx" v-if="orderSuc">
-					分享
-				</view>
+			<button open-type="share" v-if="orderSuc" class="right">
+				分享
 			</button>
 
 			<view class="right" v-else @click="showFixInfo=true">
@@ -248,17 +247,16 @@
 
 				shareCon: null,
 
-				orderSuc: true,
-
-				shareData: {
+				orderSuc: false,
 
-				}
+				navBarTitle: ''
 			}
 		},
 		async onLoad(o) {
 			// o.orderId = '5c3455b568c5409270e0d99cbb6057e6'
 			if (o.orderId) {
 				this.orderId = o.orderId
+				this.navBarTitle = '首页'
 				console.log('o.orderId', o.orderId);
 
 				let res = await getOrderDetailReq({
@@ -313,18 +311,13 @@
 		},
 		onShareAppMessage(params) {
 			if (params.from === 'button' || params.from === 'menu') {
-				this.shareData = {
+				return {
 					title: '定制我家的主灯',
 					imageUrl: this.picUrl + '/static/other/noMain_img3.png',
-					path: '/pages/index/fullHouseWifi_step2/index?orderId=08e2d44b34b4bc182882242f02837797',
-					mpId: 'wx98ab2939999e13de',
-					type: 1,
-					// query: 'orderId=08e2d44b34b4bc182882242f02837797'
-					// params: {
-					// 	orderId: '08e2d44b34b4bc182882242f02837797'
-					// },
+					path: '/pages/index/customMian/index?orderId=' + this.orderId,
+					mpId: this.$appId,
+					type: this.$shareType,
 				}
-				return this.shareData;
 			}
 		},
 		methods: {
@@ -358,20 +351,7 @@
 					this.orderId = res.data.orderId
 					this.showFixInfo = false
 
-					let res1 = await getWxQrCodeReq({
-						page: 'pages/index/index',
-						id: this.orderId
-					})
-					if (res1.code == 0) {
-						console.log('获取小程序码返回值: ', res1);
-						this.linkPic = res1.data.url
-						this.showShare = true
-					} else {
-						uni.showToast({
-							title: res1.message,
-							icon: 'none'
-						})
-					}
+					this.orderSuc = true
 				} else {
 					uni.showToast({
 						title: res.message,

pages/index/customMian_step1/index.vue

@@ -314,7 +314,8 @@
 				selYt: [],
 				totalPrice: 0,
 
-				pConfig: -1
+				pConfig: -1,
+				cutdownType: 1
 			}
 		},
 		async onLoad(o) {
@@ -372,6 +373,14 @@
 
 		},
 		onShow() {
+			if (uni.getStorageSync('switchs')[0]) {
+				this.cutdownType = 1
+			} else if (uni.getStorageSync('switchs')[1]) {
+				this.cutdownType = uni.getStorageSync('priceConfig').member_price
+			} else if (uni.getStorageSync('switchs')[2]) {
+				this.cutdownType = uni.getStorageSync('priceConfig').vip_price
+			}
+			console.log('那种价格', this.cutdownType);
 			console.log('确定选择的那一项', getApp().chooseItem_kt);
 			if (getApp().chooseItem_kt) {
 				let index = getApp().index_kt
@@ -392,6 +401,15 @@
 				getApp().chooseType = null
 			}
 		},
+		// computed: {
+		// 	cutdownType() {
+		// 		uni.getStorageSync('switchs').forEach((item, index) => {
+		// 			if (item) {
+		// 				return index
+		// 			}
+		// 		})
+		// 	}
+		// },
 		methods: {
 			async getPrice(type = 2, house_type, series, drawing_lamp, canteen_lamp, bedroom_lamp, balcony_lamp) {
 				let res = await getDataMoneyReq({

pages/index/customNoMian_step2/index.scss

@@ -1,3 +1,6 @@
+::v-deep button::after{
+	border: none!important;
+}
 .page{
 	padding-bottom: 208rpx;
 }

pages/index/customNoMian_step2/index.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="page">
-		<navBar title="定制我家的无主灯" :back="true" color="black" background="white" />
+		<navBar :backType="navBarTitle" :title="navBarTitle?navBarTitle:'定制我家的无主灯'" :back="true" color="black"
+			background="white" />
 		<image class="topImg" :src="picUrl + '/static/other/noMain_img4.png'" mode=""></image>
 
 		<view class="cen">
@@ -56,7 +57,7 @@
 			</view>
 		</view>
 
-		<view class="parmasBox" v-if="orderId">
+		<view class="parmasBox" v-if="navBarTitle">
 			<view class="con">
 				<view class="top">
 					<view class="item">
@@ -96,8 +97,8 @@
 		</view>
 
 
-		<image @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
-		<view class="bot" v-if="!orderId">
+		<image v-if="!navBarTitle" @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
+		<view class="bot" v-if="!navBarTitle">
 			<!-- <view class="left" @click="showPreviewConfig=true"> -->
 			<view class="left" @click="">
 				<view class="price">
@@ -107,7 +108,11 @@
 					@click="showPreviewConfig=true"></image>
 				<image v-else src="/static/index/arrUp.png" mode="" @click="showPreviewConfig=false"></image>
 			</view>
-			<view class="right" @click="showFixInfo=true">
+			<button open-type="share" v-if="orderSuc" class="right">
+				分享
+			</button>
+
+			<view class="right" v-else @click="showFixInfo=true">
 				确认配置
 			</view>
 		</view>
@@ -198,13 +203,16 @@
 				orderId: '',
 				pConfig: -1,
 
-				shareCon: null
+				shareCon: null,
+				navBarTitle: '',
+				orderSuc: false,
 			}
 		},
 		async onLoad(o) {
 			// o.orderId = '0583586cf846a460cdc6948a9f83ba24'
 			if (o.orderId) {
 				this.orderId = o.orderId
+				this.navBarTitle = '首页'
 				console.log('o.orderId', o.orderId);
 
 				let res = await getOrderDetailReq({
@@ -215,10 +223,10 @@
 
 					this.shareCon = res.data
 
-					this.selHx = res.data.config.house_type
-					this.selKj = res.data.config.space
+					this.selHx = res.data.config.house_type_data
+					this.selKj = res.data.config.space_data
 					this.selPp = res.data.config.brand
-					this.selXl = res.data.config.series
+					this.selXl = res.data.config.series_data
 					this.selBb = res.data.config.version
 				} else {
 					uni.showToast({
@@ -238,6 +246,17 @@
 				this.totalPrice = getApp().totalPrice
 			}
 		},
+		onShareAppMessage(params) {
+			if (params.from === 'button' || params.from === 'menu') {
+				return {
+					title: '定制我家的无主灯',
+					imageUrl: this.picUrl + '/static/other/noMain_img4.png',
+					path: '/pages/index/customNoMian_step2/index?orderId=' + this.orderId,
+					mpId: this.$appId,
+					type: this.$shareType,
+				}
+			}
+		},
 		methods: {
 			back() {
 				uni.navigateBack()
@@ -269,6 +288,8 @@
 
 					this.orderId = res.data.orderId
 					this.showFixInfo = false
+
+					this.orderSuc = true
 				} else {
 					uni.showToast({
 						title: res.message,

pages/index/fullHouseWifi/index.scss

@@ -1,3 +1,6 @@
+::v-deep button::after{
+	border: none!important;
+}
 .page{
 	padding-bottom: 160rpx;
 }

pages/index/fullHouseWifi/index.vue

@@ -52,8 +52,12 @@
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
-			<view class="right" @click="showFixInfo=true">
-				一键下单
+			<button open-type="share" v-if="orderSuc" class="right">
+				分享
+			</button>
+
+			<view class="right" v-else @click="showFixInfo=true">
+				确认配置
 			</view>
 		</view>
 
@@ -148,7 +152,9 @@
 				remark: '',
 
 				orderId: '',
-				pConfig: -1
+				pConfig: -1,
+
+				orderSuc: false,
 			}
 		},
 		async onLoad(options) {
@@ -164,6 +170,17 @@
 				this.getPrice(4, this.selHx.id)
 			}
 		},
+		onShareAppMessage(params) {
+			if (params.from === 'button' || params.from === 'menu') {
+				return {
+					title: '定制我家的全屋WiFi',
+					imageUrl: this.picUrl + '/static/other/c1.png',
+					path: '/pages/index/fullHouseWifi_step2/index?orderId=' + this.orderId,
+					mpId: this.$appId,
+					type: this.$shareType,
+				}
+			}
+		},
 		methods: {
 			async postOrder() {
 				console.log('wifi下单参数', {
@@ -189,6 +206,7 @@
 
 					this.orderId = res.data.orderId
 					this.showFixInfo = false
+					this.orderSuc = true
 				} else {
 					uni.showToast({
 						title: res.message,

pages/index/fullHouseWifi_step2/index.vue

@@ -1,7 +1,8 @@
 <template>
 	<view class="page">
-		<navBar title="定制我家的全屋WIFI" :back="true" color="black" background="white" />
-		<image class="topImg" :src="picUrl + '/static/other/noMain_img4.png'" mode=""></image>
+		<navBar :backType="navBarTitle" :title="navBarTitle?navBarTitle:'定制我家的全屋WIFI'" :back="true" color="black"
+			background="white" />
+		<image class="topImg" :src="picUrl + '/static/other/c1.png'" mode=""></image>
 
 		<view class="cen">
 			<image class="water" src="/static/index/water.png" mode=""></image>
@@ -24,7 +25,7 @@
 			</view>
 		</view>
 
-		<view class="parmasBox" v-if="orderId">
+		<view class="parmasBox">
 			<view class="con">
 				<view class="top">
 					<view class="item">
@@ -64,7 +65,7 @@
 		</view>
 
 
-		<image @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image>
+		<!-- <image  @click="back" src="/static/index/backBtnImg.png" mode="" class="rule_img"></image> -->
 
 		<!-- <u-modal :show="showShare" title="分享链接" :content='content'></u-modal> -->
 	</view>
@@ -94,12 +95,18 @@
 
 				options: null,
 				options1: null,
-				query: null
+				query: null,
+
+				orderSuc: false,
+
+				navBarTitle: ''
 			}
 		},
 		async onLoad(o) {
+			// o.orderId = '1'
 			if (o.orderId) {
 				this.orderId = o.orderId
+				this.navBarTitle = '首页'
 				console.log('o.orderId', o.orderId);
 
 				let res = await getOrderDetailReq({

pages/index/productLead/index.scss

@@ -1,3 +1,4 @@
+
 ::v-deep .u-line{
 	 width: 56rpx!important;
  }

pages/index/productLead/index.vue

@@ -42,10 +42,13 @@
 				})
 			}
 		},
+
+
 		methods: {
 			goDetail(item) {
+				getApp().Litem = item
 				uni.navigateTo({
-					url: '/pages/index/productLeadDetail/index?item=' + JSON.stringify(item)
+					url: '/pages/index/productLeadDetail/index'
 				})
 			}
 		}

pages/index/productLeadDetail/index.scss

@@ -1,3 +1,6 @@
+::v-deep button::after{
+	border: none!important;
+}
 .page{
 	padding-bottom: 160rpx;
 }

pages/index/productLeadDetail/index.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="page">
-		<navBar title="产品指南" :back="true" color="black" background="white" />
+		<navBar :backType="navBarTitle" :title="navBarTitle?navBarTitle:'产品指南'" :back="true" color="black"
+			background="white" />
 
 		<view class="content">
 			<view class="title">
@@ -13,15 +14,18 @@
 
 		</view>
 
-		<view class="btnBox">
-			<view class="rBtn">
-				一键分享
-			</view>
+		<view class="btnBox" v-if="showBtn">
+			<button open-type="share" class="rBtn">
+				分享
+			</button>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		getConfigTextByIdReq,
+	} from '@/api/test/index.js'
 	export default {
 		components: {
 
@@ -30,12 +34,45 @@
 			return {
 				picUrl: this.$picUrl,
 				picBase: this.$picBase,
-				content: null
+				content: null,
+
+				showBtn: true,
+				navBarTitle: ''
+
 			}
 		},
-		onLoad(o) {
-			this.content = JSON.parse(o.item)
-			console.log('传过来的指南详情：', this.content);
+		async onLoad(o) {
+			// o.id = 13
+			if (o.id) {
+				this.showBtn = false
+				this.navBarTitle = '首页'
+				let res = await getConfigTextByIdReq({
+					id: o.id
+				})
+				if (res.code == 0) {
+					console.log('返回值: ', res);
+					this.content = res.data
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			} else {
+				this.content = getApp().Litem
+				console.log('传过来的指南详情：', this.content);
+			}
+		},
+		onShareAppMessage(params) {
+			if (params.from === 'button' || params.from === 'menu') {
+				return {
+					title: this.content.title,
+					imageUrl: this.$picBase + this.content.image,
+					path: '/pages/index/productLeadDetail/index?id=' + this.content.id,
+					mpId: this.$appId,
+					type: this.$shareType,
+				}
+			}
 		},
 		methods: {
 

pages/mall.scss

@@ -23,7 +23,8 @@
 	// margin-top: 190rpx;
 	.leftMenu{
 		width: 212rpx;
-		height: calc(100vh - 360rpx);
+		// height: calc(100vh - 400rpx);
+		height: calc(100vh - 380rpx);
 		background:#fff ;
 		overflow-y: scroll;
 		.item{
@@ -35,7 +36,9 @@
 			display: flex;
 			align-items: center;
 			justify-content: center;
-			
+			padding: 0 10rpx;
+			word-wrap: break-word;
+				word-break: break-all;
 			position: relative;
 		}
 		.halfCircle{
@@ -54,7 +57,7 @@
 		padding: 48rpx 28rpx 52rpx 28rpx;
 		overflow-y: scroll;
 		box-sizing: border-box;
-		height: calc(100vh - 340rpx);
+		height: calc(100vh - 380rpx);
 		.item{
 			.top{
 				display: flex;

pages/mall.vue

@@ -14,7 +14,7 @@
 
 
 		<view class="content" v-if="searchKey" style="margin-top: 140rpx;">
-			<view class="rightDes">
+			<view class="rightDes" style="height: calc(100vh - 330rpx)">
 				<view class="item" v-for="(item,index) in allTypes" :style="{marginTop:index>0?'22rpx':''}">
 					<view class="top" @click="toList(item,allTypesValues[index])">
 						<view class="name">
@@ -117,9 +117,6 @@
 
 		},
 		async onLoad() {
-
-		},
-		async onShow() {
 			let res = await getMallCatReq()
 			if (res.code == 0) {
 				console.log('获取商城分类数据返回值: ', res);
@@ -144,6 +141,9 @@
 					icon: 'none'
 				})
 			}
+		},
+		async onShow() {
+
 		},
 		onReady() {
 

pages/mall/detail/index.scss

@@ -1,3 +1,6 @@
+::v-deep button::after{
+	border: none!important;
+}
 .page{
 	padding-bottom: 208rpx;
 }

pages/mall/detail/index.vue

@@ -1,7 +1,8 @@
 <template>
 	<view class="">
 		<view class="page">
-			<navBar title="详情" :back="true" color="black" background="white" />
+			<navBar :backType="navBarTitle" :title="navBarTitle?navBarTitle:'详情'" :back="true" color="black"
+				background="white" />
 			<view class="topImg">
 				<u-swiper type='img' radius="0rpx 0rpx 0rpx 40rpx" :list="bannerList" keyName="image" indicator
 					indicatorMode="line" :autoplay="true" height="1124rpx" imgMode="heightFix" circular
@@ -33,20 +34,20 @@
 					</view>
 				</view>
 			</view>
-
-			<!-- 	<view class="parmasBox" v-for="(item,index) in content.parmas">
+			<view class="parmasBox" v-for="(item,index) in parmsList" v-if="navBarTitle">
 				<view class="con">
 					<view class="title">
-						选择{{item.event}}
+						{{item.title}}
 					</view>
 					<view class="list">
-						<view class="item">
-							{{item.value}}
+						<view class="item" v-for="(item1,index1) in item.list" :class="[index1==ids[index]?'act':'']"
+							@click="">
+							{{item1.data}}
 						</view>
 					</view>
 				</view>
-			</view> -->
-			<view class="parmasBox" v-for="(item,index) in parmsList">
+			</view>
+			<view class="parmasBox" v-for="(item,index) in parmsList" v-if="!navBarTitle">
 				<view class="con">
 					<view class="title">
 						{{item.title}}
@@ -78,16 +79,19 @@
 
 		<!-- <button >ces</button> -->
 
-		<view class="bot">
+		<view class="bot" v-if="!navBarTitle">
 			<view class="left">
 				<view class="price">
 					￥{{totalPrice.toFixed(2)}}
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
-			<view class="right" @click="previewConfig">
+			<button open-type="share" class="right">
 				分享
-			</view>
+			</button>
+			<!-- 	<view class="right" @click="testShare">
+				分享
+			</view> -->
 		</view>
 	</view>
 	</view>
@@ -98,7 +102,8 @@
 	import {
 		addCollReq,
 		cancelCollReq,
-		getGoodsPriceReq
+		getGoodsPriceReq,
+		getMyGoodsDetailReq,
 	} from '@/api/test/index.js'
 
 	export default {
@@ -128,31 +133,91 @@
 				checkFullSel: 0,
 				totalPrice: 0,
 
-				totalCount: 0
+				totalCount: 0,
+
+				navBarTitle: '',
+				ids: []
 			}
 		},
-		onLoad(o) {
-			this.content = getApp().mallItem
-			this.bannerList = getApp().mallItem.images
+		async onLoad(o) {
+			// o.id = 17
+			if (o.id) {
+				this.ids = JSON.parse(o.ids)
+				this.navBarTitle = '首页'
+				let res = await getMyGoodsDetailReq({
+					id: o.id
+				})
+				if (res.code == 0) {
+					console.log('回显商城详情返回值: ', res);
+					this.content = res.data
+					this.bannerList = res.data.images
+					this.parmsList = res.data.skuParams
+					this.totalCount = res.data.collect_total_count
+
+					this.content1 = res.data.content
+					if (this.content.isCollect) {
+						this.lovePic = "/static/mall/love.png"
+					} else {
+						this.lovePic = "/static/mall/no_love.png"
+					}
 
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			} else {
+				let res = await getMyGoodsDetailReq({
+					id: getApp().mallItem.id
+				})
+				if (res.code == 0) {
+					console.log('进入详情返回值', res);
+					this.content = res.data
+					this.bannerList = res.data.images
+					this.parmsList = res.data.skuParams
+					this.totalCount = res.data.collect_total_count
+
+					this.content1 = res.data.content
+					if (this.content.isCollect) {
+						this.lovePic = "/static/mall/love.png"
+					} else {
+						this.lovePic = "/static/mall/no_love.png"
+					}
+					this.parmsList.forEach((item, index) => {
+						this.parmsObj[item.title] = null
+						this.checkFullSel1.push(0)
 
-			this.parmsList = getApp().mallItem.skuParams
-			this.totalCount = this.content.collect_total_count
+					})
 
-			this.parmsList.forEach((item, index) => {
-				this.parmsObj[item.title] = null
-				this.checkFullSel1.push(0)
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
 
-			})
+				// this.content = getApp().mallItem
+				// this.bannerList = getApp().mallItem.images
 
-			this.content1 = getApp().mallItem.content
 
-			if (this.content.isCollect) {
-				this.lovePic = "/static/mall/love.png"
-			} else {
-				this.lovePic = "/static/mall/no_love.png"
+				// this.parmsList = getApp().mallItem.skuParams
+				// this.totalCount = this.content.collect_total_count
+
+				// this.parmsList.forEach((item, index) => {
+				// 	this.parmsObj[item.title] = null
+				// 	this.checkFullSel1.push(0)
+
+				// })
+
+				// this.content1 = getApp().mallItem.content
+
+				// if (this.content.isCollect) {
+				// 	this.lovePic = "/static/mall/love.png"
+				// } else {
+				// 	this.lovePic = "/static/mall/no_love.png"
+				// }
 			}
-			console.log('接收的需求参数', this.content, this.bannerList);
 		},
 
 		watch: {
@@ -186,7 +251,40 @@
 				},
 			}
 		},
+		onShareAppMessage(params) {
+			let ids = []
+			this.parmsList.forEach((item, index) => {
+				item.list.forEach((item1, index1) => {
+					if (item1.isSelect) {
+						ids.push(index1)
+					}
+				})
+			})
+			console.log('选中的二维iindex数组', ids);
+			if (params.from === 'button' || params.from === 'menu') {
+				return {
+					title: this.content.name,
+					imageUrl: this.$picBase + this.content.cover,
+					path: '/pages/mall/detail/index?id=' + this.content.id + '&ids=' + JSON.stringify(ids),
+					mpId: this.$appId,
+					type: this.$shareType,
+				}
+			}
+		},
 		methods: {
+			testShare() {
+				console.log('parmsList', this.parmsList);
+				let ids = []
+				this.parmsList.forEach((item, index) => {
+					item.list.forEach((item1, index1) => {
+						if (item1.isSelect) {
+							ids.push(index1)
+						}
+					})
+				})
+
+				console.log('选中的二维iindex数组', ids);
+			},
 			handleSel(item, index1, outer, pindex) {
 				console.log('this.checkFullSel1', this.checkFullSel1);
 

pages/my/actGoodsDetail/index.scss

@@ -1,3 +1,6 @@
+::v-deep button::after{
+	border: none!important;
+}
 .page{
 	padding-bottom: 208rpx;
 }

pages/my/actGoodsDetail/index.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="page">
-		<navBar title="详情" :back="true" color="black" background="white" />
+		<navBar :backType="navBarTitle" :title="navBarTitle?navBarTitle:'详情'" :back="true" color="black"
+			background="white" />
 		<!-- <image class="topImg" :src="picUrl + '/static/other/noMain_img3.png'" mode=""></image> -->
 		<view class="topImg">
 			<u-swiper type='img' radius="0rpx 0rpx 0rpx 40rpx" :list="bannerList" keyName="image" indicator
@@ -71,7 +72,20 @@
 				</view>
 			</view>
 		</view>
-		<view class="parmasBox" v-for="(item,index) in parmsList" :key="index">
+		<view class="parmasBox" v-for="(item,index) in parmsList" v-if="navBarTitle" :key="index">
+			<view class="con">
+				<view class="title">
+					{{item.title}}
+				</view>
+				<view class="list">
+					<view class="item" v-for="(item1,index1) in item.list" :class="[index1==ids[index]?'act':'']"
+						@click="">
+						{{item1.data}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="parmasBox" v-for="(item,index) in parmsList" :key="index" v-if="!navBarTitle">
 			<view class="con">
 				<view class="title">
 					{{item.title}}
@@ -101,16 +115,16 @@
 		</view>
 		<!-- </view> -->
 
-		<view class="bot">
+		<view class="bot" v-if="!navBarTitle">
 			<view class="left">
 				<view class="price">
 					￥{{totalPrice.toFixed(2)}}
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
-			<view class="right" @click="previewConfig">
+			<button open-type="share" class="right">
 				分享
-			</view>
+			</button>
 		</view>
 	</view>
 </template>
@@ -119,7 +133,9 @@
 	import {
 		addCollReq,
 		cancelCollReq,
-		getGoodsPriceReq
+		getGoodsPriceReq,
+		postOrderReq,
+		getMyGoodsDetailReq,
 	} from '@/api/test/index.js'
 	export default {
 		components: {
@@ -158,39 +174,99 @@
 
 				actData: [],
 
-				cutDownTime: 0
+				cutDownTime: 0,
+
+				navBarTitle: '',
+				ids: []
 			}
 		},
-		onLoad(o) {
-			this.content = getApp().mallItem
-			this.bannerList = getApp().mallItem.images
-			this.totalCount = this.content.collect_total_count
-
-			console.log('售后商品详情', this.content);
-			if (this.content.isCollect) {
-				this.lovePic = "/static/mall/love.png"
+		async onLoad(o) {
+			if (o.id) {
+				this.ids = JSON.parse(o.ids)
+				this.navBarTitle = '首页'
+				let res = await getMyGoodsDetailReq({
+					id: o.id
+				})
+				if (res.code == 0) {
+					console.log('换新商品或活动商品详情返回值: ', res);
+
+					this.content = res.data
+					this.bannerList = res.data.images
+					this.parmsList = res.data.skuParams
+					this.totalCount = res.data.collect_total_count
+
+
+					this.content1 = res.data.content
+					if (this.content.isCollect) {
+						this.lovePic = "/static/mall/love.png"
+					} else {
+						this.lovePic = "/static/mall/no_love.png"
+					}
+
+					if (o.isSellBack) {
+						this.isSellBack = o.isSellBack
+						this.actData = res.data.activity_data
+
+						this.handleRemianTime(this.actData[0].date)
+					}
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
 			} else {
-				this.lovePic = "/static/mall/no_love.png"
-			}
-			this.isSellBack = getApp().isSellBack
+				this.content = getApp().mallItem
+				this.bannerList = getApp().mallItem.images
+				this.totalCount = this.content.collect_total_count
 
-			this.content1 = getApp().mallItem.content
+				console.log('售后商品详情', this.content);
+				if (this.content.isCollect) {
+					this.lovePic = "/static/mall/love.png"
+				} else {
+					this.lovePic = "/static/mall/no_love.png"
+				}
+				this.isSellBack = getApp().isSellBack
 
-			this.parmsList = getApp().mallItem.skuParams
+				this.content1 = getApp().mallItem.content
 
-			this.parmsList.forEach((item, index) => {
-				this.parmsObj[item.title] = null
-				this.checkFullSel1.push(0)
+				this.parmsList = getApp().mallItem.skuParams
 
-			})
+				this.parmsList.forEach((item, index) => {
+					this.parmsObj[item.title] = null
+					this.checkFullSel1.push(0)
 
+				})
 
-			if (getApp().isSellBack) {
-				this.actData = getApp().mallItem.activity_data
 
-				this.handleRemianTime(this.actData[0].date)
+				if (getApp().isSellBack) {
+					this.actData = getApp().mallItem.activity_data
+
+					this.handleRemianTime(this.actData[0].date)
+				}
+				console.log('是否展示活动倒计时', getApp().isSellBack);
+			}
+		},
+		onShareAppMessage(params) {
+			let ids = []
+			this.parmsList.forEach((item, index) => {
+				item.list.forEach((item1, index1) => {
+					if (item1.isSelect) {
+						ids.push(index1)
+					}
+				})
+			})
+			console.log('选中的二维iindex数组', ids);
+			if (params.from === 'button' || params.from === 'menu') {
+				return {
+					title: this.content.name,
+					imageUrl: this.$picBase + this.content.cover,
+					path: '/pages/my/actGoodsDetail/index?id=' + this.content.id + '&ids=' + JSON.stringify(ids) +
+						'&isSellBack=' + this.isSellBack,
+					mpId: this.$appId,
+					type: this.$shareType,
+				}
 			}
-			console.log('是否展示活动倒计时', getApp().isSellBack);
 		},
 		watch: {
 			checkFullSel: {

pages/my/changeNewStep/index.scss

@@ -1,3 +1,6 @@
+::v-deep button::after{
+	border: none!important;
+}
 .page{
 	padding-bottom: 160rpx;
 }

pages/my/changeNewStep/index.vue

@@ -1,15 +1,16 @@
 <template>
 	<view class="page">
-		<navBar :title="tTitle" :back="true" color="black" background="white" />
+		<navBar :backType="navBarTitle" :title="navBarTitle?navBarTitle:tTitle" :back="true" color="black"
+			background="white" />
 
 		<view class="content">
 			<u-parse :content="content.content"></u-parse>
 		</view>
 
-		<view class="btnBox">
-			<view class="rBtn">
+		<view class="btnBox" v-if="showBtn">
+			<button open-type="share" class="rBtn">
 				一键分享
-			</view>
+			</button>
 		</view>
 	</view>
 </template>
@@ -18,6 +19,7 @@
 	import {
 		getSerStepReq,
 		getChangeStepReq,
+		postOrderReq
 	} from '@/api/test/index.js'
 	export default {
 		components: {
@@ -27,12 +29,18 @@
 			return {
 				tTitle: '',
 				title: '',
-				content: null
+				content: null,
+
+				showBtn: true,
+				navBarTitle: ''
 			}
 		},
 		async onLoad(o) {
-			this.tTitle = getApp().stepName
-			if (getApp().stepName == '换新流程') {
+			// o.id = 1
+			if (o.id) {
+				this.showBtn = false
+				this.navBarTitle = '首页'
+				this.tTitle = '换新流程'
 				let res = await getChangeStepReq()
 				if (res.code == 0) {
 					console.log('换新流程返回值: ', res, res.data.content);
@@ -44,6 +52,32 @@
 						icon: 'none'
 					})
 				}
+			} else {
+				this.tTitle = getApp().stepName
+				if (getApp().stepName == '换新流程') {
+					let res = await getChangeStepReq()
+					if (res.code == 0) {
+						console.log('换新流程返回值: ', res, res.data.content);
+						this.title = res.data.title
+						this.content = res.data
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+				}
+			}
+		},
+		onShareAppMessage(params) {
+			if (params.from === 'button' || params.from === 'menu') {
+				return {
+					title: this.tTitle,
+					imageUrl: this.$picUrl + '/static/other/noMain_img3.png',
+					path: '/pages/my/changeNewStep/index?id=1',
+					mpId: this.$appId,
+					type: this.$shareType,
+				}
 			}
 		},
 		methods: {

pages/my/collectDetail/index.scss

@@ -1,3 +1,6 @@
+::v-deep button::after{
+	border: none!important;
+}
 .page{
 	padding-bottom: 208rpx;
 }

pages/my/collectDetail/index.vue

@@ -1,7 +1,8 @@
 <template>
 	<view class="">
 		<view class="page">
-			<navBar title="详情" :back="true" color="black" background="white" />
+			<navBar :backType="navBarTitle" :title="navBarTitle?navBarTitle:'详情'" :back="true" color="black"
+				background="white" />
 			<view class="topImg">
 				<u-swiper type='img' radius="0rpx 0rpx 0rpx 40rpx" :list="bannerList" keyName="image" indicator
 					indicatorMode="line" :autoplay="true" height="1124rpx" imgMode="heightFix" circular
@@ -33,7 +34,20 @@
 					</view>
 				</view>
 			</view>
-			<view class="parmasBox" v-for="(item,index) in parmsList" :key="index">
+			<view class="parmasBox" v-for="(item,index) in parmsList" v-if="navBarTitle" :key="index">
+				<view class="con">
+					<view class="title">
+						{{item.title}}
+					</view>
+					<view class="list">
+						<view class="item" v-for="(item1,index1) in item.list" :class="[index1==ids[index]?'act':'']"
+							@click="">
+							{{item1.data}}
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="parmasBox" v-for="(item,index) in parmsList" :key="index" v-if="!navBarTitle">
 				<view class="con">
 					<view class="title">
 						{{item.title}}
@@ -63,16 +77,16 @@
 			</view>
 		</view>
 
-		<view class="bot">
+		<view class="bot" v-if="!navBarTitle">
 			<view class="left">
 				<view class="price">
 					￥{{totalPrice.toFixed(2)}}
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
-			<view class="right" @click="previewConfig">
+			<button open-type="share" class="right">
 				分享
-			</view>
+			</button>
 		</view>
 	</view>
 	</view>
@@ -85,7 +99,8 @@
 	import {
 		addCollReq,
 		cancelCollReq,
-		getGoodsPriceReq
+		getGoodsPriceReq,
+		postOrderReq,
 	} from '@/api/test/index.js'
 	export default {
 		components: {
@@ -116,39 +131,99 @@
 				checkFullSel: 0,
 				totalPrice: 0,
 				parmsObj: {},
+
+				navBarTitle: '',
+				ids: []
 			}
 		},
 		async onLoad(o) {
-			let res = await getMyCollectDetailReq({
-				id: getApp().Sid
-			})
-			if (res.code == 0) {
-				console.log('我的收藏详情', res);
-				this.content = res.data
-				this.bannerList = this.content.images
-				this.totalCount = this.content.collect_total_count
+			// o.id = 1
+			if (o.id) {
+				this.ids = JSON.parse(o.ids)
+				this.navBarTitle = '首页'
+				let res = await getMyCollectDetailReq({
+					id: o.id
+				})
+				if (res.code == 0) {
+					console.log('我的收藏详情', res);
+					this.content = res.data
+					this.bannerList = this.content.images
+					this.totalCount = this.content.collect_total_count
+
+					if (this.content.isCollect) {
+						this.lovePic = "/static/mall/love.png"
+					} else {
+						this.lovePic = "/static/mall/no_love.png"
+					}
+
+					this.content1 = this.content.content
+
+					this.parmsList = this.content.skuParams
+
+					this.parmsList.forEach((item, index) => {
+						this.parmsObj[item.title] = null
+						this.checkFullSel1.push(0)
+
+					})
 
-				if (this.content.isCollect) {
-					this.lovePic = "/static/mall/love.png"
 				} else {
-					this.lovePic = "/static/mall/no_love.png"
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				}
+			} else {
+				let res = await getMyCollectDetailReq({
+					id: getApp().Sid
+				})
+				if (res.code == 0) {
+					console.log('我的收藏详情', res);
+					this.content = res.data
+					this.bannerList = this.content.images
+					this.totalCount = this.content.collect_total_count
 
-				this.content1 = this.content.content
+					if (this.content.isCollect) {
+						this.lovePic = "/static/mall/love.png"
+					} else {
+						this.lovePic = "/static/mall/no_love.png"
+					}
 
-				this.parmsList = this.content.skuParams
+					this.content1 = this.content.content
 
-				this.parmsList.forEach((item, index) => {
-					this.parmsObj[item.title] = null
-					this.checkFullSel1.push(0)
+					this.parmsList = this.content.skuParams
 
-				})
+					this.parmsList.forEach((item, index) => {
+						this.parmsObj[item.title] = null
+						this.checkFullSel1.push(0)
 
-			} else {
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
+					})
+
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			}
+		},
+		onShareAppMessage(params) {
+			let ids = []
+			this.parmsList.forEach((item, index) => {
+				item.list.forEach((item1, index1) => {
+					if (item1.isSelect) {
+						ids.push(index1)
+					}
 				})
+			})
+			console.log('选中的二维iindex数组', ids);
+			if (params.from === 'button' || params.from === 'menu') {
+				return {
+					title: this.content.name,
+					imageUrl: this.$picBase + this.content.cover,
+					path: '/pages/my/collectDetail/index?id=' + this.content.id + '&ids=' + JSON.stringify(ids),
+					mpId: this.$appId,
+					type: this.$shareType,
+				}
 			}
 		},
 		watch: {

pages/my/set/index.vue

@@ -9,7 +9,7 @@
 						显示售价
 					</view>
 					<view class="right">
-						<u-switch v-model="value" @change="change" activeColor="#F7790C"
+						<u-switch v-model="value1" @change="change1" activeColor="#F7790C"
 							inactiveColor="#E6E6E6"></u-switch>
 					</view>
 				</view>
@@ -18,7 +18,7 @@
 						显示会员价
 					</view>
 					<view class="right">
-						<u-switch v-model="value1" @change="change" activeColor="#F7790C"
+						<u-switch v-model="value2" @change="change2" activeColor="#F7790C"
 							inactiveColor="#E6E6E6"></u-switch>
 					</view>
 				</view>
@@ -27,7 +27,7 @@
 						显示VIP价
 					</view>
 					<view class="right">
-						<u-switch v-model="value2" @change="change" activeColor="#F7790C"
+						<u-switch v-model="value3" @change="change3" activeColor="#F7790C"
 							inactiveColor="#E6E6E6"></u-switch>
 					</view>
 				</view>
@@ -45,19 +45,79 @@
 			return {
 				role: '',
 				role: '',
-				value: false,
 				value1: true,
 				value2: false,
-
+				value3: false,
+				// switchs: uni.getStorageSync('switchs')
 			}
 		},
 		onLoad(o) {
 			this.role = o.role
 		},
-		methods: {
-			change() {
+		onShow() {
+			this.value1 = Boolean(this.switchs[0])
+			this.value2 = Boolean(this.switchs[1])
+			this.value3 = Boolean(this.switchs[2])
 
+			console.log(this.switchs);
+		},
+		computed: {
+			switchs() {
+				return uni.getStorageSync('switchs')
 			}
+		},
+		methods: {
+			change1(e) {
+				if (e) {
+					this.switchs[0] = 1
+					if (this.value2) {
+						this.value2 = false
+						this.switchs[1] = 0
+					}
+					if (this.value3) {
+						this.value3 = false
+						this.switchs[2] = 0
+					}
+				} else {
+					this.switchs[0] = 0
+				}
+				uni.setStorageSync('switchs', this.switchs)
+				console.log(this.switchs);
+			},
+			change2(e) {
+				if (e) {
+					this.switchs[1] = 1
+					if (this.value1) {
+						this.value1 = false
+						this.switchs[0] = 0
+					}
+					if (this.value3) {
+						this.value3 = false
+						this.switchs[2] = 0
+					}
+				} else {
+					this.switchs[1] = 0
+				}
+				uni.setStorageSync('switchs', this.switchs)
+				console.log(this.switchs);
+			},
+			change3(e) {
+				if (e) {
+					this.switchs[2] = 1
+					if (this.value1) {
+						this.value1 = false
+						this.switchs[0] = 0
+					}
+					if (this.value2) {
+						this.value2 = false
+						this.switchs[1] = 0
+					}
+				} else {
+					this.switchs[2] = 0
+				}
+				uni.setStorageSync('switchs', this.switchs)
+				console.log(this.switchs);
+			},
 		}
 	}
 </script>

pages/my/userInfo/index.vue

@@ -177,7 +177,7 @@
 				console.log('upImg的file', file)
 				let _this = this
 				uni.uploadFile({
-					url: uploadUrl.baseUrl,
+					url: uploadUrl.baseUrl + '/api/upload',
 					filePath: file,
 					name: 'file',
 					header: {

pages/service.vue

@@ -11,7 +11,7 @@
 					<text>{{item.title}}</text>
 				</view>
 
-				<view class="con" @click="goDetail(item1.content,item1.title)" v-for="(item1,index1) in item.list"
+				<view class="con" @click="goDetail(item1.content,item1.title,item1)" v-for="(item1,index1) in item.list"
 					:style="{background:`url(${picBase+item1.image}) ` }">
 					<view class="label">
 						<image src="/static/index/part1_icon.png" mode="" class="img"></image>
@@ -62,9 +62,10 @@
 			}
 		},
 		methods: {
-			goDetail(content, title) {
+			goDetail(content, title, item) {
 				getApp().serCon = content
 				getApp().sTitle = title
+				getApp().Sdetail = item
 				uni.navigateTo({
 					url: '/pages/service/detail/index'
 				})

pages/service/detail/index.scss

@@ -1,3 +1,6 @@
+::v-deep button::after{
+	border: none!important;
+}
 .content{
 	padding: 48rpx 32rpx  0 32rpx;
 	.title{

pages/service/detail/index.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="page">
-		<navBar title="服务" :back="true" color="black" background="white" />
+		<navBar :backType="navBarTitle" :title="navBarTitle?navBarTitle:'服务'" :back="true" color="black"
+			background="white" />
 
 		<view class="content">
 			<view class="title">
@@ -9,17 +10,18 @@
 			<u-parse :content="content"></u-parse>
 		</view>
 
-		<view class="btnBox">
-			<view class="rBtn">
+		<view class="btnBox" v-if="showBtn">
+			<button open-type="share" class="rBtn">
 				一键分享
-			</view>
+			</button>
 		</view>
 	</view>
 </template>
 
 <script>
 	import {
-		getServerDataReq
+		postOrderReq,
+		getConfigTextByIdReq,
 	} from '@/api/test/index.js'
 	export default {
 		components: {
@@ -29,12 +31,48 @@
 			return {
 				picUrl: this.$picUrl,
 				content: null,
-				title: null
+				title: null,
+				detail: null,
+				showBtn: true,
+				navBarTitle: ''
 			}
 		},
-		async onLoad(options) {
-			this.content = getApp().serCon
-			this.title = getApp().sTitle
+		async onLoad(o) {
+			// o.id = 1
+			if (o.id) {
+				this.showBtn = false
+				this.navBarTitle = '首页'
+				let res = await getConfigTextByIdReq({
+					id: o.id
+				})
+				if (res.code == 0) {
+					console.log('服务详情返回值: ', res);
+					this.datail = res.data
+					this.content = res.data.content
+					this.title = res.data.title
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			} else {
+				this.content = getApp().serCon
+				this.title = getApp().sTitle
+
+				this.datail = getApp().Sdetail
+			}
+		},
+		onShareAppMessage(params) {
+			if (params.from === 'button' || params.from === 'menu') {
+				return {
+					title: this.title,
+					imageUrl: this.$picBase + this.datail.image,
+					path: '/pages/service/detail/index?id=' + this.datail.id,
+					mpId: this.$appId,
+					type: this.$shareType,
+				}
+			}
 		},
 		methods: {
 

store/modules/user.js

@@ -8,6 +8,8 @@ export default {
 		testInfo: '',
 		testInfo2: '',
 
+		switchs: [1, 0, 0]
+
 		// 持久化常用参数
 		// token: uni.getStorageSync('vuex').token, // token
 	},
@@ -20,6 +22,10 @@ export default {
 		},
 		testInfo3(state) {
 			return state;
+		},
+
+		testInfo4(state) {
+			return state.switchs;
 		}
 	},
 	//唯一修改state值的方法 
@@ -34,6 +40,9 @@ export default {
 		testMut3(state) {
 			state.testInfo = '',
 				state.testInfo2 = ''
+		},
+		testMut4(state, data) {
+			state.switchs = data
 		}
 	},
 	// 异步的操作
@@ -71,5 +80,11 @@ export default {
 			console.log('jinrul-------------testAct3 ');
 			commit('testMut3')
 		},
+		testAct4({
+			commit
+		}) {
+			console.log('jinrul-------------testAct3 ');
+			commit('testMut3')
+		},
 	},
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1 +1 @@
-<view class="page data-v-0eb5ec80"><nav-bar vue-id="76bf8a26-1" title="产品指南" back="{{true}}" color="black" background="white" class="data-v-0eb5ec80" bind:__l="__l"></nav-bar><view class="content data-v-0eb5ec80"><view class="title data-v-0eb5ec80">{{''+content.title+''}}</view><view class="p data-v-0eb5ec80"><u-parse vue-id="76bf8a26-2" content="{{content.content}}" class="data-v-0eb5ec80" bind:__l="__l"></u-parse></view><image style="margin-bottom:64rpx;" src="{{picBase+content.image}}" mode class="data-v-0eb5ec80"></image></view><view class="btnBox data-v-0eb5ec80"><view class="rBtn data-v-0eb5ec80">一键分享</view></view></view>
+<view class="page data-v-0c03d974"><nav-bar vue-id="76bf8a26-1" backType="{{navBarTitle}}" title="{{navBarTitle?navBarTitle:'产品指南'}}" back="{{true}}" color="black" background="white" class="data-v-0c03d974" bind:__l="__l"></nav-bar><view class="content data-v-0c03d974"><view class="title data-v-0c03d974">{{''+content.title+''}}</view><view class="p data-v-0c03d974"><u-parse vue-id="76bf8a26-2" content="{{content.content}}" class="data-v-0c03d974" bind:__l="__l"></u-parse></view><image style="margin-bottom:64rpx;" src="{{picBase+content.image}}" mode class="data-v-0c03d974"></image></view><block wx:if="{{showBtn}}"><view class="btnBox data-v-0c03d974"><button class="rBtn data-v-0c03d974" open-type="share">分享</button></view></block></view>

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

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

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

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

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

@@ -1 +1 @@
-<view class="page data-v-999984a4"><nav-bar vue-id="6ade19de-1" title="{{tTitle}}" back="{{true}}" color="black" background="white" class="data-v-999984a4" bind:__l="__l"></nav-bar><view class="content data-v-999984a4"><u-parse vue-id="6ade19de-2" content="{{content.content}}" class="data-v-999984a4" bind:__l="__l"></u-parse></view><view class="btnBox data-v-999984a4"><view class="rBtn data-v-999984a4">一键分享</view></view></view>
+<view class="page data-v-d947d5e2"><nav-bar vue-id="6ade19de-1" backType="{{navBarTitle}}" title="{{navBarTitle?navBarTitle:tTitle}}" back="{{true}}" color="black" background="white" class="data-v-d947d5e2" bind:__l="__l"></nav-bar><view class="content data-v-d947d5e2"><u-parse vue-id="6ade19de-2" content="{{content.content}}" class="data-v-d947d5e2" bind:__l="__l"></u-parse></view><block wx:if="{{showBtn}}"><view class="btnBox data-v-d947d5e2"><button class="rBtn data-v-d947d5e2" open-type="share">一键分享</button></view></block></view>

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

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

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

@@ -1 +1 @@
-.content.data-v-d9cb35f6{background:#f1f1f1;min-height:calc(100vh - 200rpx);padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-d9cb35f6{background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;margin-bottom:24rpx}.content .item .line.data-v-d9cb35f6:last-child{border-bottom:none}.content .item .line.data-v-d9cb35f6{display:flex;justify-content:space-between;align-items:center;border-bottom:2rpx solid #e6e6e6;height:140rpx}.content .item .line .left.data-v-d9cb35f6{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333}.content .item .line .right.data-v-d9cb35f6{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-d9cb35f6{width:100rpx;height:100rpx;border-radius:50%;margin-right:20rpx}.content .item .line .right .arr.data-v-d9cb35f6{width:14rpx;height:24rpx}
+.content.data-v-5a73851e{background:#f1f1f1;min-height:calc(100vh - 200rpx);padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-5a73851e{background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;margin-bottom:24rpx}.content .item .line.data-v-5a73851e:last-child{border-bottom:none}.content .item .line.data-v-5a73851e{display:flex;justify-content:space-between;align-items:center;border-bottom:2rpx solid #e6e6e6;height:140rpx}.content .item .line .left.data-v-5a73851e{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333}.content .item .line .right.data-v-5a73851e{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-5a73851e{width:100rpx;height:100rpx;border-radius:50%;margin-right:20rpx}.content .item .line .right .arr.data-v-5a73851e{width:14rpx;height:24rpx}

unpackage/dist/build/mp-weixin/pages/service.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/service"],{"020d":function(e,t,n){},1520:function(e,t,n){"use strict";var a=n("020d"),c=n.n(a);c.a},"17cb":function(e,t,n){"use strict";n.r(t);var a=n("bac9"),c=n("e24d");for(var r in c)["default"].indexOf(r)<0&&function(e){n.d(t,e,(function(){return c[e]}))}(r);n("1520");var i=n("f0c5"),u=Object(i["a"])(c["default"],a["b"],a["c"],!1,null,"85cbfff0",null,!1,a["a"],void 0);t["default"]=u.exports},"3a72":function(e,t,n){"use strict";(function(e){var a=n("4ea4");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var c=a(n("2eee")),r=a(n("c973")),i=n("9ca2"),u={data:function(){return{picUrl:this.$picUrl,picBase:this.$picBase,list:[]}},onLoad:function(e){var t=this;return(0,r.default)(c.default.mark((function e(){var n;return c.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,(0,i.getServerDataReq)({});case 2:n=e.sent,0==n.code&&(t.list=n.data,console.log("服务列表: ",n,t.list));case 4:case"end":return e.stop()}}),e)})))()},methods:{goDetail:function(t,n){getApp().serCon=t,getApp().sTitle=n,e.navigateTo({url:"/pages/service/detail/index"})}}};t.default=u}).call(this,n("543d")["default"])},"4f56":function(e,t,n){"use strict";(function(e,t){var a=n("4ea4");n("d716");a(n("66fd"));var c=a(n("17cb"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(c.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])},bac9:function(e,t,n){"use strict";n.d(t,"b",(function(){return a})),n.d(t,"c",(function(){return c})),n.d(t,"a",(function(){}));var a=function(){var e=this.$createElement;this._self._c},c=[]},e24d:function(e,t,n){"use strict";n.r(t);var a=n("3a72"),c=n.n(a);for(var r in a)["default"].indexOf(r)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(r);t["default"]=c.a}},[["4f56","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/service"],{"17cb":function(e,t,n){"use strict";n.r(t);var a=n("ccc1"),c=n("e24d");for(var r in c)["default"].indexOf(r)<0&&function(e){n.d(t,e,(function(){return c[e]}))}(r);n("f5e4");var i=n("f0c5"),u=Object(i["a"])(c["default"],a["b"],a["c"],!1,null,"94c41ad2",null,!1,a["a"],void 0);t["default"]=u.exports},"3a72":function(e,t,n){"use strict";(function(e){var a=n("4ea4");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var c=a(n("2eee")),r=a(n("c973")),i=n("9ca2"),u={data:function(){return{picUrl:this.$picUrl,picBase:this.$picBase,list:[]}},onLoad:function(e){var t=this;return(0,r.default)(c.default.mark((function e(){var n;return c.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,(0,i.getServerDataReq)({});case 2:n=e.sent,0==n.code&&(t.list=n.data,console.log("服务列表: ",n,t.list));case 4:case"end":return e.stop()}}),e)})))()},methods:{goDetail:function(t,n,a){getApp().serCon=t,getApp().sTitle=n,getApp().Sdetail=a,e.navigateTo({url:"/pages/service/detail/index"})}}};t.default=u}).call(this,n("543d")["default"])},"4c54":function(e,t,n){},"4f56":function(e,t,n){"use strict";(function(e,t){var a=n("4ea4");n("d716");a(n("66fd"));var c=a(n("17cb"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(c.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])},ccc1:function(e,t,n){"use strict";n.d(t,"b",(function(){return a})),n.d(t,"c",(function(){return c})),n.d(t,"a",(function(){}));var a=function(){var e=this.$createElement;this._self._c},c=[]},e24d:function(e,t,n){"use strict";n.r(t);var a=n("3a72"),c=n.n(a);for(var r in a)["default"].indexOf(r)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(r);t["default"]=c.a},f5e4:function(e,t,n){"use strict";var a=n("4c54"),c=n.n(a);c.a}},[["4f56","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pages/service.wxml

@@ -1 +1 @@
-<view class="container data-v-85cbfff0"><nav-bar vue-id="c84c028c-1" title="服务" back="{{false}}" color="black" flex="cen" background="#fff" class="data-v-85cbfff0" bind:__l="__l"></nav-bar><view class="list data-v-85cbfff0"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view class="item data-v-85cbfff0"><view class="topTitle data-v-85cbfff0"><view class="water data-v-85cbfff0">GIGESI</view><text class="data-v-85cbfff0">{{item.title}}</text></view><block wx:for="{{item.list}}" wx:for-item="item1" wx:for-index="index1"><view data-event-opts="{{[['tap',[['goDetail',['$0','$1'],[[['list','',index],['list','',index1,'content']],[['list','',index],['list','',index1,'title']]]]]]]}}" class="con data-v-85cbfff0" style="{{'background:'+('url('+(picBase+item1.image)+') ')+';'}}" bindtap="__e"><view class="label data-v-85cbfff0"><image class="img data-v-85cbfff0" src="/static/index/part1_icon.png" mode></image><view class="item2 data-v-85cbfff0">{{''+item1.title+''}}</view><view class="des data-v-85cbfff0">详情</view></view><view class="cen data-v-85cbfff0"><block wx:for="{{item1.label}}" wx:for-item="item2" wx:for-index="index2"><view class="item3 data-v-85cbfff0">{{''+item2.title+''}}</view></block></view><view class="bot data-v-85cbfff0"><image class="img2 data-v-85cbfff0" style="width:48rpx;height:48rpx;" src="{{picUrl+'/static/service/look.png'}}" mode></image></view></view></block></view></block></view></view>
+<view class="container data-v-94c41ad2"><nav-bar vue-id="c84c028c-1" title="服务" back="{{false}}" color="black" flex="cen" background="#fff" class="data-v-94c41ad2" bind:__l="__l"></nav-bar><view class="list data-v-94c41ad2"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view class="item data-v-94c41ad2"><view class="topTitle data-v-94c41ad2"><view class="water data-v-94c41ad2">GIGESI</view><text class="data-v-94c41ad2">{{item.title}}</text></view><block wx:for="{{item.list}}" wx:for-item="item1" wx:for-index="index1"><view data-event-opts="{{[['tap',[['goDetail',['$0','$1','$2'],[[['list','',index],['list','',index1,'content']],[['list','',index],['list','',index1,'title']],[['list','',index],['list','',index1]]]]]]]}}" class="con data-v-94c41ad2" style="{{'background:'+('url('+(picBase+item1.image)+') ')+';'}}" bindtap="__e"><view class="label data-v-94c41ad2"><image class="img data-v-94c41ad2" src="/static/index/part1_icon.png" mode></image><view class="item2 data-v-94c41ad2">{{''+item1.title+''}}</view><view class="des data-v-94c41ad2">详情</view></view><view class="cen data-v-94c41ad2"><block wx:for="{{item1.label}}" wx:for-item="item2" wx:for-index="index2"><view class="item3 data-v-94c41ad2">{{''+item2.title+''}}</view></block></view><view class="bot data-v-94c41ad2"><image class="img2 data-v-94c41ad2" style="width:48rpx;height:48rpx;" src="{{picUrl+'/static/service/look.png'}}" mode></image></view></view></block></view></block></view></view>

unpackage/dist/build/mp-weixin/pages/service.wxss

@@ -1 +1 @@
-.list.data-v-85cbfff0{padding:0rpx 32rpx 24rpx 32rpx;display:flex;flex-direction:column}.list .item .topTitle.data-v-85cbfff0{font-size:40rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333;margin-bottom:32rpx;margin-top:70rpx;position:relative}.list .item .topTitle text.data-v-85cbfff0{position:relative;z-index:1}.list .item .topTitle .water.data-v-85cbfff0{position:absolute;left:0;top:-30rpx;font-size:52rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#f0efef;z-index:0}.list .item .con.data-v-85cbfff0{height:300rpx;border-radius:8rpx 24rpx 8rpx 24rpx;background-repeat:no-repeat!important;background-size:cover!important;display:flex;flex-direction:column;padding-left:36rpx;padding-right:36rpx;margin-bottom:16rpx}.list .item .con .label.data-v-85cbfff0{display:flex;align-items:center;margin-top:48rpx;position:relative}.list .item .con .label .img.data-v-85cbfff0{width:56rpx;height:28rpx;position:absolute;top:-12rpx;left:-10rpx}.list .item .con .label .item2.data-v-85cbfff0{font-size:36rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#fff;margin-right:16rpx}.list .item .con .label .des.data-v-85cbfff0{font-size:22rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#fff;width:60rpx;height:36rpx;line-height:36rpx;background:linear-gradient(90deg,#fc8c1c,#f7790c);border-radius:2rpx;display:flex;justify-content:center}.list .item .con .cen.data-v-85cbfff0{display:flex;margin-top:24rpx}.list .item .con .cen .item3.data-v-85cbfff0{min-width:104rpx;padding:8rpx;height:36rpx;background:#fff;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:#333;box-sizing:border-box}.list .item .con .bot.data-v-85cbfff0{display:flex;justify-content:flex-end;margin-top:70rpx}.list .item .con .bot .img2.data-v-85cbfff0{width:48rpx;height:48rpx}
+.list.data-v-94c41ad2{padding:0rpx 32rpx 24rpx 32rpx;display:flex;flex-direction:column}.list .item .topTitle.data-v-94c41ad2{font-size:40rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333;margin-bottom:32rpx;margin-top:70rpx;position:relative}.list .item .topTitle text.data-v-94c41ad2{position:relative;z-index:1}.list .item .topTitle .water.data-v-94c41ad2{position:absolute;left:0;top:-30rpx;font-size:52rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#f0efef;z-index:0}.list .item .con.data-v-94c41ad2{height:300rpx;border-radius:8rpx 24rpx 8rpx 24rpx;background-repeat:no-repeat!important;background-size:cover!important;display:flex;flex-direction:column;padding-left:36rpx;padding-right:36rpx;margin-bottom:16rpx}.list .item .con .label.data-v-94c41ad2{display:flex;align-items:center;margin-top:48rpx;position:relative}.list .item .con .label .img.data-v-94c41ad2{width:56rpx;height:28rpx;position:absolute;top:-12rpx;left:-10rpx}.list .item .con .label .item2.data-v-94c41ad2{font-size:36rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#fff;margin-right:16rpx}.list .item .con .label .des.data-v-94c41ad2{font-size:22rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#fff;width:60rpx;height:36rpx;line-height:36rpx;background:linear-gradient(90deg,#fc8c1c,#f7790c);border-radius:2rpx;display:flex;justify-content:center}.list .item .con .cen.data-v-94c41ad2{display:flex;margin-top:24rpx}.list .item .con .cen .item3.data-v-94c41ad2{min-width:104rpx;padding:8rpx;height:36rpx;background:#fff;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:#333;box-sizing:border-box}.list .item .con .bot.data-v-94c41ad2{display:flex;justify-content:flex-end;margin-top:70rpx}.list .item .con .bot .img2.data-v-94c41ad2{width:48rpx;height:48rpx}

unpackage/dist/build/mp-weixin/pages/service/detail/index.wxml

@@ -1 +1 @@
-<view class="page data-v-6553dd9a"><nav-bar vue-id="99d34b82-1" title="服务" back="{{true}}" color="black" background="white" class="data-v-6553dd9a" bind:__l="__l"></nav-bar><view class="content data-v-6553dd9a"><view class="title data-v-6553dd9a">{{''+title+''}}</view><u-parse vue-id="99d34b82-2" content="{{content}}" class="data-v-6553dd9a" bind:__l="__l"></u-parse></view><view class="btnBox data-v-6553dd9a"><view class="rBtn data-v-6553dd9a">一键分享</view></view></view>
+<view class="page data-v-a716671a"><nav-bar vue-id="99d34b82-1" backType="{{navBarTitle}}" title="{{navBarTitle?navBarTitle:'服务'}}" back="{{true}}" color="black" background="white" class="data-v-a716671a" bind:__l="__l"></nav-bar><view class="content data-v-a716671a"><view class="title data-v-a716671a">{{''+title+''}}</view><u-parse vue-id="99d34b82-2" content="{{content}}" class="data-v-a716671a" bind:__l="__l"></u-parse></view><block wx:if="{{showBtn}}"><view class="btnBox data-v-a716671a"><button class="rBtn data-v-a716671a" open-type="share">一键分享</button></view></block></view>

unpackage/dist/build/mp-weixin/pages/service/detail/index.wxss

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

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

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

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

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

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

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