From d5cb2f24483bb23865f632249862d318b1788289 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 9 Oct 2023 14:52:20 +0800
Subject: [PATCH] =?UTF-8?q?1=E4=BC=98=E5=8C=96=E9=A1=B6=E9=83=A8=E8=BF=94?=
=?UTF-8?q?=E5=9B=9E=E6=8C=89=E9=92=AE=E5=AE=9A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/plugins/answers/detail/detail.vue | 135 ++++++++----------
pages/plugins/coupon/index/index.vue | 24 +++-
pages/plugins/distribution/user/user.vue | 31 ++--
.../plugins/membershiplevelvip/user/user.vue | 29 ++--
pages/plugins/points/index/index.vue | 60 +++++---
pages/plugins/seckill/index/index.css | 10 ++
pages/plugins/seckill/index/index.vue | 106 ++++++++------
.../signin/index-detail/index-detail.vue | 15 +-
.../user-answers-detail.vue | 11 +-
pages/user/user.vue | 4 +-
10 files changed, 258 insertions(+), 167 deletions(-)
diff --git a/pages/plugins/answers/detail/detail.vue b/pages/plugins/answers/detail/detail.vue
index 277052aa..056c8110 100644
--- a/pages/plugins/answers/detail/detail.vue
+++ b/pages/plugins/answers/detail/detail.vue
@@ -1,69 +1,63 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ detail_data.title }}
-
- 留言时间: {{ detail_data.add_time_date }}
- ·
- {{ detail_data.access_count || '0' }}浏览
-
- {{ detail_data.content }}
-
-
-
-
-
- 管理员
+
+
+
+
+ {{ detail_data.title }}
+
+ 留言时间: {{ detail_data.add_time_date }}
+ ·
+ {{ detail_data.access_count || '0' }}浏览
- 回复时间: {{ detail_data.reply_time_date }}
+ {{ detail_data.content }}
- {{ detail_data.reply }}
+
+
+
+
+ 管理员
+
+ 回复时间: {{ detail_data.reply_time_date }}
+
+ {{ detail_data.reply }}
+
+
+
+
+
+ 猜你喜欢
+
+
+
+
+
+
+
+
+
+ 我要提问
+
+
+
+
+
+ 我的提问
+
+
-
-
-
- 猜你喜欢
-
-
-
-
+
+
-
-
-
-
- 我要提问
-
-
-
-
-
- 我的提问
-
-
-
-
diff --git a/pages/plugins/coupon/index/index.vue b/pages/plugins/coupon/index/index.vue
index 9a3d8d22..082ac351 100644
--- a/pages/plugins/coupon/index/index.vue
+++ b/pages/plugins/coupon/index/index.vue
@@ -1,24 +1,22 @@
-
+
-
+
-
+
-
+
@@ -50,6 +48,8 @@
status_bar_height: parseInt(app.globalData.get_system_info('statusBarHeight', 0)),
// 顶部导航返回按钮
is_realstore_top_nav_back: app.globalData.data.is_realstore_top_nav_back || 0,
+ // 顶部返回导航背景透明度
+ opacity: 0,
data_bottom_line_status: false,
data_list_loding_status: 1,
data_list_loding_msg: '',
@@ -227,10 +227,12 @@
}
}
},
+
// url事件
url_event(e) {
app.globalData.url_event(e);
},
+
// 顶部返回操作
top_nav_left_back_event(e) {
var pages = getCurrentPages();
@@ -242,9 +244,17 @@
uni.navigateBack();
}
},
+
+ // 页面滚动监听
+ onPageScroll(e) {
+ var top = e.scrollTop > 47 ? 1 : e.scrollTop / 47;
+ this.setData({
+ opacity: top,
+ });
+ },
},
};
\ No newline at end of file
+
diff --git a/pages/plugins/distribution/user/user.vue b/pages/plugins/distribution/user/user.vue
index 173487b4..2e2b9bc0 100644
--- a/pages/plugins/distribution/user/user.vue
+++ b/pages/plugins/distribution/user/user.vue
@@ -1,15 +1,17 @@
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
@@ -211,6 +213,8 @@
status_bar_height: parseInt(app.globalData.get_system_info('statusBarHeight', 0)),
// 顶部导航返回按钮
is_realstore_top_nav_back: app.globalData.data.is_realstore_top_nav_back || 0,
+ // 顶部返回导航背景透明度
+ opacity: 0,
distribution_static_url: distribution_static_url,
data_bottom_line_status: false,
data_list_loding_status: 1,
@@ -467,6 +471,7 @@
},
});
},
+
// 顶部返回操作
top_nav_left_back_event(e) {
var pages = getCurrentPages();
@@ -478,6 +483,14 @@
uni.navigateBack();
}
},
+
+ // 页面滚动监听
+ onPageScroll(e) {
+ var top = e.scrollTop > 47 ? 1 : e.scrollTop / 47;
+ this.setData({
+ opacity: top,
+ });
+ },
},
};
diff --git a/pages/plugins/membershiplevelvip/user/user.vue b/pages/plugins/membershiplevelvip/user/user.vue
index 4a5427c2..ff7ed114 100644
--- a/pages/plugins/membershiplevelvip/user/user.vue
+++ b/pages/plugins/membershiplevelvip/user/user.vue
@@ -1,15 +1,17 @@
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
@@ -187,6 +189,8 @@
status_bar_height: parseInt(app.globalData.get_system_info('statusBarHeight', 0)),
// 顶部导航返回按钮
is_realstore_top_nav_back: app.globalData.data.is_realstore_top_nav_back || 0,
+ // 顶部返回导航背景透明度
+ opacity: 0,
data_bottom_line_status: false,
data_list_loding_status: 1,
data_list_loding_msg: '',
@@ -366,6 +370,7 @@
},
});
},
+
// 顶部返回操作
top_nav_left_back_event(e) {
var pages = getCurrentPages();
@@ -377,6 +382,14 @@
uni.navigateBack();
}
},
+
+ // 页面滚动监听
+ onPageScroll(e) {
+ var top = e.scrollTop > 47 ? 1 : e.scrollTop / 47;
+ this.setData({
+ opacity: top,
+ });
+ },
},
};
diff --git a/pages/plugins/points/index/index.vue b/pages/plugins/points/index/index.vue
index 0a6909fb..25cd273e 100644
--- a/pages/plugins/points/index/index.vue
+++ b/pages/plugins/points/index/index.vue
@@ -1,6 +1,15 @@
-
+
+
+
+
+
+ 积分
+
+
+
+
@@ -11,13 +20,7 @@
-
-
-
-
-
- 积分
-
+
@@ -35,7 +38,8 @@
{{ user.user_name_view }}
- 当前可用
+ 当前可用
{{ user_integral.integral || 0 }}
@@ -77,22 +81,26 @@
-
+
-
+
-
+
积分规则
@@ -124,6 +132,8 @@
status_bar_height: parseInt(app.globalData.get_system_info('statusBarHeight', 0)),
// 顶部导航返回按钮
is_realstore_top_nav_back: app.globalData.data.is_realstore_top_nav_back || 0,
+ // 顶部返回导航背景透明度
+ opacity: 0,
data_bottom_line_status: false,
data_list_loding_status: 1,
data_list_loding_msg: '',
@@ -192,6 +202,7 @@
app.globalData.is_config(this, 'init_config');
}
},
+
// 获取数据
get_data() {
uni.request({
@@ -248,6 +259,7 @@
},
});
},
+
// 立即登录
login_event() {
var user = app.globalData.get_user_info(this, 'login_event');
@@ -274,10 +286,12 @@
user: user || null,
});
},
+
// url事件
url_event(e) {
app.globalData.url_event(e);
},
+
// 头像查看
preview_event() {
if (app.globalData.data.default_user_head_src != this.user.avatar) {
@@ -287,6 +301,7 @@
});
}
},
+
get_integral_data_list(is_mandatory) {
// 是否加载中
if (this.integral_is_loading == 1) {
@@ -345,18 +360,21 @@
},
});
},
+
// 弹层开启
quick_open_event(e) {
this.setData({
popup_status: true,
});
},
+
// 弹层关闭
quick_close_event(e) {
this.setData({
popup_status: false,
});
},
+
// 顶部返回操作
top_nav_left_back_event(e) {
var pages = getCurrentPages();
@@ -368,9 +386,17 @@
uni.navigateBack();
}
},
+
+ // 页面滚动监听
+ onPageScroll(e) {
+ var top = e.scrollTop > 47 ? 1 : e.scrollTop / 47;
+ this.setData({
+ opacity: top,
+ });
+ },
},
};
\ No newline at end of file
+
diff --git a/pages/plugins/seckill/index/index.css b/pages/plugins/seckill/index/index.css
index ab9b8031..78591b1a 100644
--- a/pages/plugins/seckill/index/index.css
+++ b/pages/plugins/seckill/index/index.css
@@ -50,4 +50,14 @@
margin: 20rpx 70rpx 42rpx 70rpx;
height: 80rpx;
line-height: 80rpx;
+}
+
+/**
+ * 内容
+ */
+.scroll-y {
+ height: calc(100vh - 198rpx - var(--window-top) - 5px);
+ /* #ifdef H5 */
+ height: calc(100vh - 198rpx - 10px);
+ /* #endif */
}
\ No newline at end of file
diff --git a/pages/plugins/seckill/index/index.vue b/pages/plugins/seckill/index/index.vue
index 14da894d..0a41a385 100644
--- a/pages/plugins/seckill/index/index.vue
+++ b/pages/plugins/seckill/index/index.vue
@@ -13,56 +13,52 @@
-
-
+
+
{{ item.name }}
{{ item.time.msg }}
-
-
-
-
- {{ time_first_text }}
-
-
+
+
+
+
+
+ {{ time_first_text }}
+
+
+
+
+
+ 活动规则
+
-
- 活动规则
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 活动规则
-
- {{ item }}
-
-
-
-
+
+
+
+
+
+ 活动规则
+
+ {{ item }}
+
+
+
+
+
@@ -86,6 +82,8 @@
is_realstore_top_nav_back: app.globalData.data.is_realstore_top_nav_back || 0,
seckill_bg: 'background: url(' + seckill_static_url + 'header-bg.png) top/100% no-repeat;',
seckill_title_url: seckill_static_url + 'seckill-title.png',
+ scroll_top: 0,
+ scroll_top_old: 0,
data_bottom_line_status: false,
data_list_loding_status: 1,
data_list_loding_msg: '',
@@ -111,7 +109,7 @@
seckill_status: 0,
// 配置商品列表按钮
isOpenGridBtnSet: false,
- gridBtnConfig: {
+ grid_btn_config: {
name: '即将开抢',
disabled: true,
},
@@ -143,14 +141,14 @@
name: '即将开抢',
};
this.setData({
- gridBtnConfig: Object.assign({}, gridBtnConfig, newData),
+ grid_btn_config: Object.assign({}, this.grid_btn_config, newData),
});
} else if (val === 2) {
let newData = {
name: '已结束',
};
this.setData({
- gridBtnConfig: Object.assign({}, gridBtnConfig, newData),
+ grid_btn_config: Object.assign({}, this.grid_btn_config, newData),
});
}
},
@@ -250,6 +248,7 @@
goods: this.periods_list[index].goods,
isOpenGridBtnSet: seckill_status === 1 ? false : true,
});
+ this.reset_scroll();
},
// 弹层开启
quick_open_event(e) {
@@ -274,9 +273,28 @@
uni.navigateBack();
}
},
+
+ // 重置滑动位置
+ reset_scroll() {
+ this.setData({
+ scroll_top: this.scroll_top_old,
+ });
+ this.$nextTick(() => {
+ this.setData({
+ scroll_top: 0,
+ });
+ });
+ },
+
+ // 滑动事件位置记录
+ scroll_event(e) {
+ this.setData({
+ scroll_top_old: e.detail.scrollTop,
+ });
+ },
},
};
\ No newline at end of file
+
diff --git a/pages/plugins/signin/index-detail/index-detail.vue b/pages/plugins/signin/index-detail/index-detail.vue
index 86612210..f11a0673 100644
--- a/pages/plugins/signin/index-detail/index-detail.vue
+++ b/pages/plugins/signin/index-detail/index-detail.vue
@@ -86,7 +86,12 @@
- 今日已签到,获得{{ user_signin_data.integral }}积分,共{{ user_signin_data.total }}次
+
+ 今日
+ 已
+ 未
+ 签到,获得{{ user_signin_data.integral || 0 }}积分,共{{ user_signin_data.total }}次
+
@@ -108,7 +113,9 @@
签到成功
- 恭喜您获得 {{ coming_integral }} 积分
+ 恭喜您获得 {{ coming_integral }} 积分
立即使用
@@ -400,7 +407,7 @@
// 重新拉取数据
this.get_data();
break;
- // 需要填写联系人信息
+ // 需要填写联系人信息
case 1:
uni.navigateTo({
url: '/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo?id=' + res.data.data.qrcode_id + '&is_team=1',
@@ -446,4 +453,4 @@
\ No newline at end of file
+
diff --git a/pages/user-answers-detail/user-answers-detail.vue b/pages/user-answers-detail/user-answers-detail.vue
index 932b8cd1..1400763b 100644
--- a/pages/user-answers-detail/user-answers-detail.vue
+++ b/pages/user-answers-detail/user-answers-detail.vue
@@ -59,6 +59,7 @@
is_realstore_top_nav_back: app.globalData.data.is_realstore_top_nav_back || 0,
detail_data: {},
data_list_loding_status: 1,
+ params: '',
};
},
@@ -67,7 +68,13 @@
},
props: {},
- onLoad() {},
+ onLoad(params) {
+ if (params) {
+ this.setData({
+ params: params.id,
+ });
+ }
+ },
onShow() {
this.init();
@@ -112,7 +119,7 @@
url: app.globalData.get_request_url('detail', 'answer'),
method: 'POST',
data: {
- id: this.$route.query.id,
+ id: this.params,
},
dataType: 'json',
success: (res) => {
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 89b4b649..4686e214 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -13,8 +13,8 @@
{{ nickname }}
- ID
- {{ user_id }}
+ ID
+ {{ user_id }}