ljc hace 1 mes
padre
commit
df5cd1e0c2

+ 1 - 1
components/AddBankDialog.vue

@@ -516,7 +516,7 @@
     .dialog-footer {
       display: flex;
       gap: px2rpx(12);
-      justify-content: flex-end;
+      justify-content: center;
       padding-top: px2rpx(16);
       border-top: 1px solid #f3f4f6;
 

+ 11 - 3
components/cwg-complex-search.vue

@@ -71,7 +71,7 @@
 
         <cwg-popup v-model:visible="visible" type="center" :mask-click="false" :showFooters="true"
             :title="t('Documentary.tradingCenter.item3')">
-            <scroll-view scroll-y class="drawer-content">
+            <scroll-view scroll-y class="drawer-content" style="overflow: visible;">
                 <view v-for="field in nonDateField" :key="field.key" class="filter-item">
                     <view class="label">{{ field.label }}</view>
                     <view class="control">
@@ -82,6 +82,7 @@
                         <template v-else-if="field.type === 'select'">
                             <uni-data-select v-model:value="tempFormData[field.key]" :localdata="field.options"
                                 :placeholder="field.placeholder || '请选择'" :clearable="false"
+                                :placement="'bottom'"
                                 v-if="shouldUseSelect(field)" />
                             <view class="chip-group" v-else>
                                 <view class="chip-list">
@@ -96,7 +97,7 @@
                         </template>
                         <template v-else-if="field.type === 'number'">
                             <uni-easyinput v-model="tempFormData[field.key]" type="number"
-                                :placeholder="field.placeholder || '请输入数字'" />
+                                :placeholder="field.placeholder || '请输入数字'" clearable />
                         </template>
                         <template v-else-if="field.type === 'picker'">
                             <uni-data-picker v-model="tempFormData[field.key]" :localdata="field.options"
@@ -105,6 +106,8 @@
                                 @change="(e) => field.onChange?.(e)" @nodeclick="(node) => field.onNodeClick?.(node)" />
                         </template>
                     </view>
+                  <view v-if="nonDateField.length == 1" style="height: 25vh;"/>
+
                 </view>
             </scroll-view>
             <template #footer>
@@ -465,7 +468,7 @@ onMounted(() => {
         background-color: #ffffff;
         border: 1px solid #e5e5e5;
         border-radius: px2rpx(4);
-        padding: px2rpx(0) px2rpx(16);
+        padding: px2rpx(0) px2rpx(8);
         font-size: px2rpx(16);
         font-weight: 500;
         color: #141d22;
@@ -497,6 +500,7 @@ onMounted(() => {
 .drawer-content {
     padding: px2rpx(20);
     border-radius: px2rpx(16);
+    //min-height: 40vh;
     box-sizing: border-box;
 
     .label {
@@ -506,11 +510,15 @@ onMounted(() => {
         margin-bottom: px2rpx(20);
         letter-spacing: px2rpx(1);
     }
+    :deep(.uni-scroll-view ){
+      //min-height: px2rpx(200);
+    }
 
     :deep(.uni-scroll-view-content) {
         display: flex;
         flex-direction: column;
         gap: px2rpx(20);
+        overflow: visible;
     }
 
     :deep(uni-button) {

+ 5 - 1
components/cwg-popup.vue

@@ -1,5 +1,5 @@
 <template>
-    <uni-popup ref="popupRef" type="center" @change="handlePopupChange">
+    <uni-popup ref="popupRef" type="center" @change="handlePopupChange" class="crm-popup">
         <view class="cwg-dialog" :style="{ width: width }">
             <!-- 弹窗头部 -->
             <view class="dialog-header" v-if="title">
@@ -187,10 +187,14 @@ defineExpose({
 
 <style scoped lang="scss">
 @import "@/uni.scss";
+.crm-popup{
+  z-index: 9999;
+}
 
 .cwg-dialog {
     background-color: var(--color-white);
     border-radius: px2rpx(8);
+
     overflow: hidden;
     width: px2rpx(600);
     max-width: 90vw;

+ 4 - 1
components/cwg-tabel.vue

@@ -149,7 +149,10 @@
         <!-- <cwg-detail-popup v-model:visible="detailVisible" title="详情" :items="detailItems" /> -->
         <cwg-detail-popup v-model:visible="detailVisible" title="详情" :row="detailRow" :columns="detailColumns">
             <template v-for="col in detailColumns" :key="col.prop" #[`cell-${col.prop}`]="{ row, column }">
-                <slot v-if="col.slot" :name="col.slot" :row="row" :column="column" :index="0" />
+              <view v-if="col.type === 'file'">
+                <cwg-file :path="row[column.prop]" />
+              </view>
+                <slot v-else-if="col.slot" :name="col.slot" :row="row" :column="column" :index="0" />
             </template>
         </cwg-detail-popup>
     </view>

+ 3 - 0
pages/follow/components/applySignalDialog.vue

@@ -677,6 +677,9 @@ watch(() => props.visible, (val) => {
     grid-template-columns: 1fr 1fr;
     gap: px2rpx(20);
     margin-top: px2rpx(16);
+    @media screen and (max-width: 768px) {
+      grid-template-columns: 1fr;
+    }
   }
 
   .form-item {

+ 8 - 6
pages/mine/components/FileManagementTab.vue

@@ -1,7 +1,8 @@
 <template>
     <view>
+        <view class="content-title" v-t="'PersonalManagement.Title.FileManagement'"></view>
         <view class="content-title" v-if="current != 3">
-            <view v-t="'PersonalManagement.Title.FileManagement'"></view>
+            <view/>
             <view class="content-title-btns">
                 <view v-if="!isSHowBtn.isSHowIdentity" class="btn-primary" @click="openAddFileDialog(1)">
                     <cwg-icon icon="crm-plus" :size="16" color="#fff" />
@@ -181,14 +182,15 @@ defineProps<Props>();
 
         display: flex;
         align-items: center;
-        justify-content: center;
-        gap: px2rpx(12);
+        justify-content: flex-end;
+        //flex-wrap: wrap;
+        gap: px2rpx(10);
 
         .btn-primary {
-            min-width: px2rpx(120);
+            min-width: px2rpx(80);
             background-color: var(--color-error);
             color: white;
-            padding: 0 px2rpx(12);
+            padding: 0 px2rpx(10);
             border: none;
             font-size: px2rpx(14);
             text-align: center;
@@ -196,7 +198,7 @@ defineProps<Props>();
             display: flex;
             align-items: center;
             justify-content: center;
-            gap: px2rpx(8);
+            gap: px2rpx(5);
         }
 
         .btn-primary:active {