diff --git a/common/js/utils.js b/common/js/utils.js
index 8f98996..3cc36ce 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -124,7 +124,7 @@ const install = (Vue, vm) => {
 			 store.commit('goLogin')
 			return
 		}
-		return	vm.$goPage('/pages/indexEntry/enroll/registInfo/registInfo')
+		// return	vm.$goPage('/pages/indexEntry/enroll/registInfo/registInfo')
 		 // store.commit('updateNonPlatformStudent', false)
 		if( vm.vuex_userInfo.applyStep<2) {
 			 vm.$goPage('/pages/indexEntry/enroll/enroll')
diff --git a/config/api.js b/config/api.js
index 3bc92b3..341842e 100644
--- a/config/api.js
+++ b/config/api.js
@@ -218,6 +218,11 @@ export const periodConfirm = (data) => http.post('app/student-process/periodConf
  export const getStudentDynamics = (data) => http.post('app/student-dynamic/getStudentDynamics', data)
  // 根据已过科目计算价格
  export const paymentPrice = (data) => http.post('app/student-record/paymentPrice', data)
+ // 创建订单
+ export const pre_create = (data) => http.post('pay/ysb/pre_create', data)
+ // 创建支付应用信息加密
+ export const param_sign = (data) => http.post('pay/ysb/param_sign', data)
+ 
  
 
 
diff --git a/config/site.config.js b/config/site.config.js
index 3d89ffa..7dcae32 100644
--- a/config/site.config.js
+++ b/config/site.config.js
@@ -2,7 +2,7 @@ const VUE_APP_PLATFORM = process.env.VUE_APP_PLATFORM;
 // localIp = false
 module.exports = {
   H5_API: VUE_APP_PLATFORM === 'h5' ? '/api' : '',//h5代理
-  WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://192.168.1.43:8318/',//非代理地址
+  WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://192.168.1.38:8318/',//非代理地址
   // WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://work.lyjppt.com:8099/',//非代理地址
   website: 'http://192.168.1.37',
   httpPrefix: 'app-api/',
diff --git a/manifest.json b/manifest.json
index 2c6576c..b8184c9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -69,7 +69,7 @@
             "sdkConfigs" : {
                 "share" : {
                     "weixin" : {
-                        "appid" : "wxdfeef42d2a053912",
+                        "appid" : "wx9e7d9eea420f6541",
                         "UniversalLinks" : ""
                     }
                 },
@@ -170,7 +170,7 @@
             "disableHostCheck" : true,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://192.168.1.38:8318/",
+                    "target" : "http://192.168.1.43:8318/",
                     // "target" : "http://192.168.1.36:48080/",
                     "changeOrigin" : true,
                     "secure" : true,
diff --git a/pages/indexEntry/enroll/payment/payment.vue b/pages/indexEntry/enroll/payment/payment.vue
index e0d6bcc..a9cf1de 100644
--- a/pages/indexEntry/enroll/payment/payment.vue
+++ b/pages/indexEntry/enroll/payment/payment.vue
@@ -13,10 +13,10 @@
 					<view class="lab">订单金额</view>
 					<view class="val">￥ {{info.a}}</view>
 				</view>
-				<view class="li">
+				<!-- <view class="li">
 					<view class="lab">订单编号</view>
 					<view class="val">{{info.a}}</view>
-				</view>
+				</view> -->
 			</view>
 			<view class="card">
 				<view class="pay">
@@ -28,46 +28,54 @@
 						<view class="text">支付宝</view>
 						<view class="icon">
 							<!-- <image src="@/static/images/index/noSelect.png" mode=""></image> -->
-							<!-- <image src="@/static/images/carIcon/isSelect.png" mode=""></image>
+					<!-- <image src="@/static/images/carIcon/isSelect.png" mode=""></image>
 						</view> -->
+				</view>
+				<!-- <view class="row">
+					<view class="wxIcon">
+						<image src="@/static/images/carIcon/wxIcon.png" mode=""></image>
 					</view>
-					<view class="row">
-						<view class="wxIcon">
-							<image src="@/static/images/carIcon/wxIcon.png" mode=""></image>
-						</view>
-						<view class="text">微信</view>
-						<view class="icon">
-							<!-- <image src="@/static/images/index/noSelect.png" mode=""></image> -->
-							<image src="@/static/images/carIcon/isSelect.png" mode=""></image>
-						</view>
+					<view class="text">微信</view>
+					<view class="icon">
+						<image src="@/static/images/index/noSelect.png" mode=""></image>
+						<image src="@/static/images/carIcon/isSelect.png" mode=""></image>
 					</view>
-				</view>
-			</view>
-			<view class="footerBtn pad">
-				<view class="btnBg" @click="paySubmit">确认支付</view>
+				</view> -->
 			</view>
 		</view>
+		<view class="footerBtn pad">
+			<view class="btnBg" @click="getYSBLink">确认支付</view>
+		</view>
+		<web-view :src="link" v-if="link" @load="loadWebView"></web-view>
+	</view>
 	</view>
 </template>
 
 <script>
-	import { getStudentByPayment } from '@/config/api.js'
+	import {
+		getStudentByPayment, pre_create, param_sign
+	} from '@/config/api.js'
 	export default {
 		data() {
 			return {
 				trainingApplyId: '',
 				info: {
 					a: '待对接'
-				}
+				},
+				link: ''
 			}
 		},
 		onLoad(options) {
-			if(options.trainingApplyId) {
+			if (options.trainingApplyId) {
 				this.trainingApplyId = options.trainingApplyId
 			}
+			// this.getYSBLink()
 			this.getStudentByPayment()
 			this.initWx()
 		},
+		onPullDownRefresh() {
+			this.getStudentByPayment()
+		},
 		methods: {
 			initWx() {
 				// #ifdef APP-PLUS
@@ -85,21 +93,86 @@
 				});
 				// #endif
 			},
-			wxPay() {
+			wxPay(data) {
+				// const data = {
+				//     channelNo: 'QD202401250001', //易收宝分配的渠道号
+				//     encodeData: '', //{"outOrderNo":"15456","timestamp":"1632815312300"},json进行加签加密后的值，outOrderNo商户订单号
+				//     miniAppName: '', //第三方小程序的名称
+				//     env: '',// u8、u6为测试环境，prod为生产环境
+				//     distinctId: '',//第三方小程序的用户唯一标识
+				//     unionMode: 'miniProToMiniPro', // 微信跳转微信小程序时使用
+				// }
+
 				// #ifdef APP-PLUS
+				// this.sweixin ? this.sweixin.launchMiniProgram({
+				// 	 appId: 'wx9e7d9eea420f6541', //易收宝小程序的appid 测试环境：wx9e7d9eea420f6541 生产环境：wx05c2e4857b6806c8
+				// 	path: `/pages/ysbCheckStand/ysbCheckStand?data=${JSON.stringify(data)}`, //跳转小程序页面路径 pages/index/index
+				// 	envVersion: 'trial', // 打开体验版trial, 正式版release
+				// }) : plus.nativeUI.alert('当前环境不支持微信操作!');
+				
 				this.sweixin ? this.sweixin.launchMiniProgram({
-					// path: '/pages/payment/payment?tokenCode=' + this.payInfo.tokenCode, //跳转小程序页面路径 pages/index/index
-					path: '/' , //跳转小程序页面路径 pages/index/index
-					type: 0, //可取值： 0-正式版； 1-测试版； 2-体验版。 默认值为0。
-					id: 'gh_012fd4bda1c2' //小程序的原始id
+					    miniAppId: 'wx9e7d9eea420f6541', //小程序原始ID
+					    path: '', //跳转小程序的页面路径，可携带参数
+					    miniProgramType: '1', //小程序的版本 0正式版 1开发版 2体验版
 				}) : plus.nativeUI.alert('当前环境不支持微信操作!');
 				// #endif
 			},
 			async getStudentByPayment() {
-				const {data: res} = await getStudentByPayment({trainingApplyId: this.trainingApplyId})
-				this.$store.dispatch('getUserInfo')
+				const {
+					data: res
+				} = await pre_create({
+					trainingApplyId: this.trainingApplyId
+				})
+				console.log('创建的订单信息')
+				// console.log(res.orderNo)
+				this.encodeData = res.encodeData
+				// this.param_sign(res.orderNo)
+				// await this.getYSBLink(res.encodeData)
+				// this.wxPay()
+				// this.$store.dispatch('getUserInfo')
+				// setTimeout(()=>{
+				// 	this.wxPay()
+				// },1500)
+				
+			},
+			// 加密数据
+			async param_sign(outOrderNo) {
+				let obj = {
+					outOrderNo,
+					timestamp: Date.now()
+				}
+				console.log(JSON.stringify(obj))
+				const {data: res} = await param_sign({jsonParam:JSON.stringify(obj)})
+				
+				console.log('加密后的数据')
+				console.log(res.encodeData)
+			},
+			getYSBLink() {
+				if(!this.encodeData) return this.$u.toast('没有获取到支付信息')
+				const channelNo = 'QD202404083509';
+				//common普通的h5平台，如果当前的运行环境为微信小程序则platform的值为pay_miniPro
+				const platform = 'common'; 
+				//易收宝H5的前端页面地址，不同的环境详见第四章第4节
+				// 测试地址
+				// const preUrl = 'https://ft1wbs.zyebank.cn/cem_ysb_ft2/index.html'
+				const preUrl = 'https://u8wbs.zyebank.cn/cem_ysb_u8/index.html'
+				// 生产地址
+				// const preUrl = 'https://zmcht.zybank.com.cn/cem_ysb/index.html'; 
+				// let obj = {"outOrderNo":orderNo || "2024041211570300000308","timestamp":"1632815312300"}
+				// const encodeData = encodeData
+				// 用户的唯一标识(可以区分出用户的唯一性即可)，-缓存银行卡信息
+				const distinctId = this.userId
+				const callback = `${preUrl}?encodeData=${this.encodeData}#/checkStandPre?platform=${platform}&channelNo=${channelNo}&checkStand_v3=true&distinctId=${distinctId}`;
+				this.link = callback;
+				console.log('callback')
+				console.log(callback)
+				
 			},
-			paySubmit() { 
+			loadWebView() {
+				console.log('会来到vebview事件里吗？')
+				this.wxPay()
+			},
+			paySubmit() {
 				console.log('这是什么')
 				console.log(this.sweixin)
 				this.wxPay()
@@ -114,64 +187,76 @@
 		width: 100%;
 		margin-bottom: 20rpx;
 		padding: 0 20rpx;
-	  .orderInfo {
-		  text-align: center;
-	    .schoolName {
-			font-size: 28rpx;
-			color: #ccc;
-			padding: 40rpx 0 20rpx 0;
-	    }
-	
-	    .price {
-			font-size: 72rpx;
-			font-weight: 600;
-	      text.uint {
-			font-size: 44rpx;
-			font-weight: 600;
-	      }
-	    }
-	
-	    .num {
-			font-size: 24rpx;
-			color: #ADADAD;
-	    }
-	  }
-	  .li {
-	  	display: flex;
-		height: 88rpx;
-		line-height: 88rpx;
-		&.border{
-			border-bottom: 1px solid #F6F7FA;
+
+		.orderInfo {
+			text-align: center;
+
+			.schoolName {
+				font-size: 28rpx;
+				color: #ccc;
+				padding: 40rpx 0 20rpx 0;
+			}
+
+			.price {
+				font-size: 72rpx;
+				font-weight: 600;
+
+				text.uint {
+					font-size: 44rpx;
+					font-weight: 600;
+				}
+			}
+
+			.num {
+				font-size: 24rpx;
+				color: #ADADAD;
+			}
+		}
+
+		.li {
+			display: flex;
+			height: 88rpx;
+			line-height: 88rpx;
+
+			&.border {
+				border-bottom: 1px solid #F6F7FA;
+			}
+
+			.lab {
+				color: #ccc;
+				width: 230rpx;
+			}
+
+			.val {
+				font-weight: 500;
+				flex: 1;
+				text-align: right;
+			}
 		}
-	  	.lab {
-	  		color: #ccc;
-	  		width: 230rpx;
-	  	}
-	  	.val {
-	  		font-weight: 500;
-	  		flex: 1;
-	  		text-align: right;
-	  	}
-	  }
 	}
+
 	.pay {
 		.h2 {
 			font-size: 32rpx;
 			font-weight: 500;
 			margin-bottom: 24rpx;
 		}
+
 		.row {
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
 			height: 88rpx;
-			&.border{
+
+			&.border {
 				border-bottom: 1px solid #F6F7FA;
 			}
+
 			.wxIcon {
 				width: 40rpx;
 				height: 40rpx;
 			}
+
 			.text {
 				margin-left: 20rpx;
 				flex: 1;
@@ -179,12 +264,11 @@
 				font-size: 28rpx;
 				color: #333;
 			}
+
 			.icon {
 				width: 40rpx;
 				height: 40rpx;
 			}
 		}
 	}
-	
-	
 </style>
\ No newline at end of file
diff --git a/pages/indexEntry/enroll/registInfo/registInfo.vue b/pages/indexEntry/enroll/registInfo/registInfo.vue
index 9788ce8..47ea5c1 100644
--- a/pages/indexEntry/enroll/registInfo/registInfo.vue
+++ b/pages/indexEntry/enroll/registInfo/registInfo.vue
@@ -484,8 +484,8 @@
 			// 选择班型
 			confirmClassModel(val) {
 				let item = val.value[0]
-				console.log(item)
 				this.showClassModel = false
+				if(!item) return
 				this.form.classModel = item.name
 				this.form.schoolClassId = item.id
 				if(this.form.finishSubject&&this.form.transfer==1) {
@@ -497,8 +497,8 @@
 			// 选择车型
 			confirmCar(val) {
 				let item = val.value[0]
-				console.log(item)
 				this.showCar = false
+				if(!item) return
 				if(this.form.trainType == item) return
 				this.form.trainType = item
 				this.form.coach = ''
diff --git a/pages/indexEntry/enroll/signContract/signContract.vue b/pages/indexEntry/enroll/signContract/signContract.vue
index 6d700cc..19483f1 100644
--- a/pages/indexEntry/enroll/signContract/signContract.vue
+++ b/pages/indexEntry/enroll/signContract/signContract.vue
@@ -99,12 +99,10 @@
 				})
 				console.log(res)
 				if (res.flowStatus == 2) {
-					
 					uni.navigateTo({
-						url: '/pages/indexEntry/enroll/payment/payment?trainingApplyId='+this.trainingApplyId
+						url: '/pages/indexEntry/enroll/payment/payment?trainingApplyId='+res.trainingApplyId
 					})
 					if (res.flowStatus > 2) {
-						
 						this.$u.toast('合同已撤销或过期')
 					}
 				}
diff --git a/pages/indexEntry/signIn/signAndOut/signAndOut.vue b/pages/indexEntry/signIn/signAndOut/signAndOut.vue
index 63d6055..b77fd5e 100644
--- a/pages/indexEntry/signIn/signAndOut/signAndOut.vue
+++ b/pages/indexEntry/signIn/signAndOut/signAndOut.vue
@@ -115,18 +115,20 @@
 				console.log(res.msg)
 				if(res.code=='200240213') {
 					this.stepFailureReason = res.msg
-					if(res.msg=='学员未签退,请先签退') { 
-						if(!this.count) {
-							this.count ++
-							console.log('来这了？')
-							const res2 = await reSignOut({coachId: this.params.coachId})
-							console.log('来这没有？')
-							this.vailStudentInfoFn()
-							console.log('补签结果')
-							console.log(res2)
-						}
+					// if(res.msg=='学员未签退,请先签退') { 
+					// 	if(!this.count) {
+					// 		this.count ++
+					// 		console.log('来这了？')
+					// 		const res2 = await reSignOut({coachId: this.params.coachId})
+					// 		console.log('来这没有？')
+					// 		this.vailStudentInfoFn()
+					// 		console.log('补签结果')
+					// 		console.log(res2)
+							
+					// 		this.getInitFaceVerifyFn('补签退')
+					// 	}
 					 
-					}
+					// }
 				}
 				
 				if(res.code==0) {
diff --git a/pages/mineEntry/myForecastName/myForecastName.vue b/pages/mineEntry/myForecastName/myForecastName.vue
index f91307e..2a8b7a0 100644
--- a/pages/mineEntry/myForecastName/myForecastName.vue
+++ b/pages/mineEntry/myForecastName/myForecastName.vue
@@ -53,10 +53,11 @@
 				console.log(res)
 			},
 			itemClickFn(item) {
-				return	this.$goPage('/pages/indexEntry/enroll/payment/payment?trainingApplyId='+ item.trainingApplyId)
+				console.log(item)
+				// return	this.$goPage('/pages/indexEntry/enroll/payment/payment?trainingApplyId='+ item.trainingApplyId)
 				if(item.applyStep==3) {
 					this.$goPage('/pages/indexEntry/enroll/signContract/signContract?schoolId='+item.trainingSchoolId+'&trainingApplyId='+ item.trainingApplyId)
-				}else if(item.applyStep==4) {
+				}else if(item.applyStep==4||item.applyStep==5) {
 					return	this.$goPage('/pages/indexEntry/enroll/payment/payment?trainingApplyId='+ item.trainingApplyId)
 				}
 			}