diff --git a/packageA/pages/myGift/myGift.js b/packageA/pages/myGift/myGift.js
index c1e8126..0d0c2af 100644
--- a/packageA/pages/myGift/myGift.js
+++ b/packageA/pages/myGift/myGift.js
@@ -16,6 +16,7 @@ Page({
isLoading: false, // 检测是否已经发送请求,防止重复发送请求
noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
pageNum: 1, // 当前页数
+ iurl: os.imghost, //图片前缀网址
},
clickTab(e) {
@@ -40,7 +41,8 @@ Page({
url = '/api/weshop/libao/libaoFormvip/page';
};
- this.getData(true, url, data);
+ this.getData(true, url, data);
+
},
/**
@@ -56,6 +58,23 @@ Page({
userInfo: data,
});
});
+
+ getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, {
+ data: {
+ enabled: 1
+ }
+ }).then(res => {
+ if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
+ var a = res.data.data.pageData;
+ var tt = {
+ 'ad_code': os.imghost + a[0].ad_code,
+ 'media_link': '',
+ 'ad_weapplink': a[0].ad_weapplink,
+ 'bgcolor': a[0].bgcolor,
+ };
+ self.setData({ ad_data: tt });
+ }
+ })
},
/**
diff --git a/packageA/pages/myGift/myGift.wxml b/packageA/pages/myGift/myGift.wxml
index 731944e..dd4ab2c 100644
--- a/packageA/pages/myGift/myGift.wxml
+++ b/packageA/pages/myGift/myGift.wxml
@@ -1,5 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{item}}
@@ -31,7 +46,7 @@
- 零售价{{filter.toFix(item.oldprice,2)}}
+
已售{{item.salenum+item.virtualsales}}件
diff --git a/packageA/pages/myGift/myGift.wxss b/packageA/pages/myGift/myGift.wxss
index 05f5d37..673f376 100644
--- a/packageA/pages/myGift/myGift.wxss
+++ b/packageA/pages/myGift/myGift.wxss
@@ -1,4 +1,7 @@
@charset "utf-8";
+.top_img image {
+ width: 100%;
+}
.c-a4 {
color: #a4a4a4;
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml
index fe643fe..632e9b7 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.wxml
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml
@@ -36,7 +36,7 @@
- 零售价{{filter.toFix(details.oldprice,2)}}
+
已售{{details.salenum+details.virtualsales}}件
diff --git a/packageB/pages/user/collect_list/collect_list.wxml b/packageB/pages/user/collect_list/collect_list.wxml
index 5f756a5..d5dfeec 100644
--- a/packageB/pages/user/collect_list/collect_list.wxml
+++ b/packageB/pages/user/collect_list/collect_list.wxml
@@ -49,10 +49,10 @@
{{item.prom_price?item.prom_price:item.final_price}}
-
- 零售价:
- ￥{{item.market_price}}
-
+
+
+
+
diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js
index 0ec52e5..3ef5fe2 100644
--- a/packageB/pages/zuhegou/index/index.js
+++ b/packageB/pages/zuhegou/index/index.js
@@ -1099,6 +1099,7 @@ Page({
goods_price: newd.goods_price,
member_goods_price: newd.goods_price,
store_id: os.stoid,
+ state:0
};
if (th.data.s_cart_num) {
updata.goods_num = th.data.s_cart_num;
@@ -1889,6 +1890,7 @@ Page({
goods_price: cur_price,
prom_id: th.data.act.id,
store_id: os.stoid,
+ state:0
};
if (getApp().globalData.guide_id) {
updata['guide_id'] = getApp().globalData.guide_id;
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.wxml b/pages/giftpack/buygiftpack/giftpackbuy.wxml
index c440673..1256432 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.wxml
+++ b/pages/giftpack/buygiftpack/giftpackbuy.wxml
@@ -47,9 +47,9 @@
-
- {{"零售价:￥"+items.giftPosPrice}}
-
+
+
+
{{"活动开始时间："+items.starTime}}
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index 5d0c711..b78bfe8 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -48,9 +48,9 @@