From 2dd1426f409de6a8a9430fcff5695e7b53e922db Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Wed, 29 May 2024 15:06:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=B7=B1=E6=89=8B=E5=86=99=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=8E=88=E6=9D=83=E5=BC=B9=E7=AA=97=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/tabbar/tabbar.vue |  31 +++++
 main.js                      |   1 +
 manifest.json                |   5 +-
 pages/index/index.vue        |   6 +-
 pages/my/my.vue              | 245 +++++++++++++++++++++++++++--------
 subpkg/login/login.vue       |  33 ++++-
 6 files changed, 263 insertions(+), 58 deletions(-)

diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index 51c2e77..6625436 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -18,6 +18,7 @@
 
 <script>
 	import urlConfig from '@/utils/config.js'
+	import { mapMutations, mapState } from 'vuex'
 	
 	export default {
 		props: {
@@ -55,6 +56,7 @@
 			this.listTabbar();
 		},
 		methods: {
+			// ...mapMutations('m_user', ['token', 'updateUserInfo', 'updateToken', 'updateUserName','updateUserId','updateAvatarUrl', 'updateRedirectInfo']),
 			listTabbar() {
 				this.$api.listTabbar({})
 					.then(res => {
@@ -73,6 +75,35 @@
 			},
 			//进入tabble页
 			goPages(pageIndex) {
+				// console.log("================== pageIndox ==================")
+				// if(pageIndex == "pages/my/my") {
+				// 	uni.getUserProfile({
+				// 		desc: '获取你的昵称及头像',
+				// 		success(res) {
+				// 			console.log("================== getUserProfile ==================")
+				// 			console.log(res);
+				// 		}, fail(err) {
+				// 			console.log(err);
+				// 		}
+				// 	});
+					
+				// 	uni.authorize({
+				// 	  scope: 'scope.userInfo',
+				// 	  success () {
+				// 		  console.log("================== scope.userInfo ==================")
+				// 	  }, fail (error) {
+				// 		  console.log(error);
+				// 	  }
+				// 	});
+					
+				// 	uni.getSetting({
+				// 		success(res) {
+				// 			console.log(res.authSetting);
+				// 		}, fail(err) {
+				// 			console.log(err);
+				// 		}
+				// 	});
+				// }
 				uni.switchTab({
 					url: "/" + pageIndex
 				})
diff --git a/main.js b/main.js
index dcd8d73..86cdc70 100644
--- a/main.js
+++ b/main.js
@@ -3,6 +3,7 @@
 import Vue from 'vue'
 import App from './App'
 import store from '@/store/store.js'
+import share from './utils/share.js'
 
 //导入网络请求的包
 import {$http} from '@escook/request-miniprogram'
diff --git a/manifest.json b/manifest.json
index b3db4f1..2ce7d64 100644
--- a/manifest.json
+++ b/manifest.json
@@ -61,9 +61,10 @@
     /* 快应用特有相关 */
     "mp-weixin" : {
         /* 小程序特有相关 */
-        "appid" : "wx9cf00eac2731a25d",
+        "appid" : "wx04d7c402ea59d415",
         "setting" : {
-            "urlCheck" : false
+            "urlCheck" : false,
+            "minified" : true
         },
         "usingComponents" : true,
         "permission" : {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7a95921..a9af322 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -80,8 +80,8 @@
 		  ...mapState('m_user', ['token'])
 		},
 		onLoad(options) {
-			this.checkLogin();
-			if (this.token != "") {
+			// this.checkLogin();
+			// if (this.token != "") {
 				this.getSwiperList();
 				this.getLocation();
 				this.getContent();
@@ -89,7 +89,7 @@
 			    	this.showTitle = false
 			    	clearTimeout(this.timer)
 			    }, 5000)	
-			}
+			// }
 		},
 		onShow() {
 			this.page= "home"
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 78c7536..d67e655 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -1,47 +1,66 @@
 <template>
 	<view class="wrap">
-	  <view class="stabar"></view>
-	  <view class="mainwrap">
-	    <view class="perinfo"> <span class="type-name"><img :src="avatar"></img></span>
-	      <view class="dycd"> <span class="myname" @click="checkMyInfo()">{{name}}</span>
-	        <view class="myitem"> <span @click="showMedal()">勋章：{{medalNum}}<i :style="{'background-color':active == 0 ?'red':'none'}"></i></span> <span>挑战历史：{{challengeNum}}</span> </view>
-	      </view>
-	    </view>
-	    <view class="banbox_sec">
-			<swiper style="height: 100%;" :indicator-dots="false" :autoplay="true" :interval="3000" :duration="1000" :circular="true">
-				<swiper-item v-for="(item, i) in swiperList" :key="i">
-					<navigator style="height: 100%;" class="swiper-item">
-						<img :src="item.uploadPath"></img>
-					</navigator>
-				</swiper-item>
-			</swiper>
+		<view class="stabar"></view>
+		<view class="mainwrap">
+			<view class="perinfo"> <span class="type-name"><img :src="avatar"></img></span>
+				<view class="dycd"> <span class="myname" @click="checkMyInfo()">{{name}}</span>
+					<view class="myitem"> <span @click="showMedal()">勋章：{{medalNum}}<i
+								:style="{'background-color':active == 0 ?'red':'none'}"></i></span>
+						<span>挑战历史：{{challengeNum}}</span>
+					</view>
+				</view>
+			</view>
+			<view class="banbox_sec">
+				<swiper style="height: 100%;" :indicator-dots="false" :autoplay="true" :interval="3000" :duration="1000"
+					:circular="true">
+					<swiper-item v-for="(item, i) in swiperList" :key="i">
+						<navigator style="height: 100%;" class="swiper-item">
+							<img :src="item.uploadPath"></img>
+						</navigator>
+					</swiper-item>
+				</swiper>
+			</view>
+			<view class="mset">
+				<ul>
+					<li v-for="(item,i) in functionList" :key="i">
+						<span @click="navClickHandler(item)"
+							:style="'background-image:url('+item.uploadPath+');'">{{item.name}}</span>
+					</li>
+					<li>
+						<span @click="getUserInfoByWX()">测试</span>
+					</li>
+				</ul>
+			</view>
+		</view>
+		<view class="footbox">
+			<tabbar :page="page"></tabbar>
+		</view>
+
+		<view>
+			<!-- 普通弹窗 -->
+			<uni-popup ref="popup" background-color="#fff" @change="change">
+				<view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }"><text
+						class="text">popup 内容</text></view>
+			</uni-popup>
 		</view>
-	    <view class="mset">
-	      <ul>
-			  <li v-for="(item,i) in functionList" :key="i">
-				  <span @click="navClickHandler(item)" :style="'background-image:url('+item.uploadPath+');'">{{item.name}}</span>
-			  </li>
-	      </ul>
-	    </view>
-	  </view>
-	  <view class="footbox"> 
-		<tabbar :page="page"></tabbar>
-	  </view>
 	</view>
 
 </template>
 
 <script>
 	import tabbar from "@/components/tabbar/tabbar.vue";
-	import {mapState,mapMutations} from 'vuex'
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex'
 	export default {
 		data() {
 			return {
-				active:1,
-				medalNum:0,
-				challengeNum:0,
+				active: 1,
+				medalNum: 0,
+				challengeNum: 0,
 				page: "",
-				name:"",
+				name: "",
 				avatar: uni.$http.baseUrl + "/profile//2024/01/18/6147d64a3b94d7b3d3cc35aaf8cbfe06.png",
 				//轮播图数据列表
 				swiperList: [],
@@ -67,6 +86,7 @@
 			this.getMyMedalList()
 			this.getChallengeTotal()
 			this.getStatus()
+			this.checkLogin();
 		},
 		onPullDownRefresh() {
 			this.name = this.userName;
@@ -78,10 +98,12 @@
 			this.getStatus()
 		},
 		computed: {
-			...mapState('m_user', ['userinfo','userId','userName','avatarUrl'])
+			...mapState('m_user', ['token', 'userinfo', 'userId', 'userName', 'avatarUrl'])
 		},
 		methods: {
-			...mapMutations('m_user', ['updateAddress', 'updateUserInfo', 'updateToken']),
+			...mapMutations('m_user', ['updateAddress', 'updateUserInfo', 'updateToken', , 'updateUserName',
+				'updateUserId', 'updateAvatarUrl', 'updateRedirectInfo'
+			]),
 			async logout() {
 				const [err, succ] = await uni.showModal({
 					title: '提示',
@@ -95,34 +117,40 @@
 				}
 			},
 			async getMyMedalList() {
-				
+
 				const {
 					data: res
-				} = await uni.$http.post('/small/wechat/showMyMedal',{guid:this.userId})
+				} = await uni.$http.post('/small/wechat/showMyMedal', {
+					guid: this.userId
+				})
 				if (!res.success) return uni.$showMsg()
 				this.medalNum = res.data.length;
-				
+
 				// uni.$showMsg('数据请求成功！')
 			},
 			async getStatus() {
-				
+
 				const {
 					data: res
-				} = await uni.$http.post('/small/wechat/getActiveStatus',{guid:this.userId})
+				} = await uni.$http.post('/small/wechat/getActiveStatus', {
+					guid: this.userId
+				})
 				if (!res.success) return uni.$showMsg()
-				if(res.data!=null){
+				if (res.data != null) {
 					this.active = res.data.active;
 				}
 				// uni.$showMsg('数据请求成功！')
 			},
 			async getChallengeTotal() {
-				
+
 				const {
 					data: res
-				} = await uni.$http.post('/small/questionFre/listAll',{userId:this.userId})
+				} = await uni.$http.post('/small/questionFre/listAll', {
+					userId: this.userId
+				})
 				if (!res.success) return uni.$showMsg()
 				this.challengeNum = res.data.length;
-				
+
 				// uni.$showMsg('数据请求成功！')
 			},
 			async getSwiperList() {
@@ -153,30 +181,143 @@
 				this.functionList = res.data;
 				// uni.$showMsg('数据请求成功！')
 			},
-			async showMedal(){
-				if (this.active == 0){
+			async showMedal() {
+				if (this.active == 0) {
 					const {
 						data: res
-					} = await uni.$http.post('/small/wechat/editActiveStatus',{guid:this.userId,active:1})
+					} = await uni.$http.post('/small/wechat/editActiveStatus', {
+						guid: this.userId,
+						active: 1
+					})
 					if (!res.success) return uni.$showMsg()
 					this.active = 1;
 				}
 				uni.navigateTo({
-				  url:'/subpkg/medal/medal?medalNum='+this.medalNum+'&avatarUrl='+this.avatar+'&name='+this.name
+					url: '/subpkg/medal/medal?medalNum=' + this.medalNum + '&avatarUrl=' + this.avatar +
+						'&name=' + this.name
 				})
 			},
 			navClickHandler(item) {
-				if(item !== ""){
+				if (item !== "") {
 					uni.navigateTo({
-					  url: item.pagePath
+						url: item.pagePath
 					})
 				}
 			},
-			checkMyInfo(){
+			checkMyInfo() {
 				uni.navigateTo({
-				  url:'/subpkg/userInfo/userInfo?avatarUrl='+this.avatar+'&name='+this.name
+					url: '/subpkg/userInfo/userInfo?avatarUrl=' + this.avatar + '&name=' + this.name
 				})
-			}
+			},
+			checkLogin() {
+				// if(this.token === "") {
+				   this.getUserInfoByWX();
+				// }
+			},
+			toggle(type) {
+				this.type = type
+				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+				this.$refs.popup.open(type)
+			},
+			getUserInfoByWX() {
+				console.log("================== getUserInfoByWX ==================")
+				let that = this;
+				this.toggle('bottom');
+				// uni.openSetting({
+				// 	success(res) {
+				// 		console.log(res.authSetting);
+				// 	},
+				// 	fail(err) {
+				// 		console.log(err);
+				// 	}
+				// });
+				// 直接拉起授权窗口
+				uni.getUserInfo({
+					provider: 'weixin',
+					success: function(infoRes) {
+						console.log('用户昵称为：' + infoRes.userInfo.nickName);
+						that.getToken(infoRes);
+					},
+					fail(error) {
+						console.log('失败', error);
+						uni.switchTab({
+							url: '/pages/index/index'
+						})
+					}
+				});
+			},
+			getUserInfoByWX2ShowModal() {
+				let that = this;
+				uni.getSetting({
+					success(res) {
+						// 判断个球. 登录页直接拉起授权窗口
+						uni.showModal({
+							title: '授权提示',
+							content: '因您首次进入!我们需要获取您的基础信息，请确认授权',
+							success: function(res) {
+								if (res.confirm) {
+									// 用户点击确定，继续授权
+									uni.getUserInfo({
+										provider: 'weixin',
+										success: function(infoRes) {
+											console.log('用户昵称为：' + infoRes.userInfo
+												.nickName);
+											that.getToken(infoRes);
+										},
+										fail(error) {
+											console.log('失败', error);
+											uni.switchTab({
+												url: '/pages/index/index'
+											})
+										}
+									});
+								} else if (res.cancel) {
+									// 用户点击取消
+									console.log('用户拒绝授权');
+									uni.switchTab({
+										url: '/pages/index/index'
+									})
+								}
+							}
+						});
+					}
+				});
+			},
+			async getToken(info) {
+				// 获取 code 对应的值
+				const [err, res] = await uni.login().catch(err => err)
+				if (err || res.errMsg !== 'login:ok') return uni.$showMsg('登录失败！')
+
+				// 准备参数
+				const query = {
+					code: res.code,
+					encryptedData: info.encryptedData,
+					iv: info.iv,
+					rawData: info.rawData,
+					signature: info.signature
+				}
+
+
+				const {
+					data: loginResult
+				} = await uni.$http.post('/small/wechat/login', query)
+				if (loginResult.token === "") return uni.$showMsg('登录失败！')
+
+				// 直接把 token 保存到 vuex 中
+				this.updateToken(loginResult.token)
+				this.updateUserName(loginResult.userName)
+				this.updateUserId(loginResult.userId)
+				if (loginResult.avatarUrl != null && loginResult.avatarUrl.indexOf('http') == -1) {
+					loginResult.avatarUrl = uni.$http.baseUrl + loginResult.avatarUrl
+				}
+				this.name = loginResult.userName;
+				this.avatar = loginResult.avatarUrl;
+				this.updateAvatarUrl(loginResult.avatarUrl)
+				uni.switchTab({
+					url: '/pages/my/my'
+				})
+				//this.navigateBack()
+			},
 		},
 		components: {
 			tabbar
@@ -186,7 +327,7 @@
 
 <style lang="scss">
 	@import url("@/static/base_css.css");
-	
+
 	// .my-userinfo-container {
 	// 	height: 100%;
 	// 	background-color: #F4F4F4;
diff --git a/subpkg/login/login.vue b/subpkg/login/login.vue
index 26376db..7717e4b 100644
--- a/subpkg/login/login.vue
+++ b/subpkg/login/login.vue
@@ -19,7 +19,7 @@
 	    ...mapState('m_user', ['redirectInfo'])
 	  },
 		methods:{
-			...mapMutations('m_user', ['updateUserInfo', 'updateToken', 'updateUserName','updateUserId','updateAvatarUrl', 'updateRedirectInfo']),
+			...mapMutations('m_user', ['token', 'updateUserInfo', 'updateToken', 'updateUserName','updateUserId','updateAvatarUrl', 'updateRedirectInfo']),
 			getUserInfo(e) {
 			
 			  if (e.detail.errMsg === 'getUserInfo:fail auth deny') return uni.$showMsg('您取消了登录授权！')
@@ -32,6 +32,7 @@
 			  this.updateUserInfo(e.detail.userInfo)
 			  
 			  this.getToken(e.detail)
+			  // this.getUserInfoByWX(e.detail);
 			},
 			async getToken(info) {
 			  // 获取 code 对应的值
@@ -74,6 +75,36 @@
 			      }
 			    })
 			  }
+			},
+			// 获取用户信息
+			getUserInfoByWX(info) {
+				let that = this;
+				uni.getSetting({
+					success(res) {
+						// 判断个球. 登录页直接拉起授权窗口
+						uni.showModal({
+							title: '授权提示',
+							content: '我们需要获取你的基础用户信息，请确认授权',
+							success: function (res) {
+								if (res.confirm) {
+									// 用户点击确定，继续授权
+									uni.getUserInfo({
+										provider: 'weixin',
+										success: function (infoRes) {
+											console.log('用户昵称为：' + infoRes.userInfo.nickName);
+											that.getToken(info);
+										}, fail (error) {
+											console.log('失败', error);
+										}
+									});
+								} else if (res.cancel) {
+									// 用户点击取消
+									console.log('用户拒绝授权');
+								}
+							}
+						});
+					}
+				});
 			}
 		}
 	}