Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/home.vue

@@ -8,8 +8,12 @@
                 <el-aside class="home-el-aside" width="220px">
                     <el-menu default-active="1" class="el-menu-vertical-demo">
                         <el-menu-item :index="(index + 1) + ''" v-for="(item, index) in 10" :key="index">
-                            <el-icon><setting /></el-icon>
-                            <span>第{{ index + 1 }}个</span>
+                            <div class="relativeElem">
+                                <el-icon>
+                                    <setting />
+                                </el-icon>
+                                <span>第{{ index + 1 }}个</span>
+                            </div>
                         </el-menu-item>
 
                         <el-sub-menu index="11">
@@ -20,8 +24,10 @@
                                 <span>第十一个</span>
                             </template>
                             <el-menu-item :index="'11'">
-                                <el-icon><icon-menu /></el-icon>
-                                <span>第11-1个</span>
+                                <div class="relativeElem">
+                                    <el-icon><icon-menu /></el-icon>
+                                    <span>第11-1个</span>
+                                </div>
                             </el-menu-item>
                         </el-sub-menu>
                     </el-menu>
@@ -39,13 +45,39 @@
 </script>
 <style scoped lang="scss">
 .common-layout {
+    .relativeElem {
+        position: relative;
+        z-index: 2;
+        display: flex;
+        align-items: center;
+    }
+
     .el-header {
         background: $darkBlue;
     }
 
     .el-menu-vertical-demo {
         height: 100%;
+        background: $ashen;
+
+        .is-active {
+            position: relative;
+            color: $modena;
+
+            &:before {
+                content: '';
+                position: absolute;
+                right: 0;
+                top: 8px;
+                width: 95%;
+                height: 40px;
+                background: $backColor;
+                border-top-left-radius: 20px;
+                border-bottom-left-radius: 20px;
+            }
+        }
     }
+
     .el-main {
         padding: 0 20px;
         background: $backColor;

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/login.vue

@@ -45,7 +45,7 @@ import { useRouter } from "vue-router";
 import loginLogo from "@/assets/login/login_logo.png";
 import qiyeweixin from "@/assets/login/qiyeweixin.png";
 import { UserFilled, Lock } from '@element-plus/icons-vue'
-import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
 import { useStore } from '@/store/index'
 import { post } from "@/utils/request";
 import { LOGIN } from "./api";
@@ -75,11 +75,26 @@ const login = (formEl: FormInstance | undefined) => {
     console.log(ruleForm.value);
     post(LOGIN, { ...ruleForm.value }).then(res => {
       console.log(res);
+      if(res.code == 'error') {
+        ElMessage.error({
+          message: "登录失败",
+          type: "error",
+          duration: 2000,
+        })
+        loginLoading.value = false;
+        return
+      }
+      ElMessage.success({
+        message: "登录成功",
+        type: "success",
+        duration: 2000,
+      })
       setTimeout(() => {
         loginLoading.value = false;
       }, 1000)
       // loginLoading.value = false;
     }).catch(err => {
+      console.log(err);
       loginLoading.value = false;
     })
     return

fhKeeper/formulahousekeeper/customerBuler-crm/src/styles/global.scss

@@ -4,6 +4,7 @@ $backColor: #EEF3F6;
 $black: #000;
 $fontBlack: #333;
 $fontGray: #999;
+$modena: #6F4AFE;
 
 .text-gray{
     color : $fontGray