feat(api): order interactive part2

src/api/order/list.ts

@@ -31,6 +31,17 @@ export const ShippingListApi = (params: PageParams) =>
       ignoreCancelToken: true,
     },
   });
+
+export const BrandListApi = (params: PageParams) =>
+  defHttp.post<ListGetResultModel>({
+    url: Api.brandList,
+    params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+
 export const GetOrderInfoApi = (params: OrderInfoParams) =>
   defHttp.get<ListGetResultModel>({
     url: `${Api.getOrderInfo}/${params.id}/${params.brandId}`,

src/api/sys/user.ts

@@ -5,6 +5,7 @@ import { ErrorMessageMode } from '/#/axios';
 
 enum Api {
   Login = '/basic-api/sys/login',
+  // Login = '/zfb-api/',
   Logout = '/logout',
   GetUserInfo = '/basic-api/sys/user/infoAnon',
   GetPermCode = '/getPermCode',

src/store/modules/user.ts

@@ -7,7 +7,8 @@ import { PageEnum } from '/@/enums/pageEnum';
 import { ROLES_KEY, TOKEN_KEY, USER_INFO_KEY } from '/@/enums/cacheEnum';
 import { getAuthCache, setAuthCache } from '/@/utils/auth';
 import { GetUserInfoModel, LoginParams } from '/@/api/sys/model/userModel';
-import { doLogout, getUserInfo, loginApi } from '/@/api/sys/user';
+// doLogout
+import { getUserInfo, loginApi } from '/@/api/sys/user';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { router } from '/@/router';
@@ -148,13 +149,13 @@ export const useUserStore = defineStore({
      * @description: logout
      */
     async logout(goLogin = false) {
-      if (this.getToken) {
-        try {
-          await doLogout();
-        } catch {
-          console.log('注销Token失败');
-        }
-      }
+      // if (this.getToken) {
+      //   try {
+      //     await doLogout();
+      //   } catch {
+      //     console.log('注销Token失败');
+      //   }
+      // }
       this.setToken(undefined);
       this.setSessionTimeout(false);
       this.setUserInfo(null);

src/views/dashboard/order/list.vue

@@ -114,7 +114,7 @@ userName: "微信用户q0zj95zuo4pv" -->
   import { useMessage } from '/@/hooks/web/useMessage';
   // import { Switch } from 'ant-design-vue';
   // import { h } from 'vue';
-  import { ListApi } from '/@/api/order/list';
+  import { ListApi, BrandListApi } from '/@/api/order/list';
   import { useI18n } from '/@/hooks/web/useI18n';
   // import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import { useGo } from '/@/hooks/web/usePage';
@@ -214,7 +214,7 @@ userName: "微信用户q0zj95zuo4pv" -->
         labelWidth: 100,
         schemas: [
           {
-            field: 'orderNo',
+            field: 'orderSn',
             label: '订单号',
             component: 'Input',
             colProps: {
@@ -222,6 +222,75 @@ userName: "微信用户q0zj95zuo4pv" -->
               xxl: 5,
             },
           },
+          {
+            field: 'orderStatus',
+            label: '订单状态',
+            component: 'Select',
+            colProps: {
+              xl: 5,
+              xxl: 5,
+            },
+            componentProps: {
+              options: [
+                {
+                  label: '全部订单',
+                  value: '',
+                  key: '1',
+                },
+                {
+                  label: '待付款',
+                  value: '0',
+                  key: '2',
+                },
+                {
+                  label: '订单已取消',
+                  value: '101',
+                  key: '3',
+                },
+                {
+                  label: '订单已付款',
+                  value: '201',
+                  key: '4',
+                },
+                {
+                  label: '订单已发货',
+                  value: '1',
+                  key: '5',
+                },
+                {
+                  label: '订单已收货',
+                  value: '2',
+                  key: '6',
+                },
+                {
+                  label: '完成',
+                  value: '501',
+                  key: '7',
+                },
+              ],
+            },
+          },
+          {
+            field: 'brandId',
+            label: 'VR场景',
+            component: 'ApiSelect',
+            componentProps: {
+              api: BrandListApi,
+              // resultField: 'list',
+              numberToString: true,
+              labelField: 'name',
+              valueField: 'id',
+              immediate: true,
+              params: {
+                page: 1,
+                limit: 1000,
+              },
+            },
+            colProps: {
+              xl: 5,
+              xxl: 5,
+            },
+          },
         ],
       };
 
@@ -233,6 +302,7 @@ userName: "微信用户q0zj95zuo4pv" -->
         columns: columns,
         useSearchForm: true,
         formConfig: searchForm,
+        clickToRowSelect: false,
         showTableSetting: true,
         tableSetting: { fullScreen: true },
         showIndexColumn: false,

src/views/sys/login/LoginForm.vue

@@ -189,7 +189,7 @@
       if (userInfo) {
         notification.success({
           message: t('sys.login.loginSuccessTitle'),
-          description: `${t('sys.login.loginSuccessDesc')}: ${userInfo.realName}`,
+          description: `${t('sys.login.loginSuccessDesc')}: ${userInfo.username}`,
           duration: 3,
         });
       }