Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

.env.development

@@ -1,7 +1,7 @@
-VITE_SERVER_PROTOCOL = 'http:'
-VITE_SERVER_HOSTNAME = 'sgadserver.wdeveloperw.xyz'
-VITE_SERVER_URL = ''
-VITE_API_URL = '/api/v1'
+VITE_SERVER_PROTOCOL = 'https:'
+VITE_SERVER_HOSTNAME = 'zhgy.sagoo.cn'
 
-# VITE_SERVER_PROTOCOL = 'https:'
-# VITE_SERVER_HOSTNAME = 'zhgy.sagoo.cn'
+# VITE_SERVER_PROTOCOL = 'http:'
+# VITE_SERVER_HOSTNAME = 'sgadserver.wdeveloperw.xyz'
+# VITE_SERVER_URL = ''
+# VITE_API_URL = '/api/v1'

src/utils/request.ts

@@ -52,12 +52,13 @@ service.interceptors.response.use(
 					...res.data,
 				}
 			}
-			if (res.data?.Data) {
-				return res.data.Data
-			}
+			// if (res.data?.Data) {
+			// 	return res.data.Data
+			// }
 			if (res.data?.Data === undefined) {
 				return res.data
 			}
+			return res.data.Data
 		}
 	},
 	(error) => {

src/views/login/component/account.vue

@@ -1,50 +1,101 @@
 <template>
-	<el-form ref="loginForm" size="large" class="login-content-form" :model="ruleForm" :rules="formRules">
-		<el-form-item class="login-animation1" prop="userName">
-			<el-input type="text" :placeholder="$t('message.account.accountPlaceholder1')" v-model="ruleForm.userName" clearable autocomplete="off">
-				<template #prefix>
-					<el-icon class="el-input__icon">
-						<ele-User />
-					</el-icon>
-				</template>
-			</el-input>
-		</el-form-item>
-		<el-form-item class="login-animation2" prop="password">
-			<el-input :type="isShowPassword ? 'text' : 'password'" :placeholder="$t('message.account.accountPlaceholder2')" v-model="ruleForm.password" autocomplete="off" @keyup.enter="onSignIn">
-				<template #prefix>
-					<el-icon class="el-input__icon">
-						<ele-Unlock />
-					</el-icon>
-				</template>
-				<template #suffix>
-					<i class="iconfont el-input__icon login-content-password" :class="isShowPassword ? 'icon-yincangmima' : 'icon-xianshimima'" @click="isShowPassword = !isShowPassword">
-					</i>
-				</template>
-			</el-input>
-		</el-form-item>
-		<el-form-item class="login-animation3" prop="captcha">
-			<el-col :span="15">
-				<el-input type="text" maxlength="4" :placeholder="$t('message.account.accountPlaceholder3')" v-model="ruleForm.captcha" clearable autocomplete="off" @keyup.enter="onSignIn">
-					<template #prefix>
-						<el-icon class="el-input__icon">
-							<ele-Position />
-						</el-icon>
-					</template>
-				</el-input>
-			</el-col>
-			<el-col :span="1"></el-col>
-			<el-col :span="8">
-				<div class="login-content-code">
-					<img class="login-content-code-img" @click="getCaptcha" width="130" height="38" :src="captchaSrc" style="cursor: pointer" />
-				</div>
-			</el-col>
-		</el-form-item>
-		<el-form-item class="login-animation4">
-			<el-button type="primary" class="login-content-submit" @click="onSignIn" :loading="loading.signIn">
-				<span>{{ $t('message.account.accountBtnText') }}</span>
-			</el-button>
-		</el-form-item>
-	</el-form>
+  <el-form
+    ref="loginForm"
+    size="large"
+    class="login-content-form"
+    :model="ruleForm"
+    :rules="formRules"
+  >
+    <el-form-item
+      class="login-animation1"
+      prop="userName"
+    >
+      <el-input
+        type="text"
+        :placeholder="$t('message.account.accountPlaceholder1')"
+        v-model="ruleForm.userName"
+        clearable
+        autocomplete="off"
+      >
+        <template #prefix>
+          <el-icon class="el-input__icon">
+            <ele-User />
+          </el-icon>
+        </template>
+      </el-input>
+    </el-form-item>
+    <el-form-item
+      class="login-animation2"
+      prop="password"
+    >
+      <el-input
+        :type="isShowPassword ? 'text' : 'password'"
+        :placeholder="$t('message.account.accountPlaceholder2')"
+        v-model="ruleForm.password"
+        autocomplete="off"
+        @keyup.enter="onSignIn"
+      >
+        <template #prefix>
+          <el-icon class="el-input__icon">
+            <ele-Unlock />
+          </el-icon>
+        </template>
+        <template #suffix>
+          <i
+            class="iconfont el-input__icon login-content-password"
+            :class="isShowPassword ? 'icon-yincangmima' : 'icon-xianshimima'"
+            @click="isShowPassword = !isShowPassword"
+          >
+          </i>
+        </template>
+      </el-input>
+    </el-form-item>
+    <el-form-item
+      class="login-animation3"
+      prop="captcha"
+    >
+      <el-col :span="15">
+        <el-input
+          type="text"
+          maxlength="4"
+          :placeholder="$t('message.account.accountPlaceholder3')"
+          v-model="ruleForm.captcha"
+          clearable
+          autocomplete="off"
+          @keyup.enter="onSignIn"
+        >
+          <template #prefix>
+            <el-icon class="el-input__icon">
+              <ele-Position />
+            </el-icon>
+          </template>
+        </el-input>
+      </el-col>
+      <el-col :span="1"></el-col>
+      <el-col :span="8">
+        <div class="login-content-code">
+          <img
+            class="login-content-code-img"
+            @click="getCaptcha"
+            width="130"
+            height="38"
+            :src="captchaSrc"
+            style="cursor: pointer"
+          />
+        </div>
+      </el-col>
+    </el-form-item>
+    <el-form-item class="login-animation4">
+      <el-button
+        type="primary"
+        class="login-content-submit"
+        @click="onSignIn"
+        :loading="loading.signIn"
+      >
+        <span>{{ $t('message.account.accountBtnText') }}</span>
+      </el-button>
+    </el-form-item>
+  </el-form>
 </template>
 
 <script lang="ts">
@@ -59,124 +110,124 @@ import { Session } from '/@/utils/storage';
 import { formatAxis } from '/@/utils/formatTime';
 import api from '/@/api/system';
 export default defineComponent({
-	name: 'loginAccount',
-	setup() {
-		const { t } = useI18n();
-		const store = useStore();
-		const route = useRoute();
-		const router = useRouter();
-		const { proxy } = getCurrentInstance() as any;
-		const state = reactive({
-			isShowPassword: false,
-			ruleForm: {
-				userName: 'demo',
-				password: 'demo123456',
-				captcha: '',
-				VerifyKey: '',
-			},
-			formRules: {
-				userName: [{ required: true, trigger: 'blur', message: '用户名不能为空' }],
-				password: [{ required: true, trigger: 'blur', message: '密码不能为空' }],
-				captcha: [{ required: true, trigger: 'blur', message: '验证码不能为空' }],
-			},
-			loading: {
-				signIn: false,
-			},
-			captchaSrc: '',
-		});
-		onMounted(() => {
-			getCaptcha();
-		});
-		// 时间获取
-		const currentTime = computed(() => {
-			return formatAxis(new Date());
-		});
+  name: 'loginAccount',
+  setup() {
+    const { t } = useI18n();
+    const store = useStore();
+    const route = useRoute();
+    const router = useRouter();
+    const { proxy } = getCurrentInstance() as any;
+    const state = reactive({
+      isShowPassword: false,
+      ruleForm: {
+        userName: 'demo',
+        password: 'demo123456',
+        captcha: '',
+        VerifyKey: '',
+      },
+      formRules: {
+        userName: [{ required: true, trigger: 'blur', message: '用户名不能为空' }],
+        password: [{ required: true, trigger: 'blur', message: '密码不能为空' }],
+        captcha: [{ required: true, trigger: 'blur', message: '验证码不能为空' }],
+      },
+      loading: {
+        signIn: false,
+      },
+      captchaSrc: '',
+    });
+    onMounted(() => {
+      getCaptcha();
+    });
+    // 时间获取
+    const currentTime = computed(() => {
+      return formatAxis(new Date());
+    });
 
-		const getCaptcha = () => {
-			api.login.captcha().then((res: any) => {
-				state.captchaSrc = res.img;
-				state.ruleForm.VerifyKey = res.key;
-			});
-		};
+    const getCaptcha = () => {
+      api.login.captcha().then((res: any) => {
+        state.captchaSrc = res.img;
+        state.ruleForm.VerifyKey = res.key;
+      });
+    };
 
-		// 登录
-		const onSignIn = () => {
-			// 验证表单
-			proxy.$refs.loginForm
-				.validate((valid: boolean) => {
-					if (valid) {
-						state.loading.signIn = true;
-						api.login
-							.login(state.ruleForm)
-							.then(async (res: any) => {
-								const userInfos = res.userInfo;
-								userInfos.avatar = proxy.getUpFileUrl(userInfos.avatar);
-								// 存储 token 到浏览器缓存
-								Session.set('token', res.token);
-								// 存储用户信息到浏览器缓存
-								Session.set('userInfo', userInfos);
-								await store.dispatch('userInfos/setUserInfos', userInfos);
+    // 登录
+    const onSignIn = () => {
+      // 验证表单
+      proxy.$refs.loginForm
+        .validate((valid: boolean) => {
+          if (valid) {
+            state.loading.signIn = true;
+            api.login
+              .login(state.ruleForm)
+              .then(async (res: any) => {
+                const userInfos = res.userInfo;
+                userInfos.avatar = proxy.getUpFileUrl(userInfos.avatar);
+                // 存储 token 到浏览器缓存
+                Session.set('token', res.token);
+                // 存储用户信息到浏览器缓存
+                Session.set('userInfo', userInfos);
+                await store.dispatch('userInfos/setUserInfos', userInfos);
 
-								currentUser();
-							})
-							.catch(() => {
-								state.loading.signIn = false;
-								getCaptcha();
-							});
-					}
-				})
-				.catch(() => { });
-		};
-		// 获取登录用户信息
-		const currentUser = async () => {
-			api.login.currentUser().then(async (res: any) => {
-				// 设置用户菜单
-				Session.set('userMenu', res);
-				store.dispatch('requestOldRoutes/setBackEndControlRoutes', res);
-				if (!store.state.themeConfig.themeConfig.isRequestRoutes) {
-					// 前端控制路由，2、请注意执行顺序
-					await initFrontEndControlRoutes();
-					signInSuccess();
-				} else {
-					// 模拟后端控制路由，isRequestRoutes 为 true，则开启后端控制路由
-					// 添加完动态路由，再进行 router 跳转，否则可能报错 No match found for location with path "/"
-					await initBackEndControlRoutes();
-					// 执行完 initBackEndControlRoutes，再执行 signInSuccess
-					signInSuccess();
-				}
-			});
-			// // 设置按钮权限
-			// Session.set('permissions', res.data.permissions);
-			// // 1、请注意执行顺序(存储用户信息到vuex)
-			// await store.dispatch('userInfos/setPermissions', res.data.permissions);
-		};
-		// 登录成功后的跳转
-		const signInSuccess = () => {
-			// 初始化登录成功时间问候语
-			let currentTimeInfo = currentTime.value;
-			// 登录成功，跳到转首页
-			// 添加完动态路由，再进行 router 跳转，否则可能报错 No match found for location with path "/"
-			// 如果是复制粘贴的路径，非首页/登录页，那么登录成功后重定向到对应的路径中
-			if (route.query?.redirect) {
-				router.push({
-					path: route.query?.redirect as string,
-					query: route.query.params ? (Object.keys(route.query?.params as string).length > 0 ? JSON.parse(route.query?.params as string) : '') : '',
-				});
-			} else {
-				router.push('/');
-			}
-			// 登录成功提示
-			// 关闭 loading
-			state.loading.signIn = false;
-			const signInText = t('message.signInText');
-			ElMessage.success(`${currentTimeInfo}，${signInText}`);
-		};
-		return {
-			onSignIn,
-			getCaptcha,
-			...toRefs(state),
-		};
-	},
+                currentUser();
+              })
+              .catch(() => {
+                state.loading.signIn = false;
+                getCaptcha();
+              });
+          }
+        })
+        .catch(() => { });
+    };
+    // 获取登录用户信息
+    const currentUser = async () => {
+      api.login.currentUser().then(async (res: any) => {
+        // 设置用户菜单
+        Session.set('userMenu', res || []);
+        store.dispatch('requestOldRoutes/setBackEndControlRoutes', res || []);
+        if (!store.state.themeConfig.themeConfig.isRequestRoutes) {
+          // 前端控制路由，2、请注意执行顺序
+          await initFrontEndControlRoutes();
+          signInSuccess();
+        } else {
+          // 模拟后端控制路由，isRequestRoutes 为 true，则开启后端控制路由
+          // 添加完动态路由，再进行 router 跳转，否则可能报错 No match found for location with path "/"
+          await initBackEndControlRoutes();
+          // 执行完 initBackEndControlRoutes，再执行 signInSuccess
+          signInSuccess();
+        }
+      });
+      // // 设置按钮权限
+      // Session.set('permissions', res.data.permissions);
+      // // 1、请注意执行顺序(存储用户信息到vuex)
+      // await store.dispatch('userInfos/setPermissions', res.data.permissions);
+    };
+    // 登录成功后的跳转
+    const signInSuccess = () => {
+      // 初始化登录成功时间问候语
+      let currentTimeInfo = currentTime.value;
+      // 登录成功，跳到转首页
+      // 添加完动态路由，再进行 router 跳转，否则可能报错 No match found for location with path "/"
+      // 如果是复制粘贴的路径，非首页/登录页，那么登录成功后重定向到对应的路径中
+      if (route.query?.redirect) {
+        router.push({
+          path: route.query?.redirect as string,
+          query: route.query.params ? (Object.keys(route.query?.params as string).length > 0 ? JSON.parse(route.query?.params as string) : '') : '',
+        });
+      } else {
+        router.push('/');
+      }
+      // 登录成功提示
+      // 关闭 loading
+      state.loading.signIn = false;
+      const signInText = t('message.signInText');
+      ElMessage.success(`${currentTimeInfo}，${signInText}`);
+    };
+    return {
+      onSignIn,
+      getCaptcha,
+      ...toRefs(state),
+    };
+  },
 });
 </script>
 

src/views/system/api/component/edit.vue

@@ -1,26 +1,77 @@
 <template>
-  <el-dialog class="api-edit" v-model="showDialog" :title="`${formData.id  ?  '编辑接口'  :  '新增接口'}`" width="600px" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form ref="formRef" :model="formData" :rules="ruleForm" label-width="80px">
-      <el-form-item label="关联页面" prop="parentId">
-        <el-cascader :options="menuData" :props="{ checkStrictly: false,  multiple:  true,  emitPath: false, value: 'id', label: 'title' }" placeholder="请选择关联页面" clearable class="w100" v-model="formData.menuIds"></el-cascader>
+  <el-dialog
+    class="api-edit"
+    v-model="showDialog"
+    :title="`${formData.id  ?  '编辑接口'  :  '新增接口'}`"
+    width="600px"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+  >
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="ruleForm"
+      label-width="80px"
+    >
+      <el-form-item
+        label="关联页面"
+        prop="menuIds"
+      >
+        <el-cascader
+          :options="menuData"
+          :props="{ checkStrictly: false,  multiple:  true,  emitPath: false, value: 'id', label: 'title' }"
+          placeholder="请选择关联页面"
+          clearable
+          class="w100"
+          v-model="formData.menuIds"
+        ></el-cascader>
       </el-form-item>
-      <el-form-item label="接口名称" prop="name">
-        <el-input v-model="formData.name" placeholder="输入接口名称" />
+      <el-form-item
+        label="接口名称"
+        prop="name"
+      >
+        <el-input
+          v-model="formData.name"
+          placeholder="输入接口名称"
+        />
       </el-form-item>
-      <el-form-item label="接口地址" prop="address">
-        <el-input v-model="formData.address" placeholder="接口地址" />
+      <el-form-item
+        label="接口地址"
+        prop="address"
+      >
+        <el-input
+          v-model="formData.address"
+          placeholder="接口地址"
+        />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-switch v-model="formData.status" :active-value="1" :inactive-value="0" />
+      <el-form-item
+        label="状态"
+        prop="status"
+      >
+        <el-switch
+          v-model="formData.status"
+          :active-value="1"
+          :inactive-value="0"
+        />
       </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" type="textarea" :rows="3" />
+      <el-form-item
+        label="备注"
+        prop="remark"
+      >
+        <el-input
+          v-model="formData.remark"
+          type="textarea"
+          :rows="3"
+        />
       </el-form-item>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="showDialog = false">取消</el-button>
-        <el-button type="primary" @click="onSubmit">确定</el-button>
+        <el-button
+          type="primary"
+          @click="onSubmit"
+        >确定</el-button>
       </div>
     </template>
   </el-dialog>