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

taiyuan
2 parents 763c4721 6fc46e49
Showing 16 changed files with 158 additions and 68 deletions
app.js
custom-tab-bar/index.js
packageA/pages/distribution/card/card.js
packageA/pages/distribution/commision/commision.js
packageA/pages/distribution/goods/goods.js
packageA/pages/distribution/goods/goods.json
packageA/pages/distribution/myteam/myteam.js
packageA/pages/distribution/order/order.js
packageA/pages/distribution/rank/rank.js
packageA/pages/distribution/rookie/rookie.js
packageA/pages/distribution/shop/shop.js
pages/distribution/distribution.js
pages/distribution/distribution.wxml
pages/goods/categoryList/categoryList.js
pages/index/index/index.js
pages/togoin/togoin.js
@@ -92,8 +92,15 @@ App({
         if(!app.globalData.userInfo){
             var user = wx.getStorageSync("userinfo");
             if (user && user.user_id){
-               app.globalData.userInfo=wx.getStorageSync("userinfo");
-               app.globalData.user_id= app.globalData.userInfo.user_id;
+				//--生成会员 --
+				app.promiseGet("/api/weshop/users/get/" + user.store_id + "/" + user.user_id,{}).then(res=>{
+					  if(res.data.code==0){
+							user=res.data.data;  
+							app.globalData.userInfo=user;
+							app.globalData.user_id= user.user_id;
+							wx.setStorageSync("userinfo",user);
+					  }
+				})
             }
         }
         wx.getSystemInfo({
@@ -561,7 +568,11 @@ App({
         this.globalData.room_id=null;                      //关闭要把房间号关闭
         this.globalData.room_goods_id=null;                //关闭要把物流清空
         this.globalData.config2=null;                      //清除config2的缓存
-        this.globalData.config=null;                       //清除config的缓存
+        this.globalData.config=null;                       //清除config的缓存	
+		this.globalData.gr_index=0;                        //商品分组的序列
+		for(var i = 1; i < 50; i++) {
+		    clearInterval(i);
+		}
     },
     clear_word:function (word) {
@@ -14,16 +14,14 @@ Component({
 	lifetimes: {
 	  attached: function() {
 		   var th=this;
-	   
-		   getApp().getConfig2(function(){
-			   var e = getApp().globalData.config2;
-			   var json_d = JSON.parse(e.switch_list);
-			   if(!json_d.distribut_switch){
-			   		th.setData({is_no_distri:1})
-			   }
-		   })
-		 
-			   
+	     
+		   getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{
+		   	  var dis=rs.data.data;	
+		   	  if( dis && dis.switch==0){
+		   		   th.setData({is_no_distri:1})
+		   	  }	   				  
+		   })	
+		   
 		   getApp().promiseGet("/store/storemoduleendtime/page?store_id=" +os.stoid + "&type=5",{}).then(res=>{
 			    if(res.data.code==0){
 					  var arr = res.data.data.pageData;
@@ -22,6 +22,9 @@ Page({
 				userInfo: data,
 			});
 		});
+		wx.setNavigationBarTitle({
+		  title: "我的名片",
+		});
   },
   /**
@@ -28,6 +28,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+	    wx.setNavigationBarTitle({
+	      title: "佣金明细",
+	    });
+	 
 		this.setData({
 			currentSelect: this.data.dropdownArr[0],
 		});
@@ -37,6 +37,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+	  
+	     wx.setNavigationBarTitle({
+	       title: "上下架商品",
+	     });
+	  
 		self = this;//保存全局指针
 		app.isLogin().then(function(data) {//进入页面前已经授权登录成功
 			self.setData({
@@ -2,6 +2,6 @@
   "usingComponents": {
 		"nodata": "/components/nodata/nodata"
 	},
-	"navigationBarTitleText": "我的名片",
+	"navigationBarTitleText": "上下架商品",
 	"enablePullDownRefresh": false
 }
 \ No newline at end of file
@@ -21,6 +21,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+	    wx.setNavigationBarTitle({
+	       title: "我的团队",
+	    });
+		 
 		self = this;//保存全局指针
 		app.isLogin().then(function(data) {//进入页面前已经授权登录成功
 			self.setData({
@@ -27,6 +27,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+	  
+	    wx.setNavigationBarTitle({
+	      title: "分销订单",
+	    });
+	  
 		self = this;//保存全局指针
 		app.isLogin().then(function(data) {//进入页面前已经授权登录成功
 			self.setData({
@@ -21,6 +21,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+	    wx.setNavigationBarTitle({
+	      title: "分销排行榜",
+	    });
+	  
 		self = this;//保存全局指针
 		app.isLogin().then(function(data) {//进入页面前已经授权登录成功
 			self.setData({
@@ -19,7 +19,10 @@ Page({
    */
   onLoad: function (options) {
 		self = this;
-		
+
+        wx.setNavigationBarTitle({
+          title: "新手必看",
+        });		
 		// 判断会员是否授权登录，
 		// 没有登录则跳转到登录页，
 		// 已登录则设置已登录状态，请求加载数据
@@ -44,6 +44,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+	 
+	    wx.setNavigationBarTitle({
+	      title: "我的小店",
+	    });
 		self = this;//保存全局指针
 		app.isLogin().then(function(data) {//进入页面前已经授权登录成功
 			self.setData({
@@ -63,9 +67,9 @@ Page({
 		     success: function (e) {
 		       if(e.data.code==0){
 				   self.setData({
-				   	userInfo2:  e.data.data,
+				   	userInfo2:e.data.data,
 				   });
-			   } ;
+			   };
 		     },
 		   });
@@ -24,6 +24,9 @@ Page({
 		}else{
 		    getApp().goto("/pages/togoin/togoin") //跳到非tabbar页
 		}	
+		wx.setNavigationBarTitle({
+		  title: "我的分销",
+		});
   },
@@ -117,55 +120,74 @@ Page({
 	  //如果不是分销会员的话
 	  if(!app.globalData.userInfo['is_distribut']){
-	  	app.request.promiseGet('/api/weshop/users/distribut/getIsDistribut', {
-	  		data: {
-	  			storeId: self.data.userInfo.store_id,
-	  			userId: self.data.userInfo.user_id,
-	  			first_leader: self.data.userInfo.first_leader,
-	  		},
-	  		isShowLoading: true,
-	  	}).then(function(res) {
-	  		console.log('!!!===>', res);
-	  		if(res.data.code == 0) {
-	  			var data={
-	  				fenxiao: res.data.data,
-	  			};
-	  			var goods=null;
-	  			var isall_pass=1;
-	  			for(var i in  res.data.data){
-	  				if(!res.data.data[i].pass){ isall_pass=0; }				
-	  				if(res.data.data[i].type==3 && res.data.data[i].conditonRemark){
-	  					 goods={is_buy:1,url:'/pages/index/index/index'};
-	  					 if(res.data.data[i].goods_id){
-	  						goods.url='/pages/goods/goodsInfo/goodsInfo?goods_id='+res.data.data[i].goods_id; 
-	  					 }																						 
-	  					 break;
-	  				}
-	  			}	
-	  			if(goods){
-	  				data.buy_goods=goods;
-	  			}												
-	  			self.setData(data);
-	  			//如果全部都更新了通过的话
-	  			if(isall_pass){			
-	  				wx.showToast({
-	  				  title: "全部满足成为分销商",
-	  				  icon: 'none',
-	  				  duration: 2000
-	  				});		
+		  
+		    var res=null;
+			await app.request.promiseGet('/api/weshop/users/distribut/getIsDistribut', {
+				data: {
+					storeId: self.data.userInfo.store_id,
+					userId: self.data.userInfo.user_id,
+					first_leader: self.data.userInfo.first_leader,
+				},
+				isShowLoading: true,
+			}).then(function(res1) {
+				res=res1;
+			});
+			
+			if(res && res.data.code == 0) {
+				var data={
+					fenxiao: res.data.data,
+				};
+				var goods=null;
+				var isall_pass=1;
+				for(var i in  res.data.data){
+					if(!res.data.data[i].pass){ isall_pass=0; }				
+					if(res.data.data[i].type==3 && res.data.data[i].conditonRemark){
+						 goods={is_buy:1,url:'/pages/index/index/index'};
+						 if(res.data.data[i].goods_id){
+							goods.url='/pages/goods/goodsInfo/goodsInfo?goods_id='+res.data.data[i].goods_id; 
+						 }																						 
+						 break;
+					}					
+					if(res.data.data[i].type==2){
+						 if(!res.data.data[i].inviter && getApp().globalData.first_leader){
+							 await app.request.promiseGet("/api/weshop/users/get/" + os.stoid+"/"+getApp().globalData.first_leader,{}).then(res=>{
+								 if(res.data.code==0){
+									  var user= res.data.data;
+									  if(user.is_distribut==1){
+											data.fenxiao[i].inviter=user.mobile;
+											
+											self.setData(data);
+									  }
+								 }
+							 })		
+						 }
+					}								
+				}	
+				if(goods){
+					data.buy_goods=goods;
+				}												
+				self.setData(data);
+				//如果全部都更新了通过的话
+				if(isall_pass){			
+					wx.showToast({
+					  title: "全部满足成为分销商",
+					  icon: 'none',
+					  duration: 2000
+					});		
 					//-- 会员的分销的内容要进行存储 --			
 					app.globalData.userInfo.is_distribut=1;
 					wx.setStorageSync("userinfo",app.globalData.userInfo);					
-	  				setTimeout(function(){
-	  					self.getDis_data();
+					setTimeout(function(){
+						self.getDis_data();
 						self.setData({
 							userInfo: app.globalData.userInfo,
 						});
-	  				},2000)											
-	  			}
-	  		} 
-	  		
-	  	});
+					},2000)											
+				}
+			} 
+			
+			
+			
 	  }else{
 	  	 self.getDis_data()
 	  }	
@@ -102,8 +102,9 @@
 					<view class="item" wx:if="{{item.type == 2}}">
 						<view class="left f1">
 							<view class="icon-container"><text class="iconfont icon-renzheng"></text></view>
-							<view class="flex ali-c">
-								<input class="bg-f0 pdh10 input" type="number" value="{{item.inviter ? item.inviter:''}}" placeholder="请输入推荐人手机号码" disabled="{{item.pass}}" bindinput="getInput"/>
+							<view class="flex ali-c">		
+								<text wx:if="{{item.inviter}}">{{item.inviter}}</text>
+								<input wx:else class="bg-f0 pdh10 input" type="number" value="{{item.inviter ? item.inviter:''}}" placeholder="请输入推荐人手机号码" disabled="{{item.pass}}" bindinput="getInput"/>
 								<view class="verify" wx:if="{{!item.pass}}" bindtap="verify" data-index="{{index}}" data-pass="{{item.pass}}">验证</view>
 							</view>
 						</view>
@@ -91,8 +91,15 @@ Page({
     onLoad: function(tt) { 
       var that = this;
+	  var first_leader=tt.first_leader;  
+	  if(first_leader){
+	  	 //--  user_id代过来免登录 --
+	     getApp().globalData.first_leader=first_leader;	  
+	  }
+	  
+	   
       that.get_brand();
-
+	 
       clearInterval(that.data.timer);
       that.setData({ countDownNum: 3, stylePage: 1 });
@@ -570,8 +577,19 @@ Page({
   },
   //---------分享配置--------
   onShareAppMessage: function (e) {
+	  
+	url="pages/goods/categoryList/categoryList";  
+	var userInfo=getApp().globalData.userInfo;
+	//是分销商才带
+	if(userInfo){
+	  url+="?first_leader="+userInfo.user_id;
+	}  		
+	console.log("--分类分享---分享--");
+	console.log(url);
+	  
     return {
-      title: "商品分类",
+       title: "商品分类",
+	   path:url,
     }
   },
   //图片失败，默认图片
@@ -592,11 +592,19 @@ Page({
 	  url+="?first_leader="+userInfo.user_id;
 	}  		
 	console.log("---首页---分享--");
-	console.log(url);  	
+	var title="商城首页"
+    //分享	
+	if(getApp().globalData.config.store_name){
+		 title=getApp().globalData.config.store_name;
+	}else if(getApp().globalData.setting.appName){
+		 title=getApp().globalData.setting.appName;
+	}
+	
 	var ob={
 	  title: getApp().globalData.config.store_name,
 	  path:url,
-	};	  
+	};	
+	console.log(ob);  	
     return ob;
   },
@@ -22,8 +22,8 @@ Page({
 	   } 	  
 	   var th=this;
 	   app.getConfig(function (e) {
-		    e.store_logo=th.data.imghots+e.store_logo;		   
-	        th.setData({ store: e,store_logo:e.store_logo});
+		    var logo=th.data.imghots+e.store_logo;		   
+	        th.setData({ store: e,store_logo:logo});
 	   })	  
   },
   //绑定手机号