feat:优化2 3 5 6

locale/cn.json

@@ -678,7 +678,7 @@
     "agreemnet6": "隐私政策",
     "agreemnet7": " 。 ",
     "agreemnet8": "电子邮件已存在",
-    "agreemnet9": "如果你在收件箱中找不到邮件，请检查你的垃圾邮件文件夹",
+    "agreemnet9": "若长时间未收到邮件，请检查垃圾邮件或广告邮件文件夹",
     "ageRestriction": "根据监管要求，差价合约交易仅限18岁及以上的个人进行。您的申请目前无法继续。"
   },
   "placeholder": {

locale/en.json

@@ -666,7 +666,7 @@
     "agreemnet6": "Privacy Policy",
     "agreemnet7": ".",
     "agreemnet8": "Email exists",
-    "agreemnet9": "If you can't find the email in your inbox, check your spam folder",
+    "agreemnet9": "If you haven't received emails for a long time, please check your spam or junk mail folder.",
     "ageRestriction": "In accordance with regulatory requirements, CFD trading is restricted to individuals aged 18 years or older. Your application cannot proceed at this time."
   },
   "placeholder": {

pages/login/index.vue

@@ -122,13 +122,13 @@
                   <uni-row :gutter="20" class="formContent">
                     <uni-col :xs="24" :md="12">
                       <uni-forms-item name="country" :label="t('newSignup.item3')">
-                        <cwg-combox v-model:value="formData.country" :options="countryOptions" border="none" filterable>
+                        <cwg-combox v-model:value="formData.country" :options="countryOptions" border="none" filterable :placeholder="t('newSignup.item4')">
                         </cwg-combox>
                       </uni-forms-item>
                     </uni-col>
                     <uni-col :xs="24" :md="12">
                       <uni-forms-item name="phone" :label="t('newSignup.item5')">
-                        <up-input :customStyle="customStyle" v-model="formData.phone" border="none" :placeholder="t('newSignup.item5')"></up-input>
+                        <uni-easyinput :customStyle="customStyle" v-model="formData.phone" border="none" :placeholder="t('newSignup.item6')"></uni-easyinput>
                       </uni-forms-item>
                     </uni-col>
                     <uni-col :xs="24" :md="12">
@@ -139,17 +139,17 @@
                     </uni-col>
                     <uni-col :xs="24" :md="12">
                       <uni-forms-item name="email" :label="t('newSignup.item7')">
-                        <up-input :customStyle="customStyle" v-model="formData.email" :placeholder="t('newSignup.item8')" border="none"
-                          :disabled="!isAgeValid || !formData.birthDate"></up-input>
+                        <uni-easyinput :customStyle="customStyle" v-model="formData.email" :placeholder="t('newSignup.item8')" border="none"
+                          :disabled="!isAgeValid || !formData.birthDate"></uni-easyinput>
                       </uni-forms-item>
                     </uni-col>
                     <uni-col :xs="24" :md="24">
                       <uni-forms-item name="emailCode" :label="t('newSignup.item9')">
                         <view style="display: flex;">
                           <view style="flex: 1;">
-                            <up-input :customStyle="customStyle" class="code" border="none" :disabled="!isAgeValid || !formData.birthDate" v-model="formData.emailCode"
+                            <uni-easyinput :customStyle="customStyle" class="code" border="none" :disabled="!isAgeValid || !formData.birthDate" v-model="formData.emailCode"
                               :placeholder="t('newSignup.item10')">
-                            </up-input>
+                            </uni-easyinput>
                           </view>
                           <view class="btn-code" @click="(!isAgeValid || !formData.birthDate) ? '' : handleGetCode()">
                             {{ getCodeString }}
@@ -162,8 +162,8 @@
                     </uni-col>
                     <uni-col :xs="24" :md="12">
                       <uni-forms-item name="password" :label="t('newSignup.item12')">
-                        <up-input border="none" :customStyle="customStyle" v-model.trim="formData.password" :disabled="!isAgeValid || !formData.birthDate"
-                          :placeholder="t('newSignup.item13')" type="password"></up-input>
+                        <uni-easyinput border="none" :customStyle="customStyle" v-model.trim="formData.password" :disabled="!isAgeValid || !formData.birthDate"
+                          :placeholder="t('newSignup.item13')" type="password"></uni-easyinput>
                       </uni-forms-item>
                       <uni-col :xs="24" :md="24">
                         <uni-forms-item>
@@ -177,8 +177,8 @@
                     </uni-col>
                     <uni-col :xs="24" :md="12">
                       <uni-forms-item v-if="!isRouteHasId" name="linkValue" :label="t('newSignup.item14')">
-                        <up-input border="none" :customStyle="customStyle" v-model.trim="formData.linkValue" :disabled="!isAgeValid || !formData.birthDate"
-                          :placeholder="t('newSignup.item15')" @input="limitAgentIdLength"></up-input>
+                        <uni-easyinput border="none" :customStyle="customStyle" v-model.trim="formData.linkValue" :disabled="!isAgeValid || !formData.birthDate"
+                          :placeholder="t('newSignup.item15')" @input="limitAgentIdLength"></uni-easyinput>
                       </uni-forms-item>
                     </uni-col>
                   </uni-row>
@@ -1356,19 +1356,21 @@ button {
   padding: 0 px2rpx(10);
   margin-bottom: px2rpx(10);
   display: flex;
-  align-items: center;
+  align-items: flex-start;
   cursor: pointer;
 
   .checkbox-label {
-    font-size: px2rpx(14);
+    font-size: px2rpx(16);
     color: #666666;
     margin-left: px2rpx(8);
+    line-height: px2rpx(20);
     user-select: none;
   }
 
   :deep(.u-checkbox) {
     display: flex;
     align-items: flex-start;
+    margin: 0;
   }
 }
 
@@ -1398,7 +1400,7 @@ button {
   color: #e61f1e;
   padding-bottom: 2px;
   cursor: pointer;
-  font-size: px2rpx(14);
+  font-size: px2rpx(16);
 }
 
 .agreemnet9 {
@@ -1410,7 +1412,7 @@ button {
   margin-top: px2rpx(20);
   line-height: 20px;
   color: #000;
-  font-size: 12px;
+  font-size: px2rpx(14);
 
   .desc-link {
     display: inline-block;

static/scss/global/global.scss

@@ -287,7 +287,7 @@
     --bs-btn-secondary-hover: #d93618;
     --bs-btn-secondary-border-hover: #d93618;
     --bs-btn-secondary-active: #d93618;
-    --cwg-placeholder-color: #6a6a6a;
+    --cwg-placeholder-color: #909193;
 }
 
 .dark {

uni_modules/uni-combox/components/uni-combox/uni-combox.vue

@@ -7,7 +7,7 @@
 			<input class="uni-combox__input" type="text" :placeholder="placeholder"
 				placeholder-class="uni-combox__input-plac" v-model="inputVal" @input="onInput" @focus="onFocus"
 				@blur="onBlur" />
-			<uni-icons v-if="!inputVal || !clearAble" :type="showSelector ? 'top' : 'bottom'" size="14" color="#999"
+			<uni-icons v-if="!inputVal || !clearAble" :type="showSelector ? 'top' : 'bottom'" size="18" color="#999"
 				@click="toggleSelector">
 			</uni-icons>
 			<uni-icons v-if="inputVal && clearAble" type="clear" size="24" color="#999" @click="clean">

uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue

@@ -4,7 +4,7 @@
 			<slot>
 				<view class="uni-date-editor--x"
 					:class="{ 'uni-date-editor--x__disabled': disabled, 'uni-date-x--border': border }">
-					<view v-if="!isRange" class="uni-date-x uni-date-single">
+					<view v-if="!isRange" class="uni-date-x uni-date-single" :class="[displayValue?'':'uni-date-placeholder']">
 						<uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22"></uni-icons>
 						<view class="uni-date__x-input">{{ displayValue || singlePlaceholderText }}</view>
 					</view>
@@ -867,6 +867,11 @@ $uni-primary: #007aff !default;
 :deep(.uni-picker-container){
   z-index: 9999!important;
 }
+.uni-date-placeholder{
+  .uni-date__x-input{
+    color: var(--cwg-placeholder-color);
+  }
+}
 
 .uni-date-x {
 	display: flex;
@@ -922,7 +927,7 @@ $uni-primary: #007aff !default;
 	position: relative;
 	flex: 1;
 	line-height: 35px;
-	font-size: 14px;
+	font-size: 1rem;
 	overflow: hidden;
 }
 

uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue

@@ -544,6 +544,7 @@ export default {
 <style lang="scss">
 $uni-error: #e43d33;
 $uni-border-1: #dcdfe6 !default;
+$uni-place: #909193;
 
 .uni-easyinput {
 	/* #ifndef APP-NVUE */
@@ -553,7 +554,7 @@ $uni-border-1: #dcdfe6 !default;
 	position: relative;
 	text-align: left;
 	color: var(--bs-heading-color);
-	font-size: 14px;
+	font-size: 1rem;
 }
 
 .uni-easyinput__content {
@@ -581,7 +582,7 @@ $uni-border-1: #dcdfe6 !default;
 	overflow: hidden;
 	flex: 1;
 	line-height: 1;
-	font-size: 14px;
+	font-size: 1rem;
 	height: 35px;
 }
 
@@ -604,7 +605,7 @@ $uni-border-1: #dcdfe6 !default;
 	overflow: hidden;
 	flex: 1;
 	line-height: 1.5;
-	font-size: 14px;
+	font-size: 1rem;
 	margin: 6px;
 	margin-left: 0;
 	height: 80px;
@@ -663,7 +664,7 @@ $uni-border-1: #dcdfe6 !default;
 	border-color: $uni-error;
 
 	.uni-easyinput__placeholder-class {
-		color: mix(#fff, $uni-error, 50%);
+		color: mix($uni-place, $uni-error, 50%);
 	}
 }