Merge branch 'master' of http://192.168.0.115:3000/renyicun/NanjingMuseumWuJinZang

public/configExcel.js

@@ -173,7 +173,7 @@ var configExcel = {
       "类型": "五律",
       "朝代": "宋",
       "作者": "苏轼",
-      "正文": `宁可食无肉   不可居无竹\n无肉令人瘦   无竹令人俗\n人瘦尚可肥   士俗不可医\n旁人笑此言   似高还似痴\n若对此君仍大嚼 世间那有扬州鹤`,
+      "正文": `宁可食无肉<span>一二</span> 不可居无竹\n无肉令人瘦<span>一二</span> 无竹令人俗\n人瘦尚可肥<span>一二</span> 士俗不可医\n旁人笑此言<span>一二</span> 似高还似痴\n若对此君仍大嚼 世间那有扬州鹤`,
       "顶部距离": '18vh'
     },
     {
@@ -205,7 +205,7 @@ var configExcel = {
       "类型": "七律",
       "朝代": "元",
       "作者": "马谦斋",
-      "正文": "贞姿不受雪霜侵 直节亭亭易见心\n渭川风雨清吟枕 花开时有凤寻\n文湖州是个知音\n春日临风醉&emsp;&emsp; 秋霄对月吟\n舞闲阶碎影筛金",
+      "正文": "贞姿不受雪霜侵 直节亭亭易见心\n渭川风雨清吟枕 花开时有凤寻\n文湖州是个知音\n春日临风醉<span>一二</span> 秋霄对月吟\n舞闲阶碎影筛金",
       "顶部距离": '18vh'
     },
     {

src/views/PoemList.js

@@ -26,6 +26,10 @@ export const arrList = [
   [
     { classTxt: 'ROW5_1', imgName: "3_06", moveNum: 60 },
     { classTxt: 'ROW5_2', imgName: "2_03", moveNum: 80 },
+
+    // { classTxt: 'ROW4_3', imgName: "4_05", moveNum: 100 },
+    // { classTxt: 'ROW3_3', imgName: "4_08", moveNum: 100 },
+
     { classTxt: 'ROW5_3', imgName: "4_06", moveNum: 100 },
     { classTxt: 'ROW5_4', imgName: "4_07", moveNum: 100 },
     { classTxt: 'ROW5_5', imgName: "2_04", moveNum: 80 },

src/views/PoemList.vue

@@ -642,7 +642,9 @@ const isMoveFu = (index, num) => {
           letter-spacing: 0.2em;
         }
       }
-
+      /deep/.inner-wrap > p > span{
+        opacity: 0;
+      }
       /deep/.title-wrap > h1 > img {
           width: calc(
             30 / v-bind("windowSizeWhenDesignForRef") *
@@ -840,7 +842,8 @@ const isMoveFu = (index, num) => {
     );
     position: absolute;
     bottom: 0;
-    z-index: 2;
+    z-index: 20;
+    pointer-events: none;
   }
 }
 </style>