Эх сурвалжийг харах

fix:订阅时间筛选组件交互调整

yangfeng 1 жил өмнө
parent
commit
b880305165

+ 1 - 1
apps/bigmember_pc/src/assets/style/reset-ele.scss

@@ -330,5 +330,5 @@
 .el-date-table td.in-range div:hover,
 .el-date-table.is-week-mode .el-date-table__row.current div,
 .el-date-table.is-week-mode .el-date-table__row:hover div{
-  background-color:#EAF8FA;
+  background-color:#EAF8FA!important;
 }

+ 30 - 1
apps/bigmember_pc/src/components/selector/TimeSelector.vue

@@ -9,6 +9,7 @@
       <slot name="header">选择时间</slot>
     </div>
     <TimeSelectorContent
+      class="search-time-scope-selector"
       ref="content"
       :selectorTime="selectorTime"
       :selectorType="selectorType"
@@ -16,6 +17,7 @@
       :showExact="showExact"
       :startPlaceholder="startPlaceholder"
       :endPlaceholder="endPlaceholder"
+      :isDateRange="isDateRange"
       @onChange="onChange"
     />
   </selector-card>
@@ -57,6 +59,11 @@ export default {
       default: () => {
         return {}
       }
+    },
+    // 显示类型是否为日期范围(一个弹框内选择开始日期结束日期)
+    isDateRange: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -96,4 +103,26 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.search-time-scope-selector{
+  &::v-deep {
+    .date-time-container .date-time-item {
+      width: 130px;
+      height: 24px;
+      line-height: 24px;
+    }
+    .date-time-container {
+      padding: 0;
+      background-color: transparent !important;
+      &.active {
+        background-color: transparent !important;
+        input,
+        .date-time-item.left::after {
+          background-color: $color_main;
+          color: #fff;
+        }
+      }
+    }
+  }
+}
+</style>

+ 1 - 1
apps/bigmember_pc/src/components/selector/TimeSelectorContent.vue

@@ -450,7 +450,7 @@ export default {
       if(this.showConfirmButton) {
         result = this.state.exact === 'exact' && (this.dateTimePickerState.start || this.dateTimePickerState.end) && !this.showConBtn
       } else {
-        let result = this.state.exact === 'exact'
+        result = this.state.exact === 'exact'
       }
       return result
     }

+ 1 - 1
apps/bigmember_pc/src/views/search/bidding/model/base.js

@@ -92,7 +92,7 @@ export default function () {
   // 是否在工作台内
   // 本地调试,可改为工作台内isInApp = ref(true),  isInWeb = ref(false)   提交记得改回!
   const isInApp = ref(InContainer.inApp)
-  const isInWeb = ref(InContainer.inApp)
+  const isInWeb = ref(InContainer.inWeb)
 
   // 是否是渠道商
   const cooperateCode = ref(false)

+ 1 - 0
apps/bigmember_pc/src/views/subscribe/SubPush.vue

@@ -52,6 +52,7 @@
         <TimeSelector
           ref="timeSelector"
           selectorTime="sub"
+          :isDateRange="true"
           @onChange="changeTime"
           selectorType="line"
         >