Merge branch 'master' of http://182.92.126.35:3000/hrx/vent-forewarn-micro

src/layouts/default/header/components/user-dropdown/index.vue

@@ -11,7 +11,7 @@
 
     <template #overlay>
       <Menu @click="handleMenuClick">
-        <MenuItem
+        <!-- <MenuItem
           key="doc"
           :text="t('layout.header.dropdownItemDoc')"
           icon="ion:document-text-outline"
@@ -29,7 +29,7 @@
           key="lock"
           :text="t('layout.header.tooltipLock')"
           icon="ion:lock-closed-outline"
-        />
+        /> -->
         <MenuItem
           key="logout"
           :text="t('layout.header.dropdownItemLoginOut')"

src/utils/http/axios/Axios.ts

@@ -228,9 +228,8 @@ export class VAxios {
         .then((res: AxiosResponse<Result>) => {
           if (transformResponseHook && isFunction(transformResponseHook)) {
             try {
-              // const ret = transformResponseHook(res, opt);//lxh
-              // resolve(ret);
-              resolve(res.data)//lxh
+              const ret = transformResponseHook(res, opt);
+              resolve(ret);
             } catch (err) {
               reject(err || new Error('request error!'));
             }