diff --git a/app.json b/app.json
index 190518b..efe2e48 100644
--- a/app.json
+++ b/app.json
@@ -68,8 +68,11 @@
"pages/user/user_spsy/user_spsy",
"pages/user/user_fw/user_fw",
"pages/user/user_coupon/user_coupon",
- "pages/user/grow_value/grow_value"
+ "pages/user/grow_value/grow_value",
+ "pages/user/plus/plus",
+ "pages/user/cardinfo/cardinfo"
+
],
"window": {
"backgroundTextStyle": "light",
diff --git a/pages/user/Detailed/Detailed.js b/pages/user/Detailed/Detailed.js
index f2e25a6..5d0b43c 100644
--- a/pages/user/Detailed/Detailed.js
+++ b/pages/user/Detailed/Detailed.js
@@ -1,19 +1,13 @@
-var e = function(e) {
- return e && e.__esModule ? e : {
- default: e
- };
- }(require("../../../utils/LoadMore.js")),
- t = getApp(),
+var t = getApp(),
r = t.globalData,
a = t.request,
o = t.globalData.setting,
os = o,
i = require("../../../utils/util.js"),
ut = i,
- s = require("../../../utils/common.js"),
- n = new e.default();
-Page({
+ s = require("../../../utils/common.js");
+Page({
/**
* 页面的初始数据
*/
@@ -34,8 +28,7 @@ Page({
},
selectDetailed: function() {
- var th = this,
- e = th;
+ var th = this, e = th;
getApp().request.promiseGet("/api/weshop/plus/vip/mem/referee/page", {
data: {
storeId: o.stoid,
@@ -44,20 +37,24 @@ Page({
pageSize: th.data.pageSize
}
}).then(res => {
- th.data.page++;//当前页数+1
- var arr1 = th.data.arrayDetailed;//获取明细数组
- var arr2 = res.data.data.pageData;//获取当前查询数据
- var arr3 = [...arr1, ...arr2];//把当前查询数组拼接到原本数组后面
+
+ th.setData({isDetailed:1})
+ if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0) {
+ th.data.page++;//当前页数+1
+ var arr1 = th.data.arrayDetailed;//获取明细数组
+ var arr2 = res.data.data.pageData;//获取当前查询数据
+ var arr3 = [...arr1, ...arr2];//把当前查询数组拼接到原本数组后面
- var ismore = 0;
- if (arr3.length == res.data.data.total) ismore = 1 //数据已加载完判断
+ var ismore = 0;
+ if (arr3.length == res.data.data.total) ismore = 1 //数据已加载完判断
- th.setData({
- arrayDetailed: arr3,
- total: res.data.data.total,
- ismore: ismore,
- isDetailed: 1
- })
+ th.setData({
+ arrayDetailed: arr3,
+ total: res.data.data.total,
+ ismore: ismore,
+ isDetailed: 1
+ })
+ }
}),
wx.stopPullDownRefresh();
diff --git a/pages/user/Detailed/Detailed.json b/pages/user/Detailed/Detailed.json
index cf71c5e..f681560 100644
--- a/pages/user/Detailed/Detailed.json
+++ b/pages/user/Detailed/Detailed.json
@@ -1,5 +1,5 @@
{
- "navigationBarTitleText": "邀请明细",
+ "navigationBarTitleText": "邀请明细",
"usingComponents": {
"warn": "/components/long_warn/long_warn"
}
diff --git a/pages/user/Detailed/Detailed.wxml b/pages/user/Detailed/Detailed.wxml
index 6e30427..53a1d39 100644
--- a/pages/user/Detailed/Detailed.wxml
+++ b/pages/user/Detailed/Detailed.wxml
@@ -11,6 +11,8 @@
奖励明细
+
+
diff --git a/pages/user/Detailed/Detailed.wxss b/pages/user/Detailed/Detailed.wxss
index 1b657ca..7256929 100644
--- a/pages/user/Detailed/Detailed.wxss
+++ b/pages/user/Detailed/Detailed.wxss
@@ -13,6 +13,8 @@
width: 250rpx;
}
+
+
.phone {
width: 250rpx;
}
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index 4a407f1..5e83b50 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -180,7 +180,7 @@
联系客服
-
+
plus会员
diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js
index aec9b0e..6879964 100644
--- a/pages/user/plus/plus.js
+++ b/pages/user/plus/plus.js
@@ -125,6 +125,20 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
+ var th=this,app_d=getApp().globalData;
+ getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + app_d.user_id, {
+ success: function (e) {
+ var userInfo = e.data.data;
+ if(userInfo['card_field']){
+ getApp().confirmBox("您已经是plus会员");
+ setTimeout(function () {
+ var u_url = "/pages/user/cardinfo/cardinfo";
+ wx.reLaunch({url: u_url})
+ },1500)
+ }
+ },
+ });
+
this.getPlusCardType();
},
@@ -271,8 +285,12 @@ Page({
},
//--支付成功,跳转到等级卡续费页面--
success:function () {
- var u_url="/pages/user/cardinfo/cardinfo";
- wx.reLaunch({url:u_url})
+ var th=this;
+ getApp().my_warnning("支付成功", 0, th);
+ setTimeout(function () {
+ var u_url = "/pages/user/cardinfo/cardinfo";
+ wx.reLaunch({url: u_url})
+ },1500)
},
//--绑定邀请码的输入--