diff --git a/application/api/controller/Coupon.php b/application/api/controller/Coupon.php
index 3577d6cdb..068e08842 100644
--- a/application/api/controller/Coupon.php
+++ b/application/api/controller/Coupon.php
@@ -45,7 +45,6 @@ class Coupon extends Common
*/
public function User()
{
- //sleep(5);
$coupon_params = [
'user' => $this->user,
'where' => [
diff --git a/public/appmini/old/weixin/pages/user-coupon/user-coupon.js b/public/appmini/old/weixin/pages/user-coupon/user-coupon.js
index 5982d1aac..defbb92ad 100644
--- a/public/appmini/old/weixin/pages/user-coupon/user-coupon.js
+++ b/public/appmini/old/weixin/pages/user-coupon/user-coupon.js
@@ -39,9 +39,11 @@ Page({
get_data_list() {
var self = this;
wx.showLoading({ title: "加载中..." });
- this.setData({
- data_list_loding_status: 1
- });
+ if (this.data.data_list == null || (this.data.data_list[this.data.nav_tabs_value] || null) == null || this.data.data_list[this.data.nav_tabs_value].length <= 0) {
+ this.setData({
+ data_list_loding_status: 1
+ });
+ }
wx.request({
url: app.get_request_url("user", "coupon"),
@@ -54,13 +56,12 @@ Page({
if (res.data.code == 0) {
self.setData({
data_list: res.data.data || null,
- data_bottom_line_status: true,
- data_list_loding_status: 3,
data_list_loding_msg: '',
});
-
+ self.data_view_handle();
} else {
self.setData({
+ data_bottom_line_status: false,
data_list_loding_status: 2,
data_list_loding_msg: res.data.msg,
});
@@ -71,6 +72,7 @@ Page({
wx.hideLoading();
wx.stopPullDownRefresh();
self.setData({
+ data_bottom_line_status: false,
data_list_loding_status: 2,
data_list_loding_msg: '服务器请求出错',
});
@@ -79,11 +81,22 @@ Page({
});
},
+ // 数据处理
+ data_view_handle() {
+ var status = 0;
+ if (this.data.data_list != null && (this.data.data_list[this.data.nav_tabs_value] || null) != null && this.data.data_list[this.data.nav_tabs_value].length > 0) {
+ status = 3;
+ }
+ this.setData({
+ data_list_loding_status: status,
+ data_bottom_line_status: (status == 3),
+ });
+ },
+
// 导航事件
nav_tabs_event(e) {
- var index = e.currentTarget.dataset.index;
- var value = e.currentTarget.dataset.value;
- this.setData({ nav_tabs_value: value});
+ this.setData({ nav_tabs_value: e.currentTarget.dataset.value});
+ this.data_view_handle();
},
// 下拉刷新
diff --git a/public/appmini/old/weixin/pages/user-coupon/user-coupon.json b/public/appmini/old/weixin/pages/user-coupon/user-coupon.json
index 8835af069..331ad4f3d 100644
--- a/public/appmini/old/weixin/pages/user-coupon/user-coupon.json
+++ b/public/appmini/old/weixin/pages/user-coupon/user-coupon.json
@@ -1,3 +1,3 @@
{
- "usingComponents": {}
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/user-coupon/user-coupon.wxml b/public/appmini/old/weixin/pages/user-coupon/user-coupon.wxml
index 9835f3e42..3776d4e39 100644
--- a/public/appmini/old/weixin/pages/user-coupon/user-coupon.wxml
+++ b/public/appmini/old/weixin/pages/user-coupon/user-coupon.wxml
@@ -19,8 +19,8 @@
{{item.coupon.type == 0 ? '元' : '折'}}
{{item.coupon.desc}}
- {{item.coupon.use_limit_type_name}}
- {{item.time_start_text}} 至 {{item.time_end_text}}
+ {{item.coupon.use_limit_type_name}}
+ {{item.time_start_text}} 至 {{item.time_end_text}}
@@ -43,8 +43,8 @@
{{item.coupon.type == 0 ? '元' : '折'}}
{{item.coupon.desc}}
- {{item.coupon.use_limit_type_name}}
- {{item.time_start_text}} 至 {{item.time_end_text}}
+ {{item.coupon.use_limit_type_name}}
+ 使用 {{item.use_time_text}}
@@ -65,8 +65,8 @@
{{item.coupon.type == 0 ? '元' : '折'}}
{{item.coupon.desc}}
- {{item.coupon.use_limit_type_name}}
- {{item.time_start_text}} 至 {{item.time_end_text}}
+ {{item.coupon.use_limit_type_name}}
+ 过期 {{item.time_end_text}}
@@ -78,10 +78,9 @@
-
+
-
-
+