From dd075368a95febef46220938247e0bd8fa910653 Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Tue, 19 Mar 2024 18:54:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/api.js | 3 +
config/request.js | 4 +-
pages/carEntry/operaAppointment/comp/coachInfo.vue | 4 +-
pages/carEntry/operaAppointment/comp/step1.vue | 6 +-
.../carEntry/operaAppointment/operaAppointment.vue | 25 ++++----
.../findShcool/coachComment/coachInfo.vue | 2 +
pages/indexEntry/signIn/signAndOut/signAndOut.vue | 26 ++++++--
pages/mineEntry/myAppointment/comp/comp.scss | 3 +-
pages/mineEntry/myAppointment/detail/detail.vue | 70 +++------------------
pages/mineEntry/myAppointment/detail/examin.vue | 57 -----------------
pages/mineEntry/myAppointment/detail/imitate.vue | 61 ------------------
pages/mineEntry/myAppointment/detail/opera.vue | 8 +--
pages/mineEntry/myAppointment/myAppointment.vue | 2 +-
pages/mineEntry/myForecastName/myForecastName.vue | 1 +
static/images/car/coachIcon.png | Bin 0 -> 957 bytes
15 files changed, 60 insertions(+), 212 deletions(-)
delete mode 100644 pages/mineEntry/myAppointment/detail/examin.vue
delete mode 100644 pages/mineEntry/myAppointment/detail/imitate.vue
create mode 100644 static/images/car/coachIcon.png
diff --git a/config/api.js b/config/api.js
index 72ddb4b..9036648 100644
--- a/config/api.js
+++ b/config/api.js
@@ -206,6 +206,9 @@ export const signOutAuth = (data) => http.post('business/student/sign/outAuth',
export const signOut = (data) => http.post('business/student/sign/out', data)
// 支付
export const getStudentByPayment = (params={}) => http.get('app/student-record/getStudentByPayment', {params})
+// 补签
+export const reSignOut = (data) => http.data('app/business/student/sign/reSignOut', data)
+
diff --git a/config/request.js b/config/request.js
index 2ffb546..4ea2c45 100644
--- a/config/request.js
+++ b/config/request.js
@@ -44,8 +44,8 @@ module.exports = (vm) => {
// 响应拦截
uni.$u.http.interceptors.response.use(async (response) => { /* 对响应成功做点什么 可使用async await 做异步操作*/
const data = response.data
- // console.log('请求结果')
- // console.log(data)
+ console.log('请求结果')
+ console.log(data)
if(data.code==406&&response.config.url!='member/auth/refresh-token'&&response.config.url!=='member/auth/logout') {
await refreshToken()
let obj = response.config
diff --git a/pages/carEntry/operaAppointment/comp/coachInfo.vue b/pages/carEntry/operaAppointment/comp/coachInfo.vue
index cdac5a6..8a67929 100644
--- a/pages/carEntry/operaAppointment/comp/coachInfo.vue
+++ b/pages/carEntry/operaAppointment/comp/coachInfo.vue
@@ -9,10 +9,10 @@
{{ FormData.coachName }}
- 已绑定
+ 已绑定
未绑定
-
+
diff --git a/pages/carEntry/operaAppointment/comp/step1.vue b/pages/carEntry/operaAppointment/comp/step1.vue
index 3edc237..837f7d1 100644
--- a/pages/carEntry/operaAppointment/comp/step1.vue
+++ b/pages/carEntry/operaAppointment/comp/step1.vue
@@ -1,6 +1,6 @@
-
+
预约时间
@@ -67,9 +67,7 @@
}
this.$emit('openPopup', num)
},
- showStep2() {
- this.$emit('showStep2')
- },
+
updatedForm(val) {
this.$emit('updatedForm', val)
}
diff --git a/pages/carEntry/operaAppointment/operaAppointment.vue b/pages/carEntry/operaAppointment/operaAppointment.vue
index be02584..861507b 100644
--- a/pages/carEntry/operaAppointment/operaAppointment.vue
+++ b/pages/carEntry/operaAppointment/operaAppointment.vue
@@ -2,8 +2,8 @@
-
-
+
+
@@ -47,13 +47,13 @@
-
-
\ No newline at end of file
diff --git a/pages/mineEntry/myAppointment/detail/imitate.vue b/pages/mineEntry/myAppointment/detail/imitate.vue
deleted file mode 100644
index afce70f..0000000
--- a/pages/mineEntry/myAppointment/detail/imitate.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-
- 模拟器
- {{info.name}}
-
-
- 已取消
- {{statusTxt[info.recordStatus]}}
-
-
-
-
-
-
-
-
-
- 模拟器编号
-
- {{info.deviceNum}}
-
-
-
-
-
-
- 预约时间
-
- {{info.classTime}}
-
-
-
-
- 提交预约时间:{{$u.timeFormat(info.createTime, 'yyyy-mm-dd hh:MM:ss')}}
- 取消时间:{{ $u.timeFormat(info.cancelTime, 'yyyy-mm-dd hh:MM:ss')}}
- 完成时间:{{$u.timeFormat(info.signOutTime, 'yyyy-mm-dd hh:MM:ss')}}
- 核销人员:目前没有字段
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/mineEntry/myAppointment/detail/opera.vue b/pages/mineEntry/myAppointment/detail/opera.vue
index 082ca4a..46b3b3a 100644
--- a/pages/mineEntry/myAppointment/detail/opera.vue
+++ b/pages/mineEntry/myAppointment/detail/opera.vue
@@ -18,7 +18,7 @@
-
+
预约教练
@@ -27,7 +27,7 @@
-
+
预约车辆
@@ -36,7 +36,7 @@
-
+
预约日期
@@ -45,7 +45,7 @@
-
+
预约时段
diff --git a/pages/mineEntry/myAppointment/myAppointment.vue b/pages/mineEntry/myAppointment/myAppointment.vue
index 306d891..38b22c9 100644
--- a/pages/mineEntry/myAppointment/myAppointment.vue
+++ b/pages/mineEntry/myAppointment/myAppointment.vue
@@ -10,7 +10,7 @@
{{total}}条记录
-
+
diff --git a/pages/mineEntry/myForecastName/myForecastName.vue b/pages/mineEntry/myForecastName/myForecastName.vue
index c78f89f..f91307e 100644
--- a/pages/mineEntry/myForecastName/myForecastName.vue
+++ b/pages/mineEntry/myForecastName/myForecastName.vue
@@ -53,6 +53,7 @@
console.log(res)
},
itemClickFn(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) {
diff --git a/static/images/car/coachIcon.png b/static/images/car/coachIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e42cec36ae8455c9b95f05c92699bf657c54211
GIT binary patch
literal 957
zcmV;u148_XP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91AfN*P1ONa40RR918~^|S0LWK2bN~PYCrLy>R7efwmOW?`Q51!OYOcoZhfz9svoykm??99$gbUGirz4Pun_niCgn|b>h8vged`I`dF%*-T~mX@v)
zdzya0@ealB_4@H-bbU+bBRPErLJfBpx7ylus(Fgbl?h5_BdrU^q0Ky9<(U8}w
z%()?9Z82u3(*#a{(A^4;#bVlL&t}6IF<#)n39y>&ly)_f$^7yn)SNKFD#i~RI01;h
zLl_?)AK&LkDvYp-@xyK=fe#{MWvBc|Z5SiQ3m-TEzVjy{Vr7GT<2&k+PE1U+3!`}}
zrXJS7cum^pdU|@^v9jloC-J{=J7~;<>a{S!D#p&?_N;vh+&J+r7mG!`SRM2^1gBZ0
zAyTPSj^WdPLnD1wSgdc`R03^nZN*$JHw^1h`WAW`;dG5kk@2vwHGbD&pre?#`Vd0>
zlr>Fxx4AOaIKk$@zMw)QY{h)d^!m^<0qrS7gAiq`2*x^y-eTt<&tZRS4ooXa?!q3Y
zpTKoQel;*t`0n)e^*O$Zx(TrA0SNCBAA_KPeMEoS+uQpU>)W!~>|Q_@=~ofgi(4k)
z+f?JeJ=iq?g8K>5UY8Lc!QMmISgAcY$TM86;BLX!kJVys!X-|lITBFjfOWfxa;9gx
zySrbR*ncvd4`;Y1OhHm