瀏覽代碼

登录页修改

htc 1 周之前
父節點
當前提交
99b6e992a6
共有 5 個文件被更改,包括 66 次插入44 次删除
  1. 8 8
      App.vue
  2. 3 11
      components/CusHeader/index.vue
  3. 1 0
      main.js
  4. 3 3
      pages.json
  5. 51 22
      pages/login.vue

+ 8 - 8
App.vue

@@ -146,10 +146,10 @@
 	.zt_btn{
 		width: 100%;
 		height: 88rpx;
-		background: #833478;
-		border-radius: 24rpx;
+		background: #904A87;
+		border-radius: 44rpx;
 		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
+		font-weight: bold;
 		font-size: 32rpx;
 		color: #FFFFFF;
 		line-height: 88rpx;
@@ -159,12 +159,12 @@
 	.qx_btn{
 		width: 100%;
 		height: 88rpx;
-		background: #FAFAFA;
-		border-radius: 24rpx;
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
+		border-radius: 44rpx;
+		border: 1rpx solid #E0E4E7;
+		font-family: PingFang-SC, PingFang-SC;
+		font-weight: bold;
 		font-size: 32rpx;
-		color: #393939;
+		color: #002846;
 		line-height: 88rpx;
 		text-align: center;
 		letter-spacing: 2rpx;

+ 3 - 11
components/CusHeader/index.vue

@@ -48,11 +48,8 @@
 		data() {
 			return {
 				tabUrls: [
-					'/pages/index/index',
-					'/pages/touristMap/index',
-					'/pages/oneCodePass/index',
-					'/pages/service/index',
-					'/pages/my/index'
+					'/pages/home',
+					'/pages/my'
 				]
 			}
 		},
@@ -79,7 +76,7 @@
 					let canNavBack = getCurrentPages();
 					if (canNavBack && canNavBack.length > 1) uni.navigateBack();
 					else uni.reLaunch({
-						url: '/pages/index/index'
+						url: '/pages/home'
 					})
 				} else {
 					if (this.tabUrls.find(u => u == url)) uni.reLaunch({
@@ -89,11 +86,6 @@
 						url
 					});
 				}
-			},
-			toHome() {
-				uni.reLaunch({
-					url: '/pages/index/index'
-				})
 			}
 		}
 	}

+ 1 - 0
main.js

@@ -19,6 +19,7 @@ import regTest from './utils/reg.js'
 import api from '@/http/index.js'
 Vue.prototype.$api = api;
 Vue.prototype.$reg = regTest;
+Vue.prototype.$imgBase = 'https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/'
 
 //重载uni.showToast,简化调用
 Vue.prototype.$showToast = function(title, duration = 2000, icon = "none") {

+ 3 - 3
pages.json

@@ -7,19 +7,19 @@
 			}
 		},
 		{
-			"path": "pages/scan",
+			"path": "pages/login",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path": "pages/launch",
+			"path": "pages/scan",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path": "pages/login",
+			"path": "pages/launch",
 			"style": {
 				"navigationStyle": "custom"
 			}

+ 51 - 22
pages/login.vue

@@ -1,29 +1,33 @@
 <template>
 	<view class="page" :style="{'min-height':h+'px', 'padding-top':mt+'px'}">
-		<cus-header title='创衡汇教练AI智能体' :showback="false"></cus-header>
+		<cus-header title='创衡汇教练AI智能体' bgColor="transparent" backUrl="/pages/home"></cus-header>
+		<image class="topbg" :src="imgBase+'login_top_bg.png'"></image>
 		<div class="content">
 			<div class="c_top">
-				<image src="@/static/logo2.png" mode="heightFix"></image>
-				<div class="title">Hi,我是企业教练~</div>
-				<div class="tip">很高兴遇见你!作为你的AI教练,我随时可以回答您的问题</div>
+				<image :src="imgBase+'logo.png'" mode="heightFix"></image>
+				<div class="title">Hi,我是创衡团队教练助手</div>
+				<div class="tip">可以为您提供PERILL团队评估、团队评估报告分析和团队教练督导对话,期待和您的共创~</div>
 				<div class="item adf">
-					<image src="@/static/qa.png"></image>
 					<div class="qa">
-						<p>智能问答</p>
-						<p>正念修己 教练达人,知识推理整合,要点清晰呈现,助力企业打造高价值团队</p>
+						<p>PERILL团队发展动态评估</p>
+						<p>据您对相关陈述的评分,帮助团队从六个维度评估团队的现状。</p>
 					</div>
 				</div>
 				<div class="item adf">
-					<image src="@/static/qs.png"></image>
 					<div class="qa">
-						<p>PERILL模型问题库</p>
-						<p>作为团队成员,您可以对所在团队相关描述的体验进行评分,帮助团队有效评估团队的现状</p>
+						<p>AI教练督导对话</p>
+						<p>保持正念教练督导心态,对您的PERILL测评报告或团队教练计划进行启发式沟通。</p>
 					</div>
 				</div>
 			</div>
 			<div class="c_bottom">
 				<button class="zt_btn" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">手机号一键登录</button>
-				<button class="qx_btn" style="margin-top: 20rpx;" @tap="codeLogin">授权码登录</button>
+				<div class="qx_btn" style="margin-top: 40rpx;" @tap="codeLogin">授权码登录</div>
+				<div class="agree adfacjc" @click="changeAgree">
+					<image :src="imgBase+'not_select.png'" v-if="!agree"></image>
+					<image :src="imgBase+'selected.png'" v-else></image>
+					<div class="text"v>已阅读并同意我们的<span>“服务协议与隐私政策”</span></div>
+				</div>
 			</div>
 		</div>
 		<u-popup :show="show" @close="cancel" mode="center" :round="20">
@@ -47,11 +51,13 @@
 			return {
 				show:false,
 				phone:'',
-				code:''
+				code:'',
+				agree:false
 			}
 		},
 		methods:{
 			decryptPhoneNumber(e){
+				if(!this.agree) return this.$showToast('请勾选协议与政策')
 				if(uni.getStorageSync('token')){
 					uni.reLaunch({
 						url:'/pages/home'
@@ -61,6 +67,7 @@
 				if(e.detail.code) this.wxLogin(e.detail.code);
 			},
 			codeLogin(){
+				if(!this.agree) return this.$showToast('请勾选协议与政策')
 				this.show = true;
 			},
 			toCodeLogin(){
@@ -114,9 +121,8 @@
 					uni.reLaunch({ url:'/pages/home' })
 				},1500)
 			},
-			cancelLogin(){
-				// uni.exitMiniProgram();
-				uni.reLaunch({ url:'/pages/home' })
+			changeAgree(){
+				this.agree = !this.agree
 			}
 		}
 	}
@@ -128,6 +134,15 @@
 		display: flex;
 		flex-direction: column;
 		box-sizing: border-box;
+		
+		.topbg{
+			width: 100%;
+			height: 584rpx;
+			position: fixed;
+			top: 0;
+			left: 0;
+		}
+		
 		.content{
 			padding: 0 45rpx;
 			flex: 1;
@@ -135,11 +150,13 @@
 			display: flex;
 			flex-direction: column;
 			justify-content: space-between;
+			position: relative;
 			
 			.c_top{
+				padding: 0 20rpx;
 				&>image{
 					height: 88rpx;
-					margin-top: 100rpx;
+					margin-top: 76rpx;
 				}
 				.title{
 					font-family: PingFang-SC, PingFang-SC;
@@ -159,13 +176,7 @@
 				}
 				.item{
 					margin-top: 64rpx;
-					&>image{
-						width: 64rpx;
-						height: 64rpx;
-					}
 					.qa{
-						width: calc(100% - 64rpx);
-						padding-left: 24rpx;
 						box-sizing: border-box;
 						p{
 							font-family: PingFang-SC, PingFang-SC;
@@ -188,6 +199,24 @@
 				.qx_btn{
 					margin-top: 36rpx;
 				}
+				.agree{
+					margin-top: 64rpx;
+					image{
+						width: 30rpx;
+						height: 30rpx;
+					}
+					.text{
+						margin-left: 8rpx;
+						font-family: PingFangSC, PingFang SC;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #95A5B1;
+						line-height: 44rpx;
+						span{
+							color: #833478;
+						}
+					}
+				}
 			}
 		}
 	}