yu
/
CostumingPlatform
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yu:64b7bfaa0f97e9a6b12d804f02f35e547710fdc2
Branches Tags
yu:master
yu:zhc4dev
..
compare: yu:2d8b4339c5fe8bd0bd537311b0cf373a4d71ce00
Branches Tags
yu:master
yu:zhc4dev

No commits in common. '64b7bfaa0f97e9a6b12d804f02f35e547710fdc2' and '2d8b4339c5fe8bd0bd537311b0cf373a4d71ce00' have entirely different histories.
64b7bfaa0f ... 2d8b4339c5

4 changed files with 34 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats
  1. 100
      ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue
  2. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
  3. 3
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
  4. 10
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

100
ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue
Unescape View File

@ -59,39 +59,38 @@
:label-col="labelCol"
:wrapper-col="wrapperCol"
>
<a-form-model-item label="性别" prop="sex">
<!-- <a-select v-model="form.sex" placeholder="请选择性别" >
<a-select-option value="2">
<a-form-model-item label="性别" prop="region">
<a-select v-model="form.region" placeholder="请选择性别">
<a-select-option value="shanghai">
女士
</a-select-option>
<a-select-option value="1">
<a-select-option value="beijing">
先生
</a-select-option>
</a-select>-->
<j-dict-select-tag type="list" v-model="form.sex" dictCode="sex" placeholder="请选择性别" />
</a-select>
</a-form-model-item>
<a-form-model-item label="姓名" prop="realname">
<a-input placeholder="请输入姓名" v-model="form.realname" />
<a-form-model-item label="姓名" prop="desc">
<a-input placeholder="请输入姓名" v-model="form.desc" />
</a-form-model-item>
<!-- <a-form-model-item label="地区" prop="desc">
<a-form-model-item label="地区" prop="desc">
<a-input placeholder="请选择地区" v-model="form.desc" />
</a-form-model-item>-->
</a-form-model-item>
<a-form-model-item label="电话" prop="phone">
<a-input placeholder="请输入电话" v-model="form.phone" />
<a-form-model-item label="电话" prop="desc">
<a-input placeholder="请输入电话" v-model="form.desc" />
</a-form-model-item>
<a-form-model-item label="出生日期" required prop="birthday">
<a-form-model-item label="出生日期" required prop="date1">
<a-date-picker
v-model="form.birthday"
v-model="form.date1"
show-time
type="date"
placeholder="请选择出生日期"
style="width: 100%;"
/>
</a-form-model-item>
<a-form-model-item label="电子邮箱" prop="email">
<a-input placeholder="请输入电子邮箱" v-model="form.email" />
<a-form-model-item label="电子邮箱" prop="desc">
<a-input placeholder="请输入电子邮箱" v-model="form.desc" />
</a-form-model-item>
<a-form-model-item label="1" prop="type">
<a-checkbox value="1" name="type">
@ -103,10 +102,10 @@
</a-form-model-item>
</a-form-model>
<div class="d-flex btnDiv">
<div type="primary" style="width: 100%;margin-bottom: 10px" class="dialogButton primary f_12" @click="handuser()">修改信息</div>
<div type="primary" style="width: 100%;margin-bottom: 10px" class="dialogButton primary f_12">修改信息</div>
</div>
<a @click="handleChangePassword(form.username)" class="xgmm"> 更改密码?</a>
<!-- <a-modal v-model="visible1" title="更改密码" @ok="handleOk" @cancel="handleCancel">
<a @click="show" class="xgmm"> 更改密码?</a>
<a-modal v-model="visible1" title="更改密码" @ok="handleOk" @cancel="handleCancel">
<a-form-model
ref="ruleForm1"
:model="form1"
@ -119,7 +118,7 @@
<a-input placeholder="请输入新密码" v-model="form.desc" />
</a-form-model-item>
</a-form-model>
</a-modal>-->
</a-modal>
</div>
</div>
<div class="orderList" >
@ -156,10 +155,8 @@
</div>
</div>
</div>
<password-modal ref="passwordmodal" @ok="passwordModalOk"></password-modal>
<Footer></Footer>
</div>
</template>
<script>
import Header from "../components/Header/HeaderView";
@ -167,10 +164,9 @@
import {mapGetters} from 'vuex'
import { getFileAccessHttpUrl} from "@/api/manage"
import { httpAction, getAction } from '@/api/manage'
import PasswordModal from '../../system/modules/PasswordModal'
export default {
name: "gerenzhongxin",
components: { Header,Footer,PasswordModal },
components: { Header,Footer },
data() {0
return {
model:{
@ -230,25 +226,20 @@
url: {
list: "/starehouse/starehouse/list",
getusername: "/sys/user/getusername",
findgoods: "/sys/user/findgoods",
getneeduser: "/getuserpersion/getneeduser",
updateneeduser: "/getuserpersion/updateneeduser",
findgoods: "/sys/user/findgoods"
},
labelCol: { span: 3 },
wrapperCol: { span: 21 },
other: '',
/*form: {
realname: '',
sex: '',
birthday: '',
email: '',
phone: '',
form: {
name: '',
region: undefined,
date1: undefined,
delivery: false,
type: [],
resource: '',
desc: '',
},*/
form: {
},
form1: {
name: '',
@ -260,24 +251,24 @@
desc: '',
},
rules: {
/*name: [
name: [
{ required: true, message: 'Please input Activity name', trigger: 'blur' },
{ min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
],
region: [{ required: true, message: 'Please select Activity zone', trigger: 'change' }],
date1: [{ required: true, message: 'Please pick a date', trigger: 'change' }],*/
date1: [{ required: true, message: 'Please pick a date', trigger: 'change' }],
type: [
{
type: 'array',
required: true,
message: '请选择',
message: 'Please select at least one activity type',
trigger: 'change',
},
],
/*resource: [
resource: [
{ required: true, message: 'Please select activity resource', trigger: 'change' },
],
desc: [{ required: true, message: 'Please input activity form', trigger: 'blur' }],*/
desc: [{ required: true, message: 'Please input activity form', trigger: 'blur' }],
},
visible1: false,
@ -287,7 +278,6 @@
created() {
this.getusername();
this.getallgoods();
this.getneeduser();
},
mounted() {
@ -297,14 +287,11 @@
}
},
methods: {
passwordModalOk() {
//TODO 密码修改完成 不需要刷新页面，可以把datasource中的数据更新一下
},
handleCancel(e) {
this.visible1 = false;
},
handleChangePassword(username) {
this.$refs.passwordmodal.show(username);
show() {
this.visible1 = true;
},
handleOk(e) {
console.log(e);
@ -336,31 +323,12 @@
getAction(this.url.getusername).then((res) => {
if(res.success) {
this.model.username1 = res.result;
console.log(res.message)
this.visible = true;
} else {
}
});
},
getneeduser(){
getAction(this.url.getneeduser).then((res) => {
if(res.success) {
this.form = res.result;
this.visible = true;
} else {
}
});
},
handuser(){
getAction(this.url.updateneeduser,{form: JSON.stringify(this.form)}).then((res) => {
if(res.success) {
console.log("-----------------------")
this.loadData(1);
} else {
}
});
},
...mapGetters(["nickname", "avatar", "userInfo", "addRouters", "username", "permissionList"]),
//获取用户头像
getAvatar(){

5
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
Unescape View File

@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import org.jeecg.modules.orderbymakeclothplan.pojo.ZyOrder;
import org.jeecg.modules.system.entity.SysUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -174,8 +173,4 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
//根据id获取用户
@Select("select * from sys_user where id=#{needid}")
SysUser getneeduser(String needid);
//个人中心我的账户修改个人信息
@Update("UPDATE sys_user SET realname = #{realname},sex=#{sex},birthday=#{birthday},phone=#{phone},email=#{email} WHERE id = #{id} ")
void updateneed(String id, String sex, String birthday, String realname, String phone, String email);
}

3
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
Unescape View File

@ -269,7 +269,4 @@ public interface ISysUserService extends IService<SysUser> {
SysUser getuser();
SysUser getneeduser(String id);
void updateneed(String id, String sex, String birthday, String realname, String phone, String email);
}

10
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
Unescape View File

@ -578,14 +578,4 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
return sysUser;
}
@Override
public SysUser getneeduser(String id) {
return userMapper.getneeduser(id);
}
@Override
public void updateneed(String id, String sex, String birthday, String realname, String phone, String email) {
userMapper.updateneed(id,sex,birthday,realname,phone,email);
}
}

Write Preview
Loading…
Cancel
Save