diff --git a/App.vue b/App.vue
index 2211627..bb9b0e2 100644
--- a/App.vue
+++ b/App.vue
@@ -18,3 +18,4 @@
@import '@/uni_modules/uview-ui/index.scss';
@import 'common/css/app.scss'
+
diff --git a/common/css/app.scss b/common/css/app.scss
index df0acaa..c820e0c 100644
--- a/common/css/app.scss
+++ b/common/css/app.scss
@@ -116,4 +116,30 @@ image {
font-size: 28rpx;
color:$themC;
border: 2rpx solid #1989FA;
- }
\ No newline at end of file
+ }
+
+ /* 通用 */
+ ::-webkit-input-placeholder { color:#ADADAD; }
+ ::-moz-placeholder { color:#ADADAD; } /* firefox 19+ */
+ :-ms-input-placeholder { color:#ADADAD; } /* ie */
+ input:-moz-placeholder { color:#ADADAD; }
+
+ input::-webkit-input-placeholder {
+ color: #CDCDCD !important;
+ }
+ input::-moz-input-placeholder {
+ color: #CDCDCD !important;
+ }
+ input::-ms-input-placeholder {
+ color: #CDCDCD !important;
+ }
+
+ // /* webkit专用 */
+ .input1::-webkit-input-placeholder { color:#00f; }
+ // #input2::-webkit-input-placeholder { color:#090; background:lightgreen; text-transform:uppercase; }
+ // #input3::-webkit-input-placeholder { font-style:italic; text-decoration:overline; color:#999; }
+
+ // /* mozilla专用 */
+ // #input1::-moz-placeholder { color:#00f; }
+ // #input2::-moz-placeholder { color:#090; background:lightgreen; text-transform:uppercase; }
+ // #input3::-moz-placeholder { font-style:italic; text-decoration:overline; color:#999; }
diff --git a/pages.json b/pages.json
index 9dcf705..fd964f8 100644
--- a/pages.json
+++ b/pages.json
@@ -33,6 +33,51 @@
"root": "pages/indexEntry",
"pages": [
{
+ "path": "enroll/enroll",
+ "style": {
+ "navigationBarTitleText": "学员报名",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false,
+ "backgroundTextStyle": "dark"
+ }
+ },
+ {
+ "path": "enroll/uploadAvatar/uploadAvatar",
+ "style": {
+ "navigationBarTitleText": "上传头像",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false,
+ "backgroundTextStyle": "dark"
+ }
+ },
+ {
+ "path": "enroll/registInfo/registInfo",
+ "style": {
+ "navigationBarTitleText": "报名信息确认",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false,
+ "backgroundTextStyle": "dark"
+ }
+ },
+ {
+ "path": "enroll/payment/payment",
+ "style": {
+ "navigationBarTitleText": "报名信息确认",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false,
+ "backgroundTextStyle": "dark"
+ }
+ },
+ {
+ "path": "enroll/signContract/signContract",
+ "style": {
+ "navigationBarTitleText": "上传头像",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false,
+ "backgroundTextStyle": "dark"
+ }
+ },
+ {
"path": "findShcool/findShcool",
"style": {
"navigationBarTitleText": "找驾校",
@@ -266,6 +311,24 @@
}
},
{
+ "path": "carLearProgress/carLearProgress",
+ "style": {
+ "navigationBarTitleText": "学车进度",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false,
+ "backgroundTextStyle": "dark"
+ }
+ },
+ {
+ "path": "carLearnHours/carLearnHours",
+ "style": {
+ "navigationBarTitleText": "学车进度",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false,
+ "backgroundTextStyle": "dark"
+ }
+ },
+ {
"path": "carData/carData",
"style": {
"navigationBarTitleText": "我的数据",
diff --git a/pages/indexEntry/enroll/enroll.vue b/pages/indexEntry/enroll/enroll.vue
new file mode 100644
index 0000000..6a7676f
--- /dev/null
+++ b/pages/indexEntry/enroll/enroll.vue
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+ 证件类型
+
+
+
+
+
+
+
+
+
+
+ 国籍
+
+
+
+
+
+
+
+
+
+
+ 证件号码
+
+
+
+
+
+
+
+
+
+
+ 实名认证
+
+ 待认证
+
+
+
+
+ 下一步
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/indexEntry/enroll/payment/payment.vue b/pages/indexEntry/enroll/payment/payment.vue
new file mode 100644
index 0000000..e9050dd
--- /dev/null
+++ b/pages/indexEntry/enroll/payment/payment.vue
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+ 翔力驾校
+
+ ¥1000.13
+
+ 交易单号:65465879312
+
+
+
+
+ 选择支付方式
+
+
+
+
+ 微信支付
+
+
+
+
+
+
+ 确认支付
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/indexEntry/enroll/registInfo/comp/comfigPopup.vue b/pages/indexEntry/enroll/registInfo/comp/comfigPopup.vue
new file mode 100644
index 0000000..a8dce69
--- /dev/null
+++ b/pages/indexEntry/enroll/registInfo/comp/comfigPopup.vue
@@ -0,0 +1,95 @@
+
+
+ 再次确认报名信息
+
+ 选择驾校
+ xxx
+
+
+ 选择车型
+ xxx
+
+
+ 选择班型
+ xxx
+
+
+ 选择教练
+ xxx
+
+
+ 业务类型
+ xxx
+
+
+ 是否异地转入
+ xxx
+
+
+ 合计
+ xxx
+
+
+ 支付形式
+ xxx
+
+
+ 待支付金额
+ xxx
+
+
+ 返回修改
+ 确认
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/indexEntry/enroll/registInfo/registInfo.vue b/pages/indexEntry/enroll/registInfo/registInfo.vue
new file mode 100644
index 0000000..e832f2c
--- /dev/null
+++ b/pages/indexEntry/enroll/registInfo/registInfo.vue
@@ -0,0 +1,364 @@
+
+
+
+
+
+
+ 扫描教练二维码
+
+ 扫一扫
+
+
+
+
+
+
+ 选择驾校
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择车型
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择班型
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择教练
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 业务类型
+
+
+
+
+
+
+
+
+
+
+
+ 是否异地转入
+
+
+
+
+
+
+
+
+
+
+
+ 原驾驶证号
+
+
+
+
+
+
+
+
+
+ 驾驶证初领日期
+
+
+
+
+
+
+
+
+
+
+
+
+ 原准驾车型
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 来源城市
+
+
+
+
+
+
+
+
+
+
+
+
+ 已过科目
+
+
+
+
+
+
+
+
+
+
+
+
+ 待学科目
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 学费
+
+
+ ¥100
+
+
+
+
+ 代收费
+
+
+ ¥100
+
+
+
+
+ 合计
+
+
+ ¥100
+
+
+
+
+
+
+
+ 支付形式
+
+
+
+
+
+
+
+
+
+
+
+ 优惠券
+
+
+ -¥1000
+
+
+
+
+
+
+
+ 待支付金额
+
+
+ ¥100
+
+
+
+
+ 确认
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/indexEntry/enroll/signContract/signContract.vue b/pages/indexEntry/enroll/signContract/signContract.vue
new file mode 100644
index 0000000..33baa96
--- /dev/null
+++ b/pages/indexEntry/enroll/signContract/signContract.vue
@@ -0,0 +1,29 @@
+
+
+
+
+
+ 教学合同
+
+ 同意并签字确认
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/indexEntry/enroll/uploadAvatar/uploadAvatar.vue b/pages/indexEntry/enroll/uploadAvatar/uploadAvatar.vue
new file mode 100644
index 0000000..b6c030a
--- /dev/null
+++ b/pages/indexEntry/enroll/uploadAvatar/uploadAvatar.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+ 请上传或拍摄一张五官清晰的照片
+
+
+
+
+
+ 添加图片
+
+
+ 上传
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/mineEntry/carLearProgress/carLearProgress.vue b/pages/mineEntry/carLearProgress/carLearProgress.vue
new file mode 100644
index 0000000..24aca32
--- /dev/null
+++ b/pages/mineEntry/carLearProgress/carLearProgress.vue
@@ -0,0 +1,128 @@
+
+
+
+
+
+ {{ item.text }}
+
+
+
+
+
+
+ 模拟器训练学时报审
+ 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/mineEntry/carLearnHours/carLearnHours.vue b/pages/mineEntry/carLearnHours/carLearnHours.vue
new file mode 100644
index 0000000..7debaea
--- /dev/null
+++ b/pages/mineEntry/carLearnHours/carLearnHours.vue
@@ -0,0 +1,98 @@
+
+
+
+
+
+ 模拟器
+
+
+
+ 总学时
+ 100分钟
+
+
+ 已完成
+ 90分钟
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue
index 5c367ea..b44e7b2 100644
--- a/pages/tabbar/index/index.vue
+++ b/pages/tabbar/index/index.vue
@@ -112,6 +112,7 @@
entrySection: [{
text: '我要报名',
icon: require('../../../static/images/index/ic_baoming.png'),
+ url: '/pages/indexEntry/enroll/enroll'
},
{
text: '找驾校',
diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue
index f1aee49..4ea3775 100644
--- a/pages/tabbar/mine/index.vue
+++ b/pages/tabbar/mine/index.vue
@@ -33,7 +33,7 @@
科目一考试通过
当前进度
- 进度查询
+ 进度查询
@@ -51,7 +51,7 @@
业务办理
-
+
@@ -106,6 +106,7 @@
{
text: '学时查询',
icon: require('../../../static/images/userCenter/ic_chaxun.png'),
+ url: '/pages/mineEntry/carLearnHours/carLearnHours'
},
{
text: '同城转校',
diff --git a/static/images/index/wxicon.png b/static/images/index/wxicon.png
new file mode 100644
index 0000000..9a813dc
Binary files /dev/null and b/static/images/index/wxicon.png differ