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
5c220466
Commit
5c220466
authored
Feb 27, 2021
by
李俊赕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
v3bug修复
parent
147b58f4
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
93 additions
and
60 deletions
+93
-60
App.vue
take-order/App.vue
+6
-4
http.interceptor.js
take-order/common/http.interceptor.js
+18
-46
pages.json
take-order/pages.json
+6
-0
wxlogin.vue
take-order/pages/login/wxlogin.vue
+4
-0
base.vue
take-order/pages/settle/base.vue
+6
-3
file.vue
take-order/pages/settle/file.vue
+2
-1
index.vue
take-order/pages/settle/index.vue
+3
-0
prompt.vue
take-order/pages/settle/prompt.vue
+11
-3
select.vue
take-order/pages/settle/select.vue
+5
-0
sign-contract.vue
take-order/pages/settle/sign-contract.vue
+32
-3
No files found.
take-order/App.vue
View file @
5c220466
...
...
@@ -96,7 +96,7 @@
protocolContent
:
''
,
signUrl
:
''
,
jumpLoginStatus
:
true
},
...
...
@@ -123,15 +123,17 @@
title
:
'加载中……'
})
const
res
=
await
vm
.
$u
.
api
.
getSettleBaseInfo
()
if
(
!
res
.
status
)
{
if
(
!
res
||
!
res
.
status
)
{
uni
.
showToast
({
title
:
res
.
message
||
'获取基本信息错误'
,
title
:
res
&&
res
.
message
||
'获取基本信息错误'
,
icon
:
'none'
});
return
false
;
}
this
.
globalData
.
settledInfo
=
res
.
data
console
.
log
(
res
.
data
,
'res.data'
)
if
(
!
res
.
data
){
return
}
callBack
(
vm
,
res
.
data
)
uni
.
hideLoading
()
return
res
.
data
...
...
take-order/common/http.interceptor.js
View file @
5c220466
//免登录接口
import
util
from
'@/utils/util.js'
let
noLoginUrl
=
[
// '/addons/cms/wxapp.user/getworkertype',
// '/api/cmstag/tagListByType',
// '/addons/cms/wxapp.login/wxa',//授权昵称头像等
// '/addons/cms/wxapp.login/login',// 授权手机号
// '/addons/ask/api.common/config',
// '/addons/ask/api.login/login',
// '/addons/ask/api.login/register',
// '/addons/ask/api.login/thirdLogin',
// '/addons/ask/api.login/resetpwd',
// '/addons/ask/api.user/myinfo',
// '/addons/ask/api.user/answer',
// '/addons/ask/api.user/question',
// '/addons/ask/api.user/article',
// '/addons/ask/api.user/follower',
// '/addons/ask/api.user/attention',
// '/addons/ask/api.question/index',
// '/addons/ask/api.question/show',
// '/addons/ask/api.article/index',
// '/addons/ask/api.article/show',
// '/addons/ask/api.zone/index',
// '/addons/ask/api.tag/index',
// '/addons/ask/api.tag/show',
// '/addons/ask/api.expert/index',
// '/addons/ask/api.sms/send',
// '/addons/ask/api.ems/send',
// '/addons/ask/api.ajax/get_answer_list',
// '/addons/ask/api.ajax/get_comment_list',
// '/addons/ask/api.ajax/get_question_list',
// '/addons/ask/api.ajax/get_article_list',
// '/addons/ask/api.common/aboutus',
// '/addons/ask/api.common/agreement',
// '/addons/ask/api.login/wxLogin',
// '/addons/ask/api.login/appLogin',
// '/addons/ask/api.login/mobilelogin',
// '/addons/ask/api.search/index',
// '/addons/recharge/api.recharge/config',
// '/addons/third/api/getAuthUrl',
// '/addons/third/api/callback',
// '/addons/third/api/account',
'/v1/h5/settled/get-settled-info'
,
'/v1/h5/settled/area'
,
'/v1/h5/settled/save-info'
,
...
...
@@ -65,7 +25,20 @@ import globalUrl from '@/common/base_url.js'
const
install
=
(
Vue
,
vm
)
=>
{
let
systemApiUrl
=
globalUrl
.
systemUrl
.
apiUrl
let
ucenterApiUrl
=
globalUrl
.
ucenterUrl
.
apiUrl
function
toLoginPage
(){
const
app
=
getApp
()
let
jumpLoginStatus
if
(
app
&&
app
.
globalData
){
jumpLoginStatus
=
app
.
globalData
.
jumpLoginStatus
}
if
(
!
jumpLoginStatus
){
return
}
app
.
globalData
.
jumpLoginStatus
=
false
vm
.
$u
.
route
(
'/pages/login/wxlogin'
);
}
Vue
.
prototype
.
$u
.
http
.
setConfig
({
baseUrl
:
systemApiUrl
,
header
:
{
...
...
@@ -78,7 +51,8 @@ const install = (Vue, vm) => {
const
reg
=
/
\?\w
+/
;
let
token
=
util
.
getToken
()
if
(
!
token
&&
noLoginUrl
.
indexOf
(
config
.
url
)
<
0
){
vm
.
$u
.
route
(
'/pages/login/wxlogin'
);
toLoginPage
()
return
false
}
// // const token = app && app.globalData && app.globalData.token || ''
if
(
config
.
url
.
indexOf
(
'access-token='
)
>=
0
&&
config
.
params
[
'access-token'
]){
...
...
@@ -116,13 +90,12 @@ const install = (Vue, vm) => {
if
(
res
.
header
.
__token__
)
{
vm
.
$u
.
vuex
(
'vuex__token__'
,
res
.
header
.
__token__
);
}
console
.
log
(
res
,
'res'
)
const
code
=
getCode
(
res
)
switch
(
code
)
{
case
1
:
case
0
:
if
(
res
.
status
===
401
||
res
.
statusCode
===
401
){
vm
.
$u
.
route
(
'/pages/login/wxlogin'
);
toLoginPage
()
return
}
return
result
;
...
...
@@ -146,8 +119,7 @@ const install = (Vue, vm) => {
let
pages
=
getCurrentPages
();
if
((
pages
[
pages
.
length
-
1
]).
route
!==
'pages/login/wxlogin'
){
util
.
setToken
(
''
)
vm
.
$u
.
route
(
'/pages/login/wxlogin'
);
toLoginPage
()
return
}
return
result
;
...
...
take-order/pages.json
View file @
5c220466
...
...
@@ -12,6 +12,12 @@
"navigationBarTitleText"
:
"充电桩安装招募"
}
},{
"path"
:
"pages/settle/base"
,
"style"
:
{
"navigationBarTitleText"
:
"基本信息"
}
},{
"path"
:
"pages/settle/sign-contract"
,
"style"
:
{
...
...
take-order/pages/login/wxlogin.vue
View file @
5c220466
...
...
@@ -36,6 +36,10 @@
this
.
icon_notice
=
getApp
().
globalData
.
icon_auth_notice
this
.
icon_auth_notice_new
=
getApp
().
globalData
.
icon_auth_notice_new
},
onShow
(){
const
app
=
getApp
()
app
.
globalData
.
jumpLoginStatus
=
true
},
methods
:
{
//用户授权得到用户的信息
getUserInfo
:
async
function
(
e
)
{
...
...
take-order/pages/settle/base.vue
View file @
5c220466
...
...
@@ -14,13 +14,13 @@
</view-->
<view
class=
"item item-select u-row-between"
@
click=
"gopage('/pages/settle/select?selectType=area')"
>
<view
class=
"label"
>
接单城市:
</view>
<p
class=
"u-flex-1 u-text-right txt"
>
{{
areaTxts
.
join
(
','
)
||
""
}}
</p>
<p
class=
"u-flex-1 u-text-right txt"
>
{{
areaTxts
.
slice
(
0
,
2
).
join
(
','
)
||
""
}}
</p>
<u-icon
name=
"arrow-right"
color=
"#999"
size=
"28"
></u-icon>
</view>
<view
class=
"tips"
>
(必选项)选择你可以服务的城市,可选多个
</view>
<view
class=
"item item-select flex-yc"
@
click=
"gopage('/pages/settle/select?selectType=working_age')"
>
<view
class=
"label"
>
电工工龄(年):
</view>
<p
class=
"u-flex-1 u-text-right"
v-show=
"baseInfo.working_age !== ''"
>
<p
class=
"u-flex-1 u-text-right
area
"
v-show=
"baseInfo.working_age !== ''"
>
{{
workingAgeTxt
}}
</p>
<u-icon
name=
"arrow-right"
color=
"#999"
size=
"28"
></u-icon>
...
...
@@ -74,7 +74,7 @@
placeholder=
"请输入详细服务地址"
placeholder-style=
'color:#CCCCCC;font-size:28rpx;'
/>
</view>
<view
class=
"tips"
>
(必填项)填写可接收物料的地址
</view>
</view>
</view>
...
...
@@ -641,6 +641,9 @@
.blueColor
{
color
:
#007AFF
;
}
.area
{
max-width
:
400rpx
;
}
/* .back_view{
background-color: #FFFFFF;
...
...
take-order/pages/settle/file.vue
View file @
5c220466
...
...
@@ -35,7 +35,7 @@
</view>
<view
class=
"seat"
></view>
<view
class=
"btn-wrap fixed flex flex-xc"
>
<button
class=
"btn-submit"
:disabled=
"!submitBtnStatus"
@
click=
"
submitFileInfo
"
>
<button
class=
"btn-submit"
:disabled=
"!submitBtnStatus"
@
click=
"
$u.debounce(submitFileInfo, 500)
"
>
{{
!submitBtnStatus ? "完成必填项,可提交资料" : "提交"
}}
...
...
@@ -242,6 +242,7 @@
icon
:
'none'
})
formFlag
=
false
;
return
formFlag
;
}
if
(
!
fileInfo
.
id_card_back_check
)
{
uni
.
showToast
({
...
...
take-order/pages/settle/index.vue
View file @
5c220466
...
...
@@ -39,6 +39,9 @@
vm
.
status
=
result
.
record
.
status
}
let
settledInfo
=
await
app
.
getBaseInfo
(
this
,
callBack
)
if
(
!
settledInfo
){
return
}
this
.
settledInfo
=
settledInfo
this
.
status
=
settledInfo
.
record
.
status
},
...
...
take-order/pages/settle/prompt.vue
View file @
5c220466
...
...
@@ -9,7 +9,7 @@
<view
class=
"tips-box"
v-if=
"info.tipsArr"
>
<text
:class=
"['tips',info.tipsArr.length>1 && index===0 ? 'red' : '']"
v-for=
"(txt,index) in info.tipsArr"
>
{{
txt
}}
</text>
</view>
<button
class=
"btn-submit"
@
click=
"
goPage(info.url
)"
>
{{
info
.
btnTxt
}}
</button>
<button
class=
"btn-submit"
@
click=
"
$u.debounce(goPage, 500
)"
>
{{
info
.
btnTxt
}}
</button>
</view>
</
template
>
...
...
@@ -105,6 +105,7 @@
return
}
const
status
=
record
.
status
// const status = 4
const
infoArr
=
this
.
promptList
.
filter
(
item
=>
{
const
itemStatus
=
item
.
status
// console.log(itemStatus,'itemStatus')
...
...
@@ -115,12 +116,19 @@
return
itemStatus
===
status
||
idx
>=
0
})
const
info
=
infoArr
.
length
>
0
&&
infoArr
[
0
]
if
(
info
&&
status
===
6
){
if
(
!
info
){
this
.
info
=
this
.
promptList
[
0
]
return
}
if
(
status
===
6
){
info
.
tipsArr
[
0
]
=
'请缴纳'
+
this
.
settledInfo
.
record
.
deposit
+
'元质保金'
}
else
if
(
status
===
4
){
info
.
tipsArr
[
1
]
=
this
.
settledInfo
.
record
.
reason
||
''
}
this
.
info
=
info
},
goPage
(
url
)
{
goPage
()
{
const
url
=
this
.
info
.
url
uni
.
navigateTo
({
url
,
});
...
...
take-order/pages/settle/select.vue
View file @
5c220466
...
...
@@ -386,6 +386,10 @@
this
.
selected
.
working_age
=
item
.
value
this
.
selected
.
workingAgeTxt
=
item
.
name
},
selectAllarea
(
idx
){
const
allChildren
=
this
.
areaList
[
this
.
currentIndex
]
},
selectArea
(
areaItem
)
{
const
code
=
areaItem
.
id
const
selected
=
this
.
selected
...
...
@@ -445,6 +449,7 @@
.nav-right
{
height
:
100%
;
overflow-x
:
hidden
;
overflow
:
auto
;
width
:
375rpx
;
...
...
take-order/pages/settle/sign-contract.vue
View file @
5c220466
...
...
@@ -3,7 +3,36 @@
<view
class=
"content-txt"
>
<view
class=
"title"
>
入驻协议内容
</view>
<view
class=
"txt"
>
此处为协议正式内容
</view>
<view
class=
"txt"
>
</br>
师傅入驻须知
</br>
一、入驻流程
提交资料 → 审核通过 → 签署协议 → 开始接单
</br>
</br>
二、入驻条件
</br>
1.年龄在18-60周岁之间;
</br>
2.初中及以上学历;
</br>
3.能熟练使用智能手机;
</br>
4.与人交流时态度良好,沟通顺畅;
</br>
</br>
三、注意事项
</br>
1.若审核通过,平台工作人员将会电话联系您,并邀约参加师傅培训会,请您耐心等待;
</br>
2.开关插座、线路维修、空开漏保等品类的师傅需持有电工证;
</br>
3.家电清洗品类的师傅需持有专业高温清洗设备,并在每一笔清洗订单中上传设备照片(单独水枪类清洗设备不符合规定)。
</br>
4.请如实填写自己擅长品类,如有核实师傅申请的维修品类和开通账号的维修品类不一致,将不给予接单资格
</br>
</view>
</view>
<view
class=
"base-list"
>
<view
class=
"item item-input flex-yc"
>
...
...
@@ -49,7 +78,7 @@
</view>
<view
class=
"seat"
></view>
<view
class=
"btn-wrap flex-xc"
>
<button
class=
"btn-submit"
:disabled=
"!submitStatus"
@
click=
"
submitBaseInfo
"
>
<button
class=
"btn-submit"
:disabled=
"!submitStatus"
@
click=
"
$u.debounce(submitBaseInfo, 500)
"
>
我已阅读协议,点击签约{{count ? '('+count+')' : ''}}
</button>
</view>
...
...
@@ -97,7 +126,7 @@
})
this
.
startCounting
()
//
this.getBaseInfo()
this
.
getBaseInfo
()
// const url = 'https://m.test.ibanshou.cn/activity/settled_2021/mini'
// uni.navigateTo({
// url:'/pages/settle/web?url='+url
...
...
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