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

components/auth/index.vue

@@ -108,8 +108,8 @@ export default {
 					data: {
 						Source: 1,
 						OpenId: obj.OpenId,
-						Name: obj.nickName,
-						Photo: obj.avatarUrl,
+						Name: obj.Name,
+						Photo: obj.Photo,
 						Moblie: '',
 						SuperiorId: 0
 					}

pages/goods/goods.vue

@@ -283,7 +283,11 @@ export default {
   },
   onLoad(option) {
     this.opTionObj = option;
+	if(option&&option.id){
+		this.id = option.id ? option.id : 29; //40887 59512 46942
+	}else{
 		this.id = option.GoodsId ? option.GoodsId : 29; //40887 59512 46942
+	}
     this.init();
     this.mc = this.$uiConfig.mainColor;
     this.secondary = this.$uiConfig.secondary;
@@ -484,7 +488,7 @@ export default {
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
   font-size: 16px;
-  height: 40px;
+  height: 45px;
 }
 .goods .g-info .g-price-box {
   display: flex;

pages/order-submit/order-submit.vue

@@ -475,10 +475,11 @@ export default {
 		},
 		changeUseInt(e) {
 			this.userInt = e.value;
-			this.formData.list.forEach(x => {
-				x.use_integral = this.userInt ? 1 : 0;
-				this.formData.Use_Integral = this.userInt ? 1 : 0;
-			});
+			// this.formData.list.forEach(x => {
+			// 	x.use_integral = this.userInt ? 1 : 0;
+			// 	this.formData.Use_Integral = this.userInt ? 1 : 0;
+			// });
+			this.formdata.Use_Integral = this.userInt ? 1 : 0;
 			this.init();
 		},
 		initPage() {
@@ -575,7 +576,7 @@ export default {
 						x.delivery.send_type_name = y.name;
 					}
 				});
-				this.goodPrice += parseFloat(x.total_goods_original_price);
+				this.goodPrice += parseFloat(x.total_goods_price);
 				this.expressPrice += parseFloat(x.express_price);
 				this.couponPrice += parseFloat(x.coupon.coupon_discount || 0.0);
 				if (x.integral.can_use) {