Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev

sub-operation-service/src/layouts/component/Header/index.vue

@@ -83,10 +83,6 @@ const router = useRouter();
 const keyword = ref('');
 
 const meuns = ref([
-  {
-    label: '综合看板',
-    path: '/sub-operation-service/dashboard',
-  },
   {
     label: '智慧种植',
     path: '/sub-operation-service/smartFarm',
@@ -96,8 +92,8 @@ const meuns = ref([
     path: '/sub-operation-service/ecommerce',
   },
   {
-    label: '涉农金融',
+    label: '农事服务',
-    path: '/sub-operation-service/finance',
+    path: '/sub-operation-service/farmService',
   },
   {
     label: '分拣包装',
@@ -108,13 +104,17 @@ const meuns = ref([
     path: '/sub-operation-service/warehouseLogistics',
   },
   {
-    label: '农事服务',
+    label: '涉农金融',
-    path: '/sub-operation-service/farmService',
+    path: '/sub-operation-service/finance',
   },
   {
     label: '公共品牌',
     path: '/sub-operation-service/brand',
   },
+  {
+    label: '综合看板',
+    path: '/sub-operation-service/dashboard',
+  },
 ]);
 
 const goodNum = ref(0);

sub-operation-service/src/router/index.js

@@ -150,11 +150,11 @@ export const constantRoutes = [
     path: '/sub-operation-service',
     name: 'layout',
     component: Layout,
-    redirect: '/sub-operation-service/dashboard',
+    redirect: '/sub-operation-service/smartFarm',
     meta: { title: '运营服务' },
     children: [
       {
-        path: '/sub-operation-service/home',
+        path: '/sub-operation-service/main',
         component: () => import('@/views/home/index.vue'),
         name: 'home',
         meta: { title: '首页' },