From 27787d3300cf4acdf761bbf76b74e72cc53bf7e2 Mon Sep 17 00:00:00 2001
From: clay <209192278@qq.com>
Date: Wed, 4 Jan 2023 16:46:46 +0800
Subject: [PATCH] 1

---
 components/news/news.vue |  7 +------
 pages/index/index.vue    | 24 ++++++++++++++++++++----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/components/news/news.vue b/components/news/news.vue
index 804dea6..05645e5 100644
--- a/components/news/news.vue
+++ b/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)
 					}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e6ce84b..497fcb1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -39,6 +39,9 @@
 			</view>
 			<!-- 产品 -->
 			<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>
@@ -79,6 +82,7 @@
 			//获取子组件的getProducts方法返回数据的length，用于当length为0时取消发送请求
 			getChild(e) {
 				this.reachBottomLength = e
+
 			},
 			//获取一级分类
 			getCategories() {
@@ -103,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, // 微信登录仅请求授权认证
@@ -118,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) {
 						// 登录授权失败
@@ -134,7 +151,6 @@
 			},
 			getImgUrl() {
 				this.$apiServe.getImgUrl().then(res => {
-					// console.log(res)
 					try {
 						uni.setStorageSync('img_url', res.data.data.img_url);
 					} catch (e) {