diff --git a/package.json b/package.json index 315bbb1..a5db5c5 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "scripts": { "serve": "vue-cli-service serve", - "build": "vue-cli-service build", + "build": "export NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build", "test:unit": "vue-cli-service test:unit", "lint": "export NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service lint", "build:preview": "vue-cli-service build --mode preview", diff --git a/src/api/dealer/apply.js b/src/api/dealer/apply.js index f92cdea..afea8e1 100644 --- a/src/api/dealer/apply.js +++ b/src/api/dealer/apply.js @@ -2,7 +2,8 @@ import { axios } from '@/utils/request' const api = { list: '/dealer.apply/list', - audit: '/dealer.apply/audit' + audit: '/dealer.apply/audit', + checkProviders: '/dealer.apply/checkProviders' } /** @@ -28,3 +29,11 @@ export function audit (data) { data }) } + +export function checkProviders (data) { + return axios({ + url: api.checkProviders, + method: 'post', + data + }) +} diff --git a/src/config/router.config.js b/src/config/router.config.js index cfc118a..b5f01a1 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -887,11 +887,11 @@ export const asyncRouterMap = [ moduleKey: 'apps-dealer', isHideChildren: true, children: [ - // { - // path: '/apps/dealer/apply', - // component: () => import(/* webpackChunkName: "dealer" */ '@/views/apps/dealer/apply/Index'), - // meta: { title: '入驻申请', keepAlive: false, permission: ['/apps/dealer/apply'] } - // }, + { + path: '/apps/dealer/apply', + component: () => import(/* webpackChunkName: "dealer" */ '@/views/apps/dealer/apply/Index'), + meta: { title: '入驻申请', keepAlive: false, permission: ['/apps/dealer/apply'] } + }, { path: '/apps/dealer/user', component: () => import(/* webpackChunkName: "dealer" */ '@/views/apps/dealer/user/Index'), diff --git a/src/views/apps/dealer/apply/modules/AuditForm.vue b/src/views/apps/dealer/apply/modules/AuditForm.vue index cd9715c..ce12dae 100644 --- a/src/views/apps/dealer/apply/modules/AuditForm.vue +++ b/src/views/apps/dealer/apply/modules/AuditForm.vue @@ -27,6 +27,7 @@ diff --git a/src/views/apps/dealer/user/modules/EditForm.vue b/src/views/apps/dealer/user/modules/EditForm.vue index c0f5459..2b43a33 100644 --- a/src/views/apps/dealer/user/modules/EditForm.vue +++ b/src/views/apps/dealer/user/modules/EditForm.vue @@ -16,14 +16,14 @@ - + @@ -50,8 +50,8 @@ export default { form: this.$form.createForm(this), // 当前记录 record: {}, - //身份 - typeList: [], + // 身份 + typeList: [] } }, methods: { @@ -63,7 +63,7 @@ export default { this.record = record // 设置默认值 this.setFieldsValue() - //类别 + // 类别 this.getTypeList() }, @@ -71,13 +71,13 @@ export default { setFieldsValue() { const { record, - form: { setFieldsValue }, + form: { setFieldsValue } } = this this.$nextTick(() => { setFieldsValue(pick(record, ['real_name', 'mobile', 'type'])) }) }, - //获取身份 + // 获取身份 getTypeList() { Api.typeList() .then((result) => { @@ -90,7 +90,7 @@ export default { e.preventDefault() // 表单验证 const { - form: { validateFields }, + form: { validateFields } } = this validateFields((errors, values) => { // 提交到后端api @@ -117,7 +117,7 @@ export default { this.$emit('handleSubmit', values) }) .finally(() => (this.confirmLoading = false)) - }, - }, + } + } } diff --git a/src/views/user/modules/GradeForm.vue b/src/views/user/modules/GradeForm.vue index d286426..7c11029 100644 --- a/src/views/user/modules/GradeForm.vue +++ b/src/views/user/modules/GradeForm.vue @@ -100,16 +100,16 @@ export default { }, { id: 20, - name: 'PLUS会员' + name: '采购商' }, { id: 30, - name: '分销商' - }, - { - id: 40, - name: '店长' + name: '服务商' } + // { + // id: 40, + // name: '店长' + // } ] } }, @@ -192,6 +192,7 @@ export default { // 通知父端组件提交完成了 this.$emit('handleSubmit', values) }) + // eslint-disable-next-line no-return-assign .finally(() => this.confirmLoading = false) } diff --git a/src/views/wholesaler/Apply.vue b/src/views/wholesaler/Apply.vue index 77a1cdc..0a71231 100644 --- a/src/views/wholesaler/Apply.vue +++ b/src/views/wholesaler/Apply.vue @@ -41,8 +41,9 @@ :pagination="false" > - - + +

{{ item.nick_name }}

+

{{ item.mobile }}

{{ item.region.province }}-{{ item.region.city }}

@@ -81,7 +82,7 @@ import { UserItem } from '@/components/Table' // 表格表头 const columns = [ { - title: '采购商信息', + title: '会员信息', dataIndex: 'user', width: '170px', ellipsis: true,