From db71e3e0ae1897f61d842cbe2056abfc159fd897 Mon Sep 17 00:00:00 2001 From: unknown <331404948@qq.com> Date: Mon, 25 Sep 2023 20:05:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E4=B8=9A=E6=94=BF=E7=AD=96=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E5=9B=BE=E7=89=87=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/css/app.scss | 2 +- components/searchRow/searchRow.vue | 15 +++-- config/api.js | 12 +++- config/site.config.js | 3 +- manifest.json | 3 +- pages.json | 4 +- pages/indexEntry/examines/detail/detail.vue | 4 +- pages/indexEntry/findShcool/findShcool.vue | 2 + .../findShcool/shcoolDetail/shcoolDetail.vue | 4 +- pages/indexEntry/iIndustryInfo/detail/detail.vue | 33 +++++++++-- pages/indexEntry/iIndustryInfo/iIndustryInfo.vue | 63 +++++++++++++++------ pages/indexEntry/industryPolicy/industryPolicy.vue | 63 ++++++++++++++------- pages/indexEntry/publicVideo/comp/videoItem.vue | 8 ++- pages/indexEntry/publicVideo/publicVideo.vue | 26 +++++++-- .../publicVideo/videoDetail/videoDetail.vue | 26 +++++++-- pages/mineEntry/carData/carData.vue | 12 ++-- pages/mineEntry/carLearnHours/carLearnHours.vue | 5 +- pages/tabbar/index/index.vue | 8 ++- pages/userCenter/login/login.vue | 11 ++-- pages/userCenter/login/loginByPhone.vue | 9 ++- static/images/bigImg/carlearTimeBg.png | Bin 30060 -> 0 bytes static/images/bigImg/index_banner.png | Bin 298852 -> 0 bytes static/images/bigImg/radian.png | Bin 5054 -> 0 bytes static/images/bigImg/topbg.png | Bin 132621 -> 0 bytes static/images/userCenter/loginTopBg.png | Bin 36319 -> 0 bytes static/images/userCenter/mydatabg.png | Bin 46426 -> 0 bytes static/images/userCenter/topbg.png | Bin 132621 -> 0 bytes 27 files changed, 230 insertions(+), 83 deletions(-) delete mode 100644 static/images/bigImg/carlearTimeBg.png delete mode 100644 static/images/bigImg/index_banner.png delete mode 100644 static/images/bigImg/radian.png delete mode 100644 static/images/bigImg/topbg.png delete mode 100644 static/images/userCenter/loginTopBg.png delete mode 100644 static/images/userCenter/mydatabg.png delete mode 100644 static/images/userCenter/topbg.png diff --git a/common/css/app.scss b/common/css/app.scss index c820e0c..3ddc0f4 100644 --- a/common/css/app.scss +++ b/common/css/app.scss @@ -42,7 +42,7 @@ view { .pageBgImg { font-size: 28rpx;; color: #333; - background: url('http://192.168.1.20:81/zhili/image/20230814/625b0f15924541cda70b4616f032d194.png') #F6F6F6 no-repeat; + background: url('http://jxtemp.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/topbg.png') #F6F6F6 no-repeat; background-size: 100% 362rpx; min-height: 100vh; } diff --git a/components/searchRow/searchRow.vue b/components/searchRow/searchRow.vue index 782ae74..e6da29a 100644 --- a/components/searchRow/searchRow.vue +++ b/components/searchRow/searchRow.vue @@ -5,8 +5,7 @@ - + @@ -17,7 +16,12 @@ props: ['placeholder'], data() { return { - keywords: '' + keyword: '' + } + }, + methods: { + searchFn() { + this.$emit('searchFn', this.keyword) } } } @@ -41,11 +45,12 @@ } .inputBox { - padding-left: 28rpx; flex: 1; color: #fff; font-size: 28rpx; } } } - \ No newline at end of file + + + diff --git a/config/api.js b/config/api.js index fc673f4..2e74830 100644 --- a/config/api.js +++ b/config/api.js @@ -17,8 +17,16 @@ export const schoolPage = (params) => http.get('business/school/page', {params: // 教练列表分页 export const coachPage = (params) => http.get('business/coach/page', {params: params}) // 公益视频 -export const publicVideoPage = (params) => http.get('business/public-video/page', {params: params}) - +export const publicVideoPage = (params) => http.get('business/video/page', {params: params}) +// 公益视频 详情 +export const publicGetvideo = (params) => http.get('business/video/getvideo', {params: params}) +// 行业资讯, +export const getarticleList = (params) => http.get('business/video/article', {params: params}) +// 行业政策 +export const getarticlezcList = (params) => http.get('business/video/articlezc', {params: params}) +// 行业资讯,行业政策 详情 +export const getarticle = (params) => http.get('business/video/getarticle', {params: params}) + diff --git a/config/site.config.js b/config/site.config.js index feedc97..bc7dc8b 100644 --- a/config/site.config.js +++ b/config/site.config.js @@ -4,5 +4,6 @@ module.exports = { H5_API: VUE_APP_PLATFORM === 'h5' ? '/api' : '',//h5代理 WX_API: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.26:48080/',//非代理地址 TEMP_HOST: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.26:48080/', - httpPrefix: '/app-api/' + httpPrefix: '/app-api/', + imgUrl: 'http://jxtemp.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/' }; diff --git a/manifest.json b/manifest.json index 901fb58..64b81c0 100644 --- a/manifest.json +++ b/manifest.json @@ -93,7 +93,8 @@ "disableHostCheck" : true, "proxy" : { "/api" : { - "target" : "http://192.168.1.26:48080/", + // "target" : "http://192.168.1.26:48080/", + "target" : "http://192.168.1.36:48080/", "changeOrigin" : true, "secure" : true, "pathRewrite" : { diff --git a/pages.json b/pages.json index 5b274a6..5125e95 100644 --- a/pages.json +++ b/pages.json @@ -44,8 +44,8 @@ { "path": "industryPolicy/industryPolicy", "style": { - "navigationBarTitleText": "质量信誉排行", - "enablePullDownRefresh": false, + "navigationBarTitleText": "行业政策", + "enablePullDownRefresh": true, "navigationStyle": "custom", "backgroundTextStyle": "dark" , "navigationBarBackgroundColor": "#FFFFFF" diff --git a/pages/indexEntry/examines/detail/detail.vue b/pages/indexEntry/examines/detail/detail.vue index ce7cd07..4deb226 100644 --- a/pages/indexEntry/examines/detail/detail.vue +++ b/pages/indexEntry/examines/detail/detail.vue @@ -7,7 +7,7 @@ - + @@ -47,10 +47,12 @@