From 8d7a85383e9d008f94e19b932f777a458f26bc71 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期三, 13 十二月 2023 15:10:25 +0800
Subject: [PATCH] bug修改

---
 src/views/components/loginForm.vue |   16 +++++++++++-----
 src/views/components/publish.vue   |    6 ++++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/views/components/loginForm.vue b/src/views/components/loginForm.vue
index 7e7889c..51eddfd 100644
--- a/src/views/components/loginForm.vue
+++ b/src/views/components/loginForm.vue
@@ -81,8 +81,8 @@
 const { proxy } = getCurrentInstance();
 
 const loginForm = ref({
-  username: "admin",
-  password: "admin@123",
+  username: "",
+  password: "",
   code: "",
   uuid: ""
 });
@@ -90,7 +90,7 @@
 const loginRules = {
   username: [{ required: true, trigger: "blur", message: "请输入您的账号" }],
   password: [{ required: true, trigger: "blur", message: "请输入您的密码" }],
-  code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+  code: [{ required: true, trigger: "blur", message: "请输入验证码" }]
 };
 
 const codeUrl = ref("");
@@ -132,8 +132,14 @@
       //   Cookies.remove("rememberMe");
       // }
       // 调用action的登录方法
-      loginForm.value.password = Base64.encode(loginForm.value.password)
-      userStore.login(loginForm.value).then(() => {
+      // loginForm.value.password = Base64.encode(loginForm.value.password)
+        const param = {
+            username: loginForm.value.username,
+            password: Base64.encode(loginForm.value.password),
+            code: loginForm.value.code,
+            uuid: loginForm.value.uuid
+        }
+      userStore.login(param).then(() => {
         // const query = route.query;
         // const otherQueryParams = Object.keys(query).reduce((acc, cur) => {
         //   if (cur !== "redirect") {
diff --git a/src/views/components/publish.vue b/src/views/components/publish.vue
index ae64238..495982a 100644
--- a/src/views/components/publish.vue
+++ b/src/views/components/publish.vue
@@ -6,7 +6,7 @@
           <el-form-item label="机构名称:" class="nameInput"  style="width: 300px;margin-bottom: 0;margin-right: 20px;">
             <el-input v-model="state.querys.name" placeholder="请选择机构名称" />
           </el-form-item>
-          <el-form-item label="所在地市:" style="margin-bottom: 0;margin-right: 20px">
+          <el-form-item label="所在地市:"  style="margin-bottom: 0;margin-right: 20px">
               <el-cascader
                   ref="myCascader"
                   v-model="state.querys.area"
@@ -126,6 +126,7 @@
     ElMessage.warning(res.message)
   }
 }
+
 const getArea = async ()=>{
     const res = await getRegionTree({name: '',parentId: null,regionType: state.attribute})
     if(res.code == 200){
@@ -140,6 +141,8 @@
         ElMessage.warning(res.message)
     }
 }
+
+
 const getBusiness = async ()=>{
     const res = await getDict({dictType: 'sys_business_scope'})
     if(res.code == 200){
@@ -149,7 +152,6 @@
     }
 }
 const handleChange = (value) => {
-    console.log('myCascader',myCascader.value)
     if(value && value[0] === '全部'){
         state.querys.province = ''
         state.querys.city = ''

--
Gitblit v1.9.2