diff --git a/src/store/modules/core/auth.js b/src/store/modules/core/auth.js
index 403b998..d05952d 100644
--- a/src/store/modules/core/auth.js
+++ b/src/store/modules/core/auth.js
@@ -100,13 +100,13 @@ const actions = {
         }
         return res;
     },
-    logout: ({ commit }, returnUrl) => {
+    logout: async ({ commit }, returnUrl) => {
         returnUrl = returnUrl || router.currentRoute.value.fullPath;
         console.info('[logout]', returnUrl);
         commit('local/setToken', null, { root: true });
         commit('auth/setPermission', [], { root: true });
-        commit('layout/setReturnUrl', returnUrl, { root: true });
-        router.push({ name: 'Login', query: { returnUrl } });
+        await router.push({ name: 'Login', query: { returnUrl } });
+        location.reload();
     },
     getPermission: async ({ commit }) => {
         let res = await getPermission();
diff --git a/src/views/global/login.vue b/src/views/global/login.vue
index b5d5d37..dabda3e 100644
--- a/src/views/global/login.vue
+++ b/src/views/global/login.vue
@@ -44,6 +44,8 @@
 
     const { proxy } = getCurrentInstance();
     const store = useStore();
+    const route = useRoute();
+    store.commit('layout/setReturnUrl', route.query.returnUrl);
 
     const refsForm = ref(null);
     // const sending = ref(false);
diff --git a/src/views/sales/product/form/step2.vue b/src/views/sales/product/form/step2.vue
index 2890efd..6cdb942 100644
--- a/src/views/sales/product/form/step2.vue
+++ b/src/views/sales/product/form/step2.vue
@@ -133,7 +133,7 @@
                     state.form.id = id;
                     let res = await store.dispatch('product/detail', id);
                     if (res) {
-                        Object.assign(state.form, state.form);
+                        Object.assign(state.form, res);
                     }
                     res = await store.dispatch('productSkus/search', id);
                     state.form.skuInfos = res.map((item) => {