| .env.production | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/api/userInfo.ts | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/router/index.ts | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/pointsManage/personal/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/tradeManage/buyer/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/tradeManage/detail/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/tradeManage/seller/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.env.production
@@ -1,10 +1,14 @@ # 线上环境 ENV = 'production' # base路径 VITE_BASE_PATH = '/admin' #VITE_BASE_PATH = '/admin' VITE_BASE_PATH = '/trade-api' # 开发环境下跨域代理，请输入要跨域的api地址 - 尾部无需带'/' VITE_BI_URL = 'https://zynlpt.ccccltd.cn' VITE_AXIOS_BASE_URL = 'http://36.133.126.111:7099' #VITE_BI_URL = 'https://zynlpt.ccccltd.cn' VITE_BI_URL = 'http://36.133.126.111:7099' #跳转iframe地址 VITE_IFREAM_URL='https://zynlpt.ccccltd.cn' #VITE_IFREAM_URL='https://zynlpt.ccccltd.cn' VITE_IFREAM_URL='http://36.133.126.111:7099' # 扫码登录页地址 登录完会自动跳转到大屏 VITE_BASE_LOGIN_URL='https://portal.ccccltd.cn/sso_sys?cb=http://zynlpt.ccccltd.cn' src/api/userInfo.ts
@@ -1,5 +1,4 @@ import createAxios from '@/utils/axios' let url = '/test' // 修改密码 export function updatePassw(data: object = {}): ApiPromise { @@ -15,7 +14,8 @@ // 查看个人信息 export function queryUserDetail(data: object = {}): ApiPromise { return createAxios({ url: `${url}/admin/common/userDetail`, baseURL: '/api', url: `/admin/common/userDetail`, headers: { 'Content-Type': 'application/json;charset=UTF-8' }, src/router/index.ts
@@ -51,6 +51,16 @@ screenToken: '', } userStore.updateUserInfo(obj) }else { if (to.query.token) { const token = to.query.token as string localStorage.setItem('lastRecordTime', new Date().getTime().toString()) const obj: any = { adminToken: token, screenToken: '', } userStore.updateUserInfo(obj) } } } } src/views/pointsManage/personal/index.vue
@@ -103,7 +103,7 @@ <!-- 流水表格 --> <div class="table-section"> <el-table :data="flowList" stripe style="width: 100%"> <el-table :data="flowList" stripe style="width: 100%" :height="440"> <el-table-column prop="id" label="序号" width="80" align="center" /> <el-table-column prop="dataCategory" label="数据类目" width="120"> <template #default="{ row }"> src/views/tradeManage/buyer/index.vue
@@ -35,11 +35,11 @@ <el-option v-for="item in productTypeOptions" :key="item.value" :label="item.label" :value="item.value" /> </el-select> </el-form-item> <el-form-item label="" class="col-17"> <el-select v-model="query.productSubType" placeholder="请选择产品类型子级" clearable style="width: 100%"> <el-option v-for="item in productSubTypeOptions" :key="item.value" :label="item.label" :value="item.value" /> </el-select> </el-form-item> <!-- <el-form-item label="" class="col-17">--> <!-- <el-select v-model="query.productSubType" placeholder="请选择产品类型子级" clearable style="width: 100%">--> <!-- <el-option v-for="item in productSubTypeOptions" :key="item.value" :label="item.label" :value="item.value" />--> <!-- </el-select>--> <!-- </el-form-item>--> <el-form-item label="申请时间" class="col-30"> <el-date-picker v-model="query.dateRange" @@ -379,7 +379,8 @@ // 获取产品类型选项 const getProductTypeOptions = async () => { try { const res = await productApi.getCategoryByParent({ parentCode: 'product_type' }) // product_type const res = await productApi.getCategoryByParent({ parentCode: 'ProductTechnologyType' }) if (res?.code === 200 && res.data) { productTypeOptions.value = res.data.map((item: any) => ({ label: item.name, @@ -444,7 +445,7 @@ // 清空产品子级选择 query.productSubType = '' // 获取对应的产品子级选项 await getProductSubTypeOptions(value) // await getProductSubTypeOptions(value) } // 获取状态类型 src/views/tradeManage/detail/index.vue
@@ -302,6 +302,7 @@ import orderApi from '@/api/orderApi' import createAxios from '@/utils/axios' import productApi from '@/api/productApi' import sysUserService from '@/api/sysUser' import { useUserInfo } from '@/stores/modules/userInfo' const hostUrl = import.meta.env.VITE_AXIOS_BASE_URL @@ -413,6 +414,19 @@ } // 获取用户信息 try { const userRes: any = await sysUserService.getUserdetail({ userId: data.userId }) if (userRes?.code === 200 && userRes.data) { // 用产品详情补全头信息 data.unitName = userRes.data.unitName || data.unitName data.userName = userRes.data.name || data.userName data.userDept = userRes.data.departmentName || data.userDept data.userPhone = userRes.data.phone || data.userPhone data.userAccount = userRes.data.username || data.userAccount } }catch (e){ } // 映射订单详情头部信息 const head = { src/views/tradeManage/seller/index.vue
@@ -35,11 +35,11 @@ <el-option v-for="s in statusOptions" :key="s.value" :label="s.label" :value="s.value" /> </el-select> </el-form-item> <el-form-item label="" class="col-17"> <el-select v-model="query.productSubType" placeholder="请选择产品类型子级" clearable style="width: 100%"> <el-option v-for="item in productSubTypeOptions" :key="item.value" :label="item.label" :value="item.value" /> </el-select> </el-form-item> <!-- <el-form-item label="" class="col-17">--> <!-- <el-select v-model="query.productSubType" placeholder="请选择产品类型子级" clearable style="width: 100%">--> <!-- <el-option v-for="item in productSubTypeOptions" :key="item.value" :label="item.label" :value="item.value" />--> <!-- </el-select>--> <!-- </el-form-item>--> <el-form-item label="申请时间" class="col-30"> <el-date-picker v-model="query.dateRange" @@ -342,7 +342,7 @@ // 获取产品类型选项 const getProductTypeOptions = async () => { try { const res = await productApi.getCategoryByParent({ parentCode: 'product_type' }) const res = await productApi.getCategoryByParent({ parentCode: 'ProductTechnologyType' }) if (res?.code === 200 && res.data) { productTypeOptions.value = res.data.map((item: any) => ({ label: item.name, @@ -407,7 +407,7 @@ // 清空产品子级选择 query.productSubType = '' // 获取对应的产品子级选项 await getProductSubTypeOptions(value) // await getProductSubTypeOptions(value) }
