Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2024-11-17 7c33a1164d3019feb3ad9e4844b3d364e5c6eb44

 ruoyi-ui/src/views/login.vue

@@ -1,18 +1,18 @@
<template>
  <div>
  


  <div class="login Group_132">
     <div class="navbar topHeight">
   <!--     <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
	  

        <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
        <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
     -->
        <div class="right-menu">
	     
	  
	     



            <div class="avatar-wrapper">
            <el-button @click="login">
              <img :src="avatar" class="user-avatar">
@@ -20,14 +20,14 @@
            <span>登录</span>
            </el-button>
            <el-button @click="openReg">
			 

            <span>注册</span>
            </el-button>
            </div>
	     

        </div>
      </div>
	  

       <el-dialog  :visible.sync="open" style="margin: 0px;" customClass="customWidth" width="620px">
    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" style="margin: 0px;">
      <h3 class="title">登录本都都家网</h3>
@@ -107,7 +107,7 @@
        </div>

        <div class="code" @click="getCode" style="width: 24px;
        

        height: 16px;
        font-size: 12px;
        font-family: Microsoft YaHei-Regular, Microsoft YaHei;
@@ -134,24 +134,24 @@
          <span v-if="!loading" style="width: 97px;height: 62px;">登录</span>
          <span v-else>登 录 中...</span>
        </el-button>
      

      </el-form-item>
     <el-form-item>
        <a href="https://www.bendudu.com:8080/profile/upload/2023/10/10/Bendudu20231010_20231010203358A033.apk">点击此处下载应用程序</a>
		

     </el-form-item>
    </el-form>
   </el-dialog>
	
	
	
	




   <el-dialog :visible.sync="openRegister" customClass="customWidth" width="450px">
      <div class="register">
        <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
          <h3 class="title">新用户注册</h3>
          <el-form-item prop="nickName">
            <el-input v-model="registerForm.nickName" type="text" auto-complete="off" placeholder="账号">
          <el-form-item prop="nickname">
            <el-input v-model="registerForm.nickname" type="text" auto-complete="off" placeholder="账号">
              <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
            </el-input>
          </el-form-item>
@@ -202,11 +202,11 @@
              <span v-if="!loading">注 册</span>
              <span v-else>注 册 中...</span>
            </el-button>
		   

          </el-form-item>
        </el-form>
        <!--  底部  -->
		

      </div>
   </el-dialog>
    <!--  底部  -->
@@ -215,13 +215,15 @@
      <a href="https://beian.miit.gov.cn/" target="_blank" style="color: black; ">粤ICP备2023050334号<span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>公安备案号44010402003045</a>
    </div>
  </div>
  
  <div class="gpr"></div>

  <div class="gpr">
<!--       <img :key="url" :src="url" style="width:100%;height:30%"></img> -->
  </div>
</div>
</template>

<script>
import { getCodeImg,Download } from "@/api/login";
import { getCodeImg,Download,register } from "@/api/login";
import Cookies from "js-cookie";
import { encrypt, decrypt } from '@/utils/jsencrypt'

@@ -233,10 +235,13 @@
         callback(new Error("两次输入的密码不一致"));
       } else {
         callback();

       }
     };
    return {
     url: require('../assets/images/index.png'),
      openRegister: false,
    avatar: undefined,
     open: false,
      codeUrl: "",
      loginForm: {
@@ -261,23 +266,23 @@
      // 验证码开关
      captchaEnabled: true,
      // 注册开关
      register: true,
    //  register: true,
      redirect: undefined,
	  
	  
	  




     registerForm: {
       nickName: "",
       nickname: "",
       password: "",
       confirmPassword: "",
       code: "",
       uuid: ""
     },
     registerRules: {
       nickName: [
       nickname: [
         { required: true, trigger: "blur", message: "请输入您的账号" },
         { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
       //  { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
       ],
       password: [
         { required: true, trigger: "blur", message: "请输入您的密码" },
@@ -306,16 +311,19 @@
  },
  methods: {
     handleRegister() {
        //alert(this.registerForm.nickname)
       this.$refs.registerForm.validate(valid => {
         if (valid) {
           this.loading = true;
         //alert(this.registerForm.nickname)
           register(this.registerForm).then(res => {
             const nickName = this.registerForm.nickName;
             const nickName = this.registerForm.nickname;
             this.$alert("<font color='red'>恭喜你，您的账号 " + nickName + " 注册成功！</font>", '系统提示', {
               dangerouslyUseHTMLString: true,
               type: 'success'
             }).then(() => {
               this.$router.push("/login");
              this.openRegister = false;
            //   this.$router.push("/login");
             }).catch(() => {});
           }).catch(() => {
             this.loading = false;
@@ -327,7 +335,7 @@
       });
     },
     openReg(){
        this.openRegister = true; 
        this.openRegister = true;
     },
     login(){
        this.open = true;
@@ -340,6 +348,7 @@
        if (this.captchaEnabled) {
          this.codeUrl = "data:image/gif;base64," + res.data.img;
          this.loginForm.uuid = res.data.uuid;
            this.registerForm.uuid = res.data.uuid;
        }
      });
    },
@@ -385,20 +394,31 @@
<style rel="stylesheet/scss" lang="scss">
.gpr{
   width:100%;
   height:600px;
   background: no-repeat center/40% url("../assets/images/Group 132.png");
   // height:1000px;

   //background: no-repeat center/100% url("../assets/images/index.png");
}
    .customWidth{
         width:40%;  // 设置弹出框宽度的数值
     }
.topHeight{
   height: 40px;

   margin-right: 20px;
   top:5px;
   position: absolute;
}
.Group_132{
   // background-image: url("../assets/images/index.png");



  // background: no-repeat center/40% url("../assets/images/Group 132.png");
  height: 100%;
  width:  100%;
  // height: 1200px;
   min-width: 1300px;
    width: 100vw;
    height: 100vh;

  background-color: #FEF7FC;
  //background-position: 49.5% 16.2% ;
  // background-position: 81.7px 71.3px;
@@ -410,17 +430,17 @@
  display: flex;
  justify-content: flex-end;
  align-items: center;
  height: 100%;
  // height: 60px;
  width:  100%;
  background: no-repeat center/40% url("../assets/images/login_logo.png");
  background: no-repeat center/100% url("../assets/images/index.png");
  background-color: #FEF7FC;

  

  //background-image: url("../assets/images/login-background.jpg");
  //background-size: cover;
}
.title {
  

  width:355px;
  height: 58px;
  font-size: 44px;
@@ -516,7 +536,7 @@
  width: 108px;
  height: 48px;
  float: right;
  



  img {
@@ -544,7 +564,7 @@
}

.code {
  

}

.register {
@@ -553,10 +573,10 @@
  align-items: center;
  height: 100%;
  //background-image: url("../assets/images/login-background.jpg");
 

 width:400px;
  background-color: #FEF7FC;
  

  //background-size: cover;
}
.title {