diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue index dc7905f..fe7d0b8 100644 --- a/pageB/sdetails/index.vue +++ b/pageB/sdetails/index.vue @@ -353,7 +353,12 @@ export default { }).then(res => { this.$refs.uToast.show({ title: res.message, - type: res.errCode == 0 ? 'success' : 'warning', + duration: 1000, + callback: () => { + if(res.errCode == 0) { + this.showSpec = false; + } + } }) }) }, @@ -495,6 +500,7 @@ export default { } this.$u.api.settlementOrder(params).then(res => { if(res.errCode == 0) { + // console.log('type' + this.type); this.$store.commit('setOrderType', this.type); this.$store.commit('updateOrderInfo', res.data) this.$u.route({ diff --git a/pageC/cart/ConfirmOrder.vue b/pageC/cart/ConfirmOrder.vue index a3ab02e..0f368a5 100644 --- a/pageC/cart/ConfirmOrder.vue +++ b/pageC/cart/ConfirmOrder.vue @@ -148,7 +148,7 @@ export default { onLoad(option) { this.orderType = this.$store.state.orderType; this.orderInfo = this.$store.state.orderInfo; - // console.log(this.orderType); + console.log('orderType' + this.orderType); // console.log(this.orderInfo); this.getGoodsClass(); this.setTotalPrice(); @@ -204,6 +204,8 @@ export default { this.withImmediate(); } else if(this.orderType == 1) { this.sendOrder(0); + } else if(this.orderType == 3) { + this.sendOrder(0); } else { this.sendOrder(1); } diff --git a/pageC/merchant/goods.vue b/pageC/merchant/goods.vue index 964ae95..51f25b2 100644 --- a/pageC/merchant/goods.vue +++ b/pageC/merchant/goods.vue @@ -109,7 +109,7 @@ export default { }) }, switchCurrent(current) { - if(current == 1 && this.current == 1) this.priceOrderAsc = !this.priceOrderAsc; + if(current == 3 && this.current == 3) this.priceOrderAsc = !this.priceOrderAsc; this.current = current; }, setViewHeight() { diff --git a/pageE/mine/EditUserInfo.vue b/pageE/mine/EditUserInfo.vue index ffe3365..1fc040d 100644 --- a/pageE/mine/EditUserInfo.vue +++ b/pageE/mine/EditUserInfo.vue @@ -98,7 +98,7 @@ export default { }, onNavigationBarButtonTap(e) { if( e.index == 0 ) uni.navigateBack(); - if( e.index == 1 ) this.customers(); + // if( e.index == 1 ) this.customers(); }, methods: { customers(){ diff --git a/pageE/mine/Integral.vue b/pageE/mine/Integral.vue index ec34744..da88a62 100644 --- a/pageE/mine/Integral.vue +++ b/pageE/mine/Integral.vue @@ -46,7 +46,7 @@ export default { this.$u.api.getMemberPointsStat().then((res)=>{ if (res.errCode == 0) { this.memberInfo = res.data; - this.nodes = common.unescapeHTML(this.memberInfo.points_rule); + this.nodes = common.unescapeHTML(this.memberInfo.points_rule.document_content); } }) }, diff --git a/pages.json b/pages.json index 7e95a04..ccbeec4 100644 --- a/pages.json +++ b/pages.json @@ -881,14 +881,14 @@ "text":"取消", "float":"left", "fontSize":"14" - }, - { - "type":"none", - "text":"\ue62d", - "float":"right", - "fontSrc": "/static/fonts/customer.ttf", - "fontSize":"20" } + // { + // "type":"none", + // "text":"\ue62d", + // "float":"right", + // "fontSrc": "/static/fonts/customer.ttf", + // "fontSize":"20" + // } ] } } diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 6258211..c088e61 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -110,7 +110,7 @@ 收货地址 - + 售后政策 diff --git a/static/image/mine/38.png b/static/image/mine/38.png new file mode 100644 index 0000000..1855a52 Binary files /dev/null and b/static/image/mine/38.png differ