From 82a24bf9aa90ccf75b94c864ab27ff51bf1fd95e Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Fri, 12 Apr 2024 18:31:46 +0800
Subject: [PATCH] 00
---
common/js/utils.js | 2 +-
config/api.js | 5 +
config/site.config.js | 2 +-
manifest.json | 4 +-
pages/indexEntry/enroll/payment/payment.vue | 220 ++++++++++++++-------
pages/indexEntry/enroll/registInfo/registInfo.vue | 4 +-
.../enroll/signContract/signContract.vue | 4 +-
pages/indexEntry/signIn/signAndOut/signAndOut.vue | 24 +--
pages/mineEntry/myForecastName/myForecastName.vue | 5 +-
9 files changed, 180 insertions(+), 90 deletions(-)
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 @@
订单金额
¥ {{info.a}}
-
+
@@ -28,46 +28,54 @@
支付宝
-
+
+
-
-
+ 微信
+
+
+
-
-
- -->
+
+
+