From 85075e3f7c6af85e0c2ad65ce180aa6459cab336 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Mon, 29 Nov 2021 10:53:13 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E8=AF=95=E6=89=AB=E7=A0=81=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E9=93=B6=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Utils/Api.js                                  |  10 +-
 pages.json                                    |  20 ++-
 pages/goods/coupon-details/coupon-details.vue |   5 +-
 pages/pay/success/success.vue                 |   6 +-
 pages/qianZhuPay/union-pay/union-pay.vue      |  27 ++++
 subPages/unionPay/unionPay.vue                | 137 +++++++++++-------
 subPages/unionWeb/unionWeb.vue                |  46 ++++++
 7 files changed, 192 insertions(+), 59 deletions(-)
 create mode 100644 pages/qianZhuPay/union-pay/union-pay.vue
 create mode 100644 subPages/unionWeb/unionWeb.vue

diff --git a/Utils/Api.js b/Utils/Api.js
index 9bf983c..baa9141 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -180,7 +180,11 @@ export const getDredgeProvince = params => {
 export const getCmsContent = params => {
 	return POST('GET', `${base}/cmsContent/getCmsContent`, params).then(res => res.data);
 }
-
+
+//设置用户参数
+export const setUserParam = params => {
+	return POST('GET', `${base}/highUser/setUserParam`, params).then(res => res.data);
+}
 /**
  * 工会卡
  */
@@ -327,7 +331,9 @@ export const getAgentSalesPriceCount = params => {
 //修改密码
 export const sendUserPass = params => {
 	return POSTBREST('POST', `${brestBase}/secUser/sendUserPass`, params).then(res => res.data);
-}
+}
+
+
 
 
 
diff --git a/pages.json b/pages.json
index c5afe7e..e76e09d 100644
--- a/pages.json
+++ b/pages.json
@@ -462,7 +462,17 @@
 				"navigationBarTextStyle": "white"
 			}
 
+		},{
+		    "path" : "pages/qianZhuPay/union-pay/union-pay",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "",
+		        "enablePullDownRefresh": false
+		    }
+		    
 		}
+       
+       
     ],
 	"subpackages": [{
 		"root": "subPages",
@@ -554,7 +564,15 @@
 				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white"
 			}
-		}
+		} ,{
+            "path" : "unionWeb/unionWeb",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
 		]
 	}],
 	"globalStyle": {
diff --git a/pages/goods/coupon-details/coupon-details.vue b/pages/goods/coupon-details/coupon-details.vue
index e80ca1f..41ae1cc 100644
--- a/pages/goods/coupon-details/coupon-details.vue
+++ b/pages/goods/coupon-details/coupon-details.vue
@@ -25,7 +25,10 @@
 				<yy-video-player :auto-play="false" :url="imagewxUrl+imgadres3" :poster="poster" :show-back-btn="true">
 				</yy-video-player>
 				<image :src="imagewxUrl+imgadres2" mode="widthFix" class="mart10"></image>
-			</view>
+			</view>
+			<view class="mart20 fotct fcorred font15 marb20 height20"
+				v-if="couponDesInfo.couponInfo.reserveStatus &&  couponDesInfo.highUserCoupon.status  != 0">
+				预约订单已成功 门店会在24小时内联系您</view>
 			<view class="mart20 fotct fcorred font15 marb20 height20"
 				v-if="!couponDesInfo.couponInfo.reserveStatus && couponDesInfo.highUserCoupon.status != 0 && couponDesInfo.couponInfo.couponSource == 3">
 				请出示核销码(商户扫客户)</view>
diff --git a/pages/pay/success/success.vue b/pages/pay/success/success.vue
index 9fdf76a..9134df2 100644
--- a/pages/pay/success/success.vue
+++ b/pages/pay/success/success.vue
@@ -36,8 +36,10 @@
 			</view>
 
 
-			<view class="width100">
-				<view class="width90 mart10 fcor666" v-if="!couponDesInfo.couponInfo.reserveStatus && couponDesInfo.highUserCoupon.status != 0 && couponDesInfo.couponInfo.couponSource == 3">请出示核销码(商户扫客户)</view>
+			<view class="width100">
+				
+				<view class="mart20 fotct fcorred font15 marb20" v-if="couponDesInfo.couponInfo.reserveStatus && couponDesInfo.highUserCoupon.status != 0">预约订单已成功 门店会在24小时内联系您</view>
+				<view class="mart20 fotct fcorred font15 marb20" v-if="!couponDesInfo.couponInfo.reserveStatus && couponDesInfo.highUserCoupon.status != 0 && couponDesInfo.couponInfo.couponSource == 3">请出示核销码(商户扫客户)</view>
 				<view class="mart20 fotct fcorred font15 marb20" v-if="!couponDesInfo.couponInfo.reserveStatus && couponDesInfo.highUserCoupon.status != 0 && couponDesInfo.couponInfo.couponSource != 3">请告知加油员用码商支付</view>
 				<view class="width90 mart20 fotct" v-if="!couponDesInfo.couponInfo.reserveStatus">
 					<image class="coupon-qr" :src="imageUrl+'couponCode/'+couponDesInfo.highUserCoupon.qrCodeImg">
diff --git a/pages/qianZhuPay/union-pay/union-pay.vue b/pages/qianZhuPay/union-pay/union-pay.vue
new file mode 100644
index 0000000..f7e3b84
--- /dev/null
+++ b/pages/qianZhuPay/union-pay/union-pay.vue
@@ -0,0 +1,27 @@
+<template>
+	<view>
+		<view>测试中。。。。</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				url: 'https://base.95516.com/s/wl/WebAPP/helpAgree/page/help/shareRutineHelp.html?params=eyJlbmNyeXB0QXBwSWQiOiIxOTAwYmM4NDQ5N2NhYjNiIiwidG9MaW5rIjoiaHR0cHMlM0ElMkYlMkZoc2cuZGN0cGF5LmNvbSUyRnVuaW9uUGF5JTJGIn0'
+			}
+		},
+		onLoad() {
+			this.jumpurl();
+		},
+		methods: {
+			jumpurl(){
+				location.href = this.url;
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/subPages/unionPay/unionPay.vue b/subPages/unionPay/unionPay.vue
index e412c44..b9de60e 100644
--- a/subPages/unionPay/unionPay.vue
+++ b/subPages/unionPay/unionPay.vue
@@ -1,59 +1,90 @@
-<template>
-	<view>
-		<image class="width90" mode="widthFix" :src="imagewxUrl+imgadres" @click="jumpunionpay"></image>
-		<image class="width90" mode="widthFix" :src="imagewxUrl+imgadres1" @click="jumpMp"></image>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				imagewxUrl: app.globalData.imageWxImg,
-				imgadres: 'union1.jpg',
-				imgadres1: 'union2.jpg',
-				codes:'',
-				url:'https://base.95516.com/s/wl/WebAPP/helpAgree/page/help/shareRutineHelp.html?params=eyJlbmNyeXB0QXBwSWQiOiIxOTAwYmM4NDQ5N2NhYjNiIiwidG9MaW5rIjoiaHR0cHMlM0ElMkYlMkZoc2cuZGN0cGF5LmNvbSUyRnVuaW9uUGF5JTJGIn0=&id=40'
-			}
-		},
-		onLoad(options) {
-			var arr1 = decodeURIComponent(options.q);
-			var arr2 = arr1.split('=');
-			this.codes = arr2[2];
-		},
-		methods: {
-			//跳转银联支付
-			jumpunionpay(){
+<template>
+	<view>
+		<image class="width90" mode="widthFix" :src="imagewxUrl+imgadres" @click="jumpunionpay"></image>
+		<image class="width90" mode="widthFix" :src="imagewxUrl+imgadres1" @click="jumpMp"></image>
+	</view>
+</template>
+
+<script>
+	import {
+		setUserParam,
+		HandleCode
+	} from '../../Utils/Api.js';
+	let app = getApp();
+	export default {
+		data() {
+			return {
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres: 'union1.jpg',
+				imgadres1: 'union2.jpg',
+				codes: '',
+				url: 'https://base.95516.com/s/wl/WebAPP/helpAgree/page/help/shareRutineHelp.html?params=eyJlbmNyeXB0QXBwSWQiOiIxOTAwYmM4NDQ5N2NhYjNiIiwidG9MaW5rIjoiaHR0cHMlM0ElMkYlMkZoc2cuZGN0cGF5LmNvbSUyRnVuaW9uUGF5JTJGIn0'
+			}
+		},
+		onLoad(options) {
+			var arr1 = decodeURIComponent(options.q);
+			var arr2 = arr1.split('=');
+			this.codes = arr2[2];
+		},
+		methods: {
+			//跳转银联支付
+			jumpunionpay() {
 				// uni.navigateTo({
-					// url:'unionPay-entrance/unionPay-entrance'
-				// })
-				// uni.navigateToMiniProgram({
-				//   appId: '1900bc84497cab3b',
-				//   path: '../../pages/goods/externalCoupon/externalCoupon',
-				//   // extraData: {
-				//   //   'data1': 'test'
-				//   // },
-				//   success(res) {
-				//     // 打开成功
-				//   }
+				// 	url:'../unionWeb/unionWeb'
 				// })
+				
 				uni.showToast({
 					title: '暂未开放',
-					duration: 2000,
-					icon: "none"
+					icon: 'none',
+					duration: 2000
 				})
-			},
-			//跳转到小程序
-			jumpMp(){
-				uni.reLaunch({
-					url: '../../pages/goods/externalCoupon/externalCoupon?id='+this.codes
-				})
-				
-			}
-		}
-	}
-</script>
-
-<style>
-
+				// if (!app.globalData.userInfo) {
+				// 	uni.login({
+				// 		provider: 'weixin',
+				// 		success: function(loginRes) {
+				// 			app.globalData.code = loginRes.code;
+				// 			// 请求接口
+				// 			let params = {
+				// 				code: app.globalData.code
+				// 			}
+				// 			HandleCode(params).then(res => {
+				// 				if (res.return_code == '000000') {
+				// 					app.globalData.openId = res.return_data.openId;
+				// 					uni.navigateTo({
+				// 						url: '../../pages/userLogin/userLogin'
+				// 					})
+				// 				}
+				// 			})
+				// 		}
+				// 	})
+				// 	return;
+				// }
+				// let params = {
+				// 	param: this.codes
+				// }
+				// setUserParam(params).then(res => {
+				// 	if (res.return_code == '000000') {
+				// 		location.href = this.url;
+				// 	} else {
+				// 		uni.showToast({
+				// 			title: res.return_msg,
+				// 			icon: 'none',
+				// 			duration: 2000
+				// 		})
+				// 	}
+				// })
+			},
+			//跳转到小程序
+			jumpMp() {
+				uni.reLaunch({
+					url: '../../pages/goods/externalCoupon/externalCoupon?id=' + this.codes
+				})
+
+			}
+		}
+	}
+</script>
+
+<style>
+
 </style>
diff --git a/subPages/unionWeb/unionWeb.vue b/subPages/unionWeb/unionWeb.vue
new file mode 100644
index 0000000..d5b6c82
--- /dev/null
+++ b/subPages/unionWeb/unionWeb.vue
@@ -0,0 +1,46 @@
+<template>
+	<view>
+			<web-view :src="url">
+			<cover-view class="duiba-back-btn" bindtap="handleBackTo">
+				<cover-image src="//yun.duiba.com.cn/saas/images/zjzy-icons/back-btn.png" @click="openurl()"></cover-image>
+				<button class="mart30 width90 height50 fcorfff backcor008 fotct btns font16"
+					@click="openurl">立即打开</button>
+			</cover-view>
+		</web-view>
+		<!-- <button open-type="launchApp" binderror="launchAppError">打开APP</button> -->
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				url: 'https://unionpa.dctpay.com/s/wl/WebAPP/helpAgree/page/help/shareRutineHelp.html?params=eyJlbmNyeXB0QXBwSWQiOiIxOTAwYmM4NDQ5N2NhYjNiIiwidG9MaW5rIjoiaHR0cHMlM0ElMkYlMkZoc2cuZGN0cGF5LmNvbSUyRnVuaW9uUGF5JTJGIn0='
+			}
+		},
+		methods: {
+			launchAppError(e) {
+				console.log(e.detail.errMsg)
+			},
+			openurl() {
+				location.href = this.url;
+				uni.showToast({
+					title: 'oooooo中',
+					icon: "none",
+					duration: 20000
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.duiba-back-btn {
+		position: fixed;
+		z-index: 999999;
+		top: 20rpx;
+		left: 0;
+		width: 100rpx;
+		height: 50rpx;
+	}
+</style>