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
6d9a8b82
Commit
6d9a8b82
authored
May 14, 2021
by
Morson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
parents
abffb723
66147a07
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
10 deletions
+19
-10
XhInput.vue
src/components/createCom/XhInput.vue
+6
-2
complete.vue
src/pages/order/complete.vue
+6
-3
detail.vue
src/pages/order/detail.vue
+7
-5
No files found.
src/components/createCom/XhInput.vue
View file @
6d9a8b82
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<
template
>
<
template
>
<view
:style=
"
{'width': fieldsWidth}">
<view
:style=
"
{'width': fieldsWidth}">
<u-input
:type=
"type"
class=
"input-item"
v-model=
"dataValue"
@
input=
"valueChange"
:placeholder=
"placeholder"
:placeholder-style=
"placeholderStyle"
<u-input
:type=
"type"
class=
"input-item"
v-model=
"dataValue"
@
input=
"valueChange"
:placeholder=
"placeholder"
:placeholder-style=
"placeholderStyle"
:custom-style=
"customStyle"
:clearable=
"false"
:border=
"border"
border-color=
"#ECECEC"
:maxlength=
"maxlength"
/>
:custom-style=
"customStyle"
:clearable=
"false"
:border=
"border"
border-color=
"#ECECEC"
:maxlength=
"maxlength"
:cursor-spacing=
"10"
hold-keyboard
/>
</view>
</view>
</
template
>
</
template
>
...
@@ -93,7 +93,11 @@
...
@@ -93,7 +93,11 @@
},
},
watch
:
{},
watch
:
{},
mounted
()
{},
mounted
()
{},
methods
:
{}
methods
:
{
handleFocus
()
{
console
.
log
(
'handle focus'
)
}
}
}
}
</
script
>
</
script
>
...
...
src/pages/order/complete.vue
View file @
6d9a8b82
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
</scroll-view>
</scroll-view>
<view
class=
"form-list"
>
<view
class=
"form-list"
@
touchmove=
"handleTouchstart"
>
<u-form
:model=
"form"
ref=
"uForm"
>
<u-form
:model=
"form"
ref=
"uForm"
>
<template
v-for=
"(groupItem, groupIndex) in (list.length>0?list[tabIndex].items:[])"
>
<template
v-for=
"(groupItem, groupIndex) in (list.length>0?list[tabIndex].items:[])"
>
<view
class=
"class-item"
:key=
"groupIndex"
v-show=
"current == groupIndex"
>
<view
class=
"class-item"
:key=
"groupIndex"
v-show=
"current == groupIndex"
>
...
@@ -674,8 +674,11 @@
...
@@ -674,8 +674,11 @@
}
}
}
}
},
10
)
},
10
)
}
},
}
handleTouchstart
()
{
uni
.
hideKeyboard
()
}
}
}
}
</
script
>
</
script
>
...
...
src/pages/order/detail.vue
View file @
6d9a8b82
...
@@ -294,11 +294,11 @@
...
@@ -294,11 +294,11 @@
// uni.getLocation({
// uni.getLocation({
// type: 'gcj02', //返回可以用于uni.openLocation的经纬度
// type: 'gcj02', //返回可以用于uni.openLocation的经纬度
// success: function (res) {
// success: function (res) {
const
latitude
=
this
.
contactAddressLatitud
//res.latitude;
const
latitude
=
this
.
order
.
contactAddressLatitud
//res.latitude;
const
longitude
=
this
.
contactAddressLongitud
//res.longitude;
const
longitude
=
this
.
order
.
contactAddressLongitud
//res.longitude;
uni
.
openLocation
({
uni
.
openLocation
({
latitude
:
Number
(
this
.
contactAddressLatitud
),
latitude
:
Number
(
latitude
),
longitude
:
Number
(
this
.
contactAddressLongitud
),
longitude
:
Number
(
longitude
),
success
:
function
()
{
success
:
function
()
{
console
.
log
(
'success'
);
console
.
log
(
'success'
);
}
}
...
@@ -580,9 +580,9 @@
...
@@ -580,9 +580,9 @@
// 不同请求类型传递不同数据
// 不同请求类型传递不同数据
if
(
this
.
submitType
===
'orderAccept'
){
// 接单
if
(
this
.
submitType
===
'orderAccept'
){
// 接单
data
.
orderId
=
this
.
order
.
orderId
data
.
orderId
=
this
.
order
.
orderId
data
.
channel
=
'zypt'
}
else
if
(
this
.
submitType
===
'orderGan'
){
// 抢单
}
else
if
(
this
.
submitType
===
'orderGan'
){
// 抢单
data
.
orderId
=
this
.
order
.
orderId
data
.
orderId
=
this
.
order
.
orderId
data
.
channel
=
4
}
else
if
(
this
.
submitType
===
'workerAppointment'
){
// 预约
}
else
if
(
this
.
submitType
===
'workerAppointment'
){
// 预约
data
.
appointmentDatetime
=
this
.
appointmentDatetime
data
.
appointmentDatetime
=
this
.
appointmentDatetime
if
(
!
data
.
appointmentDatetime
){
if
(
!
data
.
appointmentDatetime
){
...
@@ -602,6 +602,7 @@
...
@@ -602,6 +602,7 @@
return
return
}
}
}
}
data
.
channel
=
4
data
.
exception
=
this
.
isErrorSign
data
.
exception
=
this
.
isErrorSign
data
.
coordinate
=
this
.
dataValue
?
this
.
dataValue
[
0
]
+
','
+
this
.
dataValue
[
1
]:
''
data
.
coordinate
=
this
.
dataValue
?
this
.
dataValue
[
0
]
+
','
+
this
.
dataValue
[
1
]:
''
data
.
url
=
this
.
errorSignUrl
?
this
.
errorSignUrl
:
''
data
.
url
=
this
.
errorSignUrl
?
this
.
errorSignUrl
:
''
...
@@ -948,6 +949,7 @@
...
@@ -948,6 +949,7 @@
font-size
:
26rpx
;
font-size
:
26rpx
;
color
:
#333333
;
color
:
#333333
;
margin-top
:
30rpx
;
margin-top
:
30rpx
;
margin-bottom
:
30rpx
;
}
}
.record-line-view
{
.record-line-view
{
...
...
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