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
92922049
Commit
92922049
authored
Aug 07, 2020
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
fd31ad15
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
11 deletions
+38
-11
cart.vue
pages/cart/cart.vue
+7
-1
goods.vue
pages/goods/goods.vue
+31
-10
No files found.
pages/cart/cart.vue
View file @
92922049
...
...
@@ -110,6 +110,7 @@
text-overflow: ellipsis;
margin-top: 2px;
"
@
click=
"goUrl(item.FreeShippingUrl)"
v-if=
"item.FreeShippingName !=null && (item.FreeShippingFullMoneyPinkage>0 || item.FreeShippingFullNumPinkage>0)"
>
...
...
@@ -654,7 +655,12 @@ export default {
uni
.
navigateTo
({
url
:
'/pages/goods/goods?id='
+
id
});
}
},
goUrl
(
url
)
{
uni
.
navigateTo
({
url
:
url
});
},
}
};
</
script
>
...
...
pages/goods/goods.vue
View file @
92922049
...
...
@@ -92,7 +92,7 @@
style=
"align-items: flex-start;"
>
<view
class=
"label"
style=
"margin-top: 5px;"
>
活动
</view>
<view
class=
"label"
>
活动
</view>
<view
class=
"content"
style=
"display: flex;flex-direction: column"
>
<view
style=
"display: flex;flex-direction: row;align-items: center;margin-bottom: 5px;"
v-if=
"g.goods_marketing_award.integral.title != ''"
>
<u-tag
text=
"送积分"
type=
"error"
/>
...
...
@@ -106,9 +106,29 @@
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
style=
"display: flex;flex-direction: row;align-items: center"
v-if=
" g.freeShippingName!=null && g.freeShippingName !='' &&(g.fullMoneyPinkage > 0 || g.fullNumPinkage>0)"
@
click=
"goUrl(g.FreeShippingUrl)"
>
<view
style=
"color: #FF4048;background: #fdf6ec;padding: 0 5px;display: inline-block;"
>
<Text
style=
"
font-size: 20rpx;
margin-right: 5rpx;
"
>
{{
g
.
freeShippingName
!=
null
?
g
.
freeShippingName
:
''
}}
</Text>
</view>
<!--
<view
class=
"label"
style=
"color: #FF4048;"
>
{{
g
.
freeShippingName
}}
</view>
-->
<!--
<view
class=
"content"
v-if=
"g.fullMoneyPinkage==0 && g.fullNumPinkage>0"
>
{{
g
.
fullNumPinkage
}}
件包邮
</view>
<view
class=
"content"
v-if=
"g.fullMoneyPinkage>0 && g.fullNumPinkage==0"
>
满
{{
g
.
fullMoneyPinkage
}}
元包邮
</view>
-->
</view>
<!--
<view
style=
"margin-top: 5px;"
v-if=
"
g.goods_marketing_award.PresentFXGradeMsg == ''
&& g.goods_marketing_award.integral.title == '' &&
g.freeShippingName!=null && g.freeShippingName !='' &&(g.fullMoneyPinkage == 0 && g.fullNumPinkage==0)
"
>
<text>
暂无活动
</text>
</view>
-->
</view>
</view>
...
...
@@ -165,17 +185,13 @@
</view>
</view>
<view
class=
"sku-box u-skeleton-rect"
v-if=
"setting.is_express == '1'
&& g.fullMoneyPinkage==0 && g.fullNumPinkage==0
"
>
<view
class=
"sku-box u-skeleton-rect"
v-if=
"setting.is_express == '1'
"
>
<view
class=
"label"
>
快递
</view>
<view
class=
"content"
>
{{
g.express == "" ? "免运费" : "¥" + g.express
}}
</view>
</view>
<view
class=
"sku-box u-skeleton-rect"
v-if=
"g.express>0 && g.freeShippingName!=null && g.freeShippingName !=''"
>
<view
class=
"label"
style=
"color: #000000;"
>
{{g.freeShippingName}}:
</view>
<view
class=
"content"
v-if=
"g.fullMoneyPinkage==0 && g.fullNumPinkage>0"
>
{{g.fullNumPinkage}}件包邮
</view>
<view
class=
"content"
v-if=
"g.fullMoneyPinkage>0 && g.fullNumPinkage==0"
>
满{{g.fullMoneyPinkage}}元包邮
</view>
</view>
<view
class=
"sku-box u-skeleton-rect"
style=
"margin-top: -10;"
...
...
@@ -702,7 +718,12 @@ export default {
},
closeBtn(){
this.showCoupons = false
}
},
goUrl(url) {
uni.navigateTo({
url: url
});
},
},
};
...
...
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