Skip to content

dev / home-with-kids-mp

Go to a project
Toggle navigation
Toggle navigation pinning
daf3eb67 by simon
Options

默认提交

1 parent c0f6ab09
Inline Side-by-side
Showing 6 changed files with 22 additions and 9 deletions
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
7 </view> 7 </view>
8 <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"> 8 <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">
9 <!-- <span class="iconfont iconicon-test3 contact"></span> --> 9 <!-- <span class="iconfont iconicon-test3 contact"></span> -->
10 <image class="img" mode="widthFix" src="../../image/shortcut/contact.jpg" /> 10 <image class="img" mode="widthFix" src="../../image/shortcut/contact.png" />
11 </button> 11 </button>
12 </view> 12 </view>
......
...@@ -285,7 +285,6 @@ Page({ ...@@ -285,7 +285,6 @@ Page({
285 adConfigure: result 285 adConfigure: result
286 }) 286 })
287 app.globalData.adConfigure = result; 287 app.globalData.adConfigure = result;
288
289 resolve(result); 288 resolve(result);
290 }).catch((err) => { 289 }).catch((err) => {
291 reject(err) 290 reject(err)
......
...@@ -60,10 +60,16 @@ ...@@ -60,10 +60,16 @@
60 <view class="more"> 60 <view class="more">
61 <view class="more-title">-- 更多推荐欣赏 --</view> 61 <view class="more-title">-- 更多推荐欣赏 --</view>
62 <view class="more-list"> 62 <view class="more-list">
63 <view bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" wx:for="{{dataList}}" wx:key="index" class="more-list-item"> 63 <block wx:for="{{dataListResult}}" wx:key="index">
64 <block wx:if="{{item.type == 'ad'}}">
65 <ad wx:if="{{item.adType == 'video'}}" unit-id="adunit-f944674d97d18363" ad-type="video" ad-theme="white"></ad>
66 <ad wx:else unit-id="adunit-c3754721d968fc07"></ad>
67 </block>
68 <view wx:else bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" class="more-list-item">
64 <view class="tit">{{item.videoName}}</view> 69 <view class="tit">{{item.videoName}}</view>
65 <image class="poster" src="{{item.thumbnail}}" /> 70 <image class="poster" src="{{item.thumbnail}}" />
66 </view> 71 </view>
72 </block>
67 </view> 73 </view>
68 </view> 74 </view>
69 <!-- 返回首页按钮 --> 75 <!-- 返回首页按钮 -->
......
...@@ -441,7 +441,7 @@ Page({ ...@@ -441,7 +441,7 @@ Page({
441 adStepIndex = 0; 441 adStepIndex = 0;
442 dataListResult.push({ 442 dataListResult.push({
443 type: "ad", 443 type: "ad",
444 adType: "banner" 444 adType: "video"
445 }) 445 })
446 } 446 }
447 } 447 }
...@@ -449,9 +449,11 @@ Page({ ...@@ -449,9 +449,11 @@ Page({
449 adStepIndex++; 449 adStepIndex++;
450 450
451 dataListResult.push(element); 451 dataListResult.push(element);
452 // console.log("dataListResult:", dataListResult);
452 }); 453 });
453 this.setData({ 454 this.setData({
454 dataList: dataListResult, 455 dataList: dataList,
456 dataListResult: dataListResult,
455 total: result.total, 457 total: result.total,
456 queueCode: result.queueCode, 458 queueCode: result.queueCode,
457 listType: result.type 459 listType: result.type
......
...@@ -26,8 +26,11 @@ ...@@ -26,8 +26,11 @@
26 <view class="list"> 26 <view class="list">
27 <!-- 拜年item --> 27 <!-- 拜年item -->
28 <block wx:if="{{listType == 2}}"> 28 <block wx:if="{{listType == 2}}">
29 <block wx:for="{{dataList}}" wx:key="index"> 29 <block wx:for="{{dataListResult}}" wx:key="index">
30 <ad wx:if="{{item.type == 'ad'}}" unit-id="adunit-c3754721d968fc07"></ad> 30 <block wx:if="{{item.type == 'ad'}}">
31 <ad wx:if="{{item.adType == 'video'}}" unit-id="adunit-f944674d97d18363" ad-type="video" ad-theme="white"></ad>
32 <ad wx:else unit-id="adunit-c3754721d968fc07"></ad>
33 </block>
31 <view wx:else bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" class="list-bless-item"> 34 <view wx:else bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" class="list-bless-item">
32 <image class="poster" src="{{item.thumbnail}}" /> 35 <image class="poster" src="{{item.thumbnail}}" />
33 <view class="desc-wrap"> 36 <view class="desc-wrap">
...@@ -41,8 +44,11 @@ ...@@ -41,8 +44,11 @@
41 </block> 44 </block>
42 <!-- 视频item --> 45 <!-- 视频item -->
43 <block wx:else> 46 <block wx:else>
44 <block wx:for="{{dataList}}" wx:key="index"> 47 <block wx:for="{{dataListResult}}" wx:key="index">
45 <ad wx:if="{{item.type == 'ad'}}" unit-id="adunit-c3754721d968fc07"></ad> 48 <block wx:if="{{item.type == 'ad'}}">
49 <ad wx:if="{{item.adType == 'video'}}" unit-id="adunit-f944674d97d18363" ad-type="video" ad-theme="white"></ad>
50 <ad wx:else unit-id="adunit-c3754721d968fc07"></ad>
51 </block>
46 <view wx:else class="list-item"> 52 <view wx:else class="list-item">
47 <view bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" class="list-item-video"> 53 <view bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" class="list-item-video">
48 <image class="img" src="{{item.thumbnail}}" mode="aspectFill" /> 54 <image class="img" src="{{item.thumbnail}}" mode="aspectFill" />
......