|
@@ -186,7 +186,8 @@
|
|
|
<div
|
|
|
class="hotspot-wrap"
|
|
|
:style="{
|
|
|
- top: `${paintingTop / windowSizeWhenDesignForRef * windowSizeInCssForRef.substring(0, windowSizeInCssForRef.length - 2)}px`
|
|
|
+ top: `${paintingTop / windowSizeWhenDesignForRef * windowSizeInCssForRef.substring(0, windowSizeInCssForRef.length - 2)}px`,
|
|
|
+ width: summaryOpacity > 0 ? `calc(215 / 308 * 100%)`: paintingWidth == 485 ? `110%`: `${paintingWidth / windowSizeWhenDesignForRef * windowSizeInCssForRef.substring(0, windowSizeInCssForRef.length - 2)}px`,
|
|
|
}"
|
|
|
>
|
|
|
<HotspotForHomepage
|
|
@@ -271,27 +272,24 @@
|
|
|
top: `${(paintingTop + 750) / windowSizeWhenDesignForRef * windowSizeInCssForRef.substring(0, windowSizeInCssForRef.length - 2)}px`,
|
|
|
opacity: stemGreenOpacity,
|
|
|
}"
|
|
|
- >
|
|
|
- {{ detailDescStem }}
|
|
|
- </div>
|
|
|
+ v-html="detailDescStem"
|
|
|
+ />
|
|
|
<div
|
|
|
class="fixed-desc detail-desc-leaf"
|
|
|
:style="{
|
|
|
top: `${(paintingTop + 750) / windowSizeWhenDesignForRef * windowSizeInCssForRef.substring(0, windowSizeInCssForRef.length - 2)}px`,
|
|
|
opacity: leafGreenOpacity,
|
|
|
}"
|
|
|
- >
|
|
|
- {{ detailDescLeaf }}
|
|
|
- </div>
|
|
|
+ v-html="leafOpacity1 > 0 ? detailDescLeaf1 :leafOpacity2> 0? detailDescLeaf2:detailDescLeaf3"
|
|
|
+ />
|
|
|
<div
|
|
|
class="fixed-desc detail-desc-stone"
|
|
|
:style="{
|
|
|
top: `${(paintingTop + 750) / windowSizeWhenDesignForRef * windowSizeInCssForRef.substring(0, windowSizeInCssForRef.length - 2)}px`,
|
|
|
opacity: stoneGreenOpacity,
|
|
|
}"
|
|
|
- >
|
|
|
- {{ detailDescStone }}
|
|
|
- </div>
|
|
|
+ v-html="detailDescStone"
|
|
|
+ />
|
|
|
<div
|
|
|
class="fixed-desc summary-desc"
|
|
|
:style="{
|
|
@@ -449,7 +447,9 @@ const {
|
|
|
const homepagePaintingDesc = configText.homepagePaintingDesc
|
|
|
const homepageAuthorDesc = configText.homepageAuthorDesc
|
|
|
const detailDescStem = configText.homepagePaintingDetailDescStem
|
|
|
-const detailDescLeaf = configText.homepagePaintingDetailDescLeaf
|
|
|
+const detailDescLeaf1 = configText.homepagePaintingDetailDescLeaf1
|
|
|
+const detailDescLeaf2 = configText.homepagePaintingDetailDescLeaf2
|
|
|
+const detailDescLeaf3 = configText.homepagePaintingDetailDescLeaf3
|
|
|
const detailDescStone = configText.homepagePaintingDetailDescStone
|
|
|
const summaryDesc = configText.homepagePaintingSummary
|
|
|
|
|
@@ -521,6 +521,7 @@ const paintingTop = computed(() => {
|
|
|
return ret
|
|
|
})
|
|
|
|
|
|
+
|
|
|
const paintingWidthInitial = 308
|
|
|
const paintingWidthMovedUp = 250
|
|
|
const paintingWidthMovedDown = 485
|
|
@@ -576,7 +577,6 @@ const longDescOpacity = computed(() => {
|
|
|
return ret
|
|
|
})
|
|
|
watch(scrollerElScrollTop, (vNew, vOld) => {
|
|
|
- console.log('scrollerElScrollTop', vNew / scrollerEl.value.scrollHeight)
|
|
|
if (vNew > paintingMoveUpFinishAt) {
|
|
|
// longDesc.value.scrollTop = vNew - paintingMoveUpFinishAt
|
|
|
} else if (vNew < vOld && vNew <= paintingMoveUpFinishAt) {
|
|
@@ -942,8 +942,8 @@ const sizeOpacity = computed(() => {
|
|
|
const isShowHotspot = computed(() => {
|
|
|
let ret = null
|
|
|
|
|
|
- // console.log('scrollerElScrollTop.value', scrollerElScrollTop.value <= sizeShowAt)
|
|
|
- if (scrollerElScrollTop.value <= sizeShowAt && scrollerElScrollTop.value > 0) {
|
|
|
+ console.log('scrollerElScrollTop.value', scrollerElScrollTop.value)
|
|
|
+ if (scrollerElScrollTop.value >= summaryShowAt) {
|
|
|
ret = true
|
|
|
} else {
|
|
|
return false
|
|
@@ -1187,9 +1187,10 @@ function onClickGoNextPage() {
|
|
|
>.hotspot-wrap {
|
|
|
position: absolute;
|
|
|
left: 50%;
|
|
|
- transform: translate(-50%, 0);
|
|
|
+ top: calc(92 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef')) !important;
|
|
|
+ transform: translate(-46%, 0);
|
|
|
width: calc(264 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
|
|
|
- height: calc(434 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
|
|
|
+ height: calc(517 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
|
|
|
z-index: 7;
|
|
|
pointer-events: none;
|
|
|
|
|
@@ -1271,6 +1272,18 @@ function onClickGoNextPage() {
|
|
|
position:relative;
|
|
|
z-index:2;
|
|
|
}
|
|
|
+ >.detail-desc-stem{
|
|
|
+ display: block;
|
|
|
+ margin-top: 10%;
|
|
|
+ }
|
|
|
+ >.detail-desc-leaf{
|
|
|
+ display: block;
|
|
|
+ margin-top: 6%;
|
|
|
+ }
|
|
|
+ >.detail-desc-stone{
|
|
|
+ display: block;
|
|
|
+ margin-top: 8%;
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|