daf3eb67 by simon

默认提交

1 parent c0f6ab09
......@@ -7,6 +7,6 @@
</view>
<button class="contact" wx:if="{{contact}}" open-type="contact" show-message-card="true" send-message-title="家有儿孙" end-message-path="/pages/index/index" send-message-img="https://kdcdn.oss-cn-shenzhen.aliyuncs.com/weapp/jyes/assets/logo.jpg" bindcontact="handleContact">
<!-- <span class="iconfont iconicon-test3 contact"></span> -->
<image class="img" mode="widthFix" src="../../image/shortcut/contact.jpg" />
<image class="img" mode="widthFix" src="../../image/shortcut/contact.png" />
</button>
</view>
......
......@@ -285,7 +285,6 @@ Page({
adConfigure: result
})
app.globalData.adConfigure = result;
resolve(result);
}).catch((err) => {
reject(err)
......
......@@ -60,10 +60,16 @@
<view class="more">
<view class="more-title">-- 更多推荐欣赏 --</view>
<view class="more-list">
<view bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" wx:for="{{dataList}}" wx:key="index" class="more-list-item">
<block wx:for="{{dataListResult}}" wx:key="index">
<block wx:if="{{item.type == 'ad'}}">
<ad wx:if="{{item.adType == 'video'}}" unit-id="adunit-f944674d97d18363" ad-type="video" ad-theme="white"></ad>
<ad wx:else unit-id="adunit-c3754721d968fc07"></ad>
</block>
<view wx:else bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" class="more-list-item">
<view class="tit">{{item.videoName}}</view>
<image class="poster" src="{{item.thumbnail}}" />
</view>
</block>
</view>
</view>
<!-- 返回首页按钮 -->
......
......@@ -441,7 +441,7 @@ Page({
adStepIndex = 0;
dataListResult.push({
type: "ad",
adType: "banner"
adType: "video"
})
}
}
......@@ -449,9 +449,11 @@ Page({
adStepIndex++;
dataListResult.push(element);
// console.log("dataListResult:", dataListResult);
});
this.setData({
dataList: dataListResult,
dataList: dataList,
dataListResult: dataListResult,
total: result.total,
queueCode: result.queueCode,
listType: result.type
......
......@@ -26,8 +26,11 @@
<view class="list">
<!-- 拜年item -->
<block wx:if="{{listType == 2}}">
<block wx:for="{{dataList}}" wx:key="index">
<ad wx:if="{{item.type == 'ad'}}" unit-id="adunit-c3754721d968fc07"></ad>
<block wx:for="{{dataListResult}}" wx:key="index">
<block wx:if="{{item.type == 'ad'}}">
<ad wx:if="{{item.adType == 'video'}}" unit-id="adunit-f944674d97d18363" ad-type="video" ad-theme="white"></ad>
<ad wx:else unit-id="adunit-c3754721d968fc07"></ad>
</block>
<view wx:else bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" class="list-bless-item">
<image class="poster" src="{{item.thumbnail}}" />
<view class="desc-wrap">
......@@ -41,8 +44,11 @@
</block>
<!-- 视频item -->
<block wx:else>
<block wx:for="{{dataList}}" wx:key="index">
<ad wx:if="{{item.type == 'ad'}}" unit-id="adunit-c3754721d968fc07"></ad>
<block wx:for="{{dataListResult}}" wx:key="index">
<block wx:if="{{item.type == 'ad'}}">
<ad wx:if="{{item.adType == 'video'}}" unit-id="adunit-f944674d97d18363" ad-type="video" ad-theme="white"></ad>
<ad wx:else unit-id="adunit-c3754721d968fc07"></ad>
</block>
<view wx:else class="list-item">
<view bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" class="list-item-video">
<image class="img" src="{{item.thumbnail}}" mode="aspectFill" />
......