添加授权页面

App.vue

@@ -5,7 +5,15 @@ export default {
     shareUrl: "https://kiq.xazhima.com/",
     globalTimestamp: Date.now().toString(),
     secret: "AirQK_weichat_app_zhima",
-    selectedIndex:0
+    selectedIndex:0,
+	user_id: '',
+	open_id:'',
+	user_status:'',
+	user_name:'',
+	user_phone:'',
+	user_headUrl:'',
+	isAuth:false,
+	session_key: '',
   },
   onLaunch: function () {
     console.log("App Launch");

pages/auth/index.vue

@@ -1,217 +1,135 @@
 <template>
-	<view>
-	<view v-if="imStaff&&!isLogin" class="auth">
-		<image src="/static/login-logo.png" mode=""></image>
-			提示：工作人员登录后才能显示会员管理信息<br/>
-			请点击
-			<button v-if="!isAuth" type='primary' class="allow" open-type="getUserInfo" @getuserinfo="getUserInfo">授权</button>
-			<button v-if="isAuth" type="primary" class="allow"  open-type="getPhoneNumber"  style="font-size: 12px;" @getphonenumber="getPhoneNumber">绑定手机</button>
-	</view>
-	<view v-if="imMember&&(!isLogin)" class="auth">
-		<image src="/static/login-logo.png" mode=""></image>
-			提示：会员登录后才能使用会员功能<br/>
-			请点击
-			<button v-if="!isAuth" type='primary' class="allow" open-type="getUserInfo" @getuserinfo="getUserInfo">授权</button>
-			<button v-if="isAuth" type="primary" class="allow"  open-type="getPhoneNumber"  style="font-size: 12px;" @getphonenumber="getPhoneNumber">绑定手机</button>
-	</view>
-	<uni-popup ref="popup" type="center">
-		<view class="uni-tip">
-			<view class="uni-tip-title">登录失败</view>
-			<view class="uni-tip-content">您授权的手机号与后台信息不匹配，请联系客服人员{{kf_number}}</view>
-			<button class="uni-tip-button" @click="closePopup">确定</button>
+	<view class="auth">
+		
+		<image src="/static/logo.png" mode="aspectFill"></image>
+		
+		<text class="margin-top-3 auth-title">欢迎使用空i企小程序</text>
+		
+		<text class="margin-top-3 auth-content">此页面是微信授权页面,授权之后你可以获取更优质的服务,您的隐私将会受到保护</text>
+		
+		<view class="margin-top-3">
+			<button type='default' class="refuse" @click="refuseBtn">暂不授权</button>
+			<button type='primary' class="allow" @click="getUserInfo()" v-if="!isAuth">登录授权</button>
+			<button type="primary" class="allow"  open-type="getPhoneNumber"  style="font-size: 12px;"
+			@getphonenumber="getPhoneNumber" v-if="isAuth && !isNeedPhone">手机号码授权</button> 
 		</view>
-	</uni-popup>
-
+		
 	</view>
 </template>
 
 <script>
-var md5 = require("../../common/md5.js");
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-export default {
-	components: {
-		uniPopup,
-	},
-	data(){
-		return {
+	import md5 from '@/common/md5.js';
+	export default {
+		data(){
+			return {
 				iv:'',
 				encryptedData:'',
-				session_key:getApp().globalData.session_key,
-				open_id: getApp().globalData.open_id,
-				imStaff:getApp().globalData.imStaff,
-				imMember:getApp().globalData.imMember,
-			    isAuth:getApp().globalData.isAuth,
-				isBind:getApp().globalData.isBind,
-				isLogin:getApp().globalData.isLogin,
-				kf_number:getApp().globalData.kf_number,
-				user_type:'',
-		}
-	},
-	onLoad() {
-		// console.log("是否授权"+getApp().globalData.isAuth);
-		// console.log("是否绑定"+getApp().globalData.isBind);
-		// console.log("是否登录"+getApp().globalData.isLogin);
-		// console.log("是否工作人员"+getApp().globalData.imStaff);
-		// console.log("是否客户"+getApp().globalData.imMember);
-	},
-	watch:{
-		user_type(){
-			console.log("监听到用户类型了！");
-			// this.judgeStaff(getApp().globalData.user_type);
+				isNeedPhone:getApp().globalData.user_phone,
+			    isAuth:getApp().globalData.isAuth
+			}
 		},
-	},
-	methods:{
-		loginRequest(){
-			uni.login({
-				success: (res) => {
-					uni.request({
-						url: getApp().globalData.shareUrl, //需要设置为全局
-						method: 'POST',
-						header: {
-							'content-type': 'application/x-www-form-urlencoded',
-						},
-						data: {
-							method: 'login',
-							timestamp: getApp().globalData.globalTimestamp,
-							code: res.code,
-							sign: md5('login' + getApp().globalData.globalTimestamp)
-						},
-						success: res => {
-							// 通过openid发起会员登录
-							console.log(res);
-							if(res.data.msg.status===1){
-								getApp().globalData.isAuth=true;//用户已授权 手机号未绑定
-							}else if(res.data.msg.status===2){
-								getApp().globalData.isAuth=true;
-								getApp().globalData.isBind=true;//用户手机号已绑定 进入调用用户信息流程来判断用户类型
-							    this.getSelInfo();
-							};
-							getApp().globalData.open_id = res.data.msg.openId;
-							getApp().globalData.session_key = res.data.msg.session_key;
-							console.log('会员&工作人员尝试登录');
-						},
-					});
-				},
-			});
+		onLoad() {
+			this.loginLoad()
 		},
-		getSelInfo(){
-			let that = this;
-			uni.request({
-				url: getApp().globalData.shareUrl, 
-				method: 'POST',
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				data: {
-					sign: md5('get_member_info' + getApp().globalData.globalTimestamp),
-					method: 'get_member_info',
-					timestamp: getApp().globalData.globalTimestamp,
-					openId: getApp().globalData.open_id,
-				},
-				success:(res)=>{
-					if(res.data.code===200){
-						getApp().globalData.user_id=res.data.msg.id;
-						getApp().globalData.user_type=res.data.msg.type;
-						getApp().globalData.member_count=res.data.msg.member_count;
-						getApp().globalData.user_adminid=res.data.msg.adminid;
-						getApp().globalData.user_headimg=res.data.msg.headimg;
-						getApp().globalData.user_name=res.data.msg.name;
-						getApp().globalData.user_nickname=res.data.msg.nickname;
-						getApp().globalData.user_sex=res.data.msg.sex;
-						getApp().globalData.user_status=res.data.msg.status;
-						getApp().globalData.user_birthday=res.data.msg.birthday;
-						getApp().globalData.user_idnum=res.data.msg.idnum;
-						getApp().globalData.user_phone=res.data.msg.phone;
-						getApp().globalData.user_email=res.data.msg.email;
-						getApp().globalData.user_home_address=res.data.msg.home_address;
-						getApp().globalData.user_send_address=res.data.msg.send_address;
-						getApp().globalData.user_pcode=res.data.msg.pcode;
-						getApp().globalData.user_number=res.data.msg.number;
-						getApp().globalData.user_firsttime=res.data.msg.firsttime;
-						getApp().globalData.user_addtime=res.data.msg.addtime;
-						getApp().globalData.user_balance=res.data.msg.balance;
-						getApp().globalData.user_deadline=res.data.msg.deadline;
-						getApp().globalData.user_doctor=res.data.msg.doctor;
-						getApp().globalData.user_doctor_name=res.data.msg.doctor_name;
-						getApp().globalData.user_online_doctor=res.data.msg.online_doctor;
-						getApp().globalData.user_online_doctor_name=res.data.msg.online_doctor_name;
-						getApp().globalData.user_kf=res.data.msg.kf;
-						getApp().globalData.user_kf_name=res.data.msg.kf_name;
-						getApp().globalData.member_count=res.data.msg.member_count;
-						getApp().globalData.user_health_doc=res.data.msg.health_doc;
-						getApp().globalData.roomId = res.data.msg.type === '0' ? res.data.msg.rooms[0] :res.data.msg.rooms;
-						if(getApp().globalData.user_deadline*1000<new Date().getTime()){
-							getApp().globalData.deadline=true;
+		methods:{
+			loginLoad(){
+				let that = this;
+				uni.login({
+					success(res) {
+						that.loginRequest(res.code)
+					}
+				})
+			},
+			loginRequest(codeRes){
+				let md5Sign = md5("method="+'user'+"&timestamp="+getApp().globalData.globalTimestamp+"&secret="+getApp().globalData.secret)
+				let url = getApp().globalData.shareUrl+'api/api.php'+'?method=user&source=user&action=login&timestamp='+getApp().globalData.globalTimestamp +'&sign='+md5Sign
+				uni.request({
+					url:url,
+					method: 'POST',
+					header: {
+						'content-type': 'application/x-www-form-urlencoded'
+					},
+					data: {
+						code:codeRes
+					},
+					success: (res) => {
+						console.log(res)
+						if(res.data.code === 200){
 						}
-						console.log("读取用户个人信息成功");
-						that.judgeStaff(getApp().globalData.user_type);
+					},
+					fail: () => {
+						console.log("连接失败");
 					}
-				},
-				fail:()=>{
-					console.log("读取用户个人信息失败");
-				},
-			});
-		},
-		judgeStaff(type){
-			if(type==0){
-				if(!getApp().globalData.imMember){
-					this.$refs.popup.open();
-					getApp().globalData.isSignOut=true;
-					getApp().globalData.isAuth=false;
-					getApp().globalData.isBind=false;
-					getApp().globalData.isLogin=false;
-					this.signout();
-				}else{
-					getApp().globalData.isLogin=true;
-					console.log("该用户登录成功");
-					if(getApp().globalData.user_deadline*1000<new Date().getTime()){
-						getApp().globalData.deadline=true;
+				});
+			},
+			getUserInfo() {
+				uni.getUserProfile({
+					desc:'登录',
+					success:(res)=> {
+						getApp().globalData.user_headUrl = res.userInfo.avatarUrl;
+						getApp().globalData.user_name = res.userInfo.nickName;
+						this.iv = res.iv;
+						this.encryptedData = res.encryptedData;
+						this.isAuth = true;
+						getApp().globalData.isAuth = true;
+						//this.loginUserInfo()
+					},
+					fail:(err)=> {
+						getApp().globalData.isAuth = false;
 					}
-					this.refuseBtn();
-					//登陆成功再获取一次用户信息，登录状态不同获取的信息不一致
-				}
-			}else{
-				if(!getApp().globalData.imStaff){
-					this.$refs.popup.open();
-					getApp().globalData.isSignOut=true;
-					getApp().globalData.isAuth=false;
-					getApp().globalData.isBind=false;
-					getApp().globalData.isLogin=false;
-					this.signout();
-				}else{
-					getApp().globalData.isLogin=true;
-					console.log("该医生&客服登录成功");
-					this.goChatlist();
-					// this.getSelInfo();
-				}
-			}
-		},
-		getUserInfo(e) {
-				if (e.detail.errMsg == "getUserInfo:ok") {
-					console.log(e);
-					getApp().globalData.isAuth = true;
-					getApp().globalData.user_headimg = e.detail.userInfo.avatarUrl;
-					getApp().globalData.user_name = e.detail.userInfo.nickName;
-					this.iv = e.detail.iv;
-					this.encryptedData = e.detail.encryptedData;
-					this.isAuth=true;
-					console.log("用户信息授权成功");
-				} else {
-					console.log("用户信息授权失败");
-					this.isAuth = false;
-					getApp().globalData.isAuth = false;
-				}
+				})
+				// if (e.detail.errMsg == "getUserInfo:ok") {
+				// 	getApp().globalData.user_headUrl = e.detail.userInfo.avatarUrl;
+				// 	getApp().globalData.user_name = e.detail.userInfo.nickName;
+				// 	this.iv = e.detail.iv;
+				// 	this.encryptedData = e.detail.encryptedData;
+				// 	console.log(e.detail)
+				// 	//this.loginUserInfo()
+				// } else {
+				// 	console.log("用户信息授权失败");
+				// 	getApp().globalData.isAuth = false;
+				// }
 			},
-		getPhoneNumber(e){
-				console.log(e);
+			getPhoneNumber(e){
 				let that = this;
 				 if (e.detail.errMsg == 'getPhoneNumber:ok') { //允许授权执行跳转
-				  that.phoneRequest(e.detail.iv, e.detail.encryptedData, getApp().globalData.session_key);
+				  that.phoneRequest(e.detail.iv, e.detail.encryptedData, getApp().globalData.session_key)
 				} else { //
 				      that.isNeedPhone = false;
 				}
 			},
-		phoneRequest(myIv,myEncryptedData,sKey){
+			phoneRequest(myIv,myEncryptedData,sKey){
+				let that = this;
+				let md5Sign = md5("method="+'user'+"&timestamp="+getApp().globalData.globalTimestamp+"&secret="+getApp().globalData.secret)
+				let url = getApp().globalData.shareUrl+'api/api.php'+'?method=user&source=user&action=phone&timestamp='+getApp().globalData.globalTimestamp +'&sign='+md5Sign
+				uni.request({
+					url:url,
+					method: 'POST',
+					header: {
+						'content-type': 'application/x-www-form-urlencoded'
+					},
+					data: {
+						iv:myIv,
+						sessionKey:sKey ||'MlkY744GF9fmIqXzS4YEkw==',
+						encryptedData:myEncryptedData,
+					},
+					success: (res) => {
+						console.log(res)
+						if(res.data.code === 200){
+							getApp().globalData.user_phone = res.data.phoneNumber;
+							that.refuseBtn();
+						}
+					},
+					fail: () => {
+						console.log("连接失败");
+					}
+				});
+			},
+			refuseBtn(){
+				uni.navigateBack({
+				});
+			},
+			loginUserInfo(){
 				let that = this;
 				uni.request({
 					url:getApp().globalData.shareUrl, //需要设置为全局
@@ -221,134 +139,40 @@ export default {
 					},
 					data: {
 						method: 'auth',
-						timestamp: getApp().globalData.globalTimestamp, 
+						timestamp: getApp().globalData.globalTimestamp, //Date.now()
+						id:getApp().globalData.user_id,
 						sign: md5('auth' + getApp().globalData.globalTimestamp),
-						iv:myIv,
-						encryptedData:myEncryptedData,
-						session_key:sKey,
-						openId: that.open_id,
+						nickname:getApp().globalData.user_name,
+						headimg:getApp().globalData.user_headUrl,
+						auth_status:1,
 					},
 					success: res => {
-						console.log(res.data.code);
-						if(res.data.code===200){
-							console.log("手机号绑定成功!");
-							getApp().globalData.isBind=true;
-							that.uploadHeadimg();
-						}else{
-							this.$refs.popup.open();
-							getApp().globalData.isSignOut=true;
-							getApp().globalData.isAuth=false;
-							getApp().globalData.isBind=false;
-							getApp().globalData.isLogin=false;
-							this.isBind = false;
+						if(res.data.code === 200){
+							getApp().globalData.user_id = res.data.msg.id;
+							getApp().globalData.open_id = res.data.msg.openid;
+							getApp().globalData.isAuth = true;
+							getApp().globalData.user_headUrl = res.data.msg.headimg;
+							getApp().globalData.user_name = res.data.msg.name;
+							getApp().globalData.user_status = res.data.msg.status;
+							getApp().globalData.user_phone = res.data.msg.phone;
+							that.isNeedPhone = res.data.msg.phone;
+							that.isAuth = getApp().globalData.isAuth;
 						}
+						else {
+							uni.showToast({
+								title: res.data.msg,
+								icon: 'none',
+								duration:2000
+							});
+						}
+						
+						// uni.navigateBack({
+						// });
 					} 
 				});
 			},
-		uploadHeadimg(){
-			let that = this;
-			uni.request({
-				url: getApp().globalData.shareUrl, 
-				method: 'POST',
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				data: {
-					sign: md5('update_member_info' + getApp().globalData.globalTimestamp),
-					method: 'update_member_info',
-					timestamp: getApp().globalData.globalTimestamp, 
-					openId:getApp().globalData.open_id,
-					key:'headimg',
-					value:getApp().globalData.user_headimg,
-				},
-				success:(res)=>{
-					if(res.data.code===200){
-						getApp().globalData.user_headimg=res.data.msg.headimg;
-						that.getSelInfo()
-						console.log("将微信头像作为用户头像");
-					}
-				},
-				fail:()=>{
-					console.log("微信头像作为用户头像更新失败");
-				},
-			});
-		},
-		refuseBtn(){
-			uni.navigateBack({
-				delta: 1
-			});
-		},
-		goChatlist(){
-			uni.reLaunch({
-				url: '../index/chatList/index',
-				success: res => {},
-				fail: () => {},
-				complete: () => {}
-			});
-			return true;
-		},
-		signout(){
-			getApp().globalData.isAuth=false;
-			getApp().globalData.isBind=false;
-			getApp().globalData.isLogin=false;
-			uni.request({
-				url: getApp().globalData.shareUrl, 
-				method: 'POST',
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				data: {
-					sign: md5('update_member_info' + getApp().globalData.globalTimestamp),
-					method: 'update_member_info',
-					timestamp: getApp().globalData.globalTimestamp, 
-					uid:getApp().globalData.user_id,
-					openId:getApp().globalData.open_id,
-					key:'login_status',
-					value:0,
-				},
-				success:(res)=>{
-					if(res.data.code===200){
-						getApp().globalData.login_status=res.data.msg.login_status;
-						getApp().globalData.user_headimg=res.data.msg.headimg;
-						getApp().globalData.user_name=res.data.msg.name;
-						getApp().globalData.user_birthday=res.data.msg.birthday;
-						getApp().globalData.user_idnum=res.data.msg.idnum;
-						getApp().globalData.user_phone=res.data.msg.phone;
-						getApp().globalData.user_email=res.data.msg.email;
-						getApp().globalData.user_home_address=res.data.msg.home_address;
-						getApp().globalData.user_send_address=res.data.msg.send_address;
-						getApp().globalData.user_pcode=res.data.msg.pcode;
-						getApp().globalData.user_number=res.data.msg.number;
-						getApp().globalData.user_firsttime=res.data.msg.firsttime;
-						getApp().globalData.user_balance=res.data.msg.balance;
-						getApp().globalData.user_deadline=res.data.msg.deadline;
-						getApp().globalData.user_doctor_name=res.data.msg.doctor_name;
-						getApp().globalData.user_online_doctor_name=res.data.msg.online_doctor_name;
-						getApp().globalData.kf_name=res.data.msg.kf_name;
-						console.log("退出登录成功！");
-					}
-				},
-				fail:()=>{
-					console.log("999");
-				},
-			});
-		},
-		closePopup(){
-			getApp().globalData.isSignOut=true;
-			getApp().globalData.isAuth=true;
-			getApp().globalData.isBind=false;
-			getApp().globalData.isLogin=false;
-			
-				this.$refs.popup.close();
-				uni.reLaunch({
-						url: '../index/chooseId/index',
-						success: res => {},
-						fail: () => {},
-						complete: () => {}
-				});
-		},
+		}
 	}
-}
 </script>
 
 <style>
@@ -429,50 +253,4 @@ export default {
    .margin-top-3{
 	   margin-top: 10%;
    }
-   
-   
-   .uni-tip {
-   	 	padding: 30rpx;
-   	 	width: 600rpx;
-   		height: 340rpx;
-   	 	background: #fff;
-   	 	box-sizing: border-box;
-   		border:2rpx solid #fff;
-   	 	border-radius: 10rpx;
-   	}
-   	 
-   	.uni-tip-title {
-   	 	text-align: center;
-		height: 40rpx;
-   	 	/* font-weight: bold; */
-   	 	font-size: 30rpx;
-		background: #fff;
-   	 	/* color: #333; */
-   	}
-   	 
-   	.uni-tip-content {
-		text-align: center;
-		background: #fff;
-   	 	padding: 15px;
-   	 	font-size: 28rpx;
-		height: 70rpx;
-		line-height: 1.8;
-   	 	/* color: #666; */
-   	}
-	 
-	.uni-tip-button {
-		width: 200rpx;
-		height: 60rpx;
-		line-height: 60rpx;
-	 	margin-top: 30rpx;
-	 	/* display: flex; */
-		text-align: center;
-		background: #fff;
-		font-size: 28rpx;
-		color: #c02924;
-		border: solid 1rpx #c02924;
-		border-radius: 30rpx;
-	}
-   
-   
-</style>
+</style>

pages/index/index.vue

@@ -272,36 +272,6 @@
 			swiperChange(e){
 				this.swiperCurrent = e.detail.current
 			},
-			loginLoad(){
-				let that = this;
-				uni.login({
-					success(res) {
-						that.loginRequest(res.code)
-					}
-				})
-			},
-			loginRequest(codeRes){
-				let md5Sign = md5("method="+'user'+"&timestamp="+getApp().globalData.globalTimestamp+"&secret="+getApp().globalData.secret)
-				let url = getApp().globalData.shareUrl+'api/api.php'+'?method=user&source=user&action=login&timestamp='+getApp().globalData.globalTimestamp +'&sign='+md5Sign
-				uni.request({
-					url:url,
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					data: {
-						code:codeRes
-					},
-					success: (res) => {
-						console.log(res)
-						if(res.data.code === 200){
-						}
-					},
-					fail: () => {
-						console.log("连接失败");
-					}
-				});
-			},
 			getSwiperList(){
 				let md5Sign = md5("method="+'common'+"&timestamp="+getApp().globalData.globalTimestamp+"&secret="+getApp().globalData.secret)
 				let url = getApp().globalData.shareUrl+'api/api.php'+'?method=common&source=main_pics&action=list&timestamp='+getApp().globalData.globalTimestamp +'&sign='+md5Sign

pages/selfCenter/index.vue

@@ -2,9 +2,12 @@
   <view class="content">
     <foot-tabs></foot-tabs>
     <div class="self-inf">
-      <div class="img-name-box">
-        <image src="/static/logo.png" alt="" class="heade-img" mode="aspectFill"></image>
-        <p src="" alt="" class="nickname">微信昵称2233</p>
+	   <view class="img-name-box" v-if="!isAuth">
+		   <button  @click="goAuthPage()" class="auth-btn">点击去授权</button>
+	   </view>
+      <div class="img-name-box" v-if="isAuth">
+        <image :src="userHeadImg" alt="" class="heade-img" mode="aspectFill"></image>
+        <p  class="nickname">{{userNickName}}</p>
       </div>
       <image class="bg-img" :src="swiperBackground" mode="aspectFill"></image>
 	  <image src="../../static/Intersect.svg" class="groove-img"></image>
@@ -31,6 +34,9 @@ export default {
   data() {
     return {
       message: "我的",
+	  isAuth:getApp().globalData.isAuth,
+	  userHeadImg:getApp().globalData.user_headUrl,
+	  userNickName:getApp().globalData.user_name,
       list: [
         { icoin: "/static/selfCenter/suggest.png", name: "我的建议" },
         { icoin: "/static/selfCenter/sign.png", name: "我的报名" },
@@ -43,7 +49,19 @@ export default {
   onLoad() {
 	  this.getSwiperList();
   },
+  onShow() {
+  	 this.isAuth = getApp().globalData.isAuth;
+	 if(this.isAuth){
+		 this.userHeadImg = getApp().globalData.user_headUrl;
+		 this.userNickName = getApp().globalData.user_name;
+	 }
+  },
   methods: {
+	  goAuthPage(){
+		  uni.navigateTo({
+		  	url:'../auth/index'
+		  })
+	  },
 	  getSwiperList(){
 	  	let md5Sign = md5("method="+'common'+"&timestamp="+getApp().globalData.globalTimestamp+"&secret="+getApp().globalData.secret)
 	  	let url = getApp().globalData.shareUrl+'api/api.php'+'?method=common&source=main_pics&action=list&timestamp='+getApp().globalData.globalTimestamp +'&sign='+md5Sign
@@ -88,6 +106,13 @@ export default {
       margin-top: 70rpx;
       display: flex;
       align-items: center;
+	  .auth-btn {
+		  margin-left: 80rpx;
+		  margin-top: 50rpx;
+		  font-size: 28rpx;
+		  background-color: #02A7F0;
+		  color: #fff;
+	  } 
       .heade-img {
         z-index: 1;
         width: 100rpx;