tanxue 1 день назад
Родитель
Сommit
c92174115d

+ 7 - 0
common/styles/global/components.scss

@@ -132,6 +132,13 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 	width: 24rpx;height: 38rpx;content: '';display: block;margin: 12rpx 32rpx 12rpx;transform: rotate(180deg);
 	background-image: url("@/static/images/common/h-jt-icon.png");@include ezy-no-repeat-cover();
 }
+
+/***** 登录按钮 *****/
+.login-btn{width: 655rpx;height: 92rpx;line-height: 92rpx;text-align: center;font-size:32rpx;
+	margin-top: 84rpx;@include ezy-no-repeat-cover;font-weight: bold;}
+.login-btn-disabled{background-image: url("@/static/images/login/login-btn-bj-disabled.png");color:#999b9a;}
+.login-btn-normal{background-image: url("@/static/images/login/login-btn-bj.png");color:#fff;}
+
 /***** 试题 *****/
 // 标题
 .ezy-shiti-title{

+ 27 - 37
common/styles/global/pages.scss

@@ -76,37 +76,6 @@
 		}
 }
 
-// 数学题库
-.ezy-sxtk-page{
-	width: 100%;height: 100vh;background-color: #00c5fe;position: relative;
-	padding-top:var(--status-bar-height);display: flex;flex-direction: column;
-	@include ezy-no-repeat-cover(bottom);background-image: url("@/static/images/common/ezy-page-bj.png");
-	.sxtk-tab-border{height: calc(100vh - 254rpx - var(--status-bar-height));flex: unset;}
-	.tab-img{width: 346rpx;height: 77rpx;margin: 24rpx auto 0;
-	@include ezy-no-repeat-cover;background-image: url("@/static/images/my/tk-qxzjc.png");}
-	.sxtk-line{width: 94%;height: 4rpx;border-top: 4rpx dashed #7cbeee;margin: 20rpx auto;}
-	.sxtk-tab-box{
-		display: flex;box-sizing: border-box;padding: 0 16rpx;margin-top: 24rpx;
-		.tab-item{width: 16.66%;font-size: 30rpx;}
-		.tab-nianji-item{width: 106rpx;height: 73rpx;line-height: 73rpx;margin: 0 auto;text-align: center;}
-		.tab-item.active .tab-nianji-item{@include ezy-no-repeat-cover;color: #fff;
-		background-image: url("@/static/images/my/tk-tab-item.png");}
-	}
-	.sxtk-banben-body{
-		flex: 1;overflow-y: auto;padding:10rpx 0;box-sizing: border-box;
-		display: flex;flex-wrap: wrap;align-content: flex-start;margin-bottom: 10rpx;
-		.banben-item{width: 33.33%;font-size: 28rpx;margin-bottom: 24rpx;}
-		.banben-text-item{width: 194rpx;height: 79rpx;line-height: 79rpx;text-align: center;margin: 0 auto;
-		 @include single-line-ellipsis;box-sizing: border-box;padding: 0 6rpx;
-		 background-image: url("@/static/images/my/tk-list-item.png");@include ezy-no-repeat-cover;color: #fff;}
-		.banben-item.active .banben-text-item{background-image: url("@/static/images/my/tk-list-item-a.png");color: #6e0c02;}
-		}
-	.sxtk-confirm-btn{
-		width: 644rpx;height: 108rpx;background-color: transparent;margin-bottom: 36rpx;
-	}
-	.sxtk-confirm-btn:after{display: none;}
-}
-
 
 /***************** 新数学 *********************/
 // 登录页  padding-bottom: env(safe-area-inset-bottom); box-sizing: unset;
@@ -120,8 +89,6 @@
 	.login-body-box{
 		display: flex;flex-direction: column;align-items: center;margin: 160rpx auto 0;  
 	}
-	.login-btn{width: 655rpx;height: 92rpx;line-height: 92rpx;text-align: center;font-size:32rpx;
-	margin-top: 84rpx;@include ezy-no-repeat-cover;font-weight: bold;}
 	/***** 输入手机号页面*****/
 	.phone-input-box{
 		width: 662rpx;height: 122rpx;
@@ -161,8 +128,6 @@
 		  }
 	}
 
-	.login-btn-disabled{background-image: url("@/static/images/login/login-btn-bj-disabled.png");color:#999b9a;}
-	.login-btn-normal{background-image: url("@/static/images/login/login-btn-bj.png");color:#fff;}
 	.bottom-btn-box{
 		position: absolute;bottom:8%;left: 50%;transform: translateX(-50%);
 		.bottom-tip{color: #999;font-size: 28rpx;text-align: center;margin-bottom: 60rpx;}
@@ -836,9 +801,9 @@
 
 	// list
 	.my-list-box{
-		width:710rpx;margin: 24rpx auto;display: flex;padding: 42rpx 6rpx;
+		width:710rpx;margin: 24rpx auto;display: flex;flex-wrap: wrap;padding: 42rpx 6rpx 0;
 		background-color: #fff;border-radius: 16rpx;box-shadow: 0 0rpx 4rpx rgba(100, 159, 241, 0.2);
-		.list-item{color: #444;width: 25%;text-align: center;font-size: 28rpx;}
+		.list-item{color: #444;width: 25%;text-align: center;font-size: 28rpx;margin-bottom: 36rpx;}
 		.list-icon{width: 64rpx;height: 64rpx;display: block;
 		margin: 0 auto 12rpx;@include ezy-no-repeat-cover;}
 		.yysz-icon{background-image: url("@/static/images/my/list-icon1.png");}
@@ -1037,3 +1002,28 @@
 		}
 	}
 }
+
+// 绑定手机号
+.bind-tel-page{
+	width: 100%;height: 100vh;display: flex;flex-direction: column;
+	.bind-tel-body{width: 95%;margin: 20rpx auto 0;box-sizing: border-box;padding: 36rpx;}
+	.tel-input{
+		width: 100%;height: 100rpx;border: 1rpx solid #dfdfdf;border-radius: 16rpx;
+		display: flex;align-items: center;
+		.phone-input {font-size: 38rpx;padding: 0 30rpx;box-sizing: border-box;color: #555;flex: 1;overflow: hidden;}
+		.uni-input-placeholder {font-size: 34rpx;color: #acacae;
+		}
+		.close-btn{width: 42rpx;height: 42rpx;margin-right: 30rpx;@include ezy-no-repeat-cover;
+		background-image: url("@/static/images/login/login-close-icon.png");flex-shrink: 0;}
+	}
+	.yzm-row{
+		width: 100%;margin: 36rpx 0 0;
+		display: flex;align-items: center;
+		.yzm-btn{
+			width:270rpx;height: 100rpx;line-height: 100rpx;text-align: center;@include ezy-no-repeat-cover;
+			background-image: url("@/static/images/common/tip-confirm-btn.png");
+			flex-shrink: 0;margin-left: 16rpx;color: #fff;font-size: 34rpx;
+		}
+	}
+	
+}

+ 33 - 29
components/bindPhone/bindPhone.vue

@@ -1,34 +1,38 @@
 <template>
-	<uni-popup ref="dlRef" :animation="true" :is-mask-click="false" mask-background-color="rgba(255, 255, 255, 0.6);">
-		<!-- 返回 -->
-		<view class="icon-title-navBar-box333">
-			<view @click="handleBack" class="nav-bar-icon"></view>
-			<text @click="handleBack" class="nav-bar-title">绑定手机号</text>
+	<uni-popup ref="dlRef" :animation="true" :is-mask-click="false" 
+	mask-background-color="rgba(255, 255, 255, 0.6);">
+		<view class="bind-tel-page">
+			<!-- 返回 -->
+			<view class="icon-title-navBar-box">
+				<view @click="handleBack" class="nav-bar-icon"></view>
+				<view class="nav-bar-title">绑定手机号</view>
+			</view>
+			<view class="ezy-page-body bind-tel-body">
+				<!-- 手机号 -->
+				<view class="tel-input">
+					<input class="phone-input" type="text" v-model="loginData.phoneNumber" placeholder="请输入手机号" maxlength="11"
+						@input="clearTelInput" />
+					<view class="close-btn" v-if="loginData.clearTelIcon" @click="clearTel"></view>
+				</view>
+				
+				<!-- 验证码 -->
+				<view class="yzm-row">
+					<view class="tel-input">
+						<input class="phone-input" type="text" v-model="loginData.yzmNumber" placeholder="请输入验证码" maxlength="4"
+							@input="clearYzmInput" />
+						<view class="close-btn" v-if="loginData.clearYzmIcon" @click="clearYzm"></view>
+					</view>
+					
+					<text class="yzm-btn" @click="startCountdown"
+						:class="{ 'cxfs-btn-disabled': loginData.isDisabled}">{{loginData.buttonText}}</text>
+				</view>
+				<!-- 登录按钮 -->
+				<ezyActiveVue v-if="skipBtnFlag" class="ezy-btn-active login-btn yzm-btn" @aclick="skipFun" :class="loginData.yzmStatus">跳过
+				</ezyActiveVue>
+				<ezyActiveVue class="ezy-btn-active login-btn yzm-btn" @aclick="bangdingFun" :class="loginData.yzmStatus">确认绑定
+				</ezyActiveVue>
+			</view>
 		</view>
-		<!-- 用户名 -->
-		<view class="phone-input-box">
-			<view class="phone-prefix">+86</view>
-			<input class="phone-input" type="text" v-model="loginData.phoneNumber" placeholder="请输入手机号" maxlength="11"
-				@input="clearTelInput" />
-			<view class="close-btn" v-if="loginData.clearTelIcon" @click="clearTel"></view>
-		</view>
-
-		<!-- 验证码 -->
-		<view class="phone-input-box">
-			<input class="phone-input" type="text" v-model="loginData.yzmNumber" placeholder="请输入验证码" maxlength="4"
-				@input="clearYzmInput" />
-			<view class="close-btn" v-if="loginData.clearYzmIcon" @click="clearYzm"></view>
-
-			<text class="cxfs-btn" @click="startCountdown"
-				:class="{ 'cxfs-btn-disabled': loginData.isDisabled}">{{loginData.buttonText}}</text>
-		</view>
-		<!-- 登录按钮 -->
-		<ezyActiveVue v-if="skipBtnFlag" class="ezy-btn-active login-btn yzm-btn" @aclick="skipFun" :class="loginData.yzmStatus">跳过
-		</ezyActiveVue>
-		<ezyActiveVue class="ezy-btn-active login-btn yzm-btn" @aclick="bangdingFun" :class="loginData.yzmStatus">绑定
-		</ezyActiveVue>
-
-
 	</uni-popup>
 	<!-- 图形验证码 -->
 	<captchaVue ref="captcha" :config="config" @captchaSuccess="captchaSuccess" @captchaError="captchaError"

BIN
static/images/my/two-code.png