地图页面 及页面加语言编译

pages/login/index.vue

@@ -8,50 +8,51 @@
 			<view class="inputs_button">
 				<view class="inputs">
 					<view class="account">
-						<input type="text" v-model="email"  placeholder="账号" />
+						<input type="text" v-model="email"  :placeholder="$t('account')" />
 					</view>
 					<view class="password">
 						<u--input
 							type="password"
-						    placeholder="密码"
+						    :placeholder="$t('password')"
 						    v-model="password"
 						    border="none"
 						  ></u--input>
 					</view>
 				</view>
 				<view class="forgot-password">
-					<text @click="forgotPassword">忘记密码？</text>
+					<view @click="regin">{{$t('reg')}}</view>
+					<view @click="forgotPassword">{{$t('fgpassword')}}？</view>
 				</view>
 				<view class="button">
 					<view @click="login">
-						登录
+						{{$t('login')}}
 					</view>
 				</view>
 			</view>
 			<view class="three">
-				<u-divider text="第三方登录" style="padding: 0px 40px;"></u-divider>
+				<u-divider :text="$t('threelogin')" style="padding: 0px 40px;"></u-divider>
 				<u-grid :border="false" @click="click" align="center">
 					<u-grid-item>
 						<image src="/static/image/login/fenshu.png" mode=""></image>
-						<text class="grid-text">飞书</text>
+						<text class="grid-text">{{$t('Facebook')}}</text>
 					</u-grid-item>
 					<u-grid-item>
 						<image src="/static/image/login/emali.png" mode=""></image>
-						<text class="grid-text">邮箱</text>
+						<text class="grid-text">{{$t('email')}}</text>
 					</u-grid-item>
 					<u-grid-item>
 						<image src="/static/image/login/phone.png" mode=""></image>
-						<text class="grid-text">手机</text>
+						<text class="grid-text">{{$t('phone')}}</text>
 					</u-grid-item>
 				</u-grid>
 			</view>
-			<view class="pact">
-				<radio :checked="pactChecked" activeBackgroundColor="#3264ed" activeBorderColor="#3264ed"
-					borderColor="#3264ed" color="#fff" @click="pactChange" />
-				<view>我已经阅读并同意<text @click="toPact">《用户协议》</text>和<text @click="toPact">《隐私协议》</text></view>
-			</view>
+			
+		</view>
+		<view class="pact">
+			<radio :checked="pactChecked" activeBackgroundColor="#3264ed" activeBorderColor="#3264ed"
+				borderColor="#3264ed" color="#fff" @click="pactChange" />
+			<view>{{$t('agreeMsg')}}<text @click="toPact">{{$t('UserAgreement')}}</text>{{$t('and')}}<text @click="toPact">{{$t('Privacy')}}</text></view>
 		</view>
-		
 	</view>
 </template>
 
@@ -66,30 +67,40 @@
 			}
 		},
 		onLoad() {
-
+			
 		},
 		methods: {
 			pactChange() {
 				this.pactChecked = !this.pactChecked
 			},
+			regin(){
+				uni.navigateTo({
+					url: '/pages/login/register'
+				})
+			},
+			forgotPassword(){
+				uni.navigateTo({
+					url: '/pages/mine/resetPwd'
+				})
+			},
 			login() {
 				if(this.email==''){
 					uni.showToast({
-						title:'邮箱不能为空',
+						title:this.$t('emailerr'),
 						icon: 'none'
 					});
 					return false
 				}
 				if(this.password==''){
 					uni.showToast({
-						title:'密码不能为空',
+						title:this.$t('passworerr'),
 						icon: 'none'
 					});
 					return false
 				}
 				if(!this.pactChecked){
 					uni.showToast({
-						title:'请先勾选同意用户服务协议以及隐私政策',
+						title:this.$t('agreementarr'),
 						icon: 'none'
 					});
 					return false
@@ -105,7 +116,7 @@
 					console.log(res.data.data)
 					if (res.data.code == -1) {
 						uni.showToast({
-							title: res.data.msg,
+							title: res.data.message,
 							icon: 'none'
 						});token
 						
@@ -199,7 +210,10 @@
 			}
 		}
 		.forgot-password {
-		  text-align: right;
+			display: flex;
+			align-items: center;
+			justify-content:space-between;
+		  // text-align: right;
 		  margin-bottom: 20px;
 		}
 		.pact {
@@ -207,7 +221,7 @@
 			align-items: center;
 			justify-content: center;
 			font-size: 24rpx;
-
+			margin-bottom: 20px;
 			text {
 				color: #3264ed;
 			}