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 @@ + + + + + \ 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 @@