diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index 3056247..b5bb2de 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -106,13 +106,13 @@
{{"数量:"+item.num}}
-
-
- 已核销
-
-
- 未核销
-
+
+
+ 已核销
+
+
+ 未核销
+
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 53bfc68..d0f064a 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -84,7 +84,7 @@ Page({
full_ad: null, //全屏广告
full_screen: 0, //全屏广告
is_ok_h5: 0, //判断要不要显示关注二维码
-
+ mb_banner:{},//首页广告
container: null,
is_retail_price:0,
},
@@ -669,6 +669,36 @@ Page({
})
let user_id = getApp().globalData.user_id;
+ //---首页广告-------
+ await getApp().request.promiseGet("/api/weshop/ad/page?pids=300,301,302,303,304&store_id=" + o.stoid, {
+ data: {
+ enabled: 1
+ }
+ }).then(res => {
+ console.log('首页广告--------------------------');
+ console.log(res);
+ if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) {
+ var a = res.data.data.pageData;
+ var obj = {};
+ for (var i = 0; i < a.length; i++) {
+ var tt = {
+ 'ad_code': o.imghost + a[i].ad_code,
+ 'media_link': '',
+ 'ad_weapplink': a[i].ad_weapplink,
+ 'pid':a[i].pid
+ };
+ // arr.push(tt);
+ obj[a[i].pid]=tt
+ }
+ if (a.length > 0) e.setData({
+ mb_banner: obj,
+ });
+
+ wx.stopPullDownRefresh();
+ }
+ })
+
+
//----拼单-----
await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2", {
data: {
@@ -1092,6 +1122,11 @@ Page({
}
})
},
+ //广告跳转
+ go_mb(e){
+ let url=e.currentTarget.dataset.url
+ getApp().goto(url);
+ },
//跳转到分类
go_cate: function () {
diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss
index 1172f86..3238b3f 100644
--- a/pages/index/index/index.wxss
+++ b/pages/index/index/index.wxss
@@ -1234,3 +1234,18 @@ page {
align-items: center;
justify-items: center;
}
+/* 商城首页 */
+.mb_box{
+ width: 100%;
+}
+.mb_top,.mb_bottom{
+ width: 100%;
+ display: flex;
+
+}
+.mb_top .mb_top_item{
+ width: 50%;
+}
+.mb_bottom>view{
+ width: 50%;
+}
diff --git a/pages/user/userqy/userqy.js b/pages/user/userqy/userqy.js
index 90bc7ca..3317023 100644
--- a/pages/user/userqy/userqy.js
+++ b/pages/user/userqy/userqy.js
@@ -1,5 +1,6 @@
var e = getApp(),os = e.globalData.setting;
var utils = require('../../../utils/util.js');
+var ut = require('../../../utils/util.js');
var regeneratorRuntime = require('../../../utils/runtime.js');
Page({