Merge branch 'main' of https://gitee.com/mrf/agri-app

src/pages.json

@@ -71,13 +71,12 @@
         {
             "path": "pages/wode/wode",
             "style": {
-                "navigationBarTitleText": "",
-                "navigationBarBackgroundColor": "#e6f5e8",
-                "backgroundColorTop": "#e6f5e8",
+                "navigationBarTitleText": "我的农场",
+                "navigationBarBackgroundColor": "#5DB66F",
+                "navigationBarTextStyle": "white",
                 "backgroundColorBottom": "#e6f5e8",
                 "enablePullDownRefresh": true,
                 "app-plus": {
-                    "titleNView": false,
                     "bounce": false
                 }
             }
@@ -97,8 +96,47 @@
             "style": {
                 "navigationBarTitleText": "个人资料",
                 "enablePullDownRefresh": false,
-                "navigationBarBackgroundColor": "#F8F8F8",
-                "navigationBarTextStyle": "black",
+                "navigationBarBackgroundColor": "#5DB66F",
+                "navigationBarTextStyle": "white",
+                "backgroundColorBottom": "#F2F2F2",
+                "app-plus": {
+                    "titleNView": {}
+                }
+            }
+        },
+        {
+            "path": "pages/nongyedamoxing/nongyedamoxing",
+            "style": {
+                "navigationBarTitleText": "农业大模型",
+                "enablePullDownRefresh": false,
+                "navigationBarBackgroundColor": "#5DB66F",
+                "navigationBarTextStyle": "white",
+                "backgroundColorBottom": "#F2F2F2",
+                "app-plus": {
+                    "titleNView": {}
+                }
+            }
+        },
+        {
+            "path": "pages/nongjifuwu/nongjifuwu",
+            "style": {
+                "navigationBarTitleText": "农机作业预约",
+                "enablePullDownRefresh": false,
+                "navigationBarBackgroundColor": "#5DB66F",
+                "navigationBarTextStyle": "white",
+                "backgroundColorBottom": "#F2F2F2",
+                "app-plus": {
+                    "titleNView": {}
+                }
+            }
+        },
+        {
+            "path": "pages/linghuoyonggong/linghuoyonggong",
+            "style": {
+                "navigationBarTitleText": "灵活用工",
+                "enablePullDownRefresh": false,
+                "navigationBarBackgroundColor": "#5DB66F",
+                "navigationBarTextStyle": "white",
                 "backgroundColorBottom": "#F2F2F2",
                 "app-plus": {
                     "titleNView": {}
@@ -223,7 +261,6 @@
         "fontSize": "10px",
         "iconWidth": "24px",
         "spacing": "6px",
-        // "custom": true,
         "list": [
             {
                 "pagePath": "pages/shouye/shouye",

src/pages/mine/index.vue

@@ -79,8 +79,8 @@
 
     const items = reactive<Recordable[]>([
         {
-            title: '个人资源',
-            icon: 'level',
+            title: '我的农场',
+            icon: 'nongchang2',
             disabled: false,
             show: true,
             handle: () => {
@@ -212,7 +212,7 @@
                         height="42"
                         background="transparent"
                     />
-                    <text class="ml-3.5 text-30 text-#333333 font-500">{{ item.title }}</text>
+                    <text class="ml-3.5 text-30 text-#67c17a font-bold">{{ item.title }}</text>
                 </fui-list-cell>
             </fui-list>
             <fui-list class="rd-3 overflow-hidden shadow !mt-20rpx" :top-border="false">

src/pages/nongchang/nongchang.vue

 <script setup lang="ts">
     import { reactive } from 'vue'
     import { onPullDownRefresh, onShow } from '@dcloudio/uni-app'
+    import Navigate from '@/utils/page/navigate'
 
     import * as NongChangAPI from '@/api/model/nongchang'
 
@@ -59,6 +60,7 @@
                 name: '柑橘模型',
                 description: '精准预测柑橘生长周期',
                 actionText: '查看介绍',
+                link: '/pages/nongyedamoxing/nongyedamoxing',
             },
             {
                 id: 2,
@@ -66,6 +68,7 @@
                 name: '作物生长监测',
                 description: 'AI识别生长状况',
                 actionText: '查看介绍',
+                link: '/pages/nongyedamoxing/nongyedamoxing',
             },
             {
                 id: 3,
@@ -73,6 +76,7 @@
                 name: '产能模型',
                 description: '基于作物生长状况产能构建模型',
                 actionText: '查看介绍',
+                link: '/pages/nongyedamoxing/nongyedamoxing',
             },
         ],
 
@@ -252,6 +256,9 @@
     function onAgricultureModelClick(model: any) {
         console.log('点击农业模型:', model)
         // 在这里添加具体的农业模型点击逻辑
+
+        // 打开模型详情页面
+        Navigate.to(model.link)
     }
 
     // 基地管理点击事件

src/pages/shouye/shouye.vue

@@ -61,6 +61,10 @@
                 return '宜喷药'
             case '阴':
                 return '宜少浇水'
+            case '小雨':
+                return '宜播种'
+            case '中雨':
+                return '注意防涝'
             default:
                 return '无建议'
         }