diff --git a/App.vue b/App.vue
index dfb03325..9644c50a 100644
--- a/App.vue
+++ b/App.vue
@@ -7,10 +7,10 @@
data: {
// 基础配置
// 数据接口请求地址
- request_url: 'https://d1.shopxo.vip/',
+ request_url: 'http://shopxo.com/',
// 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
- static_url: 'https://d1.shopxo.vip/',
+ static_url: 'http://shopxo.com/',
// 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
system_type: 'default',
diff --git a/common/css/page.css b/common/css/page.css
index 0988dd60..0348f308 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -225,6 +225,9 @@ button:before {
.pr {
position: relative;
}
+.ps {
+ position: sticky;
+}
.z-i {
z-index: 1 !important;
}
diff --git a/components/no-data/no-data.vue b/components/no-data/no-data.vue
index 3e70354f..f724c5f4 100644
--- a/components/no-data/no-data.vue
+++ b/components/no-data/no-data.vue
@@ -54,7 +54,7 @@
{{title}}
-
+
@@ -137,6 +137,10 @@
propIsHeader: {
type: Boolean,
default: false,
+ },
+ propLoadingLogoTop: {
+ type: String,
+ default: '50%',
}
},
// 页面被展示
diff --git a/pages/plugins/ask/index/index.css b/pages/plugins/ask/index/index.css
index f823f54f..71801947 100644
--- a/pages/plugins/ask/index/index.css
+++ b/pages/plugins/ask/index/index.css
@@ -1,13 +1,5 @@
-.avatar {
- width: 35rpx;
- height: 35rpx;
-}
-
.scroll-box {
- height: calc(100vh - 174rpx - var(--status-bar-height));
- /* #ifdef H5 */
- height: calc(100vh - 174rpx);
- /* #endif */
+ height: calc(100vh - 40px);
}
.status .ask-status {
diff --git a/pages/plugins/ask/index/index.vue b/pages/plugins/ask/index/index.vue
index 9c43f59d..bfa3d12e 100644
--- a/pages/plugins/ask/index/index.vue
+++ b/pages/plugins/ask/index/index.vue
@@ -1,45 +1,51 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
{{ item.name }}
-
-
-
-
-
-
-
-
- {{ index + 1 }}
-
-
- {{ item.title }}
- {{ item.content }}
-
- {{ item.is_reply === '1' ? $t('index.index.1c17n3') : $t('index.index.75l3l2') }}
-
- {{ item.add_time_date }}
- ·
- {{ item.access_count || '0' }}{{ $t('detail.detail.e6ga1y') }}
+
+
+
+
+
+
+ {{ index + 1 }}
+
+
+ {{ item.title }}
+ {{ item.content }}
+
+ {{ item.is_reply === '1' ? $t('index.index.1c17n3') : $t('index.index.75l3l2') }}
+
+ {{ item.add_time_date }}
+ ·
+ {{ item.access_count || '0' }}{{ $t('detail.detail.e6ga1y') }}
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -61,11 +67,18 @@
import componentNoData from '@/components/no-data/no-data';
import componentBottomLine from '@/components/bottom-line/bottom-line';
import componentSearch from '@/components/search/search';
+ import componentBanner from '@/components/slider/slider';
+ // 状态栏高度
+ var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
+ // #ifdef MP-TOUTIAO
+ bar_height = 0;
+ // #endif
export default {
data() {
return {
theme_view: app.globalData.get_theme_value_view(),
+ status_bar_height: bar_height,
is_mp_env: false,
// #ifdef MP-WEIXIN || MP-BAIDU || MP-ALIPAY || MP-QQ || MP-KUAISHOU
is_mp_env: true,
@@ -79,6 +92,8 @@
data_list_loding_msg: '',
data_bottom_line_status: false,
data_is_loading: 0,
+ // 轮播
+ slider_list: [],
// 导航分类
nav_list: [],
nav_index: 0,
@@ -95,6 +110,7 @@
componentNoData,
componentBottomLine,
componentSearch,
+ componentBanner
},
props: {},
@@ -136,6 +152,7 @@
var data_base = res.data.data.base || {};
this.setData({
data_base: data_base,
+ slider_list: res.data.data.slider_list || [],
nav_list: res.data.data.search_tab_list || [],
// 基础自定义分享
share_info: {
@@ -250,6 +267,7 @@
this.setData({
search_bwg: e || '',
data_page: 1,
+ data_list: []
});
this.reset_scroll();
this.get_data_list(1);