Browse Source

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

shaogen1995 1 year ago
parent
commit
8ff61acdf5
3 changed files with 1687 additions and 977 deletions
  1. 2 1
      src/views/BambooHotView3/index.vue
  2. 2 1
      src/views/HomeView(横向滑动).vue
  3. 1683 975
      src/views/HomeView.vue

+ 2 - 1
src/views/BambooHotView3/index.vue

@@ -249,6 +249,7 @@ const hotVisible = ref(false)
 const checkedHotId = ref(0)
 
 const handleHot = (id) => {
+  titShow.value = false
   checkedHotId.value = id
   hotVisible.value = true
 
@@ -470,7 +471,7 @@ img {
     white-space: pre-wrap;
     line-height: calc(40 /v-bind('windowSizeWhenDesignForRef')* v-bind('windowSizeInCssForRef'));
     font-size: calc(20 /v-bind('windowSizeWhenDesignForRef')* v-bind('windowSizeInCssForRef'));
-    height: calc(400 /v-bind('windowSizeWhenDesignForRef')* v-bind('windowSizeInCssForRef'));
+    height: calc(430 /v-bind('windowSizeWhenDesignForRef')* v-bind('windowSizeInCssForRef'));
   }
 }
 

+ 2 - 1
src/views/HomeView(横向滑动).vue

@@ -569,6 +569,7 @@
       class="operation-tip"
       text="向左划动"
       direction="h"
+      :is-show="isShowOperationTip"
     />
 
     <div
@@ -1649,7 +1650,7 @@ function onClickGoNextPage() {
     top: 0;
     right: 0;
     z-index: 3;
-    width: calc(224 / var(--9ea40744-windowSizeWhenDesignForRef)* var(--9ea40744-windowSizeInCssForRef));
+    width: calc(224 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
     background: linear-gradient(78deg, rgba(0, 0, 0, 0) 38%, #00000045 75%);
     height: 100%;
 

File diff suppressed because it is too large
+ 1683 - 975
src/views/HomeView.vue