Commit 1a1d9b7b authored by 罗超's avatar 罗超

Merge branch 'master' of http://gitlab.oytour.com/viitto/pptist

parents 9813887b a83a0daa
......@@ -3,6 +3,7 @@ import Axios, {
InternalAxiosRequestConfig,
AxiosError,
} from 'axios';
import { domainManager } from '@/utils/domainManager'
let datas: AxiosResponse
export enum ApiResult{
......@@ -65,7 +66,7 @@ const getErrorCode2text = (response: AxiosResponse): string => {
* service.get<{data: string; code: number}>('/test').then(({data}) => { console.log(data.code) })
*/
const service = Axios.create({
baseURL: 'http://192.168.10.214/api/common/post',
baseURL: `${domainManager().domainUrl}`,//'http://192.168.10.214/api/common/post'
timeout: 20000,
headers: {
'User-Type': 'bus',
......
......@@ -2,7 +2,7 @@ export const domainManager = () => {
const locationName = window.location.hostname
console.log(window.location.hostname, '=====hostname')
const obj = {
domainUrl: locationName.indexOf('oytour') !== -1 ? "http://reborn.oytour.com" : "http://192.168.10.214/api/common/post",
domainUrl: locationName.indexOf('oytour') !== -1 ? "http://reborn.oytour.com/api/common/post" : "http://192.168.10.214/api/common/post",
//上传站点
UploadUrl: locationName.indexOf('oytour') !== -1 ? "http://upload.oytour.com" : "http://192.168.10.214:8120",
//文件站点
......
......@@ -174,7 +174,6 @@ const insertImageElement = (files: FileList) => {
const setImgs = () => {
let text = '请选择图片'
let url = imgOnline.value
const props = { url: url}
if(activeName.value=='1') propsDatas.value = { src: imgOnline.value }
else if(activeName.value=='2') {
text = '请上传图片'
......
<template>
<div class="pptist-editor">
<div class="pptist-editor" v-if="model!=3">
<EditorHeader class="layout-header" />
<div class="layout-content">
<Thumbnails class="layout-content-left" />
......
......@@ -89,7 +89,10 @@
</template>
</div>
<div v-else-if="dataList.length == 0 && !loading" class="q-mt-lg bg-white rounded" style="padding: 30px 10px 30px 10px;text-align: center;color: #909399;">暂无数据</div>
<div v-else-if="dataList.length == 0 && !loading" class="q-mt-lg bg-white rounded"
style="padding: 30px 10px 30px 10px;">
<el-empty description="暂无数据" />
</div>
<el-divider class="no-bg q-mt-lg" v-if='queryObj.pageCount == queryObj.pageIndex && !loading'>
<span class="text-samll" style="background: #f3f6fb;padding: 0 10px;color:#a3a3a3">已加载完成所有数据</span>
</el-divider>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment