diff --git a/App.vue b/App.vue index 981a835..e2b51d3 100644 --- a/App.vue +++ b/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')){ diff --git a/api/api.js b/api/api.js index c1263f5..29f52b8 100644 --- a/api/api.js +++ b/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: { diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue index 2f44a78..a6983c3 100644 --- a/pages_order/auth/wxLogin.vue +++ b/pages_order/auth/wxLogin.vue @@ -40,10 +40,10 @@ activeColor="#FD5100" :name="1" > - 阅读并同意我们的“服务协议与隐私条款” + 阅读并同意我们的“服务协议与隐私条款” - 以及个人信息保护指引 + 以及个人信息保护指引 @@ -75,10 +75,6 @@ this.$store.commit('login') }, - //打开应用配置 - openConfigDetail(key){ - this.$refs.popup.open(key) - }, qux(){ uni.reLaunch({ url: '/pages/index/index' diff --git a/pages_order/components/product/submitUnitSelect.vue b/pages_order/components/product/submitUnitSelect.vue index 0139c76..c879d59 100644 --- a/pages_order/components/product/submitUnitSelect.vue +++ b/pages_order/components/product/submitUnitSelect.vue @@ -42,7 +42,7 @@ - ¥{{ detail.depositPrice }}元 + 租金¥{{ unit.price }} 请选择规格 @@ -173,7 +173,7 @@ computed : { price(){ return (this.detail.depositPrice * this.num).toFixed(2) - } + }, }, data() { return { diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue index d82ce09..20ae3b0 100644 --- a/pages_order/product/productDetail.vue +++ b/pages_order/product/productDetail.vue @@ -16,10 +16,15 @@ - ¥{{ detail.depositPrice }}起 + 租金¥ + {{ + detail.hotelGoodsSkuList[0] && + detail.hotelGoodsSkuList[0].price + }} + - 已售{{ detail.soldNum }}+ + 已售{{ detail.soldNum || 0 }}+ diff --git a/store/store.js b/store/store.js index 2f503a7..e50b204 100644 --- a/store/store.js +++ b/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'