Bläddra i källkod

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

aamin 1 år sedan
förälder
incheckning
85cbb3c7f7
4 ändrade filer med 28 tillägg och 7 borttagningar
  1. 2 2
      src/views/HomeView.vue
  2. 23 1
      src/views/MoreContent.vue
  3. 1 2
      src/views/PaintingList.vue
  4. 2 2
      src/views/PoemList.vue

+ 2 - 2
src/views/HomeView.vue

@@ -449,8 +449,8 @@ const isShowHotspotDetail3 = ref(false)
     top: 0;
     width: 100%;
     height: 100%;
-    background: rgba(70, 82, 73, 0.67);
-    backdrop-filter: blur(calc(5 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef')));
+    background: rgba(60, 89, 71, 0.65);
+    backdrop-filter: blur(calc(22 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef')));
   }
   >.startup{
     z-index: 10;

+ 23 - 1
src/views/MoreContent.vue

@@ -1,11 +1,12 @@
 <template>
   <div class="more-content">
+    <!-- <button>双勾设色</button> -->
     <button
       @click="router.push({
         name: 'PoemList'
       })"
     >
-      诗词
+      人文
     </button>
     <button
       @click="router.push({
@@ -14,6 +15,27 @@
     >
       画作
     </button>
+    <button
+      @click="router.push({
+        name: 'BambooBook',
+      })"
+    >
+      竹谱
+    </button>
+    <button
+      @click="router.push({
+        name: 'BambooHot',
+      })"
+    >
+      竹子热点
+    </button>
+    <button
+      @click="router.push({
+        name: 'Game',
+      })"
+    >
+      “《无尽藏》线上展”与“《修篁树石图》画作创作”入口页
+    </button>
   </div>
 </template>
 

+ 1 - 2
src/views/PaintingList.vue

@@ -210,7 +210,6 @@ function getPaintingSizeStringForShow({ width, height }) {
   return `${width}\u00D7${height} 厘米`
 }
 
-
 const paintingWidthWhenDesign = 240
 const paintingMarginWhenDesin = 75
 const specialDescWidthWhenDesin = 444
@@ -255,7 +254,7 @@ watch(menuElScrollLeft, (v) => {
   top: 0;
   width: 100%;
   height: 100%;
-  background-color: #798F69;
+  background-color: rgba(121, 143, 108, 1);
   >ul{
     position: absolute;
     left: 0;

+ 2 - 2
src/views/PoemList.vue

@@ -372,9 +372,9 @@ function onClickMenuItem(menuItemName) {
     top: 0;
     width: 100%;
     height: 100%;
-    background: rgba(102,123,82,0.6);
+    background: hsl(96deg 22% 38% / 52%);
     border-radius: 0px 0px 0px 0px;
-    backdrop-filter: blur(calc(20 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef')));
+    backdrop-filter: blur(calc(12 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef')));
     z-index: 15;
     >ul{
       position: absolute;