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

# Conflicts: # packageA/pages/distribution/shop/shop.js

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
# Conflicts: # packageA/pages/distribution/shop/shop.js
yvan.ni
2 parents d9d162e4 72137b2c
Showing 4 changed files with 91 additions and 73 deletions
packageA/pages/distribution/main/main.js
packageA/pages/distribution/shop/shop.js
packageA/pages/distribution/shop/shop.wxml
packageA/pages/distribution/shop/shop.wxss
@@ -15,12 +15,14 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-		self = this;//保存全局指针
+	  self = this;//保存全局指针
+
 		app.isLogin().then(function(data) {//进入页面前已经授权登录成功
 			self.setData({
 				userInfo: data,
 			});
 		});
+		
   },
   /**
@@ -34,8 +36,8 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+		console.log('onshow');
 		let url = '/api/weshop/users/distribut/getMoney';
-
 		if(app.globalData.userInfo) {
 			if(!this.data.isLogin) {
 				this.setData({
@@ -43,10 +45,11 @@ Page({
 					imghost: app.globalData.setting.imghost,
 					isLogin: true,
 				});
-				console.log('userinfo', this.data.userInfo);
+				
 				// 请求数据
 				app.request.get(url + '/' + this.data.userInfo.store_id + '/' + this.data.userInfo.user_id, {
 				  success: function(res) {
+						console.log('success~~`', self.data.userInfo);
 					  if(res.data.code == 0){
 							self.setData({
@@ -61,7 +64,6 @@ Page({
 										storeId: self.data.userInfo.store_id,
 										userId: self.data.userInfo.user_id,
 										first_leader: self.data.userInfo.first_leader,
-										// first_leader: '',
 									},
 									isShowLoading: true,
 								}).then(function(res) {
@@ -74,19 +76,14 @@ Page({
 							// };
 						};
 				  },
-					fail: function() {
-						
-					},
+
 				});
-				// this.getData('/api/weshop/users/distribut/getMoney', {
-				// 	store_id: app.globalData.setting.stoid,
-				// 	user_id: app.globalData.user_id,
-				// });
 			};
 		};
+		
   },
   /**
@@ -138,34 +135,7 @@ Page({
 		app.goto(url);
 	},
-	/**
-	 * 请求数据
-	 */
-	// getData(url, data) {
-
-	// 		app.request.get(url + '/' + data.store_id + '/' + data.user_id, {
-	// 		  success: function(res) {
-	// 			  if(res.data.code == 0){
-	// 					// console.log('success',res.data.data.is_distribut);
-	// 					if(res.data.data.is_distribut) {//如果是分销商
-	// 						self.setData({
-	// 							data: res.data.data,
-	// 						});
-	// 					} else {//如果不是分销商
-							
-	// 					};
-	// 				}else{
-	// 					wx.showToast({
-	// 					  title: "网络繁忙，请重试",
-	// 					  icon: 'none',
-	// 					  duration: 2000
-	// 					})
-	// 				}
-	// 		  },
-	// 			fail: function() {},
-	// 		});
-
-	// },
+
 	/**
 	 * 获取输入框
@@ -221,19 +191,6 @@ Page({
 				  }
 				});
-				// app.request.promisePost('/api/weshop/users/distribut/updateUserRecommender', {
-				// 	data: {
-				// 		storeId: self.data.userInfo.store_id,
-				// 		userId: self.data.userInfo.user_id,
-				// 		mobile: mobile,
-				// 	},
-				// 	isShowLoading: true,
-				// }).then(function(res) {
-				// 	console.log('!!!===>', res);
-				// 	self.setData({
-				// 		fenxiao: res.data.data,
-				// 	});
-				// });
 			}
 		} else {
 			wx.showToast({
@@ -28,11 +28,15 @@ Page({
 		noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
 		pageNum: 1, // 当前页数
+
 		rank_switch: false,
 		card_field: "",
 		card_name: "",
 		max_card_field: "",
 		card_list: null
+
+		isAll: true,
+
   },
   /**
@@ -118,7 +122,15 @@ Page({
 				});
 				// 请求数据
-				this.getData(true, '/api/weshop/users/distribut/pagemyshop', this.data.currentQuery);
+				app.request.promiseGet('/api/weshop/users/distribut/pagemyshop', {
+					data: this.data.currentQuery,
+				}).then(res => {
+					self.setData({
+						list: res.data.data,
+						total: res.data.data.total,
+					});
+				});
+
 				// 新品
 				app.request.promiseGet('/api/weshop/users/distribut/pagemyshop?type=2', {
 					data: self.data.currentQuery,
@@ -265,7 +277,13 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-		this.scrollToLower('/api/weshop/users/distribut/pagemyshop', this.data.currentQuery);
+		let url = '';
+		if(this.data.isAll) {
+			url = '/api/weshop/users/distribut/pagemyshop';
+		} else {
+			url = '/api/weshop/users/distribut/pagemyshop?type=2';
+		};
+		this.scrollToLower(url, this.data.currentQuery);
   },
   /**
@@ -517,7 +535,7 @@ Page({
 				if(isInit) {// 第一次加载
 					self.setData({
-						list: res.data.data
+						list: res.data.data,
 					});
 				} else {
 					self.setData({
@@ -584,10 +602,10 @@ Page({
 		} else {
 			url = e.currentTarget.dataset.url;
 		}
-		console.log(url);
 		app.goto(url);
 	},
+
 	//--- 获取卡类列表 ---
 	getPlusCardType: function (func) {
 	  var storid = os.stoid;
@@ -629,4 +647,52 @@ Page({
 	    })
 	},
+
+	/**
+	 * 点击全部
+	 */
+	clickAll() {
+		let data = this.data.currentQuery;
+		
+		if(data.page) delete data.page;
+		if(data.orderField) delete data.orderField;
+		if(data.orderType) delete data.orderType;
+		if(data.key) delete data.key;
+		
+		this.setData({
+			pageNum: 1,
+			noMore: false,
+			isAll: true,
+		});
+		
+		this.getData(true, '/api/weshop/users/distribut/pagemyshop', data);
+	},
+	
+	/**
+	 * 点击新品
+	 */
+	clickNew() {
+		let data = this.data.currentQuery;
+		
+		if(data.page) delete data.page;
+		if(data.orderField) delete data.orderField;
+		if(data.orderType) delete data.orderType;
+		if(data.key) delete data.key;
+		
+		this.setData({
+			pageNum: 1,
+			noMore: false,
+			isAll: false,
+		});
+		app.request.promiseGet('/api/weshop/users/distribut/pagemyshop?type=2', {
+			data: data,
+		}).then(res => {
+			self.setData({
+				list: res.data.data,
+			});
+		});
+	},
+	
+	
+
 })
 \ No newline at end of file
@@ -19,11 +19,11 @@
 				<view class="flex t-c fs24 f1 jc_fe">
-					<view class="pdv20 pdh40">
-						<view class="fs30">{{filter.show_default(list.total)}}</view>
+					<view class="pdv20 pdh40 {{isAll ? 'selected':''}}" bindtap="clickAll">
+						<view class="fs30">{{filter.show_default(total)}}</view>
 						<view>全部商品</view>
 					</view>
-					<view class="pdv20 pdh40">
+					<view class="pdv20 pdh40 {{!isAll ? 'selected':''}}" bindtap="clickNew">
 						<view class="fs30">{{filter.show_default(newList.total)}}</view>
 						<view>新品</view>
 					</view>
@@ -349,19 +349,10 @@
 	</view>
-	
-	
-	
-	<!-- <view class="bottomBar flex pd20 jc_sb fs26 ai-center">
-		<view>
-			<label class="flex ai-center">
-				<checkbox/>全选
-			</label>
-		</view>
-		<view class="pd20 btn" wx:if="{{options.index == 0}}">一键上架</view>
-		<view class="pd20 btn" wx:else>一键下架</view>
-	</view> -->
-	
-	
 </view>
+
+
+
+
+
@@ -148,6 +148,10 @@ page {
 	z-index: 1;
 }
+.selected {
+	color: #FF6768;
+}
+
 .active {
 	color: #FF6768;