diff --git a/pages/index/cart.vue b/pages/index/cart.vue index 4c9a7c2..65e5f46 100644 --- a/pages/index/cart.vue +++ b/pages/index/cart.vue @@ -76,6 +76,8 @@ + + diff --git a/pages/index/category.vue b/pages/index/category.vue index f85a494..f07bc70 100644 --- a/pages/index/category.vue +++ b/pages/index/category.vue @@ -87,6 +87,11 @@ }, computed: { categoryList(){ + + if(!this.category[this.current] || !this.category[this.current].children){ + return [] + } + return this.category[this.current].children[this.currentChildren] }, }, @@ -96,7 +101,7 @@ onShow() { if(uni.getStorageSync('token')){ // 刷新快捷下单信息 - this.refreshQuickOrder() + this.$refs.quickOrderEntry.refresh(); } }, methods: { @@ -130,7 +135,6 @@ }) }, change(index) { - console.log('选项改变:', index) this.currentChildren = index; if(this.category[index]) { this.$nextTick(() => { diff --git a/pages/index/center.vue b/pages/index/center.vue index 88e5349..aff341b 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -55,7 +55,8 @@ - + - 我的团队 + 我的分享 - + @@ -130,10 +131,10 @@ - + /> --> @@ -163,7 +164,6 @@ onShow() { if(uni.getStorageSync('token')){ // 刷新快捷下单信息 - this.refreshQuickOrder() this.$store.commit('getUserInfo') } this.getBanner() diff --git a/pages/index/index.vue b/pages/index/index.vue index 6d712a8..7e5957b 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -246,7 +246,7 @@ export default { } .building-class { - height: 220rpx; + padding: 20rpx 0; display: flex; justify-content: space-around; align-items: center; diff --git a/pages/index/order.vue b/pages/index/order.vue index 0e9b754..a93401f 100644 --- a/pages/index/order.vue +++ b/pages/index/order.vue @@ -58,6 +58,8 @@ + + diff --git a/pages_order/auth/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue index a78b284..980ed5d 100644 --- a/pages_order/auth/wxUserInfo.vue +++ b/pages_order/auth/wxUserInfo.vue @@ -32,7 +32,7 @@ v-model="userInfoForm.nickName" /> - + @@ -92,9 +92,8 @@ if(!e.detail.code){ return } - console.log(e); this.$api('bindPhone', { - phoneCode : e.detail.code + code : e.detail.code }, res => { if(res.code == 200){ let phoneObj = JSON.parse(res.result) @@ -124,7 +123,7 @@ if (self.$utils.verificationAll(self.userInfoForm, { headImage: '请选择头像', nickName: '请填写昵称', - // phone: '请填写手机号', + phone: '请填写手机号', })) { return } @@ -132,7 +131,7 @@ self.$api('updateInfo', { headImage : self.userInfoForm.headImage, nickName : self.userInfoForm.nickName, - // phone : self.userInfoForm.phone, + phone : self.userInfoForm.phone, }, res => { if (res.code == 200) { uni.reLaunch({ diff --git a/pages_order/mine/individualTeam.vue b/pages_order/mine/individualTeam.vue index 092d24e..7df7e3e 100644 --- a/pages_order/mine/individualTeam.vue +++ b/pages_order/mine/individualTeam.vue @@ -1,7 +1,7 @@ diff --git a/pages_order/order/fastCreateOrder.vue b/pages_order/order/fastCreateOrder.vue index c50c47b..4067434 100644 --- a/pages_order/order/fastCreateOrder.vue +++ b/pages_order/order/fastCreateOrder.vue @@ -19,6 +19,8 @@ + + diff --git a/pages_order/order/firmOrder.vue b/pages_order/order/firmOrder.vue index 2109443..3a84e12 100644 --- a/pages_order/order/firmOrder.vue +++ b/pages_order/order/firmOrder.vue @@ -81,6 +81,8 @@ 新增地址 + + diff --git a/pages_order/order/pictureOrder.vue b/pages_order/order/pictureOrder.vue index da5f635..6f5b816 100644 --- a/pages_order/order/pictureOrder.vue +++ b/pages_order/order/pictureOrder.vue @@ -168,11 +168,13 @@ uni.showToast({ title: '下单成功', icon: 'success', - duration: 1500, + duration: 1000, success: () => { - uni.reLaunch({ - url: '/pages/index/index' - }) + // uni.reLaunch({ + // url: '/pages/index/index' + // }) + + uni.navigateBack(-1) } }); } else { diff --git a/pages_order/order/voiceOrder.vue b/pages_order/order/voiceOrder.vue index aa2b542..0057ecd 100644 --- a/pages_order/order/voiceOrder.vue +++ b/pages_order/order/voiceOrder.vue @@ -410,7 +410,7 @@ // 创建语音订单 createVoiceOrder(audioUrl) { - this.$api('index.addOrder', { + this.$api('addOrder', { voiceUrl: audioUrl, type: '2', // 2表示语音下单 userId: uni.getStorageSync('userId') || '' @@ -423,12 +423,9 @@ uni.showToast({ title: '下单成功', icon: 'success', - duration: 1500, + duration: 1000, success: () => { - setTimeout(() => { - // 跳转到订单列表页 - this.$utils.redirectTo('/pages_order/order/orderList'); - }, 1500); + uni.navigateBack(-1) } }); } else { diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue index 3ce41be..936b700 100644 --- a/pages_order/product/productDetail.vue +++ b/pages_order/product/productDetail.vue @@ -67,6 +67,9 @@ + + + diff --git a/pages_order/product/productList.vue b/pages_order/product/productList.vue index b2cd337..1d231c1 100644 --- a/pages_order/product/productList.vue +++ b/pages_order/product/productList.vue @@ -17,6 +17,8 @@ @click="$utils.navigateTo(`/pages_order/product/productDetail?id=${item.id}`)" :item="item" v-for="(item, index) in list" :key="index"/> + + diff --git a/static/image/center/2.png b/static/image/center/2.png deleted file mode 100644 index 5e0bedc..0000000 Binary files a/static/image/center/2.png and /dev/null differ