Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
self-support
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
李俊赕
self-support
Commits
7ada66f9
Commit
7ada66f9
authored
Apr 23, 2021
by
Facius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
第一轮bug修复
parent
09e50ec4
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
83 additions
and
58 deletions
+83
-58
index.vue
src/components/settle/index.vue
+7
-1
pages.json
src/pages.json
+2
-1
index.vue
src/pages/exam/index.vue
+10
-9
base.vue
src/pages/settle/base.vue
+4
-2
file.vue
src/pages/settle/file.vue
+5
-2
pay-ensure.vue
src/pages/settle/pay-ensure.vue
+31
-24
prompt.vue
src/pages/settle/prompt.vue
+23
-18
sign-contract.vue
src/pages/settle/sign-contract.vue
+1
-1
No files found.
src/components/settle/index.vue
View file @
7ada66f9
...
...
@@ -31,7 +31,13 @@
}
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.settle-view
{
::-webkit-scrollbar
{
width
:
0
;
}
}
.introduction
{
border-radius
:
12rpx
;
overflow
:
auto
;
...
...
src/pages.json
View file @
7ada66f9
...
...
@@ -106,7 +106,8 @@
"path"
:
"pages/settle/select"
,
"style"
:
{
"navigationBarTitleText"
:
"选择可服务的城市"
,
"navigationBarBackgroundColor"
:
"#FFFFFF"
"navigationBarBackgroundColor"
:
"#FFFFFF"
,
"disableScroll"
:
true
}
},
{
...
...
src/pages/exam/index.vue
View file @
7ada66f9
...
...
@@ -53,7 +53,7 @@
</view>
<view
class=
"bottomRightView"
>
<view
:class=
"isSelect ? 'nextBtn selectBackColor' : 'nextBtn defaultBackColor' "
@
click=
"
next
Click()"
>
@
click=
"
handle
Click()"
>
<text
class=
"bottomTitle"
>
{{
bottomTitle
}}
</text>
</view>
</view>
...
...
@@ -300,7 +300,7 @@
that
.
vuex_token
+
'?userExamId='
+
this
.
userExamId
+
'&questionId='
+
questionId
+
'&userAnswerIds='
+
this
.
userAnswerIds
,
'&userAnswerIds='
+
(
this
.
userAnswerIds
||
'9999'
),
// 9999超时自动下一题
method
:
'POST'
,
data
:
{
// userExamId:this.userExamId,
...
...
@@ -372,7 +372,6 @@
},
startCounting
:
function
()
{
if
(
this
.
isStop
)
{
return
}
...
...
@@ -441,16 +440,18 @@
},
// 点击下一步
handleClick
()
{
// 判断有没有选
if
(
!
this
.
isSelect
)
{
return
}
this
.
nextClick
()
},
//下一题
nextClick
:
function
()
{
//判断有没有选
if
(
!
this
.
isSelect
)
{
return
}
clearTimeout
(
this
.
timer
)
this
.
currentNumber
=
this
.
currentNumber
+
1
...
...
src/pages/settle/base.vue
View file @
7ada66f9
...
...
@@ -235,7 +235,7 @@
}
this
.
baseInfo
=
res
.
data
uni
.
showToast
({
title
:
'
入驻基本信息
提交成功'
,
title
:
'提交成功'
,
icon
:
'success'
});
},
...
...
@@ -326,7 +326,9 @@
*/
async
submitBaseInfo
()
{
if
(
!
this
.
submitStatus
)
{
return
}
// this.newSubmitBaseInfo()
// return
const
baseInfo
=
this
.
baseInfo
;
...
...
src/pages/settle/file.vue
View file @
7ada66f9
...
...
@@ -321,7 +321,7 @@ export default {
break
;
}
await
self
.
chooseImage
(
"qiniu"
,
attr
)
await
self
.
chooseImage
(
"qiniu"
,
{...
attr
,
options
:
{
count
:
1
}}
)
if
(
self
.
uploadType
&&
self
.
imgList
&&
self
.
imgList
.
length
>
0
)
{
// 设置图片对象
self
.
imgObj
[
self
.
uploadType
]
=
self
.
imgList
...
...
@@ -460,7 +460,10 @@ export default {
return
formFlag
;
},
async
submitFileInfo
()
{
async
submitFileInfo
()
{
if
(
!
this
.
submitBtnStatus
)
{
return
}
if
(
!
this
.
checkFileInfo
())
{
return
;
}
...
...
src/pages/settle/pay-ensure.vue
View file @
7ada66f9
...
...
@@ -2,7 +2,7 @@
<view
class=
"content"
>
<Settle
:index=
"5"
>
<view
class=
"base-list"
>
<view
class=
"title"
>
充电桩安装
需缴纳配件押金
</view>
<view
class=
"title"
>
您还
需缴纳配件押金
</view>
<view
class=
"price"
><text>
¥
</text>
{{
settledInfo
.
record
.
deposit
}}
</view>
<view
class=
"list"
>
<view
class=
"item u-flex u-row-between"
>
...
...
@@ -146,7 +146,8 @@
this
.
saving
=
true
uni
.
showLoading
({
title
:
'支付中……'
})
})
// 提交支付订单
const
code
=
await
this
.
getCode
()
const
params
=
{
...
...
@@ -158,31 +159,14 @@
}
const
response
=
await
this
.
$u
.
api
.
paySettleDeposit
(
params
)
console
.
log
(
response
)
if
(
response
.
code
!==
200
)
{
if
(
response
.
code
!==
200
)
{
this
.
saving
=
false
uni
.
showToast
({
title
:
response
.
message
,
icon
:
'none'
})
return
}
let
timer
=
setTimeout
(
res
=>
{
clearTimeout
(
timer
)
uni
.
showModal
({
title
:
'提示'
,
content
:
'支付结果'
,
confirmText
:
'成功'
,
cancelText
:
'失败'
,
success
:
function
(
res
)
{
if
(
res
.
confirm
)
{
// console.log(res.confirm,'res.confirm')
self
.
pending
()
}
else
if
(
res
.
cancel
)
{
self
.
saving
=
false
console
.
log
(
'用户点击取消'
);
}
}
});
},
1000
)
const
{
charge
,
...
...
@@ -193,16 +177,19 @@
pingpp
.
createPayment
(
charge
,
(
result
,
err
)
=>
{
if
(
result
==
"success"
)
{
// 只有微信公众账号 (wx_pub)、微信小程序 (wx_lite)、QQ 公众号 (qpay_pub)、支付宝口碑 (alipay_qr)
// 支付成功的结果会在这里返回,其他的支付结果都会跳转到 extra 中对应的 URL。
// 支付成功的结果会在这里返回,其他的支付结果都会跳转到 extra 中对应的 URL。
this
.
showPopView
()
uni
.
showToast
({
title
:
'支付成功'
,
icon
:
'none'
})
}
else
if
(
result
==
"fail"
)
{
// charge 不正确或者微信公众账号/QQ 公众号/支付宝口碑支付失败时会在此处返回
// console.log(err.msg)
// console.log(err.msg)
this
.
showPopView
()
}
else
if
(
result
==
"cancel"
)
{
// 微信公众账号、QQ 公众号、支付宝口碑支付取消支付
// 微信公众账号、QQ 公众号、支付宝口碑支付取消支付
this
.
saving
=
false
uni
.
showToast
({
title
:
'您已经取消了支付'
,
icon
:
'none'
...
...
@@ -210,6 +197,26 @@
}
});
},
showPopView
()
{
// let timer = setTimeout(res => {
// clearTimeout(timer)
uni
.
showModal
({
title
:
'提示'
,
content
:
'支付结果'
,
confirmText
:
'成功'
,
cancelText
:
'失败'
,
success
:
((
res
)
=>
{
if
(
res
.
confirm
)
{
// console.log(res.confirm,'res.confirm')
this
.
pending
()
}
else
if
(
res
.
cancel
)
{
this
.
pending
()
console
.
log
(
'用户点击取消'
);
}
})
});
// }, 1000)
}
},
}
</
script
>
...
...
src/pages/settle/prompt.vue
View file @
7ada66f9
...
...
@@ -2,9 +2,9 @@
<view
class=
"container u-row-between"
v-if=
"info"
>
<Settle
:index=
"pageIndex"
>
<view
class=
"content-view"
>
<
view
style=
"min-height: 120rpx;"
v-if=
"status == 8"
></view
>
<
!--
<view
style=
"min-height: 120rpx;"
v-if=
"status == 8"
></view>
--
>
<view
class=
"u-flex u-row-center"
>
<image
:class=
"['icon',
{active: status != 1}]"
<image
:class=
"['icon',
{active: status != 1
, h: [1, 2, 3, 4].indexOf(status) != -1
}]"
:src="imageUrl">
</image>
</view>
...
...
@@ -16,7 +16,7 @@
v-for=
"(txt,index) in info.tipsArr"
:key=
"index"
>
{{
txt
}}
</text>
</view>
<view
class=
"services-view"
>
<view
v-if=
"
status != 8
"
>
<view
v-if=
"
[1, 2, 3, 4].indexOf(status) != -1
"
>
<image
class=
"service-info-image"
:src=
"erweimaImage"
></image>
<view
class=
"content-info-tip"
>
长按二维码添加官方客服微信
</view>
<view
class=
"content-info-tip"
>
及时了解审核进度
</view>
...
...
@@ -45,14 +45,14 @@
promptList
:
[{
status
:
1
,
statusName
:
'待审核'
,
txtArr
:
[
'
已提交,等待审核'
,
'
正在审核中'
],
txtArr
:
[
'
入驻资料提交成功'
,
'您的申请入驻资料已成功提交,工作人员
正在审核中'
],
btnTxt
:
'去首页'
,
url
:
'/pages/index/index'
},
{
status
:
2
,
statusName
:
'已通过'
,
txtArr
:
[
'
恭喜,审核通过'
,
'“充电桩安装入驻审核”
'
],
btnTxt
:
'
去考试
'
,
txtArr
:
[
'
入驻资料审核成功'
,
'您的申请入驻资料已审核提交,可进行在线学习考试
'
],
btnTxt
:
'
下一步
'
,
url
:
'/pages/learn/exam'
},
{
status
:
3
,
...
...
@@ -64,28 +64,26 @@
},
{
status
:
4
,
statusName
:
'已驳回'
,
txtArr
:
[
'
您的入驻资料已被驳回!'
,
'可重新提交资料!
'
],
txtArr
:
[
'
入驻资料审核失败
'
],
tipsArr
:
[
'原因:'
,
'图片不够清楚'
],
btnTxt
:
'重新提交'
,
url
:
'/pages/settle/file'
},
{
status
:
8
,
statusName
:
'step4'
,
txtArr
:
[
'您已通过'
,
'“充电桩安装入驻考试”'
],
tipsArr
:
[
'可以正式签约了'
],
btnTxt
:
'去签约'
,
txtArr
:
[
'您已通过接单在线考试'
,
'通过在线考试后,可以前往签约'
],
btnTxt
:
'下一步'
,
url
:
'/pages/settle/sign-contract'
},
{
status
:
[
5
,
6
],
statusName
:
'未支付保证金'
,
txtArr
:
[
'您已成为'
,
"充电桩安装的签约服务商"
],
tipsArr
:
[
'请缴纳1000元质保金'
],
btnTxt
:
'去缴纳保证金'
,
txtArr
:
[
'您已成功完成签约'
,
"完成签约后,缴纳配件押金即可完成入驻"
],
btnTxt
:
'下一步'
,
url
:
'/pages/settle/pay-ensure'
},
{
status
:
7
,
statusName
:
'已支付保证金'
,
txtArr
:
[
'您已成
为'
,
"充电桩安装的正式服务商
"
],
txtArr
:
[
'您已成
功缴纳配件押金'
,
" 成功缴纳配件押金后即前往接单
"
],
btnTxt
:
'去首页'
,
url
:
'/pages/index/index'
}],
...
...
@@ -177,9 +175,10 @@
this
.
info
=
this
.
promptList
[
0
]
return
}
if
(
status
===
6
)
{
info
.
tipsArr
[
0
]
=
'请缴纳'
+
this
.
settledInfo
.
record
.
deposit
+
'元质保金'
}
else
if
(
status
===
4
)
{
// if (status === 6) {
// info.tipsArr[0] = '请缴纳' + this.settledInfo.record.deposit + '元质保金'
// } else
if
(
status
===
4
)
{
info
.
tipsArr
[
1
]
=
this
.
settledInfo
.
record
.
reason
||
''
}
this
.
info
=
info
...
...
@@ -218,9 +217,15 @@
height
:
224rpx
;
&
.active
{
margin-top
:
38
rpx
;
margin-top
:
150
rpx
;
width
:
234rpx
;
height
:
222rpx
;
}
&
.h
{
margin-top
:
38rpx
;
width
:
234rpx
;
height
:
222rpx
;
}
}
...
...
src/pages/settle/sign-contract.vue
View file @
7ada66f9
...
...
@@ -366,7 +366,7 @@
// }
uni
.
hideLoading
()
uni
.
showToast
({
title
:
'
入驻基本信息
提交成功'
,
title
:
'提交成功'
,
icon
:
'success'
});
// let timer = setTimeout(() => {
...
...
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