diff --git a/admin/.env.development b/admin/.env.development index 89af61d..e5876da 100644 --- a/admin/.env.development +++ b/admin/.env.development @@ -1 +1,3 @@ -VUE_APP_API_BASE_URL=http://agent.admin.haodian.cn/api +VUE_APP_API_BASE_URL=/api +URL = http://agent.admin.haodian.cn +PORT = 8100 diff --git a/admin/src/api/auto/index.js b/admin/src/api/auto/index.js new file mode 100644 index 0000000..964d480 --- /dev/null +++ b/admin/src/api/auto/index.js @@ -0,0 +1,22 @@ +import request from '@/utils/request'; + +export async function pageBrand(params) { + const res = await request.get('/common/autoBrand', { + params + }); + return res.data; +} + +export async function pageSeries(params) { + const res = await request.get('/common/autoSeries', { + params + }); + return res.data; +} + +export async function pageAutoCar(params) { + const res = await request.get('/common/autoCar', { + params + }); + return res.data; +} diff --git a/admin/src/components/CarSelector/index.vue b/admin/src/components/CarSelector/index.vue new file mode 100644 index 0000000..41a0223 --- /dev/null +++ b/admin/src/components/CarSelector/index.vue @@ -0,0 +1,214 @@ + + + + + diff --git a/admin/src/views/car/product/components/edit.vue b/admin/src/views/car/product/components/edit.vue index db27517..8c93d2b 100644 --- a/admin/src/views/car/product/components/edit.vue +++ b/admin/src/views/car/product/components/edit.vue @@ -39,6 +39,11 @@ class="ele-fluid" /> + { @@ -213,6 +221,9 @@ }); }); }, + handleCarChange(carInfo) { + this.form.selectedCar = carInfo; + }, /* 更新visible */ updateVisible(value) { this.$emit('update:visible', value); diff --git a/admin/src/views/car/product/index.vue b/admin/src/views/car/product/index.vue index 836fb80..de9eb39 100644 --- a/admin/src/views/car/product/index.vue +++ b/admin/src/views/car/product/index.vue @@ -13,6 +13,14 @@ /> + + +
+ + + diff --git a/pingan/src/config/setting.js b/pingan/src/config/setting.js index 8ea83f4..f043239 100644 --- a/pingan/src/config/setting.js +++ b/pingan/src/config/setting.js @@ -18,7 +18,7 @@ export const HIDE_FOOTERS = [ export const REPEATABLE_TABS = []; // 不需要登录的路由 -export const WHITE_LIST = ['/login', '/forget']; +export const WHITE_LIST = ['/login', '/register']; // 开启 KeepAlive 后仍然不需要缓存的路由地址 export const KEEP_ALIVE_EXCLUDES = []; diff --git a/pingan/src/layout/components/header-tools.vue b/pingan/src/layout/components/header-tools.vue index e338ba4..5a67a1b 100644 --- a/pingan/src/layout/components/header-tools.vue +++ b/pingan/src/layout/components/header-tools.vue @@ -26,7 +26,7 @@
- {{ loginUser.nickname }} + {{ loginUser.username }}
+ + diff --git a/pingan/src/views/result/fail/index.vue b/pingan/src/views/result/fail/index.vue deleted file mode 100644 index 910a849..0000000 --- a/pingan/src/views/result/fail/index.vue +++ /dev/null @@ -1,50 +0,0 @@ - - - - - diff --git a/pingan/src/views/result/success/index.vue b/pingan/src/views/result/success/index.vue deleted file mode 100644 index 6b56b15..0000000 --- a/pingan/src/views/result/success/index.vue +++ /dev/null @@ -1,27 +0,0 @@ - - - diff --git a/pingan/src/views/system/login-record/index.vue b/pingan/src/views/system/login-record/index.vue index 4d3ea32..1586ac2 100644 --- a/pingan/src/views/system/login-record/index.vue +++ b/pingan/src/views/system/login-record/index.vue @@ -70,8 +70,8 @@ minWidth: 110 }, { - prop: 'nickname', - label: '用户名', + prop: 'mobile', + label: '手机号', sortable: 'custom', showOverflowTooltip: true, minWidth: 110 diff --git a/pingan/src/views/user/profile/index.vue b/pingan/src/views/user/profile/index.vue index 9a8d873..de29d9c 100644 --- a/pingan/src/views/user/profile/index.vue +++ b/pingan/src/views/user/profile/index.vue @@ -11,36 +11,6 @@
- -
- -
-
标签
-
@@ -115,66 +85,6 @@ - - - @@ -253,7 +163,7 @@ }, created() { Object.assign(this.form, this.loginUser, { - tellPre: '0752', + tellPre: '', tell: '' }); }, diff --git a/pingan/vue.config.js b/pingan/vue.config.js index 411d92b..f6adb03 100644 --- a/pingan/vue.config.js +++ b/pingan/vue.config.js @@ -2,6 +2,16 @@ const CompressionWebpackPlugin = require('compression-webpack-plugin'); const { transformElementScss } = require('ele-admin/lib/utils/dynamic-theme'); module.exports = { + devServer: { + port: process.env.PORT || 8200, + proxy: { + '/pingan': { + target: process.env.URL, + changeOrigin: true, + pathRewrite: { '^/pingan/common': '/common' } //路由重写调用公共方法 + } + } + }, productionSourceMap: false, transpileDependencies: ['element-ui', 'ele-admin', 'vue-i18n'], configureWebpack: {