Browse Source

Merge branch 'master' of http://git.ycjcjy.com/H5/huaqiaocheng-h5

李志伟 3 years ago
parent
commit
ccabc61a31
2 changed files with 16 additions and 9 deletions
  1. 9
    3
      src/views/apartment.vue
  2. 7
    6
      src/views/office.vue

+ 9
- 3
src/views/apartment.vue View File

7
       <yz-modal :visible="visible[index]" class="apartment-modal">
7
       <yz-modal :visible="visible[index]" class="apartment-modal">
8
         <pure-image :bg-image="item.image"></pure-image>
8
         <pure-image :bg-image="item.image"></pure-image>
9
         <div class="back-sign" @click="cancelShow(index)">
9
         <div class="back-sign" @click="cancelShow(index)">
10
-          <img :src="item.backSign" alt="">
10
+          <img :src="item.backSign" alt />
11
         </div>
11
         </div>
12
       </yz-modal>
12
       </yz-modal>
13
     </div>
13
     </div>
14
     <yz-modal :visible="visible[5]" class="apartment-modal">
14
     <yz-modal :visible="visible[5]" class="apartment-modal">
15
       <swiper-image :list="houseList"></swiper-image>
15
       <swiper-image :list="houseList"></swiper-image>
16
       <div class="back-sign" @click="cancelShow(5)">
16
       <div class="back-sign" @click="cancelShow(5)">
17
-        <img :src="backSignImg" alt="">
17
+        <img :src="backSignImg" alt />
18
       </div>
18
       </div>
19
     </yz-modal>
19
     </yz-modal>
20
+    <div class="back-sign index-back" @click="handleGotoIndex(index)">
21
+      <img :src="backSignImg" alt />
22
+    </div>
20
   </div>
23
   </div>
21
 </template>
24
 </template>
22
 
25
 
23
 <script>
26
 <script>
24
-
25
 const backSignImg = require('@/assets/images/apartment/backSign.png')
27
 const backSignImg = require('@/assets/images/apartment/backSign.png')
26
 const backSignImg2 = require('@/assets/images/apartment/backSign-2.png')
28
 const backSignImg2 = require('@/assets/images/apartment/backSign-2.png')
27
 
29
 
107
     },
109
     },
108
     cancelShow(inx) {
110
     cancelShow(inx) {
109
       this.$set(this.visible, inx, false)
111
       this.$set(this.visible, inx, false)
112
+    },
113
+    handleGotoIndex(inx) {
114
+      this.$router.push({ path: '/' })
110
     }
115
     }
111
   }
116
   }
112
 }
117
 }
116
 .apartment {
121
 .apartment {
117
   height: 100%;
122
   height: 100%;
118
   position: relative;
123
   position: relative;
124
+  overflow: hidden;
119
 
125
 
120
   .apartment-modal {
126
   .apartment-modal {
121
     // position: absolute;
127
     // position: absolute;

+ 7
- 6
src/views/office.vue View File

11
         </div>
11
         </div>
12
       </yz-modal>
12
       </yz-modal>
13
     </div>
13
     </div>
14
-    <!-- <modal v-if="visible[5]" class="office-modal">
15
-      <swiper-image :list="houseList"></swiper-image>
16
-      <div class="back-sign" @click="cancelShow(5)">
17
-        <img :src="require('@/assets/office/1-2.png')" alt />
18
-      </div>
19
-    </modal>-->
14
+    <div class="back-sign index-back" @click="handleGotoIndex(index)">
15
+      <img :src="backSignImg" alt />
16
+    </div>
20
   </div>
17
   </div>
21
 </template>
18
 </template>
22
 
19
 
106
     },
103
     },
107
     cancelShow(inx) {
104
     cancelShow(inx) {
108
       this.$set(this.visible, inx, false)
105
       this.$set(this.visible, inx, false)
106
+    },
107
+    handleGotoIndex(inx) {
108
+      this.$router.push({ path: '/' })
109
     }
109
     }
110
   }
110
   }
111
 }
111
 }
115
 .office-index {
115
 .office-index {
116
   height: 100%;
116
   height: 100%;
117
   position: relative;
117
   position: relative;
118
+  overflow: hidden;
118
 
119
 
119
   .office-modal {
120
   .office-modal {
120
     position: absolute;
121
     position: absolute;