diff --git a/common/css/app.scss b/common/css/app.scss index e6e2c56..3d31400 100644 --- a/common/css/app.scss +++ b/common/css/app.scss @@ -35,15 +35,24 @@ view { } .pageBg { background: #F6F6F6; + color: #333; + min-height: 100vh; } .pageBgImg { background: url('static/images/bigImg/topbg.png') #F6F6F6 no-repeat; + color: #333; // background: url('http://192.168.1.20:81/zhili/image/20230814/625b0f15924541cda70b4616f032d194.png') #F6F6F6 no-repeat; background-size: 100% 362rpx; + min-height: 100vh; } .pad { padding: 0 28rpx; } +.card { + width: 100%; + background: #fff; + border-radius: 16rpx; +} .status_bar { height: var(--status-bar-height); width: 100%; @@ -56,15 +65,33 @@ image { .placeholderClassFFF { color: #fff !important; } -.star { +.starBox { display: flex; - align-items: center; - .starText { - font-size: 26rpx; - color: #F5682D; - } -} + .num { + color: $themC; + font-size: 24rpx; + } + } .my .u-input { height: 100%; + } + + .h1 { + font-size: 32rpx; + color: #333; + font-weight: 500; + position: relative; + padding: 0 0 0 32rpx; + &::before { + position: absolute; + content: ''; + width: 8rpx; + height: 32rpx; + background: #1F6EFA; + border-radius: 4rpx; + top: 50%; + transform: translateY(-50%); + left: 0; + } } \ No newline at end of file diff --git a/components/moreRight/moreRight.vue b/components/moreRight/moreRight.vue new file mode 100644 index 0000000..f3c0d3a --- /dev/null +++ b/components/moreRight/moreRight.vue @@ -0,0 +1,24 @@ + + + + + \ No newline at end of file diff --git a/components/pozCard/pozCard.vue b/components/pozCard/pozCard.vue new file mode 100644 index 0000000..834cb0f --- /dev/null +++ b/components/pozCard/pozCard.vue @@ -0,0 +1,59 @@ + + + + + \ No newline at end of file diff --git a/components/topNavbar/topNavbar.vue b/components/topNavbar/topNavbar.vue index ba00ff2..ca3dcef 100644 --- a/components/topNavbar/topNavbar.vue +++ b/components/topNavbar/topNavbar.vue @@ -8,9 +8,6 @@ :fixed="false" > - - - diff --git a/pages.json b/pages.json index 5bcc315..e0235e7 100644 --- a/pages.json +++ b/pages.json @@ -40,6 +40,95 @@ "enablePullDownRefresh": false, "backgroundTextStyle": "dark" } + }, + { + "path": "findShcool/shcoolDetail/shcoolDetail", + "style": { + "navigationBarTitleText": "找驾校", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "findShcool/comments/comments", + "style": { + "navigationBarTitleText": "教练评价", + "enablePullDownRefresh": true, + "backgroundTextStyle": "dark" + } + }, + { + "path": "iIndustryInfo/iIndustryInfo", + "style": { + "navigationBarTitleText": "行业资讯", + "navigationStyle": "custom", + "enablePullDownRefresh": true, + "backgroundTextStyle": "dark" + } + }, + { + "path": "iIndustryInfo/detail/detail", + "style": { + "navigationBarTitleText": "行业资讯详情", + "navigationStyle": "custom", + "enablePullDownRefresh": true, + "backgroundTextStyle": "dark" + } + }, + { + "path": "examines/examines", + "style": { + "navigationBarTitleText": "找考场", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "examines/allExamines/allExamines", + "style": { + "navigationBarTitleText": "找考场", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "examines/detail/detail", + "style": { + "navigationBarTitleText": "考场详情", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "examines/allNews/allNews", + "style": { + "navigationBarTitleText": "考场信息资讯", + "navigationStyle": "custom", + "enablePullDownRefresh": true, + "backgroundTextStyle": "dark" + } + }, + { + "path": "examines/newsDetail/newsDetail", + "style": { + "navigationBarTitleText": "考场信息资讯详情", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "theory/theory", + "style": { + "navigationBarTitleText": "考场信息资讯详情", + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } } ] }, diff --git a/pages/indexEntry/examines/allExamines/allExamines.vue b/pages/indexEntry/examines/allExamines/allExamines.vue new file mode 100644 index 0000000..68cd945 --- /dev/null +++ b/pages/indexEntry/examines/allExamines/allExamines.vue @@ -0,0 +1,69 @@ + + + + + \ No newline at end of file diff --git a/pages/indexEntry/examines/allNews/allNews.vue b/pages/indexEntry/examines/allNews/allNews.vue new file mode 100644 index 0000000..d9e1f11 --- /dev/null +++ b/pages/indexEntry/examines/allNews/allNews.vue @@ -0,0 +1,26 @@ + + + + + \ No newline at end of file diff --git a/pages/indexEntry/examines/comp/examineItem.vue b/pages/indexEntry/examines/comp/examineItem.vue new file mode 100644 index 0000000..3c0be6f --- /dev/null +++ b/pages/indexEntry/examines/comp/examineItem.vue @@ -0,0 +1,100 @@ + + + + + \ No newline at end of file diff --git a/pages/indexEntry/examines/comp/marquee.vue b/pages/indexEntry/examines/comp/marquee.vue new file mode 100644 index 0000000..8d72798 --- /dev/null +++ b/pages/indexEntry/examines/comp/marquee.vue @@ -0,0 +1,101 @@ + + + + \ No newline at end of file diff --git a/pages/indexEntry/examines/comp/newItem.vue b/pages/indexEntry/examines/comp/newItem.vue new file mode 100644 index 0000000..7e7d53d --- /dev/null +++ b/pages/indexEntry/examines/comp/newItem.vue @@ -0,0 +1,28 @@ + + + + + \ No newline at end of file diff --git a/pages/indexEntry/examines/detail/detail.vue b/pages/indexEntry/examines/detail/detail.vue new file mode 100644 index 0000000..ce7cd07 --- /dev/null +++ b/pages/indexEntry/examines/detail/detail.vue @@ -0,0 +1,146 @@ + + + + + \ No newline at end of file diff --git a/pages/indexEntry/examines/examines.vue b/pages/indexEntry/examines/examines.vue new file mode 100644 index 0000000..7fd8032 --- /dev/null +++ b/pages/indexEntry/examines/examines.vue @@ -0,0 +1,75 @@ + + + + + \ No newline at end of file diff --git a/pages/indexEntry/examines/newsDetail/newsDetail.vue b/pages/indexEntry/examines/newsDetail/newsDetail.vue new file mode 100644 index 0000000..f57f19c --- /dev/null +++ b/pages/indexEntry/examines/newsDetail/newsDetail.vue @@ -0,0 +1,35 @@ + + + + + \ No newline at end of file diff --git a/pages/indexEntry/findShcool/comments/comments.vue b/pages/indexEntry/findShcool/comments/comments.vue new file mode 100644 index 0000000..4c33547 --- /dev/null +++ b/pages/indexEntry/findShcool/comments/comments.vue @@ -0,0 +1,112 @@ + + + + + \ No newline at end of file diff --git a/pages/indexEntry/findShcool/findShcool.vue b/pages/indexEntry/findShcool/findShcool.vue index 71a305f..6eebfbc 100644 --- a/pages/indexEntry/findShcool/findShcool.vue +++ b/pages/indexEntry/findShcool/findShcool.vue @@ -11,27 +11,27 @@ 筛选 - + - + 江西海正驾校 - + 4.9分 行业信用AA 距您1000.99公里 - + @@ -61,6 +61,12 @@ }, ] } + }, + methods: { + goPage() { + console.log(this.$goPage) + this.$goPage('/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail') + } } } @@ -75,6 +81,7 @@ .navBox { display: flex; justify-content: space-between; + padding-bottom: 48rpx; .tab { display: flex; font-size: 28rpx; @@ -121,34 +128,63 @@ } .screenIcon { - width: 40rpx; - height: 40rpx; + width: 32rpx; + height: 32rpx; } } } .ul { + width: 100%; .li { + height: 208rpx; + background: #FFFFFF; + border-radius: 16rpx; + padding: 24rpx; + position: relative; + display: flex; + margin-bottom: 20rpx; .img { - img {} + width: 204rpx; + height: 140rpx; + background: #FFFFFF; } .textCon { - .name {} + flex: 1; + font-size: 24rpx; + padding: 0 0 0 36rpx; + .name { + font-size: 32rpx; + color: #363A44; + font-weight: 600; + } .starBox { - u-rate {} - - .num {} + display: flex; + padding: 6rpx 0 6rpx 0; + .num { + color: $themC; + } } - .credit {} + .credit { + color: #1989FA; + margin-bottom: 4rpx; + } - .adr {} + .adr { + color: #363A44; + } } .pozPhone { - img {} + position: absolute; + top: 50%; + right: 48rpx; + width: 72rpx; + height: 72rpx; + transform: translateY(-50%); } } } diff --git a/pages/indexEntry/findShcool/shcoolDetail/comp/tab1.vue b/pages/indexEntry/findShcool/shcoolDetail/comp/tab1.vue new file mode 100644 index 0000000..5fc5793 --- /dev/null +++ b/pages/indexEntry/findShcool/shcoolDetail/comp/tab1.vue @@ -0,0 +1,55 @@ + + + + + \ No newline at end of file diff --git a/pages/indexEntry/findShcool/shcoolDetail/comp/tab2.vue b/pages/indexEntry/findShcool/shcoolDetail/comp/tab2.vue new file mode 100644 index 0000000..a435341 --- /dev/null +++ b/pages/indexEntry/findShcool/shcoolDetail/comp/tab2.vue @@ -0,0 +1,62 @@ + + + + + \ No newline at end of file diff --git a/pages/indexEntry/findShcool/shcoolDetail/comp/tab3.vue b/pages/indexEntry/findShcool/shcoolDetail/comp/tab3.vue new file mode 100644 index 0000000..9a3cc68 --- /dev/null +++ b/pages/indexEntry/findShcool/shcoolDetail/comp/tab3.vue @@ -0,0 +1,93 @@ + + + + + \ No newline at end of file diff --git a/pages/indexEntry/findShcool/shcoolDetail/comp/tab4.vue b/pages/indexEntry/findShcool/shcoolDetail/comp/tab4.vue new file mode 100644 index 0000000..86fa1d9 --- /dev/null +++ b/pages/indexEntry/findShcool/shcoolDetail/comp/tab4.vue @@ -0,0 +1,44 @@ + + + + + \ No newline at end of file diff --git a/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue b/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue new file mode 100644 index 0000000..c60355c --- /dev/null +++ b/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue @@ -0,0 +1,189 @@ + + + + + \ No newline at end of file diff --git a/pages/indexEntry/iIndustryInfo/detail/detail.vue b/pages/indexEntry/iIndustryInfo/detail/detail.vue new file mode 100644 index 0000000..8c2448b --- /dev/null +++ b/pages/indexEntry/iIndustryInfo/detail/detail.vue @@ -0,0 +1,49 @@ + + + + + \ No newline at end of file diff --git a/pages/indexEntry/iIndustryInfo/iIndustryInfo.vue b/pages/indexEntry/iIndustryInfo/iIndustryInfo.vue new file mode 100644 index 0000000..2231f84 --- /dev/null +++ b/pages/indexEntry/iIndustryInfo/iIndustryInfo.vue @@ -0,0 +1,94 @@ + + + + + \ No newline at end of file diff --git a/pages/indexEntry/index.vue b/pages/indexEntry/index.vue deleted file mode 100644 index 74eb186..0000000 --- a/pages/indexEntry/index.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - - - diff --git a/pages/indexEntry/theory/theory.vue b/pages/indexEntry/theory/theory.vue new file mode 100644 index 0000000..8b026e4 --- /dev/null +++ b/pages/indexEntry/theory/theory.vue @@ -0,0 +1,67 @@ + + + + + \ No newline at end of file diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue index 81f1f9c..4f23d2d 100644 --- a/pages/tabbar/index/index.vue +++ b/pages/tabbar/index/index.vue @@ -52,7 +52,7 @@ 行业资讯 - + 更多 @@ -63,7 +63,7 @@ :current="current" :mode="mode" style="height: 230rpx;" :dots-styles="dotsStyles" field="content"> - + @@ -121,6 +121,7 @@ { text: '找考场', icon: require('../../../static/images/index/ic_kaochang.png'), + url: '/pages/indexEntry/examines/examines' }, { text: '找陪练', @@ -129,6 +130,7 @@ { text: '理论学习', icon: require('../../../static/images/index/ic_lilun.png'), + url: '/pages/indexEntry/theory/theory' }, ], serviceSector: [{ diff --git a/static/images/bigImg/radian.png b/static/images/bigImg/radian.png new file mode 100644 index 0000000..85f0d5a Binary files /dev/null and b/static/images/bigImg/radian.png differ diff --git a/static/images/index/btn_jiaoyu.png b/static/images/index/btn_jiaoyu.png new file mode 100644 index 0000000..0c639da Binary files /dev/null and b/static/images/index/btn_jiaoyu.png differ diff --git a/static/images/index/btn_moni.png b/static/images/index/btn_moni.png new file mode 100644 index 0000000..33a1a42 Binary files /dev/null and b/static/images/index/btn_moni.png differ diff --git a/static/images/index/btn_quhao.png b/static/images/index/btn_quhao.png new file mode 100644 index 0000000..733e6c3 Binary files /dev/null and b/static/images/index/btn_quhao.png differ diff --git a/static/images/index/btn_xuanshi.png b/static/images/index/btn_xuanshi.png new file mode 100644 index 0000000..3e5c295 Binary files /dev/null and b/static/images/index/btn_xuanshi.png differ diff --git a/static/images/index/btn_youjix.png b/static/images/index/btn_youjix.png new file mode 100644 index 0000000..a263035 Binary files /dev/null and b/static/images/index/btn_youjix.png differ diff --git a/static/images/index/ic_shaixuan.png b/static/images/index/ic_shaixuan.png new file mode 100644 index 0000000..29d6b3e Binary files /dev/null and b/static/images/index/ic_shaixuan.png differ diff --git a/static/images/index/ic_tongzhi.png b/static/images/index/ic_tongzhi.png new file mode 100644 index 0000000..0835279 Binary files /dev/null and b/static/images/index/ic_tongzhi.png differ diff --git a/static/images/index/mapIcon.png b/static/images/index/mapIcon.png new file mode 100644 index 0000000..b3ea6e3 Binary files /dev/null and b/static/images/index/mapIcon.png differ diff --git a/static/images/index/telephone.png b/static/images/index/telephone.png new file mode 100644 index 0000000..06a7b54 Binary files /dev/null and b/static/images/index/telephone.png differ diff --git a/static/images/index/找考场_slices.zip b/static/images/index/找考场_slices.zip new file mode 100644 index 0000000..cbd3c31 Binary files /dev/null and b/static/images/index/找考场_slices.zip differ diff --git a/uni_modules/uview-ui/components/u-notice-bar/u-notice-bar.vue b/uni_modules/uview-ui/components/u-notice-bar/u-notice-bar.vue index a06eb39..9cdb8a1 100644 --- a/uni_modules/uview-ui/components/u-notice-bar/u-notice-bar.vue +++ b/uni_modules/uview-ui/components/u-notice-bar/u-notice-bar.vue @@ -95,7 +95,7 @@ .u-notice-bar { overflow: hidden; - padding: 9px 12px; + padding: 9rpx 12rpx; flex: 1; }