Skip to content

严立 / cd-bid

Go to a project
Commit b14fe58b by 严立
Options

列表查看公告详情方式优化 | 添加中标信息类型 | 供应商地址异常处理

parent 2da8c6e0
Inline Side-by-side
Showing with 20 additions and 12 deletions
src/common/js/request/interceptors.js
...@@ -75,6 +75,9 @@ let output = { ...@@ -75,6 +75,9 @@ let output = {
// 请求正常直接返回 data 内容 // 请求正常直接返回 data 内容
case 200: case 200:
if (funcResultData.msg === '登录失效') {
return { state: false, response: { message: funcResultData.msg }}
}
return { state: true, response: funcResultData.data} return { state: true, response: funcResultData.data}
break break
......
src/common/js/request/request.js
...@@ -92,8 +92,9 @@ let output = { ...@@ -92,8 +92,9 @@ let output = {
if (funcInterceptorsResponse.state) { if (funcInterceptorsResponse.state) {
funcResolve(funcInterceptorsResponse.response) funcResolve(funcInterceptorsResponse.response)
} else { } else {
console.log('funcReject') if (funcInterceptorsResponse.response.message !== '登录失效') {
iVue.$message.error(funcInterceptorsResponse.response.message) iVue.$message.error(funcInterceptorsResponse.response.message)
}
funcReject(funcInterceptorsResponse.response) funcReject(funcInterceptorsResponse.response)
} }
} else { } else {
......
src/view/home.vue
...@@ -1103,7 +1103,7 @@ ...@@ -1103,7 +1103,7 @@
} }
.bidding-news-detail-html { .bidding-news-detail-html {
width: 100%; width: 100%;
height: 40px; height: 38px;
margin-top: 20px; margin-top: 20px;
font-size: @fontSize01 !important; font-size: @fontSize01 !important;
overflow: hidden; overflow: hidden;
......
src/view/personal/supplier-info.vue
...@@ -230,12 +230,14 @@ ...@@ -230,12 +230,14 @@
'examineReason': funcResponse.reason, 'examineReason': funcResponse.reason,
} }
if (funcResponse.receiveArea) {
// 判断地址数据类型，同时兼容字符串与数组类型 // 判断地址数据类型，同时兼容字符串与数组类型
if (Object.prototype.toString.call(funcResponse.receiveArea) === '[object String]') { if (Object.prototype.toString.call(funcResponse.receiveArea) === '[object String]') {
this.formInfo.receiveArea = JSON.parse(funcResponse.receiveArea).join(' ') this.formInfo.receiveArea = JSON.parse(funcResponse.receiveArea).join(' ')
} else { } else {
this.formInfo.receiveArea = funcResponse.receiveArea.join(' ') this.formInfo.receiveArea = funcResponse.receiveArea.join(' ')
} }
}
console.log(this.formInfo) console.log(this.formInfo)
......
src/view/personal/supplier-notice.vue
...@@ -852,7 +852,6 @@ ...@@ -852,7 +852,6 @@
* @returns * @returns
*/ */
onQuoteSubmit: function () { onQuoteSubmit: function () {
console.log(JSON.stringify(this.tableQuote))
if (this.tableQuote.length === 0) { if (this.tableQuote.length === 0) {
this.$message.error('请填写完整报价信息') this.$message.error('请填写完整报价信息')
return return
...@@ -893,7 +892,8 @@ ...@@ -893,7 +892,8 @@
'biddingOffers': JSON.stringify(funcQuoteData) 'biddingOffers': JSON.stringify(funcQuoteData)
} }
let funcOther = iRequest.request(iHost.base + 'bid/zBiddingProject/biddingOffer', funcParam, 'json', 'post') console.log('promise begin')
iRequest.request(iHost.base + 'bid/zBiddingProject/biddingOffer', funcParam, 'json', 'post')
.then((funcResponse) => { .then((funcResponse) => {
this.winQuote = false this.winQuote = false
this.$message({ message: '报价成功！', type: 'success' }) this.$message({ message: '报价成功！', type: 'success' })
......
src/view/personal/supplier-orders-detail.vue
...@@ -283,25 +283,26 @@ ...@@ -283,25 +283,26 @@
if (funcResponse.orderBilling) { if (funcResponse.orderBilling) {
this.isReceive = !Boolean(Number(funcResponse.orderBilling.receiveType)) this.isReceive = !Boolean(Number(funcResponse.orderBilling.receiveType))
if (this.isReceive) {
this.componentReceive = { this.componentReceive = {
'name': funcResponse.orderBilling.name, 'name': funcResponse.orderBilling.name ? funcResponse.orderBilling.name : '暂无',
'phone': funcResponse.orderBilling.phone, 'phone': funcResponse.orderBilling.phone ? funcResponse.orderBilling.phone : '暂无',
'area': '', 'area': '',
'address': funcResponse.orderBilling.address, 'address': funcResponse.orderBilling.address ? funcResponse.orderBilling.address : '暂无',
} }
// 判断地址数据类型，同时兼容字符串与数组类型 // 判断地址数据类型，同时兼容字符串与数组类型
if (funcResponse.orderBilling.area) {
if (Object.prototype.toString.call(funcResponse.orderBilling.area) === '[object String]') { if (Object.prototype.toString.call(funcResponse.orderBilling.area) === '[object String]') {
this.componentReceive.area = JSON.parse(funcResponse.orderBilling.area).join(' ') this.componentReceive.area = JSON.parse(funcResponse.orderBilling.area).join(' ')
} else { } else {
this.componentReceive.area = funcResponse.orderBilling.area.join(' ') this.componentReceive.area = funcResponse.orderBilling.area.join(' ')
} }
} else { }
this.isReceive = false }
} }
console.log(this.isReceive) console.log(this.componentProject.isPackage)
if (this.componentProject.isPackage) { if (this.componentProject.isPackage) {
// 多个合同 // 多个合同
let funcRawData = funcResponse.order.tenderPackages let funcRawData = funcResponse.order.tenderPackages
...@@ -313,6 +314,7 @@ ...@@ -313,6 +314,7 @@
'price': funcRawData[i].price, 'price': funcRawData[i].price,
} }
this.componentContract.push(funcItem) this.componentContract.push(funcItem)
console.log('this.componentContract', this.componentContract)
} }
} else { } else {
this.componentContract.push({ 'price': funcResponse.order.price }) this.componentContract.push({ 'price': funcResponse.order.price })
......
src/view/register-supplier.vue
...@@ -469,7 +469,7 @@ ...@@ -469,7 +469,7 @@
* @returns * @returns
*/ */
reset: function () { reset: function () {
this.state = 3 this.state = 1
this.formRegister = { this.formRegister = {
// 基本信息 // 基本信息
companyName: '', companyName: '',
......
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