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
68f070af
Commit
68f070af
authored
Jan 18, 2021
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2
parent
ef6ba2e5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
activeContent.vue
pages/friendcircle/activeContent.vue
+1
-1
myreward.vue
pages/friendcircle/myreward.vue
+6
-5
No files found.
pages/friendcircle/activeContent.vue
View file @
68f070af
...
@@ -124,7 +124,7 @@
...
@@ -124,7 +124,7 @@
<view
class=
"active_Title"
>
活动规则
</view>
<view
class=
"active_Title"
>
活动规则
</view>
<view
class=
"active_Inner"
>
<view
class=
"active_Inner"
>
<view
v-if=
"dataList.Type==1"
>
<view
v-if=
"dataList.Type==1"
>
活动期间累计订单数量需满足
{{
dataList
.
OrderNum
}}
个
活动期间累计订单数量需满足
{{
dataList
.
OrderNum
}}
单
</view>
</view>
<view
v-if=
"dataList.Type==2"
>
<view
v-if=
"dataList.Type==2"
>
活动期间累计订单金额需满足
{{
dataList
.
OrderMoney
}}
元
活动期间累计订单金额需满足
{{
dataList
.
OrderMoney
}}
元
...
...
pages/friendcircle/myreward.vue
View file @
68f070af
...
@@ -8,12 +8,12 @@
...
@@ -8,12 +8,12 @@
}
}
.reward_ImgDiv
{
.reward_ImgDiv
{
width
:
120px
;
width
:
120px
;
height
:
7
0px
;
height
:
9
0px
;
border-radius
:
5px
;
border-radius
:
5px
;
overflow
:
hidden
;
overflow
:
hidden
;
box-shadow
:
2px
2px
8px
#d2d2d2
;
box-shadow
:
2px
2px
8px
#d2d2d2
;
}
}
.reward_ImgDiv
im
g
{
.reward_ImgDiv
im
age
{
width
:
100%
;
width
:
100%
;
height
:
100%
;
height
:
100%
;
}
}
...
@@ -71,16 +71,17 @@
...
@@ -71,16 +71,17 @@
<view
class=
"myRewardContent"
>
<view
class=
"myRewardContent"
>
<view
style=
"width:calc(100vw - 110px);display: flex;"
>
<view
style=
"width:calc(100vw - 110px);display: flex;"
>
<view
class=
"reward_ImgDiv"
>
<view
class=
"reward_ImgDiv"
>
<im
g
:src=
"x.PrizeImage"
alt=
""
>
<im
age
:src=
"x.PrizeImage"
alt=
""
mode=
'aspectFill'
/
>
</view>
</view>
<view
style=
"padding-left:10px;flex: 1;width: 1px;"
>
<view
style=
"padding-left:10px;flex: 1;width: 1px;"
>
<view
class=
"rewardTop Chaochu"
>
{{
x
.
ActivityName
}}
</view>
<view
class=
"rewardTop Chaochu"
>
{{
x
.
ActivityName
}}
</view>
<!--
<view
class=
"reDuihuan Chaochu"
>
{{
x
.
PrizeName
}}
</view>
-->
<view
class=
"reDuihuan Chaochu"
>
{{
x
.
PrizeName
}}
</view>
<view
class=
"reDuihuan Chaochu"
style=
"font-family: aa;"
>
截止:
{{
x
.
ReceiveTime
}}
之前兑换
</view>
<view
class=
"reDuihuan Chaochu"
style=
"display:flex;flex-direction: row;align-items: center;font-family: aa;"
>
<view
class=
"reDuihuan Chaochu"
style=
"display:flex;flex-direction: row;align-items: center;font-family: aa;"
>
<image
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/tiaoxingma.png"
style=
"width: 13px;height: 10px;margin-right: 5px;"
></image>
<image
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/tiaoxingma.png"
style=
"width: 13px;height: 10px;margin-right: 5px;"
></image>
{{
x
.
Code
}}
</view>
{{
x
.
Code
}}
</view>
<view
class=
"reDuihuan Chaochu"
style=
"font-family: aa;"
>
截止
{{
x
.
ReceiveTime
}}
之前兑换
</view>
</view>
</view>
</view>
</view>
<view>
<view>
...
...
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