Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

components/pay/pay.vue

@@ -45,6 +45,7 @@ export default {
 		},
 		getDataInfo() {
 			let that=this;
+			console.log("that.payInfo",that.payInfo)
 			let msg = {
 				OpenId: that.payInfo.OpenId,
 				OrderId: that.payInfo.OrderId,

components/tabbar/index.vue

@@ -145,9 +145,11 @@ export default {
     };
   },
   created() {
-    this.navs = uni.getStorageSync("basedata")
-      ? uni.getStorageSync("basedata").navbar.navs
-      : [];
+	setTimeout(() => {
+		this.navs = uni.getStorageSync("basedata")
+			? uni.getStorageSync("basedata").navbar.navs
+			: [];
+	}, 400);
   },
   mounted() {
     this.flagTypeInfo = this.$uiConfig.is_bang;

pages/order-submit/order-submit.vue

@@ -235,7 +235,8 @@ export default {
 				OrderPayType: 1,
 				GoodsName: ''
 			},
-			ShoppingCartIdList: []
+			ShoppingCartIdList: [],
+			BuyerMessage:'',
 		};
 	},
 	onLoad(option) {
@@ -335,7 +336,12 @@ export default {
 									that.payInfo.OrderId = res.data.OrderId;
 									that.payInfo.total_price = that.ds.total_price;
 								}
-
+								else{
+									that.$refs.uToast.show({
+										title: res.data.message,
+										type: 'warning'
+									});
+								}
 								uni.hideNavigationBarLoading();
 							}
 						);
@@ -451,7 +457,6 @@ export default {
 			this.$forceUpdate();
 			if (e && e.val) {
 				if (this.mchs[i].delivery.send_type != e.val) {
-					this.formData.list[i].send_type = e.val;
 					this.formdata.DeliveryMethod = e.val;
 					this.init();
 				}
@@ -503,7 +508,8 @@ export default {
 						this.address = res.data.address;
 						this.address_enable=res.data.address_enable;
 						this.mchs = res.data.mch_list;
-						this.payInfo.GoodsName = this.mchs[0].goods_list[0].name;
+						this.payInfo.GoodsName = this.mchs[0].goods_list[0].name.slice(0,10);
+						this.formdata.DeliveryMethod=this.mchs[0].delivery.send_type;
 						this.ds = res.data;
 						this.expressPrice = 0.0;
 						this.goodPrice = 0.0;

pages/order/index/index.vue

@@ -464,7 +464,7 @@ export default {
     },
 	payment(e){
 		this.payInfo.OrderId = e.OrderId;
-		this.payInfo.GoodsName = e.DetailList[0].GoodsName;
+		this.payInfo.GoodsName = e.DetailList[0].GoodsName.slice(0,10);
 		this.payInfo.PaymentWay = e.PaymentWay;	
 		this.payInfo.total_price = e.Income;	
 		this.payBtn=true

pages/order/order-detail.vue

@@ -530,7 +530,7 @@ export default {
 	payment(e){
 		console.log(e.OrderId)
 		this.payInfo.OrderId = e.OrderId;
-		this.payInfo.GoodsName = e.DetailList[0].GoodsName;
+		this.payInfo.GoodsName = e.DetailList[0].GoodsName.slice(0,10);
 		this.payInfo.PaymentWay = e.PaymentWay;	
 		this.payInfo.total_price = e.Income;	
 		this.payBtn=true