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

WXD-SEASON\season
2 parents a4729286 6b8227e5
Showing 4 changed files with 56 additions and 19 deletions
packageA/pages/distribution/rank/rank.js
packageA/pages/distribution/rank/rank.wxml
pages/user/index/index.js
pages/user/userinfo/userinfo.js
@@ -14,7 +14,9 @@ Page({
 		list: null,
 		isLoading: false, // 检测是否已经发送请求,防止重复发送请求
 		noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
-		pageNum: 1, // 当前页数
+    pageNum: 1, // 当前页数
+    listUrl:"/api/weshop/users/distribut/rankinglist",
+    userUrl:"/api/weshop/users/distribut/rankingUser",
   },
   /**
@@ -272,9 +274,10 @@ Page({
 		// 数据总量
 		let total = this.data.list.total;
 		// 单页最大数据量
-		let pageSize = this.data.list.pageSize;
+    let pageSize = this.data.list.pageSize;
+    let page = this.data.list.page;
 		// 如果数据总量不为0且小于或等于单页最大数据量，说明数据已全部加载，显示‘没有更多了’
-		if((total != 0)&&(total <= pageSize)) {
+		if((total != 0)&&(total <= pageSize*page)) {
 			this.setData({
 				noMore: true
 			});
+<wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
 <view>
 	<view>
 		<view class="flex jc_sb pd bg-red ai-center">
 			<view>
 				<view class="t1">排行榜</view>
 				<view class="t2 pdt10 pdr40" wx:if="{{userRanking.rownum == 1}}">恭喜您当前排名第一！</view>
-				<view class="t2 pdt10 pdr40" wx:elif="{{userRanking.mindistribut_money}}">您距离前一名还差<text class="money">{{userRanking.mindistribut_money - userRanking.distribut_money}}</text></view>
+				<view class="t2 pdt10 pdr40" wx:elif="{{userRanking.mindistribut_money}}">您距离前一名还差<text class="money">{{filters.toFix(userRanking.mindistribut_money - userRanking.distribut_money,2)}}</text></view>
 				<view class="t2 pdt10 pdr40" wx:elif="{{userRanking.underling_number}}">您距离前一名还差{{userRanking.underling_number}}人</view>
 				<view class="t2 pdt10 pdr40" wx:else>好好努力，天天向上！</view>
 			</view>
@@ -582,16 +582,31 @@ Page({
 	//------卡片的显示和关闭--------
 	show_tc: function () {
+    var that=this;
     if (!this.data.userInfo) return false;
-
-		//base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
-		var val = this.data.userInfo.mobile + "|" + ut.formatTime()+"|"+this.data.getusercode_vailtime;
-		val = "^" + ut.base64_encode(val);
-
-		qrcode('qrcode', val, 480, 480, this);
-		this.setData({
-			tc_hide: false,
-		});
+    var getnowtime;
+    rq.get("/api/weshop/users/getServerTime", {    
+      success: function (res) {
+        if (res.data.code == 0)
+        {
+          getnowtime=res.data.data;
+          if (!getnowtime)
+          {
+            getApp().showWarning("获取服务时间失败");
+            return;
+          }
+          //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
+          var val = that.data.userInfo.mobile + "|" +getnowtime+"|"+that.data.getusercode_vailtime;
+          val = "^" + ut.base64_encode(val);
+
+          qrcode('qrcode', val, 480, 480, that);
+          that.setData({
+            tc_hide: false,
+          });
+        }
+      }
+    })
+    
 	},
 	hide_tc: function () {
 		this.setData({
@@ -867,16 +867,34 @@ Page({
   //------卡片的显示和关闭--------
   show_tc: function() {
+    var that=this;
+    var req = t;
     if (!getApp().globalData.userInfo) return false;
     //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
-    var val=getApp().globalData.userInfo.mobile+"|"+ut.formatTime()+"|"+this.data.getusercode_vailtime;
-    val="^"+ut.base64_encode(val);
+    var getnowtime;
+    req.get("/api/weshop/users/getServerTime", {    
+      success: function (res) {
+        if (res.data.code == 0)
+        {
+          getnowtime=res.data.data;
+          if (!getnowtime)
+          {
+            getApp().showWarning("获取服务时间失败");
+            return;
+          }
+          //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
+          var val = that.data.userInfo.mobile + "|" +getnowtime+"|"+that.data.getusercode_vailtime;
+          val = "^" + ut.base64_encode(val);
+
+          qrcode('qrcode', val, 480, 480, that);
+          that.setData({
+            tc_hide: false,
+          });
+        }
+      }
+    })
-    qrcode('qrcode', val, 480, 480, this);
-    this.setData({
-      tc_hide: false,
-    });
   },
   hide_tc: function() {
     this.setData({