添加注册确认密码 隐藏三方登录及俄语 添加联系客服取消按钮

pages/index/index.vue

@@ -83,9 +83,6 @@
 					}, {
 						label: this.$t('en'),
 						id: 'en'
-					}, {
-						label:this.$t('ru'),
-						id: 'ru'
 					}]
 				],
 				
@@ -141,9 +138,6 @@
 					}, {
 						label: this.$t('en'),
 						id: 'en'
-					}, {
-						label:this.$t('ru'),
-						id: 'ru'
 					}]
 				];
 				uni.setTabBarItem({

pages/index/mine.vue

@@ -49,7 +49,7 @@
 					<span>{{$t('mine.feedback')}}</span>
 					<uni-icons type="right"  class="icon" size="18"></uni-icons>
 				</view> -->
-				<view class="sonContent" @click="gomyauth">
+				<view class="sonContent" v-if="!isopenid" @click="gomyauth">
 					<image class="son-img-bg" style="width: 30px; height: 30px;" src="/static/image/login/fenshu.png"></image>
 					<span>{{$t('auth')}}</span>
 					<uni-icons type="right"  class="icon" size="18"></uni-icons>
@@ -80,13 +80,16 @@
 			
 		</view>
 		<!-- 联系客服弹框 -->
-		<u-popup :show="show" :round="20" mode="center"  @close="close" :closeable="true">
+		<u-popup :show="show" :round="20" mode="center"  @close="close">
 			<view class="popupcontent">
 				<image class="log1" src="/static/image/mine/kefu.png"></image>
 				<view class="title">{{$t('mine.kfphone')}}</view>
 				<view class="calls">18137110386</view>
 				<button class="btn" @click="callPhone('18137110386')">{{$t('call')}}</button>
 			</view>
+			<view class="upopupqx" @click="close">
+				<image src="/static/image/mine/chaprop.png" mode=""></image>
+			</view>
 		</u-popup>
 	</view>
 </template>
@@ -177,6 +180,17 @@
 </script>
 
 <style lang="scss">
+	::v-deep .u-popup__content{
+		background-color: transparent !important;
+	}
+	.upopupqx{
+		margin-top: 20px;
+		text-align: center;
+		image{
+			width: 80rpx;
+			height: 80rpx;
+		}
+	}
 	uni-page-body {
 		background-color: #F6F6F6 !important;
 	}

pages/login/index.vue

@@ -37,7 +37,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="three">
+			<!-- <view class="three">
 				<u-divider :text="$t('threelogin')" style="padding: 0px 40px;"></u-divider>
 				<u-grid :border="false" @click="click" align="center">
 					<u-grid-item>
@@ -53,7 +53,7 @@
 						<text class="grid-text">{{$t('phone')}}</text>
 					</u-grid-item>
 				</u-grid>
-			</view>
+			</view> -->
 			
 		</view>
 		<view class="pact">
@@ -82,9 +82,6 @@
 					}, {
 						label: this.$t('en'),
 						id: 'en'
-					}, {
-						label:this.$t('ru'),
-						id: 'ru'
 					}]
 				],
 				language:'zh-Hans'
@@ -118,9 +115,6 @@
 					}, {
 						label: this.$t('en'),
 						id: 'en'
-					}, {
-						label:this.$t('ru'),
-						id: 'ru'
 					}]
 				];
 				this.list1 = [{

pages/login/register.vue

@@ -39,6 +39,14 @@
 						    border="none"
 						  ></u--input>
 					</view>
+					<view class="password">
+						<u--input
+							type="password"
+							v-model="password1"
+						    :placeholder="$t('Confirmpassword')"
+						    border="none"
+						  ></u--input>
+					</view>
 				</view>
 				<view class="button">
 					<view @click="login">
@@ -59,6 +67,7 @@
 				email: "",
 				code:'',
 				password: "",
+				password1: "",
 				pactChecked: false,
 				vcodeTime: 0,
 				vcodeTimer: null
@@ -93,6 +102,13 @@
 					});
 					return false
 				}
+				if(this.password != this.password1){
+					uni.showToast({
+						title:this.$t('passworerr1'),
+						icon: 'none'
+					});
+					return false
+				}
 				request({
 					url:'user/register',
 					method:'POST',