Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/views/shop/shopOrder/components/orderInfo.vue
#	src/views/shop/shopOrder/index.vue

src/store/modules/user.ts

@@ -131,6 +131,15 @@ export const useUserStore = defineStore({
         }
         return m;
       });
+    },
+    /**
+     * 重置用户状态（退出登录时调用）
+     */
+    resetUserState() {
+      this.info = null;
+      this.menus = null;
+      this.authorities = [];
+      this.roles = [];
     }
   }
 });