!1 Merge branch 'main' of <a…

!1 Merge branch 'main' of <a href="https://gitee.com/link?target=https%3A%2F%2Fgitlab.yiring.com%2Fdigital-agri%2Fagri-app">https://gitlab.yiring.com/digital-agri/agri-app</a> into dev
Merge pull request !1 from ifzm/dev

.env.production

 # API 接口地址
-VITE_GLOB_API_URL=http://localhost:8080
+VITE_GLOB_API_URL=http://111.22.182.169:49600
 
 # API 接口地址前缀
-VITE_GLOB_API_URL_PREFIX=/api
+VITE_GLOB_API_URL_PREFIX=/jeecgboot

package.json

 {
     "name": "湖南省农业服务平台",
-    "version": "1.0.2",
+    "version": "1.0.4",
     "description": "数智农服",
     "keywords": [
         "app",

src/pages.json

@@ -220,6 +220,30 @@
             }
         },
         {
+            "path": "pages/jidiguanli/jidiguanli",
+            "style": {
+                "navigationBarTitleText": "农场基地管理",
+                "enablePullDownRefresh": false,
+                "navigationBarBackgroundColor": "#5DB66F",
+                "navigationBarTextStyle": "white",
+                "backgroundColorBottom": "#F2F2F2",
+                "app-plus": {
+                    "titleNView": {
+                        "titleSize": "20",
+                        "buttons": [
+                            {
+                                "text": "\ue560",
+                                "fontSrc": "/static/uni.ttf",
+                                "color": "#fff",
+                                "fontSize": "22px",
+                                "width": "40px"
+                            }
+                        ]
+                    }
+                }
+            }
+        },
+        {
             "path": "pages/index/index",
             "style": {
                 "navigationBarTitleText": "Basic APP"
@@ -302,10 +326,10 @@
     "globalStyle": {
         "navigationBarTextStyle": "black",
         "navigationBarTitleText": "uni-app",
-        "navigationBarBackgroundColor": "#F8F8F8",
-        "backgroundColor": "#F8F8F8",
-        "backgroundColorTop": "#F8F8F8",
-        "backgroundColorBottom": "#F8F8F8",
+        "navigationBarBackgroundColor": "#5DB66F",
+        "backgroundColor": "#5DB66F",
+        "backgroundColorTop": "#5DB66F",
+        "backgroundColorBottom": "#5DB66F",
         "pageOrientation": "portrait",
         "app-plus": {
             "scrollIndicator": "none",

src/pages/mine/index.vue

@@ -89,6 +89,17 @@
                 })
             },
         },
+        {
+            title: '我的基地',
+            icon: 'jidi',
+            disabled: false,
+            show: true,
+            handle: () => {
+                uni.navigateTo({
+                    url: '/pages/jidiguanli/jidiguanli',
+                })
+            },
+        },
 
         {
             title: '问题意见反馈',
@@ -199,7 +210,7 @@
             <fui-list class="rd-3 overflow-hidden shadow" :top-border="false">
                 <fui-list-cell
                     arrow
-                    v-for="(item, index) in items.slice(0, 1)"
+                    v-for="(item, index) in items.slice(0, 2)"
                     :key="index"
                     :bottom-border="false"
                     :class="{ disabled: item.disabled }"
@@ -218,7 +229,7 @@
             <fui-list class="rd-3 overflow-hidden shadow !mt-20rpx" :top-border="false">
                 <fui-list-cell
                     arrow
-                    v-for="(item, index) in items.slice(1, 5)"
+                    v-for="(item, index) in items.slice(2, 6)"
                     :key="index"
                     :bottom-border="false"
                     :class="{ disabled: item.disabled }"
@@ -237,7 +248,7 @@
             <fui-list class="rd-3 overflow-hidden shadow !mt-20rpx" :top-border="false">
                 <fui-list-cell
                     arrow
-                    v-for="(item, index) in items.slice(5, 10)"
+                    v-for="(item, index) in items.slice(7, 10)"
                     :key="index"
                     :bottom-border="false"
                     class="pos-relative"