Skip to content

basic-uniapp-v3
basic-uniapp-v3
提交 52c973a6 作者: guolinhua
操作

fix(api): 调整首页与农场字段显示

上级 730d68c6
正在显示 包含 71 行增加 和 64 行删除
src/api/model/nongchang.ts
...@@ -3,8 +3,8 @@ import { otherHttp } from '/@/utils/http/axios' ...@@ -3,8 +3,8 @@ import { otherHttp } from '/@/utils/http/axios'
enum Api { enum Api {
zoneList = '/online/cgform/api/getData/01fd687ecb164aea914e92047e144d66', // 功能菜单数据 zoneList = '/online/cgform/api/getData/01fd687ecb164aea914e92047e144d66', // 功能菜单数据
agricultureModelsList = '/online/cgform/api/getData/7b2983df6ddf416aba68db8b0ab234ab', // 农业模型数据 agricultureModelsList = '/online/cgform/api/getData/7b2983df6ddf416aba68db8b0ab234ab', // 农业模型数据
baseManagementList = '/online/cgform/api/getData/3a7fbb877f304b7d83935caa454859c4', // 基地管理数据 baseManagementList = '/online/cgform/api/getData/e4e4e6c901254b60b1e7a005097999ec', // 基地管理数据
commonToolsList = '/online/cgform/api/getData/e4e4e6c901254b60b1e7a005097999ec', // 常用工具数据 commonToolsList = '/online/cgform/api/getData/3a7fbb877f304b7d83935caa454859c4', // 常用工具数据
} }
/** /**
......
src/pages.json
...@@ -143,53 +143,43 @@ ...@@ -143,53 +143,43 @@
} }
} }
}, },
// pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{ {
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
"navigationBarTitleText": "Basic APP" "navigationBarTitleText": "Basic APP"
} }
}, },
// ================================ 通用页面分割线 ====================================
// === 关于我们 ===
{ {
"path": "pages/common/about/index", "path": "pages/common/about/index",
"style": { "style": {
"navigationBarTitleText": "关于我们" "navigationBarTitleText": "关于我们"
} }
}, },
// === 问题反馈 ===
{ {
"path": "pages/common/feedback/index", "path": "pages/common/feedback/index",
"style": { "style": {
"navigationBarTitleText": "问题反馈" "navigationBarTitleText": "问题反馈"
} }
}, },
// === Webview ===
{ {
"path": "pages/common/webview/index", "path": "pages/common/webview/index",
"style": { "style": {
"navigationBarTitleText": "" "navigationBarTitleText": ""
} }
}, },
// === PDF 文件预览 ===
{ {
"path": "pages/common/viewer/pdf", "path": "pages/common/viewer/pdf",
"style": { "style": {
"navigationBarTitleText": "" "navigationBarTitleText": ""
} }
}, },
// === 空页面（开发中...） ===
{ {
"path": "pages/common/coding/coding", "path": "pages/common/coding/coding",
"style": { "style": {
// #ifdef H5
"titleNView": false, "titleNView": false,
// #endif
"navigationBarTitleText": "开发中" "navigationBarTitleText": "开发中"
} }
}, },
// === 版本更新 ===
{ {
"path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup", "path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
"style": { "style": {
...@@ -206,7 +196,6 @@ ...@@ -206,7 +196,6 @@
"disableScroll": true "disableScroll": true
} }
}, },
// === 应用全屏通知弹窗（场景：应用维护通知、用户通知公告等） ===
{ {
"path": "pages/common/notice/index", "path": "pages/common/notice/index",
"style": { "style": {
...@@ -230,9 +219,7 @@ ...@@ -230,9 +219,7 @@
"easycom": { "easycom": {
"autoscan": true, "autoscan": true,
"custom": { "custom": {
// https://doc.firstui.cn/docs/introduce.html
"^fui-(.*)": "@/components/FirstUI/fui-$1/fui-$1.vue", "^fui-(.*)": "@/components/FirstUI/fui-$1/fui-$1.vue",
// https://ext.dcloud.net.cn/plugin?id=55#detail
"^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue" "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
} }
}, },
......
src/pages/linghuoyonggong/linghuoyonggong.vue
...@@ -11,12 +11,14 @@ ...@@ -11,12 +11,14 @@
{ id: 4, name: '采摘' }, { id: 4, name: '采摘' },
{ id: 5, name: '其他' }, { id: 5, name: '其他' },
], ],
currentCategoryId: 1,
// 用工类型标签 // 用工类型标签
employmentTabs: [ employmentTabs: [
{ id: 1, name: '推荐用工' }, { id: 1, name: '推荐用工' },
{ id: 2, name: '我的用工' }, { id: 2, name: '我的用工' },
], ],
currentEmploymentId: 1,
// 用工列表 // 用工列表
employmentList: [ employmentList: [
...@@ -87,12 +89,14 @@ ...@@ -87,12 +89,14 @@
// 分类标签点击事件 // 分类标签点击事件
function onCategoryTabClick(tab: any) { function onCategoryTabClick(tab: any) {
console.log('点击分类标签:', tab) console.log('点击分类标签:', tab)
pageData.currentCategoryId = tab.id
// 在这里添加具体的分类标签点击逻辑 // 在这里添加具体的分类标签点击逻辑
} }
// 用工类型标签点击事件 // 用工类型标签点击事件
function onEmploymentTabClick(tab: any) { function onEmploymentTabClick(tab: any) {
console.log('点击用工类型标签:', tab) console.log('点击用工类型标签:', tab)
pageData.currentEmploymentId = tab.id
// 在这里添加具体的用工类型标签点击逻辑 // 在这里添加具体的用工类型标签点击逻辑
} }
...@@ -117,10 +121,13 @@ ...@@ -117,10 +121,13 @@
v-for="tab in pageData.categoryTabs" v-for="tab in pageData.categoryTabs"
:key="tab.id" :key="tab.id"
class="codefun-flex-col codefun-justify-start codefun-items-center" class="codefun-flex-col codefun-justify-start codefun-items-center"
:class="[tab.id === 1 ? 'text-wrapper' : 'text-wrapper_2', tab.id > 1 ? 'codefun-ml-12' : '']" :class="[
tab.id === pageData.currentCategoryId ? 'text-wrapper' : 'text-wrapper_2',
tab.id > 1 ? 'codefun-ml-12' : '',
]"
@click="onCategoryTabClick(tab)" @click="onCategoryTabClick(tab)"
> >
<text class="font_2" :class="[`text_${tab.id + 1}`]"> <text class="font_2 text_2">
{{ tab.name }} {{ tab.name }}
</text> </text>
</view> </view>
...@@ -130,15 +137,11 @@ ...@@ -130,15 +137,11 @@
<view <view
v-for="tab in pageData.employmentTabs" v-for="tab in pageData.employmentTabs"
:key="tab.id" :key="tab.id"
class="codefun-flex-col codefun-justify-start codefun-items-center" class="codefun-flex-col codefun-justify-start codefun-items-center text-50p"
:class="[ :class="[tab.id === pageData.currentEmploymentId ? 'text-wrapper_3' : 'codefun-self-start']"
tab.id === 1 ? 'text-wrapper_3' : '',
tab.id > 1 ? 'codefun-self-start' : '',
tab.id > 1 ? 'ml-55' : '',
]"
@click="onEmploymentTabClick(tab)" @click="onEmploymentTabClick(tab)"
> >
<text class="font_2" :class="[`text_${tab.id + 6}`]"> <text class="font_2">
{{ tab.name }} {{ tab.name }}
</text> </text>
</view> </view>
...@@ -309,16 +312,25 @@ ...@@ -309,16 +312,25 @@
border-right: solid 2rpx #ffffffcc; border-right: solid 2rpx #ffffffcc;
border-top: solid 2rpx #ffffffcc; border-top: solid 2rpx #ffffffcc;
border-bottom: solid 2rpx #ffffffcc; border-bottom: solid 2rpx #ffffffcc;
.text-50p {
width: 50%;
padding: 0.75rem 0 1.625rem;
}
.text-wrapper_3 { .text-wrapper_3 {
padding: 24rpx 0 52rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 32rpx; border-radius: 32rpx;
width: 348rpx;
height: 102rpx;
.text_7 { .text_7 {
color: #333333; color: #333333;
line-height: 26.16rpx; line-height: 26.16rpx;
} }
.font_2 {
color: #1f2937;
}
}
.codefun-self-start {
.font_2 {
color: #5db66f;
}
} }
.text_8 { .text_8 {
margin-top: 20rpx; margin-top: 20rpx;
...@@ -343,11 +355,11 @@ ...@@ -343,11 +355,11 @@
.font_4 { .font_4 {
font-size: 24rpx; font-size: 24rpx;
font-family: DingTalk Sans; font-family: DingTalk Sans;
line-height: 22rpx; // line-height: 22rpx;
color: #999999; color: #999999;
} }
.text_10 { .text_10 {
line-height: 23.36rpx; // line-height: 23.36rpx;
} }
} }
.image_8 { .image_8 {
......
src/pages/nongjifuwu/nongjifuwu.vue
<script> <script setup lang="ts">
export default { import { reactive } from 'vue'
components: {},
props: {},
data() {
return {}
},
methods: {}, const pageData = reactive({
// 分类标签
categoryTabs: [
{ id: 1, name: '找农机' },
{ id: 2, name: '干农活' },
],
currentCategoryId: 1,
})
// 分类标签点击事件
function onCategoryTabClick(tab: any) {
console.log('点击分类标签:', tab)
pageData.currentCategoryId = tab.id
// 在这里添加具体的分类标签点击逻辑
} }
</script> </script>
...@@ -24,10 +32,17 @@ ...@@ -24,10 +32,17 @@
</view> </view>
</view> </view>
<view class="codefun-flex-row section_3"> <view class="codefun-flex-row section_3">
<view class="codefun-flex-col codefun-justify-start codefun-items-center text-wrapper"> <view
<text class="font_2 text_4">找农机</text> v-for="item in pageData.categoryTabs"
:key="item.id"
class="codefun-flex-col codefun-justify-start codefun-items-center text-50p"
:class="item.id === pageData.currentCategoryId ? 'text-wrapper' : ''"
@click="onCategoryTabClick(item)"
>
<text class="font_2" :class="item.id === pageData.currentCategoryId ? 'text_4' : 'text_5'">{{
item.name
}}</text>
</view> </view>
<text class="codefun-self-start font_2 text_5 codefun-ml-56">干农活</text>
</view> </view>
<view class="codefun-flex-col codefun-relative section_4"> <view class="codefun-flex-col codefun-relative section_4">
<view class="codefun-flex-row group_6"> <view class="codefun-flex-row group_6">
...@@ -272,18 +287,20 @@ ...@@ -272,18 +287,20 @@
background-color: #ffffff66; background-color: #ffffff66;
border-radius: 32rpx; border-radius: 32rpx;
border: solid 2rpx #ffffffcc; border: solid 2rpx #ffffffcc;
.text-50p {
width: 50%;
height: 102rpx;
padding: 0.75rem 0 1.625rem;
}
.text-wrapper { .text-wrapper {
padding: 24rpx 0 56rpx; padding: 24rpx 0 56rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 32rpx; border-radius: 32rpx;
width: 348rpx;
height: 102rpx;
.text_4 { .text_4 {
line-height: 26.02rpx; line-height: 26.02rpx;
} }
} }
.text_5 { .text_5 {
margin-top: 24rpx;
color: #5db66f; color: #5db66f;
line-height: 25.82rpx; line-height: 25.82rpx;
} }
......
src/pages/nongyedamoxing/nongyedamoxing.vue
<script> <script setup lang="ts"></script>
export default {
components: {},
props: {},
data() {
return {}
},
methods: {},
}
</script>
<template> <template>
<view class="codefun-flex-col page"> <view class="codefun-flex-col page">
......
src/pages/shouye/shouye.vue
...@@ -220,7 +220,9 @@ ...@@ -220,7 +220,9 @@
}) })
} }
function getProductMarketList() { function getProductMarketList() {
HomeAPI.productMarketList().then((res) => { HomeAPI.productMarketList({
status: 1,
}).then((res) => {
const { records } = res const { records } = res
console.log(res) console.log(res)
pageData.productMarket.products = records pageData.productMarket.products = records
...@@ -237,13 +239,17 @@ ...@@ -237,13 +239,17 @@
}) })
} }
function getServiceStatsList() { function getServiceStatsList() {
HomeAPI.serviceStatsList().then((res) => { HomeAPI.serviceStatsList({
status: 1,
}).then((res) => {
const { records } = res const { records } = res
pageData.serviceStats = records pageData.serviceStats = records
}) })
} }
function getAgricultureClassList() { function getAgricultureClassList() {
HomeAPI.agricultureClassList().then((res) => { HomeAPI.agricultureClassList({
status: 1,
}).then((res) => {
const { records } = res const { records } = res
pageData.agricultureClass.videoList = records pageData.agricultureClass.videoList = records
pageData.agricultureClass.title = records[0]?.title pageData.agricultureClass.title = records[0]?.title
...@@ -462,12 +468,7 @@ ...@@ -462,12 +468,7 @@
}" }"
> >
<view <view
class="codefun-flex-col codefun-justify-start codefun-items-start codefun-self-center codefun-relative" class="codefun-flex-col codefun-justify-start codefun-items-start codefun-self-center codefun-relative group_1"
:class="{
group_41: index === 0,
group_20: index === 1,
group_1: index === 2,
}"
> >
<text class="font_8 text_23">{{ product.name }}</text> <text class="font_8 text_23">{{ product.name }}</text>
<text class="font_9 text_23" :class="`pos${index > 0 ? `_${index + 1}` : ''}`">{{ <text class="font_9 text_23" :class="`pos${index > 0 ? `_${index + 1}` : ''}`">{{
...@@ -992,7 +993,7 @@ ...@@ -992,7 +993,7 @@
} }
.group_1 { .group_1 {
padding: 10rpx 0 4.92rpx; padding: 10rpx 0 4.92rpx;
width: 106rpx; // width: 106rpx;
.text_24 { .text_24 {
color: #5db66f; color: #5db66f;
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论