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

src/views/HomeView.vue

@@ -386,10 +386,17 @@
           {{ item }}
         </p>
       </div>
-      <div class="bottom-box" />
-      <div class="system-btns">
-        <BtnBack @click="isShowPaintingDesc = false" />
-      </div>
+      <!-- <div class="bottom-box" /> -->
+      <img
+        class="back-btn"
+        src="@/assets/images/icon_back_white.png"
+        alt=""
+        @click="isShowPaintingDesc = false"
+      >
+      <!-- <BtnBack
+        class="system-btns"
+        @click="isShowPaintingDesc = false"
+      /> -->
     </div>
 
     <!-- 作者简介 -->
@@ -418,10 +425,20 @@
         </div>
       </div>
       <!-- 底部遮罩 -->
-      <div class="bottom-box" />
-      <div class="system-btns">
-        <BtnBack @click="isShowAuthorDesc = false" />
-      </div>
+      <!-- <div class="bottom-box" /> -->
+      <img
+        style="position: absolute;
+        bottom: 30px;
+        left: 20px;
+        width: 25px;"
+        src="@/assets/images/icon_back_white.png"
+        alt=""
+        @click="isShowAuthorDesc = false"
+      >
+      <!-- <BtnBack
+        class="system-btns"
+        @click="isShowAuthorDesc = false"
+      /> -->
     </div>
 
     <!-- 竹杆提示 -->
@@ -488,7 +505,7 @@
     <div
       class="fixed-desc detail-desc-stem"
       :style="{
-        top: `${(paintingTop + 715) / windowSizeWhenDesignForRef * windowSizeInCssForRef.substring(0, windowSizeInCssForRef.length - 2)}px`,
+        top: `${(paintingTop + 725) / windowSizeWhenDesignForRef * windowSizeInCssForRef.substring(0, windowSizeInCssForRef.length - 2)}px`,
         opacity: stemGreenOpacity,
 
       }"
@@ -497,7 +514,7 @@
     <div
       class="fixed-desc detail-desc-leaf"
       :style="{
-        top: `${(paintingTop + 715) / windowSizeWhenDesignForRef * windowSizeInCssForRef.substring(0, windowSizeInCssForRef.length - 2)}px`,
+        top: `${(paintingTop + 725) / windowSizeWhenDesignForRef * windowSizeInCssForRef.substring(0, windowSizeInCssForRef.length - 2)}px`,
         opacity: leafGreenOpacity,
         zIndex: 4,
       }"
@@ -537,7 +554,6 @@
       @go-to-slide="goToSlide"
     />
     <OperationTip
-      v-if="isStartupOver"
       class="operation-tip"
       text="向左划动"
       direction="h"
@@ -1718,6 +1734,13 @@ function onClickGoNextPage() {
     padding-top: 15%;
     padding-left: 10%;
     padding-right: 10%;
+
+    >.back-btn{
+      width: 25px;
+      left: 20px;
+      bottom: 30px;
+      position: absolute;
+    }
     >.painting-img{
       width: 70%;
       margin-bottom: 20px;
@@ -1725,7 +1748,6 @@ function onClickGoNextPage() {
 
     >.text-box {
         width: 100%;
-        max-height: 30vh;
         overflow: auto;
 
         >p {
@@ -1747,17 +1769,14 @@ function onClickGoNextPage() {
       left: 0;
     }
 
-
-
     >.system-btns {
-      width: 100%;
+      width: 30px;
+      height: 30px;
       padding: 0 calc(20 / v-bind(windowSizeWhenDesignForRef) * v-bind(windowSizeInCssForRef));
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
       position: fixed;
-      bottom: calc(20 /v-bind(windowSizeWhenDesignForRef) * v-bind(windowSizeInCssForRef));
-      z-index: 10;
+      left: calc(30 /v-bind(windowSizeWhenDesignForRef) * v-bind(windowSizeInCssForRef));
+      bottom: calc(50 /v-bind(windowSizeWhenDesignForRef) * v-bind(windowSizeInCssForRef));
+      z-index: 2;
     }
   }
 
@@ -1822,17 +1841,20 @@ function onClickGoNextPage() {
       left: 0;
     }
 
-
+    >.back-btn{
+      width: 25px;
+      left: 20px;
+      bottom: 30px;
+      position: absolute;
+    }
 
     >.system-btns {
-      width: 100%;
+      // width: 100%;
       padding: 0 calc(20 / v-bind(windowSizeWhenDesignForRef) * v-bind(windowSizeInCssForRef));
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
       position: fixed;
-      bottom: calc(20 /v-bind(windowSizeWhenDesignForRef) * v-bind(windowSizeInCssForRef));
-      z-index: 10;
+      left: calc(30 /v-bind(windowSizeWhenDesignForRef) * v-bind(windowSizeInCssForRef));
+      bottom: calc(35 /v-bind(windowSizeWhenDesignForRef) * v-bind(windowSizeInCssForRef));
+      z-index: 34;
     }
   }
 

src/views/MoreContent.vue

@@ -180,7 +180,6 @@
           draggable="false"
         >
       </div>
-
       <div
         class="layer-1"
         :style="{
@@ -300,9 +299,7 @@
           <div
             class="game-box"
             @click="
-              () => {
-                isShowScenePage = true;
-              }
+              OpenScene()
             "
           >
             线上展厅

src/views/PaintingDetail.vue

@@ -99,10 +99,16 @@
         :class="{ 'info-title-content-up': isUping }"
       >
         <h1>{{ props.title }}</h1>
-        <p class="subtitle">
+        <p
+          class="subtitle"
+          style="margin-bottom: 19px"
+        >
           {{ `${props.author} （${props.age}）` }}
         </p>
         <p class="subtitle">
+          {{ props.size.width }} x {{ props.size.height }}
+        </p>
+        <p class="subtitle">
           {{ props.subtitle }}
         </p>
         <p class="subtitle">
@@ -191,10 +197,10 @@ const props = defineProps({
     type: String,
     required: true,
   },
-  // subtitle: {
-  //   type: String,
-  //   required: true,
-  // },
+  subtitle: {
+    type: String,
+    required: true,
+  },
   age: {
     type: String,
     required: true,
@@ -485,7 +491,7 @@ function showBigPainting() {
         v-bind("windowSizeInCssForRef")
     );
     height: calc(
-      130 / v-bind("windowSizeWhenDesignForRef") *
+      150 / v-bind("windowSizeWhenDesignForRef") *
         v-bind("windowSizeInCssForRef")
     );
     overflow: auto;
@@ -502,10 +508,10 @@ function showBigPainting() {
             v-bind("windowSizeInCssForRef")
         );
         color: #ffffff;
-        margin-bottom: calc(
-          19 / v-bind("windowSizeWhenDesignForRef") *
-            v-bind("windowSizeInCssForRef")
-        );
+        // margin-bottom: calc(
+        //   19 / v-bind("windowSizeWhenDesignForRef") *
+        //     v-bind("windowSizeInCssForRef")
+        // );
         white-space: pre;
       }
 

src/views/ShuangGouSheSeDetail.vue

@@ -48,6 +48,11 @@ const text = [
     '彩色的，以墨色为主绘制的作品。', ]
 ]
 
+const text2 = [
+  '双钩，中国画技法名。用线条钩描物象的轮廓，通称“勾勒”，因基本上是用左右或上下两笔钩描合拢，故亦称“双钩”。大部用于工笔花鸟画。又旧时摹搨法书。沿字的笔迹两边用细劲的墨线钩出轮廓，也叫“双钩”；双钩后填墨的称为“双钩廓填”。',
+  '设色，国画中晕染彩色的意思，画面中只要出现彩色就可以说是设色作品。与设色相反的是“水墨”，指画面中不出现彩色，或者极少出现彩色的，以墨色为主绘制的作品。'
+]
+
 const curIndex = ref(0)
 
 const lastX = ref(0)
@@ -110,7 +115,7 @@ const curPercentage = computed(() => {
       src="@/assets/images/shuanggou-text.png"
       alt=""
     > -->
-    <div
+    <!-- <div
       class="text"
       :style="{ top: x > 0.5 ? 'auto' : '', bottom: x > 0.5 ? '15vh' : 'auto' }"
     >
@@ -120,16 +125,12 @@ const curPercentage = computed(() => {
       >
         {{ item }}
       </div>
-      <!-- <img
-        v-show="curIndex == 0"
-        src="@/assets/images/shuanggou-text.png"
-        alt=""
-      > -->
-      <!-- <img
-        v-show="curIndex == 1"
-        src="@/assets/images/shese-text.png"
-        alt=""
-      > -->
+    </div> -->
+    <div
+      class="text"
+      :style="{ top: x > 0.5 ? 'auto' : '', bottom: x > 0.5 ? '15vh' : 'auto' }"
+    >
+      {{ text2[curIndex] }}
     </div>
 
     <ProgressBar
@@ -227,12 +228,11 @@ const curPercentage = computed(() => {
     font-size: calc(18 /v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
     line-height: calc(26 /v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
     font-family: 'KaiTi';
+    writing-mode: vertical-rl;
+    letter-spacing: 2px;
+    text-align: justify;
+    height: 40vh;
 
-    >div {
-      writing-mode: vertical-rl;
-      letter-spacing: 2px;
-      text-align: justify;
-    }
   }
 
   .right-bottom {