diff --git a/config/api.js b/config/api.js
index 756c882..c20029d 100644
--- a/config/api.js
+++ b/config/api.js
@@ -7,7 +7,7 @@ export const getAgreement = (params, config = {}) => http.post('/util/manage/get
// 验证码登录
export const loginSMS = (data) => http.post('member/auth/sms-login', data, { custom: { noToken: true }})
// 登录发验证码
-export const getLoginCode = (data) => http.post('member/auth/send-sms-code', data, { custom: { noToken: true, }})
+export const getLoginCode = (data) => http.post('member/auth/send-sms-code', data, { custom: { noToken: true, catch: true,}})
// 获取个人信息
export const getUserInfo = (data) => http.post('member/user/get', {header: {'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'}})
// 退出登录
@@ -142,6 +142,25 @@ export const masterCancelBooking = (data) => http.put('business/booking/master/c
export const applyOrderPage = (params) => http.get('app/apply-order/page', {params})
// 我的订单详情
export const applyOrderGet = (params) => http.get('app/apply-order/get', {params})
+// 线上提交学员退款信息
+export const applyOnlineFund = (data) => http.post('app/refund/applyOnlineFund', data)
+// 查询退费详情
+export const selectRefundDetail = (params) => http.get('app/refund/selectRefundDetail', {params})
+// 获得退款记录分页
+export const refundPage = (params) => http.get('app/refund/page', {params})
+// 获取保存的biztonken
+export const getbiztoken = (params) => http.get('app/student-record/getbiztoken', {params})
+// 退款原因
+export const getdictDataList = (params) => http.get('app/refund/getdictDataList', {params})
+// 轮询是否已报名
+export const getApplyStep = (params) => http.get('app/student-record/getApplyStep', {params})
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index e23a747..fe05c43 100644
--- a/pages.json
+++ b/pages.json
@@ -90,7 +90,15 @@
"backgroundTextStyle": "dark"
}
},
-
+ {
+ "path": "enroll/realName/webView",
+ "style": {
+ "navigationBarTitleText": "实名认证",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false,
+ "backgroundTextStyle": "dark"
+ }
+ },
{
"path": "enroll/uploadAvatar/uploadAvatar",
"style": {
diff --git a/pages/indexEntry/enroll/enroll.vue b/pages/indexEntry/enroll/enroll.vue
index 721d432..538d4d3 100644
--- a/pages/indexEntry/enroll/enroll.vue
+++ b/pages/indexEntry/enroll/enroll.vue
@@ -138,7 +138,7 @@
this.showType = false
},
async getpersonfaceFn() {
- const {data: res} = await getpersonface({ ruleId: 1, RedirectUrl: website + '/pages/indexEntry/enroll/realName/realName',userId: this.userId})
+ const {data: res} = await getpersonface({ ruleId: 1, RedirectUrl: website + '/pages/indexEntry/enroll/realName/realName?userId='+this.userId+'&test=123' ,userId: this.userId})
let obj = JSON.parse(res)
this.link = obj.Url
this.$store.commit('updateBizToken', obj.BizToken)
@@ -151,7 +151,7 @@
// #ifdef MP-WEIXIN
this.$store.commit('updateWebVeiwUrl', this.link)
uni.navigateTo({
- url: '/pages/indexEntry/webView/webView'
+ url: '/pages/indexEntry/enroll/realName/webView'
})
// #endif
diff --git a/pages/indexEntry/enroll/realName/realName.vue b/pages/indexEntry/enroll/realName/realName.vue
index 0a46626..fcf116c 100644
--- a/pages/indexEntry/enroll/realName/realName.vue
+++ b/pages/indexEntry/enroll/realName/realName.vue
@@ -5,18 +5,35 @@
+
+
diff --git a/pages/indexEntry/webView/webView.vue b/pages/indexEntry/webView/webView.vue
index 9699c38..e4e8980 100644
--- a/pages/indexEntry/webView/webView.vue
+++ b/pages/indexEntry/webView/webView.vue
@@ -13,7 +13,7 @@
return {
webviewStyles: {
progress: {
- color: '#FF3333'
+ color: '#3877ff'
},
width: '100vw', // 设置 WebView 宽度为100%,占满整个屏幕宽度
height: '100vh', // 设置 WebView 高度为100vh,占满整个屏幕高度
@@ -27,9 +27,7 @@
// http://192.168.1.44:92/question/?uniItem=%7B%22phone%22%3A%2218267103167%22%2C%22cityCode%22%3A%223311%22%2C%22isUni%22%3A1%7D
// uni.hideNavigationBarLoading()
},
- // onReady() {
- // uni.hideNavigationBarLoading();
- // }
+
}
diff --git a/pages/mineEntry/myOrder/comp/opera.vue b/pages/mineEntry/myOrder/comp/opera.vue
index 4dddbeb..b39b71b 100644
--- a/pages/mineEntry/myOrder/comp/opera.vue
+++ b/pages/mineEntry/myOrder/comp/opera.vue
@@ -3,11 +3,15 @@
- {{orderTypeTxt[item.orderType]}}
+ {{orderTypeTxt[item.orderType||item.feeType]}}
{{ $u.utils.truncateText(item.schoolName, 12) }}
- {{orderStatusTxt[item.orderStatus]}}
+
+ {{auditStatusTxt[item.auditStatus]}}
+
+ {{orderStatusTxt[item.orderStatus]}}
+
@@ -57,6 +61,7 @@
return {
orderTypeTxt: ['', '学费', '理科费', '考场模拟', '额外学时购买'],//1:驾校培训费用,2:理科培训费用,3:考场适应性费用,4:额外学时购买
orderStatusTxt: ['待支付', '已支付', '已取消', '支付失败'], //0:待支付,1:已支付,-1:已取消,2:支付失败
+ auditStatusTxt: ['待审核', '审核通过', '审核不通过',],//审核状态,0、待审核,1、审核通过,-1、取消,2、审核不通过,示例值(2)
}
}
}
diff --git a/pages/mineEntry/myOrder/detail/comp/refundInfo.vue b/pages/mineEntry/myOrder/detail/comp/refundInfo.vue
index 2fa2112..fb30e84 100644
--- a/pages/mineEntry/myOrder/detail/comp/refundInfo.vue
+++ b/pages/mineEntry/myOrder/detail/comp/refundInfo.vue
@@ -8,41 +8,44 @@
退款金额
- ¥100.00
+ ¥{{$u.utils.priceTo(info.amount)}}
- 申请时间:2023/08/06 09:12:33
- 退款完成时间:2023/08/10 09:12:33
+ 申请时间:{{ $u.timeFomat(info.createTime, 'yyyy-mm-dd hh:MM:ss')}}
+ 退款完成时间:{{ $u.timeFomat(info.refundTime, 'yyyy-mm-dd hh:MM:ss')}}
收款信息
持卡人
- 张三
+ {{ info.stuName }}
手机号
- 18267103167
+ {{ info.mobile }}
已验证
卡号
- 79879465454148
+ {{ info.bankAccount }}
开户行
- 招商银行
+ {{ info.bankName }}
\ No newline at end of file
diff --git a/pages/mineEntry/refund/refund.vue b/pages/mineEntry/refund/refund.vue
index ef7bbb0..e1c4325 100644
--- a/pages/mineEntry/refund/refund.vue
+++ b/pages/mineEntry/refund/refund.vue
@@ -1,6 +1,6 @@
-
+
@@ -12,23 +12,36 @@
-
- 提交
+
@@ -61,8 +74,5 @@
}
}
- .btnBg {
- width: 396rpx;
- margin: 94rpx auto;
- }
+
\ No newline at end of file
diff --git a/pages/userCenter/login/loginByPhone.vue b/pages/userCenter/login/loginByPhone.vue
index 4cf1606..d75b8dd 100644
--- a/pages/userCenter/login/loginByPhone.vue
+++ b/pages/userCenter/login/loginByPhone.vue
@@ -73,30 +73,33 @@
this.isCheck = val
},
// 发送短信验证码
- async goSms() {
+ goSms() {
const {
FormData
} = this
if (!FormData.phone) return this.$u.toast('请输入手机号');
if (!this.isPhone) return this.$u.toast('手机号格式有误');
if (this.codeOn) return
- const data = await getLoginCode({
+ this.codeOn = true;
+ getLoginCode({
scene: 1,
mobile: FormData.phone,
+ }).then(()=>{
+ var time = 60;
+ var timer = setInterval(() => {
+ time--;
+ this.codeText = time + "秒后重新发送"
+ if (time == 0) {
+ clearInterval(timer);
+ this.codeText = "获取验证码";
+ this.codeOn = false;
+ }
+ }, 1000);
+ }).catch(()=>{
+ this.codeOn = false;
})
- console.log(data)
// 获取验证码
- var time = 60;
- var timer = setInterval(() => {
- time--;
- this.codeText = time + "秒后重新发送"
- this.codeOn = true;
- if (time == 0) {
- clearInterval(timer);
- this.codeText = "获取验证码";
- this.codeOn = false;
- }
- }, 1000);
+
},
async submitFn() {
if(!this.btnHighlight) return