Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
take_order
Project
Project
Details
Activity
Releases
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
和慭琛
take_order
Commits
22c3c26a
Commit
22c3c26a
authored
Feb 27, 2021
by
李俊赕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
签约页面优化
parent
d1efcde1
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
76 additions
and
3 deletions
+76
-3
index.vue
take-order/pages/exam/index.vue
+59
-1
file.vue
take-order/pages/settle/file.vue
+3
-1
pay-ensure.vue
take-order/pages/settle/pay-ensure.vue
+2
-0
select.vue
take-order/pages/settle/select.vue
+1
-0
sign-contract.vue
take-order/pages/settle/sign-contract.vue
+11
-1
icon-success.png
take-order/static/settle/icon-success.png
+0
-0
No files found.
take-order/pages/exam/index.vue
View file @
22c3c26a
...
@@ -53,6 +53,15 @@
...
@@ -53,6 +53,15 @@
</view>
</view>
</
template
>
</
template
>
<view
class=
"mask"
v-show=
"isComplete"
>
<view
class=
"box"
>
<image
class=
"icon"
src=
"@/static/settle/icon-success.png"
></image>
<view
class=
"txt"
>
您已成功完成考试
</view>
<button
class=
"btn"
@
click=
"$u.debounce(goSignContract, 500)"
>
去签约
</button>
</view>
</view>
</view>
</view>
</template>
</template>
...
@@ -78,6 +87,7 @@
...
@@ -78,6 +87,7 @@
examScore
:
1
,
examScore
:
1
,
alphaArr
:[
'A'
,
'B'
,
'C'
,
'D'
,
'E'
],
alphaArr
:[
'A'
,
'B'
,
'C'
,
'D'
,
'E'
],
timer
:
null
,
timer
:
null
,
isComplete
:
false
,
}
}
},
},
onLoad
(
e
)
{
onLoad
(
e
)
{
...
@@ -88,6 +98,12 @@
...
@@ -88,6 +98,12 @@
},
},
methods
:
{
methods
:
{
goSignContract
(){
const
url
=
'/pages/settle/prompt'
uni
.
navigateTo
({
url
})
},
contentFilter
(
txt
){
contentFilter
(
txt
){
if
(
!
txt
){
if
(
!
txt
){
return
txt
return
txt
...
@@ -146,6 +162,7 @@
...
@@ -146,6 +162,7 @@
if
(
res
.
data
.
data
.
examStatus
==
0
||
if
(
res
.
data
.
data
.
examStatus
==
0
||
res
.
data
.
data
.
examStatus
==
1
)
{
res
.
data
.
data
.
examStatus
==
1
)
{
this
.
examScore
=
res
.
data
.
data
.
examScore
that
.
userExamId
=
res
.
data
.
data
.
id
that
.
userExamId
=
res
.
data
.
data
.
id
that
.
getNext
()
that
.
getNext
()
}
}
...
@@ -283,7 +300,8 @@
...
@@ -283,7 +300,8 @@
}
else
{
}
else
{
that
.
isSelect
=
true
that
.
isSelect
=
true
clearTimeout
(
this
.
timer
)
clearTimeout
(
this
.
timer
)
that
.
bottomTitle
=
'完成考试,现在签约'
this
.
isComplete
=
true
// that.bottomTitle = '完成考试,现在签约'
}
}
}
else
{
}
else
{
...
@@ -696,4 +714,44 @@
...
@@ -696,4 +714,44 @@
.bottom-padding
{
.bottom-padding
{
padding-bottom
:
180rpx
;
padding-bottom
:
180rpx
;
}
}
.mask
{
position
:
fixed
;
left
:
0
;
width
:
100%
;
height
:
100%
;
display
:
flex
;
justify-content
:
center
;
flex-direction
:
column
;
align-items
:
center
;
background
:
rgba
(
0
,
0
,
0
,
0
.5
);
}
.box
{
width
:
660rpx
;
height
:
696rpx
;
padding
:
0
70rpx
;
border-radius
:
12rpx
;
background-color
:
#fff
;
.icon
{
margin
:
80rpx
auto
0
;
display
:
block
;
width
:
192rpx
;
height
:
192rpx
;
}
.txt
{
margin-top
:
78rpx
;
margin-bottom
:
98rpx
;
font-weight
:
bold
;
font-size
:
48rpx
;
line-height
:
66rpx
;
color
:
#666
;
text-align
:
center
;
}
.btn
{
line-height
:
104rpx
;
border-radius
:
52rpx
;
background
:
#2272ff
;
font-size
:
32rpx
;
color
:
#fff
;
}
}
</
style
>
</
style
>
take-order/pages/settle/file.vue
View file @
22c3c26a
...
@@ -470,11 +470,13 @@
...
@@ -470,11 +470,13 @@
// bottom: px2rem(36);
// bottom: px2rem(36);
height
:
104rpx
;
height
:
104rpx
;
line-height
:
104rpx
;
line-height
:
104rpx
;
border-radius
:
52rpx
;
overflow
:
hidden
;
background
:
#2272ff
;
background
:
#2272ff
;
font-size
:
32rpx
;
font-size
:
32rpx
;
color
:
#fff
;
color
:
#fff
;
&
:disabled
{
&
[
disabled
]
{
border
:
2rpx
solid
#999
;
border
:
2rpx
solid
#999
;
background-color
:
#f3f3f3
;
background-color
:
#f3f3f3
;
color
:
#999
;
color
:
#999
;
...
...
take-order/pages/settle/pay-ensure.vue
View file @
22c3c26a
...
@@ -85,6 +85,7 @@
...
@@ -85,6 +85,7 @@
}
}
const
res
=
await
this
.
$u
.
api
.
getSettleDepositResult
(
params
);
const
res
=
await
this
.
$u
.
api
.
getSettleDepositResult
(
params
);
if
(
res
.
status
!==
true
){
if
(
res
.
status
!==
true
){
this
.
saving
=
false
return
return
}
}
uni
.
showToast
({
uni
.
showToast
({
...
@@ -158,6 +159,7 @@
...
@@ -158,6 +159,7 @@
// console.log(res.confirm,'res.confirm')
// console.log(res.confirm,'res.confirm')
self
.
pending
()
self
.
pending
()
}
else
if
(
res
.
cancel
)
{
}
else
if
(
res
.
cancel
)
{
self
.
saving
=
false
console
.
log
(
'用户点击取消'
);
console
.
log
(
'用户点击取消'
);
}
}
}
}
...
...
take-order/pages/settle/select.vue
View file @
22c3c26a
...
@@ -517,6 +517,7 @@
...
@@ -517,6 +517,7 @@
// bottom: px2rem(36);
// bottom: px2rem(36);
height
:
104rpx
;
height
:
104rpx
;
line-height
:
104rpx
;
line-height
:
104rpx
;
border-radius
:
52rpx
;
background
:
#2272ff
;
background
:
#2272ff
;
font-size
:
32rpx
;
font-size
:
32rpx
;
color
:
#fff
;
color
:
#fff
;
...
...
take-order/pages/settle/sign-contract.vue
View file @
22c3c26a
...
@@ -82,6 +82,13 @@
...
@@ -82,6 +82,13 @@
我已阅读协议,点击签约{{count ? '('+count+')' : ''}}
我已阅读协议,点击签约{{count ? '('+count+')' : ''}}
</button>
</button>
</view>
</view>
<view
class=
"mask"
>
<view
class=
"box"
>
<button>
去提交
</button>
</view>
</view>
</view>
</view>
</template>
</template>
...
@@ -136,7 +143,10 @@
...
@@ -136,7 +143,10 @@
computed
:
{
computed
:
{
submitStatus
()
{
submitStatus
()
{
const
baseInfo
=
this
.
baseInfo
const
baseInfo
=
this
.
baseInfo
const
flag
=
baseInfo
.
pay_type
&&
baseInfo
.
bank_no
&&
baseInfo
.
bank_name
let
flag
=
baseInfo
.
pay_type
&&
baseInfo
.
bank_no
&&
baseInfo
.
bank_name
if
(
baseInfo
.
pay_type
===
'bankcard'
){
flag
=
flag
&&
baseInfo
.
bank_site
}
return
flag
&&
!
this
.
saving
&&
this
.
isStop
;
return
flag
&&
!
this
.
saving
&&
this
.
isStop
;
},
},
},
},
...
...
take-order/static/settle/icon-success.png
0 → 100644
View file @
22c3c26a
8.63 KB
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