diff --git a/App.vue b/App.vue index 7ffd168..cbd22ea 100644 --- a/App.vue +++ b/App.vue @@ -4,7 +4,7 @@ console.log('App Launch'); }, onShow: function() { - console.log('App Show') + console.log('App Show'); }, onHide: function() { console.log('App Hide'); diff --git a/pages/index/index.vue b/pages/index/index.vue index f69e464..f8b1536 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -232,11 +232,14 @@ for (let key in data) { STORE_INFO[key] = data[key] } - } else { - getStoreInfo().then(res => { - uni.setStorageSync("STORE_INFO", JSON.stringify(res.data)) - }) } + getStoreInfo().then(res => { + uni.setStorageSync("STORE_INFO", JSON.stringify(res.data)); + let data = res.data; + for (let key in data) { + STORE_INFO[key] = data[key] + } + }) } getStoreInfoFn() diff --git a/pages/login/login.vue b/pages/login/login.vue index 7e22e2e..35ce671 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -16,10 +16,10 @@ 微信快捷登录 - + diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue index 03438dc..d13a27e 100644 --- a/pagesOrder/detail/detail.vue +++ b/pagesOrder/detail/detail.vue @@ -8,7 +8,7 @@ style='display: flex;justify-content: space-between;width: 690rpx;align-items: center;' @click="callPhone(shopInfo.phone)"> - + 自提点 @@ -28,7 +28,7 @@ + style="padding: 20rpx;background-color:#20B128;color: white;border-radius: 40rpx;flex-shrink: 0;"> 所有提货点 diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue index 462f509..cbd5c67 100644 --- a/pagesOrder/settle/settle.vue +++ b/pagesOrder/settle/settle.vue @@ -91,12 +91,13 @@ - - + + 余额支付 + ( 可用¥{{userInfo.now_money}} ) @@ -109,6 +110,7 @@ 采购款支付 + ( 可用¥{{userInfo.purchase_funds}} ) @@ -353,7 +355,7 @@ }) } - const pay_type = ref(''); + const pay_type = ref('7'); const createOrder = () => { if (!pay_type.value) return uni.$u.toast('请选择支付方式');