Sfoglia il codice sorgente

feat:颜色修改

ljc 1 mese fa
parent
commit
49c9f3d467

+ 5 - 4
components/AddBankDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <uni-popup ref="popupRef" type="center" background-color="#fff" style="z-index: 9999;">
+  <uni-popup ref="popupRef" type="center" style="z-index: 999;">
     <view class="dialog-container">
       <view class="dialog-header">
         <text class="dialog-title" v-t="typeMap[form.type]"></text>
@@ -470,6 +470,7 @@ defineExpose({
   border-radius: px2rpx(12);
   display: flex;
   flex-direction: column;
+  background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
   .uni-row1{
     flex: 1;
     height: 100%;
@@ -487,7 +488,7 @@ defineExpose({
     .dialog-title {
       font-size: px2rpx(18);
       font-weight: 600;
-      color: #1f2937;
+      color: var(--bs-emphasis-color);
     }
 
     .dialog-close {
@@ -497,12 +498,12 @@ defineExpose({
       align-items: center;
       justify-content: center;
       font-size: px2rpx(28);
-      color: #9ca3af;
+      color: var(--bs-emphasis-color);
       cursor: pointer;
       transition: all 0.3s;
 
       &:hover {
-        color: #1f2937;
+        color: var(--bs-emphasis-color);
       }
     }
   }

+ 2 - 2
components/cwg-file-picker-wrapper.vue

@@ -448,7 +448,7 @@ const imgStyle = computed(() => {
 .uni-file-picker__container {
   display: flex;
   flex-wrap: wrap;
-  margin: -5px;
+  //margin: -5px;
   width: 100%;
 }
 
@@ -544,7 +544,7 @@ const imgStyle = computed(() => {
   display: flex;
   align-items: center;
   justify-content: center;
-  background: #f7f7f7;
+  background: var(--bs-body-bg);
 }
 
 .upload-icon {

+ 19 - 19
pages/ib/complexReport.vue

@@ -71,7 +71,7 @@
       options: [
         { text: t('State.All'), value: 0 },
         { text: t('AccountType.SeniorAccount'), value: 2 },
-        { text: t('AccountType.NewSpeedAccount'), value: 6 },
+        // { text: t('AccountType.NewSpeedAccount'), value: 6 },
         { text: t('AccountType.StandardAccount'), value: 7 },
         { text: t('AccountType.CentAccount'), value: 8 },
       ],
@@ -114,24 +114,24 @@
         8: t('AccountType.CentAccount'),
       },
     },
-    {
-      prop: 'ibNo',
-      label: t('Label.AgentNumber'),
-      align: 'center',
-      formatter: ({ row }: any) => row.ibNo || '--',
-    },
-    {
-      prop: 'salesNo',
-      label: t('Label.Encode'),
-      align: 'center',
-      formatter: ({ row }: any) => row.salesNo || '--',
-    },
-    {
-      prop: 'salesName',
-      label: '销售姓名',
-      align: 'center',
-      formatter: ({ row }: any) => row.salesName || '--',
-    },
+    // {
+    //   prop: 'ibNo',
+    //   label: t('Label.AgentNumber'),
+    //   align: 'center',
+    //   formatter: ({ row }: any) => row.ibNo || '--',
+    // },
+    // {
+    //   prop: 'salesNo',
+    //   label: t('Label.Encode'),
+    //   align: 'center',
+    //   formatter: ({ row }: any) => row.salesNo || '--',
+    // },
+    // {
+    //   prop: 'salesName',
+    //   label: '销售姓名',
+    //   align: 'center',
+    //   formatter: ({ row }: any) => row.salesName || '--',
+    // },
     {
       prop: 'deposit',
       label: t('Documentary.Report.item21'),

+ 19 - 16
pages/mine/components/AddFileDialog.vue

@@ -1,12 +1,12 @@
 <template>
-    <uni-popup ref="fileRef" type="center" background-color="#fff">
-        <view class="dialog-container">
-            <view class="dialog-header">
-                <text class="dialog-title">{{ form.title }}</text>
-                <view class="dialog-close" @click="close">
-                    <text>×</text>
-                </view>
-            </view>
+  <cwg-popup :title="form.title" :visible="visible" @close="close" @confirm="submit" >
+<!--        <view class="dialog-container">-->
+<!--            <view class="dialog-header">-->
+<!--                <text class="dialog-title">{{ form.title }}</text>-->
+<!--                <view class="dialog-close" @click="close">-->
+<!--                    <text>×</text>-->
+<!--                </view>-->
+<!--            </view>-->
             <uni-forms ref="formRef" :rules="rules" :model="form" labelWidth="200" label-position="top"
                 class="crm-form">
                 <uni-row class="form-row uni-row1">
@@ -55,12 +55,12 @@
                     </template>
                 </uni-row>
             </uni-forms>
-            <view class="dialog-footer">
-                <view class="btn btn-cancel" @click="close">{{ t('Btn.Cancel') }}</view>
-                <view class="btn btn-confirm" @click="submit">{{ t('Btn.Confirm') }}</view>
-            </view>
-        </view>
-    </uni-popup>
+<!--            <view class="dialog-footer">-->
+<!--                <view class="btn btn-cancel" @click="close">{{ t('Btn.Cancel') }}</view>-->
+<!--                <view class="btn btn-confirm" @click="submit">{{ t('Btn.Confirm') }}</view>-->
+<!--            </view>-->
+<!--        </view>-->
+  </cwg-popup>
 </template>
 
 <script setup lang="ts">
@@ -82,6 +82,7 @@ const emit = defineEmits(["success"]);
 
 const fileRef = ref<any>(null);
 const formRef = ref<any>(null);
+const visible = ref(false);
 
 const form = ref<AddBankForm>({});
 
@@ -111,12 +112,14 @@ const open = async (item) => {
 
 
     getBankList()
-    fileRef.value?.open();
+  visible.value = true
+    // fileRef.value?.open();
 };
 
 // 关闭弹窗
 const close = () => {
-    fileRef.value?.close();
+    // fileRef.value?.close();
+    visible.value = false
     resetForm();
 };
 

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

@@ -1,5 +1,5 @@
 <template>
-    <uni-popup ref="kycRef" type="center" background-color="#fff" style="z-index: 9999">
+    <uni-popup ref="kycRef" type="center" background-color="#fff" style="z-index: 999">
         <view class="dialog-container">
             <view class="dialog-header">
                 <text class="dialog-title">{{ t('blockchain.item2') }}</text>

+ 4 - 4
static/scss/global/global.scss

@@ -1408,7 +1408,7 @@ uni-content.collapsed {
     }
 
     .checklist-text {
-        color: #666 !important;
+        //color: #666 !important;
     }
 
     .checklist-box.is--default.is-checked .checkbox__inner {
@@ -1626,8 +1626,8 @@ uni-content.collapsed {
     font-size: var(--font-size-24);
     font-weight: 500;
     line-height: 1.5;
-    color: var(--color-rose-500);
-    background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
+    color: #6b7280;
+    background-color: #f3f4f6;
     border: 1px solid var(--color-rose-500);
     cursor: pointer;
     transition: all var(--default-transition-duration) var(--default-transition-timing-function);
@@ -1770,7 +1770,7 @@ uni-content.collapsed {
 
     .cancel-btn {
         background-color: #f5f5f5;
-        color: var(--bs-heading-color);
+        color: #6b7280;
 
         &:active {
             background-color: #e8e8e8;

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

@@ -523,7 +523,7 @@ $disable: 0.4;
 
 				.checklist-text {
 					font-size: 1rem;
-					color: var(--bs-heading-color);
+					color: var(--bs-emphasis-color);
 					margin-left: 5px;
 					line-height: 14px;
 				}
@@ -655,7 +655,7 @@ $disable: 0.4;
 					}
 
 					.checklist-text {
-						color: $uni-primary;
+						color: var(--bs-emphasis-color);
 					}
 
 					// 选中禁用

+ 1 - 1
uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue

@@ -480,7 +480,7 @@
 			align-items: center;
 			text-align: left;
 			font-size: 14px;
-			color: var(--bs-body-color);
+			color: var(--bs-emphasis-color);
 			height: 36px;
 			padding: 0 12px 0 0;
 			/* #ifndef APP-NVUE */