heyang

component/topWarn.vue

@@ -2,7 +2,7 @@
 <template>
 	<view class="top-warn" v-if="pageType">
 		<view>{{text}}</view>
-		<view @click="buttonClick" v-if="whetherRoute">操作</view>
+		<view @click="buttonClick" v-if="whetherRoute">查看</view>
 	</view>
 </template>
 

pages/login.vue

@@ -4,6 +4,12 @@
     <!-- <img class="login-max-big" src="@/images/img_bg_dl.png"> -->
     <img class="login-max-big" :src="loginBanner">
     <view class="login-box">
+	  <view class="tabTitle">
+	  	<view class="tabTitle_li" @tap="tabClick(index)"  :key="index" v-for="(item,index) in tabText">
+	  		<view :class="{on:curTab==index}" class="tabTitle_text">{{item}}</view>
+	  	    <view :class="{on:curTab==index}" class="tabTitle_across"></view>
+	  	</view>
+	  </view>
       <view class="input-max-box-one">
         <view class="input-box">
           <img src="@/images/img_log_in_account.png"/>
@@ -22,14 +28,12 @@
         <view>记住我</view>
       </view>
       <view class="button-box" @click="login">登录</view>
-      <view class="supplier" v-if="identityStatus==2">
+      <view class="supplier" v-if="curTab==1">
         <view class="supplier_l" @click="handleClick('forget')">忘记密码</view>
         <view class="supplier_r" @click="handleClick('register')">没有账号，<text>立即注册</text></view>
       </view>
-      <!-- 供应商 -->
-      <view class="switch_btn" @click="switchClick()">{{identityStatus==2?'师生登录':'供应商登录'}}<img  src="@/images/Version3.0/icon_ssdl_qh.png"/></view>
     </view>
-    <img class="top-back" src="@/images/img_sys_bg.png"/>
+    <!-- <img class="top-back" src="@/images/img_sys_bg.png"/> -->
   </view>
 </template>
 
@@ -46,6 +50,8 @@ export default {
       checkedType:false,
       loginBanner:uni.getStorageSync('loginBanner'),
       infoList:[],//模板消息Id
+	  tabText:['师生登录','供应商登录'],
+	  curTab:0,
     }
   },
 
@@ -68,6 +74,11 @@ export default {
 
   },
   methods: {
+	  //顶部tab点击
+	  tabClick(index) {
+	  	this.curTab = index;
+	
+	  },
     //获取openID
     async getOpenId(){
       let _this=this;
@@ -253,15 +264,56 @@ export default {
     z-index:0;
   }
   .login-box{
-    z-index:1;
+    z-index:3;
     position: absolute
     top:446rpx;
     left:46rpx;
     width:658rpx;
     height:700rpx;
     // background #fff
+	/* 切换按钮 */
+	.tabTitle{
+		display flex;
+		width:100%;
+		height: 100rpx;
+		position: absolute;
+		top: 50rpx;
+		justify-content: center;
+		>view:nth-of-type(1){
+			margin-right: 100rpx;
+		}
+		.tabTitle_li{
+			width:168rpx;
+			text-align center;
+			.tabTitle_text{
+				display: inline-block;
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+				line-height: 90rpx;
+				&.on{
+					color:#0183FA;
+				}
+			}
+			.tabTitle_across{
+				width: 100rpx;
+				height: 4rpx;
+				background: #0183FA;
+				border-radius: 2rpx;
+				margin-left 30rpx;
+				display none;
+				&.on{
+					display block;
+				}
+			}
+	
+		}
+	}
     border-radius:20rpx;
     .input-max-box-one{
+		overflow: hidden;
+		margin-top:68rpx;
       .input-box{
         display flex
         width:600rpx;