ddd

components/activitybar/index.js

@@ -80,10 +80,12 @@ Component({
             this.setData({
               isClock: false,
             })
+            this.triggerEvent('activityIsClock', false)
           } else {
             this.setData({
               isClock: true,
             })
+            this.triggerEvent('activityIsClock', true)
           }
         }
       }).catch((err) => {

src/pages/clockdetail/index.js

@@ -67,7 +67,8 @@ Page({
     activityTid:constants.activity.tid,
     isReceived:true, //是否领奖
     atvDailogShow:false,
-    sessionCode:''
+    sessionCode:'',
+    activityIsClock:false
   },
 
   /**
@@ -819,5 +820,21 @@ Page({
       }
     }).catch((err) => {
     })
+  },
+  goActivity(){
+    if(this.data.activityIsClock){
+      wx.navigateTo({
+        url: `/src/pages/themeindex/index?id=${this.data.activityId}&tid=${this.data.activityTid}`
+      });
+    }else{
+      wx.navigateTo({
+        url: `/src/pages/activityindex/index?id=${this.data.activityId}&tid=${this.data.activityTid}`
+      });
+    }
+  },
+  activityIsClock(e){
+    this.setData({
+      activityIsClock:e.detail
+    })
   }
 })
\ No newline at end of file

src/pages/clockdetail/index.wxml

@@ -81,7 +81,7 @@
         </video>
     </view>
     <view class="" hover-class="none" hover-stop-propagation="false" wx:if="{{clock.school_id==activitySid&&!isReceived&&activityTid!=tid}}">
-        <activity-bar></activity-bar>
+        <activity-bar bind:activityIsClock="activityIsClock"></activity-bar>
     </view>
     <view class="dailog-box" hover-class="none" hover-stop-propagation="false" wx:if="{{atvDailogShow&&tid==activityTid}}">
         <view class="content animation" hover-class="none" hover-stop-propagation="false">
@@ -90,4 +90,7 @@
             <image class="adimg" src="{{imageRoot}}activityindex/getph.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
         </view>
     </view>
+    <view class="ad-img-box" hover-class="none" hover-stop-propagation="false" wx:if="{{sid==activitySid}}" bindtap="goActivity" wx:if="{{!isReceived}}">
+            <image class="" src="{{imageRoot}}2c/common/bi.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" ></image>
+      </view>
 </view>
\ No newline at end of file

src/pages/clockdetail/index.wxss

@@ -116,4 +116,16 @@ to {background: scale(1,1);}
       left: 0;
       bottom: 10rpx;
       opacity: 0;
-  }
\ No newline at end of file
+  }
+  .ad-img-box{
+    width:100%;
+    height:150rpx;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 300;
+}
+.ad-img-box image{
+    width:100%;
+    height:150rpx;
+}
\ No newline at end of file

src/pages/growthrecord/index.js

@@ -178,6 +178,9 @@ Page({
     commenteditor: false, // 评论input框
     commentclock: '', //回复的clock    
     activitySid:constants.activity.sid,
+    activityTid:constants.activity.tid,
+    activityId:constants.activity.id,
+    activityIsClock:false
   },
   onLoad: function(options) { // Do some initialize when page load.
     this.innerAudioContext = wx.createInnerAudioContext(); // 当前页面唯一的一个音频容器
@@ -1139,4 +1142,20 @@ Page({
       clockList: _clockList
     })
   },
+  goActivity(){
+    if(this.data.activityIsClock){
+      wx.navigateTo({
+        url: `/src/pages/themeindex/index?id=${this.data.activityId}&tid=${this.data.activityTid}`
+      });
+    }else{
+      wx.navigateTo({
+        url: `/src/pages/activityindex/index?id=${this.data.activityId}&tid=${this.data.activityTid}`
+      });
+    }
+  },
+  activityIsClock(e){
+    this.setData({
+      activityIsClock:e.detail
+    })
+  }
 })
\ No newline at end of file

src/pages/growthrecord/index.wxml

@@ -385,9 +385,9 @@
       <comment-editor wx:if="{{commenteditor}}" prams="{{commentclock}}" bind:hidecommenteditor="hidecommenteditor" type="2c"></comment-editor>
   </view>
   <view class="" hover-class="none" hover-stop-propagation="false" wx:if="{{sid==activitySid}}">
-    <activity-bar></activity-bar>
+    <activity-bar bind:activityIsClock="activityIsClock"></activity-bar>
   </view>
-  <view class="ad-img-box" hover-class="none" hover-stop-propagation="false" wx:if="{{sid==activitySid}}">
-        <image class="" src="{{imageRoot}}2c/common/bi.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" bindtap="remarkChange" lazy-load="false" binderror="" bindload="" ></image>
+  <view class="ad-img-box" hover-class="none" hover-stop-propagation="false" wx:if="{{sid==activitySid}}" bindtap="goActivity">
+        <image class="" src="{{imageRoot}}2c/common/bi.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" ></image>
   </view>
 </view>
\ No newline at end of file

src/pages/growthrecord/index.wxss

@@ -670,6 +670,7 @@ transition: all 0.2s;
     position: fixed;
     left: 0;
     bottom: 0;
+    z-index: 300;
 }
 .ad-img-box image{
     width:100%;

src/pages/schoolindex/index.js

@@ -41,6 +41,7 @@ Page({
     activitySid:constants.activity.sid,
     activityTid:constants.activity.tid,
     activityId:constants.activity.id,
+    activityIsClock:false
   },
 
   /**
@@ -243,8 +244,19 @@ Page({
     })
   },
   goActivity(){
-    wx.navigateTo({
-      url: `/src/pages/activityindex/index?id=${this.data.activityId}&tid=${this.data.activityTid}`
-    });
+    if(this.data.activityIsClock){
+      wx.navigateTo({
+        url: `/src/pages/themeindex/index?id=${this.data.activityId}&tid=${this.data.activityTid}`
+      });
+    }else{
+      wx.navigateTo({
+        url: `/src/pages/activityindex/index?id=${this.data.activityId}&tid=${this.data.activityTid}`
+      });
+    }
+  },
+  activityIsClock(e){
+    this.setData({
+      activityIsClock:e.detail
+    })
   }
 })
\ No newline at end of file

src/pages/schoolindex/index.wxml

@@ -83,5 +83,5 @@
   >
 </btabbar>
 <view class="" hover-class="none" hover-stop-propagation="false" wx:if="{{sid==activitySid}}">
-  <activity-bar></activity-bar>
+  <activity-bar bind:activityIsClock="activityIsClock"></activity-bar>
 </view>
\ No newline at end of file