diff --git a/api/userManagement/customer.js b/api/userManagement/customer.js
new file mode 100644
index 0000000..e69de29
diff --git a/api/userManagement/yunSite.js b/api/userManagement/yunSite.js
new file mode 100644
index 0000000..9e68030
--- /dev/null
+++ b/api/userManagement/yunSite.js
@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+export default {
+ // 司机
+ customerRelationSite(data) {
+ return request({
+ url: '/oil-user/oilCustomerChannelRelation/customerRelationSite',
+ method: 'post',
+ data
+ })
+ },
+
+ // 油站渠道
+ getSiteChannelList(data) {
+ return request({
+ url: '/oil-site/oilSiteChannel/getSiteChannelList',
+ method: 'post',
+ data
+ })
+ },
+ // 权限
+ getSiteCloudRoles() {
+ return request({
+ url: '/oil-user/sysRole/getSiteCloudRoles',
+ method: 'get'
+ })
+ },
+ // 修改
+ updateCustomerRelationSite(data) {
+ return request({
+ url: '/oil-user/oilCustomerChannelRelation/updateCustomerRelationSite',
+ method: 'post',
+ data
+ })
+ },
+ // 新增
+ saveCustomerRelationSite(data) {
+ return request({
+ url: '/oil-user/oilCustomerChannelRelation/saveCustomerRelationSite',
+ method: 'post',
+ data
+ })
+ },
+
+}
diff --git a/pages.json b/pages.json
index 0acdbe5..f76a92b 100644
--- a/pages.json
+++ b/pages.json
@@ -414,6 +414,63 @@
}
+ ]
+ },
+ {
+ "root": "userManagement",
+ "pages": [{
+ "path": "customer/index",
+ "style": {
+ "navigationBarTitleText": "客户运营系统用户信息",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "yunSite/index",
+ "style": {
+ "navigationBarTitleText": "星油云站用户信息",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+
+ },
+ {
+ "path": "customer/detail",
+ "style": {
+ "navigationBarBackgroundColor": "#2866FF",
+ "navigationBarTitleText": "用户详情",
+ "enablePullDownRefresh": false
+ }
+
+ },
+
+ {
+ "path": "yunSite/detail",
+ "style": {
+ "navigationBarBackgroundColor": "#2866FF",
+ "navigationBarTitleText": "用户详情",
+ "enablePullDownRefresh": false
+ }
+
+ },
+ {
+ "path": "yunSite/components/serviceStation",
+ "style": {
+ "navigationBarTitleText": "请选择油站",
+ "enablePullDownRefresh": false
+ }
+
+ },
+ {
+ "path": "yunSite/components/auth",
+ "style": {
+ "navigationBarTitleText": "请选择权限",
+ "enablePullDownRefresh": false
+ }
+
+ }
+
]
}
],
diff --git a/pages/index/menu.json b/pages/index/menu.json
index 88ee3ef..2edccf6 100644
--- a/pages/index/menu.json
+++ b/pages/index/menu.json
@@ -132,5 +132,25 @@
"lable":"finance:account:serviceStation"
}
]
+ },
+ {
+ "name":"用户管理",
+ "icon":"iconxiugaiyonghuxinxi",
+ "label":"userManagement",
+ "colorOpen":false,
+ "submenu":[
+ {
+ "icon":"iconxiugaiyonghuxinxi",
+ "name":"客户运营系统",
+ "router":"/userManagement/customer/index",
+ "lable":"management:user:customer"
+ },
+ {
+ "icon":"iconxiugaiyonghuxinxi",
+ "name":"星油云站",
+ "router":"/userManagement/yunSite/index",
+ "lable":"management:user:yunSite"
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/userManagement/customer/detail.vue b/userManagement/customer/detail.vue
new file mode 100644
index 0000000..9a3cc63
--- /dev/null
+++ b/userManagement/customer/detail.vue
@@ -0,0 +1,177 @@
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 用户权限信息
+
+
+
+
+
+
+
+
+
+
+
+
+ 星油云站超级管理员
+
+
+
+
+
+
+ 修改
+ 保存
+
+
+
+
+
+
+
diff --git a/userManagement/customer/index.vue b/userManagement/customer/index.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/userManagement/customer/index.vue
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/userManagement/yunSite/components/auth.vue b/userManagement/yunSite/components/auth.vue
new file mode 100644
index 0000000..958f07d
--- /dev/null
+++ b/userManagement/yunSite/components/auth.vue
@@ -0,0 +1,188 @@
+
+
+
+
+
+
+
+
+ {{item.roleName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/userManagement/yunSite/components/serviceStation.vue b/userManagement/yunSite/components/serviceStation.vue
new file mode 100644
index 0000000..296d5fb
--- /dev/null
+++ b/userManagement/yunSite/components/serviceStation.vue
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+ {{item.otherSiteName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/userManagement/yunSite/detail.vue b/userManagement/yunSite/detail.vue
new file mode 100644
index 0000000..3256f89
--- /dev/null
+++ b/userManagement/yunSite/detail.vue
@@ -0,0 +1,338 @@
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 用户权限信息
+
+
+
+
+
+ {{postData.siteName}}
+ 选择油站渠道
+
+
+
+
+
+
+
+
+ {{item.roleName}}
+
+ 选择所属权限
+
+
+
+
+
+
+ 修改
+ 保存
+
+
+
+
+
+
+
diff --git a/userManagement/yunSite/index.vue b/userManagement/yunSite/index.vue
new file mode 100644
index 0000000..66b3d89
--- /dev/null
+++ b/userManagement/yunSite/index.vue
@@ -0,0 +1,255 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.customerName ||'暂无' }}
+
+
+ {{item.phone || '暂无'}}
+
+
+
+ {{item.siteName ||'暂无'}}
+
+
+
+
+
+ {{item.customerId}}
+ {{item.updateTime}}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/request.js b/utils/request.js
index e5be27e..1295dd6 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -3,10 +3,10 @@ import utils from '@/utils/encode'
// const env = process.env.NODE_ENV
// const env = 'test'
const env = 'test'
-const testUrl = 'http://192.168.1.83:38080'
+const testUrl = 'http://192.168.1.85:38080'
// const productUrl = 'https://www.xingoil.com/adminapi'
// const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new
-// const productUrl = 'http://uat.xingoil.com/adminapi'
+const productUrl = 'http://uat.xingoil.com/adminapi'
const service = axios.create({
baseURL: env == 'production' ? productUrl : testUrl,