From 0a0ab4d1605f7d29dbb4e8e12ad6d8885b31fdfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B5=85=E5=BF=B5?= <email@sample.com>
Date: Mon, 24 Mar 2025 10:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E5=86=8C=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E5=AF=86=E7=A0=81=20=E9=9A=90=E8=97=8F=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E7=99=BB=E5=BD=95=E5=8F=8A=E4=BF=84=E8=AF=AD=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=81=94=E7=B3=BB=E5=AE=A2=E6=9C=8D=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue         |   6 ------
 pages/index/mine.vue          |  18 ++++++++++++++++--
 pages/login/index.vue         |  10 ++--------
 pages/login/register.vue      |  16 ++++++++++++++++
 static/image/mine/chaprop.png | Bin 0 -> 1244 bytes
 5 files changed, 34 insertions(+), 16 deletions(-)
 create mode 100644 static/image/mine/chaprop.png

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8556df8..5cbe756 100644
--- a/pages/index/index.vue
+++ b/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({
diff --git a/pages/index/mine.vue b/pages/index/mine.vue
index f921a82..086d498 100644
--- a/pages/index/mine.vue
+++ b/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;
 	}
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 2f13b86..106e07f 100644
--- a/pages/login/index.vue
+++ b/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 = [{
diff --git a/pages/login/register.vue b/pages/login/register.vue
index 6c6e412..c67b2ff 100644
--- a/pages/login/register.vue
+++ b/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',
diff --git a/static/image/mine/chaprop.png b/static/image/mine/chaprop.png
new file mode 100644
index 0000000000000000000000000000000000000000..3be4d213478c95f53ac5bda2a1472735b54c50d8
GIT binary patch
literal 1244
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVB7>k44ofy`glX(f`oC)v=aRt)<
zhYPTp^pFGSALo)FzhDLy4jutv5pfB51$7O517j0=2X_x|AOC>hkno7;nB??~?EK>L
z>gM+T$<t@gU%Y(%=Iy)pA3lEm^7Y&IA3uNn{`2?WC)Gmv7#NuIJzX3_A`Wkz`8Mp9
zgFxHzg-NS2R=W!Ha;b%_)(l#CtR_I={NMY*^)2fKCfz+!^1tBRxi_=#&b&GEruf81
z8_S>VsBhvtpdzvR+|79*^1bt<CrIwQZK`#!R{q=x$;}VHUz)x7uy2dOmpuly$>v@M
zB+r$U9+=-8Tx^*?k5BIJ(v(*j^Z#ghO*`X0ZRXTj*D~gvSnRF4LtnphmwCpsl_vRn
zU7kPfKK4y0yyE%Mtmm9h-gu?%jqf~p{%ZU_k2z1oqAt}i&$ypG^Y)H@#(QUKrXFTc
zu(<a1Ug4tp8QtcL6?%dRz3B}n69w<Z?v(zZEPs)w;m5K!b9Z$%CbY};nk($nsDG}X
z^uYA>v3Lga&`lol2hJWTX8pbN%?{Cr?8XmvW<9E5TgJX}rJ;a{R{A4`iko&H{zPc?
zKbE+0!q$!DPW^(26Se|tZEM+EG>_NsvkIE?=~cGY3#S8doXZ`w_De8sjGf_HW8v+p
z{Gt3Mi}Z(}U%F=YJEZ%MUzxIfqtcyw3nbpRb}Zw+;Flhw5OL-78Mf)(Z<O}rE@W4^
zTFSxWB5&wk!p-CAB4s?o+*R7p|3Xh<T89U}#LIk@`q#<}l$G=nGUeAE5E1*JqQsc+
zN^1X!NVNy+>%ItZ&(*iPFoo|!@E3vZk54#XbZpknC{xz@kiuZ`h-vwv<`st~2OpSf
zztirfQ^=!E&K^|;mn$7vHi8GHbG9sMv<Q6c$ue;PON_#*k18xF?yF8Zhdey_`#;l~
z?<cleFa5S*rR|37{Z)Jy)~j27VRW~e$@Tl-m#b^64|c^Da|)Q>?F`iqn%=Ec8dxs5
zcJGDL0z1}j6rEUBdp4+guF9^bw|AOMycoN^_^bJxUd;>MZ!cWW=nUpf&)=*nrha=%
zytbSq@9XHg%W;P{KT6E@788&UJ#O8#z53Afe*3d^|L-4P98>?La&~6Z-C6PvxVsjF
z%dHn@UOzue+3;7TN}I=OtFxDG>E?v0Hbqr_3Uji}bpH{^@L+pLO4J(9Wwu8c)~79;
zH2XrW)V+7QFZTI!?S0)+_jT9Nth+4}=0v^Hm)Fs}d^?7(Cf{@BKf4Q?wr*7_)&IWv
z(%;j8dlt;ojeRfqZB|*`oB3-3zWe|3*S=MmG+pt|_KuGlHTC?9&(1ucH}}mg*DJNV
zgQASAUNh(Y+4<p$;gVk&WisV&+!-d?m(BGH-uOU%YiMvlo|auIFefv3y85}Sb4q9e
E0R1bld;kCd

literal 0
HcmV?d00001