Commit ba5f67ae9dad692287b2d1369bb5d39889dd0a80
1 parent
5dcff105
oa单
Showing
4 changed files
with
59 additions
and
8 deletions
pages/giftpack/giftpacklist/giftpacklist.wxml
| @@ -106,13 +106,13 @@ | @@ -106,13 +106,13 @@ | ||
| 106 | <text class="data-v-3a5b7e36 ellipsis-1"> | 106 | <text class="data-v-3a5b7e36 ellipsis-1"> |
| 107 | {{"数量:"+item.num}} | 107 | {{"数量:"+item.num}} |
| 108 | </text> | 108 | </text> |
| 109 | - <block wx:if="{{isBuy==0 && !flag}}"> | ||
| 110 | - <text style="margin-left:10rpx" wx:if="{{item.useState}}"> | ||
| 111 | - 已核销 | ||
| 112 | - </text> | ||
| 113 | - <text style="margin-left:10rpx" wx:else> | ||
| 114 | - 未核销 | ||
| 115 | - </text> | 109 | + <block wx:if="{{isBuy==0 && !flag && item.lbType==1}}"> |
| 110 | + <text style="margin-left:10rpx" wx:if="{{item.useState}}"> | ||
| 111 | + 已核销 | ||
| 112 | + </text> | ||
| 113 | + <text style="margin-left:10rpx" wx:else> | ||
| 114 | + 未核销 | ||
| 115 | + </text> | ||
| 116 | </block> | 116 | </block> |
| 117 | </view> | 117 | </view> |
| 118 | 118 |
pages/index/index/index.js
| @@ -84,7 +84,7 @@ Page({ | @@ -84,7 +84,7 @@ Page({ | ||
| 84 | full_ad: null, //全屏广告 | 84 | full_ad: null, //全屏广告 |
| 85 | full_screen: 0, //全屏广告 | 85 | full_screen: 0, //全屏广告 |
| 86 | is_ok_h5: 0, //判断要不要显示关注二维码 | 86 | is_ok_h5: 0, //判断要不要显示关注二维码 |
| 87 | - | 87 | + mb_banner:{},//首页广告 |
| 88 | container: null, | 88 | container: null, |
| 89 | is_retail_price:0, | 89 | is_retail_price:0, |
| 90 | }, | 90 | }, |
| @@ -669,6 +669,36 @@ Page({ | @@ -669,6 +669,36 @@ Page({ | ||
| 669 | }) | 669 | }) |
| 670 | let user_id = getApp().globalData.user_id; | 670 | let user_id = getApp().globalData.user_id; |
| 671 | 671 | ||
| 672 | + //---首页广告------- | ||
| 673 | + await getApp().request.promiseGet("/api/weshop/ad/page?pids=300,301,302,303,304&store_id=" + o.stoid, { | ||
| 674 | + data: { | ||
| 675 | + enabled: 1 | ||
| 676 | + } | ||
| 677 | + }).then(res => { | ||
| 678 | + console.log('首页广告--------------------------'); | ||
| 679 | + console.log(res); | ||
| 680 | + if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) { | ||
| 681 | + var a = res.data.data.pageData; | ||
| 682 | + var obj = {}; | ||
| 683 | + for (var i = 0; i < a.length; i++) { | ||
| 684 | + var tt = { | ||
| 685 | + 'ad_code': o.imghost + a[i].ad_code, | ||
| 686 | + 'media_link': '', | ||
| 687 | + 'ad_weapplink': a[i].ad_weapplink, | ||
| 688 | + 'pid':a[i].pid | ||
| 689 | + }; | ||
| 690 | + // arr.push(tt); | ||
| 691 | + obj[a[i].pid]=tt | ||
| 692 | + } | ||
| 693 | + if (a.length > 0) e.setData({ | ||
| 694 | + mb_banner: obj, | ||
| 695 | + }); | ||
| 696 | + | ||
| 697 | + wx.stopPullDownRefresh(); | ||
| 698 | + } | ||
| 699 | + }) | ||
| 700 | + | ||
| 701 | + | ||
| 672 | //----拼单----- | 702 | //----拼单----- |
| 673 | await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2", { | 703 | await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2", { |
| 674 | data: { | 704 | data: { |
| @@ -1092,6 +1122,11 @@ Page({ | @@ -1092,6 +1122,11 @@ Page({ | ||
| 1092 | } | 1122 | } |
| 1093 | }) | 1123 | }) |
| 1094 | }, | 1124 | }, |
| 1125 | + //广告跳转 | ||
| 1126 | + go_mb(e){ | ||
| 1127 | + let url=e.currentTarget.dataset.url | ||
| 1128 | + getApp().goto(url); | ||
| 1129 | + }, | ||
| 1095 | 1130 | ||
| 1096 | //跳转到分类 | 1131 | //跳转到分类 |
| 1097 | go_cate: function () { | 1132 | go_cate: function () { |
pages/index/index/index.wxss
| @@ -1234,3 +1234,18 @@ page { | @@ -1234,3 +1234,18 @@ page { | ||
| 1234 | align-items: center; | 1234 | align-items: center; |
| 1235 | justify-items: center; | 1235 | justify-items: center; |
| 1236 | } | 1236 | } |
| 1237 | +/* 商城首页 */ | ||
| 1238 | +.mb_box{ | ||
| 1239 | + width: 100%; | ||
| 1240 | +} | ||
| 1241 | +.mb_top,.mb_bottom{ | ||
| 1242 | + width: 100%; | ||
| 1243 | + display: flex; | ||
| 1244 | + | ||
| 1245 | +} | ||
| 1246 | +.mb_top .mb_top_item{ | ||
| 1247 | + width: 50%; | ||
| 1248 | +} | ||
| 1249 | +.mb_bottom>view{ | ||
| 1250 | + width: 50%; | ||
| 1251 | +} |
pages/user/userqy/userqy.js
| 1 | var e = getApp(),os = e.globalData.setting; | 1 | var e = getApp(),os = e.globalData.setting; |
| 2 | var utils = require('../../../utils/util.js'); | 2 | var utils = require('../../../utils/util.js'); |
| 3 | +var ut = require('../../../utils/util.js'); | ||
| 3 | var regeneratorRuntime = require('../../../utils/runtime.js'); | 4 | var regeneratorRuntime = require('../../../utils/runtime.js'); |
| 4 | 5 | ||
| 5 | Page({ | 6 | Page({ |