Merge remote-tracking branch 'origin/StableVersion' into dev_vite

src/component/Account/account.vue

@@ -50,10 +50,10 @@
 									<div v-if="!isEditEmail">{{ userDetail.email }}</div>
 									<input v-else type="text" :value="editEmail">
 								</div>
-								<div class="icon">
+								<!-- <div class="icon">
 									<i v-if="!isEditEmail" class="fi fi-rr-edit" @click="openEdit('email')"></i>
 									<i v-else class="fi fi-br-check" @click="editChek('email')"></i>
-								</div>
+								</div> -->
 							</div>
 						</div>
 						<div class="content_item_user_left_detail_bottom">

src/component/Account/frontPage/mylnformation.vue

@@ -28,7 +28,7 @@
                         optionFilterProp="label"
                         :options="countryList"
 						:field-names="{ label: locale == 'CHINESE_SIMPLIFIED'?'labelCn':'label' }"
-                        placeholder="Please select"
+                        :placeholder="`${$t('account.plaseSelect')} ${$t('account.Country')}`"
                         allowClear
                         show-search
                     ></a-select>