Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
W
web-purchase
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张冬
web-purchase
Commits
32bce56a
Commit
32bce56a
authored
Nov 17, 2020
by
zhangdong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
开标大厅逻辑改变
parent
d4d4289a
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
11 deletions
+25
-11
bidOpenhal.vue
src/pages/purchaser/bid/bidOpen/bidOpenhal.vue
+12
-6
bidOpenhal.vue
src/pages/supply/bid/joinProject/bidOpen/bidOpenhal.vue
+11
-4
request.js
src/utils/request.js
+2
-1
No files found.
src/pages/purchaser/bid/bidOpen/bidOpenhal.vue
View file @
32bce56a
...
...
@@ -17,7 +17,8 @@
<timeDown
:remain-time=
"decodeTime"
@
countDowmEnd=
"decodeTimeEnd"
></timeDown>
</div>
<!--
<div
class=
"flex"
v-show=
"signatureTime"
>
-->
<div
class=
"flex"
v-show=
"openStatus == 2&&endbidButton"
>
<!--
<div
class=
"flex"
v-show=
"openStatus == 2&&endbidButton"
>
-->
<div
class=
"flex"
v-show=
"openStatus == 2 && issueTable"
>
<p>
签名倒计时:
</p>
<timeDown
:remain-time=
"signatureTime"
@
countDowmEnd=
"signatureTimeEnd"
></timeDown>
</div>
...
...
@@ -414,7 +415,7 @@ export default {
duration
:
1500
});
setTimeout
(()
=>
{
this
.
$router
.
push
(
"/purchaser/bid/workbench"
)
this
.
$router
.
push
(
'/purchaser/bid/workbench'
);
},
1500
);
// this.isfailInfo = false;
// this.isFailed = false;
...
...
@@ -487,18 +488,23 @@ export default {
this
.
openStatus
=
data
.
openStatus
;
this
.
isFailed
=
data
.
isFailed
;
this
.
issueTable
=
data
.
issueTable
;
// 解密时间
let
comparyTime
=
this
.
storagedecodeTime
-
(
localTime
-
data
.
openBidTime
)
/
1000
;
if
(
data
.
issueTable
){
// 签名时间
this
.
signatureTime
=
this
.
storagesignatureTime
-
(
localTime
-
data
.
openBidTime
)
/
1000
+
comparyTime
;
}
if
(
data
.
openStatus
==
2
)
{
let
localTime
=
new
Date
().
getTime
();
console
.
log
(
this
.
storagedecodeTime
,
'..............'
);
let
comparyTime
=
this
.
storagedecodeTime
-
(
localTime
-
data
.
openBidTime
)
/
1000
;
console
.
log
(
comparyTime
);
if
(
comparyTime
>
0
)
{
this
.
decodeTime
=
comparyTime
;
if
(
comparyTime
>
0
)
{
console
.
log
(
'大于'
);
}
else
{
console
.
log
(
'小于'
);
this
.
endbidButton
=
true
;
this
.
signatureTime
=
this
.
storagesignatureTime
-
(
localTime
-
data
.
openBidTime
)
/
1000
;
}
}
}
...
...
src/pages/supply/bid/joinProject/bidOpen/bidOpenhal.vue
View file @
32bce56a
...
...
@@ -15,7 +15,8 @@
<p>
解密倒计时:
</p>
<timeDown
:remain-time=
"decodeTime"
@
countDowmEnd=
"decodeTimeEnd"
></timeDown>
</div>
<div
class=
"flex"
v-show=
"openStatus == 2 && isDecode"
>
<!--
<div
class=
"flex"
v-show=
"openStatus == 2 && isDecode"
>
-->
<div
class=
"flex"
v-show=
"openStatus == 2 && issueTable"
>
<p>
签名倒计时:
</p>
<timeDown
:remain-time=
"signatureTime"
@
countDowmEnd=
"signatureTimeEnd"
></timeDown>
</div>
...
...
@@ -406,16 +407,22 @@ export default {
this
.
issueTable
=
data
.
issueTable
;
let
localTime
=
new
Date
().
getTime
();
console
.
log
(
this
.
storagedecodeTime
,
'..............'
);
// 解密时间
let
comparyTime
=
this
.
storagedecodeTime
-
(
localTime
-
data
.
openBidTime
)
/
1000
;
if
(
comparyTime
>
0
)
{
// 签名时间
let
comparyTime1
=
this
.
storagesignatureTime
-
(
localTime
-
data
.
openBidTime
)
/
1000
;
this
.
decodeTime
=
comparyTime
;
if
(
data
.
issueTable
)
{
this
.
signatureTime
=
comparyTime1
+
comparyTime
;
}
if
(
comparyTime
>
0
)
{
console
.
log
(
'大于'
);
}
else
{
console
.
log
(
'小于'
);
this
.
isDecode
=
true
;
let
comparyTime1
=
this
.
storagesignatureTime
-
(
localTime
-
data
.
openBidTime
)
/
1000
;
if
(
comparyTime
>
0
)
{
this
.
signatureTime
=
comparyTime1
;
console
.
log
(
'大于'
);
}
else
{
console
.
log
(
'小于'
);
...
...
src/utils/request.js
View file @
32bce56a
...
...
@@ -6,7 +6,8 @@ import {requestUrl,homeUrl} from "./common.js"
// 创建axios实例
const
service
=
axios
.
create
({
baseURL
:
`/apis`
,
// baseURL: `/apis`,
baseURL
:
"http://www.eugood.cn/apis"
,
timeout
:
35000
// 请求超时时间
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment