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 |   67 ++++++++++++++++++++++-----------
 1 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/src/pages/academicGenres/detail.vue b/src/pages/academicGenres/detail.vue
index 1be251f..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"
@@ -9,7 +9,6 @@
       >
       <view class="flex flex-center flex-column">
         <view
-          class=""
           style="
             font-weight: 900;
             margin-bottom: 0.2rem;
@@ -19,13 +18,18 @@
           >{{ detailData.name }}
         </view>
         <ul class="flex Lists">
-          <li style="background-color: #597aa5; color: #fff;cursor: pointer;">瀛︽淳浠嬬粛</li>
-          <li @click="ListClick" style="background-color: #fff; color: #597aa5;cursor: pointer;">
+          <li style="background-color: #597aa5; color: #fff; cursor: pointer">
+            瀛︽淳浠嬬粛
+          </li>
+          <li
+            @click="ListClick"
+            style="background-color: #fff; color: #597aa5; cursor: pointer"
+          >
             瀛︽淳鍥捐氨
           </li>
         </ul>
       </view>
-      <view class=""></view>
+      <view></view>
     </view>
     <view class="Bottom">
       <view class="Bottom_top flex">
@@ -169,7 +173,6 @@
   methods: {
     getData() {
       getIntroduction(Number(this.idIndex)).then((res) => {
-        console.log(res,"rrrr");
         this.detailData = {
           name: res.object.school_NAME[0].content,
           icon:
@@ -200,11 +203,15 @@
                 return {
                   content: item.content,
                   source:
-                    "鍑哄锛氥��" +
+                    res.object.bookList &&
                     res.object.bookList.find((citem) => citem.id == item.bookId)
-                      .name +
-                    "銆� P" +
-                    item.pageNo
+                      ? "鍑哄锛氥��" +
+                        res.object.bookList.find(
+                          (citem) => citem.id == item.bookId
+                        ).name +
+                        "銆� " +
+                        (item.pageNo ? "P " + item.pageNo : "")
+                      : ""
                 };
               })
             : [],
@@ -213,11 +220,15 @@
                 return {
                   content: item.content,
                   source:
-                    "鍑哄锛氥��" +
+                    res.object.bookList &&
                     res.object.bookList.find((citem) => citem.id == item.bookId)
-                      .name +
-                    "銆� P" +
-                    item.pageNo
+                      ? "鍑哄锛氥��" +
+                        res.object.bookList.find(
+                          (citem) => citem.id == item.bookId
+                        ).name +
+                        "銆� " +
+                        (item.pageNo ? "P " + item.pageNo : "")
+                      : ""
                 };
               })
             : [],
@@ -226,11 +237,15 @@
                 return {
                   content: item.content,
                   source:
-                    "鍑哄锛氥��" +
+                    res.object.bookList &&
                     res.object.bookList.find((citem) => citem.id == item.bookId)
-                      .name +
-                    "銆� P" +
-                    item.pageNo
+                      ? "鍑哄锛氥��" +
+                        res.object.bookList.find(
+                          (citem) => citem.id == item.bookId
+                        ).name +
+                        "銆� " +
+                        (item.pageNo ? "P " + item.pageNo : "")
+                      : ""
                 };
               })
             : [],
@@ -239,16 +254,19 @@
                 return {
                   content: item.content,
                   source:
-                    "鍑哄锛氥��" +
+                    res.object.bookList &&
                     res.object.bookList.find((citem) => citem.id == item.bookId)
-                      .name +
-                    "銆� P" +
-                    item.pageNo
+                      ? "鍑哄锛氥��" +
+                        res.object.bookList.find(
+                          (citem) => citem.id == item.bookId
+                        ).name +
+                        "銆� " +
+                        (item.pageNo ? "P " + item.pageNo : "")
+                      : ""
                 };
               })
             : []
         };
-        console.log(this.detailData,"detailDatadetailData");
       });
     },
     goBack() {
@@ -320,6 +338,9 @@
     height: 0.24rem;
     font-size: 0.12rem;
     padding: 0;
+    border-radius: 0;
+    border: 1px solid #9e9e9e;
+    color: #000;
   }
 
   .Lists {

--
Gitblit v1.9.1