From 71e9d9ad18bd2069fb58c1bac084b004d32a54c9 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Fri, 1 Jul 2022 22:31:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=B8=8D=E5=86=8D=E5=81=9A?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=A0=A1=E9=AA=8C=E3=80=82=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E9=80=89=E8=B4=AD=E4=BB=A5=E5=8F=8A=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E9=A6=96=E9=A1=B5=E5=8F=91=E5=B8=83=E5=92=8C=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E9=80=89=E9=A1=B9=E7=9A=84=E6=97=B6=E5=80=99=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E7=99=BB=E5=BD=95=E6=A0=A1=E9=AA=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/request.js                 |  6 +--
 components/custom-bar/module-bar.vue |  5 +-
 pages/index/home.vue                 | 36 +-------------
 pages/index/index.vue                | 72 ++++++++++++++++++++--------
 pages/product/product-detail.vue     | 47 +++++++++++++++---
 5 files changed, 98 insertions(+), 68 deletions(-)

diff --git a/common/js/request.js b/common/js/request.js
index 07636e2..b838eaf 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -77,10 +77,8 @@ export default {
 		let userInfo = await wx.getUserProfile({
 			desc: '用于小程序登录'
 		});
-		console.log("从微信获取基本用户信息：" + userInfo);
 		// 获取微信登录凭证
 		const wxLoginRes = await wx.login();
-		console.log(wxLoginRes)
 		// 获取openid
 		const wxAuthRes = await uni.request({
 			url: '/wx/auth',
@@ -88,7 +86,6 @@ export default {
 				code: wxLoginRes.code
 			}
 		})
-		console.log(wxAuthRes)
 		const openId = wxAuthRes[1].data.data.openid;
 		// 第一次从服务端获取用户信息
 		let wxGetUserRes = await this.qryUserInfo(openId);
@@ -113,7 +110,6 @@ export default {
 				wxLoginCode: wxLoginRes.code
 			}
 		}
-		console.log("通过后台服务获取用户信息：" + userInfo);
 		if (!userInfo || userInfo.customerId == null || userInfo.customerId == undefined) {
 			uni.showToast({
 				icon: 'none',
@@ -202,7 +198,7 @@ export default {
 		}
 		if (phoneRes && phoneRes.data) {
 			let userInfo = this.getCurUserInfo();
-			this.updateUserPhone({
+			await this.updateUserPhone({
 				customerId: userInfo.customerId,
 				account: phoneRes.data,
 				phone: phoneRes.data
diff --git a/components/custom-bar/module-bar.vue b/components/custom-bar/module-bar.vue
index b1bbf4e..3c011e1 100644
--- a/components/custom-bar/module-bar.vue
+++ b/components/custom-bar/module-bar.vue
@@ -26,7 +26,8 @@
 
 <script>
 	export default {
-		name: "module-bar",
+		name: "module-bar",
+		emits: ['getCurPageInfo'],
 		props: {
 			moduleBarInfos: {
 				type: Array,
@@ -48,7 +49,7 @@
 			navChange(e, isChangeFocus) {
 				let cur = e.currentTarget.dataset.cur;
 				this.curPageCode = isChangeFocus ? cur : this.curPageCode;
-				uni.$emit('getCurPageInfo', {
+				this.$emit('getCurPageInfo', {
 					curPageCode: cur
 				});
 			}
diff --git a/pages/index/home.vue b/pages/index/home.vue
index 0ceb7a5..71959ad 100644
--- a/pages/index/home.vue
+++ b/pages/index/home.vue
@@ -79,10 +79,7 @@
 			<!-- 热门服务 -->
 			<vertical-goods-card :goodsInfos="hotGoods" :multiPicMode="true" title="大家都在买">
 			</vertical-goods-card>
-		</view>
-		
-		<vertify-login ref="vertifyLogin" @reload="loadData"></vertify-login>
-		<vertify-phone ref="vertifyPhone" @reload="loadData"></vertify-phone>
+		</view>
 	</view>
 </template>
 
@@ -121,16 +118,6 @@
 		},
 		methods: {
 			async loadData() {
-				uni.showLoading({
-					mask: true,
-					title: '加载中'
-				})
-				let loginRes = this.authLogin();
-				if (!loginRes) {
-					return;
-				}
-				uni.hideLoading();
-
 				// 加载区域信息
 				this.loadRegionList();
 				// 加载热门商品
@@ -149,27 +136,6 @@
 				this.moduleBarInfos = await this.$api.data('moduleBarInfos');
 				// this.hotGoods = await this.$api.data('hotGoods');
 				// this.discountGoods = await this.$api.data('discountGoods');
-			},
-			async authLogin() {
-				// 更新缓存中的userInfo
-				let res = await this.$request.storageExistUser();
-				// 获取缓存中的userInfo
-				let curUserInfo = this.$request.getCurUserInfo();
-				// 校验提示登录
-				if (!curUserInfo || !curUserInfo.openId) {
-					this.$refs.vertifyLogin.showModal();
-					return false;
-				} else {
-					this.$refs.vertifyLogin.hideModal();
-				}
-				// 校验提示获取手机号码
-				if (!curUserInfo.phone) {
-					this.$refs.vertifyPhone.showModal();
-					return false;
-				} else {
-					this.$refs.vertifyPhone.hideModal();
-				}
-				return true;
 			},
 			bindEvent() {
 				uni.$on('index_showProductDetail', this.showDetails);
diff --git a/pages/index/index.vue b/pages/index/index.vue
index dbd3285..5cfc177 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -5,7 +5,13 @@
 		<personal-center v-if="curPageCode === 'myPage'"></personal-center>
 		<!-- <publish-home v-if="curPageCode === 'publishPage'"></publish-home> -->
 		<msg-page v-if="curPageCode === 'msgPage'"></msg-page>
-		<module-bar ref="moduleBar" :moduleBarInfos="moduleBarInfos"></module-bar>
+		<module-bar ref="moduleBar" :moduleBarInfos="moduleBarInfos" @getCurPageInfo="getCurPageInfo"></module-bar>
+		
+		<!-- 登录校验弹窗 -->
+		<vertify-login ref="vertifyLogin" @reload="reloadForwardPage"></vertify-login>
+		<vertify-phone ref="vertifyPhone" @reload="reloadForwardPage"></vertify-phone>
+		
+		<!-- 发布 -->
 		<view class="cu-modal content-mask" :class="isShowPublish?'show':''">
 			<view class="cu-dialog bottom-dialog margin-bottom-with-bar">
 				<view class="padding-xl">
@@ -79,41 +85,69 @@
 			return {
 				moduleBarInfos: [],
 				curPageCode: 'indexPage',
-				isShowPublish: false
+				isShowPublish: false,
+				forwardingPageCode: null
 			}
 		},
 		onLoad() {
 			this.loadData();
-			this.bindEvent();
-		},
-		onUnload() {
-			this.offEvent();
 		},
 		methods: {
 			async loadData() {
 				this.moduleBarInfos = await this.$api.data('moduleBarInfos');
+			},
+			reloadForwardPage() {
+				this.getCurPageInfo({
+					curPageCode: this.forwardingPageCode
+				})
 			},
-			bindEvent() {
-				uni.$on('getCurPageInfo', function(data) {
-					if (data.curPageCode === 'publishPage') {
-						this.isShowPublish = true;
-					} else {
-						this.isShowPublish = false;
-						this.curPageCode = data.curPageCode;
-					}
-				}.bind(this));
-			},
-			offEvent() {
-				uni.$off('getCurPageInfo')
+			async getCurPageInfo(data) {
+				let pageCode = data.curPageCode;
+				this.forwardingPageCode = pageCode;
+				// 登录校验
+				if (['publishPage', 'myPage'].indexOf(pageCode) >= 0) {
+					let loginRes = await this.authLogin();
+					if (!loginRes) {
+						return;
+					}
+				}
+				this.forwardingPageCode = null;
+				
+				if (pageCode === 'publishPage') {
+					this.isShowPublish = true;
+				} else {
+					this.isShowPublish = false;
+					this.curPageCode = pageCode;
+				}
 			},
 			hidePublish() {
 				this.isShowPublish = false;
 			},
 			showPage(url) {
-				console.log(url)
 				uni.navigateTo({
 					url: url
 				})
+			},
+			async authLogin() {
+				// 更新缓存中的userInfo
+				let res = await this.$request.storageExistUser();
+				// 获取缓存中的userInfo
+				let curUserInfo = this.$request.getCurUserInfo();
+				// 校验提示登录
+				if (!curUserInfo || !curUserInfo.openId) {
+					this.$refs.vertifyLogin.showModal();
+					return false;
+				} else {
+					this.$refs.vertifyLogin.hideModal();
+				}
+				// 校验提示获取手机号码
+				if (!curUserInfo.phone) {
+					this.$refs.vertifyPhone.showModal();
+					return false;
+				} else {
+					this.$refs.vertifyPhone.hideModal();
+				}
+				return true;
 			}
 		}
 	}
diff --git a/pages/product/product-detail.vue b/pages/product/product-detail.vue
index a40e01b..5448093 100644
--- a/pages/product/product-detail.vue
+++ b/pages/product/product-detail.vue
@@ -171,14 +171,17 @@
 				购物车
 			</view>
 			<view class="bg-main-color light submit" @click="toggleProductPickModal">加入购物车</view>
-			<view class="bg-main-color submit" @click="toggleProductPickModal($event, true)">立即订购</view>
+			<view class="bg-main-color submit" @tap="checkLogin" @click="toggleProductPickModal($event, true)">立即订购</view>
 		</view>
 		<!-- 底部弹窗 -->
 		<uni-popup ref="productPickPopup" type="bottom" @change="changePopupState">
 			<view class="text-bold text-gray text-lg text-center left-top-sm-bar" @click="toggleProductPickModal"><text
 					class="cuIcon-close"></text></view>
 			<product-pick :shopInfo="shopInfo" :productInfo="productDetail" :specsList="productDetail.goodsStandardList" :orderNow="orderNow"></product-pick>
-		</uni-popup>
+		</uni-popup>
+		<!-- 登录校验弹窗 -->
+		<vertify-login ref="vertifyLogin" @reload="checkLogin"></vertify-login>
+		<vertify-phone ref="vertifyPhone" @reload="checkLogin"></vertify-phone>
 	</view>
 </template>
 
@@ -193,6 +196,7 @@
 		},
 		data() {
 			return {
+				inParam: {},
 				productDetail: {},
 				detailPicList: [],
 				swiperList: [],
@@ -214,8 +218,9 @@
 			}
 		},
 		onLoad(options) {
-			let params = JSON.parse(decodeURIComponent(options.params));
-			this.loadData(params);
+			let params = JSON.parse(decodeURIComponent(options.params));
+			this.inParam = params;
+			this.loadData();
 			this.bindEvent();
 		},
 		onUnload() {
@@ -229,10 +234,10 @@
 			this.changeSwiperHeight = e.scrollTop > 50 ? true: false;
 		},
 		methods: {
-			async loadData(params) {
+			async loadData() {
 				let productDetailMock = await this.$api.data('productDetail');
 				this.productDetail = await this.$request.getGoodsDetail({
-					goodsId: params.goodsId
+					goodsId: this.inParam.goodsId
 				});
 				// 默认规格
 				this.curProductSpecs = this.productDetail.goodsStandardList[0];
@@ -257,6 +262,34 @@
 				this.reviewers = productDetailMock.reviewers;
 				// this.shopInfo = productDetailMock.shopInfo;
 			},
+			async checkLogin() {
+				let loginRes = await this.authLogin();
+				if (!loginRes) {
+					return;
+				}
+				this.loadData();
+			},
+			async authLogin() {
+				// 更新缓存中的userInfo
+				let res = await this.$request.storageExistUser();
+				// 获取缓存中的userInfo
+				let curUserInfo = this.$request.getCurUserInfo();
+				// 校验提示登录
+				if (!curUserInfo || !curUserInfo.openId) {
+					this.$refs.vertifyLogin.showModal();
+					return false;
+				} else {
+					this.$refs.vertifyLogin.hideModal();
+				}
+				// 校验提示获取手机号码
+				if (!curUserInfo.phone) {
+					this.$refs.vertifyPhone.showModal();
+					return false;
+				} else {
+					this.$refs.vertifyPhone.hideModal();
+				}
+				return true;
+			},
 			bindEvent() {
 				uni.$on('product-detail_add2Cart', this.add2Cart);
 			},
@@ -305,7 +338,7 @@
 					selector: '#pageAnchor' + index
 				})
 			},
-			toggleProductPickModal(e, orderNow) {
+			async toggleProductPickModal(e, orderNow) {
 				this.orderNow = orderNow ? true : false;
 				if (this.ifShowPageMeta) {
 					this.$refs.productPickPopup.close();