修改成昵称登录了

feige

2024-08-29 be4c17512fe93511c21939d594c843b9594b1549

修改成昵称登录了

 ruoyi-ui/src/api/login.js

@@ -1,9 +1,10 @@
import request from '@/utils/request'

// 登录方法
export function login(username, password, code, uuid) {
export function login(nickname, password, code, uuid) {
    alert(nickname)
  const data = {
    username,
    nickname,
    password,
    code,
    uuid

 ruoyi-ui/src/api/system/family.js

@@ -27,9 +27,9 @@
    data:data
  })
}
export function findByFname(name){
export function findByFname(name, clanId){
  return request({
    url:'/family/findByFname/'+name,
    url:'/family/findByFname/'+name+"/"+clanId,
    method: 'get',

  })

 ruoyi-ui/src/store/modules/user.js

@@ -36,7 +36,7 @@
    // 登录
    Login({ commit }, userInfo) {

      const username = userInfo.username.trim()
      const nickname = userInfo.nickName.trim()
      const password = userInfo.password
      const code = userInfo.code

@@ -44,7 +44,7 @@
      const uuid = userInfo.uuid

      return new Promise((resolve, reject) => {
        login(username, password, code, uuid).then(res => {
        login(nickname, password, code, uuid).then(res => {

          setToken(res.data.token)


 ruoyi-ui/src/views/login.vue

@@ -37,9 +37,9 @@
        </div></div>
      <div class="yonghuming" style="">用户名</div>

      <el-form-item prop="username" style="width: 380px; height: 48px; ">
      <el-form-item prop="nickName" style="width: 380px; height: 48px; ">
        <el-input
          v-model="loginForm.username"
          v-model="loginForm.nickName"
          type="text"
          auto-complete="off"
          placeholder="请输入用户名"
@@ -150,8 +150,8 @@
        <div class="register">
          <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
            <h3 class="title">新用户注册</h3>
            <el-form-item prop="username">
              <el-input v-model="registerForm.username" 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>
@@ -242,14 +242,14 @@
      loginForm: {
        // username: "admin",
        // password: "admin123",
        username: "",
        nickName: "",
        password: "",
        rememberMe: false,
        code: "",
        uuid: ""
      },
      loginRules: {
        username: [
        nickName: [
          { required: true, trigger: "blur", message: "请输入您的账号" }
        ],
        password: [
@@ -268,14 +268,14 @@
      

      registerForm: {
        username: "",
        nickName: "",
        password: "",
        confirmPassword: "",
        code: "",
        uuid: ""
      },
      registerRules: {
        username: [
        nickName: [
          { required: true, trigger: "blur", message: "请输入您的账号" },
          { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
        ],
@@ -310,8 +310,8 @@
          if (valid) {
            this.loading = true;
            register(this.registerForm).then(res => {
              const username = this.registerForm.username;
              this.$alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", '系统提示', {
              const nickName = this.registerForm.nickName;
              this.$alert("<font color='red'>恭喜你，您的账号 " + nickName + " 注册成功！</font>", '系统提示', {
                dangerouslyUseHTMLString: true,
                type: 'success'
              }).then(() => {
@@ -344,11 +344,11 @@
      });
    },
    getCookie() {
      const username = Cookies.get("username");
      const nickName = Cookies.get("nickName");
      const password = Cookies.get("password");
      const rememberMe = Cookies.get('rememberMe')
      this.loginForm = {
        username: username === undefined ? this.loginForm.username : username,
        nickName: nickName === undefined ? this.loginForm.nickName : nickName,
        password: password === undefined ? this.loginForm.password : decrypt(password),
        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
      };
@@ -358,14 +358,15 @@
        if (valid) {
          this.loading = true;
          if (this.loginForm.rememberMe) {
            Cookies.set("username", this.loginForm.username, { expires: 30 });
            Cookies.set("nickName", this.loginForm.nickName, { expires: 30 });
            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
          } else {
            Cookies.remove("username");
            Cookies.remove("nickName");
            Cookies.remove("password");
            Cookies.remove('rememberMe');
          }
          alert(this.loginForm.nickName)
          this.$store.dispatch("Login", this.loginForm).then(() => {
            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
          }).catch(() => {

 ruoyi-ui/src/views/system/family/index.vue

@@ -233,8 +233,9 @@
  methods: {
    chongf(){
      //alert(2)
      let clanId = this.$store.state.user.clanId
      if(this.form.name!=""){
      findByFname(this.form.name).then(response => {
      findByFname(this.form.name, clanId).then(response => {
          console.log(response.data)
       //   alert(response.data!=null)
          if(response.data!=null)

 ruoyi-ui/src/views/system/user/index.vue

@@ -183,13 +183,13 @@
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-row>
          <el-col :span="12">
            <el-form-item label="用户昵称" prop="nickName">
              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
            <el-form-item label="用户名称" prop="nickName">
              <el-input v-model="form.nickName" placeholder="请输入用户名称" maxlength="30" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="用户名称" prop="userName">
              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
            <el-form-item label="用户姓名" prop="userName">
              <el-input v-model="form.userName" placeholder="请输入用户姓名" maxlength="30" />
            </el-form-item>
          </el-col>


 ruoyi-ui/vue.config.js

@@ -37,8 +37,8 @@
      // detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
      //target: `https://10.39.18.174:8080/`,
       target: `https://10.39.18.174:8080/`,
    //  target: 'https://www.bendudu.com:8080/',
     //  target: `https://192.168.1.3:8080/`,
      target: 'https://www.bendudu.com:8080/',
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API]: ''