Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents 1e618d67 ba5f67ae
Showing 4 changed files with 59 additions and 8 deletions
pages/giftpack/giftpacklist/giftpacklist.wxml
pages/index/index/index.js
pages/index/index/index.wxss
pages/user/userqy/userqy.js
@@ -106,13 +106,13 @@
             <text class="data-v-3a5b7e36 ellipsis-1">
 			        {{"数量:"+item.num}}
 			      </text>
-            <block wx:if="{{isBuy==0 && !flag}}">
-              <text style="margin-left:10rpx" wx:if="{{item.useState}}">
-              已核销
-            </text>
-            <text style="margin-left:10rpx" wx:else>
-              未核销
-            </text>
+            <block wx:if="{{isBuy==0 && !flag && item.lbType==1}}">
+                <text style="margin-left:10rpx" wx:if="{{item.useState}}">
+                已核销
+              </text>
+              <text style="margin-left:10rpx" wx:else>
+                未核销
+              </text>
             </block>
           </view>
@@ -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 () {
@@ -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%;
+}
 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({