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
f8d0481d
Commit
f8d0481d
authored
Dec 06, 2020
by
和慭琛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
登录模块 下单模块 UI高保真还原 接口对接 100%
parent
5742e1ef
Changes
19
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
597 additions
and
153 deletions
+597
-153
App.vue
take-order/App.vue
+8
-2
pages.json
take-order/pages.json
+18
-21
index.vue
take-order/pages/index/index.vue
+16
-2
record.vue
take-order/pages/index/record.vue
+211
-58
index.vue
take-order/pages/take/index.vue
+42
-8
main.js.map
...npackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
+1
-1
index.js.map
...ge/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
+1
-1
record.js.map
...e/dist/dev/.sourcemap/mp-weixin/pages/index/record.js.map
+1
-1
index.js.map
...age/dist/dev/.sourcemap/mp-weixin/pages/take/index.js.map
+1
-1
app.json
take-order/unpackage/dist/dev/mp-weixin/app.json
+4
-4
main.js
take-order/unpackage/dist/dev/mp-weixin/common/main.js
+8
-2
main.wxss
take-order/unpackage/dist/dev/mp-weixin/common/main.wxss
+6
-0
index.js
take-order/unpackage/dist/dev/mp-weixin/pages/index/index.js
+16
-2
record.js
...-order/unpackage/dist/dev/mp-weixin/pages/index/record.js
+46
-32
record.wxml
...rder/unpackage/dist/dev/mp-weixin/pages/index/record.wxml
+1
-1
record.wxss
...rder/unpackage/dist/dev/mp-weixin/pages/index/record.wxss
+172
-9
index.js
take-order/unpackage/dist/dev/mp-weixin/pages/take/index.js
+9
-0
index.wxml
...-order/unpackage/dist/dev/mp-weixin/pages/take/index.wxml
+1
-1
index.wxss
...-order/unpackage/dist/dev/mp-weixin/pages/take/index.wxss
+35
-7
No files found.
take-order/App.vue
View file @
f8d0481d
...
@@ -24,6 +24,10 @@
...
@@ -24,6 +24,10 @@
icon_agree_yes
:
'https://qn-static.banshouhui.com/agree_yes.png'
,
icon_agree_yes
:
'https://qn-static.banshouhui.com/agree_yes.png'
,
//勾选取消 图标
//勾选取消 图标
icon_agrss_no
:
'https://qn-static.banshouhui.com/agree_no.png'
,
icon_agrss_no
:
'https://qn-static.banshouhui.com/agree_no.png'
,
//无数据 图标
icon_noData
:
'https://qn-static.banshouhui.com/empty.png'
,
//登录注册页--
//登录注册页--
//通过code获取用户信息(登录)
//通过code获取用户信息(登录)
getUsersByCode
:
'/wxh-support-rest/rest/ssoinfo/v3/getUsersByCode'
,
getUsersByCode
:
'/wxh-support-rest/rest/ssoinfo/v3/getUsersByCode'
,
...
@@ -69,6 +73,9 @@
...
@@ -69,6 +73,9 @@
console
.
log
(
res
.
data
);
console
.
log
(
res
.
data
);
that
.
globalData
.
token
=
res
.
data
that
.
globalData
.
token
=
res
.
data
that
.
initAPIneedToken
()
console
.
log
(
'当前token'
,
that
.
token
)
}
}
})
})
...
@@ -76,8 +83,7 @@
...
@@ -76,8 +83,7 @@
//RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502
//RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502
//this.globalData.token = 'RTOKEN52e603131ae93ac83ac0b3628064822690ee4de0'
//this.globalData.token = 'RTOKEN52e603131ae93ac83ac0b3628064822690ee4de0'
this
.
initAPIneedToken
()
console
.
log
(
'当前token'
,
this
.
token
)
...
...
take-order/pages.json
View file @
f8d0481d
...
@@ -7,36 +7,45 @@
...
@@ -7,36 +7,45 @@
"pages"
:
[
//pages数组中第一项表示应用启动页,参考:https
:
//uniapp.dcloud.io/collocation/pages
"pages"
:
[
//pages数组中第一项表示应用启动页,参考:https
:
//uniapp.dcloud.io/collocation/pages
{
{
"path"
:
"pages/index/
success
"
,
"path"
:
"pages/index/
index
"
,
"style"
:
{
"style"
:
{
"navigationBarTitleText"
:
"下单"
"navigationBarTitleText"
:
"下单"
}
}
},
},
{
{
"path"
:
"pages/
index
/index"
,
"path"
:
"pages/
take
/index"
,
"style"
:
{
"style"
:
{
"navigationBarTitleText"
:
"
下
单"
"navigationBarTitleText"
:
"
接
单"
}
}
},
},
{
{
"path"
:
"pages/
login/wxlogin
"
,
"path"
:
"pages/
index/record
"
,
"style"
:
{
"style"
:
{
"navigationBarTitleText"
:
"
授权登录
"
"navigationBarTitleText"
:
"
下的单
"
}
}
},
},
{
{
"path"
:
"pages/
take/index
"
,
"path"
:
"pages/
index/success
"
,
"style"
:
{
"style"
:
{
"navigationBarTitleText"
:
"
接
单"
"navigationBarTitleText"
:
"
下
单"
}
}
},
},
{
"path"
:
"pages/login/wxlogin"
,
"style"
:
{
"navigationBarTitleText"
:
"授权登录"
}
},
{
{
"path"
:
"pages/take/finish"
,
"path"
:
"pages/take/finish"
,
"style"
:
{
"style"
:
{
...
@@ -67,19 +76,7 @@
...
@@ -67,19 +76,7 @@
"style"
:
{
"style"
:
{
"navigationBarTitleText"
:
"接单详情"
"navigationBarTitleText"
:
"接单详情"
}
}
},
{
"path"
:
"pages/index/record"
,
"style"
:
{
"navigationBarTitleText"
:
"下的单"
}
}
}
],
],
"globalStyle"
:
{
"globalStyle"
:
{
...
...
take-order/pages/index/index.vue
View file @
f8d0481d
...
@@ -249,6 +249,7 @@
...
@@ -249,6 +249,7 @@
*/
*/
},
},
//客户报单接口
//客户报单接口
createAppletsOrder
:
async
function
()
{
createAppletsOrder
:
async
function
()
{
console
.
log
(
'联系人:'
+
this
.
name
)
console
.
log
(
'联系人:'
+
this
.
name
)
...
@@ -260,9 +261,14 @@
...
@@ -260,9 +261,14 @@
uni
.
showLoading
({
uni
.
showLoading
({
title
:
'请稍候'
title
:
'请稍候'
})
})
//getApp().globalData.createAppletsOrder
//'/wxh-worker-rest/rest/order/revision/applets/'
//+this.globalData.token+'/order/createAppletsOrder'
uni
.
request
({
uni
.
request
({
url
:
getApp
().
globalData
.
domain_Name
url
:
getApp
().
globalData
.
domain_Name
+
getApp
().
globalData
.
createAppletsOrder
,
+
'/wxh-worker-rest/rest/order/revision/applets/'
+
getApp
().
globalData
.
token
+
'/order/createAppletsOrder'
,
method
:
'POST'
,
method
:
'POST'
,
header
:
{
header
:
{
'Content-Type'
:
'application/x-www-form-urlencoded'
,
'Content-Type'
:
'application/x-www-form-urlencoded'
,
...
@@ -282,6 +288,14 @@
...
@@ -282,6 +288,14 @@
console
.
log
(
'客户报单接口 成功'
)
console
.
log
(
'客户报单接口 成功'
)
console
.
log
(
res
)
console
.
log
(
res
)
uni
.
hideLoading
()
uni
.
hideLoading
()
if
(
res
.
statusCode
==
401
){
uni
.
navigateTo
({
url
:
'/pages/login/wxlogin'
})
return
}
if
(
res
.
data
.
code
==
200
){
if
(
res
.
data
.
code
==
200
){
uni
.
showToast
({
uni
.
showToast
({
title
:
'下单成功'
title
:
'下单成功'
...
@@ -332,7 +346,7 @@
...
@@ -332,7 +346,7 @@
//获取消息订阅信息
//获取消息订阅信息
getSubSubscribeMessage
:
function
(){
getSubSubscribeMessage
:
function
(){
let
that
=
this
uni
.
requestSubscribeMessage
({
uni
.
requestSubscribeMessage
({
tmplIds
:
[
'3doUrjIT3-FIfmzsLdBy5MQ5i_q5braPzIbVZRBoEjU'
],
tmplIds
:
[
'3doUrjIT3-FIfmzsLdBy5MQ5i_q5braPzIbVZRBoEjU'
],
success
(
res
)
{
success
(
res
)
{
...
...
take-order/pages/index/record.vue
View file @
f8d0481d
<
template
>
<
template
>
<view
class=
""
>
<view
class=
"
backView
"
>
<view
class=
"topView"
>
<view
class=
"topView"
>
<view
:class=
"activeTop == 0 ? 'topItemView activeColor' : 'topItemView' "
@
click=
"topClick(0)"
>
<view
class=
"topItemView u-m-l-80"
@
click=
"topClick(0)"
>
<text
class=
"topItemText"
>
未完成
</text>
<text
:class=
"activeTop == 0 ? 'activeItemText' : 'topItemText' "
>
未完成
</text>
<view
class=
"activeItemBottom"
v-if=
"activeTop == 0"
></view>
</view>
</view>
<view
:class=
"activeTop == 1 ? 'topItemView activeColor' : 'topItemView' "
@
click=
"topClick(1)"
>
<view
class=
"topItemView u-m-r-80"
@
click=
"topClick(1)"
>
<text
class=
"topItemText"
>
已完成
</text>
<text
:class=
"activeTop == 1 ? 'activeItemText' : 'topItemText' "
>
已完成
</text>
<view
class=
"activeItemBottom"
v-if=
"activeTop == 1"
></view>
</view>
</view>
</view>
</view>
<view
class=
"listView"
>
<view
class=
"listView"
>
<view
class=
"itemView"
v-
for=
"(item,ikey) in unfinishList"
:key=
"ikey"
v-if=
"activeTop == 0
"
>
<view
class=
"itemView"
v-
if=
"activeTop == 0"
v-for=
"(item,ikey) in unfinishList"
:key=
"ikey
"
>
<view
class=
"nameView"
>
<view
class=
"nameView"
>
<text
class=
"u-font-24 u-m-l-24"
>
{{
item
.
name
}}
{{
item
.
phone
}}
</text>
<view
class=
"nameLeftView"
>
<text
class=
"u-font-24 u-m-r-24"
>
{{
item
.
type
}}
</text>
<text
class=
"nameText"
v-if=
"item.contactName"
>
{{
item
.
contactName
}}
</text>
<text
class=
"phoneText"
v-if=
"item.contactMobilephone"
>
{{
item
.
contactMobilephone
}}
</text>
</view>
<text
class=
"productText"
v-if=
"item.brandName && item.categoryName && item.orderServiceType"
>
{{
item
.
brandName
}}
-
{{
item
.
categoryName
}}
-
{{
item
.
orderServiceType
}}
</text>
</view>
</view>
<text
class=
"u-font-24 u-m-l-24 u-m-r-24"
>
{{
item
.
address
}}
</text>
<text
class=
"addressText"
v-if=
"item.contactAddress"
>
{{
item
.
contactAddress
}}
</text>
<view
class=
"nameView"
>
<view
class=
"itemBottomView"
v-if=
"item.maintainWorkerName || item.statusText"
>
<text
class=
"u-font-24 u-m-l-24 underLine"
@
click=
"callClick(item.worker_phone)"
>
{{
item
.
worker_name
}}
{{
item
.
worker_phone
}}
</text>
<view
class=
"workerView"
>
<text
class=
"u-font-24 u-m-r-24"
>
{{
item
.
status
}}
</text>
<text
class=
"workerNameText"
v-if=
"item.maintainWorkerName"
>
师傅:
{{
item
.
maintainWorkerName
}}
</text>
<text
class=
"workerPhoneText"
v-if=
"item.maintainWorkerPhone"
@
click=
"callClick(item.maintainWorkerPhone)"
>
{{
item
.
maintainWorkerPhone
}}
</text>
</view>
<view
class=
"statusView"
v-if=
"item.statusText"
>
<text
class=
"statusText"
v-if=
"item.statusText"
>
{{
item
.
statusText
}}
</text>
</view>
</view>
</view>
<view
class=
"divideLine u-m-t-30"
></view>
</view>
<view
class=
"noDataView"
v-if=
"activeTop == 0 && unfinishList.length==0"
>
<image
class=
"noDataIcon"
:src=
"icon_noData"
mode=
""
></image>
<text
class=
"noDataText"
>
暂无数据
</text>
</view>
</view>
<view
class=
"itemView"
v-
for=
"(item,ikey) in finishList"
:key=
"ikey"
v-if=
"activeTop == 1
"
>
<view
class=
"itemView"
v-
if=
"activeTop == 1"
v-for=
"(item,ikey) in finishList"
:key=
"ikey
"
>
<view
class=
"nameView"
>
<view
class=
"nameView"
>
<text
class=
"u-font-24 u-m-l-24"
>
{{
item
.
name
}}
{{
item
.
phone
}}
</text>
<view
class=
"nameLeftView"
>
<text
class=
"u-font-24 u-m-r-24"
>
{{
item
.
type
}}
</text>
<text
class=
"nameText"
v-if=
"item.contactName"
>
{{
item
.
contactName
}}
</text>
<text
class=
"phoneText"
v-if=
"item.contactMobilephone"
>
{{
item
.
contactMobilephone
}}
</text>
</view>
<text
class=
"productText"
v-if=
"item.brandName && item.categoryName && item.orderServiceType"
>
{{
item
.
brandName
}}
-
{{
item
.
categoryName
}}
-
{{
item
.
orderServiceType
}}
</text>
</view>
</view>
<text
class=
"u-font-24 u-m-l-24 u-m-r-24"
>
{{
item
.
address
}}
</text>
<text
class=
"addressText"
v-if=
"item.contactAddress"
>
{{
item
.
contactAddress
}}
</text>
<view
class=
"nameView"
>
<view
class=
"itemBottomView"
v-if=
"item.maintainWorkerName || item.statusText"
>
<text
class=
"u-font-24 u-m-l-24 underLine"
@
click=
"callClick(item.worker_phone)"
>
{{
item
.
worker_name
}}
{{
item
.
worker_phone
}}
</text>
<view
class=
"workerView"
v-if=
"item.maintainWorkerName"
>
<text
class=
"u-font-24 u-m-r-24"
>
{{
item
.
status
}}
</text>
<text
class=
"workerNameText"
v-if=
"item.maintainWorkerName"
>
师傅:
{{
item
.
maintainWorkerName
}}
</text>
<text
class=
"workerPhoneText"
v-if=
"item.maintainWorkerPhone"
@
click=
"callClick(item.maintainWorkerPhone)"
>
{{
item
.
maintainWorkerPhone
}}
</text>
</view>
<view
class=
"statusView"
v-if=
"item.statusText"
>
<text
class=
"statusText"
v-if=
"item.statusText"
>
{{
item
.
statusText
}}
</text>
</view>
</view>
</view>
<view
class=
"divideLine u-m-t-30"
></view>
</view>
<view
class=
"noDataView"
v-if=
"activeTop == 1 && finishList.length==0"
>
<image
class=
"noDataIcon"
:src=
"icon_noData"
mode=
""
></image>
<text
class=
"noDataText"
>
暂无数据
</text>
</view>
</view>
</view>
</view>
</view>
</view>
...
@@ -40,41 +68,15 @@
...
@@ -40,41 +68,15 @@
data
()
{
data
()
{
return
{
return
{
activeTop
:
0
,
activeTop
:
0
,
unfinishList
:[
unfinishList
:[],
{
finishList
:[],
name
:
'未完工'
,
icon_noData
:
''
phone
:
'15811112222'
,
type
:
'米家-新风机-安装'
,
address
:
'广东省深圳市宝安区新安街道庭威产业园10C'
,
status
:
'待抢单'
,
worker_name
:
'范师傅'
,
worker_phone
:
'15933334444'
},
{
name
:
'许三多'
,
phone
:
'15811112222'
,
type
:
'TCL-空调-清洗'
,
address
:
'广西壮族自治区北海市海城区高德街道北海大道东延线5号和苑12幢203号'
,
status
:
'待完工'
,
worker_name
:
'范师傅'
,
worker_phone
:
'15933334444'
},
],
finishList
:[
{
name
:
'已完工'
,
phone
:
'15811112222'
,
type
:
'米家-新风机-安装'
,
address
:
'广东省深圳市宝安区新安街道庭威产业园10C'
,
status
:
'待抢单'
,
worker_name
:
'范师傅'
,
worker_phone
:
'15933334444'
}
]
}
}
},
},
onLoad
()
{
onLoad
()
{
this
.
icon_noData
=
getApp
().
globalData
.
icon_noData
},
},
onShow
(){
onShow
(){
...
@@ -91,13 +93,14 @@
...
@@ -91,13 +93,14 @@
//获取下单列表
//获取下单列表
createOrderList
:
function
()
{
createOrderList
:
function
()
{
let
that
=
this
uni
.
request
({
uni
.
request
({
url
:
getApp
().
globalData
.
domain_Name
url
:
getApp
().
globalData
.
domain_Name
+
getApp
().
globalData
.
createOrderList
,
+
getApp
().
globalData
.
createOrderList
,
method
:
'GET'
,
method
:
'GET'
,
data
:
{
data
:
{
type
:
this
.
activeTop
,
type
:
this
.
activeTop
,
pageNumber
:
1
,
pageNumber
:
0
,
pageSize
:
20
,
pageSize
:
20
,
},
},
success
:
(
res
)
=>
{
success
:
(
res
)
=>
{
...
@@ -105,6 +108,17 @@
...
@@ -105,6 +108,17 @@
console
.
log
(
res
)
console
.
log
(
res
)
if
(
res
.
data
.
code
==
200
){
if
(
res
.
data
.
code
==
200
){
console
.
log
(
'code=200'
)
//未完工
if
(
that
.
activeTop
==
0
){
console
.
log
(
'未完工'
)
that
.
unfinishList
=
res
.
data
.
data
}
//已完工
if
(
that
.
activeTop
==
1
){
console
.
log
(
'已完工'
)
that
.
finishList
=
res
.
data
.
data
}
}
else
{
}
else
{
uni
.
showToast
({
uni
.
showToast
({
...
@@ -144,26 +158,53 @@
...
@@ -144,26 +158,53 @@
</
script
>
</
script
>
<
style
>
<
style
>
.backView
{
background-color
:
#FAFAFA
;
position
:
absolute
;
top
:
0
;
left
:
0
;
width
:
100%
;
height
:
100%
;
display
:
flex
;
flex-direction
:
column
;
}
.topView
{
.topView
{
display
:
flex
;
display
:
flex
;
flex-direction
:
row
;
flex-direction
:
row
;
}
}
.topItemView
{
.topItemView
{
background-color
:
#F
FFFFF
;
background-color
:
#F
AFAFA
;
width
:
50%
;
width
:
50%
;
height
:
80
rpx
;
height
:
94
rpx
;
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
align-items
:
center
;
align-items
:
center
;
justify-content
:
center
;
border
:
2
rpx
solid
#999999
;
}
}
.topItemText
{
.topItemText
{
font-size
:
28
rpx
;
margin-top
:
22
rpx
;
font-size
:
32
rpx
;
color
:
#999999
;
}
.activeItemText
{
margin-top
:
22
rpx
;
font-size
:
32
rpx
;
color
:
#333333
;
}
.activeItemBottom
{
margin-top
:
10
rpx
;
background-color
:
#2272FF
;
width
:
70
rpx
;
height
:
6
rpx
;
}
}
.activeColor
{
.activeColor
{
background-color
:
#999999
;
background-color
:
#999999
;
}
}
...
@@ -174,14 +215,65 @@
...
@@ -174,14 +215,65 @@
}
}
.itemView
{
.itemView
{
background-color
:
#FFFFFF
;
width
:
100%
;
width
:
100%
;
height
:
200
rpx
;
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
border-bottom
:
2
rpx
solid
#999999
;
}
.divideLine
{
background-color
:
#FAFAFA
;
width
:
100%
;
height
:
16
rpx
;
}
}
.nameView
{
.nameView
{
width
:
100%
;
height
:
90
rpx
;
display
:
flex
;
flex-direction
:
row
;
align-items
:
center
;
justify-content
:
space-between
;
}
.nameLeftView
{
background-color
:
#FFFFFF
;
width
:
40%
;
height
:
100%
;
display
:
flex
;
flex-direction
:
row
;
align-items
:
center
;
}
.nameText
{
margin-left
:
28
rpx
;
color
:
#333333
;
font-size
:
28
rpx
;
font-weight
:
bold
;
}
.phoneText
{
margin-left
:
20
rpx
;
color
:
#999999
;
font-size
:
24
rpx
;
}
.productText
{
margin-right
:
30
rpx
;
font-size
:
28
rpx
;
color
:
#333333
;
}
.addressText
{
margin-left
:
24
rpx
;
margin-right
:
30
rpx
;
font-size
:
28
rpx
;
line-height
:
40
rpx
;
color
:
#333333
;
}
.itemBottomView
{
background-color
:
#FFFFFF
;
width
:
100%
;
width
:
100%
;
height
:
80
rpx
;
height
:
80
rpx
;
display
:
flex
;
display
:
flex
;
...
@@ -190,8 +282,69 @@
...
@@ -190,8 +282,69 @@
justify-content
:
space-between
;
justify-content
:
space-between
;
}
}
.workerView
{
background-color
:
#FFFFFF
;
width
:
70%
;
height
:
100%
;
display
:
flex
;
flex-direction
:
row
;
align-items
:
flex-end
;
}
.workerNameText
{
margin-left
:
28
rpx
;
color
:
#333333
;
font-size
:
28
rpx
;
font-weight
:
bold
;
}
.workerPhoneText
{
margin-left
:
16
rpx
;
color
:
#2272FF
;
font-size
:
28
rpx
;
text-decoration
:
underline
;
}
.statusView
{
background-color
:
#FFFFFF
;
width
:
30%
;
height
:
80
rpx
;
display
:
flex
;
flex-direction
:
row-reverse
;
align-items
:
flex-end
;
}
.statusText
{
color
:
#2272FF
;
font-size
:
28
rpx
;
margin-right
:
30
rpx
;
}
.underLine
{
.underLine
{
text-decoration
:
underline
;
text-decoration
:
underline
;
}
}
.noDataView
{
background-color
:
#FFFFFF
;
width
:
100%
;
height
:
1112
rpx
;
display
:
flex
;
flex-direction
:
column
;
align-items
:
center
;
}
.noDataIcon
{
background-color
:
#FFFFFF
;
margin-top
:
280
rpx
;
width
:
200
rpx
;
height
:
160
rpx
;
}
.noDataText
{
color
:
#999999
;
margin-top
:
32
rpx
;
font-size
:
28
rpx
;
}
</
style
>
</
style
>
take-order/pages/take/index.vue
View file @
f8d0481d
<
template
>
<
template
>
<view
class=
""
>
<view
class=
"backView"
>
<view
class=
"topView"
>
<view
class=
"topView"
>
<view
class=
"topItemView u-m-l-80"
@
click=
"topClick(0)"
>
<text
:class=
"activeTop == 0 ? 'activeItemText' : 'topItemText' "
>
未完成
</text>
<view
class=
"activeItemBottom"
v-if=
"activeTop == 0"
></view>
</view>
<view
class=
"topItemView u-m-r-80"
@
click=
"topClick(1)"
>
<text
:class=
"activeTop == 1 ? 'activeItemText' : 'topItemText' "
>
已完成
</text>
<view
class=
"activeItemBottom"
v-if=
"activeTop == 1"
></view>
</view>
</view>
<!--view class="topView">
<view
:class=
"activeTop == 0 ? 'topItemView activeColor' : 'topItemView' "
@
click=
"topClick(0)"
>
<view
:class=
"activeTop == 0 ? 'topItemView activeColor' : 'topItemView' "
@
click=
"topClick(0)"
>
<text
class=
"topItemText"
>
抢单广场
</text>
<text
class=
"topItemText"
>
抢单广场
</text>
</view>
</view>
...
@@ -11,7 +20,7 @@
...
@@ -11,7 +20,7 @@
<view
:class=
"activeTop == 2 ? 'topItemView activeColor' : 'topItemView' "
@
click=
"topClick(2)"
>
<view
:class=
"activeTop == 2 ? 'topItemView activeColor' : 'topItemView' "
@
click=
"topClick(2)"
>
<text
class=
"topItemText"
>
已完工单
</text>
<text
class=
"topItemText"
>
已完工单
</text>
</view>
</view>
</view>
</view
--
>
<view
class=
"listView"
>
<view
class=
"listView"
>
<view
class=
"itemView"
v-if=
"activeTop == 0"
@
click=
"itemClick(item)"
v-for=
"(item,ikey) in grabList"
:key=
"ikey"
>
<view
class=
"itemView"
v-if=
"activeTop == 0"
@
click=
"itemClick(item)"
v-for=
"(item,ikey) in grabList"
:key=
"ikey"
>
<view
class=
"nameView"
>
<view
class=
"nameView"
>
...
@@ -394,23 +403,48 @@
...
@@ -394,23 +403,48 @@
</
script
>
</
script
>
<
style
>
<
style
>
.backView
{
background-color
:
#FAFAFA
;
position
:
absolute
;
top
:
0
;
left
:
0
;
width
:
100%
;
height
:
100%
;
display
:
flex
;
flex-direction
:
column
;
}
.topView
{
.topView
{
display
:
flex
;
display
:
flex
;
flex-direction
:
row
;
flex-direction
:
row
;
}
}
.topItemView
{
.topItemView
{
background-color
:
#F
FFFFF
;
background-color
:
#F
AFAFA
;
width
:
33%
;
width
:
33%
;
height
:
80
rpx
;
height
:
94
rpx
;
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
align-items
:
center
;
align-items
:
center
;
justify-content
:
center
;
border
:
2
rpx
solid
#999999
;
}
}
.topItemText
{
.topItemText
{
font-size
:
28
rpx
;
margin-top
:
22
rpx
;
font-size
:
32
rpx
;
color
:
#999999
;
}
.activeItemText
{
margin-top
:
22
rpx
;
font-size
:
32
rpx
;
color
:
#333333
;
}
.activeItemBottom
{
margin-top
:
10
rpx
;
background-color
:
#2272FF
;
width
:
70
rpx
;
height
:
6
rpx
;
}
}
.activeColor
{
.activeColor
{
...
...
take-order/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
View file @
f8d0481d
This diff is collapsed.
Click to expand it.
take-order/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
View file @
f8d0481d
This diff is collapsed.
Click to expand it.
take-order/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/record.js.map
View file @
f8d0481d
This diff is collapsed.
Click to expand it.
take-order/unpackage/dist/dev/.sourcemap/mp-weixin/pages/take/index.js.map
View file @
f8d0481d
This diff is collapsed.
Click to expand it.
take-order/unpackage/dist/dev/mp-weixin/app.json
View file @
f8d0481d
{
{
"pages"
:
[
"pages"
:
[
"pages/index/success"
,
"pages/index/index"
,
"pages/index/index"
,
"pages/login/wxlogin"
,
"pages/take/index"
,
"pages/take/index"
,
"pages/index/record"
,
"pages/index/success"
,
"pages/login/wxlogin"
,
"pages/take/finish"
,
"pages/take/finish"
,
"pages/take/measure"
,
"pages/take/measure"
,
"pages/take/rob"
,
"pages/take/rob"
,
"pages/take/detail"
,
"pages/take/detail"
"pages/index/record"
],
],
"subPackages"
:
[],
"subPackages"
:
[],
"window"
:
{
"window"
:
{
...
...
take-order/unpackage/dist/dev/mp-weixin/common/main.js
View file @
f8d0481d
...
@@ -127,6 +127,10 @@ var _default =
...
@@ -127,6 +127,10 @@ var _default =
icon_agree_yes
:
'https://qn-static.banshouhui.com/agree_yes.png'
,
icon_agree_yes
:
'https://qn-static.banshouhui.com/agree_yes.png'
,
//勾选取消 图标
//勾选取消 图标
icon_agrss_no
:
'https://qn-static.banshouhui.com/agree_no.png'
,
icon_agrss_no
:
'https://qn-static.banshouhui.com/agree_no.png'
,
//无数据 图标
icon_noData
:
'https://qn-static.banshouhui.com/empty.png'
,
//登录注册页--
//登录注册页--
//通过code获取用户信息(登录)
//通过code获取用户信息(登录)
getUsersByCode
:
'/wxh-support-rest/rest/ssoinfo/v3/getUsersByCode'
,
getUsersByCode
:
'/wxh-support-rest/rest/ssoinfo/v3/getUsersByCode'
,
...
@@ -172,6 +176,9 @@ var _default =
...
@@ -172,6 +176,9 @@ var _default =
console
.
log
(
res
.
data
);
console
.
log
(
res
.
data
);
that
.
globalData
.
token
=
res
.
data
;
that
.
globalData
.
token
=
res
.
data
;
that
.
initAPIneedToken
();
console
.
log
(
'当前token'
,
that
.
token
);
}
});
}
});
...
@@ -179,8 +186,7 @@ var _default =
...
@@ -179,8 +186,7 @@ var _default =
//RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502
//RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502
//this.globalData.token = 'RTOKEN52e603131ae93ac83ac0b3628064822690ee4de0'
//this.globalData.token = 'RTOKEN52e603131ae93ac83ac0b3628064822690ee4de0'
this
.
initAPIneedToken
();
console
.
log
(
'当前token'
,
this
.
token
);
...
...
take-order/unpackage/dist/dev/mp-weixin/common/main.wxss
View file @
f8d0481d
...
@@ -3472,6 +3472,12 @@ u-dropdown {
...
@@ -3472,6 +3472,12 @@ u-dropdown {
...
...
take-order/unpackage/dist/dev/mp-weixin/pages/index/index.js
View file @
f8d0481d
...
@@ -381,6 +381,7 @@ var _default = {
...
@@ -381,6 +381,7 @@ var _default = {
*/
*/
},
},
//客户报单接口
//客户报单接口
createAppletsOrder
:
function
()
{
var
_createAppletsOrder
=
_asyncToGenerator
(
/*#__PURE__*/
_regenerator
.
default
.
mark
(
function
_callee
()
{
var
_this
=
this
;
return
_regenerator
.
default
.
wrap
(
function
_callee$
(
_context
)
{
while
(
1
)
{
switch
(
_context
.
prev
=
_context
.
next
)
{
case
0
:
createAppletsOrder
:
function
()
{
var
_createAppletsOrder
=
_asyncToGenerator
(
/*#__PURE__*/
_regenerator
.
default
.
mark
(
function
_callee
()
{
var
_this
=
this
;
return
_regenerator
.
default
.
wrap
(
function
_callee$
(
_context
)
{
while
(
1
)
{
switch
(
_context
.
prev
=
_context
.
next
)
{
case
0
:
console
.
log
(
'联系人:'
+
this
.
name
);
console
.
log
(
'联系人:'
+
this
.
name
);
...
@@ -392,9 +393,14 @@ var _default = {
...
@@ -392,9 +393,14 @@ var _default = {
uni
.
showLoading
({
uni
.
showLoading
({
title
:
'请稍候'
});
title
:
'请稍候'
});
//getApp().globalData.createAppletsOrder
//'/wxh-worker-rest/rest/order/revision/applets/'
//+this.globalData.token+'/order/createAppletsOrder'
uni
.
request
({
uni
.
request
({
url
:
getApp
().
globalData
.
domain_Name
+
url
:
getApp
().
globalData
.
domain_Name
+
getApp
().
globalData
.
createAppletsOrder
,
'/wxh-worker-rest/rest/order/revision/applets/'
+
getApp
().
globalData
.
token
+
'/order/createAppletsOrder'
,
method
:
'POST'
,
method
:
'POST'
,
header
:
{
header
:
{
'Content-Type'
:
'application/x-www-form-urlencoded'
,
'Content-Type'
:
'application/x-www-form-urlencoded'
,
...
@@ -414,6 +420,14 @@ var _default = {
...
@@ -414,6 +420,14 @@ var _default = {
console
.
log
(
'客户报单接口 成功'
);
console
.
log
(
'客户报单接口 成功'
);
console
.
log
(
res
);
console
.
log
(
res
);
uni
.
hideLoading
();
uni
.
hideLoading
();
if
(
res
.
statusCode
==
401
)
{
uni
.
navigateTo
({
url
:
'/pages/login/wxlogin'
});
return
;
}
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
uni
.
showToast
({
uni
.
showToast
({
title
:
'下单成功'
});
title
:
'下单成功'
});
...
@@ -464,7 +478,7 @@ var _default = {
...
@@ -464,7 +478,7 @@ var _default = {
//获取消息订阅信息
//获取消息订阅信息
getSubSubscribeMessage
:
function
getSubSubscribeMessage
()
{
getSubSubscribeMessage
:
function
getSubSubscribeMessage
()
{
var
that
=
this
;
uni
.
requestSubscribeMessage
({
uni
.
requestSubscribeMessage
({
tmplIds
:
[
'3doUrjIT3-FIfmzsLdBy5MQ5i_q5braPzIbVZRBoEjU'
],
tmplIds
:
[
'3doUrjIT3-FIfmzsLdBy5MQ5i_q5braPzIbVZRBoEjU'
],
success
:
function
success
(
res
)
{
success
:
function
success
(
res
)
{
...
...
take-order/unpackage/dist/dev/mp-weixin/pages/index/record.js
View file @
f8d0481d
...
@@ -110,46 +110,48 @@ __webpack_require__.r(__webpack_exports__);
...
@@ -110,46 +110,48 @@ __webpack_require__.r(__webpack_exports__);
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
var
_default
=
var
_default
=
{
{
data
:
function
data
()
{
data
:
function
data
()
{
return
{
return
{
activeTop
:
0
,
activeTop
:
0
,
unfinishList
:
[
unfinishList
:
[],
{
finishList
:
[],
name
:
'未完工'
,
icon_noData
:
''
};
phone
:
'15811112222'
,
type
:
'米家-新风机-安装'
,
address
:
'广东省深圳市宝安区新安街道庭威产业园10C'
,
status
:
'待抢单'
,
worker_name
:
'范师傅'
,
worker_phone
:
'15933334444'
},
{
name
:
'许三多'
,
phone
:
'15811112222'
,
type
:
'TCL-空调-清洗'
,
address
:
'广西壮族自治区北海市海城区高德街道北海大道东延线5号和苑12幢203号'
,
status
:
'待完工'
,
worker_name
:
'范师傅'
,
worker_phone
:
'15933334444'
}],
finishList
:
[
{
name
:
'已完工'
,
phone
:
'15811112222'
,
type
:
'米家-新风机-安装'
,
address
:
'广东省深圳市宝安区新安街道庭威产业园10C'
,
status
:
'待抢单'
,
worker_name
:
'范师傅'
,
worker_phone
:
'15933334444'
}]
};
},
},
onLoad
:
function
onLoad
()
{
onLoad
:
function
onLoad
()
{
this
.
icon_noData
=
getApp
().
globalData
.
icon_noData
;
},
},
onShow
:
function
onShow
()
{
onShow
:
function
onShow
()
{
...
@@ -166,13 +168,14 @@ var _default =
...
@@ -166,13 +168,14 @@ var _default =
//获取下单列表
//获取下单列表
createOrderList
:
function
createOrderList
()
{
createOrderList
:
function
createOrderList
()
{
var
that
=
this
;
uni
.
request
({
uni
.
request
({
url
:
getApp
().
globalData
.
domain_Name
+
url
:
getApp
().
globalData
.
domain_Name
+
getApp
().
globalData
.
createOrderList
,
getApp
().
globalData
.
createOrderList
,
method
:
'GET'
,
method
:
'GET'
,
data
:
{
data
:
{
type
:
this
.
activeTop
,
type
:
this
.
activeTop
,
pageNumber
:
1
,
pageNumber
:
0
,
pageSize
:
20
},
pageSize
:
20
},
success
:
function
success
(
res
)
{
success
:
function
success
(
res
)
{
...
@@ -180,6 +183,17 @@ var _default =
...
@@ -180,6 +183,17 @@ var _default =
console
.
log
(
res
);
console
.
log
(
res
);
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
console
.
log
(
'code=200'
);
//未完工
if
(
that
.
activeTop
==
0
)
{
console
.
log
(
'未完工'
);
that
.
unfinishList
=
res
.
data
.
data
;
}
//已完工
if
(
that
.
activeTop
==
1
)
{
console
.
log
(
'已完工'
);
that
.
finishList
=
res
.
data
.
data
;
}
}
else
{
}
else
{
uni
.
showToast
({
uni
.
showToast
({
...
...
take-order/unpackage/dist/dev/mp-weixin/pages/index/record.wxml
View file @
f8d0481d
<view><view class="topView"><view data-event-opts="{{[['tap',[['topClick',[0]]]]]}}" class="{{[activeTop==0?'topItemView activeColor':'topItemView']}}" bindtap="__e"><text class="topItemText">未完成</text></view><view data-event-opts="{{[['tap',[['topClick',[1]]]]]}}" class="{{[activeTop==1?'topItemView activeColor':'topItemView']}}" bindtap="__e"><text class="topItemText">已完成</text></view></view><view class="listView"><block wx:for="{{unfinishList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==0}}"><view class="itemView"><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.name+" "+item.phone}}</text><text class="u-font-24 u-m-r-24">{{item.type}}</text></view><text class="u-font-24 u-m-l-24 u-m-r-24">{{item.address}}</text><view class="nameView"><text data-event-opts="{{[['tap',[['callClick',['$0'],[[['unfinishList','',ikey,'worker_phone']]]]]]]}}" class="u-font-24 u-m-l-24 underLine" bindtap="__e">{{item.worker_name+" "+item.worker_phone}}</text><text class="u-font-24 u-m-r-24">{{item.status}}</text></view></view></block></block><block wx:for="{{finishList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==1}}"><view class="itemView"><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.name+" "+item.phone}}</text><text class="u-font-24 u-m-r-24">{{item.type}}</text></view><text class="u-font-24 u-m-l-24 u-m-r-24">{{item.address}}</text><view class="nameView"><text data-event-opts="{{[['tap',[['callClick',['$0'],[[['finishList','',ikey,'worker_phone']]]]]]]}}" class="u-font-24 u-m-l-24 underLine" bindtap="__e">{{item.worker_name+" "+item.worker_phone}}</text><text class="u-font-24 u-m-r-24">{{item.status}}</text></view></view></block></block></view></view>
<view class="backView"><view class="topView"><view data-event-opts="{{[['tap',[['topClick',[0]]]]]}}" class="topItemView u-m-l-80" bindtap="__e"><text class="{{[activeTop==0?'activeItemText':'topItemText']}}">未完成</text><block wx:if="{{activeTop==0}}"><view class="activeItemBottom"></view></block></view><view data-event-opts="{{[['tap',[['topClick',[1]]]]]}}" class="topItemView u-m-r-80" bindtap="__e"><text class="{{[activeTop==1?'activeItemText':'topItemText']}}">已完成</text><block wx:if="{{activeTop==1}}"><view class="activeItemBottom"></view></block></view></view><view class="listView"><block wx:for="{{unfinishList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==0}}"><view class="itemView"><view class="nameView"><view class="nameLeftView"><block wx:if="{{item.contactName}}"><text class="nameText">{{item.contactName}}</text></block><block wx:if="{{item.contactMobilephone}}"><text class="phoneText">{{item.contactMobilephone}}</text></block></view><block wx:if="{{item.brandName&&item.categoryName&&item.orderServiceType}}"><text class="productText">{{item.brandName+"-"+item.categoryName+"-"+item.orderServiceType}}</text></block></view><block wx:if="{{item.contactAddress}}"><text class="addressText">{{item.contactAddress}}</text></block><block wx:if="{{item.maintainWorkerName||item.statusText}}"><view class="itemBottomView"><view class="workerView"><block wx:if="{{item.maintainWorkerName}}"><text class="workerNameText">{{"师傅:"+item.maintainWorkerName}}</text></block><block wx:if="{{item.maintainWorkerPhone}}"><text data-event-opts="{{[['tap',[['callClick',['$0'],[[['unfinishList','',ikey,'maintainWorkerPhone']]]]]]]}}" class="workerPhoneText" bindtap="__e">{{item.maintainWorkerPhone}}</text></block></view><block wx:if="{{item.statusText}}"><view class="statusView"><block wx:if="{{item.statusText}}"><text class="statusText">{{item.statusText}}</text></block></view></block></view></block><view class="divideLine u-m-t-30"></view></view></block></block><block wx:if="{{activeTop==0&&unfinishList.length==0}}"><view class="noDataView"><image class="noDataIcon" src="{{icon_noData}}" mode></image><text class="noDataText">暂无数据</text></view></block><block wx:for="{{finishList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==1}}"><view class="itemView"><view class="nameView"><view class="nameLeftView"><block wx:if="{{item.contactName}}"><text class="nameText">{{item.contactName}}</text></block><block wx:if="{{item.contactMobilephone}}"><text class="phoneText">{{item.contactMobilephone}}</text></block></view><block wx:if="{{item.brandName&&item.categoryName&&item.orderServiceType}}"><text class="productText">{{item.brandName+"-"+item.categoryName+"-"+item.orderServiceType}}</text></block></view><block wx:if="{{item.contactAddress}}"><text class="addressText">{{item.contactAddress}}</text></block><block wx:if="{{item.maintainWorkerName||item.statusText}}"><view class="itemBottomView"><block wx:if="{{item.maintainWorkerName}}"><view class="workerView"><block wx:if="{{item.maintainWorkerName}}"><text class="workerNameText">{{"师傅:"+item.maintainWorkerName}}</text></block><block wx:if="{{item.maintainWorkerPhone}}"><text data-event-opts="{{[['tap',[['callClick',['$0'],[[['finishList','',ikey,'maintainWorkerPhone']]]]]]]}}" class="workerPhoneText" bindtap="__e">{{item.maintainWorkerPhone}}</text></block></view></block><block wx:if="{{item.statusText}}"><view class="statusView"><block wx:if="{{item.statusText}}"><text class="statusText">{{item.statusText}}</text></block></view></block></view></block><view class="divideLine u-m-t-30"></view></view></block></block><block wx:if="{{activeTop==1&&finishList.length==0}}"><view class="noDataView"><image class="noDataIcon" src="{{icon_noData}}" mode></image><text class="noDataText">暂无数据</text></view></block></view></view>
\ No newline at end of file
\ No newline at end of file
take-order/unpackage/dist/dev/mp-weixin/pages/index/record.wxss
View file @
f8d0481d
.backView{
background-color: #FAFAFA;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
}
.topView{
.topView{
display: -webkit-box;
display: -webkit-box;
display: -webkit-flex;
display: -webkit-flex;
...
@@ -9,24 +24,38 @@
...
@@ -9,24 +24,38 @@
flex-direction: row;
flex-direction: row;
}
}
.topItemView{
.topItemView{
background-color: #F
FFFFF
;
background-color: #F
AFAFA
;
width: 50%;
width: 50%;
height:
80
rpx;
height:
94
rpx;
display: -webkit-box;
display: -webkit-box;
display: -webkit-flex;
display: -webkit-flex;
display: flex;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
-webkit-box-align: center;
-webkit-box-align: center;
-webkit-align-items: center;
-webkit-align-items: center;
align-items: center;
align-items: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center;
border: 2rpx solid #999999;
}
}
.topItemText{
.topItemText{
font-size: 28rpx;
margin-top: 22rpx;
font-size: 32rpx;
color: #999999;
}
.activeItemText{
margin-top: 22rpx;
font-size: 32rpx;
color: #333333;
}
.activeItemBottom{
margin-top: 10rpx;
background-color: #2272FF;
width: 70rpx;
height: 6rpx;
}
}
.activeColor{
.activeColor{
background-color: #999999;
background-color: #999999;
}
}
.listView{
.listView{
...
@@ -40,8 +69,8 @@
...
@@ -40,8 +69,8 @@
flex-direction: column;
flex-direction: column;
}
}
.itemView{
.itemView{
background-color: #FFFFFF;
width: 100%;
width: 100%;
height: 200rpx;
display: -webkit-box;
display: -webkit-box;
display: -webkit-flex;
display: -webkit-flex;
display: flex;
display: flex;
...
@@ -49,9 +78,69 @@
...
@@ -49,9 +78,69 @@
-webkit-box-direction: normal;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
-webkit-flex-direction: column;
flex-direction: column;
flex-direction: column;
border-bottom: 2rpx solid #999999;
}
.divideLine{
background-color: #FAFAFA;
width: 100%;
height: 16rpx;
}
}
.nameView{
.nameView{
width: 100%;
height: 90rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-webkit-flex-direction: row;
flex-direction: row;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
justify-content: space-between;
}
.nameLeftView{
background-color: #FFFFFF;
width: 40%;
height: 100%;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-webkit-flex-direction: row;
flex-direction: row;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
}
.nameText{
margin-left: 28rpx;
color: #333333;
font-size: 28rpx;
font-weight: bold;
}
.phoneText{
margin-left: 20rpx;
color: #999999;
font-size: 24rpx;
}
.productText{
margin-right: 30rpx;
font-size: 28rpx;
color: #333333;
}
.addressText{
margin-left: 24rpx;
margin-right: 30rpx;
font-size: 28rpx;
line-height: 40rpx;
color: #333333;
}
.itemBottomView{
background-color: #FFFFFF;
width: 100%;
width: 100%;
height: 80rpx;
height: 80rpx;
display: -webkit-box;
display: -webkit-box;
...
@@ -68,8 +157,82 @@
...
@@ -68,8 +157,82 @@
-webkit-justify-content: space-between;
-webkit-justify-content: space-between;
justify-content: space-between;
justify-content: space-between;
}
}
.workerView{
background-color: #FFFFFF;
width: 70%;
height: 100%;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-webkit-flex-direction: row;
flex-direction: row;
-webkit-box-align: end;
-webkit-align-items: flex-end;
align-items: flex-end;
}
.workerNameText{
margin-left: 28rpx;
color: #333333;
font-size: 28rpx;
font-weight: bold;
}
.workerPhoneText{
margin-left: 16rpx;
color: #2272FF;
font-size: 28rpx;
text-decoration:underline;
}
.statusView{
background-color: #FFFFFF;
width: 30%;
height: 80rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: reverse;
-webkit-flex-direction: row-reverse;
flex-direction: row-reverse;
-webkit-box-align: end;
-webkit-align-items: flex-end;
align-items: flex-end;
}
.statusText{
color: #2272FF;
font-size: 28rpx;
margin-right: 30rpx;
}
.underLine{
.underLine{
text-decoration:underline;
text-decoration:underline;
}
}
.noDataView{
background-color: #FFFFFF;
width: 100%;
height: 1112rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
}
.noDataIcon{
background-color: #FFFFFF;
margin-top: 280rpx;
width: 200rpx;
height: 160rpx;
}
.noDataText{
color:#999999;
margin-top: 32rpx;
font-size: 28rpx;
}
take-order/unpackage/dist/dev/mp-weixin/pages/take/index.js
View file @
f8d0481d
...
@@ -206,6 +206,15 @@ __webpack_require__.r(__webpack_exports__);
...
@@ -206,6 +206,15 @@ __webpack_require__.r(__webpack_exports__);
...
...
take-order/unpackage/dist/dev/mp-weixin/pages/take/index.wxml
View file @
f8d0481d
<view><view class="topView"><view data-event-opts="{{[['tap',[['topClick',[0]]]]]}}" class="{{[activeTop==0?'topItemView activeColor':'topItemView']}}" bindtap="__e"><text class="topItemText">抢单广场</text></view><view data-event-opts="{{[['tap',[['topClick',[1]]]]]}}" class="{{[activeTop==1?'topItemView activeColor':'topItemView']}}" bindtap="__e"><text class="topItemText">全部未完工</text></view><view data-event-opts="{{[['tap',[['topClick',[2]]]]]}}" class="{{[activeTop==2?'topItemView activeColor':'topItemView']}}" bindtap="__e"><text class="topItemText">已完工单</text></view></view><view class="listView"><block wx:for="{{grabList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==0}}"><view data-event-opts="{{[['tap',[['itemClick',['$0'],[[['grabList','',ikey]]]]]]]}}" class="itemView" bindtap="__e"><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.name+" "+item.phone}}</text><text class="u-font-24 u-m-r-24">{{item.type}}</text></view><text class="u-font-24 u-m-l-24 u-m-r-24">{{item.address}}</text><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.product}}</text><text class="u-font-24 u-m-r-24">{{item.status}}</text></view></view></block></block><block wx:for="{{unfinishList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==1}}"><view class="itemView"><view data-event-opts="{{[['tap',[['itemClick',['$0'],[[['unfinishList','',ikey]]]]]]]}}" class="nameView" bindtap="__e"><text class="u-font-24 u-m-l-24">{{item.orderType}}</text><text class="u-font-24 u-m-r-24">{{item.date}}</text></view><view data-event-opts="{{[['tap',[['itemClick',['$0'],[[['unfinishList','',ikey]]]]]]]}}" class="nameView" bindtap="__e"><text class="u-font-24 u-m-l-24">{{item.name+" "+item.phone}}</text><text class="u-font-24 u-m-r-24">{{item.type}}</text></view><text data-event-opts="{{[['tap',[['itemClick',['$0'],[[['unfinishList','',ikey]]]]]]]}}" class="u-font-24 u-m-l-24 u-m-r-24" bindtap="__e">{{item.address}}</text><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.product}}</text><block wx:if="{{item.bookDate.length==0}}"><text data-event-opts="{{[['tap',[['onShowDatePicker',['datetime','$0'],[[['unfinishList','',ikey]]]]]]]}}" class="u-font-24 underLine" bindtap="__e">(未预约)</text></block><block wx:if="{{item.bookDate.length>0}}"><text class="u-font-24">{{"(预约:"+item.bookDate+")"}}</text></block><text class="u-font-24 u-m-r-24">{{item.status}}</text></view><mx-date-picker vue-id="{{'6cf9683a-1-'+ikey}}" show="{{showPicker}}" type="{{type}}" value="{{value}}" show-tips="{{true}}" begin-text="入住" end-text="离店" show-seconds="{{true}}" data-event-opts="{{[['^confirm',[['onSelected']]],['^cancel',[['onSelected']]]]}}" bind:confirm="__e" bind:cancel="__e" bind:__l="__l"></mx-date-picker></view></block></block><block wx:for="{{finishList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==2}}"><view data-event-opts="{{[['tap',[['itemClick',['$0'],[[['finishList','',ikey]]]]]]]}}" class="itemView" bindtap="__e"><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.orderType}}</text><text class="u-font-24 u-m-r-24">{{item.date}}</text></view><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.name+" "+item.phone}}</text><text class="u-font-24 u-m-r-24">{{item.type}}</text></view><text class="u-font-24 u-m-l-24 u-m-r-24">{{item.address}}</text><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.product}}</text><text class="u-font-24 u-m-r-24">{{item.status}}</text></view></view></block></block></view></view>
<view class="backView"><view class="topView"><view data-event-opts="{{[['tap',[['topClick',[0]]]]]}}" class="topItemView u-m-l-80" bindtap="__e"><text class="{{[activeTop==0?'activeItemText':'topItemText']}}">未完成</text><block wx:if="{{activeTop==0}}"><view class="activeItemBottom"></view></block></view><view data-event-opts="{{[['tap',[['topClick',[1]]]]]}}" class="topItemView u-m-r-80" bindtap="__e"><text class="{{[activeTop==1?'activeItemText':'topItemText']}}">已完成</text><block wx:if="{{activeTop==1}}"><view class="activeItemBottom"></view></block></view></view><view class="listView"><block wx:for="{{grabList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==0}}"><view data-event-opts="{{[['tap',[['itemClick',['$0'],[[['grabList','',ikey]]]]]]]}}" class="itemView" bindtap="__e"><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.name+" "+item.phone}}</text><text class="u-font-24 u-m-r-24">{{item.type}}</text></view><text class="u-font-24 u-m-l-24 u-m-r-24">{{item.address}}</text><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.product}}</text><text class="u-font-24 u-m-r-24">{{item.status}}</text></view></view></block></block><block wx:for="{{unfinishList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==1}}"><view class="itemView"><view data-event-opts="{{[['tap',[['itemClick',['$0'],[[['unfinishList','',ikey]]]]]]]}}" class="nameView" bindtap="__e"><text class="u-font-24 u-m-l-24">{{item.orderType}}</text><text class="u-font-24 u-m-r-24">{{item.date}}</text></view><view data-event-opts="{{[['tap',[['itemClick',['$0'],[[['unfinishList','',ikey]]]]]]]}}" class="nameView" bindtap="__e"><text class="u-font-24 u-m-l-24">{{item.name+" "+item.phone}}</text><text class="u-font-24 u-m-r-24">{{item.type}}</text></view><text data-event-opts="{{[['tap',[['itemClick',['$0'],[[['unfinishList','',ikey]]]]]]]}}" class="u-font-24 u-m-l-24 u-m-r-24" bindtap="__e">{{item.address}}</text><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.product}}</text><block wx:if="{{item.bookDate.length==0}}"><text data-event-opts="{{[['tap',[['onShowDatePicker',['datetime','$0'],[[['unfinishList','',ikey]]]]]]]}}" class="u-font-24 underLine" bindtap="__e">(未预约)</text></block><block wx:if="{{item.bookDate.length>0}}"><text class="u-font-24">{{"(预约:"+item.bookDate+")"}}</text></block><text class="u-font-24 u-m-r-24">{{item.status}}</text></view><mx-date-picker vue-id="{{'6cf9683a-1-'+ikey}}" show="{{showPicker}}" type="{{type}}" value="{{value}}" show-tips="{{true}}" begin-text="入住" end-text="离店" show-seconds="{{true}}" data-event-opts="{{[['^confirm',[['onSelected']]],['^cancel',[['onSelected']]]]}}" bind:confirm="__e" bind:cancel="__e" bind:__l="__l"></mx-date-picker></view></block></block><block wx:for="{{finishList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==2}}"><view data-event-opts="{{[['tap',[['itemClick',['$0'],[[['finishList','',ikey]]]]]]]}}" class="itemView" bindtap="__e"><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.orderType}}</text><text class="u-font-24 u-m-r-24">{{item.date}}</text></view><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.name+" "+item.phone}}</text><text class="u-font-24 u-m-r-24">{{item.type}}</text></view><text class="u-font-24 u-m-l-24 u-m-r-24">{{item.address}}</text><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.product}}</text><text class="u-font-24 u-m-r-24">{{item.status}}</text></view></view></block></block></view></view>
\ No newline at end of file
\ No newline at end of file
take-order/unpackage/dist/dev/mp-weixin/pages/take/index.wxss
View file @
f8d0481d
.backView{
background-color: #FAFAFA;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
}
.topView{
.topView{
display: -webkit-box;
display: -webkit-box;
display: -webkit-flex;
display: -webkit-flex;
...
@@ -9,22 +24,35 @@
...
@@ -9,22 +24,35 @@
flex-direction: row;
flex-direction: row;
}
}
.topItemView{
.topItemView{
background-color: #F
FFFFF
;
background-color: #F
AFAFA
;
width: 33%;
width: 33%;
height:
80
rpx;
height:
94
rpx;
display: -webkit-box;
display: -webkit-box;
display: -webkit-flex;
display: -webkit-flex;
display: flex;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
-webkit-box-align: center;
-webkit-box-align: center;
-webkit-align-items: center;
-webkit-align-items: center;
align-items: center;
align-items: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center;
border: 2rpx solid #999999;
}
}
.topItemText{
.topItemText{
font-size: 28rpx;
margin-top: 22rpx;
font-size: 32rpx;
color: #999999;
}
.activeItemText{
margin-top: 22rpx;
font-size: 32rpx;
color: #333333;
}
.activeItemBottom{
margin-top: 10rpx;
background-color: #2272FF;
width: 70rpx;
height: 6rpx;
}
}
.activeColor{
.activeColor{
background-color: #999999;
background-color: #999999;
...
...
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