bug自测修复

public/configExcel.js

@@ -278,7 +278,9 @@ var configExcel = {
   ],
   "画作": [
     {
+      "序号": "1",
       "标题": "墨竹图（一）",
+      "标题（展示）": "墨竹图",
       "朝代": "宋",
       "作者": "文同",
       "馆藏": "台北故宫博物院藏",
@@ -289,7 +291,9 @@ var configExcel = {
       "图片": "=DISPIMG(\"ID_C27CC7DE6D8E438680A9B832D501DB8F\",1)"
     },
     {
+      "序号": "2",
       "标题": "潇湘竹石图\n（竹石部分）",
+      "标题（展示）": "潇湘竹石图\n（竹石部分）",
       "朝代": "宋",
       "作者": "苏轼",
       "馆藏": "中国美术馆藏",
@@ -300,7 +304,9 @@ var configExcel = {
       "图片": "=DISPIMG(\"ID_3A02D4F7E4634CE4AC9CBE35C93481F0\",1)"
     },
     {
+      "序号": "3",
       "标题": "赵氏一门三竹图",
+      "标题（展示）": "赵氏一门三竹图",
       "朝代": "元",
       "作者": "赵孟頫",
       "馆藏": "故宫博物院藏",
@@ -311,7 +317,9 @@ var configExcel = {
       "图片": "=DISPIMG(\"ID_23BB166FF59D4B348746454D9E6974DE\",1)"
     },
     {
+      "序号": "4",
       "标题": "枯木竹石图",
+      "标题（展示）": "枯木竹石图",
       "朝代": "元",
       "作者": "赵孟頫",
       "馆藏": "台北故宫博物院藏",
@@ -322,7 +330,9 @@ var configExcel = {
       "图片": "=DISPIMG(\"ID_B0C92DB13FC945D4B2B7312FD8C85535\",1)"
     },
     {
+      "序号": "5",
       "标题": "筼筜清影图",
+      "标题（展示）": "筼筜清影图",
       "朝代": "元",
       "作者": "吴镇",
       "馆藏": "台北故宫博物院藏",
@@ -333,7 +343,9 @@ var configExcel = {
       "图片": "=DISPIMG(\"ID_95C549FBC2CA4DD19EC6BBD892527861\",1)"
     },
     {
+      "序号": "6",
       "标题": "晚香高节图",
+      "标题（展示）": "晚香高节图",
       "朝代": "元",
       "作者": "柯九思",
       "馆藏": "台北故宫博物院藏",
@@ -344,7 +356,9 @@ var configExcel = {
       "图片": "=DISPIMG(\"ID_4BFB903DD4DA48A78337600B4D5AF6A9\",1)"
     },
     {
+      "序号": "7",
       "标题": "古木竹石",
+      "标题（展示）": "古木竹石",
       "朝代": "元",
       "作者": "顾安",
       "馆藏": "台北故宫博物院藏",
@@ -355,7 +369,9 @@ var configExcel = {
       "图片": "=DISPIMG(\"ID_926C0AC0F38A4C06914F19BC3216A622\",1)"
     },
     {
+      "序号": "8",
       "标题": "竹枝图",
+      "标题（展示）": "竹枝图",
       "朝代": "元",
       "作者": "倪瓒",
       "馆藏": "故宫博物院藏",
@@ -366,7 +382,9 @@ var configExcel = {
       "图片": "=DISPIMG(\"ID_9C7FD90779374ECF94DB02A15BDDBE7D\",1)"
     },
     {
+      "序号": "9",
       "标题": "万竹秋深图\n（局部）",
+      "标题（展示）": "万竹秋深图\n（局部）",
       "朝代": "明",
       "作者": "王绂",
       "馆藏": "弗利尔美术馆藏",
@@ -377,7 +395,9 @@ var configExcel = {
       "图片": "=DISPIMG(\"ID_1BB9888A23EB4C34816F16208830871E\",1)"
     },
     {
+      "序号": "10",
       "标题": "墨竹",
+      "标题（展示）": "墨竹",
       "朝代": "明",
       "作者": "夏昶（音chǎng）",
       "馆藏": "故宫博物院藏",
@@ -388,7 +408,9 @@ var configExcel = {
       "图片": "=DISPIMG(\"ID_8E8F1A57A2F946169D6FE3AD124EAF8C\",1)"
     },
     {
+      "序号": "11",
       "标题": "墨竹图（二）",
+      "标题（展示）": "墨竹图",
       "朝代": "明",
       "作者": "唐寅（音yín)",
       "馆藏": "大都会艺术博物馆藏",
@@ -399,7 +421,9 @@ var configExcel = {
       "图片": "=DISPIMG(\"ID_BF354BF7312D4605953824D69A480F5D\",1)"
     },
     {
+      "序号": "12",
       "标题": "竹石菊花图",
+      "标题（展示）": "竹石菊花图",
       "朝代": "明",
       "作者": "陈淳",
       "馆藏": "上海博物馆藏",
@@ -410,7 +434,9 @@ var configExcel = {
       "图片": "=DISPIMG(\"ID_D30EE4F73BAA45188D86706A598B1C5B\",1)"
     },
     {
+      "序号": "13",
       "标题": "十二墨花图\n（墨竹部分）",
+      "标题（展示）": "十二墨花图\n（墨竹部分）",
       "朝代": "明",
       "作者": "徐渭",
       "馆藏": "佛利尔美术馆藏",
@@ -421,7 +447,9 @@ var configExcel = {
       "图片": "=DISPIMG(\"ID_D9AB1A8A0937417989394AD45A831607\",1)"
     },
     {
+      "序号": "14",
       "标题": "朱竹图",
+      "标题（展示）": "朱竹图",
       "朝代": "明",
       "作者": "倪元璐",
       "馆藏": "台北故宫博物院藏",
@@ -431,7 +459,9 @@ var configExcel = {
       "图片": "=DISPIMG(\"ID_5A164E60DBEF4E60B368AAE17E5C4FCA\",1)"
     },
     {
+      "序号": "15",
       "标题": "花果图\n（墨竹部分）",
+      "标题（展示）": "花果图\n（墨竹部分）",
       "朝代": "清",
       "作者": "朱耷",
       "馆藏": "故宫博物院藏",
@@ -442,7 +472,9 @@ var configExcel = {
       "图片": "=DISPIMG(\"ID_AE93B95C255A4DA285134CDD018F5D3F\",1)"
     },
     {
+      "序号": "16",
       "标题": "灵谷探梅图",
+      "标题（展示）": "灵谷探梅图",
       "朝代": "清",
       "作者": "石涛",
       "馆藏": "南京博物院藏",
@@ -453,7 +485,9 @@ var configExcel = {
       "图片": "=DISPIMG(\"ID_F895196C87AC46C49A5B45599E748529\",1)"
     },
     {
+      "序号": "17",
       "标题": "托根乱岩图",
+      "标题（展示）": "托根乱岩图",
       "朝代": "清",
       "作者": "郑燮（音xiè）",
       "馆藏": "南京博物院藏",
@@ -464,7 +498,9 @@ var configExcel = {
       "图片": "=DISPIMG(\"ID_EF0A8786FD9E49A186248F61D5D257BE\",1)"
     },
     {
+      "序号": "18",
       "标题": "湘潭秋意图",
+      "标题（展示）": "湘潭秋意图",
       "朝代": "清",
       "作者": "罗聘",
       "馆藏": "上海博物馆藏",
@@ -475,7 +511,9 @@ var configExcel = {
       "图片": "=DISPIMG(\"ID_F6CE767BFAEC4EAD98082206B615C749\",1)"
     },
     {
+      "序号": "19",
       "标题": "墨竹图屏",
+      "标题（展示）": "墨竹图屏",
       "朝代": "清",
       "作者": "蒲华",
       "馆藏": "台北故宫博物院藏",

src/views/PaintingDetail.vue

@@ -51,11 +51,15 @@
         {{ props.location }}
       </p>
 
-      <h2>作品简介：</h2>
+      <h2 v-if="paintingDesc">
+        作品简介：
+      </h2>
       <div class="normal-text">
         {{ paintingDesc }}
       </div>
-      <h2>作者简介：</h2>
+      <h2 v-if="authorDesc">
+        作者简介：
+      </h2>
       <div class="normal-text">
         {{ authorDesc }}
       </div>
@@ -116,11 +120,11 @@ const props = defineProps({
   },
   paintingDesc: {
     type: String,
-    required: true,
+    default: '',
   },
   authorDesc: {
     type: String,
-    required: true,
+    default: '',
   },
   canClose: {
     type: Boolean,

src/views/PaintingDetailList.vue

@@ -3,7 +3,10 @@
     <div class="bg-left" />
     <Swiper
       class="painting-list"
+      :initial-slide="Number(route.query.idx)"
       :slides-per-view="1"
+      @swiper="onSwiper"
+      @slideChange="onSlideChange"
     >
       <SwiperSlide
         v-for="item in paintingList"
@@ -13,7 +16,7 @@
         <PaintingDetail
           class="painting-item"
           :thumb="`${$env.BASE_URL}configMultiMedia/paintings-small/${item['标题']}.jpg`"
-          :title="item['标题']"
+          :title="item['标题（展示）']"
           :author="item['作者']"
           :age="item['朝代']"
           :subtitle="item['装裱\/材质\/笔类型']"
@@ -54,6 +57,15 @@ const {
 
 const paintingList = configExcel['画作']
 
+/**
+ * swiper
+ */
+let swiper = null
+const onSwiper = (swiperP) => {
+  swiper = swiperP
+}
+const onSlideChange = (e) => {
+}
 </script>
 
 <style lang="less" scoped>

src/views/PaintingList.vue

@@ -62,6 +62,12 @@
             v-for="item in paintingGroup"
             :key="item['标题']"
             class="painting-item"
+            @click="router.push({
+              name: 'PaintingDetailList',
+              query: {
+                idx: Number(item['序号']) - 1,
+              }
+            })"
           >
             <div class="top-wrap">
               <div
@@ -79,7 +85,7 @@
                 {{ item['作者'] }}
               </div>
               <div class="title">
-                {{ item['标题'].split('\n').join('') }}
+                {{ item['标题（展示）'].split('\n').join('') }}
               </div>
               <div class="type">
                 {{ item['装裱\/材质\/笔类型'] }}

src/views/PoemList.vue

@@ -45,7 +45,7 @@
       >
         <div class="inner-wrap">
           <div class="title-wrap">
-            <h1>《{{ item['标题'] }}》</h1>
+            <h1>《{{ item['标题（展示）'] }}》</h1>
             <div class="sub-title">
               <span class="author">{{ item['作者'] }}</span>
               <span class="age">{{ item['朝代'] }}</span>