Merge branch 'master' of http://139.196.39.194:9021/yuansh/doors-windows-web

src/components/layouts/UserLayout.vue

@@ -4,12 +4,12 @@
       <div class="top">
         <div class="header">
           <a href="/">
-            <img src="~@/assets/logo.svg" class="logo" alt="logo">
+            <!-- <img src="~@/assets/logo.svg" class="logo" alt="logo"> -->
-            <span class="title">亿事达</span>
+            <span class="title">门窗生产管理平台</span>
           </a>
         </div>
-        <div class="desc">
+       <div class="desc">
-          门窗生产管理平台
+         <!--  门窗生产管理平台 -->
         </div>
       </div>
 
@@ -22,7 +22,7 @@
           <a href="https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE" target="_blank">条款</a>
         </div> -->
         <div class="copyright">
-          Copyright &copy; 2022 <a href="https://blog.csdn.net/qq_40032778" target="_blank">NBCIO 亿事达</a> 出品
+          Copyright &copy; 2024 <a href="/" target="_blank">上海用优网络科技公司</a> 出品
         </div>
       </div>
     </div>

src/components/tools/UserMenu.vue

@@ -26,11 +26,11 @@
     <!-- update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
     <!-- update-end author:sunjianlei date:20191220 for: 解决全局样式冲突的问题 -->
     <!-- update_end  author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
-    <span class="action">
+    <!-- <span class="action">
       <a class="logout_title" target="_blank" href="http://doc.jeecg.com">
         <a-icon type="question-circle-o"></a-icon>
       </a>
-    </span>
+    </span> -->
     <header-notice class="action"/>
     <a-dropdown>
       <span class="action action-full ant-dropdown-link user-dropdown-menu">

src/views/user/Login.vue

@@ -6,19 +6,19 @@
           <login-account ref="alogin" @validateFail="validateFail" @success="requestSuccess" @fail="requestFailed"></login-account>
         </a-tab-pane>
 
-        <a-tab-pane key="tab2" tab="手机号登录">
+       <!-- <a-tab-pane key="tab2" tab="手机号登录">
           <login-phone ref="plogin" @validateFail="validateFail" @success="requestSuccess" @fail="requestFailed"></login-phone>
-        </a-tab-pane>
+        </a-tab-pane> -->
       </a-tabs>
 
       <a-form-model-item>
         <a-checkbox @change="handleRememberMeChange" default-checked>自动登录</a-checkbox>
-        <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">
+        <!-- <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">
           忘记密码
         </router-link>
         <router-link :to="{ name: 'register'}" class="forge-password" style="float: right;margin-right: 10px" >
           注册账户
-        </router-link>
+        </router-link> -->
       </a-form-model-item>
 
       <a-form-item style="margin-top:24px">

src/views/user/third/ThirdLogin.vue

@@ -1,12 +1,12 @@
 <template>
   <div>
-    <div class="user-login-other">
+    <!-- <div class="user-login-other">
       <span>其他登录方式</span>
       <a @click="onThirdLogin('github')" title="github"><a-icon class="item-icon" type="github"></a-icon></a>
       <a @click="onThirdLogin('wechat_enterprise')" title="企业微信"> <icon-font class="item-icon" type="icon-qiyeweixin3" /></a>
       <a @click="onThirdLogin('dingtalk')" title="钉钉"><a-icon class="item-icon" type="dingding"></a-icon></a>
       <a @click="onThirdLogin('wechat_open')" title="微信"><a-icon class="item-icon" type="wechat"></a-icon></a>
-    </div>
+    </div> -->
     <!-- 第三方登录绑定账号密码输入弹框 -->
     <a-modal title="请输入密码" :visible="thirdPasswordShow" @ok="thirdLoginCheckPassword" @cancel="thirdLoginNoPassword">
       <a-input-password placeholder="请输入密码" v-model="thirdLoginPassword" />