From 8ac5c6a4c3327370fb5738c0f7fcf5355088bbb3 Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Fri, 17 Nov 2023 19:20:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=93=8D=E9=A2=84=E7=BA=A6=E8=AE=B0?=
=?UTF-8?q?=E5=BD=95=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/UserTab/UserTab.vue | 17 ++++--
.../appointItem-operate/appointItem-operate.vue | 2 +-
components/appointItem/appointItem.vue | 37 ++++++++-----
components/commentItem/commentItem.vue | 37 +++++++------
components/user-info/user-info.vue | 2 +-
config/api.js | 4 +-
config/request.js | 1 +
pages/recordEntry/operate/detail/detail.vue | 26 ++++++++-
pages/tabbar/examSimulation/comp/simulation.vue | 59 +++++++++++++++------
.../tabbar/examSimulation/comp/studentComment.vue | 1 +
pages/tabbar/mine/index.vue | 4 ++
pages/tabbar/operateTrain/index.vue | 18 +++++--
pages/tabbar/statistics/comp/topUserInfo.vue | 2 +-
pages/userCenter/myCar/comp/unbind.vue | 32 +++++++++++
pages/userCenter/myCar/myCar.vue | 18 ++++++-
static/images/coach/教练.png | Bin 0 -> 904 bytes
static/images/index/carNum.png | Bin 0 -> 514 bytes
static/images/index/coachIcon.png | Bin 0 -> 957 bytes
static/images/index/siteIcon.png | Bin 0 -> 1263 bytes
19 files changed, 198 insertions(+), 62 deletions(-)
create mode 100644 pages/userCenter/myCar/comp/unbind.vue
create mode 100644 static/images/coach/教练.png
create mode 100644 static/images/index/carNum.png
create mode 100644 static/images/index/coachIcon.png
create mode 100644 static/images/index/siteIcon.png
diff --git a/components/UserTab/UserTab.vue b/components/UserTab/UserTab.vue
index d2d80df..17a18f7 100644
--- a/components/UserTab/UserTab.vue
+++ b/components/UserTab/UserTab.vue
@@ -117,9 +117,20 @@
"iconPath": require("../../static/images/tabbar/wd.png"),
"selectedIconPath": require("../../static/images/tabbar/wdActive.png")
}]
- }else {
- // 模拟器老师
-
+ }else if(uni.getStorageSync('identity') == '模拟器老师'){
+ this.list = [
+ {
+ "pagePath": "/pages/tabbar/examSimulation/index",
+ "text": "学员评价",
+ "iconPath": require("../../static/images/tabbar/kc.png"),
+ "selectedIconPath": require("../../static/images/tabbar/kcActive.png")
+ },
+ {
+ "pagePath": "/pages/tabbar/mine/index",
+ "text": "我的",
+ "iconPath": require("../../static/images/tabbar/wd.png"),
+ "selectedIconPath": require("../../static/images/tabbar/wdActive.png")
+ }]
}
}
}
diff --git a/components/appointItem-operate/appointItem-operate.vue b/components/appointItem-operate/appointItem-operate.vue
index f2d6d95..85fff8b 100644
--- a/components/appointItem-operate/appointItem-operate.vue
+++ b/components/appointItem-operate/appointItem-operate.vue
@@ -35,7 +35,7 @@
- 预约时间:{{$u.timeFormat(item.startTime, 'yyyy/mm/dd MM:ss')}}
+ 预约时间:{{item.classDate}} {{$u.timeFormat(item.startTime, 'hh:MM')}} - {{$u.timeFormat(item.endTime, 'hh:MM')}}
diff --git a/components/appointItem/appointItem.vue b/components/appointItem/appointItem.vue
index 34bc099..130d58b 100644
--- a/components/appointItem/appointItem.vue
+++ b/components/appointItem/appointItem.vue
@@ -3,11 +3,13 @@
- 模拟器
- 张三三 18265468753
+
+ 科目{{item.subject==2?'二':'三'}}
+ {{item.studentName}} {{item.studentPhone}}
- 待处理
+ 已取消
+ {{ statusTxt[item.recordStatus]}}
@@ -16,27 +18,27 @@
-
+
- xx考场
+ {{item.examSiteName}}
-
+
- C1小型汽车手动挡
+ {{item.trainType}}
-
+
- 2号车(浙A99999)
+ {{item.examCarLicnum}}
-
+
- 2023/08/08 9:00—10:00
+ {{item.classDate}} {{$u.timeFormat(item.startTime, 'hh:MM')}} - {{$u.timeFormat(item.endTime, 'hh:MM')}}
@@ -44,11 +46,20 @@
\ No newline at end of file
diff --git a/pages/userCenter/myCar/myCar.vue b/pages/userCenter/myCar/myCar.vue
index 475a0f4..bd33320 100644
--- a/pages/userCenter/myCar/myCar.vue
+++ b/pages/userCenter/myCar/myCar.vue
@@ -13,7 +13,13 @@
-->
-
+
+
+ {{item.licnum}}
+ {{item.manufacturer}}
+
+
+
{{item.licnum}}
{{item.manufacturer}}
@@ -29,7 +35,11 @@