2

src/pages/index/components/indexassembly.vue

@@ -170,7 +170,6 @@
 						unionid: data.obj.unionid,
 					})
 					if (res.Code==1) {
-						
 						uni.hideLoading();
 						data.showLogin = true; //防止多次点击登录
 						res.Data.Account = data.obj.phoneNum;
@@ -181,16 +180,18 @@
 						uni.showTabBar()
 					}else{
 						data.showLogin = true; //防止多次点击登录
-						data.showPhone = false
-						uni.showTabBar()
+						data.showPhone = false
+						if(currentRoute=="pages/index/index"){
+							uni.showTabBar()//手机授权弹窗出现 隐藏tabbar 
+						} 
 						uni.hideLoading();
 						if(res.Data.Error==-1){//如果没找到电话号码 就跳入登录
-						
-							setTimeout(() => {
-							  uni.reLaunch({
-							  	url: '/pages/login/login'
-							  });
-							}, 1000);
+							
+							// setTimeout(() => {
+							//   uni.reLaunch({
+							//   	url: '/pages/login/login'
+							//   });
+							// }, 1000);
 							
 						}
 						

src/pages/index/index.vue

@@ -63,7 +63,7 @@
 			<view class="wordDuration" style="visibility: hidden;">
 				预计用时10分钟
 			</view>
-			<view class="wordBtn" v-if="(pageData.Words.NextWord==0||!pageData.Words.NextWord)&&(pageData.Words.ReviewWord==0||!pageData.Words.ReviewWord)"> 暂无新词</view>
+			<view style="text-align: center;font-size: 22rpx;color: #4C50E7;" v-if="(pageData.Words.NextWord==0||!pageData.Words.NextWord)&&(pageData.Words.ReviewWord==0||!pageData.Words.ReviewWord)"> 暂无新词</view>
 			<view class="wordBtn" v-else
 				@click="jumpPage(`/pages/word/word?CourseId=${pageData.Words.CourseId||0}&&ChapterId=${pageData.Words.NextCourseNo||0}&&ReviewChapterId=${pageData.Words.ReviewCourseNo||0}&&ClassId=${pageData.Words.ClassId||0}`)">
 				开始学习
@@ -367,7 +367,7 @@
 		width: 100%;
 		height: 300rpx;
 		border-radius: 20rpx;
-		margin-bottom: 50rpx;
+		margin: 40rpx 0 60rpx 0;
 		overflow: hidden;
 		box-sizing: border-box;
 		padding: 0 30rpx;
@@ -417,8 +417,8 @@
 		box-sizing: border-box;
 		/* height: 390rpx; */
 		background-color: #EBEBEB;
-		padding: 30rpx;
-		margin-bottom: 50rpx;
+		padding: 60rpx 30rpx;
+		margin-bottom: 80rpx;
 	}
 
 	.wordTitle {
@@ -492,7 +492,7 @@
 		box-sizing: border-box;
 		padding: 10rpx;
 		position: relative;
-		margin-bottom: 50rpx;
+		margin-bottom: 80rpx;
 	}
 
 	.courseInnerBox {
@@ -574,14 +574,14 @@
 		font-size: 28rpx;
 		font-weight: 500;
 		color: #666666;
-		margin-bottom: 15rpx;
+		margin-bottom: 30rpx;
 	}
 
 	.learningGardenTitle {
 		font-size: 46rpx;
 		font-weight: 800;
 		color: #111111;
-		margin-bottom: 35rpx;
+		margin-bottom: 50rpx;
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
@@ -591,7 +591,7 @@
 		width: 680rpx;
 		height: 455rpx;
 		border-radius: 24rpx;
-		margin-bottom: 30rpx;
+		margin-bottom: 60rpx;
 		overflow: hidden;
 		position: relative;
 	}

src/pages/person/person.vue

@@ -209,7 +209,7 @@
 
 	.person .info {
 		height: 160rpx;
-		padding: 0 35rpx;
+		padding: 10rpx 35rpx;
 	}
 
 	.person .info .left {
@@ -240,8 +240,8 @@
 
 	.person .orderInfo {
 		height: 195rpx;
-		padding: 0 35rpx;
-		margin-bottom: 50rpx;
+		padding: 10rpx 35rpx;
+		margin-bottom: 70rpx;
 	}
 
 	.person .orderItem {
@@ -280,20 +280,20 @@
 		/* height: 535rpx; */
 		background-color: #ebebeb;
 		padding: 35rpx;
-		margin-bottom: 50rpx;
+		margin-bottom: 70rpx;
 	}
 
 	.courseInfo .title {
 		font-size: 28rpx;
 		font-weight: bold;
 		color: #111111;
-		margin-bottom: 30rpx;
+		margin-bottom: 40rpx;
 	}
 
 	.statistic {
 		/* height: 70rpx; */
 		display: flex;
-		margin-bottom: 50rpx;
+		margin-bottom: 70rpx;
 	}
 
 	.statisticItem {
@@ -390,7 +390,7 @@
 		font-size: 28rpx;
 		font-weight: 500;
 		color: #666666;
-		margin-bottom: 20rpx;
+		margin-bottom: 30rpx;
 	}
 
 	.serviceItem {
@@ -399,7 +399,7 @@
 		height: 185rpx;
 		background-color: #ffffff;
 		border-radius: 24rpx;
-		margin-top: 30rpx;
+		margin-top: 40rpx;
 		display: flex;
 		/* justify-content: space-between; */
 		align-items: center;

src/pages/study/index.vue

@@ -36,14 +36,14 @@
 	}
 
 	.box_t {
-		padding: 18px;
+		padding: 40rpx 36rpx;
 	}
 
 	.box_tb {
 		height: 388rpx;
 		background: #FFFFFF;
-		border-radius: 12px;
-		padding: 15px;
+		border-radius: 24rpx;
+		padding: 30rpx;
 	}
 
 	.box_tb_c {
@@ -69,7 +69,7 @@
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		margin-top: 5px;
+		margin-top: 10rpx;
 	}
 
 	.box_tb_b .btn {
@@ -150,14 +150,12 @@
 	}
 
 	.examination {
-		margin-top: 25px;
-
+		margin-top: 60rpx;
 	}
 
 	.examination-box {
 		background: #FFF;
-
-		margin: 10px 0;
+		margin: 40rpx 0;
 	}
 
 	.examination-box-c {
@@ -172,7 +170,7 @@
 		width: 200rpx;
 		/* height: 100%; */
 		display: inline-block;
-		padding: 10px 0;
+		padding: 40rpx 0;
 		box-sizing: border-box;
 		/* border-right: 1px solid #E2E2E2; */
 	}
@@ -308,7 +306,7 @@
 						</view>
 						<view class="box_tb_b">
 							<view style="font-size: 22rpx;color: #999999;visibility: hidden;">预计用时10分钟</view>
-							<view class="btn"
+							<view style="text-align: center;font-size: 22rpx;color: #4C50E7;"
 								v-if="(InfoData.Words.NextWord==0||!InfoData.Words.NextWord)&&(InfoData.Words.ReviewWord==0||!InfoData.Words.ReviewWord)">
 								暂无新词</view>
 							<view class="btn" @click="jumpStudyPage()" v-else>立即学习</view>
@@ -388,7 +386,7 @@
 					<view v-if="InfoData.ExamList.length>0">
 						<view v-for="(x,y) in InfoData.ExamList" :key='y'>
 							<view class="examination-box">
-								<view style="padding: 20px;">
+								<view style="padding: 60rpx 40rpx;">
 									<view style="font-size: 36rpx;font-weight: bold;color: #111111;">{{x.PaperName}}
 									</view>
 									<!-- <view style="font-size: 24rpx;font-weight: 500;color: #999999;margin-top: 9px;">

src/utils/request.js

@@ -41,7 +41,7 @@ let request = (param) => {
 						uni.showToast({
 							title: res.data.Message,
 							duration: 2000,
-							icon: "error",
+							icon: "none",
 							success() {
 								if(res.data.Code === 0 && res.data.Data.Error==-1){//如果电话号码没有
 									resolve(res.data)