Pārlūkot izejas kodu

Merge branch 'zhudie' into 'master'

feat: 删除不必要的入口

See merge request tian-group/template/admin-template-fe!1
楼航飞 2 gadi atpakaļ
vecāks
revīzija
ed182905ad

+ 3 - 4
.env.development

@@ -18,13 +18,12 @@ VITE_DROP_CONSOLE = true
 # VITE_PROXY=[["/api","https://naive-ui-admin"]]
 
 # API 接口地址
-VITE_GLOB_API_URL = https://api-tenant.naiveadmin.com
-
+VITE_GLOB_API_URL = http://172.16.23.144:8086
 # 图片上传地址
-VITE_GLOB_UPLOAD_URL= https://api-tenant.naiveadmin.com
+VITE_GLOB_UPLOAD_URL= http://172.16.23.144:8086
 
 # 图片前缀地址
-VITE_GLOB_IMG_URL= https://api-tenant.naiveadmin.com
+VITE_GLOB_IMG_URL= http://172.16.23.144:8086
 
 # 接口前缀
 VITE_GLOB_API_URL_PREFIX = /api

+ 3 - 3
.env.production

@@ -9,13 +9,13 @@ VITE_PUBLIC_PATH = /
 VITE_DROP_CONSOLE = true
 
 # API
-VITE_GLOB_API_URL = https://api-tenant.naiveadmin.com
+VITE_GLOB_API_URL = http://172.16.23.144:8086
 
 # 图片上传地址
-VITE_GLOB_UPLOAD_URL= https://api-tenant.naiveadmin.com
+VITE_GLOB_UPLOAD_URL= http://172.16.23.144:8086
 
 # 图片前缀地址
-VITE_GLOB_IMG_URL= https://api-tenant.naiveadmin.com
+VITE_GLOB_IMG_URL= http://172.16.23.144:8086
 
 # 接口前缀
 VITE_GLOB_API_URL_PREFIX = /api

+ 21 - 21
src/layout/components/Header/index.vue

@@ -370,27 +370,27 @@
 
   // 图标列表
   const iconList = [
-    {
-      icon: SearchOutlined,
-      tips: '搜索',
-      eventObject: {
-        click: () => openAppSearch(),
-      },
-    },
-    {
-      icon: GithubOutlined,
-      tips: 'github',
-      eventObject: {
-        click: () => window.open('https://github.com/jekip/naive-ui-admin'),
-      },
-    },
-    {
-      icon: LockOutlined,
-      tips: '锁屏',
-      eventObject: {
-        click: () => useLockscreen.setLock(true),
-      },
-    },
+    // {
+    //   icon: SearchOutlined,
+    //   tips: '搜索',
+    //   eventObject: {
+    //     click: () => openAppSearch(),
+    //   },
+    // },
+    // {
+    //   icon: GithubOutlined,
+    //   tips: 'github',
+    //   eventObject: {
+    //     click: () => window.open('https://github.com/jekip/naive-ui-admin'),
+    //   },
+    // },
+    // {
+    //   icon: LockOutlined,
+    //   tips: '锁屏',
+    //   eventObject: {
+    //     click: () => useLockscreen.setLock(true),
+    //   },
+    // },
   ];
 
   //头像下拉菜单

+ 1 - 1
src/views/about/index.vue

@@ -32,7 +32,7 @@
         <el-descriptions-item label="QQ交流群">
           <div class="flex items-center">
             <a href="https://jq.qq.com/?_wv=1027&k=xib9dU4C" class="py-2" target="_blank"
-              >点击链接加入群聊【Naive Admin】</a
+              >点击链接加入群聊【Cloud Admin】</a
             >
           </div>
         </el-descriptions-item>

+ 9 - 9
src/views/login/LoginForm2.vue

@@ -86,9 +86,9 @@
       <div class="flex-initial">
         <el-checkbox v-model:checked="autoLogin">自动登录</el-checkbox>
       </div>
-      <div class="flex-initial order-last">
+      <!-- <div class="flex-initial order-last">
         <a href="javascript:">忘记密码</a>
-      </div>
+      </div> -->
     </div>
 
     <el-form-item :show-label="false">
@@ -104,7 +104,7 @@
       </el-button>
     </el-form-item>
     <div class="mb-4 default-color">
-      <div class="flex view-account-other">
+      <!-- <div class="flex view-account-other">
         <div class="flex-initial">
           <span>其它登录方式</span>
         </div>
@@ -125,7 +125,7 @@
         <div class="flex-initial" style="margin-left: auto">
           <a href="javascript:" @click="goRegister">注册账号</a>
         </div>
-      </div>
+      </div> -->
     </div>
   </el-form>
 </template>
@@ -138,7 +138,7 @@
   import { ResultEnum } from '@/enums/httpEnum';
   import { initData, captchaBase64, tentantList } from '@/api/common/index';
   import { CodeOutlined } from '@vicons/antd';
-  import { PersonOutline, LockClosedOutline, LogoGithub, LogoFacebook } from '@vicons/ionicons5';
+  import { PersonOutline, LockClosedOutline } from '@vicons/ionicons5';//LogoGithub, LogoFacebook 
   import { PageEnum } from '@/enums/pageEnum';
 
   interface FormState {
@@ -179,7 +179,7 @@
     password: { required: true, message: '请输入密码', trigger: 'blur' },
     tenantId: { required: true, message: '请选择租户', type: 'number', trigger: 'change' },
   };
-  const emit = defineEmits(['goRegister']);
+  // const emit = defineEmits(['goRegister']);
   const userStore = useUserStore();
 
   const router = useRouter();
@@ -256,9 +256,9 @@
     });
   };
 
-  function goRegister() {
-    emit('goRegister');
-  }
+  // function goRegister() {
+  //   emit('goRegister');
+  // }
 
   function getInitData() {
     initData().then((res) => {

+ 2 - 2
src/views/login/newLogin2.vue

@@ -12,9 +12,9 @@
             <div class="account-top">
               <div class="account-top-logo">
                 <img src="~@/assets/images/logo.png" alt="" />
-                <span class="project-title">Naive Admin</span>
+                <span class="project-title">Cloud Admin</span>
               </div>
-              <div class="account-top-desc">Element plus 中后台前端/设计解决方案</div>
+              <div class="account-top-desc">用户管理平台</div>
             </div>
             <!-- <div class="login-form-title">
             <el-space>