From f961a7e1d262afcc37b0743fcd9cec0f9fc1cbc2 Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期五, 26 七月 2024 11:37:06 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/academicGenres/detail.vue | 74 ++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 33 deletions(-)
diff --git a/src/pages/academicGenres/detail.vue b/src/pages/academicGenres/detail.vue
index 12ebb2d..e42a8b2 100644
--- a/src/pages/academicGenres/detail.vue
+++ b/src/pages/academicGenres/detail.vue
@@ -1,7 +1,7 @@
<template>
<view class="bag">
<!-- 椤堕儴瀵艰埅 -->
- <headNav idIndex="3" text="涓尰瀛︽湳娴佹淳" />
+ <headNav idIndex="3" text="瀛︽湳娴佹淳" />
<view class="Midde flex">
<!-- <view class="MiddeBack">杩斿洖</view> -->
<el-button class="MiddeBack flex flex-center" @click="goBack"
@@ -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 +
+ "銆� " +
+ (item.pageNo ? "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 +
+ "銆� " +
+ (item.pageNo ? "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 +
+ "銆� " +
+ (item.pageNo ? "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 +
+ "銆� " +
+ (item.pageNo ? "P " + item.pageNo : "")
+ : ""
};
})
: []
--
Gitblit v1.9.1