ljc 1 месяц назад
Родитель
Сommit
c48b28e12c

+ 2 - 2
components/cwg-input.vue

@@ -427,7 +427,7 @@ function onDateConfirm(event) {
 
 .form-input {
   width: 100%;
-  border: 1px solid var(--border) !important;
+  border: 1px solid var(--bs-border-color) !important;
   border-radius: 10px !important;
   font-size: px2rpx(31) !important;
   margin-top: px2rpx(4) !important;
@@ -466,7 +466,7 @@ function onDateConfirm(event) {
 // uview-plus 组件样式覆盖
 :deep(.u-input) {
   border-radius: 10px !important;
-  font-size: px2rpx(31) !important;
+  font-size: px2rpx(32) !important;
   padding: px2rpx(12);
   background: transparent;
   color: var(--white);

+ 1 - 1
pages/ib/index.vue

@@ -9,7 +9,7 @@
           <view class="d-flex flex-wrap gap-3 align-items-center justify-content-between mb-3" style="width: 100%;">
             <view class="mb-0 h3">Welcome to IB Zone!</view>
             <button type="button" class="btn  btn-secondary  btn-shadow waves-effect" @click="LinkActivity1">
-              <cwg-icon name="crm-share-nodes" :size="24" color="#fff" />{{t('Ib.Index.CreateLinkActivity')}}</button>
+              <cwg-icon name="crm-share-nodes" :size="24" color="#fff" />{{t('Ib.Index.CreateLink')}}</button>
           </view>
         </view>
       </uni-col>

+ 2 - 2
pages/ib/openAccount.vue

@@ -115,7 +115,7 @@ import { ibApi } from '@/service/ib'
 import { isAfterJuly28 } from '@/utils/dateUtils'
 import Config from '@/config/index'
 
-const { t, local } = useI18n()
+const { t, locale } = useI18n()
 const { Code } = Config
 
 const pictLoading = ref(false)
@@ -259,7 +259,7 @@ const backIndex = () => {
 }
 
 const openLeverageMargin = () => {
-  const url = ['cn', 'zhHant'].includes(local.value)
+  const url = ['cn', 'zhHant'].includes(locale.value)
     ? 'https://www.cwgvu.com/cn/leveragemargin'
     : 'https://www.cwgvu.com/en/leveragemargin'
   // #ifdef H5

+ 4 - 3
pages/mine/components/CardAuthDialog.vue

@@ -1,5 +1,5 @@
 <template>
-    <uni-popup ref="cardRef" type="center" background-color="#fff" style="z-index: 9999;">
+    <uni-popup ref="cardRef" type="center" background-color="#fff" style="z-index: 999;">
         <view class="dialog-container">
             <view class="dialog-header">
                 <text class="dialog-title" v-t="'PersonalManagement.CardVerify.Title'" />
@@ -237,6 +237,7 @@ defineExpose({
 </script>
 
 <style lang="scss" scoped>
+  @import "@/uni.scss";
 .dialog-container {
     width: 90vw;
     max-width: px2rpx(800);
@@ -257,7 +258,7 @@ defineExpose({
         .dialog-title {
             font-size: px2rpx(20);
             font-weight: 700;
-            color: var(--bs-emphasis-color);
+            color: #fff;
             letter-spacing: 0.5px;
         }
 
@@ -322,7 +323,7 @@ defineExpose({
 
             &.btn-confirm {
                 background: #ea2027;
-                color: var(--bs-emphasis-color);
+                color: #fff;
 
                 &:hover {
                     background: #d11920;

+ 2 - 1
pages/mine/components/KycAuthDialog.vue

@@ -153,6 +153,7 @@ defineExpose({
 </script>
 
 <style lang="scss" scoped>
+  @import "@/uni.scss";
 .dialog-container {
     width: 90vw;
     max-width: px2rpx(800);
@@ -173,7 +174,7 @@ defineExpose({
         .dialog-title {
             font-size: px2rpx(20);
             font-weight: 700;
-            color: var(--bs-emphasis-color);
+            color: #fff;
             letter-spacing: 0.5px;
         }
 

+ 0 - 1
pages/mine/components/PersonalInfoTab.vue

@@ -578,7 +578,6 @@ onMounted(async () => {
   .uni-combox,
   .uni-easyinput__content,
   .uni-date-editor--x {
-    border: none !important;
     background-color: var(--bs-secondary-bg)!important;
     //background-color: var(--color-zinc-100) !important;
   }

+ 17 - 14
pages/mine/improveImmediately.vue

@@ -38,7 +38,7 @@
               </uni-forms-item>
             </uni-col>
             <!-- 法人中间名 -->
-            <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8" v-if="local == 'en'">
+            <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8" v-if="locale == 'en'">
               <uni-forms-item name="middle" :label="t('placeholder.middle')">
                 <uni-easyinput :clearable="false" v-model="formData.middle" :placeholder="t('placeholder.input')" />
               </uni-forms-item>
@@ -64,7 +64,7 @@
               </uni-forms-item>
             </uni-col>
             <!-- 拼音 -->
-            <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8" v-if="['cn', 'zhHant'].includes(local)">
+            <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8" v-if="['cn', 'zhHant'].includes(locale)">
               <uni-forms-item name="nameEn" :label="t('ImproveImmediately.Label.NamePinYin')">
                 <uni-easyinput :clearable="false" v-model="formData.nameEn" :placeholder="t('placeholder.input')" />
               </uni-forms-item>
@@ -341,7 +341,7 @@
               <span class="dian">-</span>
               <span>{{ t('ImproveImmediately.Content.ProofIdentity5') }}</span>
             </p>
-            <p class="des" v-if="['cn', 'zhHant'].indexOf(local) == -1">
+            <p class="des" v-if="['cn', 'zhHant'].indexOf(locale) == -1">
               <span class="dian">-</span>
               <span>{{ t('ImproveImmediately.Content.ProofIdentity6') }}</span>
             </p>
@@ -357,11 +357,11 @@
               <span class="dian">·</span>
               <span>{{ t('ImproveImmediately.Content.ProofIdentity3') }}</span>
             </p>
-            <p class="des" v-if="['cn', 'zhHant'].indexOf(local) == -1">
+            <p class="des" v-if="['cn', 'zhHant'].indexOf(locale) == -1">
               <span class="dian">·</span>
               <span>{{ t('ImproveImmediately.Content.ProofIdentity7') }}</span>
             </p>
-            <p class="des" v-if="['cn', 'zhHant'].indexOf(local) == -1">
+            <p class="des" v-if="['cn', 'zhHant'].indexOf(locale) == -1">
               <span class="dian">·</span>
               <span>{{ t('ImproveImmediately.Content.ProofIdentity8') }}</span>
             </p>
@@ -532,19 +532,19 @@
               <span>{{ t('ImproveImmediately.Content.ProofAddress3') }}</span>
             </p>
             <p class="des">
-              <span class="dian" v-if="['cn', 'zhHant'].indexOf(local) != -1">·</span>
-              <span class="dian" v-if="local == 'en'">-</span>
+              <span class="dian" v-if="['cn', 'zhHant'].indexOf(locale) != -1">·</span>
+              <span class="dian" v-if="locale == 'en'">-</span>
               <span>{{ t('ImproveImmediately.Content.ProofAddress4') }}</span>
             </p>
             <p class="des">
               <span class="dian">·</span>
               <span>{{ t('ImproveImmediately.Content.ProofAddress6') }}</span>
             </p>
-            <p class="des" v-if="local == 'en'">
+            <p class="des" v-if="locale == 'en'">
               <span class="dian">·</span>
               <span>{{ t('ImproveImmediately.Content.ProofAddress7') }}</span>
             </p>
-            <p class="des" v-if="local == 'en'">
+            <p class="des" v-if="locale == 'en'">
               <span class="dian">·</span>
               <span>{{ t('ImproveImmediately.Content.ProofAddress8') }}</span>
             </p>
@@ -659,7 +659,7 @@ import icon_mobile from '@/static/icons/icon_mobile.svg'
 import icon_arrowR from '@/static/icons/icon_arrowR.svg'
 
 const router = useRouter()
-const { t, local } = useI18n()
+const { t, locale } = useI18n()
 const currentStep = ref<number>(3)
 const formRef = ref()
 const dialogCheck = ref(null)
@@ -1248,12 +1248,14 @@ async function getStateList(pid: string) {
   try {
     let res = await personalApi.Country({ pid })
     if (res.code == Config.Code.StatusOK) {
+      console.log(locale)
       stateOptions.value = res.data.map((item: any) => ({
-        text: local.value === 'en' ? item.enName : item.name,
-        value: local.value === 'en' ? item.enName : item.name,
+        text: locale.value === 'en' ? item.enName : item.name,
+        value: locale.value === 'en' ? item.enName : item.name,
       }))
       states.value = res.data
       const state = formData.value.state
+      console.log(state)
       if (state) {
         states.value.forEach((item) => {
           if (
@@ -1266,6 +1268,7 @@ async function getStateList(pid: string) {
       }
     }
   } catch (error: any) {
+    console.log(error)
   }
 }
 
@@ -1274,8 +1277,8 @@ async function getCityList(pid: string) {
     let res = await personalApi.Country({ pid })
     if (res.code == Config.Code.StatusOK) {
       cityOptions.value = res.data.map((item: any) => ({
-        text: local.value === 'en' ? item.enName : item.name,
-        value: local.value === 'en' ? item.enName : item.name,
+        text: locale.value === 'en' ? item.enName : item.name,
+        value: locale.value === 'en' ? item.enName : item.name,
       }))
       cities.value = res.data
     }

+ 1 - 1
pages/mine/info.vue

@@ -309,7 +309,7 @@ onMounted(async () => {
 
 .info-card {
     padding: px2rpx(5);
-    border: 1px solid rgba(108, 133, 149, 0.12);
+    //border: 1px solid rgba(108, 133, 149, 0.12);
     border-radius: px2rpx(8);
 
     .btns {

+ 1 - 1
static/scss/global/global.scss

@@ -1391,7 +1391,7 @@ uni-content.collapsed {
     .cwg-combox,
     .uni-date-editor--x {
       height: 3rem;
-      border: none !important;
+      border: 1px solid var(--bs-border-color)!important;
       border-radius: px2rpx(8);
       font-size: px2rpx(16);
         //background-color: var(--color-zinc-100) !important;

+ 9 - 9
uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue

@@ -522,7 +522,7 @@ $disable: 0.4;
 				justify-content: space-between;
 
 				.checklist-text {
-					font-size: 14px;
+					font-size: 1rem;
 					color: var(--bs-heading-color);
 					margin-left: 5px;
 					line-height: 14px;
@@ -551,8 +551,8 @@ $disable: 0.4;
 				box-sizing: border-box;
 				/* #endif */
 				position: relative;
-				width: 16px;
-				height: 16px;
+				width: 1.4rem;
+				height: 1.4rem;
 				border: 1px solid $border-color;
 				border-radius: 4px;
 				background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
@@ -566,13 +566,13 @@ $disable: 0.4;
 					/* #ifndef APP-NVUE */
 					top: 1px;
 					/* #endif */
-					left: 5px;
-					height: 8px;
-					width: 4px;
-					border-right-width: 1px;
+					left: 0.4rem;
+					height: 0.75rem;
+					width: 0.5rem;
+					border-right-width: 2px;
 					border-right-color: #fff;
 					border-right-style: solid;
-					border-bottom-width: 1px;
+					border-bottom-width: 2px;
 					border-bottom-color: #fff;
 					border-bottom-style: solid;
 					opacity: 0;
@@ -595,7 +595,7 @@ $disable: 0.4;
 				height: 16px;
 				border: 1px solid $border-color;
 				border-radius: 16px;
-				background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
+				background-color: var(--color-white);
 				z-index: 1;
 
 				.radio__inner-icon {