diff --git a/src/api/index.ts b/src/api/index.ts index 365c440..27c5969 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -13,13 +13,13 @@ import { del, get, post, put, setToken } from './base' */ export async function loginpass(phone: string, password: string,type?: number,smscode?: string){ - let newdata={} + let newdata: any = {} if(type==1){ newdata={type:type?type:2,username: phone, smscode: smscode} }else{ newdata={type:type?type:2,username: phone, password: password} } - + newdata.logintype = 1; const res = await post("login",newdata); console.log(res.code) if(res.code == 1){ diff --git a/src/components/Menu.vue b/src/components/Menu.vue index b44ebe7..dcdfc7c 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -7,7 +7,7 @@ -
+
@@ -201,13 +201,18 @@ export default defineComponent({ router.replace("/"); } + function tuichu(){ + console.log(1121) + } + return{ list, routeto, selnum, userinfo, logout, - mouse + mouse, + tuichu } } }) diff --git a/src/utils/date.ts b/src/utils/date.ts index deb83a2..ea9ad2f 100644 --- a/src/utils/date.ts +++ b/src/utils/date.ts @@ -41,7 +41,7 @@ export function getdate(yue?: number): GetDate{ while(i < month){ for(w = 0; w < week; w++){ - date[0][w] = {}; + date[0][w] = {list:[]}; } i++; const zhou = Math.floor((i + w - 1) / 7) @@ -55,7 +55,7 @@ export function getdate(yue?: number): GetDate{ date[zhou].push(d) } while(date[date.length - 1].length < 7){ - date[date.length - 1].push({}) + date[date.length - 1].push({list:[]}) } console.log(date) diff --git a/src/views/regime/date.vue b/src/views/regime/date.vue index 29290ef..5d5f742 100644 --- a/src/views/regime/date.vue +++ b/src/views/regime/date.vue @@ -223,7 +223,7 @@ export default defineComponent({ } } } - console.log(month.value.date) + console.log(month.value.date, 121) }) } function xia(){ diff --git a/src/views/regime/week.vue b/src/views/regime/week.vue index b75a60f..bc7462f 100644 --- a/src/views/regime/week.vue +++ b/src/views/regime/week.vue @@ -5,7 +5,7 @@ 上一周
- 2020年10月 + {{week.year}}年{{week.yue}}月 月日历
下一周 @@ -46,7 +46,7 @@
-