Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev

master
gongfuxiang 2026-02-26 17:38:55 +08:00
commit a2671705b3
3 changed files with 24 additions and 1 deletions

View File

@ -542,6 +542,14 @@
this.update_display_data();
setTimeout(() => {
//#ifdef H5
//
const current_video = this.video_data_list.find(item => item.id == id);
if (current_video && current_video.title) {
document.title = current_video.title;
}
//#endif
// //
this.update_share_info(this.display_video_list[this.current_index]);
@ -620,6 +628,12 @@
// URL
const pathname = location.href.split('?')[0];
history.replaceState(null, '', pathname + url.search);
//
const current_video = this.video_data_list.find(item => item.id == id);
if (current_video && current_video.title) {
document.title = current_video.title;
}
//#endif
const index = this.video_data_list.findIndex(item => item.id == id);

View File

@ -16,6 +16,10 @@
<search-component propIsDisabled @disabledSearch="handle_search"/>
</view>
</view>
<!-- 轮播 -->
<view v-if="slider_list.length > 0" class="padding-horizontal-main">
<component-banner :propData="slider_list" propSize="mini"></component-banner>
</view>
<template v-if="tabs.length > 0">
<!-- 导航栏 -->
<view class="nav-tabs">
@ -65,6 +69,7 @@
<script>
import searchComponent from '@/pages/plugins/video/components/search.vue';
import componentNoData from '@/components/no-data/no-data';
import componentBanner from '@/components/slider/slider';
import { video_get_top_left_padding } from '@/common/js/common/common.js';
import { isEmpty } from '../../../../common/js/common/common';
const app = getApp();
@ -76,7 +81,8 @@ bar_height = 0;
export default {
components: {
searchComponent,
componentNoData
componentNoData,
componentBanner,
},
data() {
return {
@ -102,6 +108,7 @@ export default {
data_list_loding_msg: '',
menu_button_info: '',
header_padding_left: '',
slider_list: [],
};
},
onShow() {
@ -150,6 +157,7 @@ export default {
tabs: new_data.category_list,
current_tabs_id: new_data.category_list.length > 0 ? new_data.category_list[this.current_tabs_index].id : '',
data_tabs_loding_status: 0,
slider_list: new_data.slider_list,
});
//
this.get_video_list(this.current_tabs_id);

View File

@ -338,6 +338,7 @@ export default {
/* 热门搜索 */
.hot-search {
padding: 40rpx;
background: #fff;
}
.hot-tabs {