From 6cffb189105aaa2dbde8886c3f43a1a65276e872 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期一, 20 五月 2024 17:44:43 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary

---
 src/pages/Login/Login.vue |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/Login/Login.vue b/src/pages/Login/Login.vue
index 0975d76..c874ce4 100644
--- a/src/pages/Login/Login.vue
+++ b/src/pages/Login/Login.vue
@@ -184,19 +184,19 @@
 				},
 				// 涔︾睄鏁版嵁
 				listData: [{
-						name: '鍘嗕唬鍖诲浼犺搴�',
+						name: '涓尰浜虹墿鏁版嵁搴�',
 						id: 1,
 					}, {
-						name: '涓栧尰鍖诲搴�',
+						name: '涓栧尰鍖诲鏁版嵁搴�',
 						id: 2,
 					}, {
-						name: '鍖诲瀛︽湳娴佹淳',
+						name: '涓尰瀛︽湳娴佹淳',
 						id: 3,
 					}, {
-						name: '涓浗鍦板煙鍖昏氨',
+						name: '涓尰鍦板煙鍖昏氨',
 						id: 4,
 					}, {
-						name: '涓浗鍖讳簨鍒跺害',
+						name: '涓尰鍖讳簨鍒跺害',
 						id: 5,
 					},
 
@@ -222,16 +222,16 @@
 				// uni.setStorageSync('globalData', { id: 123, name: 'example' });
 				if (item.id == 1) {
 					uni.navigateTo({
-						url: '/pages/repository/repository?id=' + item.id
+						url: '/pages/character/detail?id=' + item.id
 					})
 				} else if (item.id == 2) {
 					console.log(item.name);
 					// uni.navigateTo({
-					// 	url:'/pages/repository/repository?id='+item.id
+					// 	url:'/pages/character/detail?id='+item.id
 					// })
 				} else if (item.id == 3) {
 					uni.navigateTo({
-						url: '/pages/dataDisplay/dataDisplay?id=' + item.id
+						url: '/pages/academicGenres/index?id=' + item.id
 					})
 				} else if (item.id == 4) {
 					uni.navigateTo({
@@ -511,7 +511,7 @@
 		width: 1.2rem;
 		height: .37rem;
 		background: url(@/static/image/鐢ㄦ埛鐧诲綍.png) no-repeat 0 0;
-		background-size: 100% 100%;
+		background-size: 100%;
 		margin-bottom: .47rem;
 	}
 

--
Gitblit v1.9.1