diff --git a/src/pages/user/AccountManagementModify.vue b/src/pages/user/AccountManagementModify.vue new file mode 100644 index 0000000..250a874 --- /dev/null +++ b/src/pages/user/AccountManagementModify.vue @@ -0,0 +1,244 @@ + + + + + + diff --git a/src/pages/user/AccountManager.vue b/src/pages/user/AccountManager.vue index 6a97e51..8f1c25d 100644 --- a/src/pages/user/AccountManager.vue +++ b/src/pages/user/AccountManager.vue @@ -29,12 +29,11 @@

确定要删除此账户吗？删除后不可恢复

- +
@@ -122,7 +121,20 @@ }, on: { click: () => { - that.addOneAccount(); + this.$router.push({ + path: '/account/management/modify', + query: { + accountId: params.row.accountId, + userId: params.row.userId, + userName: params.row.userName, + account: params.row.account, + password: params.row.password, + confirmPassword: params.row.confirmPassword, + roleId: params.row.roleId, + roleCode: params.row.roleCode, + shopId: params.row.shopId, + } + }); } } }, '修改'), @@ -182,11 +194,13 @@ }, //添加单个账户 addOneAccount() { - this.$router.push({path: '/account/management/add'}); + this.$router.push({ + path: '/account/management/add', + }); }, //导入账户 uploadAccount() { - this.$router.push({path: '/account/management/upload'}); + this.$router.push({path: '/account/upload'}); }, //查询所有角色 listRoleInfo() { @@ -312,13 +326,15 @@ } }) }, - }, - cancel() { + cancel() { + }, + ok() { + this.modal13 = false; + this.remove(); + } }, - ok() { - this.remove(); - } + } diff --git a/src/pages/user/AccountManagerAdd.vue b/src/pages/user/AccountManagerAdd.vue index 59586b0..2307a48 100644 --- a/src/pages/user/AccountManagerAdd.vue +++ b/src/pages/user/AccountManagerAdd.vue @@ -1,68 +1,71 @@ @@ -70,179 +73,194 @@ diff --git a/src/pages/user/AccountManagerUpload.vue b/src/pages/user/AccountManagerUpload.vue index 1e52178..8de4534 100644 --- a/src/pages/user/AccountManagerUpload.vue +++ b/src/pages/user/AccountManagerUpload.vue @@ -9,7 +9,7 @@ + action="" :data="data" :on-success="upSuccess" :on-error="upError">

将文件拖拽到此区域

@@ -45,7 +45,7 @@ upSuccess(response, res, file) { console.log("1111"); if (!response.results) { - this.$message.info("上传成功,店铺已添加") + this.$message.info("上传成功,账户已添加") } else { let data = response.results; this.data1 = data; diff --git a/src/router/index.js b/src/router/index.js index 6b3ba48..8ef7c34 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -5,6 +5,7 @@ import ExternalContact from '@/pages/ExternalContact'; import Home from '@/pages/Home'; import AccountManager from '@/pages/user/AccountManager'; import AccountManagerAdd from '@/pages/user/AccountManagerAdd'; +import AccountManagementModify from '@/pages/user/AccountManagementModify'; import AccountManagerUpload from '@/pages/user/AccountManagerUpload'; import RoleManager from '@/pages/user/RoleManager'; import IncreaseManager from '@/pages/shop/IncreaseManager'; @@ -54,7 +55,12 @@ const router = new Router({ component: AccountManagerAdd }, { - path: '/account/management/upload', + path: '/account/management/modify', + name: 'AccountManagementModify', + component: AccountManagementModify + }, + { + path: '/account/upload', name: 'AccountManagerUpload', component: AccountManagerUpload }, diff --git a/src/services/account/AccountManagementAdd.js b/src/services/account/AccountManagementAdd.js index 1c34719..b2b4650 100644 --- a/src/services/account/AccountManagementAdd.js +++ b/src/services/account/AccountManagementAdd.js @@ -15,6 +15,17 @@ export function listShopApi(params, call) { return http.get('account/shop/list', params).then(call); } +/** + * 保存账号 + * @param params + * @param call + * @returns {Promise} + */ +export function saveAccountInputApi(params, call) { + return http.post('account/save', params).then(call); +} + export default { - listShopApi + listShopApi, + saveAccountInputApi } diff --git a/src/services/account/AccountManagementModify.js b/src/services/account/AccountManagementModify.js new file mode 100644 index 0000000..287016a --- /dev/null +++ b/src/services/account/AccountManagementModify.js @@ -0,0 +1,30 @@ +/** + * 修改账号 + * @author jinchaofan + * @date 2020/2/18 + */ +import http from '../CommonHttp' + +/** + * 修改账号 + * @param params + * @param call + * @returns {Promise} + */ +export function modifyAccountApi(params, call) { + return http.post('account/modify', params).then(call); +} +/** + * 查询所有店铺 + * @param params + * @param call + * @returns {Promise} + */ +export function listShopApi(params, call) { + return http.get('/poi/store/all/list', params).then(call); +} + +export default { + modifyAccountApi, + listShopApi +}