From 48fbf705ee51a803081bfd09e7ff173d8475cdc9 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期三, 24 七月 2024 09:53:55 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/index/index.vue | 106 +++++++++++++++++++++++++++++++----------------------
1 files changed, 62 insertions(+), 44 deletions(-)
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index e8d6e6d..63770e5 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -3,13 +3,13 @@
<view class="repository relative">
<view class="flex Ttop flex-column" style="width: 100%">
<view class="flex" style="width: 100%">
- <view style="padding-left: 4rem"></view>
+ <view style="padding-left: 4rem"></view>
<view
class="flex flex-center flex-wrap"
style="width: 100%; flex-direction: column"
>
- <view ></view>
- <view ref="Rtop">
+ <view></view>
+ <view ref="Rtop">
<text class="login"></text>
<text
style="
@@ -19,7 +19,7 @@
font-family: cursive;
font-weight: bold;
"
- >涓浗鍖诲浜虹墿鐭ヨ瘑搴�</text
+ >涓浗鍘嗕唬鍖诲浜虹墿鐭ヨ瘑搴�</text
>
</view>
</view>
@@ -42,7 +42,7 @@
@confirm="toggleSearch"
type="text"
style="
- margin-left: 0.05rem;
+ margin-left: 0.16rem;
color: #2c2c2c;
flex: 1;
background-color: #fff;
@@ -55,11 +55,7 @@
<view
class="search-logo"
@click="toggleSearch"
- style="
- background-color: #244a7b;
- border-radius: 50%;
- margin-top: -4rpx;
- "
+ style="background-color: #244a7b; border-radius: 50%"
></view>
</view>
<el-dropdown
@@ -121,7 +117,7 @@
>{{ item.name }}</span
>
<view
- class="flex flex-content"
+ class="detailBtn flex flex-content"
style="
width: 0.5rem;
height: 0.5rem;
@@ -154,7 +150,7 @@
import Footer1 from "@/components/footer/footer.vue";
export default {
components: {
- Footer1
+ Footer1,
},
data() {
return {
@@ -173,60 +169,63 @@
pass: "",
checkPass: "",
cellphoneORmailbox: "",
- verifyCode: ""
+ verifyCode: "",
},
// 鐧诲綍鐢ㄦ埛璐﹀彿
loginData: {
// 璐﹀彿
loginID: "",
- pass: ""
+ pass: "",
},
// 閲嶇疆瀵嗙爜
resetDataPass: {
cellphoneORmailbox: "",
verifyCode: "",
newPass: "",
- checkPass: ""
+ checkPass: "",
},
// 淇敼瀵嗙爜
amendDataPass: {
loginID: "",
originalPass: "",
newPass: "",
- checkPass: ""
+ checkPass: "",
},
// 涔︾睄鏁版嵁
listData: [
{
- name: "涓尰浜虹墿鏁版嵁搴�",
- id: 1
+ name: "鍘嗕唬浜虹墿",
+ id: 1,
},
{
- name: "涓栧尰鍖诲鏁版嵁搴�",
- id: 2
+ name: "瀹跺浼犳壙",
+ id: 2,
},
{
- name: "涓尰瀛︽湳娴佹淳",
- id: 3
+ name: "瀛︽湳娴佹淳",
+ id: 6,
},
{
- name: "涓尰鍦板煙鍖昏氨",
- id: 4
+ name: "瀛︽湳鍥捐氨",
+ id: 3,
},
{
- name: "涓尰鍖讳簨鍒跺害",
- id: 5
- }
- ]
+ name: "鍦板煙鍥捐氨",
+ id: 4,
+ },
+ // {
+ // name: "涓尰鍖讳簨鍒跺害",
+ // id: 5
+ // }
+ ],
};
},
onLoad() {
-
uni.getSystemInfo({
success: function (info) {
// console.log('灞忓箷鐨勫搴︼細' + info.windowWidth);
// console.log('灞忓箷鐨勯珮搴︼細' + info.windowHeight);
- }
+ },
});
},
mounted() {
@@ -237,7 +236,7 @@
// 鎼滅储
onSearch(val) {
uni.navigateTo({
- url: "/pages/knowledgeBase/knowledgeBase?keyword=" + val.text
+ url: "/pages/knowledgeBase/knowledgeBase?keyword=" + val.text,
});
},
// 鎼滅储
@@ -248,7 +247,7 @@
if (this.searchInput.trim() !== "") {
uni.navigateTo({
url:
- "/pages/knowledgeBase/knowledgeBase?keyword=" + this.searchInput
+ "/pages/knowledgeBase/knowledgeBase?keyword=" + this.searchInput,
});
}
this.searchInput = "";
@@ -261,26 +260,30 @@
if (item.id == 1) {
uni.navigateTo({
// url: '/pages/character/detail?id=' + item.id
- url: "/pages/character/index?id=" + item.id
+ url: "/pages/character/index?id=" + item.id,
});
} else if (item.id == 2) {
uni.navigateTo({
- url: "/pages/inherit/index?id=" + item.id
+ url: "/pages/inherit/index?id=" + item.id,
});
// uni.navigateTo({
// url: '/pages/shiyiHome/shiyiHome'
// })
} else if (item.id == 3) {
uni.navigateTo({
- url: "/pages/academicGenres/index?id=" + item.id
+ url: "/pages/academicGenres/index?id=" + item.id,
});
} else if (item.id == 4) {
uni.navigateTo({
- url: "/pages/territory/territory?id=" + item.id
+ url: "/pages/territory/territory?id=" + item.id,
});
} else if (item.id == 5) {
uni.navigateTo({
- url: "/pages/TcmSystem/TcmSystem?id=" + item.id
+ url: "/pages/TcmSystem/TcmSystem?id=" + item.id,
+ });
+ } else if (item.id == 6) {
+ uni.navigateTo({
+ url: "/pages/academicSchools/index",
});
}
},
@@ -312,7 +315,7 @@
// token 涓嶅瓨鍦�
this.isCommand = false;
uni.navigateTo({
- url: "/pages/Login/Login"
+ url: "/pages/Login/Login",
});
}
} else if (index == 3) {
@@ -323,7 +326,7 @@
handleCommand(int) {
if (int == 1) {
uni.navigateTo({
- url: "/pages/changePassword/changePassword"
+ url: "/pages/changePassword/changePassword",
});
} else if (int == 2) {
uni.showModal({
@@ -340,15 +343,15 @@
//閫�鍑烘垚鍔燂紒骞惰烦杞埌鍏朵粬椤甸潰
this.$message.success("閫�鍑烘垚鍔�");
uni.reLaunch({
- url: "/pages/Login/Login"
+ url: "/pages/Login/Login",
});
});
}
- }
+ },
});
}
- }
- }
+ },
+ },
};
</script>
@@ -568,6 +571,14 @@
height: 80% !important;
}
+ .Search ::v-deep .ffff {
+ opacity: 0.8;
+ }
+
+ .Search ::v-deep .ffff:focus-within {
+ opacity: 1;
+ }
+
::v-deep .searchBg {
width: 0.35rem;
height: 0.35rem;
@@ -742,7 +753,14 @@
}
}
-::v-deep .cleanupBtn{
+::v-deep .cleanupBtn {
right: 52px !important;
}
+
+.secretary li .detailBtn {
+ transition: translate 0.3s;
+}
+.secretary li .detailBtn:hover {
+ translate: 0 -5px;
+}
</style>
--
Gitblit v1.9.1