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] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=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 @@
 }
 </style>
 <script lang="ts">
-import { defineComponent, ref, watch } from "vue";
+import { computed, defineComponent, ref, watch } from "vue";
 import { getDay, gethour, getminute, gettime, getweek } from "@/utils/date";
 import store from '@/store';
 import { getdatelist, userinfo } from '@/api';
@@ -260,11 +260,12 @@ import { useRoute } from 'vue-router';
 export default defineComponent({
     props: {},
     setup() {
+        const userinfo = computed(()=>store.state.userinfo)
         const zhou = ref(0);
         const time: any = useRoute().query.time;
-        const week = ref<any>(getweek(time, store.state.userinfo.zoneValue));
-        const userid = store.state.userinfo.memberid;
-        console.log(week.value);
+        let userid = userinfo.value.memberid;
+        const week = ref<any>(getweek(time, userinfo.value.zoneValue));
+       
         function getdates(userid: number){
             getdatelist(week.value.start, week.value.end, userid).then((res: any)=>{
                 console.log(res)
@@ -287,6 +288,13 @@ export default defineComponent({
                 console.log(week.value)
             })
         }
+        watch(userinfo,()=>{
+            userid = userinfo.value.memberid;
+            getdates(userid);
+            week.value = getweek(time, userinfo.value.zoneValue);
+        })
+        console.log(week.value);
+        
 
         getdates(userid);
         
@@ -301,7 +309,7 @@ export default defineComponent({
             dayjs.extend(utc)
             dayjs.extend(timezone)
             const days: any = dayjs;
-            const now = days().tz(store.state.userinfo.zoneValue)
+            const now = days().tz(userinfo.value.zoneValue)
             const xiaoshi = now.hour()
             const fenzhong = now.minute()
             top.value = (xiaoshi + (fenzhong / 60)) * 0.63;
@@ -310,7 +318,7 @@ export default defineComponent({
         }, 2000)
 
         watch(zhou, (value) => {
-            week.value = getweek(time, store.state.userinfo.zoneValue, value);
+            week.value = getweek(time, userinfo.value.zoneValue, value);
             console.log(week.value);
             getdates(userid)
         });
@@ -341,6 +349,7 @@ export default defineComponent({
             console.log(url)
             router.push(url)
         }
+        
         return {
             zhou,
             week,