From 9a637419482c3d2f36656ecb7bbc1e2c7634e843 Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Mon, 14 Aug 2023 19:37:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E8=BD=A6=E9=9D=99=E6=80=81=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/css/app.scss | 5 +
components/searchRow/searchRow.vue | 51 ++++
components/topNavbar/topNavbar.vue | 30 +++
pages.json | 14 +
pages/index/index.vue | 60 -----
pages/indexEntry/findShcool/findShcool.vue | 156 +++++++++++
pages/indexEntry/index.vue | 60 +++++
pages/tabbar/index/index.vue | 48 +---
pages/tabbar/learnCar/comp/comp.scss | 109 ++++++++
pages/tabbar/learnCar/comp/subject0.vue | 62 +++++
pages/tabbar/learnCar/comp/subject1.vue | 83 ++++++
pages/tabbar/learnCar/comp/subject2.vue | 104 ++++++++
pages/tabbar/learnCar/comp/subject3.vue | 103 ++++++++
pages/tabbar/learnCar/comp/subject4.vue | 75 ++++++
pages/tabbar/learnCar/index.vue | 149 ++++++++++-
pages/tabbar/mine/index.vue | 290 ++++++++++++++++++---
static/images/index/chain.png | Bin 0 -> 1220 bytes
static/images/userCenter/biangen.png | Bin 0 -> 2251 bytes
static/images/userCenter/btn_xueche_nor.png | Bin 0 -> 1881 bytes
static/images/userCenter/btn_xueche_nor@2x.png | Bin 1881 -> 0 bytes
static/images/userCenter/home_icon_biangen@2x.png | Bin 2251 -> 0 bytes
.../userCenter/home_icon_shenqingtuixue@2x.png | Bin 705 -> 0 bytes
.../images/userCenter/home_icon_tgzhuanxiao@2x.png | Bin 865 -> 0 bytes
static/images/userCenter/ic_chaxun.png | Bin 0 -> 1060 bytes
static/images/userCenter/ic_chaxun@2x.png | Bin 1060 -> 0 bytes
static/images/userCenter/ic_dingdan.png | Bin 0 -> 2122 bytes
static/images/userCenter/ic_dingdan@2x.png | Bin 2122 -> 0 bytes
static/images/userCenter/ic_erweima.png | Bin 0 -> 1389 bytes
static/images/userCenter/ic_erweima@2x.png | Bin 1389 -> 0 bytes
static/images/userCenter/ic_gengduo.png | Bin 0 -> 902 bytes
static/images/userCenter/ic_hetong.png | Bin 0 -> 2280 bytes
static/images/userCenter/ic_hetong@2x.png | Bin 2280 -> 0 bytes
static/images/userCenter/ic_pingjia.png | Bin 0 -> 2332 bytes
static/images/userCenter/ic_pingjia@2x.png | Bin 2332 -> 0 bytes
static/images/userCenter/ic_shenghuo.png | Bin 0 -> 3119 bytes
static/images/userCenter/ic_shenghuo@2x.png | Bin 3119 -> 0 bytes
static/images/userCenter/ic_shoucang.png | Bin 0 -> 3224 bytes
static/images/userCenter/ic_shoucang@2x.png | Bin 3224 -> 0 bytes
static/images/userCenter/ic_shuju.png | Bin 0 -> 2871 bytes
static/images/userCenter/ic_shuju@2x.png | Bin 2871 -> 0 bytes
static/images/userCenter/ic_yuyue.png | Bin 0 -> 3168 bytes
static/images/userCenter/ic_yuyue@2x.png | Bin 3168 -> 0 bytes
static/images/userCenter/shenqingtuixue.png | Bin 0 -> 705 bytes
static/images/userCenter/tgzhuanxiao.png | Bin 0 -> 865 bytes
44 files changed, 1257 insertions(+), 142 deletions(-)
create mode 100644 components/searchRow/searchRow.vue
create mode 100644 components/topNavbar/topNavbar.vue
delete mode 100644 pages/index/index.vue
create mode 100644 pages/indexEntry/findShcool/findShcool.vue
create mode 100644 pages/indexEntry/index.vue
create mode 100644 pages/tabbar/learnCar/comp/comp.scss
create mode 100644 pages/tabbar/learnCar/comp/subject0.vue
create mode 100644 pages/tabbar/learnCar/comp/subject1.vue
create mode 100644 pages/tabbar/learnCar/comp/subject2.vue
create mode 100644 pages/tabbar/learnCar/comp/subject3.vue
create mode 100644 pages/tabbar/learnCar/comp/subject4.vue
create mode 100644 static/images/index/chain.png
create mode 100644 static/images/userCenter/biangen.png
create mode 100644 static/images/userCenter/btn_xueche_nor.png
delete mode 100644 static/images/userCenter/btn_xueche_nor@2x.png
delete mode 100644 static/images/userCenter/home_icon_biangen@2x.png
delete mode 100644 static/images/userCenter/home_icon_shenqingtuixue@2x.png
delete mode 100644 static/images/userCenter/home_icon_tgzhuanxiao@2x.png
create mode 100644 static/images/userCenter/ic_chaxun.png
delete mode 100644 static/images/userCenter/ic_chaxun@2x.png
create mode 100644 static/images/userCenter/ic_dingdan.png
delete mode 100644 static/images/userCenter/ic_dingdan@2x.png
create mode 100644 static/images/userCenter/ic_erweima.png
delete mode 100644 static/images/userCenter/ic_erweima@2x.png
create mode 100644 static/images/userCenter/ic_gengduo.png
create mode 100644 static/images/userCenter/ic_hetong.png
delete mode 100644 static/images/userCenter/ic_hetong@2x.png
create mode 100644 static/images/userCenter/ic_pingjia.png
delete mode 100644 static/images/userCenter/ic_pingjia@2x.png
create mode 100644 static/images/userCenter/ic_shenghuo.png
delete mode 100644 static/images/userCenter/ic_shenghuo@2x.png
create mode 100644 static/images/userCenter/ic_shoucang.png
delete mode 100644 static/images/userCenter/ic_shoucang@2x.png
create mode 100644 static/images/userCenter/ic_shuju.png
delete mode 100644 static/images/userCenter/ic_shuju@2x.png
create mode 100644 static/images/userCenter/ic_yuyue.png
delete mode 100644 static/images/userCenter/ic_yuyue@2x.png
create mode 100644 static/images/userCenter/shenqingtuixue.png
create mode 100644 static/images/userCenter/tgzhuanxiao.png
diff --git a/common/css/app.scss b/common/css/app.scss
index 98da871..e6e2c56 100644
--- a/common/css/app.scss
+++ b/common/css/app.scss
@@ -36,6 +36,11 @@ view {
.pageBg {
background: #F6F6F6;
}
+.pageBgImg {
+ background: url('static/images/bigImg/topbg.png') #F6F6F6 no-repeat;
+ // background: url('http://192.168.1.20:81/zhili/image/20230814/625b0f15924541cda70b4616f032d194.png') #F6F6F6 no-repeat;
+ background-size: 100% 362rpx;
+}
.pad {
padding: 0 28rpx;
}
diff --git a/components/searchRow/searchRow.vue b/components/searchRow/searchRow.vue
new file mode 100644
index 0000000..782ae74
--- /dev/null
+++ b/components/searchRow/searchRow.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/topNavbar/topNavbar.vue b/components/topNavbar/topNavbar.vue
new file mode 100644
index 0000000..ba00ff2
--- /dev/null
+++ b/components/topNavbar/topNavbar.vue
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 8d28d29..5bcc315 100644
--- a/pages.json
+++ b/pages.json
@@ -30,6 +30,20 @@
],
"subPackages": [
{
+ "root": "pages/indexEntry",
+ "pages": [
+ {
+ "path": "findShcool/findShcool",
+ "style": {
+ "navigationBarTitleText": "找驾校",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false,
+ "backgroundTextStyle": "dark"
+ }
+ }
+ ]
+ },
+ {
"root": "pages/userCenter",
"pages": [
{
diff --git a/pages/index/index.vue b/pages/index/index.vue
deleted file mode 100644
index 74eb186..0000000
--- a/pages/index/index.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
- 你好
-
-
-
-
-
-
-
-
diff --git a/pages/indexEntry/findShcool/findShcool.vue b/pages/indexEntry/findShcool/findShcool.vue
new file mode 100644
index 0000000..71a305f
--- /dev/null
+++ b/pages/indexEntry/findShcool/findShcool.vue
@@ -0,0 +1,156 @@
+
+
+
+
+
+
+
+
+
+ {{ item.text }}
+
+ 筛选
+
+
+
+
+
+
+
+
+
+
+
+
+ 江西海正驾校
+
+
+ 4.9分
+
+ 行业信用AA
+ 距您1000.99公里
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/indexEntry/index.vue b/pages/indexEntry/index.vue
new file mode 100644
index 0000000..74eb186
--- /dev/null
+++ b/pages/indexEntry/index.vue
@@ -0,0 +1,60 @@
+
+
+
+
+ 你好
+
+
+
+
+
+
+
+
diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue
index 0338f62..81f1f9c 100644
--- a/pages/tabbar/index/index.vue
+++ b/pages/tabbar/index/index.vue
@@ -32,24 +32,14 @@
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -117,7 +107,7 @@
export default {
data() {
return {
- showPrivacy: true,
+ showPrivacy: false,
keywords: '',
entrySection: [{
text: '我要报名',
@@ -126,6 +116,7 @@
{
text: '找驾校',
icon: require('../../../static/images/index/ic_jiaxiao.png'),
+ url: '/pages/indexEntry/findShcool/findShcool'
},
{
text: '找考场',
@@ -224,8 +215,10 @@
close() {
},
- open() {
-
+ goPageSection(item) {
+ uni.navigateTo({
+ url:item.url
+ })
},
// 扫码
scanCodeFn() {
@@ -314,30 +307,7 @@
padding: 0 28rpx;
width: 100%;
- .searchBg {
- background: #8ABAED;
- width: 100%;
- height: 72rpx;
- border-radius: 16rpx;
- line-height: 72rpx;
-
- .flex {
- height: 100%;
- padding: 0 28rpx;
-
- .searchIcon {
- width: 40rpx;
- height: 40rpx;
- }
-
- .inputBox {
- padding-left: 28rpx;
- flex: 1;
- color: #fff;
- font-size: 28rpx;
- }
- }
- }
+
}
}
diff --git a/pages/tabbar/learnCar/comp/comp.scss b/pages/tabbar/learnCar/comp/comp.scss
new file mode 100644
index 0000000..6f3e03e
--- /dev/null
+++ b/pages/tabbar/learnCar/comp/comp.scss
@@ -0,0 +1,109 @@
+
+
+
+ .h1 {
+ font-size: 32rpx;
+ color: #333;
+ font-weight: 500;
+ position: relative;
+ padding: 0 0 0 32rpx;
+ line-height: 108rpx;
+ height: 108rpx;
+ &::before {
+ position: absolute;
+ content: '';
+ width: 8rpx;
+ height: 32rpx;
+ background: #1F6EFA;
+ border-radius: 4rpx;
+ top: 50%;
+ left: 0;
+ transform: translateY(-50%);
+ }
+ }
+
+ .card {
+ background: #FFFFFF;
+ border-radius: 16rpx;
+ padding: 28rpx 32rpx;
+ margin-bottom: 20rpx;
+ &.mb0 {
+ margin-bottom: 0;
+ }
+ .flex-b {
+ align-items: center;
+
+ .lab {
+ font-size: 28rpx;
+ color: #333;
+ }
+
+ .btn {
+ width: 144rpx;
+ height: 56rpx;
+ background: #1989FA;
+ border-radius: 8rpx;
+ font-size: 28rpx;
+ color: #fff;
+ text-align: center;
+ line-height: 56rpx;
+ &.disable {
+ opacity: 0.3;
+ }
+ }
+ }
+ .date {
+ font-size: 28rpx;
+ color: #333;
+ }
+ }
+
+ .learnStatus {
+ .more {
+ display: flex;
+ align-items: center;
+ .txt {
+ font-size: 24rpx;
+ color: #686B73;
+ }
+
+ .moreIcon {
+
+ }
+ }
+ .bg {
+ background: rgba(25,137,250,0.1);
+ border-radius: 16rpx;
+ margin-top: 22rpx;
+ padding: 20rpx 20rpx 0 20rpx;
+ .row {
+ padding-bottom: 20rpx;
+ display: flex;
+ justify-content: space-between;
+ width: 100%;
+ align-items: center;
+ &.oneBtn {
+ justify-content: center;
+ }
+ }
+ .text {
+ color: $themC;
+ font-size: 28rpx;
+ }
+ }
+ }
+
+ .tpsLine {
+ font-size: 24rpx;
+ color: #ADADAD;
+ border-top: 1px solid #E8E9EC;
+ margin-top: 20rpx;
+ padding-top: 18rpx;
+ }
+ .cancel {
+ font-size: 28rpx;
+ font-weight: 400;
+ color: #ADADAD;
+ margin-top: 22rpx;
+ text-decoration: underline;
+ }
\ No newline at end of file
diff --git a/pages/tabbar/learnCar/comp/subject0.vue b/pages/tabbar/learnCar/comp/subject0.vue
new file mode 100644
index 0000000..dbaccbd
--- /dev/null
+++ b/pages/tabbar/learnCar/comp/subject0.vue
@@ -0,0 +1,62 @@
+
+
+
+
+ 学习内容
+
+
+ 模拟器训练预约
+ 去预约
+
+
+
+
+
+
+ 学习状态
+
+ 查看全部
+
+
+
+
+
+
+
+ 模拟器训练学时报审
+ 2023/08/09 22:52:12
+
+
+
+ 评价模拟器教学老师
+ 去评价
+
+
+
+
+
+ 模拟器训练已预约
+ 2023/08/09 22:52:12
+
+
+
+ 模拟驾驶馆:某某模拟驾驶馆
+
+
+ 模拟器编号:00001
+
+
+ 预约时间:2023/08/23 10:00:00
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/tabbar/learnCar/comp/subject1.vue b/pages/tabbar/learnCar/comp/subject1.vue
new file mode 100644
index 0000000..6431261
--- /dev/null
+++ b/pages/tabbar/learnCar/comp/subject1.vue
@@ -0,0 +1,83 @@
+
+
+
+
+ 学习内容
+
+
+ 理论学习
+ 去学习
+
+
+
+
+ 理论VIP题库模拟
+ 去学习
+
+ 待学时达标后方可学习
+
+
+
+ 安全警示教育在线视频学习
+ 去学习
+
+
+
+
+
+
+ 学习状态
+
+ 查看全部
+
+
+
+
+
+
+
+ 科目一考试成绩已通过
+ 2023/08/09 22:52:12
+
+
+
+ 考试成绩:97分
+
+
+
+
+
+ 科目一考试预约受理中
+ 2023/08/09 22:52:12
+
+
+
+ 考试场地:南昌交安科目一考场
+
+
+ 考试时间:2023/08/02 第一场 22
+
+
+
+
+
+ 科目一学时已通过
+ 2023/07/24 03:12:20
+
+
+
+ 前往“12123”APP预约考试
+ 去预约
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/tabbar/learnCar/comp/subject2.vue b/pages/tabbar/learnCar/comp/subject2.vue
new file mode 100644
index 0000000..b4766b9
--- /dev/null
+++ b/pages/tabbar/learnCar/comp/subject2.vue
@@ -0,0 +1,104 @@
+
+
+
+
+ 学习内容
+
+
+ 实操训练
+ 去预约
+
+
+
+
+ 考场模拟训练
+ 去预约
+
+
+
+
+
+
+ 学习状态
+
+ 查看全部
+
+
+
+
+
+
+
+ 科目二考试成绩已通过
+ 2023/08/09 22:52:12
+
+
+
+ 考试成绩:100分
+ 去评价
+
+
+
+
+
+ 科目二考试预约成功
+ 2023/08/09 22:52:12
+
+
+
+ 考试场地:某某科目二考场
+
+
+ 考试时间:2023/08/23 10:00:00
+
+
+
+
+
+ 科目二学习进度已通过
+ 2023/07/24 03:12:20
+
+
+
+ 前往“12123”APP预约考试
+ 去预约
+
+
+
+
+
+ 科目二模拟训练已预约
+ 2023/07/24 03:12:20
+
+
+
+ 预约科目:科目二
+
+
+ 预约考场:某某考场
+
+
+ 学驾车型:C1
+
+
+ 车辆编号:2号车(浙A99988)
+
+
+ 预约时间:2023/08/16 14:00
+
+
+ 核销时间:2023/08/16 14:00
+
+
+ 取消预约
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/tabbar/learnCar/comp/subject3.vue b/pages/tabbar/learnCar/comp/subject3.vue
new file mode 100644
index 0000000..8533231
--- /dev/null
+++ b/pages/tabbar/learnCar/comp/subject3.vue
@@ -0,0 +1,103 @@
+
+
+
+
+ 学习内容
+
+
+ 实操训练
+ 去预约
+
+
+
+
+ 考场模拟训练
+ 去预约
+
+
+
+
+
+
+ 学习状态
+
+ 查看全部
+
+
+
+
+
+
+
+ 科目三考试成绩已通过
+ 2023/08/09 22:52:12
+
+
+
+ 考试成绩:100分
+ 去评价
+
+
+
+
+
+ 科目三考试预约成功
+ 2023/08/09 22:52:12
+
+
+
+ 考试场地:某某科目二考场
+
+
+ 考试时间:2023/08/23 10:00:00
+
+
+
+
+
+ 科目三模拟训练已核销
+ 2023/07/24 03:12:20
+
+
+
+ 去评价
+
+
+
+
+
+ 科目三模拟训练已预约
+ 2023/07/24 03:12:20
+
+
+
+ 预约科目:科目三
+
+
+ 预约考场:某某考场
+
+
+ 学驾车型:C1
+
+
+ 车辆编号:2号车(浙A99988)
+
+
+ 预约时间:2023/08/16 14:00
+
+
+ 核销时间:2023/08/16 14:00
+
+
+ 取消预约
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/tabbar/learnCar/comp/subject4.vue b/pages/tabbar/learnCar/comp/subject4.vue
new file mode 100644
index 0000000..a459bf5
--- /dev/null
+++ b/pages/tabbar/learnCar/comp/subject4.vue
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+ 学习状态
+
+ 查看全部
+
+
+
+
+
+
+
+ 恭喜你!可以拿证啦!
+ 2023/08/09 22:52:12
+
+
+
+ 领证宣誓
+
+
+
+
+
+ 科目三安全文明常识成绩
已通过
+ 2023/08/09 22:52:12
+
+
+
+ 考试成绩:98分
+
+
+
+
+
+ 科目三安全文明常识考试
预约成功
+ 2023/07/24 03:12:20
+
+
+
+ 考试场地:某某科目三理论考场
+
+
+ 考试时间:2023/08/22 16:00:00
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/tabbar/learnCar/index.vue b/pages/tabbar/learnCar/index.vue
index 0cfef8b..594bf8c 100644
--- a/pages/tabbar/learnCar/index.vue
+++ b/pages/tabbar/learnCar/index.vue
@@ -1,16 +1,68 @@
-
- 学车
- {{$store.state.user.vuex_userInfo.name}}
-
-
+
+
+
+ 江西驾考公共服务平台
+
+
+ {{ item.text }}
+
+
+
+ 应完成学时
+ 100分钟
+
+
+ 已完成学时
+ 30分钟
+ *与科目一学时共享
+
+
+
+
+
+
+
+
+
+
+
+ 应完成里程
+ 50km
+
+
+ 已完成里程
+ 0km
+
+
+
+
+
+
+
+
+