From fb27448f50e3353fb4b4567173b145e11acfddc0 Mon Sep 17 00:00:00 2001 From: songyang <972986197@qq.com> Date: Fri, 8 Dec 2023 10:10:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=BB=9F=E4=B8=80=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 28 +-- env/.env.dev | 2 +- src/http/api/equip.ts | 12 +- src/http/api/login/index.ts | 2 +- src/http/api/usercenter/baseinfo.ts | 2 +- src/http/index.ts | 2 +- src/store/user.ts | 6 +- src/views/AppMain.vue | 240 +---------------------- src/views/EnterpriseCertification.vue | 30 --- src/views/user/orderManagement/index.vue | 132 ++++++------- 10 files changed, 78 insertions(+), 378 deletions(-) diff --git a/components.d.ts b/components.d.ts index 1585341..02bd1a8 100644 --- a/components.d.ts +++ b/components.d.ts @@ -13,25 +13,15 @@ declare module 'vue' { ElCascader: typeof import('element-plus/es')['ElCascader'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCol: typeof import('element-plus/es')['ElCol'] -<<<<<<< HEAD -<<<<<<< HEAD -======= ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ->>>>>>> dev-sjf-2023-12-5 -======= - ElCollapseTransition: typeof import('element-plus/es')['ElCollapseTransition'] - ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] - ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ->>>>>>> dev-songyang ElDialog: typeof import('element-plus/es')['ElDialog'] ElDivider: typeof import('element-plus/es')['ElDivider'] - ElDrawer: typeof import('element-plus/es')['ElDrawer'] + ElEmpty: typeof import('element-plus/es')['ElEmpty'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElIcon: typeof import('element-plus/es')['ElIcon'] ElImage: typeof import('element-plus/es')['ElImage'] - ElImg: typeof import('element-plus/es')['ElImg'] ElInput: typeof import('element-plus/es')['ElInput'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] @@ -39,31 +29,15 @@ declare module 'vue' { ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElProgress: typeof import('element-plus/es')['ElProgress'] -<<<<<<< HEAD -<<<<<<< HEAD -======= ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ->>>>>>> dev-sjf-2023-12-5 -======= - ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] - ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ->>>>>>> dev-songyang ElRow: typeof import('element-plus/es')['ElRow'] ElSelect: typeof import('element-plus/es')['ElSelect'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTag: typeof import('element-plus/es')['ElTag'] -<<<<<<< HEAD -<<<<<<< HEAD -======= ElTimeline: typeof import('element-plus/es')['ElTimeline'] ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] ->>>>>>> dev-sjf-2023-12-5 -======= - ElTimeline: typeof import('element-plus/es')['ElTimeline'] - ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] ->>>>>>> dev-songyang ElUpload: typeof import('element-plus/es')['ElUpload'] EquipCard: typeof import('./src/components/equipCard.vue')['default'] EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default'] diff --git a/env/.env.dev b/env/.env.dev index cce7054..61b1421 100644 --- a/env/.env.dev +++ b/env/.env.dev @@ -5,7 +5,7 @@ VITE_BUILD_MODE = 'dev' VITE_API_URL = '/proxyApi' # 开发环境接口地址 -VITE_proxyTarget = 'http://10.40.92.66:9205' #盛旭 +VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭 # VITE_proxyTarget = 'http://10.40.92.185:9200' # 赵福海 (登录) diff --git a/src/http/api/equip.ts b/src/http/api/equip.ts index ffad84d..b63a9b8 100644 --- a/src/http/api/equip.ts +++ b/src/http/api/equip.ts @@ -1,8 +1,8 @@ -import { post,get,put } from '../index' +import { post, get, put } from '../index' // 获取装备列表 export const getList = (params = {}) => { - return post('/dev/list',params) + return post('/zlpt-equip/dev/list', params) } //获取装备详情 @@ -11,14 +11,14 @@ export const getDetail = (id = '') => { } //获取 推荐装备列表 -export const getHotList = (params) => { - return get('/dev/hotList',params) +export const getHotList = (params) => { + return get('/dev/hotList', params) } export const equipCollect = (params = {}) => { - return put('/collect',params) + return put('/collect', params) } export const apiSubmitLease = (params = {}) => { - return post('/details',params) + return post('/details', params) } diff --git a/src/http/api/login/index.ts b/src/http/api/login/index.ts index 5da0441..9d7dbe9 100644 --- a/src/http/api/login/index.ts +++ b/src/http/api/login/index.ts @@ -2,5 +2,5 @@ import { get, post } from '../../index' // 登录接口 export const loginApi = (data: any) => { - return post('/login', data) + return post('/zlpt-auth/login', data) } \ No newline at end of file diff --git a/src/http/api/usercenter/baseinfo.ts b/src/http/api/usercenter/baseinfo.ts index 2c13a9f..8b43886 100644 --- a/src/http/api/usercenter/baseinfo.ts +++ b/src/http/api/usercenter/baseinfo.ts @@ -4,6 +4,6 @@ import { get, post } from '../../index' // 申请企业信息认证接口 export const applyAttestationApi = (data: any) => { - return post('/company_info/addCompanyInfo', data) + return post('/zlpt-company/company_info/addCompanyInfo', data) } diff --git a/src/http/index.ts b/src/http/index.ts index 002484e..37593ba 100644 --- a/src/http/index.ts +++ b/src/http/index.ts @@ -21,7 +21,7 @@ const service = axios.create({ service.interceptors.request.use( (config) => { - config.headers['Authorization'] = VITE_ENV == 'development' && VITE_LocalFlag ? VITE_token : store.token + config.headers['Authorization'] = store.token return config }, (error) => { diff --git a/src/store/user.ts b/src/store/user.ts index dcbfa70..ad5e91a 100644 --- a/src/store/user.ts +++ b/src/store/user.ts @@ -39,13 +39,13 @@ export const useStore = defineStore('myUser', { }, // 获取省份信息 async getprovinceList() { - const res: any = await post('/baseAddress/selectAddress', {}) + const res: any = await post('/zlpt-company/baseAddress/selectAddress', {}) this.provinceList = res.data }, // 获取市级信息 async getmarketList(val: any) { - const res: any = await post('/baseAddress/selectAddress', { code: val }) + const res: any = await post('/zlpt-company/baseAddress/selectAddress', { code: val }) console.log(res, '市区信息'); this.marketList = res.data @@ -53,7 +53,7 @@ export const useStore = defineStore('myUser', { }, // 获取区级信息 async getareaList(val: any) { - const res: any = await post('/baseAddress/selectAddress', { code: val }) + const res: any = await post('/zlpt-company/baseAddress/selectAddress', { code: val }) this.areaList = res.data }, // 获取证件类型 diff --git a/src/views/AppMain.vue b/src/views/AppMain.vue index fbbcd6e..e85b9bc 100644 --- a/src/views/AppMain.vue +++ b/src/views/AppMain.vue @@ -1,12 +1,10 @@ - - diff --git a/src/views/user/orderManagement/index.vue b/src/views/user/orderManagement/index.vue index b233d3f..737b5f3 100644 --- a/src/views/user/orderManagement/index.vue +++ b/src/views/user/orderManagement/index.vue @@ -2,13 +2,9 @@ import { ref } from 'vue' import PagingComponent from 'components/PagingComponent/index.vue' import { useRouter } from 'vue-router' - import { useStore } from 'store/main' import { getOrderListApi } from 'http/api/usercenter/seekorder' - import zhCn from 'element-plus/dist/locale/zh-cn.mjs' const queryParams = ref({}) - const userStore = useStore() const router = useRouter() - const route = useRoute() const pageSize = 20 const pageNumber = 1 const total: any = ref(0) @@ -21,7 +17,7 @@ total.value = res.total } - // getList() + getList() // 查询按钮 const queryTableList = () => { @@ -59,74 +55,68 @@