Browse Source

Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl_admin_table

lsc 3 months ago
parent
commit
18d215bede

File diff suppressed because it is too large
+ 0 - 0
dist/css/app.4990276e.css


File diff suppressed because it is too large
+ 0 - 0
dist/css/app.a7acf9ef.css


+ 4 - 0
dist/img/wechat.0277f1a9.svg

@@ -0,0 +1,4 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.1333 10.8533C21.6533 10.8533 22.16 10.8933 22.6533 10.96C21.7467 7 17.5867 4 12.5867 4C6.92001 4 2.32001 7.84 2.32001 12.5733C2.32001 15.3067 3.85334 17.72 6.24001 19.2933L4.89334 22L8.57334 20.4133C9.36001 20.6933 10.1867 20.92 11.0667 21.04C10.9467 20.52 10.88 19.9867 10.88 19.4267C10.8667 14.7067 15.4667 10.8533 21.1333 10.8533ZM16 7.85333C16.1681 7.85333 16.3345 7.88644 16.4898 7.95077C16.6451 8.01509 16.7862 8.10938 16.9051 8.22824C17.024 8.3471 17.1182 8.4882 17.1826 8.6435C17.2469 8.7988 17.28 8.96524 17.28 9.13333C17.28 9.30143 17.2469 9.46787 17.1826 9.62317C17.1182 9.77847 17.024 9.91957 16.9051 10.0384C16.7862 10.1573 16.6451 10.2516 16.4898 10.3159C16.3345 10.3802 16.1681 10.4133 16 10.4133C15.6605 10.4133 15.335 10.2785 15.0949 10.0384C14.8549 9.79838 14.72 9.47281 14.72 9.13333C14.72 8.79386 14.8549 8.46828 15.0949 8.22824C15.335 7.98819 15.6605 7.85333 16 7.85333ZM9.16001 10.4267C8.82053 10.4267 8.49496 10.2918 8.25491 10.0518C8.01486 9.81172 7.88001 9.48614 7.88001 9.14667C7.88001 8.80719 8.01486 8.48162 8.25491 8.24157C8.49496 8.00152 8.82053 7.86667 9.16001 7.86667C9.49949 7.86667 9.82506 8.00152 10.0651 8.24157C10.3052 8.48162 10.44 8.80719 10.44 9.14667C10.44 9.48614 10.3052 9.81172 10.0651 10.0518C9.82506 10.2918 9.49949 10.4267 9.16001 10.4267Z" fill="black"/>
+<path d="M29.68 19.4267C29.68 15.64 25.8533 12.5734 21.1333 12.5734C16.4133 12.5734 12.5867 15.64 12.5867 19.4267C12.5867 23.2134 16.4133 26.28 21.1333 26.28C21.9067 26.28 22.6533 26.1734 23.36 26.0134L27.9733 28L26.3733 24.8C28.3733 23.5467 29.68 21.6267 29.68 19.4267ZM18.56 19C18.3068 19 18.0594 18.925 17.8489 18.7843C17.6384 18.6437 17.4743 18.4438 17.3774 18.2099C17.2806 17.976 17.2552 17.7186 17.3046 17.4703C17.354 17.222 17.4759 16.9939 17.6549 16.8149C17.8339 16.6359 18.062 16.514 18.3103 16.4646C18.5586 16.4152 18.8159 16.4406 19.0498 16.5375C19.2837 16.6343 19.4836 16.7984 19.6243 17.0089C19.7649 17.2194 19.84 17.4669 19.84 17.72C19.8533 18.4267 19.2667 19 18.56 19ZM23.6933 19C23.3539 19 23.0283 18.8652 22.7882 18.6251C22.5482 18.3851 22.4133 18.0595 22.4133 17.72C22.4133 17.3806 22.5482 17.055 22.7882 16.8149C23.0283 16.5749 23.3539 16.44 23.6933 16.44C24.0328 16.44 24.3584 16.5749 24.5984 16.8149C24.8385 17.055 24.9733 17.3806 24.9733 17.72C24.9733 18.0595 24.8385 18.3851 24.5984 18.6251C24.3584 18.8652 24.0328 19 23.6933 19Z" fill="black"/>
+</svg>

+ 1 - 1
dist/index.html

@@ -36,7 +36,7 @@
         width: 100%;
         background: #e6eaf0;
         font-family: '黑体';
-      }</style><script defer="defer" src="/js/chunk-vendors.2f2a8cc6.js"></script><script defer="defer" src="/js/app.8f6df576.js"></script><link href="/css/chunk-vendors.7cfe4581.css" rel="stylesheet"><link href="/css/app.a7acf9ef.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but pblAdminTable doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html><script>function stopSafari() {
+      }</style><script defer="defer" src="/js/chunk-vendors.2f2a8cc6.js"></script><script defer="defer" src="/js/app.f840d58a.js"></script><link href="/css/chunk-vendors.7cfe4581.css" rel="stylesheet"><link href="/css/app.4990276e.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but pblAdminTable doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/js/app.8f6df576.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.8f6df576.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.f840d58a.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.f840d58a.js.map


+ 1 - 0
src/assets/login/account.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1744767402496" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8203" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M113.984 703.52c46.752-71.616 156.576-126.912 293.04-145.92a192 192 0 1 1 210 0c136.416 19.008 246.24 74.304 292.992 145.92A439.872 439.872 0 0 0 953.6 512 441.6 441.6 0 1 0 70.4 512c0 68.64 15.648 133.584 43.584 191.52zM512 992C246.896 992 32 777.104 32 512S246.896 32 512 32s480 214.896 480 480-214.896 480-480 480z" fill="#000000" p-id="8204"></path></svg>

+ 1 - 0
src/assets/login/form.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1744766934058" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2668" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M768 64 192 64C121.6 64 64 121.6 64 192l0 576c0 70.4 57.6 128 128 128l576 0c70.4 0 128-57.6 128-128L896 192C896 121.6 838.4 64 768 64zM640 672c0 17.92-14.08 32-32 32l-320 0C270.08 704 256 689.92 256 672l0 0C256 654.08 270.08 640 288 640l320 0C625.92 640 640 654.08 640 672L640 672zM256 480C256 462.08 270.08 448 288 448l256 0C561.92 448 576 462.08 576 480 576 497.92 561.92 512 544 512l-256 0C270.08 512 256 497.92 256 480zM672 320l-384 0C270.08 320 256 305.92 256 288 256 270.08 270.08 256 288 256l384 0C689.92 256 704 270.08 704 288 704 305.92 689.92 320 672 320z" p-id="2669" fill="#000000"></path></svg>

+ 32 - 18
src/views/login/loginPage.vue

@@ -5,10 +5,7 @@
 				v-if="form.basics && form.basics.loginBanner"
 				:src="form.basics.loginBanner"
 			/>
-			<img
-				v-else
-				src="@/assets/login.png"
-			/>
+			<img v-else src="@/assets/login.png" />
 		</div>
 		<div class="lp_right">
 			<div class="lp_r_box">
@@ -95,7 +92,7 @@
 				<div
 					class="lp_r_b_btn"
 					v-if="loginType == 'weChat'"
-					@click="loginType = 'default'"
+					style="opacity: 0; cursor: default"
 				>
 					账号密码登录
 				</div>
@@ -108,7 +105,7 @@
 					确认绑定
 				</div>
 				<div class="lp_r_b_line">
-					<template v-if="['default', 'weChat'].includes(loginType) ">
+					<template v-if="['default', 'weChat'].includes(loginType)">
 						<div></div>
 						<span>其他登录方式</span>
 						<div></div>
@@ -119,7 +116,18 @@
 						@click="loginType = 'weChat'"
 						v-if="['default', 'weChat'].includes(loginType)"
 					>
-						<img src="@/assets/login/wechat.svg" />
+						<el-tooltip effect="dark" content="微信登录" placement="bottom">
+							<img src="@/assets/login/wechat.svg" />
+						</el-tooltip>
+					</div>
+
+					<div
+						@click="loginType = 'default'"
+						v-if="['default', 'weChat'].includes(loginType)"
+					>
+						<el-tooltip effect="dark" content="账号密码登录" placement="bottom">
+							<img src="@/assets/login/account.svg" />
+						</el-tooltip>
 					</div>
 				</div>
 			</div>
@@ -147,7 +155,7 @@ export default {
 			// 组织列表
 			OrgOptions: [],
 			form: {},
-			showName:"",
+			showName: "",
 		};
 	},
 	methods: {
@@ -271,9 +279,9 @@ export default {
 				.post(API_CONFIG.baseUrl, params)
 				.then((res) => {
 					let data = res.data[0];
-					console.log('data', data)
+					console.log("data", data);
 					this.form = JSON.parse(data[0].json);
-					this.showName = data[0].name
+					this.showName = data[0].name;
 				})
 				.catch((err) => {
 					console.error("请求失败,错误信息:", err);
@@ -340,7 +348,7 @@ export default {
 }
 
 .lp_r_box > span {
-	font-size: 48px;
+	font-size: 46px;
 	font-weight: bold;
 	margin: 40px 0;
 	display: block;
@@ -348,7 +356,7 @@ export default {
 
 .lp_r_b_formArea {
 	width: 100%;
-	height: 300px;
+	height: 250px;
 	margin-bottom: 40px;
 }
 
@@ -373,9 +381,9 @@ export default {
 
 .fa_i_item > div {
 	width: 100%;
-	height: 45px;
+	height: 40px;
 	border: solid 1px rgba(213, 213, 213, 1);
-	margin-top: 15px;
+	margin-top: 5px;
 	border-radius: 8px;
 	transition: 0.5s;
 }
@@ -388,7 +396,7 @@ export default {
 	text-indent: 1em;
 
 	color: #000;
-	font-size: 16px;
+	font-size: 14px;
 	background: none;
 }
 
@@ -402,8 +410,8 @@ export default {
 	outline: none;
 	background: none;
 	text-indent: 1em;
-	font-size: 16px;
-	height: 45px;
+	font-size: 14px;
+	height: 40px;
 	padding-left: 0;
 	color: #000;
 }
@@ -446,7 +454,7 @@ export default {
 
 .lp_r_b_btn {
 	width: 100%;
-	height: 50px;
+	height: 45px;
 	background-color: rgba(0, 106, 254, 1);
 	border-radius: 10px;
 	display: flex;
@@ -501,5 +509,11 @@ export default {
 	width: 32px;
 	height: 32px;
 	cursor: pointer;
+	margin: 0 20px;
+}
+
+.lp_r_b_iconBtn > div > img {
+	width: 100%;
+	height: 100%;
 }
 </style>

Some files were not shown because too many files changed in this diff