Merge branch 'dev-sws' into dev-yxl
commit
566e6ed7ae
|
|
@ -163,7 +163,6 @@
|
|||
style_img_container: common_img_computer(common_style, this.propIndex),
|
||||
tabs_style: new_tabs_style,
|
||||
});
|
||||
console.log(this.propValue);
|
||||
},
|
||||
tabs_click_event(index) {
|
||||
let new_data = JSON.parse(JSON.stringify(this.propValue));
|
||||
|
|
|
|||
|
|
@ -164,7 +164,6 @@
|
|||
tabs_bottom_line_theme: new_style.tabs_one_theme == '1' ? 'tabs-bottom-line-theme' : '',
|
||||
tabs_theme_1_style: new_style.tabs_one_theme == '1',
|
||||
});
|
||||
console.log(this.propValue);
|
||||
},
|
||||
// 获取选项卡主题
|
||||
get_tabs_theme(data) {
|
||||
|
|
|
|||
|
|
@ -107,7 +107,6 @@
|
|||
},
|
||||
// 视频播放
|
||||
video_play(url, popup_width, popup_height) {
|
||||
console.log(url, popup_width, popup_height);
|
||||
this.$emit('onVideoPlay', url, popup_width, popup_height);
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -100,6 +100,10 @@
|
|||
// 初始化
|
||||
this.init();
|
||||
},
|
||||
propSpacingCommonStyle(val) {
|
||||
// 初始化
|
||||
this.init();
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
// 初始化数据
|
||||
|
|
|
|||
Loading…
Reference in New Issue