diff --git a/locale/en.js b/locale/en.js
index 7192ce4..97b63f8 100644
--- a/locale/en.js
+++ b/locale/en.js
@@ -166,8 +166,6 @@ export default {
 			"ok": "OK"
 		},
 		"login": {
-			"title": "Login",
-			"please-login": "Please login to access more content",
 			"username": "Username",
 			"username-placeholder": "username",
 			"password": "Password",
diff --git a/locale/es.js b/locale/es.js
index fdbec44..c637729 100644
--- a/locale/es.js
+++ b/locale/es.js
@@ -166,8 +166,6 @@ export default {
 			"ok": "OK"
 		},
 		"login": {
-			"title": "Inicio de sesión",
-			"please-login": "Por favor, inicie sesión para acceder a más contenido",
 			"username": "Nombre de usuario",
 			"username-placeholder": "nombre de usuario",
 			"password": "Contraseña",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 4d2eefd..66b85b7 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -43,7 +43,7 @@
 
 				<view class="status-icon">
 					<view v-if="item.current" class="current">current</view>
-					<uni-icons v-else type="locked" size="20" color="#aec438"></uni-icons>
+					<uni-icons v-else type="locked" size="20" color="#000"></uni-icons>
 				</view>
 
 				<view class="img-box">
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 7f93fc8..e86655e 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,64 +1,51 @@
 <!-- 登录页面 -->
 <template>
 	<view class="login bx">
+		<div class="language">
+			<image @click="showSelectLanguageProp" src="@/static/login/language.png" mode="aspectFit"></image>
+		</div>
 
 		<!-- 背景图片 -->
-		<view class="bg-box">
-			<image @click="showSelectLanguageProp" class="language" src="@/static/login/language.png" mode="aspectFit"></image>
-			<image src="@/static/login/logo.png" mode="aspectFit"></image>
+		<view class="logo-box">
+			<image class="logo content" src="@/static/login/logo.png" mode="widthFix"></image>
 		</view>
-		
+
 		<!-- 加载效果 -->
 		<loading :loading="loading" @close="closeLoading"></loading>
 
 		<view v-if="!loading" class="main">
 			<!-- 登录标题 -->
 			<view class="login-title">
-			
-				<view class="title">{{ $t('page.login.title') }}</view>
-			
-				<view class="login-descript">{{ $t('page.login.please-login') }}</view>
-			
+				<view class="title">TikTok shop</view>
+				<view class="shop-desc">Online rebate mall.</view>
 			</view>
-			
+
 			<!-- 输入框列表 -->
 			<view class="input-list">
-			
-				<view class="input-item">
-					<view class="input-descript">{{ $t('page.login.username') }}</view>
-			
-					<input v-model="form.account" type="text" :placeholder="$t('page.login.username-placeholder')" />
-				</view>
-			
-				<view class="input-item">
-					<view class="input-descript">{{ $t('page.login.password') }}</view>
-			
-					<input v-model="form.pass" type="password" :placeholder="$t('page.login.password-placeholder')" />
-				</view>
-			
-			</view>
-			
-			<!-- 忘记密码 -->
-			<view class="forgot-password">
-				<text  @click="forgetPass">{{ $t('page.login.forgot-password') }}</text>
+
+				<input v-model="form.account" type="text" :placeholder="$t('page.login.username-placeholder')" />
+				<input v-model="form.pass" type="password" :placeholder="$t('page.login.password-placeholder')" />
+
 			</view>
-			
+
 			<!-- 按钮组 -->
 			<view class="btns">
-			
+
 				<view @click="Login" class="now-login-btn">{{ $t('page.login.login') }}</view>
-			
-				<view @click="toRegister" class="now-register-btn">{{ $t('page.login.register') }}</view>
-			
+
+				<view class="now-register-btn">
+					<text @click="toRegister">{{ $t('page.login.register') }}</text>
+				</view>
+
 			</view>
 		</view>
-		
+
 		<!-- 切换语言 -->
 		<changeLanguage :show.sync="showSelectLanguage" @close="closeSelectLanguageProp"></changeLanguage>
-		
+
 		<!-- 客服列表 -->
 		<serviceList :show="showService" :serverList="serverList" @close="closeServiceList"></serviceList>
-		
+
 		<!-- 初始页面 -->
 		<!-- <pageInit></pageInit> -->
 
@@ -70,20 +57,25 @@
 	import serviceList from '@/components/serviceList/serviceList.vue';
 	import pageInit from '@/components/pageInit/pageInit.vue'
 	import loading from '@/components/pageInit/loading.vue'
-	
+
 	export default {
-		components : { changeLanguage , serviceList , pageInit , loading },
+		components: {
+			changeLanguage,
+			serviceList,
+			pageInit,
+			loading
+		},
 		data() {
 			return {
 				form: {
 					account: '',
 					pass: '',
-					loginIp : ''
+					loginIp: ''
 				},
-				showSelectLanguage : false,
-				showService : false,
-				serverList : [],
-				loading : false
+				showSelectLanguage: false,
+				showService: false,
+				serverList: [],
+				loading: false
 			}
 		},
 		created() {
@@ -94,21 +86,30 @@
 			Login() {
 				this.$play()
 				let _self = this;
-				let { account , pass } = this.form
-				if(account.trim() == ''){
-					return uni.showToast({title: this.$t('page.login.accountEmpty'),icon : 'none'});
+				let {
+					account,
+					pass
+				} = this.form
+				if (account.trim() == '') {
+					return uni.showToast({
+						title: this.$t('page.login.accountEmpty'),
+						icon: 'none'
+					});
 				}
-				if(pass.trim() == ''){
-					return uni.showToast({title: this.$t('page.login.passEmpty'),icon : 'none'});
+				if (pass.trim() == '') {
+					return uni.showToast({
+						title: this.$t('page.login.passEmpty'),
+						icon: 'none'
+					});
 				}
-				
+
 				return uni.request({
 					url: 'https://api.ipify.org?format=json',
 					success: function(res) {
 						_self.form.loginIp = res.data.ip;
 						_self.request('login', {}, _self.form).then(res => {
-							if(res.code == 200){
-								localStorage.setItem("userInfo",JSON.stringify(res.result.userInfo))
+							if (res.code == 200) {
+								localStorage.setItem("userInfo", JSON.stringify(res.result.userInfo))
 								localStorage.setItem("token", res.result.token)
 								uni.navigateTo({
 									url: '/pages/home/home'
@@ -117,7 +118,7 @@
 						})
 					}
 				});
-				
+
 			},
 
 			//跳转注册页面
@@ -127,38 +128,38 @@
 					url: '/pages/register/register'
 				})
 			},
-			
+
 			//显示选择语言弹框
-			showSelectLanguageProp(){
+			showSelectLanguageProp() {
 				this.$play()
 				this.showSelectLanguage = true
 			},
-			
+
 			//关闭语言选择弹框
-			closeSelectLanguageProp(){
+			closeSelectLanguageProp() {
 				this.showSelectLanguage = false
 			},
-			
+
 			//显示客服列表
-			revealServiceList(){
+			revealServiceList() {
 				this.$play()
 				this.showService = true;
 			},
-			
+
 			//关闭客服列表
-			closeServiceList(){
+			closeServiceList() {
 				this.showService = false;
 			},
-			
+
 			//关闭加载效果
-			closeLoading(){
+			closeLoading() {
 				this.loading = false;
 			},
-			
+
 			//忘记密码
-			forgetPass(){
+			forgetPass() {
 				this.request('forgetPass').then(res => {
-					if(res.code == 200){
+					if (res.code == 200) {
 						this.serverList = res.result
 						this.revealServiceList()
 					}
@@ -173,44 +174,55 @@
 		width: 750rpx;
 		height: 100vh;
 		margin: 0px auto;
-		// background: black;
-		// background-image: url('@/static/login/bg.png');
+		background: linear-gradient(to bottom, #fcedff 0%, #ffffff 100%);
 		background-size: 100%;
 		background-repeat: no-repeat;
 		box-sizing: border-box;
 		padding: 0rpx 20rpx;
 
-		.bg-box {
-			position: relative;
+		.content {
+			width: 96%;
+			margin: 0rpx auto;
+		}
+
+		.language {
 			display: flex;
+			justify-content: flex-end;
 			align-items: center;
-			justify-content: center;
-			height: 40%;
+			height: 160rpx;
 
-			.language {
-				position: absolute;
-				top: 30rpx;
-				right: 30rpx;
+			image {
 				width: 60rpx;
 				height: 60rpx;
-				z-index: 999;
+			}
+		}
+
+		.logo-box {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-bottom: 40rpx;
+
+			.logo {
+				border-radius: 10rpx;
 			}
 		}
 
 		.login-title {
 			padding: 0rpx 10rpx;
 			box-sizing: border-box;
+			text-align: center;
 
 			.title {
-				font-size: 36rpx;
-				font-weight: bold;
+				font-size: 30rpx;
 				color: $uni-bg-color-app;
 				margin-bottom: 10rpx;
+				font-weight: bold;
 			}
 
-			.login-descript {
-				font-size: 32rpx;
-				color: white;
+			.shop-desc {
+				font-size: 28rpx;
+				color: #333;
 				margin-bottom: 20rpx;
 			}
 		}
@@ -220,61 +232,49 @@
 			box-sizing: border-box;
 			margin: 40rpx 0rpx;
 
-			.input-item {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				border: 1px solid $uni-bg-color-app;
-				padding: 20rpx;
-				border-radius: 5rpx;
-				margin-bottom: 25rpx;
-				box-sizing: border-box;
-				font-size: 28rpx;
-
-				.input-descript {
-					color: $uni-bg-color-app;
-				}
+			input {
+				display: block;
+				width: 90%;
+				margin: 0rpx auto;
+				color: $uni-bg-color-app;
+				border: 1px solid #eeeeee;
+				height: 80rpx;
+				border-radius: 40rpx;
+				background: #fff;
+				margin-bottom: 20rpx;
+				text-align: center;
+				text-indent: 1em;
+				padding: 0rpx 15rpx;
 
-				input {
-					color: $uni-bg-color-app;
+				&:focus {
+					border-color: #6d00be !important;
+					background: pink !important;
 				}
 			}
 		}
 
-		.forgot-password {
-			color: $uni-bg-color-app;
-			text-align: center;
-
-			text {
-				border-bottom: 1rpx solid #ccc;
-			}
-		}
-
 		.btns {
 			padding: 0rpx 10rpx;
 			margin-top: 40rpx;
 			color: $uni-bg-color;
-			.now-login-btn,
-			.now-register-btn {
+
+			.now-login-btn {
 				background: $uni-bg-color-app;
-				border-radius: 10rpx;
+				border-radius: 60rpx;
 				display: flex;
 				align-items: center;
 				justify-content: center;
 				margin-bottom: 20rpx;
 				font-weight: bold;
-			}
-
-			.now-login-btn {
 				height: 90rpx;
 				font-size: 40rpx;
 			}
 
 			.now-register-btn {
-				height: 60rpx;
-				width: 90%;
-				font-size: 28rpx;
-				margin: 0 auto;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				color: $uni-bg-color-app;
 			}
 		}
 	}
diff --git a/pages/register/register.vue b/pages/register/register.vue
index fbc0c54..c96f1bf 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -1,13 +1,9 @@
 <!-- 注册页面 -->
 <template>
 	<view class="register bx">
-
-		<!-- 背景图片 -->
-		<view class="bg-box">
-			<image @click="showSelectLanguageProp" class="language" src="@/static/login/language.png" mode="aspectFit">
-			</image>
-			<image src="@/static/login/logo.png" mode="aspectFit"></image>
-		</view>
+		<div class="language">
+			<image @click="showSelectLanguageProp" src="@/static/login/language.png" mode="aspectFit"></image>
+		</div>
 
 		<!-- 加载效果 -->
 		<!-- <loading :loading="loading" @close="closeLoading"></loading> -->
@@ -15,70 +11,32 @@
 		<view v-if="!loading" class="main">
 			<!-- 登录标题 -->
 			<view class="register-title">
-
-				<view class="title">{{ $t('page.register.title') }}</view>
-
-				<view class="register-descript">{{ $t('page.register.please-register') }}</view>
-
+				<view class="title">TikTok shop</view>
+				<view class="shop-desc">Online rebate mall.</view>
 			</view>
 
 			<!-- 输入框列表 -->
 			<view class="input-list">
 
-				<view class="input-item">
-					<view class="input-descript">{{ $t('page.register.username') }}</view>
-
-					<input v-model="form.account" type="text" :placeholder="$t('page.register.username-placeholder')" />
-				</view>
-
-				<view class="input-item">
-					<view class="input-descript">{{ $t('page.register.password') }}</view>
-
-					<input v-model="form.password" type="password"
-						:placeholder="$t('page.register.password-placeholder')" />
-				</view>
-
-				<view class="input-item">
-					<view class="input-descript">{{ $t('page.register.confirm-password') }}</view>
-
-					<input v-model="form.okPassword" type="password"
-						:placeholder="$t('page.register.confirm-password')" />
-				</view>
-
-				<view class="input-item">
-					<view class="input-descript">{{ $t('page.register.PaymentPassword') }}</view>
-
-					<input v-model="form.payPass" type="password" :placeholder="$t('page.register.PaymentPassword-placeholder')" />
-				</view>
-
-				<view class="input-item">
-					<view class="input-descript">{{ $t('page.register.confirm-PaymentPassword') }}</view>
-
-					<input v-model="form.okPayPass" type="password"
-						:placeholder="$t('page.register.PaymentPassword-placeholder')" />
-				</view>
-
-				<view class="input-item">
-					<view class="input-descript">{{ $t('page.register.invitation-code') }}</view>
-
-					<input v-model="form.invitationCode" :placeholder="$t('page.register.invitation-code')" />
-				</view>
+				<input v-model="form.account" type="text" :placeholder="$t('page.register.username-placeholder')" />
+				<input v-model="form.password" type="password"
+					:placeholder="$t('page.register.password-placeholder')" />
+				<input v-model="form.okPassword" type="password" :placeholder="$t('page.register.confirm-password')" />
+				<input v-model="form.payPass" type="password"
+					:placeholder="$t('page.register.PaymentPassword-placeholder')" />
+				<input v-model="form.okPayPass" type="password"
+					:placeholder="$t('page.register.PaymentPassword-placeholder')" />
+				<input v-model="form.invitationCode" :placeholder="$t('page.register.invitation-code')" />
 
 			</view>
 
 			<!-- 勾选协议 -->
-			<view class="check-box">
+		<!-- 	<view class="check-box">
 				<u-checkbox-group v-model="agree" @change="$play">
-					<u-checkbox activeColor="#B0C73B" 
-					shape="circle" :label="$t('page.register.agreen')"
+					<u-checkbox activeColor="#B0C73B" shape="circle" :label="$t('page.register.agreen')"
 						name="agree"></u-checkbox>
 				</u-checkbox-group>
 				<view @click.stop="toAgreement" class="agreement-content">{{ $t('page.register.agreement') }}</view>
-			</view>
-
-			<!-- 忘记密码
-			<view class="forgot-password">
-				<text>{{ $t('page.register.forgot-password') }}</text>
 			</view> -->
 
 			<!-- 按钮组 -->
@@ -89,6 +47,7 @@
 				<view @click.stop="toLogin" class="now-login-btn">{{ $t('page.register.login') }}</view>
 
 			</view>
+			
 		</view>
 
 		<!-- 切换语言 -->
@@ -143,8 +102,10 @@
 			},
 
 			//跳转登录页面
-			toLogin(sound) {		//是否发出声音
-				if(sound){this.$play()}
+			toLogin(sound) { //是否发出声音
+				if (sound) {
+					this.$play()
+				}
 				uni.navigateTo({
 					url: '/pages/login/login'
 				})
@@ -160,35 +121,59 @@
 					okPayPass
 				} = this.form
 				if (account.trim() == '') {
-					uni.showToast({title: this.$t('page.register.accountEmpty'),icon : 'none'});
+					uni.showToast({
+						title: this.$t('page.register.accountEmpty'),
+						icon: 'none'
+					});
 					return false;
 				}
 				if (password.trim() == '') {
-					uni.showToast({title: this.$t('page.register.passEmpty'),icon : 'none'});
+					uni.showToast({
+						title: this.$t('page.register.passEmpty'),
+						icon: 'none'
+					});
 					return false;
 				}
 				if (okPassword.trim() == '') {
-					uni.showToast({title: this.$t('page.register.okPassEmpty'),icon : 'none'});
+					uni.showToast({
+						title: this.$t('page.register.okPassEmpty'),
+						icon: 'none'
+					});
 					return false;
 				}
 				if (password.trim() != okPassword.trim()) {
-					uni.showToast({title: this.$t('page.register.passInconsistency'),icon : 'none'});
+					uni.showToast({
+						title: this.$t('page.register.passInconsistency'),
+						icon: 'none'
+					});
 					return false;
 				}
 				if (payPass.trim() == '') {
-					uni.showToast({title: this.$t('page.register.payPassEmpty'),icon : 'none'});
+					uni.showToast({
+						title: this.$t('page.register.payPassEmpty'),
+						icon: 'none'
+					});
 					return false;
 				}
 				if (okPayPass.trim() == '') {
-					uni.showToast({title: this.$t('page.register.okPayPassEmpty'),icon : 'none'});
+					uni.showToast({
+						title: this.$t('page.register.okPayPassEmpty'),
+						icon: 'none'
+					});
 					return false;
 				}
 				if (payPass.trim() != okPayPass.trim()) {
-					uni.showToast({title: this.$t('page.register.payPassInconsistency'),icon : 'none'});
+					uni.showToast({
+						title: this.$t('page.register.payPassInconsistency'),
+						icon: 'none'
+					});
 					return false;
 				}
 				if (this.agree.length <= 0 && this.agree[0] != 'agree') {
-					uni.showToast({title: this.$t('page.register.tickProtocol'),icon : 'none'});
+					uni.showToast({
+						title: this.$t('page.register.tickProtocol'),
+						icon: 'none'
+					});
 					return false;
 				}
 				return true
@@ -209,9 +194,9 @@
 			closeLoading() {
 				this.loading = false;
 			},
-			
+
 			//跳转用户协议
-			toAgreement(){
+			toAgreement() {
 				this.$play()
 				uni.navigateTo({
 					url: '/pages/instructions/instructions?index=4'
@@ -226,119 +211,111 @@
 		width: 750rpx;
 		height: 100vh;
 		margin: 0px auto;
-		// background: black;
-		// background-image: url('@/static/login/bg.png');
+		background: linear-gradient(to bottom, #fcedff 0%, #ffffff 100%);
 		background-size: 100%;
 		background-repeat: no-repeat;
 		box-sizing: border-box;
 		padding: 0rpx 20rpx;
-	
-		.bg-box {
-			position: relative;
+
+		.language {
 			display: flex;
+			justify-content: flex-end;
 			align-items: center;
-			justify-content: center;
-			height: 25%;
-	
-			.language {
-				position: absolute;
-				top: 30rpx;
-				right: 30rpx;
+			height: 160rpx;
+
+			image {
 				width: 60rpx;
 				height: 60rpx;
-				z-index: 999;
 			}
 		}
-	
+
 		.register-title {
 			padding: 0rpx 10rpx;
 			box-sizing: border-box;
-	
+			text-align: center;
+
 			.title {
-				font-size: 36rpx;
-				font-weight: bold;
-				color: #B0C73B;
+				font-size: 30rpx;
+				color: $uni-bg-color-app;
 				margin-bottom: 10rpx;
+				font-weight: bold;
 			}
-	
-			.register-descript {
-				font-size: 32rpx;
-				color: white;
+
+			.shop-desc {
+				font-size: 28rpx;
+				color: #333;
 				margin-bottom: 20rpx;
 			}
 		}
-	
+
 		.input-list {
 			padding: 0rpx 10rpx;
 			box-sizing: border-box;
 			margin: 40rpx 0rpx;
-	
-			.input-item {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				border: 1px solid #B0C73B;
-				padding: 20rpx;
-				border-radius: 5rpx;
-				margin-bottom: 25rpx;
-				box-sizing: border-box;
-				font-size: 28rpx;
-	
-				.input-descript {
-					color: #B0C73B;
-				}
-	
-				input {
-					color: #B0C73B;
+
+			input {
+				display: block;
+				width: 90%;
+				margin: 0rpx auto;
+				color: $uni-bg-color-app;
+				border: 1px solid #eeeeee;
+				height: 80rpx;
+				border-radius: 40rpx;
+				background: #fff;
+				margin-bottom: 20rpx;
+				text-align: center;
+				text-indent: 1em;
+				padding: 0rpx 15rpx;
+
+				&:focus {
+					border-color: #6d00be !important;
+					background: pink !important;
 				}
 			}
 		}
-	
+
 		.forgot-password {
 			color: #B0C73B;
 			text-align: center;
-	
+
 			text {
 				border-bottom: 1rpx solid #ccc;
 			}
 		}
-		
-		.check-box{
+
+		.check-box {
 			display: flex;
 			color: rgb(96, 98, 102);
-			
-			.agreement-content{
+
+			.agreement-content {
 				text-decoration: underline;
 				font-size: 28rpx;
 			}
 		}
-	
+
 		.btns {
 			padding: 0rpx 10rpx;
 			margin-top: 40rpx;
-	
-			.now-login-btn,
+			color: $uni-bg-color;
+		
 			.now-register-btn {
-				background: #B0C73B;
-				border-radius: 10rpx;
+				background: $uni-bg-color-app;
+				border-radius: 60rpx;
 				display: flex;
 				align-items: center;
 				justify-content: center;
 				margin-bottom: 20rpx;
 				font-weight: bold;
-			}
-	
-			.now-login-btn {
-				height: 60rpx;
-				width: 90%;
-				font-size: 28rpx;
-				margin: 0 auto;
-			}
-	
-			.now-register-btn {
 				height: 90rpx;
 				font-size: 40rpx;
 			}
+		
+			.now-login-btn {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				color: $uni-bg-color-app;
+			}
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/static/home/About-us.png b/static/home/About-us.png
index f2a19a8..f805009 100644
Binary files a/static/home/About-us.png and b/static/home/About-us.png differ
diff --git a/static/home/Event.png b/static/home/Event.png
index 1de0f74..04802d5 100644
Binary files a/static/home/Event.png and b/static/home/Event.png differ
diff --git a/static/home/FAQ.png b/static/home/FAQ.png
index dbb749d..cd9f14a 100644
Binary files a/static/home/FAQ.png and b/static/home/FAQ.png differ
diff --git a/static/home/TC.png b/static/home/TC.png
index acf5e8f..7a5c9f5 100644
Binary files a/static/home/TC.png and b/static/home/TC.png differ
diff --git a/static/home/menu.png b/static/home/menu.png
index 5426f7a..4a523c5 100644
Binary files a/static/home/menu.png and b/static/home/menu.png differ
diff --git a/static/home/menu1.png b/static/home/menu1.png
index b12cc0a..a5b3ab6 100644
Binary files a/static/home/menu1.png and b/static/home/menu1.png differ
diff --git a/static/home/menu2.png b/static/home/menu2.png
index 02e13f5..5ea39ff 100644
Binary files a/static/home/menu2.png and b/static/home/menu2.png differ
diff --git a/static/home/menu3.png b/static/home/menu3.png
index d0a09fa..2da4240 100644
Binary files a/static/home/menu3.png and b/static/home/menu3.png differ
diff --git a/static/home/menu4.png b/static/home/menu4.png
index e31f33b..b424e68 100644
Binary files a/static/home/menu4.png and b/static/home/menu4.png differ
diff --git a/static/login/language.png b/static/login/language.png
index 7079f12..f804a1f 100644
Binary files a/static/login/language.png and b/static/login/language.png differ
diff --git a/static/login/logo.png b/static/login/logo.png
index 7ed7cd8..d57d7c6 100644
Binary files a/static/login/logo.png and b/static/login/logo.png differ