Przeglądaj źródła

feat: (register) 注册码

gemercheung 2 lat temu
rodzic
commit
586ca9dcfb

+ 1 - 1
src/api/sys/user.ts

@@ -60,7 +60,7 @@ export function registerApi(params: RegisterParams, mode: ErrorMessageMode = 'mo
     userPassword: encodeStr(window.btoa(params.userPassword)),
   };
 
-  return defHttp.post<LoginResultModel>(
+  return defHttp.post<Result>(
     {
       url: Api.Register,
       // params,

+ 20 - 7
src/views/dashboard/analysis/index.vue

@@ -51,9 +51,13 @@
     bulletChatStaticsApi,
     bulletChatExportApi,
   } from '/@/api/dashboard/analysis';
+  import { listRoomsApi } from '/@/api/scene/list';
   import { formatToDate } from '/@/utils/dateUtil';
   import dayjs from 'dayjs';
 
+  const today = formatToDate(dayjs(new Date()));
+  const priorDate = formatToDate(dayjs(new Date().setDate(new Date().getDate() - 30)));
+
   const loading = ref(true);
   // const { t } = useI18n();
 
@@ -101,27 +105,36 @@
           xxl: 5,
         },
         componentProps: {
-          maxLength: 100,
+          api: listRoomsApi,
+          labelField: 'name',
+          resultField: 'list',
+          valueField: 'id',
+          immediate: false,
+          params: {
+            page: 1,
+            limit: 1000,
+          },
         },
       },
       {
         field: 'time',
         label: '时间段',
         component: 'RangePicker',
+        defaultValue: [priorDate, today],
         colProps: {
-          xl: 5,
-          xxl: 5,
+          xl: 16,
+          xxl: 16,
         },
         componentProps: {
-          maxLength: 100,
+          disabledDate(current) {
+            // console.log('current', current, date);
+            return current && current > dayjs().endOf('day');
+          },
         },
       },
     ],
   };
 
-  const today = formatToDate(dayjs(new Date()));
-  const priorDate = formatToDate(dayjs(new Date().setDate(new Date().getDate() - 30)));
-
   const searchInfo = reactive({
     liveRoomId: '',
     limit: 20,

+ 13 - 4
src/views/sys/login/RegisterForm.vue

@@ -25,9 +25,11 @@
           :count="60"
           :sendCodeApi="
             () => {
-              return sendCodeApi({
-                phone: formData.userName,
-              });
+              return reg.test(formData.userName)
+                ? sendCodeApi({
+                    phone: formData.userName,
+                  })
+                : falseSendcode;
             }
           "
           v-model:value="formData.code"
@@ -82,6 +84,7 @@
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useLoginState, useFormRules, useFormValid, LoginStateEnum } from './useLogin';
   import { sendCodeApi, registerApi } from '/@/api/sys/user';
+  // import { useMessage } from '/@/hooks/web/useMessage';
 
   const FormItem = Form.Item;
   // const InputPassword = Input.Password;
@@ -100,7 +103,13 @@
     code: '',
     // policy: false,
   });
-
+  // const { createMessage } = useMessage();
+  const falseSendcode = ref(
+    new Promise<boolean>((r) => {
+      return r(false);
+    }),
+  );
+  const reg = ref(new RegExp(/^1\d{10}$/));
   const { getFormRules } = useFormRules(formData);
   const { validForm } = useFormValid(formRef);