Compare commits

..

No commits in common. '78db8d861196fc9d52f67ad91bc0b89f6e37e2a1' and '306e0d0da260ecf0f7e7f423eaf060356538546d' have entirely different histories.

  1. 4
      src/api/user.js
  2. 3
      src/libs/settingMer.js
  3. 15
      src/views/user/list/index.vue
  4. 2
      src/views/user/list2/index.vue

@ -194,8 +194,8 @@ export function userLstApi11(id) {
return request.get(`user/partner/${id}`) return request.get(`user/partner/${id}`)
} }
export function userLstApi12(data,uid) { export function userLstApi12(data) {
return request.post(`user/partner/${uid}`,data) return request.post(`user/partner/${data.uid}`,data)
} }
/** /**
* @description 用户列表 -- 设置分组 * @description 用户列表 -- 设置分组

@ -9,8 +9,7 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
import Cookies from "js-cookie"; 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 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 login_title = Cookies.get('MerInfo') ? JSON.parse(Cookies.get('MerInfo')).login_title : ''
const SettingMer = { const SettingMer = {

@ -269,11 +269,6 @@
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="推荐人" min-width="140"> <el-table-column label="推荐人" min-width="140">
<template slot-scope="{row}">
<span>{{ row.spread2 ? row.spread2.nickname + ' / ' + row.spread2.uid : '-' }}</span>
</template>
</el-table-column>
<el-table-column label="辅导员" min-width="140">
<template slot-scope="{row}"> <template slot-scope="{row}">
<span>{{ row.spread ? row.spread.nickname + ' / ' + row.spread.uid : '-' }}</span> <span>{{ row.spread ? row.spread.nickname + ' / ' + row.spread.uid : '-' }}</span>
</template> </template>
@ -312,7 +307,7 @@
<!-- </el-dropdown-item>--> <!-- </el-dropdown-item>-->
<el-dropdown-item @click.native="wmc(scope.row)">设置用户合作方角色 <el-dropdown-item @click.native="wmc(scope.row)">设置用户合作方角色
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setModify(scope.row)">修改辅导员 <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setModify(scope.row)">修改推荐人
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setPassword(scope.row)">修改密码 <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setPassword(scope.row)">修改密码
</el-dropdown-item> </el-dropdown-item>
@ -577,10 +572,10 @@ export default {
handleTypeChange4(value) { handleTypeChange4(value) {
var dd = { var dd = {
user_role_id: this.sel, user_role_id: this.sel,
uid: this.uid2.uid uid: this.uid2
} }
userLstApi12(dd,this.uid2.uid).then(res => { userLstApi12(dd).then(res => {
this.dialogVisible = false // this.dialogVisible = false //
this.$message.success('成功') this.$message.success('成功')
}).catch(res => { }).catch(res => {
@ -833,7 +828,7 @@ export default {
}, },
wmc(value) { wmc(value) {
this.dialogVisible = true this.dialogVisible = true
this.uid2 = value this.uid2 = val
userLstApi11(value.uid).then(res => { userLstApi11(value.uid).then(res => {
this.ulist = res.data.option this.ulist = res.data.option
this.sel = res.data.partner_id this.sel = res.data.partner_id
@ -857,7 +852,7 @@ export default {
giveMember(row) { giveMember(row) {
this.$modalForm(giveMemberApi(row.uid)).then(() => this.getList('')) this.$modalForm(giveMemberApi(row.uid)).then(() => this.getList(''))
}, },
// //
setModify(row) { setModify(row) {
this.$modalForm(modifyUserReferrer(row.uid)).then(({ message }) => { this.$modalForm(modifyUserReferrer(row.uid)).then(({ message }) => {
this.getList('') this.getList('')

@ -47,7 +47,7 @@
<el-table-column label=" 角色代理类型" min-width="100"> <el-table-column label=" 角色代理类型" min-width="100">
<template slot-scope="{row}"> <template slot-scope="{row}">
<span>{{ <span>{{
row.type == '1' ? '全部' : row.type == '2' ? '区' : row.type == '3' ? '品牌' : row.type == '4' ? '行业' : '无' row.type == '1' ? '全部' : row.type == '2' ? '区' : row.type == '3' ? '品牌' : row.type == '4' ? '行业' : '无'
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>

Loading…
Cancel
Save