Explorar el Código

feat:首页,部分表单高度修改

ljc hace 1 mes
padre
commit
15292d6ff9

+ 2 - 2
components/AddBankDialog.vue

@@ -503,7 +503,7 @@ defineExpose({
   .dialog-footer {
     display: flex;
     gap: px2rpx(12);
-    justify-content: space-between;
+    justify-content: space-around;
     padding: px2rpx(16) 0 0;
     border-top: 1px solid #f3f4f6;
 
@@ -537,7 +537,7 @@ defineExpose({
 
       &.btn-confirm {
         background: #ea2027;
-        color: var(--bs-emphasis-color);
+        color: #fff;
 
         &:hover {
           background: #d11920;

+ 5 - 2
components/cwg-combox.vue

@@ -143,12 +143,15 @@ const handleComboxChange = (text) => {
 }
 
 .disabled-text {
-    height: px2rpx(35);
+    height: 100%;
     padding: 0 px2rpx(12);
     border-radius: px2rpx(4);
-    line-height: px2rpx(35);
+    line-height: 1;
     font-size: px2rpx(15);
     background: transparent;
+    display: flex;
+    align-items: center;
+  //justify-content: center;
     color: #d5d5d5;
 }
 </style>

+ 4 - 0
package.json

@@ -27,5 +27,9 @@
     "unplugin-vue2-script-setup": "^0.11.4",
     "uview-plus": "^3.3.28",
     "vant": "^3.4.3"
+  },
+  "devDependencies": {
+    "postcss-plugin-px2rem": "^0.8.1",
+    "postcss-px-to-viewport": "^1.1.1"
   }
 }

+ 1 - 1
pages/ib/index.vue

@@ -942,7 +942,7 @@ onMounted(async () => {
     background: var(--bs-body-bg);
     color: var(--bs-emphasis-color);
     padding: px2rpx(12) px2rpx(16);
-    border-radius: 4px;
+    border-radius: 4rpx;
     flex: 1;
     margin: 0 px2rpx(5) px2rpx(10);
     box-shadow: 0 px2rpx(4) px2rpx(12) rgba(0, 0, 0, 0.2);

+ 79 - 10
pages/ib/linkList.vue

@@ -59,23 +59,37 @@
             <cwg-combox v-model:value="accountTypeSettings.cent.selectedIndex" :options="getAvailableSpreads('8')"
               @change="(val) => handleAccountTypeChange('cent', '8', val)" :placeholder="t('placeholder.choose')" />
 
-            <view class="btn">
-              <button class="crm-cursor" @click="CreateLink">{{ t('Ib.Index.CreateLink') }}
+            <view class="btn-top">
+              <button style="width: 150px" class="crm-cursor" @click="CreateLink">{{ t('Ib.Index.CreateLink') }}
               </button>
             </view>
             <view class="link qrCode" v-if="link">
               <QrCode ref="qrCode" :text="link" :width="200" :height="200" />
-              <view class="btn">
+              <view class="btn-top">
                 <button class="crm-cursor" @click="downloadQrCode()">{{ t('Btn.item9') }}
                 </button>
               </view>
             </view>
             <view class="link" v-if="link">
               <uni-easyinput disabled v-model="link" />
-              <button class="btn" @click="CopyLink(link)">
+              <button class="btn-copy" @click="CopyLink(link)">
                 {{ t('Ib.Index.Copy') }}
               </button>
             </view>
+
+            <view class="account-adjust-notes-panel">
+              <view class="account-adjust-notes-section">
+                <view class="account-adjust-notes-title">
+                  <cwg-icon name="icon_about us" color="#333" :size="18" class="account-adjust-notes-title-icon" />
+                  <text class="account-adjust-notes-title-text">{{ t('Ib.Custom.AccountAdjustNotesSection1Title') }}</text>
+                </view>
+                <view class="account-adjust-notes-list">
+                  <view class="account-adjust-notes-item">{{ t('Ib.Custom.AccountAdjustNotesSection1Item1') }}</view>
+                  <view class="account-adjust-notes-item">{{ t('Ib.Custom.AccountAdjustNotesSection1Item2') }}</view>
+                </view>
+              </view>
+            </view>
+            
           </view>
         </view>
       </cwg-popup>
@@ -557,12 +571,12 @@ const closeDetail = () => {
     cursor: pointer;
     display: flex;
     align-items: center;
-    color: var(--bs-emphasis-color);
+    color: #fff;
     padding: 0 px2rpx(10);
-    background-color: #ffde02;
+    background-color: var(--bs-secondary);
     font-size: px2rpx(16);
     font-weight: bold;
-    line-height: px2rpx(26);
+    line-height: px2rpx(36);
     border-radius: px2rpx(5);
   }
 }
@@ -624,7 +638,7 @@ const closeDetail = () => {
   margin-bottom: 8rpx;
 }
 
-.btn {
+.btn-top {
   margin-top: px2rpx(16);
   text-align: center;
 }
@@ -633,11 +647,11 @@ const closeDetail = () => {
   display: flex;
   margin-top: px2rpx(20);
 
-  .btn {
+  .btn-copy{
     display: flex;
     align-items: center;
     justify-content: center;
-    height: px2rpx(35);
+    height: px2rpx(36);
     margin: 0 px2rpx(10);
   }
 }
@@ -660,4 +674,59 @@ const closeDetail = () => {
     margin-top: px2rpx(16);
   }
 }
+.account-adjust-notes-panel {
+  margin-bottom: 18px;
+  padding: 14px 16px;
+  text-align: left;
+  background: #f5f7fa;
+  border: 1px solid #e4e7ed;
+  border-radius: 8px;
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.6);
+}
+
+.account-adjust-notes-section {
+  & + .account-adjust-notes-section {
+    margin-top: 14px;
+    padding-top: 14px;
+    border-top: 1px dashed #dcdfe6;
+  }
+}
+
+.account-adjust-notes-title {
+  display: flex;
+  align-items: flex-start;
+  gap: 8px;
+  margin-bottom: 10px;
+  line-height: 1.45;
+}
+
+.account-adjust-notes-title-icon {
+  flex-shrink: 0;
+  margin-top: 0px;
+  font-size: 15px;
+  color: #909399;
+}
+
+.account-adjust-notes-title-text {
+  font-size: 13px;
+  font-weight: 600;
+  color: #303133;
+}
+
+.account-adjust-notes-list {
+  margin: 0;
+  padding-inline-start: 1.35em;
+  color: #606266;
+  font-size: 13px;
+  line-height: 1.65;
+
+  li {
+    margin-bottom: 8px;
+    padding-inline-start: 2px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+}
 </style>

+ 41 - 20
pages/login/index.vue

@@ -54,13 +54,13 @@
             <view class="mobile-header-bar">
               <!--          <view class="fixed"/>-->
 
-              <LoginHeaderGroup text-color="#fff" icon-color="#fff" />
+              <LoginHeaderGroup text-color="#fff" :icon-color="isDark ? '#fff' : '#97A1C0' "/>
             </view>
           </cwg-match-media>
           <view class="account">
             <view class="company u-flex-y u-flex-y-center">
-              <image v-if="!isDark" src="/static/images/vu/logo-full.svg" class="company-icon" mode="widthFix"></image>
-              <image v-else src="/static/images/vu/logo-full-white.svg" class="company-icon" mode="widthFix"></image>
+              <image v-if="!isDark" src="/static/images/vu/logo-full.svg" :class="isMobile?'company-icon-mini':'company-icon'" mode="widthFix"></image>
+              <image v-else src="/static/images/vu/logo-full-white.svg" :class="isMobile?'company-icon-mini':'company-icon'" mode="widthFix"></image>
 
             </view>
             <view class="tab-list">
@@ -70,7 +70,7 @@
               </view>
             </view>
 
-            <view v-show="activeTab == 1">
+            <view v-show="activeTab == 1" style="overflow-y: scroll;">
               <view class="title">
                 <view class="tit1">{{ t('newSignin.item1') }}</view>
                 <view class="tit2">{{ t('newSignin.item2') }}</view>
@@ -93,7 +93,7 @@
               <view class="u-flex u-flex-between u-flex-y-center mb1">
                 <view class="check-box">
                   <up-checkbox-group v-model="remenber" @change="checkboxChange">
-                    <up-checkbox size="14" labelSize="14" labelColor="#666666" activeColor="#ea002a"
+                    <up-checkbox size="18" labelSize="18" labelColor="#666666" activeColor="#ea002a"
                       :label="t('newSignin.item5')" name="记住我" class="wcg-checkbox"></up-checkbox>
                   </up-checkbox-group>
                 </view>
@@ -133,7 +133,7 @@
                     </uni-col>
                     <uni-col :xs="24" :md="12">
                       <uni-forms-item name="birthDate" :label="t('newSignup.item18')">
-                        <uni-datetime-picker type="date" v-model="formData.birthDate"
+                        <uni-datetime-picker  type="date" v-model="formData.birthDate"
                           :placeholder="t('newSignup.item19')" @change="checkAge" />
                       </uni-forms-item>
                     </uni-col>
@@ -145,9 +145,9 @@
                     </uni-col>
                     <uni-col :xs="24" :md="24">
                       <uni-forms-item name="emailCode" :label="t('newSignup.item9')">
-                        <view style="display: flex; gap: 8px;">
+                        <view style="display: flex;">
                           <view style="flex: 1;">
-                            <uni-easyinput :disabled="!isAgeValid || !formData.birthDate" v-model="formData.emailCode"
+                            <uni-easyinput class="code" :disabled="!isAgeValid || !formData.birthDate" v-model="formData.emailCode"
                               :placeholder="t('newSignup.item10')">
                             </uni-easyinput>
                           </view>
@@ -185,7 +185,7 @@
                   <uni-forms-item name="agree">
                     <view class="check-box" @click="toggleAgree">
                       <up-checkbox-group v-model="agreeGroup" @change="onAgreeChange">
-                        <up-checkbox size="14" labelSize="14" labelColor="#666666" activeColor="#ea002a" name="agree"
+                        <up-checkbox size="18" labelSize="24" labelColor="#666666" activeColor="#ea002a" name="agree"
                           class="wcg-checkbox"></up-checkbox>
                       </up-checkbox-group>
                       <text class="checkbox-label">{{ t('signup.agree') }}</text>
@@ -194,7 +194,7 @@
                   <uni-forms-item name="isSubscribeEmail">
                     <view class="check-box" @click="toggleSubscribeEmail">
                       <up-checkbox-group v-model="subscribeEmailGroup" @change="onSubscribeEmailChange">
-                        <up-checkbox size="14" labelSize="14" labelColor="#666666" activeColor="#ea002a"
+                        <up-checkbox size="18" labelSize="24" labelColor="#666666" activeColor="#ea002a"
                           name="subscribeEmail" class="wcg-checkbox"></up-checkbox>
                       </up-checkbox-group>
                       <text class="checkbox-label">{{ t('signup.agree1') }}</text>
@@ -620,9 +620,9 @@ function submit() {
 }
 
 const customStyle = {
-  height: '44px',
+  height: '51px',
   'border-radius': '8px',
-  background: '#f7f8fa',
+  // background: '#f7f8fa',
   padding: '0 20px !important',
   position: 'relative',
 }
@@ -782,6 +782,7 @@ const handleChatIconClick = () => {
     isChatIconExpanded.value = false
   }, 300)
 }
+
 </script>
 
 <style lang="scss" scoped>
@@ -1031,7 +1032,7 @@ const handleChatIconClick = () => {
       padding: 0 10%;
 
       .company {
-        padding: px2rpx(50) 0 px2rpx(20) 0;
+        padding: px2rpx(30) 0 px2rpx(20) 0;
         position: relative;
         align-items: center !important;
       }
@@ -1039,6 +1040,9 @@ const handleChatIconClick = () => {
       .company-icon {
         width: px2rpx(234);
       }
+      .company-icon-mini {
+        width: px2rpx(100);
+      }
     }
   }
 }
@@ -1104,7 +1108,7 @@ button {
 }
 
 .title {
-  margin: px2rpx(32) 0;
+  margin: px2rpx(15) 0;
   font-size: px2rpx(24);
   font-weight: bolder;
   color: var(--bs-emphasis-color);
@@ -1173,6 +1177,7 @@ button {
 
 .regiset-btn {
   margin: px2rpx(20) 0;
+  border-radius: px2rpx(20);
 }
 
 .account-tip {
@@ -1272,8 +1277,24 @@ button {
   }
 }
 
-.formContent {
+:deep(.formContent) {
   padding: 0 10px;
+  .uni-select,
+  .uni-combox,
+  .uni-easyinput__content,
+  .cwg-combox,
+  .uni-date-editor--x {
+    height: 1.6rem!important;
+    //border: none !important;
+    border-radius: px2rpx(8);
+    background-color: transparent !important;
+
+  }
+  .code{
+    .uni-easyinput__content{
+      border-radius: px2rpx(8) 0 0 px2rpx(8);
+    }
+  }
 }
 
 :deep(.uni-stat-box) {
@@ -1297,16 +1318,16 @@ button {
 }
 
 .btn-code {
-  margin-left: -10px;
+  //margin-left: -10px;
   width: 120px;
-  height: px2rpx(37);
+  height: px2rpx(51);
   box-sizing: border-box;
   background-color: #102047;
   //border: 1px solid rgb(229, 229, 229);
   color: #fff;
   text-align: center;
-  line-height: px2rpx(38);
-  border-radius: 0 18px 18px 0;
+  line-height: px2rpx(51);
+  border-radius: 0 25px 25px 0;
   cursor: pointer;
   font-size: 14px;
   flex-shrink: 0;
@@ -1335,7 +1356,7 @@ button {
 .regiset-btn {
   width: 100%;
   height: px2rpx(40);
-  border-radius: px2rpx(4);
+  border-radius: px2rpx(20);
   background-color: var(--color-error);
   color: #fff;
   font-weight: bold;

+ 1 - 1
pages/login/reset.vue

@@ -250,7 +250,7 @@ function handleLogin() {
     display: flex;
     align-items: center;
     justify-content: center;
-    color: var(--bs-emphasis-color);
+    color: #fff;
     font-size: px2rpx(16);
     font-weight: 500;
     margin: 0;

+ 11 - 9
pages/mine/components/BankInfoTab.vue

@@ -759,6 +759,7 @@ onMounted(() => {
 
 
 <style scoped lang="scss">
+  @import "@/uni.scss";
 .user-form {
     margin-top: px2rpx(30);
 }
@@ -775,7 +776,7 @@ onMounted(() => {
 
     .uni-easyinput__content {
         border: none !important;
-        //background-color: var(--color-zinc-100) !important;
+        background-color: var(--bs-secondary-bg) !important;
     }
 }
 
@@ -789,10 +790,10 @@ onMounted(() => {
         gap: px2rpx(12);
         padding: px2rpx(10) px2rpx(16);
         cursor: pointer;
-        border: 1px solid #f3f4f6;
+        border: 1px solid var(--bs-border-color);
         font-size: px2rpx(16);
         font-weight: 500;
-        color: #1f2937;
+        color: var(--bs-emphasis-color);
         transition: all 0.3s;
         height: px2rpx(50);
         border-radius: px2rpx(8);
@@ -803,13 +804,14 @@ onMounted(() => {
         }
 
         &.active {
-            background: #ea2027;
-            color: var(--bs-emphasis-color);
-            border-radius: px2rpx(0);
+            background: var(--bs-secondary);
+            color: #ffffff;
+            border-radius: px2rpx(8);
         }
 
         &:hover {
-            background: #f9fafb;
+            background: var(--bs-link-hover-color-rgb);
+            color: var(--bs-secondary);
         }
 
         &.active:hover {
@@ -819,7 +821,7 @@ onMounted(() => {
 }
 
 .bank-content {
-    background: #fff;
+    //background: #fff;
     border-radius: px2rpx(8);
     padding: 0 px2rpx(24);
 
@@ -905,7 +907,7 @@ onMounted(() => {
         margin-top: px2rpx(24);
         height: px2rpx(48);
         background: #ea2027;
-        color: var(--bs-emphasis-color);
+        color: #fff;
         border-radius: px2rpx(4);
         display: flex;
         align-items: center;

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

@@ -27,7 +27,7 @@
                 <view :class="['status-badge', row.status]">{{ stateMap[row.status] }}</view>
             </template>
             <template #btn="{ row }">
-                <text :class="['operation-btn', row.status !== 4 ? 'disabled' : '']" @click.stop="openAddFile(row)">
+                <text class="btn-submit" :class="['operation-btn', row.status !== 4 ? 'disabled' : '']" @click.stop="openAddFile(row)">
                     <cwg-icon name="crm-image" :size="16" color="#1d293d" />
                     <text v-t="'State.Again'" />
                 </text>
@@ -215,13 +215,14 @@ defineProps<Props>();
         justify-content: center;
         gap: px2rpx(4);
         cursor: pointer;
-        background-color: var(--color-slate-150);
+        background-color: var(--bs-heading-color);
+        color: var(--bs-emphasis-color);
         padding: px2rpx(8) 0;
     }
 }
 
 .operation-btn.disabled {
     cursor: not-allowed;
-    opacity: 0.5;
+    opacity: 0.7;
 }
 </style>

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

@@ -237,7 +237,8 @@ onMounted(() => {
     }
 
     .uni-easyinput__content {
-        border: none !important;
+        //border: none !important;
+      background-color: transparent;
         //background-color: var(--color-zinc-100) !important;
     }
 }

+ 5 - 2
static/scss/global/global.scss

@@ -1388,8 +1388,11 @@ uni-content.collapsed {
     .uni-select,
     .uni-combox,
     .uni-easyinput__content,
+    .cwg-combox,
     .uni-date-editor--x {
-        border: none !important;
+      height: 1.6rem;
+      border: none !important;
+      border-radius: px2rpx(8);
         //background-color: var(--color-zinc-100) !important;
 
     }
@@ -1776,7 +1779,7 @@ uni-content.collapsed {
     .confirm-btn {
         &.primary {
             background-color: #cf1322;
-            color: var(--bs-emphasis-color);
+            color: #fff;
 
             &:active {
                 background-color: #0056b3;