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
d2e14893
Commit
d2e14893
authored
May 12, 2021
by
李超鹏
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
ed3a0cea
be2d69fa
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
62 additions
and
44 deletions
+62
-44
XhInput.vue
src/components/createCom/XhInput.vue
+18
-11
index.vue
src/components/order/index.vue
+16
-9
index.vue
src/pages/mine/cert/index.vue
+2
-2
complete.vue
src/pages/order/complete.vue
+1
-1
detail.vue
src/pages/order/detail.vue
+25
-21
No files found.
src/components/createCom/XhInput.vue
View file @
d2e14893
...
@@ -29,18 +29,25 @@
...
@@ -29,18 +29,25 @@
},
},
computed
:
{
computed
:
{
type
()
{
type
()
{
if
(
this
.
item
)
{
let
ty
=
this
.
item
.
fieldsType
.
toLocaleLowerCase
()
let
ty
=
this
.
item
.
fieldsType
.
toLocaleLowerCase
()
if
(
this
.
item
.
fieldsId
==
200
)
{
switch
(
ty
)
{
case
'text'
:
return
'textarea'
case
'password'
:
return
this
.
item
.
fieldsType
case
'decimal'
:
case
'number'
:
case
'double'
:
case
'integer'
:
this
.
maxlength
=
9
this
.
maxlength
=
9
return
'digit'
return
'digit'
}
else
{
case
'textarea'
:
if
(
this
.
item
&&
ty
==
'password'
)
{
default
:
return
this
.
item
.
fieldsType
}
else
if
(
this
.
item
&&
ty
==
'text'
)
{
return
'textarea'
}
else
{
return
'text'
return
'text'
}
}
}
else
{
return
'text'
}
}
},
},
...
...
src/components/order/index.vue
View file @
d2e14893
...
@@ -26,8 +26,9 @@
...
@@ -26,8 +26,9 @@
</view>
</view>
<view
class=
"line-view"
></view>
<view
class=
"line-view"
></view>
<view
class=
"reason-view"
v-if=
"showReason"
><text
class=
"reason-text"
>
未通过原因:
</text>
<view
class=
"reason-view"
v-if=
"showReason"
>
<text
v-for=
"(item, index) in orderData.auditResults"
:key=
"index"
>
{{
item
}}
</text>
<view><text
class=
"reason-title"
>
未通过原因:
</text></view>
<view
class=
"reason-text"
><text
v-for=
"(item, index) in orderData.auditResults"
:key=
"index"
>
{{
item
}}
</text></view>
</view>
</view>
<view
class=
"bottom-view"
>
<view
class=
"bottom-view"
>
<view>
<view>
...
@@ -188,7 +189,7 @@
...
@@ -188,7 +189,7 @@
},
},
timeText
()
{
timeText
()
{
let
time
=
this
.
orderType
==
4
?
this
.
orderData
.
orderFinishDatetime
:
this
.
orderData
.
auditDatetime
let
time
=
this
.
orderType
==
4
?
this
.
orderData
.
orderFinishDatetime
:
this
.
orderData
.
auditDatetime
return
t
his
.
$u
.
timeFormat
(
time
,
'yyyy.mm.dd hh:MM:ss'
)
return
t
ime
?
this
.
$u
.
timeFormat
(
time
,
'yyyy.mm.dd hh:MM:ss'
)
:
''
},
},
timeTitle
()
{
timeTitle
()
{
return
this
.
orderType
==
4
?
'提交时间:'
:
'审核时间:'
return
this
.
orderType
==
4
?
'提交时间:'
:
'审核时间:'
...
@@ -230,11 +231,11 @@
...
@@ -230,11 +231,11 @@
this
.
orderType
=
0
this
.
orderType
=
0
}
else
if
(
this
.
orderData
.
orderStatus
==
31
)
{
}
else
if
(
this
.
orderData
.
orderStatus
==
31
)
{
if
(
this
.
orderData
.
appointmentDatetime
)
{
if
(
this
.
orderData
.
appointmentDatetime
)
{
return
this
.
orderType
=
2
this
.
orderType
=
2
}
else
{
}
else
{
this
.
orderType
=
1
this
.
orderType
=
1
}
}
}
else
if
(
this
.
orderData
.
orderStatus
>
31
||
this
.
orderData
.
orderStatus
<
80
)
{
}
else
if
(
this
.
orderData
.
orderStatus
>
31
&&
this
.
orderData
.
orderStatus
<
80
)
{
this
.
orderType
=
3
this
.
orderType
=
3
}
else
if
(
this
.
orderData
.
orderStatus
==
85
||
this
.
orderData
.
orderStatus
==
87
)
{
}
else
if
(
this
.
orderData
.
orderStatus
==
85
||
this
.
orderData
.
orderStatus
==
87
)
{
this
.
orderType
=
4
this
.
orderType
=
4
...
@@ -381,6 +382,7 @@
...
@@ -381,6 +382,7 @@
align-items
:
center
;
align-items
:
center
;
align-items
:
flex-start
;
align-items
:
flex-start
;
text-align
:
left
;
text-align
:
left
;
margin-right
:
30rpx
;
.address-image
{
.address-image
{
width
:
26rpx
;
width
:
26rpx
;
height
:
28rpx
;
height
:
28rpx
;
...
@@ -408,10 +410,15 @@
...
@@ -408,10 +410,15 @@
color
:
#FA5A49
;
color
:
#FA5A49
;
display
:
flex
;
display
:
flex
;
align-items
:
flex-start
;
align-items
:
flex-start
;
.reason-text
{
display
:
flex
;
.reason-title
{
flex-shrink
:
0
;
flex-shrink
:
0
;
color
:
#666666
;
color
:
#666666
;
}
}
.reason-text
{
display
:
flex
;
flex-direction
:
column
;
}
}
}
.bottom-view
{
.bottom-view
{
...
...
src/pages/mine/cert/index.vue
View file @
d2e14893
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
></u-navbar>
></u-navbar>
<view
class=
"content-cody"
>
<view
class=
"content-cody"
>
<u-cell-group
:border=
"false"
>
<u-cell-group
:border=
"false"
>
<u-cell-item
v-for=
"
item in list"
:title=
"item.name"
:value=
"item.isUploadName"
:arrow=
"true
"
<u-cell-item
v-for=
"
(item, index) in list"
:title=
"item.name"
:value=
"item.isUploadName"
:arrow=
"true"
:key=
"index
"
:value-style=
"
{'color': item.color}" @click="toDetail(item.keyName)" :title-style="{'padding-left':'20rpx'}">
:value-style=
"
{'color': item.color}" @click="toDetail(item.keyName)" :title-style="{'padding-left':'20rpx'}">
<u-icon
slot=
"icon"
size=
"32"
name=
"checkmark-circle"
:color=
"item.iconColor"
></u-icon>
<u-icon
slot=
"icon"
size=
"32"
name=
"checkmark-circle"
:color=
"item.iconColor"
></u-icon>
</u-cell-item>
</u-cell-item>
...
@@ -112,7 +112,7 @@
...
@@ -112,7 +112,7 @@
},
},
toDetail
(
key
)
{
toDetail
(
key
)
{
let
data
=
this
.
list
[
key
].
data
;
let
data
=
this
.
list
[
key
].
data
;
if
(
data
.
status
!=
1
){
if
(
!
data
.
isUpload
){
return
;
return
;
}
}
wx
.
navigateTo
({
wx
.
navigateTo
({
...
...
src/pages/order/complete.vue
View file @
d2e14893
...
@@ -253,7 +253,7 @@
...
@@ -253,7 +253,7 @@
}
}
},
},
show200
()
{
show200
()
{
return
this
.
form
.
paymentMethodsType
!=
'03'
return
this
.
form
.
paymentMethodsType
&&
this
.
form
.
paymentMethodsType
!=
'03'
}
}
},
},
methods
:
{
methods
:
{
...
...
src/pages/order/detail.vue
View file @
d2e14893
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
<text>
{{
order
.
contactPhone
}}
</text>
<text>
{{
order
.
contactPhone
}}
</text>
</view>
</view>
<view
class=
"between-cell address-cell"
>
<view
class=
"between-cell address-cell"
>
<view
class=
"left"
>
<view
class=
"left
-address
"
>
<u-icon
name=
"map"
size=
"28"
></u-icon>
<u-icon
name=
"map"
size=
"28"
></u-icon>
<text
class=
"address-txt"
>
{{
formatAddress
}}
</text>
<text
class=
"address-txt"
>
{{
formatAddress
}}
</text>
</view>
</view>
...
@@ -323,13 +323,13 @@
...
@@ -323,13 +323,13 @@
}
}
})
})
}
else
{
}
else
if
(
res
.
errMsg
)
{
uni
.
setClipboardData
({
//
uni.setClipboardData({
data
:
address
,
//
data: address,
success
:
function
()
{
//
success: function () {
console
.
log
(
'success'
);
//
console.log('success');
}
//
}
});
//
});
}
}
}
}
});
});
...
@@ -857,9 +857,13 @@
...
@@ -857,9 +857,13 @@
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
align-items
:
center
;
align-items
:
center
;
.left
{
.left-address
{
display
:
flex
;
align-items
:
flex-start
;
.address-txt
{
.address-txt
{
line-height
:
30rpx
;
margin-left
:
8rpx
;
margin-left
:
8rpx
;
margin-right
:
30rpx
;
}
}
}
}
}
}
...
@@ -949,19 +953,19 @@
...
@@ -949,19 +953,19 @@
z-index
:
1
;
z-index
:
1
;
}
}
.address-cell
{
//
.address-cell {
height
:
24rpx
;
//
height: 24rpx;
font-size
:
24rpx
;
//
font-size: 24rpx;
font-weight
:
400
;
//
font-weight: 400;
color
:
#333333
;
//
color: #333333;
line-height
:
24rpx
;
//
line-height: 24rpx;
.left
{
//
.left {
.address-txt
{
//
.address-txt {
margin-left
:
8rpx
;
//
margin-left: 8rpx;
}
//
}
}
//
}
}
//
}
}
}
.record-item
{
.record-item
{
...
...
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