diff --git a/packageA/pages/distribution/goods/goods.js b/packageA/pages/distribution/goods/goods.js index 025012c..919d255 100644 --- a/packageA/pages/distribution/goods/goods.js +++ b/packageA/pages/distribution/goods/goods.js @@ -30,6 +30,7 @@ Page({ currentQuery: { store_id: app.globalData.setting.stoid, }, + is_no_plus:1, default_img: '/miniapp/images/default_g_img.gif', }, @@ -67,6 +68,22 @@ Page({ options, tabArr, }); + + //调用接口判断商家plus有没有过期 + getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => { + if (res.data.code == 0) { + var arr = res.data.data.pageData; + if (arr.length > 0) { + var item = arr[0]; + if (item.is_sy == 0) { + var now = Date.parse(new Date()); now = now / 1000; + if (item.end_time < now) { + self.setData({ is_no_plus: 0 }) + } + } + } + } + }) diff --git a/packageA/pages/distribution/goods/goods.wxml b/packageA/pages/distribution/goods/goods.wxml index bc6344e..c957d8c 100644 --- a/packageA/pages/distribution/goods/goods.wxml +++ b/packageA/pages/distribution/goods/goods.wxml @@ -101,7 +101,7 @@ - + @@ -242,7 +242,7 @@ - + diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js index 1b3de11..2990aa3 100644 --- a/pages/giftpack/buygiftpack/giftpackbuy.js +++ b/pages/giftpack/buygiftpack/giftpackbuy.js @@ -53,6 +53,7 @@ Page({ }) } + getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, { data: { enabled: 1 @@ -84,7 +85,6 @@ Page({ } } this.getList(); - }, //购买礼包 diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js index e19352c..0792604 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.js +++ b/pages/giftpack/giftpacklist/giftpacklist.js @@ -68,6 +68,7 @@ Page({ return false; } } + if (this.data.isBuy == 0) { this.GetMyGiftList(); } else { diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml index 3371d20..537448d 100644 --- a/pages/goods/goodsList/goodsList.wxml +++ b/pages/goods/goodsList/goodsList.wxml @@ -203,7 +203,7 @@ - +