Merge pull request 'DJ' (#39) from DJ into dev

Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/39

components/news/news.vue

@@ -36,14 +36,9 @@
 			this.imgUrl = uni.getStorageSync('img_url')
 		},
 		methods: {
-			//获取行业新闻
-			// {
-			// 	pageSize: 2,
-			// 	pageNum: 1
-			// }
 			getNews() {
 				this.$apiServe.getNews().then(res => {
-					// console.log('行业新闻', res.data.data)
+					console.log('行业新闻', res.data.data)
 					for (const item of res.data.data) {
 						item.pub_time_str = dateFormat(item.pub_time_str)
 					}

components/products/products.vue

@@ -65,11 +65,8 @@
 						this.tagsArray = tag.split(',')
 						item.tags = this.tagsArray[0]
 					}
+					this.$emit("getChild", tags.length);
 
-					// if (res.data.data.length == 0) {
-					// 	requestTask.abort()
-					// }
-					console.log(res);
 					// 为数据赋值：通过展开运算符的形式，进行新旧数据的拼接
 					this.productList = [...this.productList, ...res.data.data]
 

pages/index/index.vue

@@ -38,7 +38,10 @@
 				</u-tabs>
 			</view>
 			<!-- 产品 -->
-			<products ref="getProducts"></products>
+			<products ref="getProducts" @getChild="getChild()"></products>
+			<view style="font-size: 24rpx;color: #A3A3A3;text-align: center;padding: 26rpx 0;"
+				v-if="reachBottomLength==0">
+				没有更多数据了</view>
 		</view>
 	</view>
 </template>
@@ -59,15 +62,14 @@
 				],
 				imgUrl: '',
 				swiperList: [],
+				reachBottomLength: ''
 			}
 		},
 		onReachBottom() {
-			// console.log('pageNum===', this.$refs.getProducts);
 			this.$refs.getProducts.pageNum += 1
-			this.$refs.getProducts.getProducts()
+			if (this.reachBottomLength !== 0) {
-
+				this.$refs.getProducts.getProducts()
-			//关闭下拉刷新
+			}
-			// uni.stopPullDownRefresh()
 		},
 		onLoad() {
 			this.getCategories()
@@ -77,6 +79,11 @@
 		},
 
 		methods: {
+			//获取子组件的getProducts方法返回数据的length，用于当length为0时取消发送请求
+			getChild(e) {
+				this.reachBottomLength = e
+
+			},
 			//获取一级分类
 			getCategories() {
 				this.$apiServe.getCategories().then(res => {
@@ -100,10 +107,18 @@
 				})
 			},
 			getphonenumber(e) {
+				let that = this
+				console.log(e);
+				//必须要公司注册，且微信认证过的小程序，才能获取到手机号的接口权限
+				if (e.detail.errMsg == "getPhoneNumber:fail ") {
+					console.log('用户拒绝提供手机号');
+				} else {
+					console.log('用户同意提供手机号');
+				}
 				const {
-					code
+					phoneCode
 				} = e.detail;
-				console.log("手机code : ", code);
+				console.log("手机code : ", phoneCode);
 				uni.login({
 					"provider": "weixin",
 					"onlyAuthorize": true, // 微信登录仅请求授权认证
@@ -115,7 +130,12 @@
 						console.log("登录code", code);
 						//客户端成功获取授权临时票据（code）,向业务服务器发起登录请求。
 						// 调用登录接口 拿到token 传手机code,更新手机号码
-
+						let fromData = {
+							code: code
+						}
+						that.$apiServe.login(fromData).then(res => {
+							console.log(res);
+						})
 					},
 					fail: function(err) {
 						// 登录授权失败
@@ -131,7 +151,6 @@
 			},
 			getImgUrl() {
 				this.$apiServe.getImgUrl().then(res => {
-					// console.log(res)
 					try {
 						uni.setStorageSync('img_url', res.data.data.img_url);
 					} catch (e) {