From 1a5b2a6443dc24e3e024e2c0bb500d80a2b20d11 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期四, 06 六月 2024 15:36:37 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/character/detail.vue | 2
src/components/headNav/headNav.vue | 3 +
src/pages/academicGenres/detail.vue | 72 ++++++++++++++++++++----------------
3 files changed, 44 insertions(+), 33 deletions(-)
diff --git a/src/components/headNav/headNav.vue b/src/components/headNav/headNav.vue
index 4e516a2..4d99911 100644
--- a/src/components/headNav/headNav.vue
+++ b/src/components/headNav/headNav.vue
@@ -51,6 +51,7 @@
placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�"
/>
<view
+ title="鎼滅储"
class="search-logo"
@click="toggleSearch"
:style="{
@@ -66,6 +67,7 @@
<el-dropdown trigger="click" @command="handleCommand">
<!-- <view @click="iconClick(2)" class="s2 ss1 "></view> -->
<img
+ title="涓汉涓績"
class="cursor"
@click="changePassword(1)"
src="@/static/image/profile.svg"
@@ -77,6 +79,7 @@
</el-dropdown-menu>
</el-dropdown>
<img
+ title="甯姪"
class="cursor"
@click="changePassword(2)"
src="@/static/image/quote.svg"
diff --git a/src/pages/academicGenres/detail.vue b/src/pages/academicGenres/detail.vue
index 12ebb2d..a947007 100644
--- a/src/pages/academicGenres/detail.vue
+++ b/src/pages/academicGenres/detail.vue
@@ -202,14 +202,16 @@
? res.object.school_INTRODUCTION.map((item) => {
return {
content: item.content,
- source: res.object.bookList
- ? "鍑哄锛氥��" +
- res.object.bookList.find(
- (citem) => citem.id == item.bookId
- ).name +
- "銆� P" +
- item.pageNo
- : ""
+ source:
+ res.object.bookList &&
+ res.object.bookList.find((citem) => citem.id == item.bookId)
+ ? "鍑哄锛氥��" +
+ res.object.bookList.find(
+ (citem) => citem.id == item.bookId
+ ).name +
+ "銆� P" +
+ item.pageNo
+ : ""
};
})
: [],
@@ -217,14 +219,16 @@
? res.object.school_DEVELOPMENT.map((item) => {
return {
content: item.content,
- source: res.object.bookList
- ? "鍑哄锛氥��" +
- res.object.bookList.find(
- (citem) => citem.id == item.bookId
- ).name +
- "銆� P" +
- item.pageNo
- : ""
+ source:
+ res.object.bookList &&
+ res.object.bookList.find((citem) => citem.id == item.bookId)
+ ? "鍑哄锛氥��" +
+ res.object.bookList.find(
+ (citem) => citem.id == item.bookId
+ ).name +
+ "銆� P" +
+ item.pageNo
+ : ""
};
})
: [],
@@ -232,14 +236,16 @@
? res.object.achievement_INFLUENCE.map((item) => {
return {
content: item.content,
- source: res.object.bookList
- ? "鍑哄锛氥��" +
- res.object.bookList.find(
- (citem) => citem.id == item.bookId
- ).name +
- "銆� P" +
- item.pageNo
- : ""
+ source:
+ res.object.bookList &&
+ res.object.bookList.find((citem) => citem.id == item.bookId)
+ ? "鍑哄锛氥��" +
+ res.object.bookList.find(
+ (citem) => citem.id == item.bookId
+ ).name +
+ "銆� P" +
+ item.pageNo
+ : ""
};
})
: [],
@@ -247,14 +253,16 @@
? res.object.related_LITERATURE.map((item) => {
return {
content: item.content,
- source: res.object.bookList
- ? "鍑哄锛氥��" +
- res.object.bookList.find(
- (citem) => citem.id == item.bookId
- ).name +
- "銆� P" +
- item.pageNo
- : ""
+ source:
+ res.object.bookList &&
+ res.object.bookList.find((citem) => citem.id == item.bookId)
+ ? "鍑哄锛氥��" +
+ res.object.bookList.find(
+ (citem) => citem.id == item.bookId
+ ).name +
+ "銆� P" +
+ item.pageNo
+ : ""
};
})
: []
diff --git a/src/pages/character/detail.vue b/src/pages/character/detail.vue
index 4ed71ef..619d38b 100644
--- a/src/pages/character/detail.vue
+++ b/src/pages/character/detail.vue
@@ -541,7 +541,7 @@
},
methods: {
copyText() {
- const textToCopy = this.biogData[0].content + " 鏉ユ簮锛氫腑鍖诲尰瀛︿汉鐗╃煡璇嗗簱";
+ const textToCopy = this.biogData[0].content + "\n鏉ユ簮锛氫腑鍖诲尰瀛︿汉鐗╃煡璇嗗簱";
const textarea = document.createElement("textarea");
textarea.value = textToCopy;
document.body.appendChild(textarea);
--
Gitblit v1.9.1