Merge branch 'dev_20191114' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev_20191114

后端开发-许程
2 parents 82221a1c 821a7b39
Showing 7 changed files with 50 additions and 28 deletions
app.json
pages/user/Detailed/Detailed.js
pages/user/Detailed/Detailed.json
pages/user/Detailed/Detailed.wxml
pages/user/Detailed/Detailed.wxss
pages/user/index/index.wxml
pages/user/plus/plus.js
@@ -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",
-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();
  
 {
-  "navigationBarTitleText": "邀请明细",
+    "navigationBarTitleText": "邀请明细",
     "usingComponents": {
       "warn": "/components/long_warn/long_warn"
     }
@@ -11,6 +11,8 @@
       <view>奖励明细</view>
     </view>
   </view>
+      
+
  
   <!-- 奖励详情 -->
   <view class="flex-space-between fs28 maxvalue" wx:for="{{arrayDetailed}}">
@@ -13,6 +13,8 @@
   width: 250rpx;
 }
  
+
+
 .phone {
   width: 250rpx;
 }
@@ -180,7 +180,7 @@
           <view class="fs26">联系客服</view>
         </view>
  
-        <view class="item t-c" data-url="/pages/user/plus/plus?is_card=1" bindtap="goto" wx:if="{{is_dengji==1}}">
+        <view class="item t-c" data-url="/pages/user/cardinfo/cardinfo" bindtap="goto" wx:if="{{is_dengji==1}}">
           <image class="xc-center-img " src="{{iurl}}/miniapp/images/plus/privilege_o.png"></image>
           <view class="fs26">plus会员</view>
         </view>
@@ -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)
   },
  
   //--绑定邀请码的输入--