From 020e3e433a893afa4dbb849e68225877cf0ea69a Mon Sep 17 00:00:00 2001 From: unknown <331404948@qq.com> Date: Mon, 18 Mar 2024 19:08:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=94=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/css/app.scss | 5 +- common/js/utils.js | 5 +- components/pozCard/pozCard.vue | 90 +++++++--------------- config/api.js | 47 +++++------ config/utils.js | 39 ++++++++++ manifest.json | 3 +- pages/carEntry/operaAppointment/comp/step1.vue | 2 +- pages/carEntry/operaAppointment/comp/step2.vue | 24 +++--- .../carEntry/operaAppointment/operaAppointment.vue | 4 +- .../findShcool/shcoolDetail/shcoolDetail.vue | 4 + pages/indexEntry/signIn/signAndOut/signAndOut.vue | 53 +++++++++---- pages/indexEntry/signIn/signIn.vue | 37 +++++---- pages/tabbar/index/index.vue | 43 +---------- pages/tabbar/learnCar/comp/subject2.vue | 3 +- pages/tabbar/learnCar/index.vue | 23 +++--- pages/tabbar/mine/index.scss | 21 ++--- pages/tabbar/mine/index.vue | 6 +- 17 files changed, 217 insertions(+), 192 deletions(-) diff --git a/common/css/app.scss b/common/css/app.scss index fa2aa78..c70bf67 100644 --- a/common/css/app.scss +++ b/common/css/app.scss @@ -42,13 +42,14 @@ view { .pageBgImg { font-size: 28rpx;; color: #333; - background: url('https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/complain/2024-01-29/1706500065446-0') #F6F7FA no-repeat; + background: url('https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/complain/2024-03-18/1710759177684-0') #F6F7FA no-repeat; background-size: 100% 278rpx; + min-height: 100vh; } .topBg{ - background: url('https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/complain/2024-01-29/1706500065446-0') #F6F7FA no-repeat; + background: url('https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/complain/2024-03-18/1710759177684-0') #F6F7FA no-repeat; background-size: 100% ; } diff --git a/common/js/utils.js b/common/js/utils.js index 4758435..0894c16 100644 --- a/common/js/utils.js +++ b/common/js/utils.js @@ -4,9 +4,10 @@ const install = (Vue, vm) => { // 打开地图 const openMap = (lat, lng) => { + console.log(lat, lng, '经纬度') uni.openLocation({ - latitude: lat, - longitude: lng + latitude: lat*1, + longitude: lng*1 }) } diff --git a/components/pozCard/pozCard.vue b/components/pozCard/pozCard.vue index ebd06b8..ff95e5f 100644 --- a/components/pozCard/pozCard.vue +++ b/components/pozCard/pozCard.vue @@ -13,51 +13,12 @@ diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue index ab0afb4..2504167 100644 --- a/pages/tabbar/index/index.vue +++ b/pages/tabbar/index/index.vue @@ -15,7 +15,7 @@ - + @@ -131,6 +131,7 @@ import schoolItem from './comp/schoolItem' import informaItem from './comp/informaItem' import coachItem from './comp/coachItem' + import { scanCodeFn } from '@/config/utils.js' export default { components: { schoolItem, informaItem, coachItem }, data() { @@ -297,44 +298,8 @@ }) }, // 扫码 - scanCodeFn() { - let _this = this - uni.scanCode({ - scanType: ['qrCode'], - success: function(res) { - console.log('条码类型:' + res.scanType); - console.log('条码内容:' + res.result); - let obj = JSON.parse(res.result) - console.log(obj) - // 扫教练码去报名的 - - if(obj.QrType) { - let item = { - schoolName: obj.schoolName, - schoolId: obj.schoolId, - name: obj.coachName, - id: obj.coachId, - teachCarType: obj.teachCarType, - key: obj.key, - QrType: obj.QrType - } - console.log('***********') - console.log(item) - _this.$store.commit('upDateSchoolClass', {}) - _this.$store.commit('upDateSchoolCoach', item) - if(obj.QrType==1) { - _this.$u.utils.clickSignUp() - }else { - _this.$goPage('/pages/indexEntry/signIn/signAndOut/signAndOut') - } - } - - // _this.$store.commit('updateWebVeiwUrl', res.result) - // uni.navigateTo({ - // url: '/pages/other/webView/webView' - // }) - } - }); + scanCodeClick() { + scanCodeFn(this) }, clickItem(e) { this.swiperDotIndex = e diff --git a/pages/tabbar/learnCar/comp/subject2.vue b/pages/tabbar/learnCar/comp/subject2.vue index 6e805aa..4e33c33 100644 --- a/pages/tabbar/learnCar/comp/subject2.vue +++ b/pages/tabbar/learnCar/comp/subject2.vue @@ -27,8 +27,7 @@ 考试成绩:{{ info.studentExamVO.examResult }}分 - 去评价 + 去评价 diff --git a/pages/tabbar/learnCar/index.vue b/pages/tabbar/learnCar/index.vue index 0bc5ce8..45cdfcf 100644 --- a/pages/tabbar/learnCar/index.vue +++ b/pages/tabbar/learnCar/index.vue @@ -1,17 +1,18 @@ diff --git a/pages/tabbar/mine/index.scss b/pages/tabbar/mine/index.scss index 2d8da4f..41dbc27 100644 --- a/pages/tabbar/mine/index.scss +++ b/pages/tabbar/mine/index.scss @@ -33,7 +33,7 @@ display: flex; align-items: center; .name { - font-size: 30rpx; + font-size: 32rpx; color: #fff; font-weight: 700; } @@ -46,15 +46,18 @@ } .scanCode { - width: 36rpx; - height: 36rpx; + padding: 0 20rpx 24rpx 20rpx; + image { + width: 36rpx; + height: 36rpx; + } } } .phone { - font-size: 24rpx; + font-size: 26rpx; color: #fff; - margin-top: 20rpx; + // margin-top: 20rpx; } } } @@ -83,7 +86,7 @@ } .text { - font-size: 24rpx; + font-size: 28rpx; color: #333; } } @@ -96,7 +99,7 @@ padding: 4rpx 20rpx; .li2 { display: flex; - height: 88rpx; + height: 100rpx; display: flex; align-items: center; border-bottom: 1rpx solid #F6F7FA; @@ -104,8 +107,8 @@ border: none; } .icon { - width: 54rpx; - height: 52rpx; + width: 64rpx; + height: 62rpx; image { } diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue index c519554..27dbf26 100644 --- a/pages/tabbar/mine/index.vue +++ b/pages/tabbar/mine/index.vue @@ -14,7 +14,7 @@ - + @@ -49,6 +49,7 @@