From 1335100e875ffdda19fc16de9afdda920858ca9b Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期五, 17 五月 2024 22:17:30 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/index/index.vue | 44 +++++++++++++++++++-------------------------
1 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 1c0c77f..c7c1dca 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -25,8 +25,8 @@
<el-dropdown trigger="click" @command="handleCommand" style="margin-right: .3rem;">
<view @click="iconClick(2)" class="s2 ss1 "></view>
<el-dropdown-menu v-if="isCommand" slot="dropdown">
- <el-dropdown-item command="1" icon="el-icon-plus">淇敼瀵嗙爜</el-dropdown-item>
- <el-dropdown-item command="2" icon="el-icon-circle-plus">閫�鍑虹櫥褰�</el-dropdown-item>
+ <el-dropdown-item command="1" >淇敼瀵嗙爜</el-dropdown-item>
+ <el-dropdown-item command="2" >閫�鍑虹櫥褰�</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<view @click="iconClick(item+2)" v-for="item in 1" :key="item" :class="'s'+(item+2)"
@@ -115,19 +115,19 @@
},
// 涔︾睄鏁版嵁
listData: [{
- name: '鍘嗕唬鍖诲浼犺搴�',
+ name: '涓尰浜虹墿鏁版嵁搴�',
id: 1,
}, {
- name: '涓栧尰鍖诲搴�',
+ name: '涓栧尰鍖诲鏁版嵁搴�',
id: 2,
}, {
- name: '鍖诲瀛︽湳娴佹淳',
+ name: '涓尰瀛︽湳娴佹淳',
id: 3,
}, {
- name: '涓浗鍦板煙鍖昏氨',
+ name: '涓尰鍦板煙鍖昏氨',
id: 4,
}, {
- name: '涓浗鍖讳簨鍒跺害',
+ name: '涓尰鍖讳簨鍒跺害',
id: 5,
},
@@ -152,27 +152,22 @@
// 鎼滅储
onSearch(val) {
uni.navigateTo({
- url: '/pages/knowledgeBase/knowledgeBase?name=' + val.text
+ url: '/pages/knowledgeBase/knowledgeBase?keyword=' + val.text
})
},
// 鎼滅储
// 鍒囨崲鎼滅储妗嗙殑灞曞紑鍜屾敹璧风姸鎬�
toggleSearch() {
- console.log('sdf');
- // console.log('鎾掓棪鑼冨痉钀ㄥ彂鐢熺殑',this.searchInput);
this.isExpanded = !this.isExpanded;
this.$nextTick(() => {
if (this.searchInput.trim() !== '') {
uni.navigateTo({
- url: '/pages/knowledgeBase/knowledgeBase?name=' + this.searchInput
+ url: '/pages/knowledgeBase/knowledgeBase?keyword=' + this.searchInput
})
- // console.log('鎼滅储', this.searchInput);
} else {
console.log('涓嶆悳绱�');
}
-
this.searchInput = '';
- console.log(this.isExpanded);
})
},
// 鍒楄〃椤硅烦杞�
@@ -182,20 +177,20 @@
// uni.setStorageSync('globalData', { id: 123, name: 'example' });
if (item.id == 1) {
uni.navigateTo({
- // url: '/pages/repository/repository?id=' + item.id
- url: '/pages/characterRelation/characterRelation?id=' + item.id
+ // url: '/pages/character/detail?id=' + item.id
+ url: '/pages/character/index?id=' + item.id
})
} else if (item.id == 2) {
console.log(item.name);
- // uni.navigateTo({
- // url: '/pages/zhongyi/zhongyi?id=' + item.id
- // })
uni.navigateTo({
- url: '/pages/shiyiHome/shiyiHome'
+ url: '/pages/inherit/index?id=' + item.id
})
+ // uni.navigateTo({
+ // url: '/pages/shiyiHome/shiyiHome'
+ // })
} 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({
@@ -486,7 +481,7 @@
}
}
- @media screen and (min-width:1366px) and (max-width:1920px) {
+ @media screen and (min-width:1366px) {
.Ttop {
margin-bottom: .6rem !important;
}
@@ -530,9 +525,7 @@
width: 2rem !important;
}
- .hua {
- height: 4rem !important;
- }
+
}
@@ -694,6 +687,7 @@
background: #EBF4FF;
font-weight: 600;
margin: 0 .21rem;
+ cursor: pointer;
}
}
--
Gitblit v1.9.1