Commit 741c565f by 严立

修复问题

parent 00efc6c7
...@@ -13,7 +13,7 @@ function resolve (dir) { ...@@ -13,7 +13,7 @@ function resolve (dir) {
module.exports = { module.exports = {
context: path.resolve(__dirname, '../'), context: path.resolve(__dirname, '../'),
entry: { entry: {
app: './src/main.js' app: ['babel-polyfill', './src/main.js']
}, },
output: { output: {
path: config.build.assetsRoot, path: config.build.assetsRoot,
...@@ -39,7 +39,11 @@ module.exports = { ...@@ -39,7 +39,11 @@ module.exports = {
{ {
test: /\.js$/, test: /\.js$/,
loader: 'babel-loader', loader: 'babel-loader',
include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')] include: [
resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client'),
resolve('src'), resolve('test'), resolve('node_modules/element-ui/src'),
resolve('src'), resolve('test'), resolve('node_modules/element-ui/packages/input/src'),
]
}, },
{ {
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/, test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>厦门建发招标采购平台</title> <title>建发建信招标采购平台</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
......
let output = { let output = {
// 开发路径 // 开发路径
// base: 'http://bid-server.meiqicloud.com/', base: 'http://bid-server.meiqicloud.com/',
// resources: 'http://bid-web.meiqicloud.com/', resources: 'http://bid-web.meiqicloud.com/',
// agentSignIn: 'http://bid-vue.meiqicloud.com/' agentSignIn: 'http://bid-vue.meiqicloud.com/'
// 正式路径 // 正式路径
base: '/Api/', // base: '/Api/',
resources: 'http://bid-web.meiqicloud.com', // resources: 'http://bid-web.meiqicloud.com',
agentSignIn: 'http://bid-vue.meiqicloud.com/' // agentSignIn: 'http://bid-vue.meiqicloud.com/'
} }
output.uploadFile = output.base + 'bid/common/webupload/upload' output.uploadFile = output.base + 'bid/common/webupload/upload'
......
...@@ -26,4 +26,6 @@ let output = new Vue({ ...@@ -26,4 +26,6 @@ let output = new Vue({
'template': '<App/>' 'template': '<App/>'
}) })
console.log('test')
console.log(window.XMLHttpRequest)
export default output export default output
\ No newline at end of file
...@@ -183,6 +183,7 @@ ...@@ -183,6 +183,7 @@
this.quoteRecordList.push({ 'time': '暂无报价', 'price': 0 }) this.quoteRecordList.push({ 'time': '暂无报价', 'price': 0 })
} }
}) })
.catch((funcError) => {})
}, },
onDetail: function (funcItem, funcIsQuote) { onDetail: function (funcItem, funcIsQuote) {
......
...@@ -175,6 +175,7 @@ ...@@ -175,6 +175,7 @@
this.listBid = funcList this.listBid = funcList
this.pagination.total = funcResponse.count this.pagination.total = funcResponse.count
}) })
.catch((funcError) => {})
}, },
onDetail: function (funcItem, funcIsQuote) { onDetail: function (funcItem, funcIsQuote) {
......
...@@ -140,6 +140,7 @@ let output = function (thisVue, id, type) { ...@@ -140,6 +140,7 @@ let output = function (thisVue, id, type) {
} }
thisVue.$store.commit('componentFile', funcFile) thisVue.$store.commit('componentFile', funcFile)
}) })
.catch((funcError) => {})
funcRequestOther = iRequest.request(iHost.base + 'bid/zBiddingNotice/getApiBiddingRelevantNotices', { 'noticeId': id, 'noticeType': 7, 'isProject': 1 }, 'json', 'post') funcRequestOther = iRequest.request(iHost.base + 'bid/zBiddingNotice/getApiBiddingRelevantNotices', { 'noticeId': id, 'noticeType': 7, 'isProject': 1 }, 'json', 'post')
.then((funcResponse) => { .then((funcResponse) => {
...@@ -289,6 +290,7 @@ let output = function (thisVue, id, type) { ...@@ -289,6 +290,7 @@ let output = function (thisVue, id, type) {
} }
thisVue.$store.commit('componentFile', funcFile) thisVue.$store.commit('componentFile', funcFile)
}) })
.catch((funcError) => {})
funcRequestOther = iRequest.request(iHost.base + 'bid/zTenderNotice/getApiRelevantNotices', { 'tenderNoticeId': id, 'type': 1 }, 'json', 'post') funcRequestOther = iRequest.request(iHost.base + 'bid/zTenderNotice/getApiRelevantNotices', { 'tenderNoticeId': id, 'type': 1 }, 'json', 'post')
.then((funcResponse) => { .then((funcResponse) => {
...@@ -437,6 +439,7 @@ let output = function (thisVue, id, type) { ...@@ -437,6 +439,7 @@ let output = function (thisVue, id, type) {
} }
thisVue.$store.commit('componentFile', funcFile) thisVue.$store.commit('componentFile', funcFile)
}) })
.catch((funcError) => {})
funcRequestOther = iRequest.request(iHost.base + 'bid/zTenderNotice/getApiRelevantNotices', { 'tenderNoticeId': id, 'type': 1 }, 'json', 'post') funcRequestOther = iRequest.request(iHost.base + 'bid/zTenderNotice/getApiRelevantNotices', { 'tenderNoticeId': id, 'type': 1 }, 'json', 'post')
.then((funcResponse) => { .then((funcResponse) => {
......
...@@ -440,6 +440,7 @@ ...@@ -440,6 +440,7 @@
this.$store.commit('componentProgress', funcProgress) this.$store.commit('componentProgress', funcProgress)
} }
}) })
.catch((funcError) => {})
if (this.componentProject.isPackage) { if (this.componentProject.isPackage) {
// 查询报名中标状态 // 查询报名中标状态
...@@ -463,12 +464,14 @@ ...@@ -463,12 +464,14 @@
clearTimeout(this.windowChangeTimer) clearTimeout(this.windowChangeTimer)
}, 10) }, 10)
}) })
.catch((funcError) => {})
} else { } else {
// 查询报名中标状态 // 查询报名中标状态
iRequest.request(iHost.base + 'bid/zTenderNotice/getApiCompanyTenderDetail', { 'tenderNoticeId': this.noticeId }, 'json', 'post') iRequest.request(iHost.base + 'bid/zTenderNotice/getApiCompanyTenderDetail', { 'tenderNoticeId': this.noticeId }, 'json', 'post')
.then((funcResponse) => { .then((funcResponse) => {
}) })
.catch((funcError) => {})
} }
} }
}, },
...@@ -950,6 +953,7 @@ ...@@ -950,6 +953,7 @@
} }
this.winQuoteRecord = true this.winQuoteRecord = true
}) })
.catch((funcError) => {})
}, },
} }
} }
......
...@@ -203,6 +203,7 @@ ...@@ -203,6 +203,7 @@
// } // }
// } // }
}) })
.catch((funcError) => {})
}, },
/** /**
......
...@@ -305,6 +305,7 @@ ...@@ -305,6 +305,7 @@
this.componentContract.push({ 'price': funcResponse.order.price }) this.componentContract.push({ 'price': funcResponse.order.price })
} }
}) })
.catch((funcError) => {})
}, },
onOpenBill: function () { onOpenBill: function () {
......
...@@ -186,6 +186,7 @@ ...@@ -186,6 +186,7 @@
} }
this.queryList() this.queryList()
}) })
.catch((funcError) => {})
}, },
/** /**
......
...@@ -161,6 +161,7 @@ let output = function (thisVue, id, type, isPreview) { ...@@ -161,6 +161,7 @@ let output = function (thisVue, id, type, isPreview) {
} }
thisVue.$store.commit('componentFile', funcFile) thisVue.$store.commit('componentFile', funcFile)
}) })
.catch((funcError) => {})
// 预览公告不查询相关公告 // 预览公告不查询相关公告
if (!isPreview) { if (!isPreview) {
...@@ -177,6 +178,7 @@ let output = function (thisVue, id, type, isPreview) { ...@@ -177,6 +178,7 @@ let output = function (thisVue, id, type, isPreview) {
} }
thisVue.$store.commit('componentNotice', funcOther) thisVue.$store.commit('componentNotice', funcOther)
}) })
.catch((funcError) => {})
} else { } else {
funcRequestOther = null funcRequestOther = null
} }
...@@ -306,7 +308,7 @@ let output = function (thisVue, id, type, isPreview) { ...@@ -306,7 +308,7 @@ let output = function (thisVue, id, type, isPreview) {
} }
thisVue.$store.commit('componentFile', funcFile) thisVue.$store.commit('componentFile', funcFile)
}) })
.catch((funcError) => {})
// 预览公告不查询相关公告 // 预览公告不查询相关公告
if (!isPreview) { if (!isPreview) {
funcRequestOther = iRequest.request(iHost.base + 'bid/zBiddingNotice/getApiBiddingRelevantNotices', { 'noticeId': id, 'noticeType': 8 }, 'json', 'post') funcRequestOther = iRequest.request(iHost.base + 'bid/zBiddingNotice/getApiBiddingRelevantNotices', { 'noticeId': id, 'noticeType': 8 }, 'json', 'post')
...@@ -322,6 +324,7 @@ let output = function (thisVue, id, type, isPreview) { ...@@ -322,6 +324,7 @@ let output = function (thisVue, id, type, isPreview) {
} }
thisVue.$store.commit('componentNotice', funcOther) thisVue.$store.commit('componentNotice', funcOther)
}) })
.catch((funcError) => {})
} else { } else {
funcRequestOther = null funcRequestOther = null
} }
...@@ -467,6 +470,7 @@ let output = function (thisVue, id, type, isPreview) { ...@@ -467,6 +470,7 @@ let output = function (thisVue, id, type, isPreview) {
} }
thisVue.$store.commit('componentFile', funcFile) thisVue.$store.commit('componentFile', funcFile)
}) })
.catch((funcError) => {})
// 预览公告不查询相关公告 // 预览公告不查询相关公告
if (!isPreview) { if (!isPreview) {
...@@ -483,6 +487,7 @@ let output = function (thisVue, id, type, isPreview) { ...@@ -483,6 +487,7 @@ let output = function (thisVue, id, type, isPreview) {
} }
thisVue.$store.commit('componentNotice', funcOther) thisVue.$store.commit('componentNotice', funcOther)
}) })
.catch((funcError) => {})
} else { } else {
funcRequestOther = null funcRequestOther = null
} }
...@@ -627,6 +632,7 @@ let output = function (thisVue, id, type, isPreview) { ...@@ -627,6 +632,7 @@ let output = function (thisVue, id, type, isPreview) {
} }
thisVue.$store.commit('componentFile', funcFile) thisVue.$store.commit('componentFile', funcFile)
}) })
.catch((funcError) => {})
// 预览公告不查询相关公告 // 预览公告不查询相关公告
if (!isPreview) { if (!isPreview) {
...@@ -643,6 +649,7 @@ let output = function (thisVue, id, type, isPreview) { ...@@ -643,6 +649,7 @@ let output = function (thisVue, id, type, isPreview) {
} }
thisVue.$store.commit('componentNotice', funcOther) thisVue.$store.commit('componentNotice', funcOther)
}) })
.catch((funcError) => {})
} else { } else {
funcRequestOther = null funcRequestOther = null
} }
...@@ -779,6 +786,7 @@ let output = function (thisVue, id, type, isPreview) { ...@@ -779,6 +786,7 @@ let output = function (thisVue, id, type, isPreview) {
} }
thisVue.$store.commit('componentFile', funcFile) thisVue.$store.commit('componentFile', funcFile)
}) })
.catch((funcError) => {})
// 预览公告不查询相关公告 // 预览公告不查询相关公告
if (!isPreview) { if (!isPreview) {
...@@ -795,6 +803,7 @@ let output = function (thisVue, id, type, isPreview) { ...@@ -795,6 +803,7 @@ let output = function (thisVue, id, type, isPreview) {
} }
thisVue.$store.commit('componentNotice', funcOther) thisVue.$store.commit('componentNotice', funcOther)
}) })
.catch((funcError) => {})
} else { } else {
funcRequestOther = null funcRequestOther = null
} }
...@@ -888,6 +897,7 @@ let output = function (thisVue, id, type, isPreview) { ...@@ -888,6 +897,7 @@ let output = function (thisVue, id, type, isPreview) {
} }
thisVue.$store.commit('componentFile', funcFile) thisVue.$store.commit('componentFile', funcFile)
}) })
.catch((funcError) => {})
// 预览公告不查询相关公告 // 预览公告不查询相关公告
if (!isPreview) { if (!isPreview) {
...@@ -904,6 +914,7 @@ let output = function (thisVue, id, type, isPreview) { ...@@ -904,6 +914,7 @@ let output = function (thisVue, id, type, isPreview) {
} }
thisVue.$store.commit('componentNotice', funcOther) thisVue.$store.commit('componentNotice', funcOther)
}) })
.catch((funcError) => {})
} else { } else {
funcRequestOther = null funcRequestOther = null
} }
...@@ -1063,6 +1074,7 @@ let output = function (thisVue, id, type, isPreview) { ...@@ -1063,6 +1074,7 @@ let output = function (thisVue, id, type, isPreview) {
} }
thisVue.$store.commit('componentFile', funcFile) thisVue.$store.commit('componentFile', funcFile)
}) })
.catch((funcError) => {})
// 预览公告不查询相关公告 // 预览公告不查询相关公告
if (!isPreview) { if (!isPreview) {
...@@ -1079,6 +1091,7 @@ let output = function (thisVue, id, type, isPreview) { ...@@ -1079,6 +1091,7 @@ let output = function (thisVue, id, type, isPreview) {
} }
thisVue.$store.commit('componentNotice', funcOther) thisVue.$store.commit('componentNotice', funcOther)
}) })
.catch((funcError) => {})
} else { } else {
funcRequestOther = null funcRequestOther = null
} }
...@@ -1163,6 +1176,7 @@ let output = function (thisVue, id, type, isPreview) { ...@@ -1163,6 +1176,7 @@ let output = function (thisVue, id, type, isPreview) {
} }
thisVue.$store.commit('componentFile', funcFile) thisVue.$store.commit('componentFile', funcFile)
}) })
.catch((funcError) => {})
// 预览公告不查询相关公告 // 预览公告不查询相关公告
if (!isPreview) { if (!isPreview) {
...@@ -1179,6 +1193,7 @@ let output = function (thisVue, id, type, isPreview) { ...@@ -1179,6 +1193,7 @@ let output = function (thisVue, id, type, isPreview) {
} }
thisVue.$store.commit('componentNotice', funcOther) thisVue.$store.commit('componentNotice', funcOther)
}) })
.catch((funcError) => {})
} else { } else {
funcRequestOther = null funcRequestOther = null
} }
......
...@@ -434,6 +434,7 @@ ...@@ -434,6 +434,7 @@
this.quoteList = [] this.quoteList = []
} }
}) })
.catch((funcError) => {})
} }
...@@ -450,6 +451,7 @@ ...@@ -450,6 +451,7 @@
} }
} }
}) })
.catch((funcError) => {})
} }
}, },
......
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 sign in to comment