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
ccf5f2e0
Commit
ccf5f2e0
authored
Oct 23, 2020
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
小问题改动
parent
d5ae00fe
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
7 deletions
+12
-7
studyrecord.vue
pages/school/mystudy/studyrecord.vue
+1
-1
mycollection.vue
pages/school/personal/mycollection.vue
+2
-1
order-commit.vue
pages/school/personal/order-commit.vue
+4
-2
share-order.vue
pages/share-order/share-order.vue
+5
-3
No files found.
pages/school/mystudy/studyrecord.vue
View file @
ccf5f2e0
...
...
@@ -94,7 +94,7 @@
:font-size=
"24"
:margin-top=
"20"
:margin-bottom=
"20"
bg-color=
"#F
FF
"
bg-color=
"#F
AF8F9
"
/>
</scroll-view>
...
...
pages/school/personal/mycollection.vue
View file @
ccf5f2e0
...
...
@@ -51,6 +51,7 @@
<
template
>
<view
class=
"mycollection"
:style=
"
{'height':contentHeight}" v-if="!loading">
<template>
<u-empty
v-if=
"goodslist.length==0"
text=
"没有任何收藏课程哦~"
mode=
"favor"
></u-empty>
<view
v-if=
"goodslist.length>0"
style=
"
height: calc(100vh - 50px);
width: calc(100vw - 20px);
...
...
@@ -77,7 +78,7 @@
</view>
<u-loadmore
:status=
"status"
:load-text=
"loadText"
:font-size=
"24"
:margin-top=
"20"
:margin-bottom=
"20"
bg-color=
"#FFF"
/>
</scroll-view>
<u-empty
v-if=
"goodslist.length==0"
text=
"没有任何收藏商品哦~"
mode=
"favor"
></u-empty>
</view>
</template>
<good-sku
v-if=
"showSku"
:option-type=
"2"
borderRadius=
"20"
v-model=
"showSku"
:good=
"sku"
></good-sku>
...
...
pages/school/personal/order-commit.vue
View file @
ccf5f2e0
<
template
>
<view
class=
"commit-box"
>
<u-empty
text=
"没有找到未评价的
商品信息"
font-size=
"36"
mode=
"list"
v-if=
"g.length == 0 && !loading
"
></u-empty>
<u-empty
text=
"没有找到未评价的
课程信息"
font-size=
"36"
mode=
"list"
v-if=
"g.length == 0
"
></u-empty>
<view
v-if=
"g.length > 0"
style=
"height: 100vh;width: 100vw;overflow: hidden;padding:0 0 10px 0;"
...
...
@@ -14,7 +14,8 @@
@
scroll=
"scroll"
style=
"height: 100%; padding-bottom: 0px;"
>
<view
class=
"good-list"
>
<view
class=
"good-list"
v-if=
"g.length>0"
>
<view
class=
"good-item"
v-for=
"(x, i) in g"
:key=
"i"
>
<image
class=
"good-pic"
:src=
"x.CoverImage"
mode=
"aspectFit"
/>
<view
class=
"right-box"
>
...
...
@@ -158,6 +159,7 @@ export default {
}
else
{
this
.
status
=
"loadmore"
;
}
}
uni
.
hideNavigationBarLoading
();
}
...
...
pages/share-order/share-order.vue
View file @
ccf5f2e0
...
...
@@ -37,7 +37,7 @@
</view>
<view
class=
"center_l"
>
<Text>
{{
item
.
CommissionState
==
1
?
'待返佣'
:
'已返佣'
}}
:
<Text
:style=
"
{color:
mainC
olor}">
{{
item
.
Commission
}}
</Text>
元
</Text>
<Text>
{{
item
.
CommissionState
==
1
?
'待返佣'
:
'已返佣'
}}
:
<Text
:style=
"
{color:
pricec
olor}">
{{
item
.
Commission
}}
</Text>
元
</Text>
<u-icon
name=
"arrow"
v-if=
'item.showdetail==false'
></u-icon>
<u-icon
name=
"arrow-down"
v-if=
'item.showdetail==true'
></u-icon>
</view>
...
...
@@ -50,9 +50,9 @@
<view
style=
'display: flex;flex-direction: row;align-items: center;'
>
<Text
v-for=
"(q, w) in c.SpecificationList"
:key=
"w"
>
{{
q
}}
</Text>
</view>
<view>
<Text
:style=
"
{color:mainColor}">¥
{{
c
.
Final_Price
}}
</Text>
<view
style=
"display: flex;flex-direction: row;align-items: center;justify-content: space-between;"
>
<Text
style=
'margin-left: 5px;'
>
x
{{
c
.
Number
}}
</Text>
<Text
:style=
"
{color:pricecolor}">¥
{{
c
.
Final_Price
}}
</Text>
</view>
...
...
@@ -89,6 +89,7 @@
contentHeight
:
0
,
mainColor
:
''
,
secondary
:
''
,
pricecolor
:
''
,
g
:[],
list
:[
{
name
:
'全部'
},
...
...
@@ -115,6 +116,7 @@
this
.
contentHeight
=
this
.
$utils
.
calcContentHeight
(
-
40
)
+
'px'
;
this
.
mainColor
=
this
.
$uiConfig
.
mainColor
;
this
.
secondary
=
this
.
$uiConfig
.
secondary
;
this
.
pricecolor
=
this
.
$uiConfig
.
pricecolor
;
this
.
init
()
},
mounted
()
{
...
...
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