From 013cf65ed6eac87d5c9416f41973478bc77c0d5a Mon Sep 17 00:00:00 2001 From: unknown <331404948@qq.com> Date: Fri, 23 Feb 2024 18:49:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=AE=9A=E4=BD=8D=E5=BC=80?= =?UTF-8?q?=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 30 ++- pages.json | 8 + .../findShcool/shcoolDetail/comp/tab3.vue | 2 +- pages/mineEntry/aboutUs/aboutUs.vue | 45 ++++ pages/mineEntry/myEvaluate/comp/commentItem.vue | 2 +- pages/mineEntry/myOrder/detail/detail.vue | 10 +- pages/tabbar/learnCar/comp/comp.scss | 44 +-- pages/tabbar/learnCar/comp/subject0.vue | 52 ---- pages/tabbar/learnCar/comp/subject1.vue | 79 +++--- pages/tabbar/learnCar/comp/subject2.vue | 116 ++++---- pages/tabbar/learnCar/comp/subject3.vue | 107 ++++---- pages/tabbar/learnCar/comp/subject4.vue | 71 ++--- pages/tabbar/learnCar/comp/topInfo.vue | 19 +- pages/tabbar/learnCar/index - 副本.vue | 206 ++++---------- pages/tabbar/learnCar/index.vue | 296 ++++++++++++++++++--- pages/tabbar/mine/index.vue | 16 +- 16 files changed, 620 insertions(+), 483 deletions(-) create mode 100644 pages/mineEntry/aboutUs/aboutUs.vue delete mode 100644 pages/tabbar/learnCar/comp/subject0.vue diff --git a/manifest.json b/manifest.json index f85a08f..8c3a528 100644 --- a/manifest.json +++ b/manifest.json @@ -1,8 +1,8 @@ { "name" : "洛阳学车", - "appid" : "__UNI__BD23957", + "appid" : "__UNI__3347C6E", "description" : "", - "versionName" : "1.0.0", + "versionName" : "1.0.1", "versionCode" : "100", "transformPx" : false, /* 5+App特有相关 */ @@ -28,6 +28,8 @@ "permissions" : [ "", "", + "", + "", "", "", "", @@ -35,12 +37,14 @@ "", "", "", + "", "", "", "", "", "", "", + "", "" ] }, @@ -74,6 +78,22 @@ } } } + }, + "nativePlugins" : { + "KJ-GNSS" : { + "__plugin_info__" : { + "name" : "系统定位完整版(ios、andorid) - [试用版，仅用于自定义调试基座]", + "description" : "系统定位完整版、检测虚拟定位、GPS、网络定位、正反地理编码、卫星信息、请试用合适再购买、请试用合适再购买、请试用合适再购买", + "platforms" : "Android,iOS", + "url" : "https://ext.dcloud.net.cn/plugin?id=11077", + "android_package_name" : "", + "ios_bundle_id" : "", + "isCloud" : true, + "bought" : 0, + "pid" : "11077", + "parameters" : {} + } + } } }, /* 快应用特有相关 */ @@ -132,10 +152,8 @@ }, "sdkConfigs" : { "maps" : { - "amap" : { - "key" : "2BTBZ-6BQRB-ZG4UG-NOYYG-KZMH7-B4BYN", - "securityJsCode" : "", - "serviceHost" : "" + "google" : { + "key" : "" } } } diff --git a/pages.json b/pages.json index f72629e..5cbbbc9 100644 --- a/pages.json +++ b/pages.json @@ -437,6 +437,14 @@ } }, { + "path": "aboutUs/aboutUs", + "style": { + "navigationBarTitleText": "关于我们", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { "path": "personaInfo/myInfo", "style": { "navigationBarTitleText": "个人信息", diff --git a/pages/indexEntry/findShcool/shcoolDetail/comp/tab3.vue b/pages/indexEntry/findShcool/shcoolDetail/comp/tab3.vue index ab5e8ce..b1fe607 100644 --- a/pages/indexEntry/findShcool/shcoolDetail/comp/tab3.vue +++ b/pages/indexEntry/findShcool/shcoolDetail/comp/tab3.vue @@ -13,7 +13,7 @@ - {{item.stars || 0}} + {{item.stars || '无'}} 报名 diff --git a/pages/mineEntry/aboutUs/aboutUs.vue b/pages/mineEntry/aboutUs/aboutUs.vue new file mode 100644 index 0000000..487b9ff --- /dev/null +++ b/pages/mineEntry/aboutUs/aboutUs.vue @@ -0,0 +1,45 @@ + + + + + \ No newline at end of file diff --git a/pages/mineEntry/myEvaluate/comp/commentItem.vue b/pages/mineEntry/myEvaluate/comp/commentItem.vue index b998da5..315c9b3 100644 --- a/pages/mineEntry/myEvaluate/comp/commentItem.vue +++ b/pages/mineEntry/myEvaluate/comp/commentItem.vue @@ -2,7 +2,7 @@ - + {{ item.name}} diff --git a/pages/mineEntry/myOrder/detail/detail.vue b/pages/mineEntry/myOrder/detail/detail.vue index 8ee372e..f9716a1 100644 --- a/pages/mineEntry/myOrder/detail/detail.vue +++ b/pages/mineEntry/myOrder/detail/detail.vue @@ -45,7 +45,7 @@ {{ info.appSchoolType }} - + @@ -75,7 +75,7 @@ - 培训费总价 + 培训费 ￥{{$u.utils.priceTo(info.totalAmount)}} - + 申请退款 diff --git a/pages/tabbar/learnCar/comp/comp.scss b/pages/tabbar/learnCar/comp/comp.scss index 5693146..43a8ded 100644 --- a/pages/tabbar/learnCar/comp/comp.scss +++ b/pages/tabbar/learnCar/comp/comp.scss @@ -28,26 +28,26 @@ color: #333; } - .btn { - height: 44rpx; - padding: 0 18rpx; - background: $themC; - border-radius: 8rpx; - font-size: 28rpx; - color: #fff; - text-align: center; - line-height: 44rpx; - &.disable { - opacity: 0.3; - } - &.status { - border-radius: 10rpx 6rpx 6rpx 0px; - } - } + } } - + .btn { + height: 44rpx; + padding: 0 18rpx; + background: $themC; + border-radius: 8rpx; + font-size: 28rpx; + color: #fff; + text-align: center; + line-height: 44rpx; + &.disable { + opacity: 0.3; + } + &.status { + border-radius: 10rpx 6rpx 6rpx 0px; + } + } .learnStatus { .more { display: flex; @@ -73,7 +73,8 @@ align-items: center; border-bottom: 1rpx solid #E3EAFB; height: 88rpx; - + color: $themC; + font-size: 28rpx; &:last-child { border: none; } @@ -81,10 +82,9 @@ justify-content: center; } } - .text { - color: $themC; - font-size: 28rpx; - } + // .text { + + // } } } diff --git a/pages/tabbar/learnCar/comp/subject0.vue b/pages/tabbar/learnCar/comp/subject0.vue deleted file mode 100644 index d7ab27a..0000000 --- a/pages/tabbar/learnCar/comp/subject0.vue +++ /dev/null @@ -1,52 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/tabbar/learnCar/comp/subject1.vue b/pages/tabbar/learnCar/comp/subject1.vue index d479fe1..fb235b7 100644 --- a/pages/tabbar/learnCar/comp/subject1.vue +++ b/pages/tabbar/learnCar/comp/subject1.vue @@ -1,76 +1,71 @@ diff --git a/pages/tabbar/learnCar/comp/subject2.vue b/pages/tabbar/learnCar/comp/subject2.vue index 8e9c7fe..6452838 100644 --- a/pages/tabbar/learnCar/comp/subject2.vue +++ b/pages/tabbar/learnCar/comp/subject2.vue @@ -1,109 +1,101 @@ + \ No newline at end of file diff --git a/pages/tabbar/learnCar/index.vue b/pages/tabbar/learnCar/index.vue index 16e8903..9ea31ab 100644 --- a/pages/tabbar/learnCar/index.vue +++ b/pages/tabbar/learnCar/index.vue @@ -1,57 +1,277 @@ + \ No newline at end of file diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue index 49aa0b5..bb2b7e5 100644 --- a/pages/tabbar/mine/index.vue +++ b/pages/tabbar/mine/index.vue @@ -45,8 +45,6 @@ - - @@ -67,7 +65,7 @@ {name: '变更车型', icon: require('@/static/images/mineIcon/minIcon (7).png'),url: '/pages/mineEntry/modelChange/modelChange'}, {name: '同城转校', icon: require('@/static/images/mineIcon/minIcon (5).png'),url: '/pages/mineEntry/schoolTransfer/schoolTransfer'}, // {name: '退款申请记录', icon: require('@/static/images/mineIcon/minIcon (6).png'),url: ''}, - {name: '关于我们', icon: require('@/static/images/mineIcon/minIcon (2).png'),url: ''}, + {name: '关于我们', icon: require('@/static/images/mineIcon/minIcon (2).png'),url: '/pages/mineEntry/aboutUs/aboutUs'}, ] } }, @@ -81,12 +79,12 @@ }, goPage(item) { if(item.name!='关于我们') { - if(this.vuex_userInfo.applyStep>2&&this.vuex_userInfo.applyStep<6) { - return this.$goPage('/pages/mineEntry/myForecastName/myForecastName') - } - if(this.vuex_userInfo.applyStep!=6) { - return this.$u.toast('您还未报名驾校') - } + // if(item.name=='我的订单'&&this.vuex_userInfo.applyStep>2&&this.vuex_userInfo.applyStep<6) { + // return this.$goPage('/pages/mineEntry/myForecastName/myForecastName') + // } + // if(this.vuex_userInfo.applyStep!=6) { + // return this.$u.toast('您还未报名驾校') + // } } this.$goPage(item.url) }