diff --git a/src/api/user.js b/src/api/user.js index 84168f7..e65dc72 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -194,8 +194,8 @@ export function userLstApi11(id) { return request.get(`user/partner/${id}`) } -export function userLstApi12(data) { - return request.post(`user/partner/${data.uid}`,data) +export function userLstApi12(data,uid) { + return request.post(`user/partner/${uid}`,data) } /** * @description 用户列表 -- 设置分组 diff --git a/src/libs/settingMer.js b/src/libs/settingMer.js index 7dafe5e..8038174 100644 --- a/src/libs/settingMer.js +++ b/src/libs/settingMer.js @@ -9,7 +9,8 @@ // +---------------------------------------------------------------------- import Cookies from "js-cookie"; // 请求接口地址 如果没有配置自动获取当前网址路径 -const VUE_APP_API_URL = 'https://b2b2c.njrenzhou.cn' +// const VUE_APP_API_URL = 'https://b2b2c.njrenzhou.cn' +const VUE_APP_API_URL = 'https://shop.freelycar.cn' const VUE_APP_WS_URL = process.env.VUE_APP_WS_URL || (location.protocol === 'https:' ? 'wss' : 'ws') + ':' + location.hostname const login_title = Cookies.get('MerInfo') ? JSON.parse(Cookies.get('MerInfo')).login_title : '' const SettingMer = { diff --git a/src/views/user/list/index.vue b/src/views/user/list/index.vue index 0c77764..0e61b7a 100644 --- a/src/views/user/list/index.vue +++ b/src/views/user/list/index.vue @@ -269,6 +269,11 @@ + + + @@ -307,7 +312,7 @@ 设置用户合作方角色 - 修改推荐人 + 修改辅导员 修改密码 @@ -572,10 +577,10 @@ export default { handleTypeChange4(value) { var dd = { user_role_id: this.sel, - uid: this.uid2 + uid: this.uid2.uid } - userLstApi12(dd).then(res => { + userLstApi12(dd,this.uid2.uid).then(res => { this.dialogVisible = false // 关闭对话框 this.$message.success('成功') }).catch(res => { @@ -828,7 +833,7 @@ export default { }, wmc(value) { this.dialogVisible = true - this.uid2 = val + this.uid2 = value userLstApi11(value.uid).then(res => { this.ulist = res.data.option this.sel = res.data.partner_id @@ -852,7 +857,7 @@ export default { giveMember(row) { this.$modalForm(giveMemberApi(row.uid)).then(() => this.getList('')) }, - // 修改推荐人 + // 修改辅导员 setModify(row) { this.$modalForm(modifyUserReferrer(row.uid)).then(({ message }) => { this.getList('') diff --git a/src/views/user/list2/index.vue b/src/views/user/list2/index.vue index 2ccbb79..07182bd 100644 --- a/src/views/user/list2/index.vue +++ b/src/views/user/list2/index.vue @@ -47,7 +47,7 @@