diff --git a/components/VoicePlayer.vue b/components/VoicePlayer.vue new file mode 100644 index 0000000..02562ea --- /dev/null +++ b/components/VoicePlayer.vue @@ -0,0 +1,189 @@ + + + + + \ No newline at end of file diff --git a/config.js b/config.js index 4c91149..068f8c7 100644 --- a/config.js +++ b/config.js @@ -7,7 +7,7 @@ import uvUI from '@/uni_modules/uv-ui-tools' Vue.use(uvUI); // 当前环境 -const type = 'local' +const type = 'prod' // 环境配置 diff --git a/mixins/order.js b/mixins/order.js index 9371ed4..9967841 100644 --- a/mixins/order.js +++ b/mixins/order.js @@ -23,7 +23,13 @@ export default { type : 1, }, res => { if(res.code == 200){ - uni.requestPaymentWxPay(res) + if(res.result.id){ + this.id = res.result.id + } + this.getData() + uni.requestPaymentWxPay({ + result : res.result.pay || res.result + }) .then(res => { uni.showToast({ title: '支付成功', diff --git a/pages/index/category.vue b/pages/index/category.vue index f2ca63a..ab7d4a0 100644 --- a/pages/index/category.vue +++ b/pages/index/category.vue @@ -92,14 +92,16 @@ return {} } - return this.category[this.current].children[this.currentChildren] + return this.category[this.current].children[this.currentChildren] || this.category[this.current] }, }, onLoad() { this.getCategory() }, onShow() { - this.$refs.quickOrderEntry.refresh(); + if(uni.getStorageSync('token')){ + this.$refs.quickOrderEntry.refresh(); + } }, methods: { clickTabs({index}){ @@ -137,7 +139,7 @@ }, change(index) { this.currentChildren = index; - if(this.category[index]) { + if(this.selectCategory.id) { this.$nextTick(() => { this.getProductList() }) diff --git a/pages/index/center.vue b/pages/index/center.vue index 5339770..4268c9d 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -163,6 +163,7 @@ if(uni.getStorageSync('token')){ // 刷新快捷下单信息 this.$store.commit('getUserInfo') + this.$refs.quickOrderEntry.refresh() } }, methods: { diff --git a/pages/index/index.vue b/pages/index/index.vue index 4693dc8..5d199b9 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -119,6 +119,7 @@ export default { this.getMenu() if(uni.getStorageSync('token')){ this.$store.commit('getUserInfo') + this.$refs.quickOrderEntry.refresh() } }, methods: { diff --git a/pages/index/order.vue b/pages/index/order.vue index 00709b2..a33648a 100644 --- a/pages/index/order.vue +++ b/pages/index/order.vue @@ -115,6 +115,7 @@ export default { }, onShow() { this.getData() + this.$refs.quickOrderEntry.refresh() }, //滚动到屏幕底部 onReachBottom() { diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue index 1fe65de..a5a3c08 100644 --- a/pages_order/auth/wxLogin.vue +++ b/pages_order/auth/wxLogin.vue @@ -58,6 +58,11 @@ checkboxValue : [] } }, + onLoad(query) { + if (query.shareId) { + uni.setStorageSync('shareId', query.shareId) + } + }, methods: { qux(){ uni.reLaunch({ diff --git a/pages_order/mine/purse.vue b/pages_order/mine/purse.vue index 9fe8f12..f88984d 100644 --- a/pages_order/mine/purse.vue +++ b/pages_order/mine/purse.vue @@ -75,8 +75,11 @@ --> 提现说明 - + + + + diff --git a/pages_order/order/firmOrder.vue b/pages_order/order/firmOrder.vue index 1c93417..0cdd6be 100644 --- a/pages_order/order/firmOrder.vue +++ b/pages_order/order/firmOrder.vue @@ -9,6 +9,30 @@ + + + + + + {{getOrderTypeName(quickOrderContent.type)}} + + + + + + + + + + + + @@ -93,10 +117,14 @@ - + + + + + @@ -113,10 +141,12 @@ diff --git a/utils/position.js b/utils/position.js index 09513cd..26210b6 100644 --- a/utils/position.js +++ b/utils/position.js @@ -144,8 +144,8 @@ function getUserAddressByIp(key) { //根据IP获取当前用户位置 //打开地图让用户选择位置 function selectAddress(longitude, latitude, successCallback) { uni.chooseLocation({ - longitude, //经度 - latitude, //纬度 + // longitude, //经度 + // latitude, //纬度 success: function(res) { successCallback && successCallback(res) }