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
741aa0dd
Commit
741aa0dd
authored
Apr 27, 2021
by
Morson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
# Conflicts: # .env.dev.js
parents
8ceb9891
d3325536
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
11 deletions
+19
-11
index.vue
src/components/settle/index.vue
+10
-2
index.vue
src/pages/order/index.vue
+8
-8
prompt.vue
src/pages/settle/prompt.vue
+1
-1
No files found.
src/components/settle/index.vue
View file @
741aa0dd
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<u-navbar
style=
"position: absolute;"
title=
"入驻"
background=
"
{background: transparent}" :border-bottom="false"
<u-navbar
style=
"position: absolute;"
title=
"入驻"
background=
"
{background: transparent}" :border-bottom="false"
back-icon-color="#ffffff" title-color="#ffffff">
</u-navbar>
back-icon-color="#ffffff" title-color="#ffffff">
</u-navbar>
<image
:src=
"url"
style=
"width: 100%;"
mode=
"widthFix"
></image>
<image
:src=
"url"
style=
"width: 100%;"
mode=
"widthFix"
></image>
<view
class=
"introduction
"
>
<view
:class=
"['introduction',
{'active': type}]
">
<slot></slot>
<slot></slot>
</view>
</view>
<view
class=
"settle-bottom"
>
<view
class=
"settle-bottom"
>
...
@@ -18,6 +18,11 @@
...
@@ -18,6 +18,11 @@
index
:
{
index
:
{
type
:
Number
,
type
:
Number
,
default
:
1
default
:
1
},
// 0: introduction距离底部168rpx 1: introduction距离底部0rpx
type
:
{
type
:
Number
,
default
:
0
}
}
},
},
data
()
{
data
()
{
...
@@ -46,6 +51,9 @@
...
@@ -46,6 +51,9 @@
bottom
:
168rpx
;
bottom
:
168rpx
;
left
:
30rpx
;
left
:
30rpx
;
right
:
30rpx
;
right
:
30rpx
;
&
.active
{
bottom
:
0rpx
;
}
}
}
.settle-bottom
{
.settle-bottom
{
...
...
src/pages/order/index.vue
View file @
741aa0dd
...
@@ -187,8 +187,8 @@
...
@@ -187,8 +187,8 @@
/*↓↓↓↓↓↓↓↓↓↓测试数据↓↓↓↓↓↓↓↓↓↓*/
/*↓↓↓↓↓↓↓↓↓↓测试数据↓↓↓↓↓↓↓↓↓↓*/
res
.
data
.
type
=
self
.
orderType
res
.
data
.
type
=
self
.
orderType
if
(
res
.
data
.
list
)
{
if
(
res
.
data
.
list
)
{
res
.
data
.
total
=
15
if
(
res
.
data
.
list
.
length
==
0
&&
res
.
data
.
total
>
0
)
{
if
(
res
.
data
.
list
.
length
==
0
&&
res
.
data
.
total
>
0
)
{
res
.
data
.
total
=
15
res
.
data
.
list
=
[{
res
.
data
.
list
=
[{
orderServiceType
:
'安装'
,
// 服务类型:安装、维修
orderServiceType
:
'安装'
,
// 服务类型:安装、维修
categoryName
:
'充电桩'
,
// 品类:充电桩
categoryName
:
'充电桩'
,
// 品类:充电桩
...
@@ -209,13 +209,13 @@
...
@@ -209,13 +209,13 @@
orderBusinessType
:
'R'
,
// 业务类型 R 为抢单
orderBusinessType
:
'R'
,
// 业务类型 R 为抢单
orderId
:
'1100000216'
orderId
:
'1100000216'
}]
}]
}
res
.
data
.
list
=
[...
res
.
data
.
list
,
...
res
.
data
.
list
,
...
res
.
data
.
list
,
...
res
.
data
res
.
data
.
list
=
[...
res
.
data
.
list
,
...
res
.
data
.
list
,
...
res
.
data
.
list
,
...
res
.
data
.
list
,
.
list
,
...
res
.
data
.
list
,
...
res
.
data
.
list
,
...
res
.
data
.
list
,
...
res
.
data
.
list
,
...
res
...
res
.
data
.
list
,
...
res
.
data
.
list
,
...
res
.
data
.
list
,
...
res
.
data
.
list
,
...
res
.
data
.
list
,
...
res
.
data
.
list
.
data
.
list
,
...
res
.
data
.
list
]
]
}
}
}
/*↑↑↑↑↑↑↑↑↑↑测试数据↑↑↑↑↑↑↑↑↑↑↑↑↑*/
/*↑↑↑↑↑↑↑↑↑↑测试数据↑↑↑↑↑↑↑↑↑↑↑↑↑*/
// 后台需要返回type,防止数据返回延迟期间点击了其他的tab
// 后台需要返回type,防止数据返回延迟期间点击了其他的tab
...
...
src/pages/settle/prompt.vue
View file @
741aa0dd
<
template
>
<
template
>
<view
class=
"container u-row-between"
v-if=
"info"
>
<view
class=
"container u-row-between"
v-if=
"info"
>
<Settle
:index=
"pageIndex"
>
<Settle
:index=
"pageIndex"
:type=
"1"
>
<view
class=
"content-view"
>
<view
class=
"content-view"
>
<!--
<view
style=
"min-height: 120rpx;"
v-if=
"status == 8"
></view>
-->
<!--
<view
style=
"min-height: 120rpx;"
v-if=
"status == 8"
></view>
-->
<view
class=
"u-flex u-row-center"
>
<view
class=
"u-flex u-row-center"
>
...
...
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