fixed bug 8.11

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({

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);
 			}

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() {

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(){

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);
 				}
 			})
 		},

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"
+									// }
 								]
 							}
 						}

pages/mine/index.vue

@@ -110,7 +110,7 @@
 						<view>收货地址</view>
 					</view>
 					<view @click="toOtherPage('/more/AfterSalesHelp')">
-						<image src="/static/image/mine/9.png"></image>
+						<image src="/static/image/mine/38.png"></image>
 						<view>售后政策</view>
 					</view>
 					<view @click="toOtherPage('/more/MineHelp')">