Merge remote-tracking branch 'origin/dev' into dev

main/src/views/login/index.vue

@@ -58,8 +58,8 @@ export default {
     return {
       codeUrl: '',
       loginForm: {
-        username: 'admin',
-        password: 'admin123',
+        username: '',
+        password: '',
         rememberMe: false,
         code: '1',
         uuid: '',

sub-operation-service/src/views/userCenter/components/userHeader.vue

@@ -33,9 +33,9 @@ const props = defineProps({
 let pageTitle = ref(props.title);
 
 let linkList = reactive([
-  { title: '帮助', name: 'help', icon: 'problem', iconSize: '30px', path: '' },
-  { title: '我的', name: 'my', icon: 'user', iconSize: '30px', path: '/sub-operation-service/userCenter' },
-  { title: '首页', name: 'home', icon: 'home', iconSize: '30px', path: '/sub-operation-service/home' },
+  // { title: '帮助', name: 'help', icon: 'problem', iconSize: '30px', path: '' },
+  // { title: '我的', name: 'my', icon: 'user', iconSize: '30px', path: '/sub-operation-service/userCenter' },
+  { title: '首页', name: 'home', icon: 'home', iconSize: '30px', path: '/sub-operation-service/smartFarm/main' },
 ]);
 
 let currentLink = ref(null);

sub-operation-service/src/views/userCenter/shoppingCart.vue

@@ -3,7 +3,7 @@
     <common current-name="agricultural">
       <template #main>
         <div class="my-shoping-car-warp">
-          <userHeader :title="'我的购物车 (' + total + ')'"></userHeader>
+          <userHeader :title="'我的购物车'"></userHeader>
           <div class="page-content-warp">
             <div class="fix-top">
               <div class="do-all" @click="toCheckAll">