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

taiyuan
2 parents a5ffbf74 6368d495
Showing 3 changed files with 213 additions and 181 deletions
pages/user/index/index.js
pages/user/index/index.wxml
pages/user/index/index.wxss
@@ -72,25 +72,25 @@ Page({
 								 }
 						  }  
 						  th.setData({user_tool:d_list});
+
+                     getApp().request.get("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, {
+                         data: {
+                             enabled: 1
+                         },
+                         success:function(res){
+                             if(res.data.code==0 && res.data.data){
+                                 var item=res.data.data.pageData[0];
+                                 if (item && item.ad_code)  th.setData({ad_img:item.ad_code})
+                             }
+                         }
+                     })
+
+                     app.getUserFir();
+
 				})						 
 			}
 		}	
 	})
-    this.birthday();
-    getApp().request.get("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, {
-      data: {
-        enabled: 1
-      },
-	  success:function(res){
-		  if(res.data.code==0 && res.data.data){
-		        var item=res.data.data.pageData[0];
-		    	if (item && item.ad_code)  th.setData({ad_img:item.ad_code})
-		  }
-	  }
-    })
-        
-    
-	app.getUserFir();
   },
@@ -98,6 +98,34 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
+      //看一下小程序是不是过期了
+      getApp().getConfig2(function(config2){
+          if(config2 && config2.is_overdue==1){
+              getApp().promiseGet("/store/storemoduleendtime/page?store_id=" +os.stoid + "&type=5",{}).then(res=>{
+                  var o=res;
+                  if (o.data.code == 0) {
+                      var ob = { isout: 0, isbuy: 1 };
+                      var arr = o.data.data.pageData;
+                      var isbuy = 0;
+                      //----如果数组不为空----
+                      if (arr.length > 0) {
+                          arr.forEach(function (val, ind) {
+                              if (val.is_sy == 0 && val.type == 5) {
+                                  isbuy = 1;
+                                  var now = ut.gettimestamp();
+                                  if (now > val.end_time) ob.isout = 1;
+                                  return false;
+                              }
+                          })
+                      }
+                      ob.isbuy = isbuy;
+                      th.setappdata(ob);
+                  }
+              })
+          }
+      })
+
+
     var th=this;
     getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + os.stoid, {}).then(res => {
       if(res.data.code==0){
@@ -113,51 +141,22 @@ Page({
 	     this.getTabBar().setData({
 	       active: index //数字是当前页面在tabbar的索引
 	     });
-		 
-		 getApp().requestCardNum(this);
-	}  
+		 //getApp().requestCardNum(this);
+	}
+
-    this.is_assistance();
     var stoid = app_d.setting.stoid;
-    var s = this,
-      th = s,
+    var s = this, th = s,
       need_money = 0,
       cur_g_num = 0;
-	  
-	getApp().getConfig2(function(config2){
-		if(config2 && config2.is_overdue==1){
-			  getApp().promiseGet("/store/storemoduleendtime/page?store_id=" +os.stoid + "&type=5",{}).then(res=>{
-				   var o=res;
-				   if (o.data.code == 0) {
-						var ob = { isout: 0, isbuy: 1 };
-						var arr = o.data.data.pageData;
-						var isbuy = 0;
-						//----如果数组不为空----
-						if (arr.length > 0) {
-						  arr.forEach(function (val, ind) {
-							if (val.is_sy == 0 && val.type == 5) {
-							  isbuy = 1;
-							  var now = ut.gettimestamp();
-							  if (now > val.end_time) ob.isout = 1;
-							  return false;
-							}
-						  })
-						}
-						ob.isbuy = isbuy;	   				      
-						th.setappdata(ob);
-					}
-			  })
-		}
-	})	
-					
-	
-    setTimeout(function () {
-        if (getApp().globalData.user_id) getApp().requestCardNum(th);
-    },500)
+
     /*------会员登录------*/
-    var e=getApp().globalData.userInfo; 
- 
+    var e=getApp().globalData.userInfo;
     if (e != undefined && e != null && e.mobile) {
+
+        this.birthday();
+        this.is_assistance();
+
         s.setData({
           userInfo: e
         });
@@ -165,6 +164,7 @@ Page({
 		//-- 要调用接口，获取卡的钱 --
 		var url="/api/weshop/wxuser/getWxCardInfo?storeId="+os.stoid+"&userId="+e.user_id;
 		rq.get(url,{
+            isShowLoading:0,
 			success: function(su) {
 			  if(su.data.code==0){
 				  s.setData({
@@ -176,6 +176,7 @@ Page({
         /*-----统计-----*/
         rq.get("/api/weshop/order/waitlist", {
+          isShowLoading:0,
           data: {
             user_id: app_d.user_id
           },
@@ -187,6 +188,7 @@ Page({
         })
         /*-----获取线下会员的预存款和优惠券的数量-----*/
         rq.get("/api/weshop/users/getinfo/" + os.stoid + "/" + e.user_id, {
+          isShowLoading:0,
           success: function(su) {
 			 if(su.data.code==0 && su.data.data ) {
 				 var data = su.data.data;
@@ -201,6 +203,7 @@ Page({
         })
         /*-----获取会员提现金额-----*/
         rq.get("/api/weshop/withdrawals/summoney", {
+          isShowLoading:0,
           data: {
             user_id: e.user_id,
             store_id: os.stoid,
@@ -220,6 +223,7 @@ Page({
         /*-----获取会员包邮券的数量-----*/
         rq.get("/api/weshop/userfeemail/page", {
+          isShowLoading:0,
           data: {
             user_id: e.user_id,
             store_id: os.stoid,
@@ -234,114 +238,120 @@ Page({
             }
           }
         })
-      
-        /*-----获取会员权益列表-----*/
-        rq.get("/api/weshop/users/grade/vipprivilegeinfo/page", {
-          data: {
-            storeId: os.stoid,
-            pageSize: 100
-          },
-          success: async function(res) {
-            var arr_data = res.data.data.pageData;
-            var gid = null,
-              g_qy_list = null,
-              cz_vals = 0,
-              need_money = 0,
-              backClass = null,
-              is_init = 0,
-              GradeName = '';
-
-            //--初始化是否有打勾--
-            await getApp().request.promiseGet("/api/weshop/users/grade/vip/init/get", {
-              data: {
-                storeId: os.stoid
-              }
-            }).then(res => {
-              is_init = res.data.data.isBool;
-            })
-            //获取成长值
-            await getApp().request.promiseGet("/api/weshop/users/grade/aftervipinfo/get", {
-              data: {
-                storeId: os.stoid,
-                userId: app_d.user_id
-              }
-            }).then(res => {
-              if (res.data.code == 0 && res.data.data) {
-                gid = res.data.data.GradeId;
-                var cz_val = res.data.data.GradeSum;
-                cz_vals = parseInt(cz_val);
-                GradeName = res.data.data.GradeName;
-              }
-              //th.setData({ cz_val: cz_vals, GradeName: res.data.data.GradeName, is_init: is_init, gradeId: gid});
-            })
-            var obj = {
-              cz_val: cz_vals,
-              GradeName: GradeName,
-              is_init: is_init,
-              gradeId: gid
-            };
-            //  获取最大值
-            await getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page", {
-              data: {
+        //--初始化是否有打勾--
+        getApp().request.get("/api/weshop/users/grade/vip/init/get", {
+            data: {
                 storeId: os.stoid
-              }
-            }).then(res => {
-              if (res.data.data)
-                backClass = res.data.data.pageData;
-              if (backClass) {
-                var full_cz_val = backClass[backClass.length - 1].BuyGradeSum;
-                //th.setData({ full_cz_val: full_cz_val});
-                obj.full_cz_val = full_cz_val
-              }
-            })
-
-            //--会员权益中心页的修改--
-            for (var i in backClass) {
-              var im = backClass[i];
-              if (cz_vals < im.BuyGradeSum && need_money == 0) {
-                need_money = im.BuyGradeSum;
-                obj.need_money = need_money;
-              }
-            }
-
-            //获取当前等级的特权
-            await getApp().request.promiseGet("/api/weshop/users/grade/privilegeform/list/page", {
-              data: {
-                storeId: os.stoid,
-                GradeId: gid,
-                userId: app_d.user_id,
-                pageSize: 100
-              }
-            }).then(res => {
-              if (res.data.data)
-                g_qy_list = res.data.data.pageData;
-            });
-
-            for (var i in arr_data) {
-              var item = arr_data[i];
-              var FromId = th.check_is_has_qy(item, g_qy_list);
-              arr_data[i].ishas = 0;
-              if (FromId) {
-                arr_data[i].ishas = 1;
-                arr_data[i].FromId = FromId;
-              }
-            }
-            arr_data.sort(function(a, b) {
-              return b.ishas - a.ishas
-            })
-
-            //4个4个一组
-            var arr = new Array();
-            for (var i = 0; i < arr_data.length; i += 4) {
-              arr.push(arr_data.slice(i, i + 4));
+            },
+            success:function (rs) {
+                 if(rs.data.code==0 && rs.data.data.isBool){
+                     th.setData({is_init:1});
+                     /*-----获取会员权益列表-----*/
+                     rq.get("/api/weshop/users/grade/vipprivilegeinfo/page", {
+                         isShowLoading:0,
+                         data: {
+                             storeId: os.stoid,
+                             pageSize: 100
+                         },
+                         success: async function(res) {
+                             var arr_data = res.data.data.pageData;
+                             var gid = null,
+                                 g_qy_list = null,
+                                 cz_vals = 0,
+                                 need_money = 0,
+                                 backClass = null,
+
+                                 GradeName = '';
+
+                             //获取成长值
+                             await getApp().request.promiseGet("/api/weshop/users/grade/aftervipinfo/get", {
+                                 data: {
+                                     storeId: os.stoid,
+                                     userId: app_d.user_id
+                                 }
+                             }).then(res => {
+                                 if (res.data.code == 0 && res.data.data) {
+                                     gid = res.data.data.GradeId;
+                                     var cz_val = res.data.data.GradeSum;
+                                     cz_vals = parseInt(cz_val);
+                                     GradeName = res.data.data.GradeName;
+                                 }
+                                 //th.setData({ cz_val: cz_vals, GradeName: res.data.data.GradeName, is_init: is_init, gradeId: gid});
+                             })
+                             var obj = {
+                                 cz_val: cz_vals,
+                                 GradeName: GradeName,
+                                 gradeId: gid,
+                                 is_grad_get:1
+                             };
+
+                             //  获取最大值
+                             await getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page", {
+                                 data: {
+                                     storeId: os.stoid
+                                 }
+                             }).then(res => {
+                                 if (res.data.data)
+                                     backClass = res.data.data.pageData;
+                                 if (backClass) {
+                                     var full_cz_val = backClass[backClass.length - 1].BuyGradeSum;
+                                     //th.setData({ full_cz_val: full_cz_val});
+                                     obj.full_cz_val = full_cz_val
+                                 }
+                             })
+
+                             //--会员权益中心页的修改--
+                             for (var i in backClass) {
+                                 var im = backClass[i];
+                                 if (cz_vals < im.BuyGradeSum && need_money == 0) {
+                                     need_money = im.BuyGradeSum;
+                                     obj.need_money = need_money;
+                                 }
+                             }
+
+                             //获取当前等级的特权
+                             await getApp().request.promiseGet("/api/weshop/users/grade/privilegeform/list/page", {
+                                 data: {
+                                     storeId: os.stoid,
+                                     GradeId: gid,
+                                     userId: app_d.user_id,
+                                     pageSize: 100
+                                 }
+                             }).then(res => {
+                                 if (res.data.data)
+                                     g_qy_list = res.data.data.pageData;
+                             });
+
+                             for (var i in arr_data) {
+                                 var item = arr_data[i];
+                                 var FromId = th.check_is_has_qy(item, g_qy_list);
+                                 arr_data[i].ishas = 0;
+                                 if (FromId) {
+                                     arr_data[i].ishas = 1;
+                                     arr_data[i].FromId = FromId;
+                                 }
+                             }
+                             arr_data.sort(function(a, b) {
+                                 return b.ishas - a.ishas
+                             })
+
+                             //4个4个一组
+                             var arr = new Array();
+                             for (var i = 0; i < arr_data.length; i += 4) {
+                                 arr.push(arr_data.slice(i, i + 4));
+                             }
+                             //th.setData({ qy_list: arr, need_money: need_money});
+                             obj.qy_list = arr;
+                             th.setData(obj);
+                         }
+                     })
+                 }
             }
-            //th.setData({ qy_list: arr, need_money: need_money});
-            obj.qy_list = arr;
-            th.setData(obj);
-          }
         })
+      
+
         /*-- 获取 --*/
         th.requestRecommend();
@@ -395,11 +405,16 @@ Page({
 		 if(t_swi.usertool) user_tool=JSON.parse(t_swi.usertool);			  
 	     th.setData({c_list:user_tool})		  
 	 } --*/
-	 	  
-    var goods_list = this.selectComponent("#goods_recommend"); //组件的id
-    goods_list.init();
-    goods_list.get_list();
+      //自定义组件一定要等到页面加载完了，才来调用selectComponnent
+      setTimeout(function () {
+          if (getApp().globalData.user_id) getApp().requestCardNum(th);
+          var goods_list = th.selectComponent("#goods_recommend"); //组件的id
+          goods_list.init();
+          goods_list.get_list();
+      },800)
+
+
   },
@@ -9,9 +9,12 @@
           <view class="xc-user-left  flex" wx:if="{{userInfo}}">
             <image class="xc-user-img  circle" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
             <view class="xc-uesr-name">
+              <view class="flex ai-center">
               <text class="ellipsis-1" style="max-width: 290rpx;display: inline-block">{{userInfo.nickname}}</text>
               <view class="hvip" wx:if='{{GradeName && is_init}}'>
                 <image class="vip-mem" src="{{iurl}}/miniapp/images/vip_hg0.png"></image>{{GradeName}}</view>
+              </view>
+
               <view class="flex fs24 xc-grow-ups" style="margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'>
                 <block wx:if="{{cz_val<full_cz_val}}">
                   {{" "}}
@@ -142,7 +145,7 @@
   </view>
   <!-- 我的权益 -->
-  <view class="xc-my-equity-frame" wx:if="{{qy_list!=null && is_init && gradeId}}">
+  <view class="xc-my-equity-frame" wx:if="{{is_init }}">
     <view class="xc-equity-title flex-level" bindtap="go_qy">
       <view class="xc-title-frame flex-space-between">
         <view class="flex-vertical xc-title-content">
@@ -150,37 +153,51 @@
             <view class="three-level-word">我的权益</view>
         </view>
       </view>
-      <view class="three-level-word  xc-more-frame flex-vertical">
+      <view wx:if="{{is_grad_get}}" class="three-level-word  xc-more-frame flex-vertical">
         <view class="three-level-word xc-more">更多</view>
         <view class="bg_right xc-more-click bcolor"></view>
       </view>
+      <view wx:else class="three-level-word  xc-more-frame flex-vertical" style="justify-content: flex-end">
+        <image style="width: 40rpx; height: 40rpx; margin-right: 20rpx" src="{{iurl}}/miniapp/images/loader.gif"></image>
+      </view>
     </view>
-    <view class="xc-specific-more-frame flex-vertical">
+    <block wx:if="{{is_grad_get}}">
+      <block wx:if="{{qy_list && gradeId}}">
+        <view class="xc-specific-more-frame flex-vertical" wx:if="{{qy_list}}">
-      <view bindtap="click_pre">
-        <view class="bg_left xc-left bcolor"></view>
-      </view>
+        <view bindtap="click_pre">
+          <view class="bg_left xc-left bcolor"></view>
+        </view>
-      <swiper current="{{sw_index}}" style='width:82.7%; height:108rpx' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}">
+        <swiper current="{{sw_index}}" style='width:82.7%; height:108rpx' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}">
-        <swiper-item wx:for="{{qy_list}}" wx:for-item="aitem" wx:for-index="pidx">
-          <view class="flex xc-middle">
+          <swiper-item wx:for="{{qy_list}}" wx:for-item="aitem" wx:for-index="pidx">
+            <view class="flex xc-middle">
-            <view class="xc-center-frame t-c" wx:for="{{aitem}}" data-img="{{item.PrivilegeImageUrl}}" data-no="{{item.PrivilegeType}}" data-ind="{{index}}" data-find="{{pidx}}" bindtap="go_qy_url">
-              <!-- <text>qy_list.privilegeICOUrl</text> -->
-              <image class="xc-center-img  {{item.ishas==1?'':'img_gray'}}" src="{{item.PrivilegeICOUrl}}"></image>
-              <view class="four-level-word">{{item.PrivilegeName}}</view>
+              <view class="xc-center-frame t-c" wx:for="{{aitem}}" data-img="{{item.PrivilegeImageUrl}}" data-no="{{item.PrivilegeType}}" data-ind="{{index}}" data-find="{{pidx}}" bindtap="go_qy_url">
+                <!-- <text>qy_list.privilegeICOUrl</text> -->
+                <image class="xc-center-img  {{item.ishas==1?'':'img_gray'}}" src="{{item.PrivilegeICOUrl}}"></image>
+                <view class="four-level-word">{{item.PrivilegeName}}</view>
+              </view>
             </view>
-          </view>
-        </swiper-item>
+          </swiper-item>
-      </swiper>
+        </swiper>
-      <view bindtap="click_next">
-        <view class="bg_right xc-right bcolor mt"></view>
+        <view bindtap="click_next">
+          <view class="bg_right xc-right bcolor mt"></view>
+        </view>
       </view>
-    </view>
+      </block>
+      <view wx:else style="text-align: center">
+            未找到数据
+      </view>
+    </block>
+
+
+
+
   </view>
   <!-- 生日营销 is_banner-->
  <block wx:if="{{is_banner}}">
@@ -692,7 +692,7 @@
   background: #383838;
   padding: 0 15rpx;
   border-radius: 20rpx;
-  vertical-align: top;
+  margin-left: 5rpx;
 }
 .vip-mem {