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
ebfd1fd6
Commit
ebfd1fd6
authored
Dec 21, 2020
by
和慭琛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix
parent
0bb1f3ca
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
12 deletions
+27
-12
index.vue
take-order/pages/index/index.vue
+25
-10
index.vue
take-order/pages/take/index.vue
+2
-2
No files found.
take-order/pages/index/index.vue
View file @
ebfd1fd6
...
@@ -147,7 +147,7 @@
...
@@ -147,7 +147,7 @@
activeService
:
''
,
activeService
:
''
,
demandContent
:
''
,
demandContent
:
''
,
isAgree
:
false
,
isAgree
:
false
,
isClean
:
fals
e
,
isClean
:
tru
e
,
isRefresh
:
false
,
isRefresh
:
false
,
isAllInput
:
false
,
isAllInput
:
false
,
icon_location
:
''
,
icon_location
:
''
,
...
@@ -158,7 +158,8 @@
...
@@ -158,7 +158,8 @@
icon_mine
:
''
,
icon_mine
:
''
,
icon_trangle_down
:
''
,
icon_trangle_down
:
''
,
TimeID
:
-
1
,
TimeID
:
-
1
,
isMineShow
:
false
isMineShow
:
false
,
}
}
},
},
...
@@ -180,12 +181,22 @@
...
@@ -180,12 +181,22 @@
onShow
()
{
onShow
()
{
//this.getWorkerType()
//this.getWorkerType()
//this.getPerson()
//this.getPerson()
this
.
isClean
=
true
console
.
log
(
'onShow'
)
this
.
checkClean
()
this
.
checkClean
()
//this.checkClean()
//this.timeProcessing('2020/12/17')
//this.timeProcessing('2020/12/17')
//getApp().initAPIneedToken
//getApp().initAPIneedToken
},
},
onHide
()
{
this
.
isClean
=
true
},
methods
:
{
methods
:
{
doNothing
:
function
(){},
doNothing
:
function
(){},
...
@@ -223,6 +234,7 @@
...
@@ -223,6 +234,7 @@
console
.
log
(
'详细地址:'
+
res
.
address
);
console
.
log
(
'详细地址:'
+
res
.
address
);
console
.
log
(
'纬度:'
+
res
.
latitude
);
console
.
log
(
'纬度:'
+
res
.
latitude
);
console
.
log
(
'经度:'
+
res
.
longitude
);
console
.
log
(
'经度:'
+
res
.
longitude
);
that
.
isClean
=
false
that
.
location
=
res
.
name
that
.
location
=
res
.
name
that
.
address
=
res
.
address
that
.
address
=
res
.
address
},
fail
:
function
(
res
)
{
},
fail
:
function
(
res
)
{
...
@@ -249,13 +261,15 @@
...
@@ -249,13 +261,15 @@
//勾选点击
//勾选点击
agreeClick
:
function
(
isAgree
)
{
agreeClick
:
function
(
isAgree
)
{
/*
clearTimeout(this.TimeID);
clearTimeout(this.TimeID);
this.TimeID = setTimeout(() => {
this.TimeID = setTimeout(() => {
*/
this
.
isAgree
=
!
isAgree
this
.
isAgree
=
!
isAgree
console
.
log
(
this
.
isAgree
)
console
.
log
(
this
.
isAgree
)
/*
}, 1000);
}, 1000);
*/
},
},
...
@@ -263,9 +277,10 @@
...
@@ -263,9 +277,10 @@
//服务协议 点击
//服务协议 点击
protocolClick
:
function
()
{
protocolClick
:
function
()
{
/*
clearTimeout(this.TimeID);
clearTimeout(this.TimeID);
this.TimeID = setTimeout(() => {
this.TimeID = setTimeout(() => {
*/
console
.
log
(
'服务协议 点击'
)
console
.
log
(
'服务协议 点击'
)
uni
.
showLoading
({
uni
.
showLoading
({
title
:
'加载中'
title
:
'加载中'
...
@@ -314,8 +329,9 @@
...
@@ -314,8 +329,9 @@
})
})
}
}
});
});
/*
}, 1000);
}, 1000);
*/
...
@@ -946,7 +962,7 @@
...
@@ -946,7 +962,7 @@
background-color
:
#FAFAFA
;
background-color
:
#FAFAFA
;
width
:
100%
;
width
:
100%
;
height
:
100
rpx
;
height
:
100
rpx
;
margin-top
:
0
rpx
;
margin-top
:
35
rpx
;
display
:
flex
;
display
:
flex
;
flex-direction
:
row
;
flex-direction
:
row
;
align-items
:
center
;
align-items
:
center
;
...
@@ -1131,7 +1147,6 @@
...
@@ -1131,7 +1147,6 @@
flex-direction
:
row
;
flex-direction
:
row
;
align-items
:
center
;
align-items
:
center
;
justify-content
:
center
;
justify-content
:
center
;
margin-top
:
35
rpx
;
}
}
</
style
>
</
style
>
take-order/pages/take/index.vue
View file @
ebfd1fd6
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
<view
class=
"itemView"
v-if=
"activeTop == 1"
v-for=
"(item,ikey) in unfinishList"
:key=
"ikey"
>
<view
class=
"itemView"
v-if=
"activeTop == 1"
v-for=
"(item,ikey) in unfinishList"
:key=
"ikey"
>
<view
class=
"orderTypeView"
>
<view
class=
"orderTypeView"
>
<text
class=
"orderTypeText"
v-if=
"item.orderTypeText"
>
{{
item
.
orderTypeText
}}
</text>
<text
class=
"orderTypeText"
v-if=
"item.orderTypeText"
>
{{
item
.
orderTypeText
}}
</text>
<text
class=
"orderCreateTimeText"
v-if=
"item.createDatetime"
>
{{
formatDate
(
item
.
createDatetime
)
}}
</text>
<text
class=
"orderCreateTimeText"
v-if=
"item.createDatetime
&& item.createDatetime.length && item.createDatetime.length >0
"
>
{{
formatDate
(
item
.
createDatetime
)
}}
</text>
</view>
</view>
<view
class=
"nameView"
@
click=
"itemClick(item)"
>
<view
class=
"nameView"
@
click=
"itemClick(item)"
>
<view
class=
"nameLeftView"
>
<view
class=
"nameLeftView"
>
...
@@ -70,7 +70,7 @@
...
@@ -70,7 +70,7 @@
<view
class=
"itemView"
v-if=
"activeTop == 2"
@
click=
"itemClick(item)"
v-for=
"(item,ikey) in finishList"
:key=
"ikey"
>
<view
class=
"itemView"
v-if=
"activeTop == 2"
@
click=
"itemClick(item)"
v-for=
"(item,ikey) in finishList"
:key=
"ikey"
>
<view
class=
"orderTypeView"
>
<view
class=
"orderTypeView"
>
<text
class=
"orderTypeText"
v-if=
"item.orderTypeText"
>
{{
item
.
orderTypeText
}}
</text>
<text
class=
"orderTypeText"
v-if=
"item.orderTypeText"
>
{{
item
.
orderTypeText
}}
</text>
<text
class=
"orderCreateTimeText"
v-if=
"item.createDatetime"
>
{{
formatDate
(
item
.
createDatetime
)
}}
</text>
<text
class=
"orderCreateTimeText"
v-if=
"item.createDatetime
&& item.createDatetime.length && item.createDatetime.length>0
"
>
{{
formatDate
(
item
.
createDatetime
)
}}
</text>
</view>
</view>
<view
class=
"nameView"
>
<view
class=
"nameView"
>
<view
class=
"nameLeftView"
>
<view
class=
"nameLeftView"
>
...
...
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