From ef78d1fc9ccd4da6c6d45d41e4bf2a561bf3250f Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Wed, 22 Sep 2021 10:53:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A2=86=E5=88=B8=E4=B8=AD=E5=BF=83=20?=
=?UTF-8?q?=E9=A2=86=E5=8F=96=E4=BC=98=E6=83=A0=E5=88=B8=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 1 +
pages/index/collectCoupons/collectCoupons.vue | 72 ++++++++++++++++---
2 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/pages.json b/pages.json
index a083d32..24b36a9 100644
--- a/pages.json
+++ b/pages.json
@@ -368,6 +368,7 @@
"path" : "pages/index/collectCoupons/collectCoupons",
"style" : {
"navigationBarTitleText": "领券中心",
+ "enablePullDownRefresh":true,
"navigationStyle": "custom"
}
},
diff --git a/pages/index/collectCoupons/collectCoupons.vue b/pages/index/collectCoupons/collectCoupons.vue
index d44094a..f611cda 100644
--- a/pages/index/collectCoupons/collectCoupons.vue
+++ b/pages/index/collectCoupons/collectCoupons.vue
@@ -6,7 +6,7 @@
我的优惠券
-
+
@@ -16,19 +16,19 @@
-
+
￥
- 200
+ {{item.action_type.value}}
- 满1200减200
- 有效期2021.09.09-2021-09.15
+ {{item.title}}
+ 有效期{{item.starts_at}}-{{item.ends_at}}
- 立即领取
-
+ 立即领取
+
抢光了
@@ -44,15 +44,65 @@
export default {
data(){
return {
-
+ coupon_list: []
}
},
onLoad(){
-
+ this.getCouponsList();
+ },
+ onPullDownRefresh() {
+ this.getCouponsList();
},
methods: {
- receive(){
- this.$msg('领取成功')
+ receive(code){
+ this.$http.post({
+ api: 'api/coupon/convert',
+ data: {
+ coupon_code: code
+ },
+ header: {
+ Authorization: this.$cookieStorage.get('user_token')
+ }
+ }).then(res => {
+ if(res.data.code == 200) {
+ this.$msg('领取成功');
+ this.getCouponsList();
+ }else {
+ this.$msg(JSON.stringify(res.data.message));
+ }
+ }).catch(err => {
+ console.log("====", err);
+ })
+ },
+ compareDate(val) {
+ var nowTime = new Date(new Date().toLocaleDateString()).getTime();
+ let oldTime = new Date(new Date(val).toLocaleDateString()).getTime();
+ if(nowTime>oldTime) {
+ return true;
+ }else {
+ return false;
+ }
+ },
+ //获取优惠券列表
+ getCouponsList() {
+ this.$http.get({
+ api: 'api/coupons/list',
+ header: {
+ Authorization: this.$cookieStorage.get('user_token')
+ }
+ }).then(res => {
+ this.coupon_list = res.data.data;
+ this.coupon_list.forEach((item,index) => {
+ if(this.compareDate(item.ends_at)) {
+ this.$set(item,'ifpast',true);
+ }else {
+ this.$set(item,'ifpast',false);
+ }
+ })
+ uni.stopPullDownRefresh();
+ }).catch(err => {
+ console.log("====", err);
+ })
}
}
}
From 96eaf15911aa45d07d6be0d57275d067d6abbda9 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Wed, 22 Sep 2021 14:59:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=91=E7=8E=B0=E6=88=91=E7=9A=84?=
=?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=BC=98=E5=8C=96/=E5=8F=91=E7=8E=B0?=
=?UTF-8?q?=E8=AF=84=E8=AE=BA=E8=B7=B3=E8=BD=AC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/coupon/index/index.vue | 2 +-
pages/discover/discoverdetails.vue | 4 +-
pages/index/collectCoupons/collectCoupons.vue | 2 +-
pages/user/my/my.vue | 111 ++++++++++++++----
4 files changed, 89 insertions(+), 30 deletions(-)
diff --git a/pages/coupon/index/index.vue b/pages/coupon/index/index.vue
index 3872da5..879d3d0 100644
--- a/pages/coupon/index/index.vue
+++ b/pages/coupon/index/index.vue
@@ -38,7 +38,7 @@
{{item.discount.title}}
- 有效期{{item.discount.ends_at}}
+ 有效期{{item.discount.starts_at}}~{{item.discount.ends_at}}
diff --git a/pages/discover/discoverdetails.vue b/pages/discover/discoverdetails.vue
index 5882da9..e2111ea 100644
--- a/pages/discover/discoverdetails.vue
+++ b/pages/discover/discoverdetails.vue
@@ -45,7 +45,7 @@
-
+
@@ -66,7 +66,7 @@
-
-
- {{item.create_time[0]}}
-
-
- {{item.create_time[1]}}
-
-
-
-
-
-
-
-
- {{item.likes_count}}
+
+
+
+ {{item.create_time[0]}}
+
+
+ {{item.create_time[1]}}
-
-
- {{item.view_count}}
+
+
-
-
- {{item.comments_count}}
+
+
+
+
+ {{item.likes_count}}
+
+
+
+ {{item.view_count}}
+
+
+
+ {{item.comments_count}}
+
-
+
+
+ {{ loadingText }}
+
+
+
@@ -57,14 +66,32 @@
user_id: 0,
page: 1,
page_size: 15,
- discover_info: ''
+ discover_info: '',
+ isPage: true,
+ loadingClass: true,
+ loadingText: '正在加载中',
+ isRefresher: false,
+ scrollH: 0,
+ nav_height: 0,
}
},
onLoad(e) {
+ let info = uni.getSystemInfoSync();
+ this.scrollH = info.screenHeight;
this.user_id = e.user_id;
this.loginList();
},
+ computed: {
+ autoHeight(){
+ return `calc(${this.scrollH}px - ${this.nav_height}px - 460rpx)`;
+ }
+ },
methods: {
+ // scroll-view 下拉刷新
+ onRefresherrefresh(){
+ this.isRefresher = true;
+ this.refreshFn({type: 'scrollRefresh'});
+ },
//关注
payAttention() {
this.$http
@@ -104,6 +131,22 @@
});
});
},
+ // 下拉刷新处理
+ refreshFn(options){
+ this.page = 1;
+ this.isPage = true;
+ this.loadingClass = true;
+ this.discover_info.list.data = [];
+ this.loadingText = '正在加载中';
+ this.loginList(options);
+ },
+ // 页面触底，加载下一页
+ onScrolltolower(){
+ if(this.isPage){
+ this.page = this.page + 1;
+ this.loginList();
+ }
+ },
//点赞发现
addLike(id) {
let user_info = this.$cookieStorage.get('user_token');
@@ -121,7 +164,7 @@
.then(res => {
if (res.data.code == 200) {
if (res.data.status) {
- this.loginList();
+ this.refreshFn({type: 'scrollRefresh'});
} else {
wx.showModal({
content: res.data.message || '请下拉页面刷新重试',
@@ -151,7 +194,7 @@
this.$url('/pages/discover/discoverdetails?discover_id='+id)
},
//登录时的发现列表
- loginList() {
+ loginList(options = {}) {
this.$http
.get({
api: 'api/discover/user/'+this.user_id,
@@ -166,7 +209,23 @@
.then(res => {
if (res.data.code == 200) {
if (res.data.status) {
- this.discover_info = res.data.data;
+ this.discover_info = res.data.data;
+ let isPage = res.data.data.list.last_page == this.page?false:true;
+ this.isPage = isPage;
+ if(!isPage) {
+ this.loadingClass = false;
+ this.loadingText = '没有更多数据啦~';
+ }
+ if(options.type == 'pageRefresh') {
+ uni.stopPullDownRefresh();
+ }else if(options.type == 'scrollRefresh') {
+ this.isRefresher = false;
+ }
+ if(this.page == 1) {
+ this.discover_info.list.data = res.data.data.list.data;
+ }else {
+ this.discover_info.list.data.push(...res.data.data.list.data);
+ }
console.log('登录时的发现列表',this.discover_info);
} else {
wx.showModal({