فهرست منبع

fix: 时间选择框调整

Ritchie 1 سال پیش
والد
کامیت
dc66de2d10
2فایلهای تغییر یافته به همراه13 افزوده شده و 13 حذف شده
  1. 3 5
      src/views/register.vue
  2. 10 8
      src/views/syncOldData/index.vue

+ 3 - 5
src/views/register.vue

@@ -51,8 +51,7 @@
             :placeholder="$t('register.codePlaceholder')"
             :rules="[{ required: true, message: $t('register.codeRequired') }]">
             <template #button v-if="ifForeign === '0' && logonMode === '10'">
-              <van-button size="small" type="primary" @click="seedVerCode()"
-                :disabled="time !== 0 || phone.length === 0"
+              <van-button size="small" type="primary" @click="seedVerCode()" :disabled="time !== 0 || phone.length === 0"
                 :loading=reqApi :loading-text="$t('register.sending')">{{
                   time === 0 ?
                   $t('register.seedVerCode') : time + $t('register.replaysInSeconds')
@@ -73,8 +72,7 @@
             :placeholder="$t('register.emailCodePlaceholder')"
             :rules="[{ required: true, message: $t('register.emailCodeRequired') }]">
             <template #button v-if="ifForeign === '0' && logonMode === '11'">
-              <van-button size="small" type="primary" @click="seedVerCode()"
-                :disabled="time !== 0 || email.length === 0"
+              <van-button size="small" type="primary" @click="seedVerCode()" :disabled="time !== 0 || email.length === 0"
                 :loading=reqApi :loading-text="$t('register.sending')">{{
                   time === 0 ?
                   $t('register.seedVerCode') : time + $t('register.replaysInSeconds')
@@ -116,7 +114,7 @@
 <script>
 import md5 from 'js-md5';
 import { ref, onMounted, reactive, toRefs } from 'vue';
-import { showFailToast, showToast} from 'vant';
+import { showFailToast, showToast } from 'vant';
 // import { sentRegisterCode, tAdminSave, getLastSendTime } from '@/service/register';
 import { sentRegisterCode, tAdminSave } from '@/service/register';
 import sHeader from '@/components/SimpleHeader';

+ 10 - 8
src/views/syncOldData/index.vue

@@ -16,7 +16,7 @@
                         @click="showPicker1 = true" :rules="[{ required: true, message: '请选择开始日期' }]">
                     </van-field>
                     <van-popup v-model:show="showPicker1" position="bottom">
-                        <van-datetime-picker type="date" @confirm="startDateConfirm" :min-date="minDate" :max-date="maxDate"
+                        <van-date-picker @confirm="startDateConfirm($event)" :min-date="minDate" :max-date="maxDate"
                             @cancel="showPicker1 = false" />
                     </van-popup>
 
@@ -24,7 +24,7 @@
                         @click="showPicker2 = true" :rules="[{ required: true, message: '请选择结束日期' }]">
                     </van-field>
                     <van-popup v-model:show="showPicker2" position="bottom">
-                        <van-datetime-picker type="date" @confirm="endDateConfirm" :min-date="minDate" :max-date="maxDate"
+                        <van-date-picker @confirm="endDateConfirm($event)" :min-date="minDate" :max-date="maxDate"
                             @cancel="showPicker2 = false" />
                     </van-popup>
 
@@ -50,7 +50,7 @@ import { ref } from 'vue';
 import sHeader from "../../components/SimpleHeader";
 import router from '../../router';
 import { syncAllData } from '@/service/syncOldData/index';
-import dateUtil from '../../utils/dateUtil';
+// import dateUtil from '../../utils/dateUtil';
 
 export default {
     components: { sHeader },
@@ -96,14 +96,16 @@ export default {
             router.go(-1);
         }
 
-        const startDateConfirm = (time) => {
-            startDate.value = dateUtil.formateDate(time, "yyyy-MM-dd hh:mm:ss");
-
+        // const startDateConfirm = (time) => {
+        const startDateConfirm = ({ selectedValues }) => {
+            // startDate.value = dateUtil.formateDate(time, "yyyy-MM-dd hh:mm:ss");
+            startDate.value = selectedValues.join("-") + " 00:00:00";
             showPicker1.value = false;
         }
 
-        const endDateConfirm = (time) => {
-            endDate.value = dateUtil.formateDate(time, "yyyy-MM-dd hh:mm:ss");
+        const endDateConfirm = ({ selectedValues }) => {
+            
+            endDate.value = selectedValues.join("-") + " 23:59:59";
 
             showPicker2.value = false;
         }