From 6c3b1aa811c412cd6bd951098daac7258e59915b Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Fri, 20 Nov 2020 15:46:26 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=BD=93=E6=97=A5=E8=81=9A=E7=84=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/regime/date.vue | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/views/regime/date.vue b/src/views/regime/date.vue index a281392..6512883 100644 --- a/src/views/regime/date.vue +++ b/src/views/regime/date.vue @@ -213,13 +213,21 @@ export default defineComponent({ async function getdates(userid: number){ getdatelist(month.value.start, month.value.end, userid).then((res: any)=>{ console.log(res) + // const day = getDay(res[i].dateline) + for(const j in month.value.date){ + for(const k in month.value.date[j]){ + if(yue.value == 0 && month.value.date[j][k].day == month.value.day){ + month.value.date[j][k].s = 1 + } + } + } for(const i in res){ const day = getDay(res[i].dateline) for(const j in month.value.date){ for(const k in month.value.date[j]){ - if(yue.value == 0 && month.value.date[j][k].day == month.value.day){ - month.value.date[j][k].s = 1 - } + // if(yue.value == 0 && month.value.date[j][k].day == month.value.day){ + // month.value.date[j][k].s = 1 + // } if(month.value.date[j][k].day == day){ if(month.value.date[j][k].list == undefined){ month.value.date[j][k].list = []; -- 2.47.2 From f32633c5d74acf34bb3506c50b5edf3e6df01fd6 Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Fri, 20 Nov 2020 15:49:01 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=8F=90?= =?UTF-8?q?=E7=8E=B0=E5=B8=90=E5=8F=B7=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mine/Cashout.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/mine/Cashout.vue b/src/views/mine/Cashout.vue index 587e6fa..5612e01 100644 --- a/src/views/mine/Cashout.vue +++ b/src/views/mine/Cashout.vue @@ -61,7 +61,7 @@
- {{lan.$t('zhanghao')}}：{{i.account}} + {{lan.$t('zhanghao')}}：{{i.account || i.bankcode}}
-- 2.47.2 From 5ea48cc2182264ad19d5cc51651a1216075b6948 Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Fri, 20 Nov 2020 16:00:12 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.ts | 6 ++++++ src/views/mine/Cashout.vue | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/api/index.ts b/src/api/index.ts index 2c41814..1348f6e 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -358,8 +358,10 @@ export async function cashout(data?: any,accountinfo?: any){ message.success(res.msg) // userinfo() store.dispatch("setUserInfo"); + return true; }else{ message.error(res.msg) + return false; } } /** @@ -394,6 +396,10 @@ export async function editaccount( id: any,data?: any){ const res=await put('wallect/' +id ,data); if(res.code==0){ message.success("修改成功") + router.push("/mine/wallet") + }else{ + message.error(res.msg) + } } /** diff --git a/src/views/mine/Cashout.vue b/src/views/mine/Cashout.vue index 5612e01..c90468b 100644 --- a/src/views/mine/Cashout.vue +++ b/src/views/mine/Cashout.vue @@ -113,7 +113,7 @@
*{{lan.$t('yueshu')}} {{danwei + parseFloat(yue) }}，{{lan.$t('zuiditixian')}} @@ -139,6 +139,7 @@ export default defineComponent({ NavBottom, }, setup() { + const lan: any = useI18n(); const money = ref(0); const payinfo = ref({ @@ -172,6 +173,7 @@ export default defineComponent({ function all() { payinfo.value.money = yue.value; } + function sub() { console.log(toRaw(payinfo.value)); @@ -189,7 +191,11 @@ export default defineComponent({ cashout( toRaw(payinfo.value), toRaw(accountlist.value)[payinfo.value.type] - ); + ).then((res: boolean)=>{ + if(res){ + router.push("/mine/wallet") + } + }) } // cashout( @@ -202,6 +208,8 @@ export default defineComponent({ router.push(url) } + const minwithdraw = computed(()=>store.state.seting.minwithdraw) + return { money, moneychange, @@ -214,7 +222,8 @@ export default defineComponent({ store, lan, navto, - danwei + danwei, + minwithdraw }; }, }); -- 2.47.2 From 5ff242d71b0cd87273199047cba507996a7da638 Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Fri, 20 Nov 2020 16:00:54 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/en.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/en.ts b/src/i18n/en.ts index e8969ef..831ba39 100644 --- a/src/i18n/en.ts +++ b/src/i18n/en.ts @@ -42,7 +42,7 @@ export default { banquan: "Copyright Beelink Inc. All rights reserved 2019-2022", zhanghao: "accounts", shuruzhanghao: "Please enter your email or mobile phone number", - shuruzhanghaol: "Please enter your email address or country number + mobile phone number（34690xxx）", + shuruzhanghaol: "Please enter your email address or country number + mobile number（e.g. in Spain, 34690xxx）", mima: "password", shurumima: "Please enter your password", wangjimima: "Forget the password?", -- 2.47.2 From b5edb781315366c2ccfa748306ec3ac69dfb9bc0 Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Fri, 20 Nov 2020 16:07:47 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E6=97=B6=E9=97=B4=E7=9A=84=E5=AE=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/date.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/utils/date.ts b/src/utils/date.ts index e58810e..fdad371 100644 --- a/src/utils/date.ts +++ b/src/utils/date.ts @@ -73,7 +73,12 @@ export function getweek(time: string, id: string,zhou?: number){ dayjs.extend(timezone) const days: any = dayjs; console.log(id, 11111) - let now = days((!time ? undefined : time)).tz(id) + let now; + try { + now = days((!time ? undefined : time)).tz(id) + } catch (error) { + now = days(undefined).tz(id) + } console.log(now, 11111) if(zhou != undefined){ -- 2.47.2 From cf87e7e9f79dfe440f1526029e370d8266e77dcd Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Fri, 20 Nov 2020 16:29:35 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/index.ts | 4 ++-- src/views/regime/week.vue | 21 +++++++++++++++------ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/store/index.ts b/src/store/index.ts index e29eedb..a738626 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -52,7 +52,7 @@ export default createStore({ zoneStr: "中途岛GMT-11:00", zoneid: 1, symbol: "$", - zoneValue:"", + zoneValue: "Atlantic/South_Georgia", currencytag: 0 }, islogin: false, @@ -123,7 +123,7 @@ export default createStore({ const user = await userinfo(); if(user != '未登录'){ saveValue("Lanvuage", user.languageValue); - commit('setUserInfo', user); + // commit('setUserInfo', user); } else { const info = await getaddr(); commit("setLanguage", info) diff --git a/src/views/regime/week.vue b/src/views/regime/week.vue index 96a9ea3..6e5ce8f 100644 --- a/src/views/regime/week.vue +++ b/src/views/regime/week.vue @@ -249,7 +249,7 @@ }