diff --git a/common/css/app.scss b/common/css/app.scss
index 5cf4612..e5f78e9 100644
--- a/common/css/app.scss
+++ b/common/css/app.scss
@@ -52,7 +52,7 @@ view {
.card {
width: 100%;
background: #fff;
- border-radius: 16rpx;
+ border-radius: 20rpx;
}
.status_bar {
height: var(--status-bar-height);
@@ -68,10 +68,10 @@ image {
}
.starBox {
display: flex;
- .num {
- color: $themC;
- font-size: 24rpx;
- }
+ width: 58rpx;
+ height: 32rpx;
+ background: #0A52F4;
+ border-radius: 16px 0px 16px 16rpx;
}
.my .u-input {
@@ -82,19 +82,25 @@ image {
font-size: 32rpx;
color: #333;
font-weight: 500;
- position: relative;
+ font-weight: 700;
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;
+ text {
+ position: relative;
+ &.active {
+ &::before {
+ position: absolute;
+ content: '';
+ width: 54rpx;
+ height: 12rpx;
+ // background: url('../../static/images/icon/h1Active.png') no-repeat;
+ background-size: 100% 100%;
+ left: 50%;
+ transform: translateX(-50%);
+ bottom: -20rpx;
+ }
+ }
}
+
}
.btnBg {
diff --git a/components/searchRow/searchRow.vue b/components/searchRow/searchRow.vue
index fbac4de..86b2457 100644
--- a/components/searchRow/searchRow.vue
+++ b/components/searchRow/searchRow.vue
@@ -2,11 +2,11 @@
-
+
-
+
@@ -54,11 +54,12 @@
.flex {
height: 100%;
- padding: 0 28rpx;
+ padding: 0 28rpx 0 0;
.searchIcon {
- width: 40rpx;
- height: 40rpx;
+ width: 52rpx;
+ height: 52rpx;
+ margin: 0 -24rpx 0 12rpx;
}
.inputBox {
diff --git a/manifest.json b/manifest.json
index 3650b3e..bdc33c0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -96,7 +96,7 @@
"disableHostCheck" : true,
"proxy" : {
"/api" : {
- "target" : "http://192.168.1.36:48080/",
+ "target" : "http://192.168.1.15:48080/",
// "target" : "http://192.168.1.36:48080/",
"changeOrigin" : true,
"secure" : true,
diff --git a/pages/tabbar/index/comp/coachItem.vue b/pages/tabbar/index/comp/coachItem.vue
new file mode 100644
index 0000000..bc7d1af
--- /dev/null
+++ b/pages/tabbar/index/comp/coachItem.vue
@@ -0,0 +1,99 @@
+
+
+ 5.0
+
+
+
+
+ 张小平
+ 翔力驾校
+
+
+ 优秀教练
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/tabbar/index/comp/informaItem.vue b/pages/tabbar/index/comp/informaItem.vue
index 2b1af88..98a0101 100644
--- a/pages/tabbar/index/comp/informaItem.vue
+++ b/pages/tabbar/index/comp/informaItem.vue
@@ -4,7 +4,7 @@
- {{ item.title }}
+ {{ item.title }}item.titleitem.titleitem.titleitem.titleitem.titleitem.titleitem.title
{{ $u.timeFormat(item.createTime, 'yyyy/mm/dd') }}
@@ -29,32 +29,37 @@
\ No newline at end of file
diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue
index 2ef041b..d1491b2 100644
--- a/pages/tabbar/index/index.vue
+++ b/pages/tabbar/index/index.vue
@@ -1,28 +1,29 @@
-
+
-
-
-
-
-
-
- {{ vuex_cityInfo.city || '杭州' }}
+
+
+ {{ vuex_cityInfo.city || '杭州' }}
+
+
+
+
-
+
+
-
+
-
-
+
@@ -39,7 +40,7 @@
-
+
@@ -51,25 +52,71 @@
-
- 优质驾校
+
+
+ 优质驾校
+
+
+
+
+
+ 推荐教练
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- 行业资讯
- 政策法规
+
+
+
+ 行业资讯
+ 政策法规
+
+
-
-
+
+
+
+
+
+
+ 服务专区
+
+
+ 学车指南
+ 查看详细的学车流程
+
+ GO
+
+
+
+
+ 学车指南
+ 查看详细的学车流程
+
+ GO
+
+
+
+
+
@@ -83,8 +130,9 @@
import { getarticleList } from '@/config/api.js'
import schoolItem from './comp/schoolItem'
import informaItem from './comp/informaItem'
+ import coachItem from './comp/coachItem'
export default {
- components: { schoolItem, informaItem },
+ components: { schoolItem, informaItem, coachItem },
data() {
return {
showPrivacy: false,
@@ -93,7 +141,7 @@
keywords: '',
entrySection: [{
text: '学车报名',
- icon: require('../../../static/images/index/ic_baoming.png'),
+ icon: require('../../../static/images/indexIcon/entryIcon (3).png'),
url: '/pages/indexEntry/enroll/enroll',
goPage: function (){
console.log(666)
@@ -102,7 +150,7 @@
},
{
text: '找驾校',
- icon: require('../../../static/images/index/ic_jiaxiao.png'),
+ icon: require('../../../static/images/indexIcon/entryIcon (4).png'),
url: '/pages/indexEntry/findShcool/findShcool',
goPage: (item)=>{
this.$goPage(item.url)
@@ -110,27 +158,27 @@
},
{
text: '找教练',
- icon: require('../../../static/images/index/ic_kaochang.png'),
+ icon: require('../../../static/images/indexIcon/entryIcon (1).png'),
url: '/pages/indexEntry/examines/examines',
goPage: ((item)=>{
this.$goPage(item.url)
})
},
{
- text: '理论学习',
- icon: require('../../../static/images/index/ic_jsg.png'),
- url: '/pages/carEntry/simulateAppointment/simulateAppointment',
+ text: '签到签退',
+ icon: require('../../../static/images/indexIcon/entryIcon (5).png'),
goPage: ((item)=>{
- this.$goPage(item.url)
+ this.$u.toast('正在开发中,敬请期待...')
})
},
{
- text: '签到签退',
- icon: require('../../../static/images/index/ic_peilian.png'),
+ text: '理论学习',
+ icon: require('../../../static/images/indexIcon/entryIcon (2).png'),
+ url: '/pages/carEntry/simulateAppointment/simulateAppointment',
goPage: ((item)=>{
- this.$u.toast('正在开发中,敬请期待...')
+ this.$goPage(item.url)
})
- }
+ },
],
serviceSector: [{
text: '学车指南',
@@ -184,7 +232,10 @@
swiperDotIndex: 0,
current: 1,
mode: 'default',
- swiperInfo: [],
+ swiperInfo: [
+ {picture: require('../../../static/images/bigImg/banner.jpg')},
+ {picture: require('../../../static/images/bigImg/banner2.jpg')}
+ ],
dotsStyles: {
backgroundColor: '#E8E9EC',
border: '1px #E8E9EC solid',
@@ -213,13 +264,14 @@
// console.log(this.$store.state.user.vuex_cityInfo)
},
onPullDownRefresh() {
- this.getarticleListFn()
+
},
onShow() {
this.$store.dispatch('getUserInfo')
if(!this.swiperInfo.length) {
- this.getarticleListFn()
+ // this.getarticleListFn()
}
+ this.getarticleListFn()
},
computed: {
@@ -239,7 +291,7 @@
async getarticleListFn() {
const {data: res} = await getarticleList(this.params)
- this.swiperInfo = res.list[0].articleManagementDO
+ // this.swiperInfo = res.list[0].articleManagementDO
},
async refereshFn() {
const res = await this.$store.dispatch('refreshToken')
@@ -318,57 +370,80 @@
\ No newline at end of file
diff --git a/static/images/bigImg/banner.jpg b/static/images/bigImg/banner.jpg
new file mode 100644
index 0000000..b1970c7
Binary files /dev/null and b/static/images/bigImg/banner.jpg differ
diff --git a/static/images/bigImg/banner2.jpg b/static/images/bigImg/banner2.jpg
new file mode 100644
index 0000000..3f4691a
Binary files /dev/null and b/static/images/bigImg/banner2.jpg differ
diff --git a/static/images/bigImg/homeBg.png b/static/images/bigImg/homeBg.png
new file mode 100644
index 0000000..6b4def3
Binary files /dev/null and b/static/images/bigImg/homeBg.png differ
diff --git a/static/images/icon/down.png b/static/images/icon/down.png
new file mode 100644
index 0000000..835309b
Binary files /dev/null and b/static/images/icon/down.png differ
diff --git a/static/images/icon/h1Active.png b/static/images/icon/h1Active.png
new file mode 100644
index 0000000..f430b73
Binary files /dev/null and b/static/images/icon/h1Active.png differ
diff --git a/static/images/icon/searchIcon.png b/static/images/icon/searchIcon.png
new file mode 100644
index 0000000..47e1355
Binary files /dev/null and b/static/images/icon/searchIcon.png differ
diff --git a/static/images/icon/箭头(1).png b/static/images/icon/箭头(1).png
new file mode 100644
index 0000000..db9f2d6
Binary files /dev/null and b/static/images/icon/箭头(1).png differ
diff --git a/static/images/indexIcon/entryIcon (1).png b/static/images/indexIcon/entryIcon (1).png
new file mode 100644
index 0000000..24f001c
Binary files /dev/null and b/static/images/indexIcon/entryIcon (1).png differ
diff --git a/static/images/indexIcon/entryIcon (2).png b/static/images/indexIcon/entryIcon (2).png
new file mode 100644
index 0000000..379c330
Binary files /dev/null and b/static/images/indexIcon/entryIcon (2).png differ
diff --git a/static/images/indexIcon/entryIcon (3).png b/static/images/indexIcon/entryIcon (3).png
new file mode 100644
index 0000000..06d7670
Binary files /dev/null and b/static/images/indexIcon/entryIcon (3).png differ
diff --git a/static/images/indexIcon/entryIcon (4).png b/static/images/indexIcon/entryIcon (4).png
new file mode 100644
index 0000000..4cbb6c9
Binary files /dev/null and b/static/images/indexIcon/entryIcon (4).png differ
diff --git a/static/images/indexIcon/entryIcon (5).png b/static/images/indexIcon/entryIcon (5).png
new file mode 100644
index 0000000..ed5f114
Binary files /dev/null and b/static/images/indexIcon/entryIcon (5).png differ
diff --git a/static/images/indexIcon/phone.png b/static/images/indexIcon/phone.png
new file mode 100644
index 0000000..101b972
Binary files /dev/null and b/static/images/indexIcon/phone.png differ
diff --git a/static/images/indexIcon/sancode.png b/static/images/indexIcon/sancode.png
new file mode 100644
index 0000000..bdf2e5a
Binary files /dev/null and b/static/images/indexIcon/sancode.png differ
diff --git a/static/images/indexIcon/xccard.png b/static/images/indexIcon/xccard.png
new file mode 100644
index 0000000..c2f0f85
Binary files /dev/null and b/static/images/indexIcon/xccard.png differ
diff --git a/static/images/indexIcon/zxcard.png b/static/images/indexIcon/zxcard.png
new file mode 100644
index 0000000..31b768d
Binary files /dev/null and b/static/images/indexIcon/zxcard.png differ
diff --git a/static/images/indexIcon/形状 101.png b/static/images/indexIcon/形状 101.png
new file mode 100644
index 0000000..c27949a
Binary files /dev/null and b/static/images/indexIcon/形状 101.png differ
diff --git a/static/images/indexIcon/矩形 14(1).png b/static/images/indexIcon/矩形 14(1).png
new file mode 100644
index 0000000..5a490f1
Binary files /dev/null and b/static/images/indexIcon/矩形 14(1).png differ
diff --git a/static/images/indexIcon/矩形 14.png b/static/images/indexIcon/矩形 14.png
new file mode 100644
index 0000000..5a490f1
Binary files /dev/null and b/static/images/indexIcon/矩形 14.png differ
diff --git a/static/images/indexIcon/矩形 24.png b/static/images/indexIcon/矩形 24.png
new file mode 100644
index 0000000..33d8b1a
Binary files /dev/null and b/static/images/indexIcon/矩形 24.png differ
diff --git a/static/images/tabbar/btn_shouye_cli.png b/static/images/tabbar/btn_shouye_cli.png
index 5e98f5e..31dbca2 100644
Binary files a/static/images/tabbar/btn_shouye_cli.png and b/static/images/tabbar/btn_shouye_cli.png differ
diff --git a/static/images/tabbar/btn_shouye_nor.png b/static/images/tabbar/btn_shouye_nor.png
index 9c48191..553d290 100644
Binary files a/static/images/tabbar/btn_shouye_nor.png and b/static/images/tabbar/btn_shouye_nor.png differ
diff --git a/static/images/tabbar/btn_wode_cli.png b/static/images/tabbar/btn_wode_cli.png
index 869e7eb..e3723f7 100644
Binary files a/static/images/tabbar/btn_wode_cli.png and b/static/images/tabbar/btn_wode_cli.png differ
diff --git a/static/images/tabbar/btn_wode_nor.png b/static/images/tabbar/btn_wode_nor.png
index 23fae10..da7d982 100644
Binary files a/static/images/tabbar/btn_wode_nor.png and b/static/images/tabbar/btn_wode_nor.png differ
diff --git a/static/images/tabbar/btn_xueche_cli.png b/static/images/tabbar/btn_xueche_cli.png
index 566ec2d..36e18ce 100644
Binary files a/static/images/tabbar/btn_xueche_cli.png and b/static/images/tabbar/btn_xueche_cli.png differ
diff --git a/static/images/tabbar/btn_xueche_nor.png b/static/images/tabbar/btn_xueche_nor.png
index 5c29319..491b84a 100644
Binary files a/static/images/tabbar/btn_xueche_nor.png and b/static/images/tabbar/btn_xueche_nor.png differ