1

src/pages/index/index.vue

@@ -405,8 +405,8 @@ export default {
           data.baseInfo[3].desc = res.Data.SurplusHours + "课时";
           data.baseInfo[3].jumpUrl =
             "/pages/surplusTime/surplusTime?id=" + res.Data.ClassId;
-          data.baseInfo[4].desc = res.Data.ContractNum;
-          data.baseInfo[5].desc = res.Data.TeacherName;
+          // data.baseInfo[4].desc = res.Data.ContractNum;
+          data.baseInfo[4].desc = res.Data.TeacherName;
         }
       },
       async getActivityData() {

src/pages/login/login.vue

@@ -37,7 +37,7 @@
     </view>
 	<view class="flex flex_between_center btnBox">
 		<view class="loginBtn flex flex_center_center" @click="login">账号登录</view>
-		<button class="loginBtn" open-type="getPhoneNumber" @getphonenumber="getphonenumber">手机号一键登录</button>
+		<button class="phoneBtn flex flex_center_center" open-type="getPhoneNumber" @getphonenumber="getphonenumber">手机号一键登录</button>
 	</view>
     
     <!-- <view class="auth" @click="authLogin"> 授权手机号一键登录 </view> -->
@@ -65,6 +65,10 @@ export default {
     let msg = reactive({
       Account: "",
       Password: "",
+    });
+	let data =reactive({
+      phoneNum: "",
+	  openid:""
     });
     let methods = {
       usernameInput(val) {
@@ -106,35 +110,66 @@ export default {
           setTimeout(() => {
             let data = uni.getStorageSync("userInfo");
             if (data) {
-              console.log(137, data);
               that.jumpPage();
             }
           }, 1000);
         }
       },
+	  //获取手机号
       getphonenumber(e){
-		  console.log(117,e)
+		if(e.detail.encryptedData&&e.detail.iv){
 		   let encryptedData = e.detail.encryptedData;
 		   let iv = e.detail.iv;
-		   
 		   uni.login({
 		     provider: 'weixin',
 		     success: async (loginRes)=> {
 		      let code=loginRes.code
+			  //解密手机号
 			  let res = await parsePhone({
 				  encryptedData,
 				  iv,
 				  code
 			  })
-			  console.log(0,res)
+			  if(res){
+				data.phoneNum=res.Data.phoneNumber
+				data.openid=res.Data.openid
+				that.phoneNumLogin()  
+			  }
 		     }
 		   });
+		}else{
+			   uni.showToast({
+			   	title: '授权失败',
+			   	duration: 2000,
+			   	icon: "error",
+			   });
+		}
+	  },
+	  //手机号授权登录
+	 async phoneNumLogin(){
+		 let res=await phoneLogin({
+			   Account:data.phoneNum,
+			   OpenId:data.openid
+		  })
+		  if(res){
+			   res.Data.Account =data.phoneNum;
+			   uni.setStorageSync("userInfo", res.Data);
+			   Toast.success("登录成功");
+			   setTimeout(() => {
+			     let data = uni.getStorageSync("userInfo");
+			     if (data) {
+			       console.log(147, data);
+			       that.jumpPage();
+			     }
+			   }, 1000);
+		  }
 	  }
     };
     onMounted(() => {});
     let that = methods;
     return {
       ...toRefs(msg),
+	   ...toRefs(data),
       ...methods,
     };
   },
@@ -174,7 +209,7 @@ export default {
 }
 
 .loginBtn {
-  width: 260rpx;
+  width: 280rpx;
   height: 90rpx;
   background-color: #00acf9;
   border-radius: 12rpx;
@@ -183,7 +218,17 @@ export default {
   font-weight: 500;
   color: #ffffff;
 }
-
+.phoneBtn{
+	width: 280rpx;
+	height: 90rpx;
+	background-color: #E6A23C;
+	border-radius: 12rpx;
+	font-size: 32rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #ffffff;
+	margin: 0;
+}
 .auth {
   text-align: center;
   font-size: 26rpx;
@@ -201,8 +246,8 @@ export default {
 .btnBox{
 	width: 600rpx;
 	height: 90rpx;
-	/* background-color: #00acf9; */
 	border-radius: 12rpx;
+	overflow: hidden;
 	margin: 0 auto;
 	font-size: 32rpx;
 	font-family: PingFang SC;