Sfoglia il codice sorgente

fix:修改反馈bug

aamin 1 anno fa
parent
commit
5fee63609b

BIN
zhengquan/public/staticData/logo/北京中金公益基金会 1.png


BIN
zhengquan/public/staticData/logo/北京中金公益基金会.png


+ 15 - 15
zhengquan/src/views/Home/components/unitList.vue

@@ -217,9 +217,7 @@ const isFlatLandscape = computed(() => {
           @mouseover="hoverIndex = item">
           <div class="list-item-con" v-if="startItem + item - 1 < store.dataAll.welfareList.length">
             <!-- 默认图片--无logo情况下显示 -->
-            <div
-              v-if="store.dataAll.welfareList[startItem + item - 1].title == '北京中金公益基金会'"
-              class="defaultLogo"
+            <div v-if="false" class="defaultLogo"
               :style="{ backgroundImage: `url(${baseResourceUrl}/logo/logo-default${hoverIndex == item ? 'Ac' : ''}.png)`, backgroundSize: 'cover' }">
               {{
                 store.dataAll.welfareList[startItem + item - 1].title }}</div>
@@ -229,7 +227,7 @@ const isFlatLandscape = computed(() => {
           </div>
           <div v-if="startItem + item - 1 < store.dataAll.welfareList.length"
             :class="store.dataAll.welfareList[startItem + item - 1].title.length > 8 ? 'item-name' : ''"
-            :style="{ whiteSpace: 'nowrap' }"> {{ store.dataAll.welfareList[startItem + item -
+            > {{ store.dataAll.welfareList[startItem + item -
               1] ? store.dataAll.welfareList[startItem + item - 1].title : '' }}</div>
         </div>
       </div>
@@ -246,7 +244,7 @@ const isFlatLandscape = computed(() => {
         <div class="content-item" v-for="(item, index) in store.dataAll.welfareList" :key="index"
           @click="curUnit = item, isShowInfoBox = true">
           <!-- 默认图片--无logo情况下显示 -->
-          <div v-if="item.title == '北京中金公益基金会'" class="defaultLogo"
+          <div v-if="false" class="defaultLogo"
             :style="{ backgroundImage: `url(${baseResourceUrl}/logo/logo-default${hoverIndex == item ? 'Ac' : ''}.png)`, backgroundSize: 'cover' }">
             {{
               item.title }}</div>
@@ -255,8 +253,8 @@ const isFlatLandscape = computed(() => {
         </div>
       </div>
     </div>
-    <img v-show="browser.mobile && !isFlatLandscape" class="icon-down" src="@/assets/images/home/icon-down.png" alt=""
-      @click="close">
+    <img v-show="browser.mobile && !isFlatLandscape" class="icon-down" :style="{ width: '15vw' }"
+      src="@/assets/images/home/icon-down.png" alt="" @click="close">
     <img v-show="!browser.mobile || isFlatLandscape" class="line-down" src="@/assets/images/home/line-down.png" alt=""
       @click="close">
   </div>
@@ -265,7 +263,7 @@ const isFlatLandscape = computed(() => {
 <style lang='less' scoped>
 .scene-list-box {
   width: 100%;
-  height: 80%;
+  // height: 80%;
   position: absolute;
   bottom: 0;
   display: flex;
@@ -532,10 +530,10 @@ const isFlatLandscape = computed(() => {
 
         .list-item-con {
           width: 100%;
-          min-height: 85%;
-          height: 90%;
-          max-height: 90%;
-          background: white;
+          // min-height: 85%;
+          // height: 85%;
+          // max-height: 90%;
+          // background: white;
           display: flex;
           justify-content: center;
           align-items: center;
@@ -568,8 +566,8 @@ const isFlatLandscape = computed(() => {
 
         .item-name {
           width: 100%;
-          animation: identifier1 8s linear infinite;
-          white-space: nowrap;
+          // animation: identifier1 8s linear infinite;
+          // white-space: nowrap;
 
         }
 
@@ -832,6 +830,7 @@ const isFlatLandscape = computed(() => {
       overflow: inherit;
 
       .icon-down {
+
         position: absolute;
         top: 0;
         transform: translateY(-100%);
@@ -902,4 +901,5 @@ const isFlatLandscape = computed(() => {
     }
 
   }
-}</style>
+}
+</style>

+ 4 - 0
zhengquan/src/views/Scene/ScenePage.vue

@@ -72,6 +72,8 @@ const sortHotspots = (hotspots: any) => {
   // 将数据对象转换成数组
   let newHotspots = Object.values(hotspots)
   let newShowHotspots = [] as any
+
+  console.log('所有数据对象',newHotspots)
   newHotspots.forEach((item: any) => {
     const nameArr = item.title.split('&')
     if (nameArr[1] == 'show') {
@@ -554,6 +556,8 @@ onMounted(() => {
       openGame(parseInt(point) - 1)
     } else if (v === 'zhaopianqiang') {
       router.replace('wall')
+    } else if(v === 'jiangpinduihuan'){
+      window.openPricePageFu()
     } else {
       const unit = store.hotspots.find((item: any) => {
         return item.code == v

+ 16 - 14
zhengquan/src/views/UnitWall/components/unitList.vue

@@ -189,7 +189,7 @@ watch(curProject, (newValue: string) => {
           <div class="list-item-con" v-if="startItem + item - 1 < store.dataAll.welfareList.length">
             <!-- 默认图片--无logo情况下显示 -->
             <div
-              v-if=" store.dataAll.welfareList[startItem + item - 1].title == '北京中金公益基金会'"
+              v-if=" false"
               class="defaultLogo"
               :style="{ backgroundImage: `url(${baseResourceUrl}/logo/logo-default${hoverIndex == item ? 'Ac' : ''}.png)`, backgroundSize: 'cover' }">
               {{
@@ -200,7 +200,7 @@ watch(curProject, (newValue: string) => {
           </div>
           <div v-if="startItem + item - 1 < store.dataAll.welfareList.length"
             :class="store.dataAll.welfareList[startItem + item - 1].title.length > 8 ? 'item-name' : ''"
-            :style="{ whiteSpace: 'nowrap' }"> {{ store.dataAll.welfareList[startItem + item -
+            > {{ store.dataAll.welfareList[startItem + item -
               1] ? store.dataAll.welfareList[startItem + item - 1].title : '' }}</div>
         </div>
       </div>
@@ -217,7 +217,7 @@ watch(curProject, (newValue: string) => {
         <div class="content-item" v-for="(item, index) in store.dataAll.welfareList" :key="index"
           @click="curUnit = item, isShowInfoBox = true">
           <!-- 默认图片--无logo情况下显示 -->
-          <div v-if=" item.title == '北京中金公益基金会'" class="defaultLogo"
+          <div v-if=" false" class="defaultLogo"
             :style="{ backgroundImage: `url(${baseResourceUrl}/logo/logo-default${hoverIndex == item ? 'Ac' : ''}.png)`, backgroundSize: 'cover' }">
             {{
               item.title }}</div>
@@ -512,10 +512,12 @@ watch(curProject, (newValue: string) => {
     .arrows-left {
       cursor: pointer;
       margin-right: 1.5%;
+      margin-left: 1.5%;
+
     }
 
     .arrows-right {
-      margin-left: 1.5%;
+      margin-left: -1.5%;
     }
 
     .content-list {
@@ -535,18 +537,18 @@ watch(curProject, (newValue: string) => {
 
         .list-item-con {
           width: 100%;
-          min-height: 85%;
-          height: 90%;
-          max-height: 90%;
-          background: white;
-          display: flex;
-          justify-content: center;
-          align-items: center;
+          // min-height: 85%;
+          // height: 90%;
+          // max-height: 90%;
+          // background: white;
+          // display: flex;
+          // justify-content: center;
+          // align-items: center;
 
 
           // object-fit: cover;
           img {
-            width: 100%;
+            width: 85%;
             // height: 0%;
             object-fit: cover;
           }
@@ -571,8 +573,8 @@ watch(curProject, (newValue: string) => {
 
         .item-name {
           width: 100%;
-          animation: identifier1 8s linear infinite;
-          white-space: nowrap;
+          // animation: identifier1 8s linear infinite;
+          // white-space: nowrap;
 
         }