提交 360688e5 作者: 方治民

feat: 优化 tabbar 以及全局 header 样式

上级 0fad7353
...@@ -40,12 +40,12 @@ ...@@ -40,12 +40,12 @@
{ {
"path": "pages/nongchang/nongchang", "path": "pages/nongchang/nongchang",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "农场",
"backgroundColorTop": "#e6f5e8", "backgroundColorTop": "#e6f5e8",
"backgroundColorBottom": "#e6f5e8", "backgroundColorBottom": "#e6f5e8",
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"app-plus": { "app-plus": {
"titleNView": false, "titleNView": true,
"bounce": false "bounce": false
} }
} }
...@@ -65,13 +65,13 @@ ...@@ -65,13 +65,13 @@
{ {
"path": "pages/chanxiao/chanxiao", "path": "pages/chanxiao/chanxiao",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "产销",
"backgroundColorTop": "#e6f5e8", "backgroundColorTop": "#e6f5e8",
"backgroundColorBottom": "#e6f5e8", "backgroundColorBottom": "#e6f5e8",
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"onReachBottomDistance": 50, "onReachBottomDistance": 50,
"app-plus": { "app-plus": {
"titleNView": false, "titleNView": true,
"bounce": false "bounce": false
} }
} }
...@@ -118,12 +118,12 @@ ...@@ -118,12 +118,12 @@
{ {
"path": "pages/fuwu/fuwu", "path": "pages/fuwu/fuwu",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "服务",
"backgroundColorTop": "#e6f5e8", "backgroundColorTop": "#e6f5e8",
"backgroundColorBottom": "#e6f5e8", "backgroundColorBottom": "#e6f5e8",
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"app-plus": { "app-plus": {
"titleNView": false, "titleNView": true,
"bounce": false "bounce": false
} }
} }
...@@ -281,13 +281,12 @@ ...@@ -281,13 +281,12 @@
"backgroundColorBottom": "#F2F2F2", "backgroundColorBottom": "#F2F2F2",
"app-plus": { "app-plus": {
"titleNView": { "titleNView": {
"titleSize": "20",
"buttons": [ "buttons": [
{ {
"text": "+ 添加基地", "text": "+ 添加基地",
"fontSrc": "/static/uni.ttf", "fontSrc": "/static/uni.ttf",
"color": "#fff", "color": "#fff",
"fontSize": "28rpx", "fontSize": "26rpx",
"width": "auto" "width": "auto"
} }
] ]
...@@ -387,13 +386,12 @@ ...@@ -387,13 +386,12 @@
"backgroundColorBottom": "#F2F2F2", "backgroundColorBottom": "#F2F2F2",
"app-plus": { "app-plus": {
"titleNView": { "titleNView": {
"titleSize": "20",
"buttons": [ "buttons": [
{ {
"text": "+ 添加设备", "text": "+ 添加设备",
"fontSrc": "/static/uni.ttf", "fontSrc": "/static/uni.ttf",
"color": "#fff", "color": "#fff",
"fontSize": "28rpx", "fontSize": "26rpx",
"width": "auto" "width": "auto"
} }
] ]
...@@ -411,13 +409,12 @@ ...@@ -411,13 +409,12 @@
"backgroundColorBottom": "#F2F2F2", "backgroundColorBottom": "#F2F2F2",
"app-plus": { "app-plus": {
"titleNView": { "titleNView": {
"titleSize": "20",
"buttons": [ "buttons": [
{ {
"text": "+ 添加资源", "text": "+ 添加资源",
"fontSrc": "/static/uni.ttf", "fontSrc": "/static/uni.ttf",
"color": "#fff", "color": "#fff",
"fontSize": "28rpx", "fontSize": "26rpx",
"width": "auto" "width": "auto"
} }
] ]
...@@ -448,7 +445,7 @@ ...@@ -448,7 +445,7 @@
"app-plus": { "app-plus": {
"scrollIndicator": "none", "scrollIndicator": "none",
"titleNView": { "titleNView": {
"titleSize": "20" "titleSize": "18"
} }
} }
}, },
......
...@@ -129,10 +129,8 @@ ...@@ -129,10 +129,8 @@
pageData.search.pageNo = 1 pageData.search.pageNo = 1
pageData.purchaseDemands = [] pageData.purchaseDemands = []
pageData.supplyInfos = [] pageData.supplyInfos = []
if (pageData.currentTransactionTab === 1) if (pageData.currentTransactionTab === 1) getPurchaseList()
getPurchaseList() if (pageData.currentTransactionTab === 2) getSupplyList()
if (pageData.currentTransactionTab === 2)
getSupplyList()
} }
// 采购/供应标签点击事件 // 采购/供应标签点击事件
...@@ -142,10 +140,8 @@ getSupplyList() ...@@ -142,10 +140,8 @@ getSupplyList()
pageData.search.pageNo = 1 pageData.search.pageNo = 1
pageData.purchaseDemands = [] pageData.purchaseDemands = []
pageData.supplyInfos = [] pageData.supplyInfos = []
if (pageData.currentTransactionTab === 1) if (pageData.currentTransactionTab === 1) getPurchaseList()
getPurchaseList() if (pageData.currentTransactionTab === 2) getSupplyList()
if (pageData.currentTransactionTab === 2)
getSupplyList()
} }
// 新需求提醒点击事件 // 新需求提醒点击事件
...@@ -190,14 +186,12 @@ getSupplyList() ...@@ -190,14 +186,12 @@ getSupplyList()
onReachBottom(() => { onReachBottom(() => {
console.log('触底了') console.log('触底了')
if (pageData.currentTransactionTab === 1) { if (pageData.currentTransactionTab === 1) {
if (pageData.total <= pageData.purchaseDemands.length) if (pageData.total <= pageData.purchaseDemands.length) return
return
pageData.search.pageNo++ pageData.search.pageNo++
getPurchaseList() getPurchaseList()
} }
if (pageData.currentTransactionTab === 2) { if (pageData.currentTransactionTab === 2) {
if (pageData.total <= pageData.supplyInfos.length) if (pageData.total <= pageData.supplyInfos.length) return
return
pageData.search.pageNo++ pageData.search.pageNo++
getSupplyList() getSupplyList()
} }
...@@ -207,9 +201,8 @@ return ...@@ -207,9 +201,8 @@ return
<template> <template>
<view class="codefun-flex-col page"> <view class="codefun-flex-col page">
<view class="codefun-flex-col section"> <view class="codefun-flex-col section">
<view class="codefun-mt-22 codefun-flex-col"> <view class="codefun-flex-col">
<text class="codefun-self-center text">{{ pageData.header.title }}</text> <view class="codefun-flex-col codefun-self-stretch">
<view class="codefun-mt-22 codefun-flex-col codefun-self-stretch">
<image class="image_5" :src="pageData.header.bannerImage" /> <image class="image_5" :src="pageData.header.bannerImage" />
<view class="codefun-mt-14 codefun-flex-row gap-1"> <view class="codefun-mt-14 codefun-flex-row gap-1">
<view <view
...@@ -439,7 +432,7 @@ return ...@@ -439,7 +432,7 @@ return
overflow-x: hidden; overflow-x: hidden;
padding-bottom: 32rpx; padding-bottom: 32rpx;
.section { .section {
padding: 28rpx 28rpx 8rpx; padding: 0 28rpx 8rpx;
background-image: url('/static/images/codefun/7a5dc4ee864fe55da98b41c14ee3b931.png'); background-image: url('/static/images/codefun/7a5dc4ee864fe55da98b41c14ee3b931.png');
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
......
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
<view class="codefun-flex-col section"> <view class="codefun-flex-col section">
<view class="codefun-flex-col group_2"> <view class="codefun-flex-col group_2">
<view class="codefun-flex-col"> <view class="codefun-flex-col">
<view <!-- <view
class="codefun-flex-row codefun-justify-center codefun-items-center codefun-relative group_3" class="codefun-flex-row codefun-justify-center codefun-items-center codefun-relative group_3"
> >
<text class="font text">{{ pageData.header.title }}</text> <text class="font text">{{ pageData.header.title }}</text>
...@@ -304,8 +304,8 @@ ...@@ -304,8 +304,8 @@
class="image_6 pos_2" class="image_6 pos_2"
src="/static/images/codefun/2d7ca3ba49afaa9f885afb0ba601a403.png" src="/static/images/codefun/2d7ca3ba49afaa9f885afb0ba601a403.png"
/> />
</view> </view> -->
<view class="codefun-flex-col mt-15"> <view class="codefun-flex-col">
<view class="codefun-flex-row codefun-items-center section_2"> <view class="codefun-flex-row codefun-items-center section_2">
<text class="codefun-shrink-0 font_2">岗位</text> <text class="codefun-shrink-0 font_2">岗位</text>
<text class="codefun-shrink-0 font_3 codefun-ml-2">{{ <text class="codefun-shrink-0 font_3 codefun-ml-2">{{
...@@ -747,7 +747,6 @@ ...@@ -747,7 +747,6 @@
} }
} }
.group_2 { .group_2 {
margin-top: 74rpx;
.group_3 { .group_3 {
padding: 9.04rpx 0 5.46rpx; padding: 9.04rpx 0 5.46rpx;
.text { .text {
......
...@@ -417,14 +417,14 @@ ...@@ -417,14 +417,14 @@
<view class="codefun-flex-col page"> <view class="codefun-flex-col page">
<view class="codefun-flex-col group"> <view class="codefun-flex-col group">
<view class="codefun-flex-col section"> <view class="codefun-flex-col section">
<view class="codefun-flex-col mt-52rpx"> <view class="codefun-flex-col">
<text class="codefun-self-center font text">{{ pageData.header.title }}</text> <!-- <text class="codefun-self-center font text">{{ pageData.header.title }}</text> -->
<view class="codefun-flex-col codefun-self-stretch mt-19"> <view class="codefun-flex-col codefun-self-stretch">
<!-- <view class="codefun-flex-row codefun-items-center section_2"> <!-- <view class="codefun-flex-row codefun-items-center section_2">
<image class="image_5" src="/static/images/codefun/b8d30fcc0b08b881a41c8b3e35b7f8ac.png" /> <image class="image_5" src="/static/images/codefun/b8d30fcc0b08b881a41c8b3e35b7f8ac.png" />
<text class="codefun-ml-8 font_2 text_2">{{ pageData.header.searchPlaceholder }}</text> <text class="codefun-ml-8 font_2 text_2">{{ pageData.header.searchPlaceholder }}</text>
</view> --> </view> -->
<view class="codefun-mt-14 codefun-flex-row equal-division section_3"> <view class="codefun-flex-row equal-division section_3">
<view <view
v-for="item in pageData.menuItems" v-for="item in pageData.menuItems"
:key="item.id" :key="item.id"
...@@ -882,7 +882,7 @@ ...@@ -882,7 +882,7 @@
.group { .group {
.section { .section {
padding: 28rpx 28rpx 116rpx; padding: 0 28rpx 116rpx;
background-image: url('/static/images/codefun/7a5dc4ee864fe55da98b41c14ee3b931.png'); background-image: url('/static/images/codefun/7a5dc4ee864fe55da98b41c14ee3b931.png');
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
......
...@@ -478,7 +478,7 @@ ...@@ -478,7 +478,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="codefun-flex-col section_9 codefun-mt-12"> <view class="codefun-flex-col section_9 codefun-mt-12 !hidden">
<view <view
class="codefun-flex-row codefun-justify-between codefun-items-center" class="codefun-flex-row codefun-justify-between codefun-items-center"
v-for="service in pageData.support.services" v-for="service in pageData.support.services"
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论