Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel

pages/visa/visaDetail.vue

@@ -590,7 +590,7 @@
 					(res) => {
 						if (res.resultCode == 1) {
 							try {
-								if(res.data.VisaProductInfo.FeeInclude&res.data.VisaProductInfo.FeeInclude.indexOf('<img')!=-1){
+								if(res.data.VisaProductInfo.FeeInclude&&res.data.VisaProductInfo.FeeInclude.indexOf('<img')!=-1){
 									res.data.VisaProductInfo.FeeInclude = this.imgTagAddStyle(res.data.VisaProductInfo.FeeInclude)
 								}
 								if(res.data.VisaProductInfo.FeeNonInclude&&res.data.VisaProductInfo.FeeNonInclude.indexOf('<img')!=-1){

pages/visa/visa_Reserve.vue

@@ -1222,13 +1222,16 @@
 				this.basedataObj = uni.getStorageSync("basedata").mall;
 
 				var price = (this.price-this.currentCoupon.discountMoney).toFixed(2)
-
+				let CouponAllotIds = ''
+				if(this.useCouponIds.length>0){
+					CouponAllotIds = this.useCouponIds.join(',')
+				}
 				let msg = {
 					Id: 0,
 					VisaId: this.orderMsg.Pid,
 					AdultPeopleNum: this.orderMsg.AdultPeopleNum,//大人
 					ChildPeopleNum: '',//小孩
-					TotalPrice: price,//总价
+					TotalPrice: this.price,//总价
 					CustomerId: this.customer.customerId,//客户id
 					CreateBy: this.CreateBy,//销售
 					OrderSource: 5,//1-ERP,2-B2B订单，3-B2C订单，4wap 5同业  6支付宝
@@ -1252,6 +1255,7 @@
 					OrderForm: 0,//1电脑端
 					ClientType: 1,//客户类型 1同业 2直客
 					Remark: this.orderMsg.Remark,
+					CouponAllotIds: CouponAllotIds,
 				};
 				this.apipost(
 					"b2b_get_SetB2BVisaOrder",