From 4739ef71a9ce69c47454fac5d83ec8bcb0433174 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Tue, 11 Aug 2020 09:46:05 +0800
Subject: [PATCH] fixed bug 8.11
---
pageB/sdetails/index.vue | 8 +++++++-
pageC/cart/ConfirmOrder.vue | 4 +++-
pageC/merchant/goods.vue | 2 +-
pageE/mine/EditUserInfo.vue | 2 +-
pageE/mine/Integral.vue | 2 +-
pages.json | 14 +++++++-------
pages/mine/index.vue | 2 +-
static/image/mine/38.png | Bin 0 -> 9022 bytes
8 files changed, 21 insertions(+), 13 deletions(-)
create mode 100644 static/image/mine/38.png
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 0000000000000000000000000000000000000000..1855a52d0225a74e068322929d3d8742259f5c0d
GIT binary patch
literal 9022
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
literal 0
HcmV?d00001