1.修改问题 上线2.0 解决问题

high-unionPay/pages/tabBar/home/home.vue

@@ -381,26 +381,7 @@
 					url: e + id
 				});
 			},
-			//积分卡券列表
+			
-			getCouponListgold() {
-				let params = {
-					regionId: app.globalData.cityId,
-					pageNum: this.pageNum,
-					pageSize: this.pageSize,
-					displayArea: 2
-				}
-				getCouponList(params).then(res => {
-					if (res.return_code == '000000' && res.return_data.list) {
-						this.goldproductList = res.return_data.list;
-						this.goldproductListleg = res.return_data.total;
-						if (res.return_data.total > 4) {
-							this.goldproductListleg = 4;
-							return;
-						}
-						this.goldproductListleg = res.return_data.total;
-					}
-				})
-			},
 			//拨打客服电话
 			playPhone() {
 				uni.showModal({

high-unionPay/pages/user/coupon/coupon.vue

@@ -362,16 +362,16 @@
 			},
 			//跳转详情
 			jumpcoupons(e) {
-				if (e.useScope == 3) {
+				if (e.discountUseScope == 3) {
 					uni.navigateTo({
 						url: '../../unionPay/recharge/recharge'
 					})
-				} else if (e.useScope == 4) {
+				} else if (e.discountUseScope == 4) {
 					app.globalData.distinguishid = 1;
 					uni.navigateTo({
 						url: '/qianzhu-KFC/buffet-order/buffet-order'
 					})
-				} else if (e.useScope == 5) {
+				} else if (e.discountUseScope == 5) {
 					app.globalData.distinguishid = 2;
 					uni.navigateTo({
 						url: '/qianzhu-KFC/buffet-order/buffet-order'
@@ -380,7 +380,7 @@
 					uni.navigateTo({
 						url: '/member-Recharge/choicepage/choicepage'
 					})
-				} else if (e.useScope == 7) {
+				} else if (e.discountUseScope == 7) {
 					uni.navigateTo({
 						url: '../../goods/refuel/refuel'
 					})

high-unionPay/pages/user/order_details/order_details.vue

@@ -7,7 +7,8 @@
 				{{countdownm}}:{{countdowns}}
 			</view>
 			<view class="width100  font13 fcor666 mart10">若超时未支付,订单将自动取消</view>
-			<view class="stubtn mart15" style="background-color: #0F8FE8;" @click="toPay()">立即支付
+			<view class="stubtn mart15" style="background-color: #0F8FE8;"
+				@click="toPay(recinfo.highChildOrderList[0].goodsId)">立即支付
 			</view>
 		</view>
 		<view class="width100 headsbg paddbotm15" v-if="recinfo.orderStatus != 1">
@@ -127,9 +128,9 @@
 				<view class="width50 fcor777">积分抵扣</view>
 				<view class="width50 fotrt fcoreb5">-¥{{recinfo.payGold / 100}}</view>
 			</view>
-			<view class="width95 height20 alijusnostart">
+			<view class="width100" style="height: 10px;">
-				<view style="width: 5%;"></view>
+				<view class="cro_left_bottom flleft"></view>
-				<view class="width95" style="border-bottom: 1px dashed #bebcbc;"></view>
+				<view class="cro_right_bottom flright"></view>
 			</view>
 		</view>
 		<view class="width95 alijusnostart">
@@ -476,7 +477,8 @@
 					</view>
 				</view>
 				<view class="btn" @tap="cancel" style="border: 1px solid #0083f5;color: #0083f5;">取消订单</view>
-				<view class="btn" @tap="toPay" style="background-color: #0083f5;color: #fff;">去支付</view>
+				<view class="btn" @tap="toPay(recinfo.highChildOrderList[0].goodsId)"
+					style="background-color: #0083f5;color: #fff;">去支付</view>
 			</view>
 		</view>
 
@@ -734,7 +736,7 @@
 					}
 				});
 			},
-			toPay() {
+			toPay(item) {
 				let payTypes;
 				if (this.recinfo.payType == 1 || this.recinfo.payType == null) {
 					payTypes = 3;

high-unionPay/qianzhu-KFC/payment-method/payment-method.vue

@@ -27,7 +27,7 @@
 							<radio :checked="paytype=='3'" @click="changeRiado()" color="#0083f5" />
 						</view>
 					</view>
-					<!-- <view class="row" @tap="paytype='oilcard'">
+					<view class="row" @tap="paytype='6'" v-if="item == 6">
 						<view class="left">
 							<image :src="imagewxUrl+imgadres1"></image>
 						</view>
@@ -35,9 +35,9 @@
 							油卡支付(余额:{{oilPirce}}元)
 						</view>
 						<view class="right">
-							<radio :checked="paytype=='oilcard'" @click="changeRiado1()" color="#0083f5" />
+							<radio :checked="paytype=='6'" @click="changeRiado1()" color="#0083f5" />
+						</view>
 					</view>
-					</view> -->
 					<view class="row" @tap="paytype='4'" v-if="item == 4">
 						<view class="left">
 							<image src="../../static/img/unionpay.png"></image>
@@ -68,10 +68,9 @@
 <script>
 	import {
 		getHuiLianTongCardBalance,
-		oilCardPay,
 		findUser,
-		qianzhuorderToUnionPay,
+		unionPay,
-		czhltUnionCardPay,
+		cardPay,
 		getThirdPartyByDetail
 	} from '../../Utils/Api.js'
 	import ssPaymentPassword from '@/components/sanshui-payment-password/index.vue';
@@ -95,7 +94,7 @@
 				oilPirce: 0, //油卡金额
 				showType: 3, //支付方式
 				paytypeList: [], //支付选择
-				productType: '' //分类 星巴克 ，肯德基
+				productType: '' ,//分类 星巴克 ，肯德基
 			};
 		},
 		onLoad(e) {
@@ -119,8 +118,9 @@
 				
 				let datas = {
 					platformId: this.showType,
-					regionId: app.globalData.cityId,
+					"companyId": app.globalData.companyId,
-					productType: this.productType
+					productType: this.productType,
+					productId: this.goodsid,
 				}
 				getThirdPartyByDetail(datas).then(res => {
 					if (res.return_code == '000000') {
@@ -203,9 +203,9 @@
 				let that = this;
 				if (that.paytype == '4') {
 					let params = {
-						"orderId": that.orderNo
+						"orderNo": that.orderNo
 					}
-					qianzhuorderToUnionPay(params).then(res => {
+					unionPay(params).then(res => {
 						if (res.return_code == '000000') {
 								that.uniontopay(res.return_data.prepayid);
 						} else {
@@ -247,7 +247,7 @@
 						return;
 					}
 					that.$refs.paymentPassword.modalFun('show');
-				} else if (that.paytype == 'oilcard') {
+				} else if (that.paytype == '6') {
 					if (!that.user.isSetPayPwd) {
 						uni.navigateTo({
 							url: '/pages/login/updatePas/updatePas'
@@ -288,9 +288,15 @@
 							uni.showToast({
 								title: '支付成功'
 							})
+							if (that.productType == 1 || that.productType == 2 || that.productType == 3) {
 								uni.reLaunch({
 									url: '/qianzhu-KFC/order-details/order-details?id=' + that.orderNo
 								})
+							} else {
+								uni.reLaunch({
+									url: '/pages/user/order_details/order_details?id=' + that.orderNo
+								})
+							}
 						},
 						fail: function(err) {
 							uni.showToast({
@@ -308,51 +314,35 @@
 				uni.showLoading({
 					title: '支付中...'
 				})
-				if (this.paytype == '3') {
+				if (this.paytype == '3' || this.paytype == '6') {
-					let params = {
+					let cardNo;
-						"orderId": this.orderNo,
+					if (this.paytype == 3) {
-						"cardNo": this.user.hltCardNo.cardNo,
+						cardNo = this.user.hltCardNo.cardNo;
-						"password": this.PaymentPassword
-					}
-					czhltUnionCardPay(params).then(res => {
-						uni.hideLoading();
-						if (res.return_code == '000000') {
-							uni.showToast({
-								title: '支付成功'
-							})
-							uni.reLaunch({
-								url: '/qianzhu-KFC/order-details/order-details?id=' + this.orderNo
-							})
-							return;
-						}
-						if (res.return_code == '102130') {
-							uni.navigateTo({
-								url: '/pages/login/updatePas/updatePas'
-							})
-							return;
 					}
-						uni.showToast({
+					if (this.paytype == 6) {
-							title: res.return_msg,
+						cardNo = this.user.oilCard.cardNo;
-							icon: 'none'
-						})
-					})
-					return;
 					}
-				if (this.paytype == 'oilcard') {
 					let params = {
-						"orderId": this.orderNo,
+						"orderNo": this.orderNo,
-						"cardNo": this.user.oilCard.cardNo,
+						"cardNo": cardNo,
-						"password": this.PaymentPassword
+						"password": this.PaymentPassword,
+						"carLicensePlate": this.cardNoNumber
 					}
-					oilCardPay(params).then(res => {
+					cardPay(params).then(res => {
 						uni.hideLoading();
 						if (res.return_code == '000000') {
 							uni.showToast({
 								title: '支付成功'
 							})
+							if (this.productType == 1 || this.productType == 2 || this.productType == 3) {
 								uni.reLaunch({
 									url: '/qianzhu-KFC/order-details/order-details?id=' + this.orderNo
 								})
+							} else {
+								uni.reLaunch({
+									url: '/pages/user/order_details/order_details?id=' + this.orderNo
+								})
+							}
 							return;
 						}
 						if (res.return_code == '102130') {