Merge branch 'dev-sws' into dev-yxl

components/diy/article-list.vue

@@ -72,7 +72,7 @@
             propkey: {
                 type: String,
                 default: '',
-            }
+            },
         },
         data() {
             return {
@@ -103,7 +103,7 @@
                 article_spacing: '',
                 article_item_height: '',
 
-                article_style: {},
+                article_style: '',
                 // 轮播图定时轮播
                 interval_time: 2000,
                 // 轮播图是否滚动
@@ -122,7 +122,7 @@
             propkey(val) {
                 // 初始化
                 this.init();
-            }
+            },
         },
         created() {
             this.init();
@@ -187,7 +187,7 @@
                         interval_time: (new_style.interval_time || 2) * 1000,
                         // 是否滚动修改
                         is_roll: new_style.is_roll,
-                        article_item_height: `max-height: ${new_style.article_height * 2}rpx`,
+                        article_item_height: `height: ${new_style.article_height * 2}rpx`,
                         article_style: this.article_style + this.content_radius + multicolumn_columns_width,
                         // 轮播高度
                         carousel_height_computer: (new_style.name_size * 2 + new_style.article_height) * 2 + 'rpx',

components/diy/hot-zone.vue

@@ -3,7 +3,9 @@
     <view ref="containerRef" class="oh container" :style="style_container">
         <view ref="hotRef" class="hot pr" :style="style">
             <image :src="img" class="wh-auto dis-block" mode="widthFix" @load="on_load_img" />
-            <view v-for="(item, index) in hot_data" :key="index" class="hot_box" :style="'left: ' + item.drag_start.x * w_scale1 * w_scale2 * 2 + 'rpx;top:' + item.drag_start.y * h_scale1 * h_scale2 * 2 + 'rpx;width: ' + Math.max(item.drag_end.width * w_scale1 * w_scale2, 1) * 2 + 'rpx;height: ' + Math.max(item.drag_end.height * h_scale1 * h_scale2, 1) * 2 + 'rpx;display: flex;'" :data-value="item.link.page" @tap="url_event"></view>
+            <view v-for="(item, index) in hot_data" :key="index" class="hot_box" :style="'left: ' + item.drag_start.x * w_scale1 * w_scale2 * 2 + 'rpx;top:' + item.drag_start.y * h_scale1 * h_scale2 * 2 + 'rpx;width: ' + Math.max(item.drag_end.width * w_scale1 * w_scale2, 1) * 2 + 'rpx;height: ' + Math.max(item.drag_end.height * h_scale1 * h_scale2, 1) * 2 + 'rpx;display: flex;'" :data-value="item.link.page" @tap="url_event">
+                {{ item.drag_start.x * w_scale1 * w_scale2 * 2 }}
+            </view>
         </view>
     </view>
 </template>
@@ -20,7 +22,7 @@
             propkey: {
                 type: String,
                 default: '',
-            }
+            },
         },
         data() {
             return {
@@ -43,7 +45,7 @@
             propkey(val) {
                 // 初始化
                 this.init();
-            }
+            },
         },
         created() {
             this.init();