Merge branch 'dev-sws' into dev-yxl

components/diy/diy.vue

@@ -256,7 +256,7 @@
             init() {
                 // tabs选项卡数据过滤
                 this.setData({
-                    hack_reset: true,
+                    hack_reset: false,
                     header_data: this.propValue.header,
                     footer_data: this.propValue.footer,
                     diy_data: this.propValue.diy_data,
@@ -266,6 +266,11 @@
                     temp_sticky_top: this.sticky_top,
                     temp_header_top: this.header_top,
                 });
+                this.$nextTick(() => {
+                    this.setData({
+                        hack_reset: true,
+                    });
+                });
                 uni.setStorageSync(this.cache_key + this.tabs_home_id, this.propValue.diy_data);
             },
             // 顶部导航沉浸模式回调

components/diy/video.vue

@@ -41,6 +41,8 @@
             init() {
                 const new_content = this.propValue.content || {};
                 const new_style = this.propValue.style || {};
+                // 视频比例
+                this.get_video_height(new_content.video_ratio);
                 this.setData({
                     video_img: new_content.video_img.length > 0 ? new_content.video_img[0].url : '',
                     video: new_content.video.length > 0 ? new_content.video[0].url : '',