Procházet zdrojové kódy

Merge branch 'develop' of git.sagacloud.cn:web/wanda-bm-guide into develop

guoxiaohuan před 4 roky
rodič
revize
f130b3cbed

+ 9 - 1
src/components/Rotation/src/rotation.vue

@@ -16,11 +16,13 @@
                 <img :src='item.url' alt />
             </el-carousel-item>
         </el-carousel>-->
+        <!-- 不显示指示器 -->
+        <!-- :indicator-position='rotationImg.length == 1 ? "none":""' -->
         <el-carousel
             v-else
             style='height:100%;width:100%'
             :interval='5000'
-            :indicator-position='rotationImg.length == 1 ? "none":""'
+            indicator-position='none'
             :arrow='rotationImg.length == 1 ? "never":"always"'
             @change='changePic'
         >
@@ -64,6 +66,12 @@ export default {
             }
         }
     },
+    // 解决两张图片时,轮播顺序反向
+    created() {
+        if (this.rotationImg && this.rotationImg.length === 2) {
+            this.rotationImg = [...this.rotationImg, ...this.rotationImg]
+        }
+    },
     mounted() {
         if (this.type == 2) {
             this.changePic(1)

+ 1 - 1
src/views/room/room4.vue

@@ -49,7 +49,7 @@
                         <div
                             v-if='row.glsmsImage'
                             style='cursor:pointer;color: #0091ff;'
-                            @click='clickPic(row.glsmsImage)'
+                            @click.stop='clickPic(row.glsmsImage)'
                         >{{row.glsmsImage.length+'张'}}</div>
                         <div v-else>{{'--'}}</div>
                     </template>

+ 1 - 1
src/views/room/room5.vue

@@ -25,7 +25,7 @@
                         <div
                             v-if='row.glsmsImage'
                             style='cursor:pointer;color: #0091ff;'
-                            @click='clickPic(row.glsmsImage)'
+                            @click.stop='clickPic(row.glsmsImage)'
                         >{{row.glsmsImage.length+'张'}}</div>
                         <div v-else>{{'--'}}</div>
                     </template>