From bf503ed1a7ddf3bb125f7b1157b020b89723ce77 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Wed, 10 Nov 2021 10:54:26 +0800
Subject: [PATCH] 完善从url指定服务器域名容错

---
 forms/datePicker/CDateRangeAction.vue |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/forms/datePicker/CDateRangeAction.vue b/forms/datePicker/CDateRangeAction.vue
index eb1d9c4..95cbf9d 100644
--- a/forms/datePicker/CDateRangeAction.vue
+++ b/forms/datePicker/CDateRangeAction.vue
@@ -15,17 +15,19 @@
             class="c-data-range-float"
             ref="floadLayer"
         >
-            <AtDrawer
+            <CDrawer
                 class="c-data-range-drawer"
-                ref="floatDrawer"
-                mask
+                direction="top"
                 :show="drawerShow"
-                :onClose="evt => drawerShow=false"
+                :onClose="evt => handleClose()"
             >
-                <view class="title">请选择日期</view>
+                <view class="title">
+                    <view v-if="placeholder">{{placeholder}}</view>
+                    <view v-else>请选择日期</view>
+                </view>
                 <view class="date">
                     <picker
-                        mode='date'
+                        mode="date"
                         :value="startDate"
                         @change="evt => handleStartDateChange(evt.detail.value)"
                     >
@@ -38,7 +40,7 @@
                         </view>
                     </picker>
                     <picker
-                        mode='date'
+                        mode="date"
                         :value="endDate"
                         @change="evt => handleEndDateChange(evt.detail.value)"
                     >
@@ -58,7 +60,7 @@
                     :circle="false"
                     :onClick="evt => handleFinish()"
                 >确定</AtButton>
-            </AtDrawer>
+            </CDrawer>
         </view>
     </view>
 </template>
@@ -67,6 +69,7 @@
 import Taro from '@tarojs/taro';
 import { $ } from '@tarojs/extend';
 import { AtDrawer, AtButton } from 'taro-ui-vue';
+import { CDrawer } from '@components/layout/drawer';
 import './cDateRangeAction.scss';
 
 export default {
@@ -74,10 +77,15 @@
     components: {
         AtDrawer,
         AtButton,
+        CDrawer,
     },
     props: {
-        value: null,
+        // 项值
+        value: String,
+        // 变化回调
         onChange: Function,
+        // 占位提示
+        placeholder: String,
     },
     data() {
         return {
@@ -93,6 +101,9 @@
             const curDates = (this.value || ',').split(',');
             this.startDate = curDates[0];
             this.endDate = curDates[1];
+        },
+        handleClose() {
+            this.drawerShow = false;
         },
         handleStartDateChange(date) {
             if (date && this.endDate) {
@@ -139,7 +150,6 @@
         const $cFilter = $(this.$refs.floadLayer).parents('.c-filter');
         if ($cFilter.length > 0) {
             $cFilter.eq(0).after(this.$refs.floadLayer);
-            $cFilter.parent().css('transform', 'translate(0,0)');
         }
     },
 };

--
Gitblit v1.9.1