Skip to content

严立 / cd-bid

Go to a project
Commit caca8ecf by 严立
Options

问题修复

parent 5de8dc13
Inline Side-by-side
Showing with 118 additions and 128 deletions
src/common/js/token.js
...@@ -31,16 +31,30 @@ let output = { ...@@ -31,16 +31,30 @@ let output = {
let funcDate = output.term(funcToken) let funcDate = output.term(funcToken)
let funcNowDate = Math.round(new Date() / 1000) let funcNowDate = Math.round(new Date() / 1000)
// 令牌有效
if (funcNowDate < funcDate) { if (funcNowDate < funcDate) {
// 判断当前时间是否小于令牌期限 // 判断当前时间是否小于令牌期限
if (funcNowDate + 1200 < funcDate) { if (funcNowDate + 1200 < funcDate) {
// 令牌有效时间大于安全时间 // 令牌有效时间大于安全时间
console.log('[token] valid')
return 'valid' return 'valid'
} else { } else {
console.log('[token] refresh')
return 'refresh' return 'refresh'
} }
} else { }
// 当前令牌过期需要重新登录
// 令牌无效继续判断刷新令牌是否有效
funcDate = output.term(localStorage.getItem('refresh'))
// 令牌过期，刷新令牌有效需要重新登录
if (funcNowDate < funcDate) {
console.log('[token] relist')
return 'relist'
}
// 令牌过期，刷新令牌过期默认游客身份
if (funcNowDate > funcDate) {
console.log('[token] invalid')
return 'invalid' return 'invalid'
} }
}, },
......
src/components/currency-header.vue
...@@ -3,7 +3,14 @@ ...@@ -3,7 +3,14 @@
<div class="components-currency-header row con-c align-c"> <div class="components-currency-header row con-c align-c">
<div class="global-maxwidth row con-b"> <div class="global-maxwidth row con-b">
<div class="about row align-c"> <div class="about row align-c">
<span class="global-cursor" @click="$router.push('/about')">关注我们</span> <el-dropdown>
<span class="global-cursor" @click="$router.push('/about')">关注我们</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item>
<img src="../assets/code.png" alt="">
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<span class="global-cursor" @click="$router.push('/question')">在线咨询</span> <span class="global-cursor" @click="$router.push('/question')">在线咨询</span>
</div> </div>
<div class="row"> <div class="row">
...@@ -141,10 +148,12 @@ ...@@ -141,10 +148,12 @@
}) })
break break
case 'invalid': case 'relist':
this.$message.error('登录失效请重新登录！') this.$message.error('登录失效请重新登录！')
this.onSignOut() this.onSignOut()
break break
default:
} }
}, },
......
src/view/personal/component/personal-header.vue
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
}) })
break break
case 'invalid': case 'relist':
this.onSignOut() this.onSignOut()
break break
} }
......
src/view/personal/supplier-info-change.vue
...@@ -120,6 +120,9 @@ ...@@ -120,6 +120,9 @@
<button class="global-cursor" @click="onSubmit()">确定</button> <button class="global-cursor" @click="onSubmit()">确定</button>
</div> </div>
</div> </div>
<el-dialog :visible.sync="winUploadFile">
<img width="100%" :src="uploadFileUrl" alt="">
</el-dialog>
</div> </div>
</template> </template>
...@@ -593,30 +596,19 @@ ...@@ -593,30 +596,19 @@
.el-form { .el-form {
width: 100%; width: 100%;
.el-upload-list {
.form-item-code { display: flex;
> div { flex-wrap: wrap;
display: flex;
flex-direction: row; li {
width: 146px;
.el-input { height: 146px;
display: inline-block; margin-right: 8px;
width: 310px;
} img {
max-width: 100%;
button { max-height: 100%;
display: inline-block; object-fit: contain;
width: 180px;
height: 40px;
margin-left: 10px;
padding: 0;
border: none;
color: @colorWhite;
img {
width: 180px;
height: 40px;
}
} }
} }
} }
......
src/view/personal/supplier-info.vue
...@@ -52,7 +52,9 @@ ...@@ -52,7 +52,9 @@
</div> </div>
<div class="item-text row"> <div class="item-text row">
<span>营业执照：</span> <span>营业执照：</span>
<img :src="formInfo.licenseImage" alt=""> <div class="item-img">
<img :src="formInfo.licenseImage" alt="">
</div>
</div> </div>
</div> </div>
...@@ -333,6 +335,7 @@ ...@@ -333,6 +335,7 @@
min-width: 900px; min-width: 900px;
margin: 20px 0; margin: 20px 0;
.item-text { .item-text {
max-height: 146px;
> span:nth-child(1) { > span:nth-child(1) {
min-width: 160px; min-width: 160px;
margin: 6px 16px 6px 0; margin: 6px 16px 6px 0;
...@@ -351,6 +354,18 @@ ...@@ -351,6 +354,18 @@
padding-top: 10px padding-top: 10px
} }
} }
.item-img {
width: 146px;
height: 146px;
margin-right: 8px;
}
img {
max-width: 100%;
max-height: 100%;
object-fit: contain;
}
} }
} }
} }
......
src/view/personal/supplier-notice.js
...@@ -96,6 +96,7 @@ let output = function (thisVue, id, type) { ...@@ -96,6 +96,7 @@ let output = function (thisVue, id, type) {
'quantity': funcRawData[i].num, // 标的数量 'quantity': funcRawData[i].num, // 标的数量
'requirement': funcRawData[i].requirement, // 竞价参数要求 'requirement': funcRawData[i].requirement, // 竞价参数要求
'isChild': funcRawData[i].isChild, 'isChild': funcRawData[i].isChild,
'isWin': funcRawData[i].selected,
} }
if (!funcItem.isChild) { if (!funcItem.isChild) {
if (funcRawData[i + 1] && funcRawData[i + 1].isChild) { if (funcRawData[i + 1] && funcRawData[i + 1].isChild) {
......
src/view/personal/supplier-notice.vue
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
<div v-if="Boolean(scope.row.haveChild)" class="quote-table col"> <div v-if="Boolean(scope.row.haveChild)" class="quote-table col">
<!-- <i class="el-icon-edit-outline"></i> --> <!-- <i class="el-icon-edit-outline"></i> -->
</div> </div>
<div v-if="!Boolean(scope.row.haveChild)" class="quote-table col"> <div v-if="Boolean(scope.row.isChild)" class="quote-table col">
<i class="el-icon-edit-outline" @click="onQuoteNote(scope.row, scope.$index)"></i> <i class="el-icon-edit-outline" @click="onQuoteNote(scope.row, scope.$index)"></i>
</div> </div>
</template> </template>
...@@ -780,13 +780,15 @@ ...@@ -780,13 +780,15 @@
// 校验输入数值 // 校验输入数值
if (!iRuleAtom.isMoney(funcValue)) { if (!iRuleAtom.isMoney(funcValue)) {
funcItem.tip = '请输入正确金额格式' funcItem.tip = '请输入正确金额格式'
this.tableQuote[funcIndex] = undefined this.tableQuote[funcIndex].price = ''
console.log(JSON.stringify(this.tableQuote))
return return
} }
if (funcValue === '') { if (!funcValue) {
funcItem.tip = '请输入报价金额' funcItem.tip = '请输入报价金额'
this.tableQuote[funcIndex] = undefined this.tableQuote[funcIndex].price = ''
console.log(JSON.stringify(this.tableQuote))
return return
} }
...@@ -798,7 +800,8 @@ ...@@ -798,7 +800,8 @@
if (funcValue > this.maxQuote) { if (funcValue > this.maxQuote) {
funcItem.tip = '不能超过一百亿元' funcItem.tip = '不能超过一百亿元'
this.tableQuote[funcIndex] = undefined this.tableQuote[funcIndex].price = ''
console.log(JSON.stringify(this.tableQuote))
return return
} }
...@@ -829,18 +832,14 @@ ...@@ -829,18 +832,14 @@
* @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
} }
for (let i = 0, len = this.tableQuote.length; i < len; i++) { for (let i = 0, len = this.tableQuote.length; i < len; i++) {
if (!this.tableQuote[i]) { if (!this.tableQuote[i].price) {
this.$message.error('请填写完整报价信息')
return
}
if (this.tableQuote[i].price === '') {
this.$message.error('请输入报价金额') this.$message.error('请输入报价金额')
return return
} }
......
src/view/public/bid-notice.vue
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</div> </div>
<!-- 代理机构 --> <!-- 代理机构 -->
<div v-if="[1, 2, 3, 4, 5, 6, 9].indexOf(noticeType) >= 0 && JSON.stringify(componentAgency) !== '{}'" class="info-item"> <div v-if="[0, 1, 2, 3, 4, 5, 6, 9].indexOf(noticeType) >= 0 && JSON.stringify(componentAgency) !== '{}'" class="info-item">
<div class="title title-decorate row align-c"> <div class="title title-decorate row align-c">
<span>招标代理机构</span> <span>招标代理机构</span>
</div> </div>
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
<div v-if="Boolean(scope.row.haveChild)" class="quote-table col"> <div v-if="Boolean(scope.row.haveChild)" class="quote-table col">
<!-- <i class="el-icon-edit-outline"></i> --> <!-- <i class="el-icon-edit-outline"></i> -->
</div> </div>
<div v-if="!Boolean(scope.row.haveChild)" class="quote-table col"> <div v-if="Boolean(scope.row.isChild)" class="quote-table col">
<i class="el-icon-edit-outline" @click="onQuoteNote(scope.row, scope.$index)"></i> <i class="el-icon-edit-outline" @click="onQuoteNote(scope.row, scope.$index)"></i>
</div> </div>
</template> </template>
...@@ -766,13 +766,15 @@ ...@@ -766,13 +766,15 @@
// 校验输入数值 // 校验输入数值
if (!iRuleAtom.isMoney(funcValue)) { if (!iRuleAtom.isMoney(funcValue)) {
funcItem.tip = '请输入正确金额格式' funcItem.tip = '请输入正确金额格式'
this.tableQuote[funcIndex] = undefined this.tableQuote[funcIndex].price = ''
console.log(JSON.stringify(this.tableQuote))
return return
} }
if (funcValue === '') { if (!funcValue) {
funcItem.tip = '请输入报价金额' funcItem.tip = '请输入报价金额'
this.tableQuote[funcIndex] = undefined this.tableQuote[funcIndex].price = ''
console.log(JSON.stringify(this.tableQuote))
return return
} }
...@@ -784,7 +786,8 @@ ...@@ -784,7 +786,8 @@
if (funcValue > this.maxQuote) { if (funcValue > this.maxQuote) {
funcItem.tip = '不能超过一百亿元' funcItem.tip = '不能超过一百亿元'
this.tableQuote[funcIndex] = undefined this.tableQuote[funcIndex].price = ''
console.log(JSON.stringify(this.tableQuote))
return return
} }
...@@ -816,18 +819,14 @@ ...@@ -816,18 +819,14 @@
* @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
} }
for (let i = 0, len = this.tableQuote.length; i < len; i++) { for (let i = 0, len = this.tableQuote.length; i < len; i++) {
if (!this.tableQuote[i]) { if (!this.tableQuote[i].price) {
this.$message.error('请填写完整报价信息')
return
}
if (this.tableQuote[i].price === '') {
this.$message.error('请输入报价金额') this.$message.error('请输入报价金额')
return return
} }
......
src/view/specialist/component/specialist-header.vue
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
}) })
break break
case 'invalid': case 'relist':
this.onSignOut() this.onSignOut()
break break
} }
......
src/view/specialist/specialist-info-change.vue
...@@ -816,21 +816,6 @@ ...@@ -816,21 +816,6 @@
border-bottom: 1px #EFEFEF solid; border-bottom: 1px #EFEFEF solid;
} }
.supplier-operation {
height: 40px;
margin-top: 24px;
button {
width: 106px;
height: 36px;
margin-left: 12px;
border:1px solid @colorBlue;
border-radius: 18px;
color: @colorBlue;
background: #FFFFFF;
font-size: @fontSize02;
}
}
.supplier-set { .supplier-set {
width: 100%; width: 100%;
...@@ -859,25 +844,6 @@ ...@@ -859,25 +844,6 @@
.detail-content { .detail-content {
width: 720px; width: 720px;
margin: 20px 0; margin: 20px 0;
.item-text {
> span:nth-child(1) {
width: 160px;
margin: 6px 16px 6px 0;
text-align: right;
font-size: @fontSize02;
}
> span:nth-child(2) {
margin: 6px 0;
font-size: @fontSize01;
}
img {
max-width: 200px;
padding-top: 10px
}
}
.register-info-skill-select { .register-info-skill-select {
width: 40px; width: 40px;
height: 40px; height: 40px;
...@@ -888,34 +854,6 @@ ...@@ -888,34 +854,6 @@
.el-form { .el-form {
width: 100%; width: 100%;
.form-item-code {
> div {
display: flex;
flex-direction: row;
.el-input {
display: inline-block;
width: 310px;
}
button {
display: inline-block;
width: 180px;
height: 40px;
margin-left: 10px;
padding: 0;
border: none;
color: @colorWhite;
background: @colorBlue;
img {
width: 180px;
height: 40px;
}
}
}
}
.form-item-address { .form-item-address {
.el-select { .el-select {
width: 152px; width: 152px;
...@@ -927,6 +865,16 @@ ...@@ -927,6 +865,16 @@
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
width: 630px; width: 630px;
li {
width: 146px;
height: 146px;
margin-right: 8px;
img {
max-width: 100%;
max-height: 100%;
object-fit: contain;
}
}
} }
.el-upload { .el-upload {
...@@ -934,12 +882,10 @@ ...@@ -934,12 +882,10 @@
width: 144px; width: 144px;
height: 200px; height: 200px;
padding-top: 10px; padding-top: 10px;
> div { > div {
position: absolute; position: absolute;
top: 60px; top: 60px;
width: 100%; width: 100%;
> i { > i {
margin-bottom: 10px; margin-bottom: 10px;
} }
......
src/view/specialist/specialist-info.vue
...@@ -65,7 +65,9 @@ ...@@ -65,7 +65,9 @@
</div> </div>
<div class="item-text row"> <div class="item-text row">
<span>最高学历证书：</span> <span>最高学历证书：</span>
<img v-for="(item, index) in uploadOption.education.image" :key="index" :src="item.url" alt=""> <div v-for="(item, index) in uploadOption.education.image" :key="index" class="item-img row">
<img :src="item.url" alt="">
</div>
</div> </div>
<div class="item-text row align-c"> <div class="item-text row align-c">
<span>政府采购或福建省综合评标专家库专家：</span> <span>政府采购或福建省综合评标专家库专家：</span>
...@@ -73,11 +75,15 @@ ...@@ -73,11 +75,15 @@
</div> </div>
<div v-if="formRegister.isOfficial" class="item-text row"> <div v-if="formRegister.isOfficial" class="item-text row">
<span>政府专家证明材料：</span> <span>政府专家证明材料：</span>
<img v-for="(item, index) in uploadOption.official.image" :key="index" :src="item.url" alt=""> <div v-for="(item, index) in uploadOption.official.image" :key="index" class="item-img row">
<img :src="item.url" alt="">
</div>
</div> </div>
<div class="item-text row"> <div class="item-text row">
<span>专家入库声明：</span> <span>专家入库声明：</span>
<img v-for="(item, index) in uploadOption.statement.image" :key="index" :src="item.url" alt=""> <div v-for="(item, index) in uploadOption.statement.image" :key="index" class="item-img row">
<img :src="item.url" alt="">
</div>
</div> </div>
</div> </div>
...@@ -93,7 +99,9 @@ ...@@ -93,7 +99,9 @@
</div> </div>
<div class="item-text row"> <div class="item-text row">
<span>职称证书：</span> <span>职称证书：</span>
<img v-for="(item, index) in uploadOption.skill.image" :key="index" :src="item.url" alt=""> <div v-for="(item, index) in uploadOption.skill.image" :key="index" class="item-img row">
<img :src="item.url" alt="">
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -458,6 +466,7 @@ ...@@ -458,6 +466,7 @@
.detail-content { .detail-content {
margin: 20px 0; margin: 20px 0;
.item-text { .item-text {
margin-bottom: 10px;
> span:nth-child(1) { > span:nth-child(1) {
width: 160px; width: 160px;
margin: 6px 16px 6px 0; margin: 6px 16px 6px 0;
...@@ -470,16 +479,22 @@ ...@@ -470,16 +479,22 @@
font-size: @fontSize01; font-size: @fontSize01;
} }
img {
width: 146px;
margin: 10px 10px 0 0;
border-radius: 5px 5px 5px 5px;
}
.item-skill { .item-skill {
margin-top: 6px; margin-top: 6px;
} }
} }
.item-img {
width: 146px;
height: 146px;
margin-right: 8px;
}
img {
max-width: 100%;
max-height: 100%;
object-fit: contain;
}
} }
} }
} }
......
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