Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mallapp
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
viitto
mallapp
Commits
29acc8d0
Commit
29acc8d0
authored
Sep 08, 2020
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
41646e47
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
18 deletions
+31
-18
order-detail.vue
pages/order/order-detail.vue
+3
-1
index.vue
pages/quick_share/index.vue
+27
-16
share-team.vue
pages/share-team/share-team.vue
+1
-1
No files found.
pages/order/order-detail.vue
View file @
29acc8d0
...
@@ -249,7 +249,7 @@
...
@@ -249,7 +249,7 @@
<view
style=
"padding: 12px;"
v-if=
"recommend.length > 0"
>
<view
style=
"padding: 12px;"
v-if=
"recommend.length > 0"
>
<goodlist
:list=
"recommend"
></goodlist>
<goodlist
:list=
"recommend"
></goodlist>
</view>
</view>
<view
class=
"btn-box"
v-if=
"orders.OrderStatus != '5'"
>
<view
class=
"btn-box"
v-if=
"orders.OrderStatus != '5'
&&isShowBtn
"
>
<view
class=
"item"
v-if=
"orders.OrderStatus == '3'"
>
<view
class=
"item"
v-if=
"orders.OrderStatus == '3'"
>
<u-button
<u-button
shape=
"circle"
shape=
"circle"
...
@@ -416,6 +416,7 @@ export default {
...
@@ -416,6 +416,7 @@ export default {
delivery_time
:
14
,
//时间
delivery_time
:
14
,
//时间
uid
:
0
,
uid
:
0
,
NewUserId
:
0
,
//zk新增
NewUserId
:
0
,
//zk新增
isShowBtn
:
true
,
};
};
},
},
onLoad
(
option
)
{
onLoad
(
option
)
{
...
@@ -423,6 +424,7 @@ export default {
...
@@ -423,6 +424,7 @@ export default {
//zk新增
//zk新增
if
(
option
.
NewUserId
){
if
(
option
.
NewUserId
){
this
.
NewUserId
=
option
.
NewUserId
;
this
.
NewUserId
=
option
.
NewUserId
;
this
.
isShowBtn
=
false
;
}
}
this
.
mc
=
this
.
$uiConfig
.
mainColor
;
this
.
mc
=
this
.
$uiConfig
.
mainColor
;
this
.
secondary
=
this
.
$uiConfig
.
secondary
;
this
.
secondary
=
this
.
$uiConfig
.
secondary
;
...
...
pages/quick_share/index.vue
View file @
29acc8d0
...
@@ -143,18 +143,22 @@
...
@@ -143,18 +143,22 @@
:active-color=
"mainColor"
:active-color=
"mainColor"
@
change=
"getChild"
@
change=
"getChild"
></u-tabs>
></u-tabs>
<view
<!--
<scroll-view
scroll-x=
"true"
style=
"white-space: nowrap;display: flex;width:90%;margin:auto;"
>
-->
style=
"white-space: nowrap;display: flex;margin:10px auto;background-color:#EBEBEB;border-radius:20px;width:95%;overflow:hidden;"
<view
>
style=
"white-space: nowrap;display: flex;margin:10px auto;background-color:#EBEBEB;border-radius:20px;width:95%;"
<view
>
@
click=
"getSecond(item,index)"
<scroll-view
scroll-x=
"true"
style=
"white-space: nowrap;display: flex;width:100%;"
>
style=
"padding:8px 17px;margin-left:0;flex:1;text-align:center;"
<view
:style=
"
{ color: index==active2 ? '#fff' : '#272727',backgroundColor:index==active2 ? mainColor:'' }"
@
click=
"getSecond(item,index)"
class="quick_slider"
style=
"padding:8px 17px;margin-left:0;flex:1;text-align:center;"
v-for="(item,index) in dataSecond"
:style=
"
{ color: index==active2 ? '#fff' : '#272727',backgroundColor:index==active2 ? mainColor:'' }"
:key="index"
class="quick_slider"
>
{{
item
.
Name
}}
</view>
v-for="(item,index) in dataSecond"
</view>
:key="index"
>
{{
item
.
Name
}}
</view>
</scroll-view>
</view>
<!--
</scroll-view>
-->
<view
class=
"qr_Line"
></view>
<view
class=
"qr_Line"
></view>
<view
class=
"quick_top"
v-if=
"dataThird.length>0"
>
<view
class=
"quick_top"
v-if=
"dataThird.length>0"
>
<scroll-view
scroll-x=
"true"
style=
"white-space: nowrap;display: flex;width:90%"
>
<scroll-view
scroll-x=
"true"
style=
"white-space: nowrap;display: flex;width:90%"
>
...
@@ -195,8 +199,8 @@
...
@@ -195,8 +199,8 @@
<view
class=
"quick_Content"
style=
"width: 100%;min-height:100%"
>
<view
class=
"quick_Content"
style=
"width: 100%;min-height:100%"
>
<view
<view
class=
"quick_Inner"
class=
"quick_Inner"
v-for=
"(item,
i
ndex) in dataList"
v-for=
"(item,
subI
ndex) in dataList"
:key=
"
i
ndex"
:key=
"
subI
ndex"
style=
"margin-bottom:10px;background-color:#fff;"
style=
"margin-bottom:10px;background-color:#fff;"
>
>
<view
class=
"quick_ImgDiv"
>
<view
class=
"quick_ImgDiv"
>
...
@@ -216,7 +220,7 @@
...
@@ -216,7 +220,7 @@
<view
<view
v-for=
"(subItem,index) in item.ImgList"
v-for=
"(subItem,index) in item.ImgList"
:key=
"index"
:key=
"index"
style=
"margin-bottom:
3
px;"
style=
"margin-bottom:
2
px;"
>
>
<!-- 遍历数组 -->
<!-- 遍历数组 -->
<view
<view
...
@@ -225,7 +229,7 @@
...
@@ -225,7 +229,7 @@
style=
"margin-right:5px;"
style=
"margin-right:5px;"
>
>
<!-- 分段显示 -->
<!-- 分段显示 -->
<img
:src=
"subItem"
style=
"height:190rpx;width:190rpx;"
/>
<img
:src=
"subItem"
@
click=
"previewImage(index, item.ImgList)"
style=
"height:190rpx;width:190rpx;"
/>
</view>
</view>
</view>
</view>
</view>
</view>
...
@@ -525,6 +529,13 @@ export default {
...
@@ -525,6 +529,13 @@ export default {
let
arr
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
images
));
let
arr
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
images
));
this
.
downLoadImage
(
arr
);
this
.
downLoadImage
(
arr
);
},
},
//图片预览
previewImage
(
index
,
images
)
{
uni
.
previewImage
({
urls
:
images
,
current
:
index
,
});
},
downLoadImage
(
arr
)
{
downLoadImage
(
arr
)
{
let
that
=
this
;
let
that
=
this
;
uni
.
downloadFile
({
uni
.
downloadFile
({
...
...
pages/share-team/share-team.vue
View file @
29acc8d0
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
<view
class=
"share_Item u-border-bottom"
>
<view
class=
"share_Item u-border-bottom"
>
<!--
<u-avatar
:src=
"item.Photo"
size=
"64"
></u-avatar>
-->
<!--
<u-avatar
:src=
"item.Photo"
size=
"64"
></u-avatar>
-->
<!-- 此层wrap在此为必写的,否则可能会出现标题定位错误 -->
<!-- 此层wrap在此为必写的,否则可能会出现标题定位错误 -->
<view
class=
"title-wrap"
style=
"width:100%;"
>
<view
class=
"title-wrap"
style=
"width:100%;"
@
click=
"goUrl(item.UserId)"
>
<view
class=
"box_top"
>
<view
class=
"box_top"
>
<u-avatar
:src=
"item.Photo"
size=
"64"
></u-avatar>
<u-avatar
:src=
"item.Photo"
size=
"64"
></u-avatar>
<view
class=
"box_r"
>
<view
class=
"box_r"
>
...
...
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