diff --git a/api/userManagement/customer.js b/api/userManagement/customer.js
index 10ebd46..f340506 100644
--- a/api/userManagement/customer.js
+++ b/api/userManagement/customer.js
@@ -49,39 +49,12 @@ export default {
method: 'get',
})
},
-
-
-
-
-
-
-
-
-
-
- // 油站渠道
- getSiteChannelList(data) {
- return request({
- url: '/oil-site/oilSiteChannel/getSiteChannelList',
- method: 'post',
- data
- })
- },
- // 权限
- getSiteCloudRoles() {
+ // 删除
+ deleteByUserId(data) {
return request({
- url: '/oil-user/sysRole/getSiteCloudRoles',
- method: 'get'
- })
- },
-
- // 新增
- saveCustomerRelationSite(data) {
- return request({
- url: '/oil-user/oilCustomerChannelRelation/saveCustomerRelationSite',
+ url: '/oil-user/oilCustomerCompanyRelation/deleteByUserId',
method: 'post',
data
})
},
-
}
diff --git a/api/userManagement/yunSite.js b/api/userManagement/yunSite.js
index 8c1a453..a8058d3 100644
--- a/api/userManagement/yunSite.js
+++ b/api/userManagement/yunSite.js
@@ -41,5 +41,12 @@ export default {
data
})
},
-
+ // 删除
+ removeCustomerRelationSite(data) {
+ return request({
+ url: '/oil-user/oilCustomerChannelRelation/removeCustomerRelationSite',
+ method: 'post',
+ data
+ })
+ },
}
diff --git a/userManagement/customer/detail.vue b/userManagement/customer/detail.vue
index 50b0d2f..4e43d3c 100644
--- a/userManagement/customer/detail.vue
+++ b/userManagement/customer/detail.vue
@@ -79,8 +79,9 @@
- 修改
+ 修改
保存
+ 删除
@@ -98,7 +99,7 @@
postData: {
phone: '',
userName: '',
- password:'',
+ password: '',
sysUserRoleList: [],
oilCompanyInfoList: [],
},
@@ -134,6 +135,28 @@
})
},
methods: {
+ deleteData() {
+ uni.showModal({
+ title: '确定删除吗?',
+ success: res => {
+ if (res.confirm) {
+ serve.deleteByUserId({
+ id: this.postData.id
+ }).then(res => {
+ if (res.code === 20000) {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none'
+ })
+ setTimeout(() => {
+ uni.navigateBack()
+ }, 1500)
+ }
+ })
+ }
+ }
+ })
+ },
getByUserId() {
serve.getByUserId(this.postData.id).then(res => {
this.$set(this.postData, 'sysUserRoleList', res.data.sysUserRoleList)
@@ -159,7 +182,7 @@
WrongText: '请选择所属权限'
}
}
- if(this.isAdd) {
+ if (this.isAdd) {
needCheckMap['password'] = {
tacitly: '',
WrongText: '请输入用户密码'
@@ -344,9 +367,13 @@
color: #fff;
border-radius: 10rpx;
- // &:nth-of-type(2) {
- // margin-top: 50rpx;
- // }
+ &.special {
+ margin-top: 35rpx;
+ }
+
+ &.orange {
+ background: #FF8C00;
+ }
&.red {
background: #EA0000;
diff --git a/userManagement/yunSite/detail.vue b/userManagement/yunSite/detail.vue
index a624717..e64101a 100644
--- a/userManagement/yunSite/detail.vue
+++ b/userManagement/yunSite/detail.vue
@@ -8,7 +8,8 @@
@@ -18,7 +19,8 @@
@@ -35,7 +37,8 @@
@@ -44,24 +47,11 @@
-
@@ -77,17 +67,18 @@
- 修改
+ 修改
保存
+ 删除