|
@@ -113,11 +113,11 @@
|
113
|
113
|
{{
|
114
|
114
|
activity.display === 1
|
115
|
115
|
? "隐藏"
|
116
|
|
- : "显示"
|
|
116
|
+ : "取消隐藏"
|
117
|
117
|
}}</span
|
118
|
118
|
>
|
119
|
119
|
<span @click="pushGive(activity)">
|
120
|
|
- 推送</span
|
|
120
|
+ 推送到群</span
|
121
|
121
|
>
|
122
|
122
|
<span @click="shareApp(activity)">
|
123
|
123
|
分享</span
|
|
@@ -197,6 +197,19 @@
|
197
|
197
|
}}
|
198
|
198
|
</span>
|
199
|
199
|
|
|
200
|
+ <span v-if="item.tagPrice">
|
|
201
|
+ 原价:{{
|
|
202
|
+ item.tagPrice / 100
|
|
203
|
+ }}
|
|
204
|
+ </span>
|
|
205
|
+ </div>
|
|
206
|
+ <div class="goods__sale">
|
|
207
|
+ <!-- <span v-if="item.agentFee">
|
|
208
|
+ 赚:¥{{
|
|
209
|
+ item.agentFee / 100
|
|
210
|
+ }}
|
|
211
|
+ </span> -->
|
|
212
|
+
|
200
|
213
|
<span
|
201
|
214
|
v-if="
|
202
|
215
|
item.totalInventory
|
|
@@ -230,7 +243,7 @@
|
230
|
243
|
</div>
|
231
|
244
|
<div
|
232
|
245
|
class="btn"
|
233
|
|
- @click="shareGood(item)"
|
|
246
|
+ @click="shareGoodFun(item)"
|
234
|
247
|
>
|
235
|
248
|
分享
|
236
|
249
|
</div>
|
|
@@ -522,6 +535,9 @@ export default {
|
522
|
535
|
.then((res) => {
|
523
|
536
|
if (res.success) {
|
524
|
537
|
val.top = 0;
|
|
538
|
+ this.goodList.sort((x, y) => {
|
|
539
|
+ return y.top - x.top;
|
|
540
|
+ });
|
525
|
541
|
this.$forceUpdate();
|
526
|
542
|
this.fn.showToast("取消成功");
|
527
|
543
|
} else {
|
|
@@ -541,6 +557,9 @@ export default {
|
541
|
557
|
.then((res) => {
|
542
|
558
|
if (res.success) {
|
543
|
559
|
val.top = 1;
|
|
560
|
+ this.goodList.sort((x, y) => {
|
|
561
|
+ return y.top - x.top;
|
|
562
|
+ });
|
544
|
563
|
this.$forceUpdate();
|
545
|
564
|
this.fn.showToast("置顶成功");
|
546
|
565
|
} else {
|
|
@@ -629,7 +648,7 @@ export default {
|
629
|
648
|
},
|
630
|
649
|
|
631
|
650
|
// 分享商品
|
632
|
|
- shareGood(val) {
|
|
651
|
+ shareGoodFun(val) {
|
633
|
652
|
uni.navigateToMiniProgram({
|
634
|
653
|
appId: "wx7d16ba51271496b8",
|
635
|
654
|
path: `/pages/recommend/detail?shopId=${this.shopId}&goodsId=${val.id}`,
|
|
@@ -1227,8 +1246,8 @@ export default {
|
1227
|
1246
|
|
1228
|
1247
|
hideContent() {
|
1229
|
1248
|
this.desModalVisible = false;
|
1230
|
|
- this.desModalTitle = '';
|
1231
|
|
- this.desModalDes = '';
|
|
1249
|
+ this.desModalTitle = "";
|
|
1250
|
+ this.desModalDes = "";
|
1232
|
1251
|
},
|
1233
|
1252
|
},
|
1234
|
1253
|
|
|
@@ -1985,11 +2004,11 @@ page {
|
1985
|
2004
|
height: 100%;
|
1986
|
2005
|
background-color: rgba(0, 0, 0, 0.3);
|
1987
|
2006
|
}
|
1988
|
|
- .head-r{
|
|
2007
|
+ .head-r {
|
1989
|
2008
|
font-size: px(40);
|
1990
|
2009
|
color: #666;
|
1991
|
2010
|
}
|
1992
|
|
- .main{
|
|
2011
|
+ .main {
|
1993
|
2012
|
max-height: 80vh;
|
1994
|
2013
|
position: absolute;
|
1995
|
2014
|
bottom: 0;
|
|
@@ -1997,7 +2016,7 @@ page {
|
1997
|
2016
|
z-index: 100;
|
1998
|
2017
|
background-color: #fff;
|
1999
|
2018
|
}
|
2000
|
|
- .head{
|
|
2019
|
+ .head {
|
2001
|
2020
|
height: px(120);
|
2002
|
2021
|
display: flex;
|
2003
|
2022
|
align-items: center;
|
|
@@ -2005,7 +2024,7 @@ page {
|
2005
|
2024
|
border-bottom: 1px solid #f1f1f1;
|
2006
|
2025
|
padding: 0 px(40);
|
2007
|
2026
|
}
|
2008
|
|
- .body{
|
|
2027
|
+ .body {
|
2009
|
2028
|
padding: px(60) px(40);
|
2010
|
2029
|
font-size: px(44);
|
2011
|
2030
|
line-height: 1.5;
|