Showing
4 changed files
with
16 additions
and
10 deletions
| ... | @@ -15,6 +15,7 @@ | ... | @@ -15,6 +15,7 @@ |
| 15 | "@vitejs/plugin-legacy": "^1.8.2", | 15 | "@vitejs/plugin-legacy": "^1.8.2", |
| 16 | "@vueuse/core": "^8.5.0", | 16 | "@vueuse/core": "^8.5.0", |
| 17 | "animate.css": "^4.1.1", | 17 | "animate.css": "^4.1.1", |
| 18 | + "dayjs": "^1.11.3", | ||
| 18 | "default-passive-events": "^2.0.0", | 19 | "default-passive-events": "^2.0.0", |
| 19 | "global": "^4.4.0", | 20 | "global": "^4.4.0", |
| 20 | "html2canvas": "^1.4.1", | 21 | "html2canvas": "^1.4.1", | ... | ... |
| 1 | /* | 1 | /* |
| 2 | * @Date: 2022-06-22 00:07:42 | 2 | * @Date: 2022-06-22 00:07:42 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2022-06-22 08:51:37 | 4 | + * @LastEditTime: 2022-06-30 13:45:54 |
| 5 | * @FilePath: /tswj/src/composables/useLogin.js | 5 | * @FilePath: /tswj/src/composables/useLogin.js |
| 6 | * @Description: 文件描述 | 6 | * @Description: 文件描述 |
| 7 | */ | 7 | */ |
| ... | @@ -16,7 +16,7 @@ import { Toast } from 'vant' | ... | @@ -16,7 +16,7 @@ import { Toast } from 'vant' |
| 16 | export const useLogin = () => { | 16 | export const useLogin = () => { |
| 17 | const phone = ref(''); | 17 | const phone = ref(''); |
| 18 | const code = ref('') | 18 | const code = ref('') |
| 19 | - | 19 | + |
| 20 | const refForm = ref(null); | 20 | const refForm = ref(null); |
| 21 | const validateForm = () => { | 21 | const validateForm = () => { |
| 22 | const valid = refForm.value.validate(); | 22 | const valid = refForm.value.validate(); |
| ... | @@ -34,10 +34,10 @@ export const useLogin = () => { | ... | @@ -34,10 +34,10 @@ export const useLogin = () => { |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | /** | 36 | /** |
| 37 | - * 判断微信环境看是否弹出控件框 | 37 | + * 判断微信环境看是否弹出控件框 |
| 38 | - * 桌面微信直接输入 | 38 | + * 桌面微信直接输入 |
| 39 | - * 其他环境弹出输入框 | 39 | + * 其他环境弹出输入框 |
| 40 | - */ | 40 | + */ |
| 41 | let use_widget = ref(true); | 41 | let use_widget = ref(true); |
| 42 | use_widget.value = !!(wxInfo().isiOS || wxInfo().isAndroid); | 42 | use_widget.value = !!(wxInfo().isiOS || wxInfo().isAndroid); |
| 43 | 43 | ||
| ... | @@ -109,7 +109,7 @@ export const useLogin = () => { | ... | @@ -109,7 +109,7 @@ export const useLogin = () => { |
| 109 | }); | 109 | }); |
| 110 | } | 110 | } |
| 111 | }; | 111 | }; |
| 112 | - | 112 | + |
| 113 | return { | 113 | return { |
| 114 | phone, | 114 | phone, |
| 115 | code, | 115 | code, | ... | ... |
| 1 | /* | 1 | /* |
| 2 | * @Date: 2022-04-18 15:59:42 | 2 | * @Date: 2022-04-18 15:59:42 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2022-06-30 01:15:33 | 4 | + * @LastEditTime: 2022-06-30 13:54:32 |
| 5 | * @FilePath: /tswj/src/utils/tools.js | 5 | * @FilePath: /tswj/src/utils/tools.js |
| 6 | * @Description: 文件描述 | 6 | * @Description: 文件描述 |
| 7 | */ | 7 | */ |
| 8 | -import moment from 'moment'; | 8 | +import dayjs from 'dayjs'; |
| 9 | 9 | ||
| 10 | // 格式化时间 | 10 | // 格式化时间 |
| 11 | const formatDate = (date) => { | 11 | const formatDate = (date) => { |
| 12 | - return moment(date).format('YYYY-MM-DD HH:mm'); | 12 | + return dayjs(date).format('YYYY-MM-DD HH:mm'); |
| 13 | }; | 13 | }; |
| 14 | 14 | ||
| 15 | /** | 15 | /** | ... | ... |
| ... | @@ -938,6 +938,11 @@ dayjs@^1.10.4: | ... | @@ -938,6 +938,11 @@ dayjs@^1.10.4: |
| 938 | resolved "http://mirrors.tencent.com/npm/dayjs/-/dayjs-1.11.2.tgz#fa0f5223ef0d6724b3d8327134890cfe3d72fbe5" | 938 | resolved "http://mirrors.tencent.com/npm/dayjs/-/dayjs-1.11.2.tgz#fa0f5223ef0d6724b3d8327134890cfe3d72fbe5" |
| 939 | integrity sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw== | 939 | integrity sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw== |
| 940 | 940 | ||
| 941 | +dayjs@^1.11.3: | ||
| 942 | + version "1.11.3" | ||
| 943 | + resolved "https://mirrors.cloud.tencent.com/npm/dayjs/-/dayjs-1.11.3.tgz#4754eb694a624057b9ad2224b67b15d552589258" | ||
| 944 | + integrity sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A== | ||
| 945 | + | ||
| 941 | debug@4.3.4, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: | 946 | debug@4.3.4, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: |
| 942 | version "4.3.4" | 947 | version "4.3.4" |
| 943 | resolved "https://mirrors.tencent.com/npm/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" | 948 | resolved "https://mirrors.tencent.com/npm/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" | ... | ... |
-
Please register or login to post a comment