wxd / MShopWeApp

Commit 23107995469634e762501d3a15eb8ece710c1904

Authored by 前端开发-罗建龙
1 parent 09f6c6f4

OA 单 跳转视频号

Inline Side-by-side
Showing 12 changed files with 299 additions and 12 deletions
... ... @@ -52,6 +52,8 @@ App({
52 52 config2: null, //门店配置
53 53 code: null,
54 54 user_id:null,// qa-6519858,//
  55 + // user_id:6520314,// qa-6519858,//
  56 + // user_id:14148118,// qa-6519858,//
55 57 buy_now: null,
56 58 picklist: null, //门店列表
57 59 wuliuprice: null, //物流价格表
... ... @@ -1197,5 +1199,66 @@ App({
1197 1199 };
1198 1200 },
1199 1201  
  1202 + //跳转视频号
  1203 + openChannelsActivity(obj){
  1204 + if (!obj.finderUserName) {
  1205 + wx.showToast({
  1206 + title: '参数缺少，跳转失败',
  1207 + duration: 2000,
  1208 + });
  1209 + }
  1210 + console.log('视频号参数：')
  1211 + console.log(obj)
  1212 + if (obj.video_type==1) { //1是直播 2 是 视频
  1213 + wx.getChannelsLiveInfo({
  1214 + finderUserName:obj.finderUserName,
  1215 + success:(res)=>{
  1216 + let {feedId ,status,nonceId} = res
  1217 + if (true || status == 2) {
  1218 + wx.openChannelsLive({
  1219 + finderUserName:obj.finderUserName,
  1220 + feedId,
  1221 + nonceId,
  1222 + success:()=>{
  1223 + console.log('进入直播间成功')
  1224 + },
  1225 + fail:(error)=>{
  1226 + console.log('进入直播间失败')
  1227 + console.log(error)
  1228 + }
  1229 + })
  1230 + }
  1231 + },
  1232 + fail:(error)=>{
  1233 + console.log('跳转失败1')
  1234 + console.log(error)
  1235 + wx.showModal({
  1236 + title: '提示',
  1237 + content: '获取直播失败：'+error.err_code,
  1238 + showCancel:false,
  1239 + success (res) {
  1240 + if (res.confirm) {
  1241 + console.log('用户点击确定')
  1242 + } else if (res.cancel) {
  1243 + console.log('用户点击取消')
  1244 + }
  1245 + }
  1246 + })
  1247 + }
  1248 + })
  1249 + }else{
  1250 + wx.openChannelsActivity({
  1251 + finderUserName:obj.finderUserName,
  1252 + feedId:obj.feedId,
  1253 + success:()=>{
  1254 + console.log('跳转成功')
  1255 + },
  1256 + fail:(error)=>{
  1257 + console.log('跳转失败')
  1258 + console.log(error)
  1259 + }
  1260 + })
  1261 + }
  1262 + },
1200 1263  
1201 1264 });
... ...
components/diy_advertising/diy_advertising.js
  View file @2310799
... ... @@ -43,7 +43,16 @@ Component({
43 43 var url=e.currentTarget.dataset.url;
44 44 getApp().goto(url);
45 45 },
46   -
  46 + nv_void(e){
  47 + var feedId=e.currentTarget.dataset.feedid;
  48 + var finderUserName=e.currentTarget.dataset.finderusername;
  49 + var video_type=e.currentTarget.dataset.video_type;
  50 + getApp().openChannelsActivity({
  51 + feedId,
  52 + finderUserName,
  53 + video_type
  54 + })
  55 + },
47 56 imageLoad:function(e){
48 57 var imgwidth = e.detail.width;
49 58 var imgheight = e.detail.height;
... ...
components/diy_advertising/diy_advertising.wxml
  View file @2310799
... ... @@ -19,6 +19,11 @@
19 19 <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
20 20 </navigator>
21 21 </block>
  22 + <block wx:elif="{{item.finderUserName && item.video_type}}">
  23 + <view bindtap="nv_void" data-feedId="{{item.feedId}}" data-video_type="{{item.video_type}}" data-finderUserName="{{item.finderUserName}}" class="s1_gk_a1" >
  24 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  25 + </view>
  26 + </block>
22 27 <block wx:else>
23 28 <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
24 29 <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
... ... @@ -53,6 +58,11 @@
53 58 </navigator>
54 59 </block>
55 60  
  61 + <block wx:elif="{{item.finderUserName && item.video_type}}">
  62 + <view class="s1_gk_a1" bindtap="nv_void" data-feedId="{{item.feedId}}" data-video_type="{{item.video_type}}" data-finderUserName="{{item.finderUserName}}">
  63 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  64 + </view>
  65 + </block>
56 66 <block wx:else>
57 67 <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
58 68 <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
... ... @@ -97,6 +107,12 @@
97 107 </navigator>
98 108 </block>
99 109  
  110 + <block wx:elif="{{item.finderUserName && item.video_type}}">
  111 + <view bindtap="nv_void" data-feedId="{{item.feedId}}" data-video_type="{{item.video_type}}" data-finderUserName="{{item.finderUserName}}" class="s1_gk_a1" >
  112 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  113 + </view>
  114 + </block>
  115 +
100 116 <block wx:else>
101 117 <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
102 118 <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
... ... @@ -140,6 +156,11 @@
140 156 </navigator>
141 157 </block>
142 158  
  159 + <block wx:elif="{{item.finderUserName && item.video_type}}">
  160 + <view bindtap="nv_void" data-feedId="{{item.feedId}}" data-video_type="{{item.video_type}}" data-finderUserName="{{item.finderUserName}}" class="s1_gk_a1" >
  161 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  162 + </view>
  163 + </block>
143 164 <block wx:else>
144 165 <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
145 166 <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
... ... @@ -171,6 +192,12 @@
171 192 </navigator>
172 193 </block>
173 194  
  195 + <block wx:elif="{{item.finderUserName && item.video_type}}">
  196 + <view bindtap="nv_void" data-feedId="{{item.feedId}}" data-video_type="{{item.video_type}}" data-finderUserName="{{item.finderUserName}}" class="s1_gk_a1" >
  197 + <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
  198 + </view>
  199 + </block>
  200 +
174 201 <block wx:else>
175 202 <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
176 203 <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
... ... @@ -202,6 +229,11 @@
202 229 <image src="{{object.data[0].src}}" lazy-load="true"></image>
203 230 </navigator>
204 231 </block>
  232 + <block wx:elif="{{object.data[0].finderUserName && object.data[0].feedId}}">
  233 + <view bindtap="nv_void" data-feedId="{{object.data[0].feedId}}" data-finderUserName="{{object.data[0].finderUserName}}" class="s1_gk_a1" >
  234 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  235 + </view>
  236 + </block>
205 237 <block wx:else>
206 238 <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
207 239 <image src="{{object.data[0].src}}" lazy-load="true"></image>
... ... @@ -234,6 +266,11 @@
234 266 <image src="{{object.data[1].src}}" lazy-load="true"></image>
235 267 </navigator>
236 268 </block>
  269 + <block wx:elif="{{object.data[1].finderUserName && object.data[1].feedId}}">
  270 + <view bindtap="nv_void" data-feedId="{{object.data[1].feedId}}" data-finderUserName="{{object.data[1].finderUserName}}" class="s1_gk_a1" >
  271 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  272 + </view>
  273 + </block>
237 274 <block wx:else>
238 275 <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
239 276 <image src="{{object.data[1].src}}" lazy-load="true"></image>
... ... @@ -265,6 +302,11 @@
265 302 <image src="{{object.data[2].src}}" lazy-load="true"></image>
266 303 </navigator>
267 304 </block>
  305 + <block wx:elif="{{object.data[2].finderUserName && object.data[2].feedId}}">
  306 + <view bindtap="nv_void" data-feedId="{{object.data[2].feedId}}" data-finderUserName="{{object.data[2].finderUserName}}" class="s1_gk_a1" >
  307 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  308 + </view>
  309 + </block>
268 310 <block wx:else>
269 311 <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
270 312 <image src="{{object.data[2].src}}" lazy-load="true"></image>
... ... @@ -304,6 +346,11 @@
304 346 <image src="{{object.data[0].src}}" lazy-load="true"></image>
305 347 </navigator>
306 348 </block>
  349 + <block wx:elif="{{object.data[0].finderUserName && object.data[0].feedId}}">
  350 + <view bindtap="nv_void" data-feedId="{{object.data[0].feedId}}" data-finderUserName="{{object.data[0].finderUserName}}" class="s1_gk_a1" >
  351 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  352 + </view>
  353 + </block>
307 354 <block wx:else>
308 355 <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
309 356 <image src="{{object.data[0].src}}" lazy-load="true"></image>
... ... @@ -334,6 +381,11 @@
334 381 <image src="{{object.data[1].src}}" lazy-load="true"></image>
335 382 </navigator>
336 383 </block>
  384 + <block wx:elif="{{object.data[1].finderUserName && object.data[1].feedId}}">
  385 + <view bindtap="nv_void" data-feedId="{{object.data[1].feedId}}" data-finderUserName="{{object.data[1].finderUserName}}" class="s1_gk_a1" >
  386 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  387 + </view>
  388 + </block>
337 389 <block wx:else>
338 390 <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
339 391 <image src="{{object.data[1].src}}" lazy-load="true"></image>
... ... @@ -367,6 +419,11 @@
367 419 <image src="{{object.data[2].src}}" lazy-load="true"></image>
368 420 </navigator>
369 421 </block>
  422 + <block wx:elif="{{object.data[2].finderUserName && object.data[2].feedId}}">
  423 + <view bindtap="nv_void" data-feedId="{{object.data[2].feedId}}" data-finderUserName="{{object.data[2].finderUserName}}" class="s1_gk_a1" >
  424 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  425 + </view>
  426 + </block>
370 427 <block wx:else>
371 428 <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
372 429 <image src="{{object.data[2].src}}" lazy-load="true"></image>
... ... @@ -397,6 +454,11 @@
397 454 <image src="{{object.data[3].src}}" lazy-load="true"></image>
398 455 </navigator>
399 456 </block>
  457 + <block wx:elif="{{object.data[3].finderUserName && object.data[3].feedId}}">
  458 + <view bindtap="nv_void" data-feedId="{{object.data[3].feedId}}" data-finderUserName="{{object.data[3].finderUserName}}" class="s1_gk_a1" >
  459 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  460 + </view>
  461 + </block>
400 462 <block wx:else>
401 463 <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
402 464 <image src="{{object.data[3].src}}" lazy-load="true"></image>
... ... @@ -434,6 +496,11 @@
434 496 <image src="{{object.data[0].src}}" lazy-load="true"></image>
435 497 </navigator>
436 498 </block>
  499 + <block wx:elif="{{object.data[0].finderUserName && object.data[0].feedId}}">
  500 + <view bindtap="nv_void" data-feedId="{{object.data[0].feedId}}" data-finderUserName="{{object.data[0].finderUserName}}" class="s1_gk_a1" >
  501 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  502 + </view>
  503 + </block>
437 504 <block wx:else>
438 505 <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
439 506 <image src="{{object.data[0].src}}" lazy-load="true"></image>
... ... @@ -464,6 +531,11 @@
464 531 <image src="{{object.data[1].src}}" lazy-load="true"></image>
465 532 </navigator>
466 533 </block>
  534 + <block wx:elif="{{object.data[1].finderUserName && object.data[1].feedId}}">
  535 + <view bindtap="nv_void" data-feedId="{{object.data[1].feedId}}" data-finderUserName="{{object.data[1].finderUserName}}" class="s1_gk_a1" >
  536 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  537 + </view>
  538 + </block>
467 539 <block wx:else>
468 540 <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
469 541 <image src="{{object.data[1].src}}" lazy-load="true"></image>
... ... @@ -498,6 +570,11 @@
498 570 <image src="{{object.data[2].src}}" lazy-load="true"></image>
499 571 </navigator>
500 572 </block>
  573 + <block wx:elif="{{object.data[2].finderUserName && object.data[2].feedId}}">
  574 + <view bindtap="nv_void" data-feedId="{{object.data[2].feedId}}" data-finderUserName="{{object.data[2].finderUserName}}" class="s1_gk_a1" >
  575 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  576 + </view>
  577 + </block>
501 578 <block wx:else>
502 579 <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
503 580 <image src="{{object.data[2].src}}" lazy-load="true"></image>
... ... @@ -528,6 +605,11 @@
528 605 <image src="{{object.data[3].src}}" lazy-load="true"></image>
529 606 </navigator>
530 607 </block>
  608 + <block wx:elif="{{object.data[3].finderUserName && object.data[3].feedId}}">
  609 + <view bindtap="nv_void" data-feedId="{{object.data[3].feedId}}" data-finderUserName="{{object.data[3].finderUserName}}" class="s1_gk_a1" >
  610 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  611 + </view>
  612 + </block>
531 613 <block wx:else>
532 614 <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
533 615 <image src="{{object.data[3].src}}" lazy-load="true"></image>
... ... @@ -567,6 +649,11 @@
567 649 <image src="{{object.data[0].src}}" lazy-load="true"></image>
568 650 </navigator>
569 651 </block>
  652 + <block wx:elif="{{object.data[0].finderUserName && object.data[0].feedId}}">
  653 + <view bindtap="nv_void" data-feedId="{{object.data[0].feedId}}" data-finderUserName="{{object.data[0].finderUserName}}" class="s1_gk_a1">
  654 + <image src="{{object.data[0].src}}" lazy-load="true"></image>
  655 + </view>
  656 + </block>
570 657 <block wx:else>
571 658 <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
572 659 <image src="{{object.data[0].src}}" lazy-load="true"></image>
... ... @@ -597,6 +684,11 @@
597 684 <image src="{{object.data[1].src}}" lazy-load="true"></image>
598 685 </navigator>
599 686 </block>
  687 + <block wx:elif="{{object.data[1].finderUserName && object.data[1].feedId}}">
  688 + <view bindtap="nv_void" data-feedId="{{object.data[1].feedId}}" data-finderUserName="{{object.data[1].finderUserName}}" class="s1_gk_a1">
  689 + <image src="{{object.data[1].src}}" lazy-load="true"></image>
  690 + </view>
  691 + </block>
600 692 <block wx:else>
601 693 <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
602 694 <image src="{{object.data[1].src}}" lazy-load="true"></image>
... ... @@ -631,6 +723,11 @@
631 723 <image src="{{object.data[2].src}}" lazy-load="true"></image>
632 724 </navigator>
633 725 </block>
  726 + <block wx:elif="{{object.data[2].finderUserName && object.data[2].feedId}}">
  727 + <view bindtap="nv_void" data-feedId="{{object.data[2].feedId}}" data-finderUserName="{{object.data[2].finderUserName}}" class="s1_gk_a1">
  728 + <image src="{{object.data[2].src}}" lazy-load="true"></image>
  729 + </view>
  730 + </block>
634 731 <block wx:else>
635 732 <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
636 733 <image src="{{object.data[2].src}}" lazy-load="true"></image>
... ... @@ -655,6 +752,11 @@
655 752 <image src="{{object.data[3].src}}" lazy-load="true"></image>
656 753 </navigator>
657 754 </block>
  755 + <block wx:elif="{{object.data[3].finderUserName && object.data[3].feedId}}">
  756 + <view bindtap="nv_void" data-feedId="{{object.data[3].feedId}}" data-finderUserName="{{object.data[3].finderUserName}}" class="s1_gk_a1">
  757 + <image src="{{object.data[3].src}}" lazy-load="true"></image>
  758 + </view>
  759 + </block>
658 760 <block wx:else>
659 761 <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
660 762 <image src="{{object.data[3].src}}" lazy-load="true"></image>
... ... @@ -683,6 +785,11 @@
683 785 <image src="{{object.data[4].src}}" lazy-load="true"></image>
684 786 </navigator>
685 787 </block>
  788 + <block wx:elif="{{object.data[4].finderUserName && object.data[4].feedId}}">
  789 + <view bindtap="nv_void" data-feedId="{{object.data[4].feedId}}" data-finderUserName="{{object.data[4].finderUserName}}" class="s1_gk_a1">
  790 + <image src="{{object.data[4].src}}" lazy-load="true"></image>
  791 + </view>
  792 + </block>
686 793 <block wx:else>
687 794 <view data-url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
688 795 <image src="{{object.data[4].src}}" lazy-load="true"></image>
... ... @@ -721,6 +828,14 @@
721 828 </navigator>
722 829 </block>
723 830  
  831 + <block wx:elif="{{item.finderUserName && item.video_type}}">
  832 + <view bindtap="nv_void" data-feedId="{{item.feedId}}" data-video_type="{{item.video_type}}" data-finderUserName="{{item.finderUserName}}" class="s1_gk_a1" style="height:{{max_sw_height}}rpx" >
  833 + <swiper-item>
  834 + <image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true" />
  835 + <view class="title" wx:if="{{item.title}}">{{item.title}}</view>
  836 + </swiper-item>
  837 + </view>
  838 + </block>
724 839 <block wx:else>
725 840 <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" style="height:{{max_sw_height}}rpx" bindtap="go_url">
726 841 <swiper-item>
... ...
components/diy_goodsGroup/diy_goodsGroup.js
  View file @2310799
... ... @@ -29,7 +29,8 @@ Component({
29 29 imghost: o.imghost,
30 30 is_recommend: 0,
31 31 is_hot: 0,
32   - is_new: 0,
  32 + is_new: 0,
  33 + isyhgoods:0,
33 34 baseUrl: "/api/weshop/goods/page",
34 35 resourceUrl: t.globalData.setting.resourceUrl,
35 36 url: t.globalData.setting.imghost,
... ... @@ -77,7 +78,7 @@ Component({
77 78  
78 79 //最新的版本才有nav_list
79 80 if (nav_list) {
80   - nav_item = nav_list[0];
  81 + nav_item = nav_list[0];
81 82 //要算一下商品goodsid
82 83 for (var ij in nav_list) {
83 84 var item = nav_list[ij];
... ... @@ -134,6 +135,9 @@ Component({
134 135 if (nav_item && nav_item.goodsclass == 3) {
135 136 this.data.is_new = 1
136 137 }
  138 + if (nav_item && nav_item.goodsclass == 4) {
  139 + this.data.isyhgoods = 1
  140 + }
137 141  
138 142 this.data.requestData = new Array();
139 143 this.data.g_id = nav_item.data;
... ... @@ -225,6 +229,7 @@ Component({
225 229 if (th.data.is_recommend) r_data.is_recommend = th.data.is_recommend;
226 230 if (th.data.is_hot) r_data.is_hot = th.data.is_hot;
227 231 if (th.data.is_new) r_data.is_new = th.data.is_new;
  232 + if (th.data.isyhgoods) r_data.isyhgoods = th.data.isyhgoods;
228 233  
229 234 var user_id = getApp().globalData.user_id;
230 235 if (!user_id) user_id = 0;
... ... @@ -239,7 +244,7 @@ Component({
239 244 th.setData({
240 245 goods_btn: res.data.data.pageData,
241 246 total: res.data.data.total
242   - })
  247 + })
243 248 th.data.currentPage++;
244 249 //设置商品熏染
245 250 th.set_good(goods);
... ... @@ -277,12 +282,20 @@ Component({
277 282 },
278 283  
279 284 setLoading: function () {
280   - var that = this;
281   - if (this.data.loading) return false;
282   - this.data.loading = 1;
283   - that.init(that.data.classstyle_id, that.data.wgroup);
  285 + if(this.data.object.column==5){return}
  286 + if( this.data.goods_btn.length!=0 || this.data.object.goodscount*this.data.page <this.data.total ){
  287 + var that = this;
  288 + if (this.data.loading) return false;
  289 + this.data.loading = 1;
  290 + that.init(that.data.classstyle_id, that.data.wgroup);
  291 + }
284 292 },
285   -
  293 + automore(){
  294 + let is_automore = this.data.object.is_automore
  295 + if (is_automore==1) {
  296 + this.setLoading()
  297 + }
  298 + },
286 299 //图片失败，默认图片
287 300 bind_bnerr3: function (e) {
288 301 var _errImg = e.target.dataset.errorimg;
... ... @@ -420,7 +433,7 @@ Component({
420 433 }
421 434  
422 435  
423   - this.data.is_recommend = this.data.is_hot = this.data.is_new = 0;
  436 + this.data.isyhgoods = this.data.is_recommend = this.data.is_hot = this.data.is_new = 0;
424 437 //推荐，热卖，新品
425 438 if (nav_item && nav_item.goodsclass == 1) {
426 439 this.data.is_recommend = 1
... ... @@ -431,6 +444,9 @@ Component({
431 444 if (nav_item && nav_item.goodsclass == 3) {
432 445 this.data.is_new = 1
433 446 }
  447 + if (nav_item && nav_item.goodsclass == 4) {
  448 + this.data.isyhgoods = 1
  449 + }
434 450  
435 451  
436 452 this.data.currentPage = 1;
... ...
components/diy_nav/diy_nav.js
  View file @2310799
... ... @@ -48,6 +48,18 @@ Component({
48 48 var url=e.currentTarget.dataset.url;
49 49 console.log('url==>', url);
50 50 getApp().goto(url);
  51 + },
  52 + nv_void(e){
  53 + console.log('导航')
  54 + console.log(e)
  55 + var feedId=e.currentTarget.dataset.feedid;
  56 + var finderUserName=e.currentTarget.dataset.finderusername;
  57 + var video_type=e.currentTarget.dataset.video_type;
  58 + getApp().openChannelsActivity({
  59 + feedId,
  60 + finderUserName,
  61 + video_type
  62 + })
51 63 }
52 64 }
53 65 })
54 66 \ No newline at end of file
... ...
components/diy_nav/diy_nav.wxml
  View file @2310799
... ... @@ -13,6 +13,11 @@
13 13 <include src="diy_nav_part1.wxml" />
14 14 </navigator>
15 15 </block>
  16 + <block wx:elif="{{item.finderUserName && item.video_type}}">
  17 + <view style="width:{{100/nav_list.length}}%;" bindtap="nv_void" data-feedId="{{item.feedId}}" data-video_type="{{item.video_type}}" data-finderUserName="{{item.finderUserName}}">
  18 + <include src="diy_nav_part1.wxml" />
  19 + </view>
  20 + </block>
16 21 <block wx:else>
17 22 <view style="width:{{100/nav_list.length}}%;" data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url">
18 23 <include src="diy_nav_part1.wxml" />
... ... @@ -36,6 +41,11 @@
36 41 <include src="diy_nav_part2.wxml" />
37 42 </navigator>
38 43 </block>
  44 + <block wx:elif="{{item.finderUserName && item.video_type}}">
  45 + <view bindtap="nv_void" data-feedId="{{item.feedId}}" data-video_type="{{item.video_type}}" data-finderUserName="{{item.finderUserName}}">
  46 + <include src="diy_nav_part2.wxml" />
  47 + </view>
  48 + </block>
39 49 <block wx:else>
40 50 <view data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url">
41 51 <include src="diy_nav_part2.wxml" />
... ...
components/diy_notice/diy_notice.js
  View file @2310799
... ... @@ -26,5 +26,15 @@ Component({
26 26 var url=e.currentTarget.dataset.url;
27 27 getApp().goto(url);
28 28 },
  29 + nv_void(e){
  30 + var feedId=e.currentTarget.dataset.feedid;
  31 + var finderUserName=e.currentTarget.dataset.finderusername;
  32 + var video_type=e.currentTarget.dataset.video_type;
  33 + getApp().openChannelsActivity({
  34 + feedId,
  35 + finderUserName,
  36 + video_type
  37 + })
  38 + }
29 39 }
30 40 })
31 41 \ No newline at end of file
... ...
components/diy_notice/diy_notice.wxml
  View file @2310799
... ... @@ -32,6 +32,20 @@
32 32 </block>
33 33  
34 34  
  35 + <block wx:elif="{{object.finderUserName && object.video_type}}">
  36 + <view bindtap="nv_void" data-feedId="{{object.feedId}}" data-video_type="{{object.video_type}}" data-finderUserName="{{object.finderUserName}}" class="s1_gk_a1" style="background-color: {{object.notice_bgcolor}}">
  37 + <view class="big_border">
  38 + <image class="image_c" src="{{imghost}}/miniapp/images/notice.png"></image>
  39 + <view class="marquee">
  40 + <view class="content">
  41 + <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text>
  42 + <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text>
  43 + <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text>
  44 + </view>
  45 + </view>
  46 + </view>
  47 + </view>
  48 + </block>
35 49 <block wx:else>
36 50 <view data-url="{{object.wxapp_url}}" class="s1_gk_a1" bindtap="go_url" style="background-color: {{object.notice_bgcolor}}">
37 51 <view class="big_border">
... ...
components/diy_picMax/diy_picMax.js
  View file @2310799
... ... @@ -32,7 +32,16 @@ Component({
32 32 var url = e.currentTarget.dataset.url;
33 33 getApp().goto(url);
34 34 },
35   -
  35 + nv_void(e){
  36 + var feedId=e.currentTarget.dataset.feedid;
  37 + var finderUserName=e.currentTarget.dataset.finderusername;
  38 + var video_type=e.currentTarget.dataset.video_type;
  39 + getApp().openChannelsActivity({
  40 + feedId,
  41 + finderUserName,
  42 + video_type
  43 + })
  44 + },
36 45 previewImage(e){
37 46 let src =e.currentTarget.dataset.src;
38 47 wx.previewImage({
... ...
components/diy_picMax/diy_picMax.wxml
  View file @2310799
... ... @@ -14,6 +14,10 @@
14 14 <image src="{{item.src}}" mode="widthFix" style="display: block; height: 100%; width: 100%;"></image>
15 15 </navigator>
16 16 </block>
  17 + <block wx:elif="{{item.finderUserName && item.video_type}}">
  18 + <image bindtap="nv_void" data-feedId="{{item.feedId}}" data-video_type="{{item.video_type}}" data-finderUserName="{{item.finderUserName}}" wx:if="{{item.wxapp_url}}" src="{{item.src}}" style="display: block; height: 100%; width: 100%;"></image>
  19 + <image bindtap="nv_void" data-feedId="{{item.feedId}}" data-video_type="{{item.video_type}}" data-finderUserName="{{item.finderUserName}}" wx:else src="{{item.src}}" style="display: block; height: 100%; width: 100%;"></image>
  20 + </block>
17 21 <block wx:else>
18 22 <image bindtap='gopage' wx:if="{{item.wxapp_url}}" data-url="{{item.wxapp_url}}" src="{{item.src}}" style="display: block; height: 100%; width: 100%;"></image>
19 23 <image bindtap='previewImage' wx:else data-src="{{item.src}}" src="{{item.src}}" style="display: block; height: 100%; width: 100%;"></image>
... ... @@ -34,6 +38,10 @@
34 38 <image src="{{item.src}}" mode="widthFix" style="display: block;"></image>
35 39 </navigator>
36 40 </block>
  41 + <block wx:elif="{{item.finderUserName && item.video_type}}">
  42 + <image bindtap="nv_void" data-feedId="{{item.feedId}}" data-video_type="{{item.video_type}}" data-finderUserName="{{item.finderUserName}}" wx:if="{{item.wxapp_url}}" src="{{item.src}}" mode="widthFix" style="display: block;"></image>
  43 + <image bindtap="nv_void" data-feedId="{{item.feedId}}" data-video_type="{{item.video_type}}" data-finderUserName="{{item.finderUserName}}" wx:else src="{{item.src}}" style="display: block;" mode="widthFix"></image>
  44 + </block>
37 45 <block wx:else>
38 46 <image bindtap='gopage' wx:if="{{item.wxapp_url}}" data-url="{{item.wxapp_url}}" src="{{item.src}}" mode="widthFix" style="display: block;"></image>
39 47 <image bindtap='previewImage' wx:else data-src="{{item.src}}" src="{{item.src}}" style="display: block;" mode="widthFix"></image>
... ...
components/diy_title/diy_title.js
  View file @2310799
... ... @@ -24,6 +24,16 @@ Component({
24 24 var txt="object.title_img";
25 25 ob[txt] = iurl +'/miniapp/images/logo.png?v=1';
26 26 this.setData(ob);
27   - }
  27 + },
  28 + nv_void(e){
  29 + var feedId=e.currentTarget.dataset.feedid;
  30 + var finderUserName=e.currentTarget.dataset.finderusername;
  31 + var video_type=e.currentTarget.dataset.video_type;
  32 + getApp().openChannelsActivity({
  33 + feedId,
  34 + finderUserName,
  35 + video_type
  36 + })
  37 + }
28 38 }
29 39 })
... ...
components/diy_title/diy_title.wxml
  View file @2310799
... ... @@ -13,6 +13,9 @@
13 13 <view class="txet_rim"><view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view>
14 14 </navigator>
15 15  
  16 + <view wx:elif="{{object.finderUserName && object.video_type}}" data-url="{{object.wxapp_url}}" bindtap="nv_void" data-feedId="{{object.feedId}}" data-video_type="{{object.video_type}}" data-finderUserName="{{object.finderUserName}}" >
  17 + <view class="txet_rim"><view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view>
  18 + </view>
16 19 <view data-url="{{object.wxapp_url}}" bindtap="go_url" wx:else>
17 20 <view class="txet_rim"><view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view>
18 21 </view>
... ... @@ -38,6 +41,14 @@
38 41 </navigator>
39 42  
40 43  
  44 + <view wx:elif="{{object.finderUserName && object.video_type}}" bindtap="nv_void" data-feedId="{{object.feedId}}" data-video_type="{{object.video_type}}" data-finderUserName="{{object.finderUserName}}" >
  45 + <view class="right_rim">
  46 + <view class="font_right_rim">
  47 + <view class="caption" style='color:{{object.title_rightcolor}}'>{{object.title_right}}</view>
  48 + </view>
  49 + <view class="aa"></view>
  50 + </view>
  51 + </view>
41 52 <view wx:else bindtap="go_url" data-url='{{object.wxapp_url}}'>
42 53 <view class="right_rim">
43 54 <view class="font_right_rim">
... ...