From d6dee5e67acecb6ec69bade8acb3d9dfa86ead34 Mon Sep 17 00:00:00 2001 From: unknown <331404948@qq.com> Date: Wed, 27 Mar 2024 18:51:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E6=97=B6=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/utils.js | 4 +++- config/api.js | 3 +++ config/utils.js | 14 ++++++----- pages.json | 16 +------------ pages/carEntry/signature/signature.vue | 27 +++++++++++++++++++--- .../enroll/registInfo/chooseCoach/chooseCoach.vue | 2 +- .../enroll/uploadAvatar/uploadAvatar.vue | 2 +- pages/indexEntry/signIn/signIn.vue | 4 ++-- pages/indexEntry/webView/webView.vue | 2 +- pages/other/webView/webView.vue | 27 ---------------------- pages/tabbar/index/index.vue | 16 +++++++++---- pages/tabbar/learnCar/comp/topInfo.vue | 6 ++--- pages/tabbar/learnCar/index.vue | 7 ++++-- pages/tabbar/mine/index.vue | 2 +- pages/userCenter/login/login.vue | 8 ++++++- .../components/zeng-calen/zeng-calen.vue | 2 +- 16 files changed, 72 insertions(+), 70 deletions(-) delete mode 100644 pages/other/webView/webView.vue diff --git a/common/js/utils.js b/common/js/utils.js index 0894c16..8650d1a 100644 --- a/common/js/utils.js +++ b/common/js/utils.js @@ -132,8 +132,10 @@ const install = (Vue, vm) => { if( vm.vuex_userInfo.applyStep&& vm.vuex_userInfo.applyStep<5) { return vm.$goPage('/pages/indexEntry/enroll/registInfo/registInfo') } + if(vm.vuex_userInfo.applyStep>5) { + uni.$u.toast('您已是报名学员') + } - uni.$u.toast('您已是报名学员') } let isImagePath = (path)=> { diff --git a/config/api.js b/config/api.js index ffd418e..3674d94 100644 --- a/config/api.js +++ b/config/api.js @@ -212,6 +212,9 @@ export const reSignOut = (data) => http.post('business/student/sign/reSignOut', export const monthSignRecord = (data) => http.post('business/student/sign/monthSignRecord', data) // 学员扫码签到记录 -- 按天查询 export const signDetail = (data) => http.post('business/student/sign/signDetail', data) +// 学时确认 +export const periodConfirm = (data) => http.post('app/student-process/periodConfirm', data) + diff --git a/config/utils.js b/config/utils.js index a0a2039..c1c024b 100644 --- a/config/utils.js +++ b/config/utils.js @@ -1,4 +1,4 @@ -import { WX_API, H5_API, httpPrefix } from '@/config/site.config.js'; +import { WX_API, H5_API, httpPrefix } from './site.config.js'; var _url = H5_API+ WX_API + httpPrefix import store from '@/store/index.js' @@ -100,7 +100,8 @@ export function chooseImages(num=0) { }) }) } -export function uploadImgApi(filePath, imgName) { + +export function uploadImgApi(filePath, imgName, imgLink='image') { console.log(filePath) let token = 'Bearer '+ store.state.user.vuex_loginInfo.accessToken let timer = new Date() * 1 @@ -110,9 +111,9 @@ export function uploadImgApi(filePath, imgName) { url: _url + 'infra/file/upload',//接口 filePath: filePath,//要上传的图片的本地路径 name: 'file', - + // complain formData: { - path: 'complain/'+ uni.$u.date(timer, 'yyyy-mm-dd')+'/'+timer + '-'+ imgName, + path: imgLink+'/'+ uni.$u.date(timer, 'yyyy-mm-dd')+'/'+timer + '-'+ imgName, type: 1, fileSuffix: "png" }, @@ -121,7 +122,8 @@ export function uploadImgApi(filePath, imgName) { // 'tenant-id': '1704459882232553474' }, success(res) { - console.log('上传成功') + console.log('上传成功??') + console.log(res) let res2 = JSON.parse(res.data) reslove(res2.data) @@ -203,7 +205,7 @@ export function uploadImgApi(filePath, imgName) { }else { _this.$store.commit('updateWebVeiwUrl', res.result) uni.navigateTo({ - url: '/pages/other/webView/webView' + url: '/pages/indexEntry/webView/webView' }) } } diff --git a/pages.json b/pages.json index 6087eb6..e7ca110 100644 --- a/pages.json +++ b/pages.json @@ -66,7 +66,7 @@ "style": { "navigationBarTitleText": "", "enablePullDownRefresh": false, - "navigationStyle": "custom", + // "navigationStyle": "custom", // "navigationBarLoading": false, "backgroundTextStyle": "dark" } @@ -521,20 +521,6 @@ } ] - }, - { - "root": "pages/other", - "pages": [ - { - "path": "webView/webView", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom", - "enablePullDownRefresh": false, - "backgroundTextStyle": "dark" - } - } - ] } ], "globalStyle": { diff --git a/pages/carEntry/signature/signature.vue b/pages/carEntry/signature/signature.vue index ab32802..e887b93 100644 --- a/pages/carEntry/signature/signature.vue +++ b/pages/carEntry/signature/signature.vue @@ -27,6 +27,7 @@ - - diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue index d3366e0..c6d8987 100644 --- a/pages/tabbar/index/index.vue +++ b/pages/tabbar/index/index.vue @@ -27,10 +27,10 @@ :current="current" :mode="mode" :dots-styles="dotsStyles" field="content"> - + - + @@ -227,6 +227,14 @@ }, methods: { + // 点击海报图 + bannerClick(item) { + let link = item.jumpPath + console.log(link) + if(!link) return false + this.$store.commit('updateWebVeiwUrl', link) + this.$goPage('/pages/indexEntry/webView/webView') + }, initApi() { this.getarticleListFn() this.getRecommendList() @@ -254,9 +262,7 @@ async getBannerListFn() { const {data: res} = await getBannerList() - this.swiperInfo = res.list.map(item=>{ - return item.imgUrl - }) + this.swiperInfo = res.list console.log(this.swiperInfo) }, async entrySectionClick(item) { diff --git a/pages/tabbar/learnCar/comp/topInfo.vue b/pages/tabbar/learnCar/comp/topInfo.vue index 7f7e50c..f1cbf39 100644 --- a/pages/tabbar/learnCar/comp/topInfo.vue +++ b/pages/tabbar/learnCar/comp/topInfo.vue @@ -12,7 +12,7 @@ - {{ carType }} + {{ carType.name }} @@ -53,8 +53,8 @@ --> - - + + 确认学时 diff --git a/pages/tabbar/learnCar/index.vue b/pages/tabbar/learnCar/index.vue index 45cdfcf..d635674 100644 --- a/pages/tabbar/learnCar/index.vue +++ b/pages/tabbar/learnCar/index.vue @@ -1,11 +1,11 @@