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
e1b18feb
Commit
e1b18feb
authored
Jul 22, 2020
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
20fc6eea
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
15 deletions
+26
-15
goods.vue
pages/goods/goods.vue
+20
-7
index.vue
pages/share/index/index.vue
+4
-3
vipBuyCommission.vue
pages/share/vipBuyCommission/vipBuyCommission.vue
+2
-5
No files found.
pages/goods/goods.vue
View file @
e1b18feb
...
@@ -69,15 +69,28 @@
...
@@ -69,15 +69,28 @@
</view>
</view>
<view
<view
class=
"sku-box u-skeleton-rect"
class=
"sku-box u-skeleton-rect"
v-if=
"g.goods_marketing_award.integral.title != ''"
style=
"align-items: flex-start;"
>
>
<view
class=
"label"
>
活动
</view>
<view
class=
"label"
style=
"margin-top: 5px;"
>
活动
</view>
<view
class=
"content"
>
<view
class=
"content"
style=
"display: flex;flex-direction: column"
>
<u-tag
text=
"送积分"
type=
"error"
/>
<view
style=
"display: flex;flex-direction: row;align-items: center;margin-bottom: 5px;"
v-if=
"g.goods_marketing_award.integral.title != ''"
>
<text
style=
"margin-left: 5px; font-size: 12px;"
>
{{
<u-tag
text=
"送积分"
type=
"error"
/>
g
.
goods_marketing_award
.
integral
.
title
<text
style=
"margin-left: 5px; font-size: 12px;"
>
{{
}}
</text>
g
.
goods_marketing_award
.
integral
.
title
}}
</text>
</view>
<view
style=
"display: flex;flex-direction: row;align-items: center"
v-if=
"g.goods_marketing_award.PresentFXGradeMsg != ''"
>
<u-tag
text=
"送会员"
type=
"error"
/>
<text
style=
"margin-left: 5px; font-size: 12px;"
>
{{
g
.
goods_marketing_award
.
PresentFXGradeMsg
}}
</text>
</view>
<view
style=
"margin-top: 5px;"
v-if=
"g.goods_marketing_award.PresentFXGradeMsg == '' && g.goods_marketing_award.integral.title == ''"
>
<text>
暂无活动
</text>
</view>
</view>
</view>
</view>
</view>
<view
<view
class=
"sku-box u-skeleton-rect"
class=
"sku-box u-skeleton-rect"
...
...
pages/share/index/index.vue
View file @
e1b18feb
...
@@ -86,9 +86,10 @@
...
@@ -86,9 +86,10 @@
</view>
</view>
<Text
style=
'font-size: 12px;margin-top: 5px;'
>
{{
sharedata
.
CustomModel
.
ReferrerName
}}
:
{{
sharedata
.
UserInfo
.
SuperiorName
}}
</Text>
<Text
style=
'font-size: 12px;margin-top: 5px;'
>
{{
sharedata
.
CustomModel
.
ReferrerName
}}
:
{{
sharedata
.
UserInfo
.
SuperiorName
}}
</Text>
<Text
style=
'font-size: 12px;margin-top: 5px;'
v-if=
'sharedata.UserInfo.IsEnableFXGrade==1 && sharedata.UserInfo.IsVip==1'
>
会员日期:
{{
sharedata
.
UserInfo
.
VipExpiryDate
}}
</Text>
<Text
style=
'font-size: 12px;margin-top: 5px;'
>
等级:
{{
sharedata
.
UserInfo
.
GradeName
}}
</Text>
<Text
style=
'font-size: 12px;margin-top: 5px;'
>
等级:
{{
sharedata
.
UserInfo
.
GradeName
}}
</Text>
</view>
<Text
style=
'font-size: 12px;margin-top: 5px;height: 19px;'
>
{{
sharedata
.
UserInfo
.
IsEnableFXGrade
==
1
&&
sharedata
.
UserInfo
.
IsVip
==
1
?
'会员日期:'
+
sharedata
.
UserInfo
.
VipExpiryDate
:
''
}}
</Text>
</view>
</view>
</view>
</view>
</view>
<!--
<view
style=
"width: 100%;margin-top: 5px;"
>
<!--
<view
style=
"width: 100%;margin-top: 5px;"
>
...
@@ -428,7 +429,7 @@
...
@@ -428,7 +429,7 @@
margin-left
:
30px
;
margin-left
:
30px
;
display
:
flex
;
display
:
flex
;
flex-direction
:
row
;
flex-direction
:
row
;
align-items
:
center
;
align-items
:
flex-start
;
}
}
.shareindexStyle
.sj_style
{
.shareindexStyle
.sj_style
{
...
...
pages/share/vipBuyCommission/vipBuyCommission.vue
View file @
e1b18feb
...
@@ -29,14 +29,11 @@
...
@@ -29,14 +29,11 @@
<view
class=
"box_ltext"
>
<view
class=
"box_ltext"
>
<Text
class=
'l_name'
>
{{
item
.
UserName
}}
</Text>
<Text
class=
'l_name'
>
{{
item
.
UserName
}}
</Text>
</view>
</view>
<!--
<Text
v-if=
'item.Grade==0'
>
自购返佣
</Text>
<text
style=
"margin-left: 8px;"
>
{{
item
.
GradeDescription
}}
</text>
<Text
v-if=
'item.Grade==1'
>
一级分销
</Text>
<Text
v-if=
'item.Grade==2'
>
二级分销
</Text>
-->
<text>
{{
item
.
GradeDescription
}}
</text>
</view>
</view>
<view
class=
"center_l"
>
<view
class=
"center_l"
>
<Text>
购买
返佣:
<Text
:style=
"
{color:mainColor}">
{{
item
.
Commission
}}
</Text>
元
</Text>
<Text>
已
返佣:
<Text
:style=
"
{color:mainColor}">
{{
item
.
Commission
}}
</Text>
元
</Text>
</view>
</view>
</view>
</view>
<view
style=
"margin: 5px 0;width: 100%;"
>
<view
style=
"margin: 5px 0;width: 100%;"
>
...
...
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