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
745f7164
Commit
745f7164
authored
May 15, 2021
by
郭晓清
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
parents
a84bad3e
6d4f1fba
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
14 deletions
+34
-14
App.vue
src/App.vue
+3
-3
index.vue
src/components/order/index.vue
+24
-9
pages.json
src/pages.json
+1
-1
index.vue
src/pages/index/index.vue
+1
-0
detail.vue
src/pages/order/detail.vue
+5
-1
No files found.
src/App.vue
View file @
745f7164
...
@@ -114,9 +114,9 @@ export default {
...
@@ -114,9 +114,9 @@ export default {
}
catch
(
a
)
{}
}
catch
(
a
)
{}
},
},
async
getBaseInfo
(
vm
,
callBack
)
{
async
getBaseInfo
(
vm
,
callBack
)
{
uni
.
showLoading
({
//
uni.showLoading({
title
:
"加载中……"
,
//
title: "加载中……",
});
//
});
const
res
=
await
vm
.
$u
.
api
.
getSettleBaseInfo
();
const
res
=
await
vm
.
$u
.
api
.
getSettleBaseInfo
();
if
(
res
.
code
!==
200
)
{
if
(
res
.
code
!==
200
)
{
uni
.
showToast
({
uni
.
showToast
({
...
...
src/components/order/index.vue
View file @
745f7164
...
@@ -11,8 +11,13 @@
...
@@ -11,8 +11,13 @@
</view>
</view>
<view
class=
"content-view"
>
<view
class=
"content-view"
>
<view
class=
"info-view"
v-for=
"(item, key) in infoTexts"
:key=
"key"
>
<view
class=
"info-view"
v-for=
"(item, key) in infoTexts"
:key=
"key"
>
<text>
{{
item
+
':'
}}
</text>
<view
class=
"info-title"
>
<text>
{{
item
.
name
+
':'
}}
</text>
</view>
<view
class=
"info-content"
>
<text>
{{
orderData
[
key
]
}}
</text>
<text>
{{
orderData
[
key
]
}}
</text>
<text
v-if=
"item.content"
>
{{
' / '
+
orderData
[
item
.
content
]
}}
</text>
</view>
</view>
</view>
<view
class=
"address-view"
>
<view
class=
"address-view"
>
<view
class=
"address-left-view"
>
<view
class=
"address-left-view"
>
...
@@ -133,9 +138,10 @@
...
@@ -133,9 +138,10 @@
},
},
infoTexts
()
{
infoTexts
()
{
return
{
return
{
'orderNumber'
:
'工单编号'
,
'orderNumber'
:
{
name
:
'工单编号'
},
'contactName'
:
'客户信息'
,
'partnerCompanyName'
:
{
name
:
'合作厂商'
},
'contactPhone'
:
'联系方式'
'contactName'
:
{
name
:
'客户信息'
,
content
:
'contactPhone'
},
}
}
},
},
typeTexts
()
{
typeTexts
()
{
...
@@ -375,8 +381,17 @@
...
@@ -375,8 +381,17 @@
text-align
:
left
;
text-align
:
left
;
color
:
#333333
;
color
:
#333333
;
font-size
:
26rpx
;
font-size
:
26rpx
;
margin-top
:
12rpx
;
margin-top
:
18rpx
;
margin-bottom
:
12rpx
;
margin-bottom
:
18rpx
;
display
:
flex
;
align-items
:
flex-start
;
.info-title
{
flex-shrink
:
0
;
}
.info-content
{
word-break
:
break-all
;
}
}
}
.address-view
{
.address-view
{
...
@@ -385,7 +400,7 @@
...
@@ -385,7 +400,7 @@
justify-content
:
space-between
;
justify-content
:
space-between
;
color
:
#333333
;
color
:
#333333
;
font-size
:
24rpx
;
font-size
:
24rpx
;
margin-top
:
1
2
rpx
;
margin-top
:
1
8
rpx
;
.address-left-view
{
.address-left-view
{
display
:
flex
;
display
:
flex
;
...
...
src/pages.json
View file @
745f7164
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
"style"
:
{
"style"
:
{
"navigationBarTitleText"
:
"首页"
,
"navigationBarTitleText"
:
"首页"
,
"navigationStyle"
:
"custom"
,
"navigationStyle"
:
"custom"
,
"enablePullDownRefresh"
:
true
,
//
"enablePullDownRefresh"
:
true
,
"disableScroll"
:
true
"disableScroll"
:
true
}
}
},
},
...
...
src/pages/index/index.vue
View file @
745f7164
...
@@ -158,6 +158,7 @@
...
@@ -158,6 +158,7 @@
}
else
{
}
else
{
this
.
waitInit
=
true
this
.
waitInit
=
true
}
}
// 第一次入驻成功弹出客服弹窗
if
(
e
&&
e
.
visible
)
{
if
(
e
&&
e
.
visible
)
{
this
.
visible
=
e
.
visible
this
.
visible
=
e
.
visible
}
}
...
...
src/pages/order/detail.vue
View file @
745f7164
...
@@ -18,6 +18,10 @@
...
@@ -18,6 +18,10 @@
<text>
工单编号:
</text>
<text>
工单编号:
</text>
<text>
{{
order
.
orderNumber
}}
</text>
<text>
{{
order
.
orderNumber
}}
</text>
</view>
</view>
<view
class=
"order-cell"
>
<text>
合作厂商:
</text>
<text>
{{
order
.
partnerCompanyName
}}
</text>
</view>
<view
class=
"order-cell between-cell"
>
<view
class=
"order-cell between-cell"
>
<view
class=
"left"
>
<view
class=
"left"
>
<text>
客户信息:
</text>
<text>
客户信息:
</text>
...
@@ -1114,7 +1118,7 @@
...
@@ -1114,7 +1118,7 @@
.between-cell
{
.between-cell
{
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
align-items
:
flex-start
;
align-items
:
center
;
}
}
.display-cell
{
.display-cell
{
display
:
flex
;
display
:
flex
;
...
...
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