diff --git a/src/api/userinfo.js b/src/api/userinfo.js index 8c336b5..07fdcef 100644 --- a/src/api/userinfo.js +++ b/src/api/userinfo.js @@ -85,11 +85,20 @@ export function getPointDetailApi (data) { data: data, }); } -// 登录状态账号设置修改密码 +// 老的登录状态账号设置修改密码 + +// export function setUserPswApi (data) { +// return request({ +// url: "/yishoudan/changePassword", +// method: "post", +// data: setqs(data), +// }); +// } +// 新的登录状态账号设置修改密码 export function setUserPswApi (data) { return request({ - url: "/yishoudan/changePassword", + url: "/yishoudan/updatePasswordByPwd", method: "post", data: setqs(data), }); diff --git a/src/components/main/index.vue b/src/components/main/index.vue index e344642..bf1e274 100644 --- a/src/components/main/index.vue +++ b/src/components/main/index.vue @@ -116,7 +116,7 @@ -->
- powered by + Powered by ｜Copyright © 2015-2023 Bocai. All Rights Reserved.｜ diff --git a/src/components/userinfo/accountsetting/components/loginpsw.vue b/src/components/userinfo/accountsetting/components/loginpsw.vue index d3bbc49..266f933 100644 --- a/src/components/userinfo/accountsetting/components/loginpsw.vue +++ b/src/components/userinfo/accountsetting/components/loginpsw.vue @@ -40,22 +40,7 @@ - + @@ -90,6 +75,7 @@ export default { components: { updatepsw, }, + inject: ['logout'], // 组件参数 接收来自父组件的数据 props: { userinfo: { @@ -111,13 +97,16 @@ export default { computed: {}, // 侦听器 watch: { - userinfo() { - this.$nextTick(() => { - console.log(this.userinfo) + userinfo: { + handler() { + this.$nextTick(() => { + console.log(this.userinfo) - // this.username = this.userinfo.tel; - console.log(this.username) - }) + // this.username = this.userinfo.tel; + console.log(this.username) + }) + }, + immediate: true, }, }, // 生命周期钩子 注：没用到的钩子请自行删除 @@ -143,9 +132,9 @@ export default { console.log(values) if (!err) { this.btnLoading = true - params.repassword = values.repassword - params.newpassword = values.newpassword - params.password = values.password + params.tel = this.userinfo.tel + params.password = values.newpassword + params.oldPassword = values.password try { const { data } = await setUserPswApi(params) console.log(data) @@ -154,7 +143,7 @@ export default { this.$message.success('密码修改成功') this.btnLoading = false this.form.resetFields() - + this.logout() // this.reload() }, 1000) } else { diff --git a/src/components/userinfo/usercenter/components/dataStatistics.vue b/src/components/userinfo/usercenter/components/dataStatistics.vue index e895add..9ff60ac 100644 --- a/src/components/userinfo/usercenter/components/dataStatistics.vue +++ b/src/components/userinfo/usercenter/components/dataStatistics.vue @@ -679,7 +679,7 @@ export default { created() { this.contentListSearchForm.start = moment().add(-0, 'd').format('YYYY-MM-DD') this.contentListSearchForm.end = moment().format('YYYY-MM-DD') - this.billList = [...this.billList, ...this.billList, ...this.billList] + // this.billList = [...this.billList, ...this.billList, ...this.billList] tableWidth(this, this.columns, 120) console.log(this.currWidth) this.$emit('setTitle', '团队数据') @@ -745,7 +745,7 @@ export default { end = moment().format('YYYY-MM-DD') } else if (tag == 2) { that.checked2 = true - start = moment().startOf('week').format('YYYY-MM-DD') + start = moment().startOf('week').weekday(-1).format('YYYY-MM-DD') end = moment().format('YYYY-MM-DD') } else if (tag == 3) { that.checked3 = true @@ -829,8 +829,6 @@ export default { console.log(item) console.log(index) }) - console.log(this.contentListSearchForm.start) - console.log(this.contentListSearchForm.end) console.log(newList) if (this.menuType == 'group') { console.log('isgroup') diff --git a/src/components/userinfo/usercenter/components/townsman.vue b/src/components/userinfo/usercenter/components/townsman.vue index 35f8205..c2f6909 100644 --- a/src/components/userinfo/usercenter/components/townsman.vue +++ b/src/components/userinfo/usercenter/components/townsman.vue @@ -36,7 +36,7 @@
- + {{ text }} 详情 @@ -152,72 +152,11 @@
-
- {{ item.desp }} +
+ - - - - 姓名： - - - {{ currentBillInfo.userName }} - /{{ currentBillInfo.sex == "1" || currentBillInfo.sex == "男" ? "男" : "女" }} - /{{ currentBillInfo.age }}岁 - /{{ currentBillInfo.nation }} - - - - - 电话： - - - {{ currentBillInfo.tel == "" || currentBillInfo.tel == null || currentBillInfo.tel == "undefined" ? "-" : currentBillInfo.tel }} - - - - - 身份证号： - - - {{ currentBillInfo.idCard == "" || currentBillInfo.idCard == null || currentBillInfo.idCard == "undefined" ? "-" : currentBillInfo.idCard }} - - - - - 家庭住址： - - - {{ currentBillInfo.address == "" || currentBillInfo.address == null || currentBillInfo.address == "undefined" ? "-" : currentBillInfo.address }} - - - -
- - - 报名岗位： - - - {{ currentBillInfo.storeJobName || "-" }} - - - - - 政策： - - - {{ currentBillInfo.policy || "-" }} - - - - - - 复制文本 - - -
{{ item.creator }} @@ -228,7 +167,67 @@
+ + + + 姓名： + + + {{ currentBillInfo.userName }} + /{{ currentBillInfo.sex == "1" || currentBillInfo.sex == "男" ? "男" : "女" }} + /{{ currentBillInfo.age }}岁 + /{{ currentBillInfo.nation }} + + + + + 电话： + + + {{ currentBillInfo.tel == "" || currentBillInfo.tel == null || currentBillInfo.tel == "undefined" ? "-" : currentBillInfo.tel }} + + + + + 身份证号： + + + {{ currentBillInfo.idCard == "" || currentBillInfo.idCard == null || currentBillInfo.idCard == "undefined" ? "-" : currentBillInfo.idCard }} + + + + + 家庭住址： + + + {{ currentBillInfo.address == "" || currentBillInfo.address == null || currentBillInfo.address == "undefined" ? "-" : currentBillInfo.address }} + + +
+ + + 报名岗位： + + + {{ currentBillInfo.storeJobName || "-" }} + + + + + 政策： + + + {{ currentBillInfo.policy || "-" }} + + + + + + 复制文本 + + +
老乡信息
@@ -772,7 +771,7 @@ export default { console.log(this.allOrders) this.allOrders.forEach((item1, index) => { this.replaceIndex(item1, index) - console.log(item1) + // console.log(item1) for (var key in item1.records) { // console.log(key, item1.records[key]); item1.records[key].forEach((item, index) => { @@ -809,7 +808,7 @@ export default { } }) console.log(this.allOrders) - this.allOrders = this.allOrders.reverse() + // this.allOrders = this.allOrders.reverse() }) this.getTownsmanImg(e) }, diff --git a/src/views/main.vue b/src/views/main.vue index 3f4d842..4ff826d 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -52,7 +52,7 @@
-
+
- powered by + Powered by ｜Copyright © 2015-2023 Bocai. All Rights Reserved.｜ @@ -291,6 +291,7 @@ export default { provide() { return { getJobList: this.getJobList, + logout: this.logout, } }, // 组件名称 diff --git a/src/views/merchantBack.vue b/src/views/merchantBack.vue index 5289629..7d39f3b 100644 --- a/src/views/merchantBack.vue +++ b/src/views/merchantBack.vue @@ -95,7 +95,7 @@ - powered by + Powered by ｜Copyright © 2015-2023 Bocai. All Rights Reserved.｜ diff --git a/src/views/userinfo.vue b/src/views/userinfo.vue index 4d750cd..9d37636 100644 --- a/src/views/userinfo.vue +++ b/src/views/userinfo.vue @@ -146,7 +146,7 @@ -->
- powered by + Powered by ｜Copyright © 2015-2023 Bocai. All Rights Reserved.｜