会员价格全部实现

App.vue

@@ -2,6 +2,7 @@
 	// import {
 	// 	getPricePercentReq,
 	// } from '@/api/test/index.js'
+	import uploadUrl from '@/common/config.js'
 	export default {
 		globalData: {
 			showPrivacy: false,
@@ -25,30 +26,19 @@
 			}
 
 			uni.setStorageSync('switchs', [1, 0, 0])
+			uni.request({
+				url: uploadUrl.baseUrl + '/api/common/getPriceConfig',
+				method: "GET",
+				success: (res) => {
+					if (res.data.code == 0) {
+						console.log('app.vue中获取的会员折扣数据', res.data.data)
+						uni.setStorageSync('priceConfig', res.data.data)
+					}
+				}
+			})
 
-			// let res = await getPricePercentReq()
-			// if (res.code == 0) {
-			// 	this.priceConfig = res.data
-			// 	console.log('获取的价格百分比', this.priceConfig);
-			// } else {
-			// 	uni.showToast({
-			// 		title: res.message,
-			// 		icon: 'none'
-			// 	})
-			// }
-		},
-		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'
-			// 	})
-			// }
 		},
+		async onShow() {},
 		onHide: function() {
 			// console.log('App Hide')
 		}

main.js

@@ -25,6 +25,17 @@ import uploadUrl from '@/common/config.js'
 Vue.prototype.$picUrl = uploadUrl.picUrl
 Vue.prototype.$picBase = uploadUrl.picBase
 
+Vue.prototype.$getCutDown = () => {
+	if (uni.getStorageSync('switchs')[0]) {
+		return 1
+	} else if (uni.getStorageSync('switchs')[1]) {
+		return uni.getStorageSync('priceConfig').member_price
+	} else if (uni.getStorageSync('switchs')[2]) {
+		return uni.getStorageSync('priceConfig').vip_price
+	}
+}
+
+
 // 常见功能函数封装
 Vue.prototype.$toast = (title, icon = "none", duration = 1500) => {
 	uni.showToast({

pages/index.vue

@@ -162,7 +162,7 @@
 				navImg: require('@/static/index/logo.png'),
 				list: [],
 
-				priceConfig: {}
+				// priceConfig: {}
 			}
 		},
 		async onLoad() {
@@ -194,17 +194,17 @@
 				})
 			}
 
-			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'
-				})
-			}
+			// 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) {

pages/index/aiControlSys/index.vue

@@ -283,7 +283,8 @@
 				selMb: [],
 				selCl: [],
 				selkt: [],
-				pConfig: -1
+				pConfig: -1,
+				cutdownRatio: 1
 			}
 		},
 		async onLoad(options) {
@@ -312,6 +313,9 @@
 					.id)
 			}
 		},
+		onShow() {
+			this.cutdownRatio = this.$getCutDown()
+		},
 		methods: {
 			sel(type, item, index) {
 				if (type == 'hx') {
@@ -350,7 +354,7 @@
 				})
 				if (res.code == 0) {
 					console.log('配置价格-智控: ', res)
-					this.totalPrice = res.data.money
+					this.totalPrice = res.data.money * this.cutdownRatio
 					this.pConfig = res.data.id
 
 				} else {

pages/index/customMian_step1/index.vue

@@ -315,7 +315,7 @@
 				totalPrice: 0,
 
 				pConfig: -1,
-				cutdownType: 1
+				cutdownRatio: 1
 			}
 		},
 		async onLoad(o) {
@@ -373,14 +373,8 @@
 
 		},
 		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);
+			this.cutdownRatio = this.$getCutDown()
+			console.log('哪种折扣价格', this.cutdownRatio);
 			console.log('确定选择的那一项', getApp().chooseItem_kt);
 			if (getApp().chooseItem_kt) {
 				let index = getApp().index_kt
@@ -401,15 +395,6 @@
 				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({
@@ -423,7 +408,7 @@
 				})
 				if (res.code == 0) {
 					console.log('配置价格-主灯: ', res)
-					this.totalPrice = res.data.money
+					this.totalPrice = res.data.money * this.cutdownRatio
 					this.pConfig = res.data.id
 
 				} else {

pages/index/customNoMian_step1/index.vue

@@ -282,7 +282,8 @@
 
 				totalPrice: 0,
 
-				pConfig: -1
+				pConfig: -1,
+				cutdownRatio: 1
 			}
 		},
 		async onLoad(o) {
@@ -314,6 +315,9 @@
 			}
 
 		},
+		onShow() {
+			this.cutdownRatio = this.$getCutDown()
+		},
 		computed: {},
 		methods: {
 			async getPrice(type = 1, house_type, space, brand, series, version) {
@@ -327,7 +331,7 @@
 				})
 				if (res.code == 0) {
 					console.log('配置价格-无主灯: ', res)
-					this.totalPrice = res.data.money
+					this.totalPrice = res.data.money * this.cutdownRatio
 					this.pConfig = res.data.id
 				} else {
 					uni.showToast({

pages/index/fullHouseWifi/index.vue

@@ -155,6 +155,7 @@
 				pConfig: -1,
 
 				orderSuc: false,
+				cutdownRatio: 1
 			}
 		},
 		async onLoad(options) {
@@ -170,6 +171,9 @@
 				this.getPrice(4, this.selHx.id)
 			}
 		},
+		onShow() {
+			this.cutdownRatio = this.$getCutDown()
+		},
 		onShareAppMessage(params) {
 			if (params.from === 'button' || params.from === 'menu') {
 				return {
@@ -227,7 +231,7 @@
 				})
 				if (res.code == 0) {
 					console.log('配置价格-wifi: ', res)
-					this.totalPrice = res.data.money
+					this.totalPrice = res.data.money * this.cutdownRatio
 
 					this.pConfig = res.data.id
 				} else {

pages/mall/detail/index.vue

@@ -136,7 +136,8 @@
 				totalCount: 0,
 
 				navBarTitle: '',
-				ids: []
+				ids: [],
+				cutdownRatio: 1
 			}
 		},
 		async onLoad(o) {
@@ -239,7 +240,7 @@
 						if (res.code == 0) {
 							console.log(res);
 
-							this.totalPrice = res.data
+							this.totalPrice = res.data * this.cutdownRatio
 						} else {
 							uni.showToast({
 								title: res.message,
@@ -251,6 +252,9 @@
 				},
 			}
 		},
+		onShow() {
+			this.cutdownRatio = this.$getCutDown()
+		},
 		onShareAppMessage(params) {
 			let ids = []
 			this.parmsList.forEach((item, index) => {

pages/my/actGoodsDetail/index.vue

@@ -177,7 +177,8 @@
 				cutDownTime: 0,
 
 				navBarTitle: '',
-				ids: []
+				ids: [],
+				cutdownRatio: 1
 			}
 		},
 		async onLoad(o) {
@@ -247,6 +248,9 @@
 				console.log('是否展示活动倒计时', getApp().isSellBack);
 			}
 		},
+		onShow() {
+			this.cutdownRatio = this.$getCutDown()
+		},
 		onShareAppMessage(params) {
 			let ids = []
 			this.parmsList.forEach((item, index) => {
@@ -287,7 +291,7 @@
 						if (res.code == 0) {
 							console.log(res);
 
-							this.totalPrice = res.data
+							this.totalPrice = res.data * this.cutdownRatio
 						} else {
 							uni.showToast({
 								title: res.message,

pages/my/collectDetail/index.vue

@@ -133,7 +133,8 @@
 				parmsObj: {},
 
 				navBarTitle: '',
-				ids: []
+				ids: [],
+				cutdownRatio: 1
 			}
 		},
 		async onLoad(o) {
@@ -206,6 +207,9 @@
 				}
 			}
 		},
+		onShow() {
+			this.cutdownRatio = this.$getCutDown()
+		},
 		onShareAppMessage(params) {
 			let ids = []
 			this.parmsList.forEach((item, index) => {
@@ -245,7 +249,7 @@
 						if (res.code == 0) {
 							console.log(res);
 
-							this.totalPrice = res.data
+							this.totalPrice = res.data * this.cutdownRatio
 						} else {
 							uni.showToast({
 								title: res.message,

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

@@ -1 +1 @@
-.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}
+.data-v-40965056 .u-tabs__wrapper__nav__line{background:#f7790c!important}.searchAndTab.data-v-40965056{background:#fff;padding-top:24rpx;position:fixed;width:100%;top:173rpx}.searchAndTab .searchBox.data-v-40965056{padding:0 32rpx}.content.data-v-40965056{display:flex}.content .leftMenu.data-v-40965056{width:212rpx;height:calc(100vh - 380rpx);background:#fff;overflow-y:scroll}.content .leftMenu .item.data-v-40965056{height:98rpx;font-size:28rpx;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#080f18;display:flex;align-items:center;justify-content:center;padding:0 10rpx;word-wrap:break-word;word-break:break-all;position:relative}.content .leftMenu .halfCircle.data-v-40965056{position:absolute;right:35rpx;top:40rpx;z-index:0}.content .leftMenu .act.data-v-40965056{background:#f2f2f2}.content .rightDes.data-v-40965056{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-40965056{display:flex;align-items:center;justify-content:space-between}.content .rightDes .item .bottom.data-v-40965056{display:flex;flex-wrap:wrap;margin-top:32rpx}.content .rightDes .item .bottom image.data-v-40965056{width:136rpx;height:136rpx;margin-right:30rpx;margin-bottom:30rpx}

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

@@ -1 +1 @@
-<view class="page data-v-eb84a78c"><nav-bar vue-id="2a133faa-1" title="设置" back="{{true}}" color="black" background="white" class="data-v-eb84a78c" bind:__l="__l"></nav-bar><view class="content data-v-eb84a78c"><view class="item data-v-eb84a78c" style="border-radius:0rpx 0rpx 0rpx 24rpx;"><view class="line data-v-eb84a78c"><view class="left data-v-eb84a78c">显示售价</view><view class="right data-v-eb84a78c"><u-switch vue-id="2a133faa-2" activeColor="#F7790C" inactiveColor="#E6E6E6" value="{{value}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','value','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-eb84a78c" bind:__l="__l"></u-switch></view></view><block wx:if="{{role!='svip'}}"><view class="line data-v-eb84a78c"><view class="left data-v-eb84a78c">显示会员价</view><view class="right data-v-eb84a78c"><u-switch vue-id="2a133faa-3" activeColor="#F7790C" inactiveColor="#E6E6E6" value="{{value1}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','value1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-eb84a78c" bind:__l="__l"></u-switch></view></view></block><block wx:if="{{role!='cydg'}}"><view class="line data-v-eb84a78c"><view class="left data-v-eb84a78c">显示VIP价</view><view class="right data-v-eb84a78c"><u-switch vue-id="2a133faa-4" activeColor="#F7790C" inactiveColor="#E6E6E6" value="{{value2}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','value2','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-eb84a78c" bind:__l="__l"></u-switch></view></view></block></view></view></view>
+<view class="page data-v-c5feb3a6"><nav-bar vue-id="2a133faa-1" title="设置" back="{{true}}" color="black" background="white" class="data-v-c5feb3a6" bind:__l="__l"></nav-bar><view class="content data-v-c5feb3a6"><view class="item data-v-c5feb3a6" style="border-radius:0rpx 0rpx 0rpx 24rpx;"><view class="line data-v-c5feb3a6"><view class="left data-v-c5feb3a6">显示售价</view><view class="right data-v-c5feb3a6"><u-switch vue-id="2a133faa-2" activeColor="#F7790C" inactiveColor="#E6E6E6" value="{{value1}}" data-event-opts="{{[['^change',[['change1']]],['^input',[['__set_model',['','value1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-c5feb3a6" bind:__l="__l"></u-switch></view></view><block wx:if="{{role!='svip'}}"><view class="line data-v-c5feb3a6"><view class="left data-v-c5feb3a6">显示会员价</view><view class="right data-v-c5feb3a6"><u-switch vue-id="2a133faa-3" activeColor="#F7790C" inactiveColor="#E6E6E6" value="{{value2}}" data-event-opts="{{[['^change',[['change2']]],['^input',[['__set_model',['','value2','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-c5feb3a6" bind:__l="__l"></u-switch></view></view></block><block wx:if="{{role!='cydg'}}"><view class="line data-v-c5feb3a6"><view class="left data-v-c5feb3a6">显示VIP价</view><view class="right data-v-c5feb3a6"><u-switch vue-id="2a133faa-4" activeColor="#F7790C" inactiveColor="#E6E6E6" value="{{value3}}" data-event-opts="{{[['^change',[['change3']]],['^input',[['__set_model',['','value3','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-c5feb3a6" bind:__l="__l"></u-switch></view></view></block></view></view></view>

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

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

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 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

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
+  }
 }