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

components/diy/diy.vue

@@ -671,11 +671,11 @@
                 if (!this.is_header_top && !this.is_immersion_model) {
                     if (scroll_num >= this.sticky_top + 33 + (this.is_search_alone_row ? 0 : 33 + this.data_alone_row_space)) {
                         this.temp_sticky_top = 0;
-                        // #ifdef H5
+                        // #ifdef H5 || MP-TOUTIAO
                         this.temp_header_top = 0;
                         this.temp_sticky_no_h5_top = 0;
                         // #endif
-                        // #ifndef H5
+                        // #ifndef H5 || MP-TOUTIAO
                         this.temp_header_top = this.sticky_top;
                         this.temp_sticky_no_h5_top = this.sticky_top;
                         // #endif

components/diy/modules/tabs-view.vue

@@ -55,7 +55,7 @@
         </view>
         <!-- 选项卡更多弹窗 -->
         <componentPopup :propShow="popup_status" :propIsBar="propIsBar" propPosition="top" :propMask="true" :propTop="newPropTop" :propStyle="newPropStyle" @onclose="quick_close_event">
-            <view class="padding-vertical-lg">
+            <view :class="['toutiao', 'app', 'h5'].includes(platform) ? 'padding-vertical-lg' : 'padding-vertical'">
                 <view class="padding-left-main padding-bottom-main">全部选项卡</view>
                 <view class="divider-b">
                     <view class="nav-list-more">
@@ -188,6 +188,7 @@
                 // #endif
                 newPropTop: '',
                 newPropStyle: '',
+                platform: app.globalData.application_client_type(),
                 // 默认数据
                 old_radius: { radius: 0, radius_top_left: 0, radius_top_right: 0, radius_bottom_left: 0, radius_bottom_right: 0 },
                 old_padding: { padding: 0, padding_top: 0, padding_bottom: 0, padding_left: 0, padding_right: 0 },