提交 0206dcfe authored 作者: 翟畅's avatar 翟畅

zc更换地址以及修改bug

上级 5aec6a64
......@@ -3,7 +3,7 @@ ENV = 'development'
# base api
# VUE_APP_BASE_API = '/dev-api'
VUE_APP_BASE_API = 'http://test23.zhongdianyun.com'
VUE_APP_BASE_API = 'http://117.78.43.107'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
# to control whether the babel-plugin-dynamic-import-node plugin is enabled.
......
......@@ -3,5 +3,5 @@ ENV = 'production'
# base api
# VUE_APP_BASE_API = '/prod-api'
VUE_APP_BASE_API = 'http://test23.zhongdianyun.com'
VUE_APP_BASE_API = 'http://117.78.43.107'
......@@ -25,7 +25,7 @@ $(function () {
var object = {
url: 'http://test23.zhongdianyun.com'+"/file/ueditor/upload?action=uploadvideo",//'http://'+window.location.host+"/file/ueditor/upload?action=uploadvideo",
url: 'http://117.78.43.107'+"/file/ueditor/upload?action=uploadvideo",//'http://'+window.location.host+"/file/ueditor/upload?action=uploadvideo",
type: "POST",
xhr: function () {
myXhr = $.ajaxSettings.xhr();
......@@ -100,7 +100,7 @@ $(function () {
success: function (t) {
var m, g;
data = JSON.parse(t);
let hostUrl = 'http://test23.zhongdianyun.com';
let hostUrl = 'http://117.78.43.107';
$('.upload-media-upload-btn').attr('disabled', !1),
$('.upload-media-upload-btn').removeClass('disable');
......@@ -169,7 +169,7 @@ $(function () {
let cssUrl = '';
/*(/index.htm[l]?#\//).test('http://192.168.2.230:8296/bg/index.htm#/')*/
let rex = /index.htm[l]?#\//;
let hostUrl = 'http://test23.zhongdianyun.com';
let hostUrl = 'http://117.78.43.107';
cssUrl = hostUrl + '/bg/index.html#';
let aa = document.createElement('iframe');
......
......@@ -40,7 +40,7 @@ $(function () {
var object = {
url: "http://test23.zhongdianyun.com/file/ueditor/upload?action=uploadvideo"/*'http://' + window.location.host + "/file/ueditor/upload?action=uploadvideo"*/,
url: "http://117.78.43.107/file/ueditor/upload?action=uploadvideo"/*'http://' + window.location.host + "/file/ueditor/upload?action=uploadvideo"*/,
type: "POST",
xhr: function () {
myXhr = $.ajaxSettings.xhr();
......
......@@ -38,7 +38,7 @@
//flashplayer:true,
//live:true,
//debug:true,/*'http://192.168.2.230:8296//file/ueditor/jsp/upload/video/20190910/1568074805987025105.mp3'*/
video:'http://test23.zhongdianyun.com'+'/file/'+getQueryVariable('id')
video:'http://117.78.43.107'+'/file/'+getQueryVariable('id')
//'http://192.168.2.230:8296/file/ueditor/jsp/upload/video/20190909/1568029139072864147.mp4'
};
......
......@@ -6,7 +6,7 @@ import SettingMer from '@/utils/settingMer'
import { isPhone } from "@/libs/wechat";
const service = axios.create({
baseURL: SettingMer.apiBaseURL,
timeout: 60000 // 过期时间
timeout: 600000 // 过期时间
})
// request interceptor
......
......@@ -7,7 +7,7 @@ import { isPhone } from "@/libs/wechat";
const qs = require('qs');
const service = axios.create({
baseURL: SettingMer.httpUrl,
timeout: 60000, // 过期时间
timeout: 600000, // 过期时间
// onUploadProgress: event => {
// // event.loaded:已上传文件大小
// // event.total:被上传文件的总大小
......
......@@ -9,5 +9,5 @@ const SettingMer = {
// socket连接
wsSocketUrl: VUE_APP_WS_URL
}
// http://test23.zhongdianyun.com
// http://117.78.43.107
export default SettingMer
......@@ -60,7 +60,7 @@
<span v-else>表格式</span>
</template>
</el-table-column>
<el-table-column label="上线状态" min-width="10%">
<!-- <el-table-column label="上线状态" min-width="10%">
<template slot="header" slot-scope="slot">
<el-select style="width:70%" v-model="listQuery.status" @change="getList()" size="mini">
<el-option label="上线状态" value=""></el-option>
......@@ -71,7 +71,7 @@
<span v-if="scope.row.status == 1" ><span class="up_status"></span>{{statusText[scope.row.status]}}</span>
<span v-else style="color:#999999"><span class="down_status"></span>{{statusText[scope.row.status]}}</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="操作" min-width="10%" class-name="small-padding" fixed="right">
<template slot-scope="scope">
<el-button v-for="item in btnList" :key="item.id" v-if="item.type == 9 && !(item.url == 'removeLine' && scope.row.status==1)" :class="item.url" size="mini" type="text"
......@@ -185,8 +185,8 @@ export default {
'viewLine':() => { this.navigationFuc('viewContentCompany',{reviewId:id,columnType:type}) }, //预览
'removeLine':() => { this.removeData(id) }, //删除
'batchRemoveBtn':() => { this.removeData() }, //批量删除
'soldBtn':() => { this.batchSoldData(1) }, //上线
'soldOutBtn':() => { this.batchSoldData(0) }, //下线
// 'soldBtn':() => { this.batchSoldData(1) }, //上线
// 'soldOutBtn':() => { this.batchSoldData(0) }, //下线
'setTopBtn':() => { this.batchTopData(1) }, //置顶
'cancelTopBtn':() => { this.batchTopData(0) }, //取消置顶
}
......
......@@ -46,7 +46,7 @@
<el-table-column prop="bulletName" label="所属栏目" min-width="10%"></el-table-column>
<el-table-column prop="releaserTime" label="发布时间" min-width="10%" sortable></el-table-column>
<el-table-column prop="source" label="来源" min-width="10%"></el-table-column>
<el-table-column label="上线状态" min-width="10%">
<!-- <el-table-column label="上线状态" min-width="10%">
<template slot="header" slot-scope="slot">
<el-select style="width:70%" v-model="listQuery.status" @change="getList()" size="mini">
<el-option label="上线状态" value=""></el-option>
......@@ -57,7 +57,7 @@
<span v-if="scope.row.status == 1" ><span class="up_status"></span>{{statusText[scope.row.status]}}</span>
<span v-else style="color:#999999"><span class="down_status"></span>{{statusText[scope.row.status]}}</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="操作" min-width="10%" class-name="small-padding" fixed="right">
<template slot-scope="scope">
<el-button v-for="item in btnList" :key="item.id" v-if="item.type == 9 && !(item.url == 'removeLine' && scope.row.status==1)" :class="item.url" size="mini" type="text"
......@@ -172,8 +172,8 @@ export default {
'viewLine':() => { this.navigationFuc('viewContentInformation',{reviewId:id}) }, //预览
'removeLine':() => { this.removeData(id) }, //删除
'batchRemoveBtn':() => { this.removeData() }, //批量删除
'soldBtn':() => { this.batchSoldData(1) }, //上线
'soldOutBtn':() => { this.batchSoldData(0) }, //下线
// 'soldBtn':() => { this.batchSoldData(1) }, //上线
// 'soldOutBtn':() => { this.batchSoldData(0) }, //下线
'setTopBtn':() => { this.batchTopData(1) }, //置顶
'cancelTopBtn':() => { this.batchTopData(0) }, //取消置顶
}
......
......@@ -269,7 +269,7 @@ import searchDia from "@/components/dialog/searchTips";
viewLine: () => { //预览
// this.$message.success("打开pc端详情");
window.open(pcUrl+'/digital/bookDetail?id=' + id)
// window.open('http://test23.zhongdianyun.com/#/bookDetail?id=' + id)
// window.open('http://117.78.43.107/#/bookDetail?id=' + id)
},
recommendLine: () => { //推荐内容
this.goRecommend(id);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论