tanxue 19 часов назад
Родитель
Сommit
3ab3865c5a

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

@@ -266,6 +266,7 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 
 // 小的提示弹窗
 .ezy-tip-dialog{
+	position: relative;
 	.tip-content-box{@include ezy-no-repeat-cover;box-sizing: border-box;text-align:center;}
 	.tip-title{
 		color: #343434;font-size: 38rpx;margin-bottom: 24rpx;
@@ -278,6 +279,8 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 	  width: 260rpx;height: 260rpx;@include ezy-no-repeat-contain;margin: 0 auto;
 	  background-image: url("@/static/images/common/dialog-login-img.png");
 	 }
+	 /*** 按钮 ***/
+	 //其他按钮
 	.tip-btn-box{
 		width: 100%;display: flex;justify-content: space-between;margin: 52rpx 0 0;
 		.not-confirm-btn,.confirm-btn{
@@ -287,6 +290,15 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 		.not-confirm-btn{background-image: url("@/static/images/common/tip-cancel-btn.png");}
 		.confirm-btn{background-image: url("@/static/images/common/tip-confirm-btn.png");}
 	}
+	//关闭
+	.close-btn{
+		width: 100rpx;height: 100rpx;display: flex;align-items: center;justify-content: center;
+		position: absolute;right: 12rpx;top: 12rpx;
+	}
+	.close-btn::after{
+		content: '';width: 52rpx;height: 52rpx;@include ezy-no-repeat-cover;
+		background-image: url("@/static/images/common/close-icon.png");
+	}
 }
 .tip-small-dialog{
 	.tip-content-box{

+ 74 - 24
common/styles/global/pages.scss

@@ -180,6 +180,70 @@
 	 
 	}
 }
+// 快捷登录
+.go-login-page{
+	/* .mt24{margin-top: 24rpx;}
+	.yzm-text-btn{color: #035493;font-size: 34rpx;margin-right: 24rpx;} */
+	
+	.yzm-row{
+		width: 662rpx;margin: 36rpx 0 0;display: flex;align-items: center;
+		.phone-input-box{flex:1;width: auto;border-radius: 28rpx;}
+		.yzm-text-btn{
+			width:250rpx;height: 120rpx;line-height: 120rpx;text-align: center;@include ezy-no-repeat-cover;
+			background-image: url("@/static/images/common/tip-confirm-btn.png");border-radius: 28rpx;
+			flex-shrink: 0;margin-left: 16rpx;color: #fff;font-size: 34rpx;
+		}
+	}
+	
+	/* .tel-input{
+		width: 662rpx;height: 100rpx;border: 1rpx solid #dfdfdf;border-radius: 16rpx;
+		display: flex;align-items: center;
+		.phone-prefix {
+		  width: 90rpx;margin-left:18rpx;font-size: 38rpx;color: #acacae;
+		  font-weight: normal;display: flex;align-items: center;justify-content: space-between;flex-shrink: 0;
+		}
+		.phone-prefix::after{content: '';width: 1rpx;height: 40rpx;display: inline-block;background-color: #ccc;}
+		
+		.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: 662rpx;margin: 36rpx 0 0;display: flex;align-items: center;
+		.tel-input{width: auto;}
+		.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;margin-top: 0;
+		}
+	} */
+}
+
+// 绑定手机号
+.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;
+		}
+	}
+	
+}
 
 // 用户协议弹窗
 .agree-sections-dialog{
@@ -982,7 +1046,6 @@
 				.money-text{font-size: 42rpx;color: #333;text-align: right;font-weight: normal;}
 			}
 		}
-		.order-card-box::last-child{margin-bottom: 0;}
 	}
 }
 
@@ -1003,27 +1066,14 @@
 	}
 }
 
-// 绑定手机号
-.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;
-		}
-	}
-	
+// 手机号快捷登录弹窗
+.sjh-kjdl-dialog{
+	.sjh-kjdl-content-box{display: flex;flex-direction: column;align-items: center;}
+	.kjdl-btn{
+		width: 496rpx;height: 88rpx;line-height: 88rpx;color: #fff;font-size: 36rpx;margin: 32rpx 0;
+		@include ezy-no-repeat-cover;background-image: url("@/static/images/shop/ksdl-btn.png");
+	}
+	.ykkt-text{color: #333;font-size: 32rpx;}
 }
+
+

+ 50 - 45
components/goLogin/goLogin.vue

@@ -1,52 +1,57 @@
 <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 class="nav-bar-title">登录</text>
-		</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>
-
-
-		<!-- 隐私协议 -->
-		<view class="agreement-checkbox-box">
-			<checkbox-group @change="handleUpdateAgree">
-				<checkbox class="agreement-checkbox-input" color="#FFFFFF" value="agree" :checked="isAgreed" />
-			</checkbox-group>
-			<view class="agreement-text-box">
-				我已阅读并同意
-				<view class="agreement-text" @click="agreeBtn('yhxy')">《用户协议》</view>
-				和
-				<view @click="agreeBtn('ystk')" class="agreement-text">《隐私政策》</view>
+		<view class="ezy-login-page go-login-page">
+			<view @click="handleBack" class="ezy-nav-bar-icon yzm-nav-bar-icon"></view>
+			<icon class="login-img"></icon>
+			<view class="login-body-box">
+				<!-- 用户名 -->
+				<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="yzm-row">
+					<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>
+					</view>
+					
+					<text class="yzm-text-btn" @click="startCountdown">{{loginData.buttonText}}</text>
+					<!-- <text class="cxfs-btn" @click="startCountdown"
+						:class="{ 'cxfs-btn-disabled': loginData.isDisabled}">{{loginData.buttonText}}</text> -->
+				</view>
+
+				<!-- 隐私协议 -->
+				<view class="agreement-checkbox-box">
+					<checkbox-group @change="handleUpdateAgree">
+						<checkbox class="agreement-checkbox-input" color="#FFFFFF" value="agree" :checked="isAgreed" />
+					</checkbox-group>
+					<view class="agreement-text-box">
+						我已阅读并同意
+						<view class="agreement-text" @click="agreeBtn('yhxy')">《用户协议》</view>
+						和
+						<view @click="agreeBtn('ystk')" class="agreement-text">《隐私政策》</view>
+					</view>
+				</view>
+				<!-- 登录按钮 -->
+				<ezyActiveVue class="ezy-btn-active login-btn yzm-btn" @aclick="handleLogin" :class="loginData.yzmStatus">登录
+				</ezyActiveVue>
 			</view>
+			
 		</view>
-		<!-- 登录按钮 -->
-		<ezyActiveVue class="ezy-btn-active login-btn yzm-btn" @aclick="handleLogin" :class="loginData.yzmStatus">登录
-		</ezyActiveVue>
-	</uni-popup>
-	<!-- 政策协议 -->
-	<agree-content-dialog ref="agreeContentDialogRef" :agreeType="agreeType"></agree-content-dialog>
-	<!-- 图形验证码 -->
-	<captchaVue ref="captcha" :config="config" @captchaSuccess="captchaSuccess" @captchaError="captchaError"
-		@captchaFail="captchaFail" @captchaReady="captchaReady" @captchaClose="captchaClose"></captchaVue>
-	<!-- 确认协议 -->
-	<agree-dialog ref="agreeDialogRef" @confirm-btn="confirmBtn"></agree-dialog>
+		</uni-popup>
+		<!-- 政策协议 -->
+		<agree-content-dialog ref="agreeContentDialogRef" :agreeType="agreeType"></agree-content-dialog>
+		<!-- 图形验证码 -->
+		<captchaVue ref="captcha" :config="config" @captchaSuccess="captchaSuccess" @captchaError="captchaError"
+			@captchaFail="captchaFail" @captchaReady="captchaReady" @captchaClose="captchaClose"></captchaVue>
+		<!-- 确认协议 -->
+		<agree-dialog ref="agreeDialogRef" @confirm-btn="confirmBtn"></agree-dialog>
+	
 </template>
 
 <script setup>

+ 5 - 6
pages/chanpinShop/components/kaiTongFongShi.vue

@@ -1,13 +1,12 @@
 <template>
 	<uni-popup ref="kaitongRef" :animation="false" :is-mask-click="false" mask-background-color="rgba(0,0,0, 0.76);">
-		<view class="phone-tip-dialog">
-			<view class="common-body-box">
+		<view class="ezy-tip-dialog tip-small-dialog sjh-kjdl-dialog">
+			<view class="close-btn" @click="handleClose"></view>
+			<view class="tip-content-box sjh-kjdl-content-box">
 				<view class="tip-title">开通方式</view>
-				<view @click="handleClose">关闭</view>
+				<view class="kjdl-btn" @click="handleKaitong">使用手机号快速登录</view>
+				<view class="ykkt-text" v-if="currentPlatform== 'ios'">游客身份开通(限当前设备使用)</view>
 			</view>
-
-			<view @click="handleKaitong">使用手机号快速登录</view>
-			<view v-if="currentPlatform== 'ios'">游客身份开通(限当前设备使用)</view>
 		</view>
 	</uni-popup>
 

BIN
static/images/shop/ksdl-btn.png