上传

App.vue

@@ -3,7 +3,7 @@
 		onLaunch: function() {
 		},
 		onShow: function() {
-			// this.$store.commit('initConfig')
+			this.$store.commit('initConfig')
 			this.$store.commit('getPosition')
 			this.$store.commit('categoryList')
 			if(uni.getStorageSync('token')){

api/api.js

@@ -14,11 +14,18 @@ const config = {
 		url: '/api/getConfig',
 		method: 'GET'
 	},
+	
+	
 	// 获取客服联系电话
 	customUser: {
 		url: '/user/custom',
 		method: 'get',
 	},
+	// 获取配置
+	getConfigOne: {
+		url: '/conf/one',
+		method: 'POST',
+	},
 
 	// banner列表
 	bannerList: {

pages_order/auth/wxLogin.vue

@@ -40,10 +40,10 @@
 							activeColor="#FD5100"
 							:name="1"
 						></uv-checkbox>
-						阅读并同意我们的<text @click="openConfigDetail('getPrivacyPolicy')">“服务协议与隐私条款”</text>
+						阅读并同意我们的<text @click="$refs.popup.open('privacyXieYi')">“服务协议与隐私条款”</text>
 					</view>
 					<view class="">
-						以及<text @click="openConfigDetail('getUserAgreement')">个人信息保护指引</text>
+						以及<text @click="$refs.popup.open('privacyXieYi')">个人信息保护指引</text>
 					</view>
 				</view>
 			</uv-checkbox-group>
@@ -75,10 +75,6 @@
 				this.$store.commit('login')
 			},
 			
-			//打开应用配置
-			openConfigDetail(key){
-				this.$refs.popup.open(key)
-			},
 			qux(){
 				uni.reLaunch({
 					url: '/pages/index/index'

pages_order/components/product/submitUnitSelect.vue

@@ -42,7 +42,7 @@
 				
 						<view class="info">
 							<view class="price">
-								￥<text>{{ detail.depositPrice }}</text>元
+								租金￥<text>{{ unit.price }}</text>元
 							</view>
 							<view class="unit">
 								请选择规格
@@ -173,7 +173,7 @@
 		computed : {
 			price(){
 				return (this.detail.depositPrice * this.num).toFixed(2)
-			}
+			},
 		},
 		data() {
 			return {

pages_order/product/productDetail.vue

@@ -16,10 +16,15 @@
 			</view>
 			<view class="info-line">
 				<view class="price">
-					￥<text>{{ detail.depositPrice }}</text>起
+					租金￥<text>
+						{{ 
+							detail.hotelGoodsSkuList[0] && 
+							detail.hotelGoodsSkuList[0].price 
+						}}
+					</text>起
 				</view>
 				<view class="num">
-					已售{{ detail.soldNum }}+
+					已售{{ detail.soldNum || 0 }}+
 					<image src="../static/product/like.png" mode=""></image>
 				</view>
 			</view>

store/store.js

@@ -29,15 +29,17 @@ const store = new Vuex.Store({
 	mutations: {
 		// 初始化配置
 		initConfig(state){
-			// api('getConfig', res => {
+			// api('getConfigOne', res => {
 			// 	if(res.code == 200){
 			// 		state.configList = res.result
 			// 	}
 			// })
 			
-			let config = ['getPrivacyPolicy', 'getUserAgreement']
+			let config = ['privacyXieYi']
 			config.forEach(k => {
-				api(k, res => {
+				api('getConfigOne', {
+					name : k
+				},res => {
 					if (res.code == 200) {
 						state.configList[k] = res.result
 					}
@@ -178,6 +180,7 @@ const store = new Vuex.Store({
 					if(r.confirm){
 						state.userInfo = {}
 						state.shop = false
+						state.bindShop = {}
 						uni.removeStorageSync('token')
 						uni.redirectTo({
 							url: '/pages/index/index'