1212

BagStation/orderInvoicing/orderInvoicing.vue

@@ -113,7 +113,9 @@
 					invoicBankNumber: '', //银行账号
 					remark: '', //发票备注
 					invoicEmail: '', //电子邮箱,
-					orderSerialNumber: '' //订单编号
+					orderSerialNumber: '' ,//订单编号,
+					"clientBelong":"ZHONGPIN",
+					
 				}
 			}
 		},

BagStation/pages/components/price-select-tab.vue

@@ -587,7 +587,8 @@
 					payType : 'CUSTOMER_ACTIVE',
 					userType:'0',
 					xoilAmountGun:e ,
-					priceId:this.activeSitePrice
+					priceId:this.activeSitePrice,
+					clientBelong: "ZHONGPIN"
 				} 
 				this.xoilAmountGun = e 
 				oilSiteApi.getOrderDiscountInfo(number).then( res=>{
@@ -635,7 +636,8 @@
 					payType : 'CUSTOMER_ACTIVE',
 					userType:'0',
 					xoilAmountGun:e.detail.value,
-					priceId:this.activeSitePrice
+					priceId:this.activeSitePrice,
+					clientBelong: "ZHONGPIN"
 				} 
 				this.xoilAmountGun = e.detail.value
 				oilSiteApi.getOrderDiscountInfo(number).then( res=>{
@@ -896,6 +898,7 @@
 				 		'version':1,
 				 		'xoilAmountGun':this.vol
 				 	}
+					console.log(orderData,'orderDataorderDataorderDataorderDataorderDataorderDataorderDataorderData');
 				 	oilOrderApi.createOrder(orderData).then(res => {
 				 		if (res.code == 20000) {
 							clearTimeout(this.timer)
@@ -919,7 +922,10 @@
 			// 获取渠道下价格等信息
 			getNewSitePrice(channelId) {
 				this.oilSitePriceDetailsVo = []
-				oilSiteApi.getNewSitePrice(channelId).then(res => {
+				oilSiteApi.getNewSitePriceZp({
+					channelId:channelId,
+					clientBelong: "ZHONGPIN"
+				}).then(res => {
 					if (res.code == 20000) {
 						this.plateNumbers = res.data.plateNumbers
 						this.oilSitePriceDetailsVo = res.data.oilSitePriceDetailsVo;

BagStation/pages/makeOrder/makeOrder.vue

@@ -112,7 +112,8 @@
 			getSiteInfo(id) {
 				let data2 = {
 					...uni.getStorageSync('location'),
-					siteId: id
+					siteId: id,
+					clientBelong: "ZHONGPIN"
 				}
 				oilSiteApi.getSiteDetails(data2).then(res => {
 					if (res.code == 20000) {

BagStation/pages/makeOrder/orderPaying.vue

@@ -318,7 +318,7 @@
 					userIp:  (this.userIp?this.userIp:"36.57.160.59") ,
 					merchantNo:'10089027856'
 				}
-
+				console.log(payData,'payDatapayData')
 				oilPayApi.aggregatePay(payData).then(res => {
 					if (res.code == 20000) {
 						uni.requestPayment({
@@ -327,10 +327,6 @@
 							success: (res1) => {
 								console.log(res)
 								if (res.code == 20000) {
-									// this.getPayStatus(this.outTradeNo)
-									// this.getLastMoney()
-									// this.getCards()
-									// console.log('success:' + JSON.stringify(res));
 									uni.showToast({
 										title: res.msg
 									})
@@ -351,23 +347,9 @@
 								}
 							},
 							fail: function(err) {
-								console.log(res, err, '************')
-								// console.log('fail:' + JSON.stringify(err));
 							}
 						})
-						// uni.showToast({
-						// 	title: res.msg
-						// })
-						// uni.redirectTo({
-						// 	url: '/BagStation/pages/makeOrder/payResult?status=success',
-						// 	fail: (err) => {
-						// 		console.log(err)
-						// 	}
-						// })
 					} else {
-						// uni.redirectTo({
-						// 	url: '/BagStation/pages/makeOrder/payResult?status=fail'
-						// })
 					}
 
 				})

BagStation/pages/stationDetail/stationDetail.vue

@@ -252,7 +252,8 @@
 				console.log('进入获取油站信息')
 				let data2 = {
 					...uni.getStorageSync('location'),
-					siteId: id
+					siteId: id,
+					clientBelong: "ZHONGPIN"
 				}
 				oilSiteApi.getSiteDetails(data2).then(res => {
 					console.log('进入获取油站信息getSiteDetails',res)