Merge remote-tracking branch 'origin/sj-dev-v2' into wxl-develop

constants/constants.js

@@ -235,8 +235,8 @@ export default {
     chineseShortName: '十二'
   }],
   activity:{
-    tid:79,
-    id:18,
-    sid:1
+    tid:99,
+    id:19,
+    sid:15
   }
 }
\ No newline at end of file

src/pages/schoolindex/index.js

@@ -186,6 +186,9 @@ Page({
         if(!data.banner || JSON.parse(data.banner).length == 0){
           data.banner = JSON.stringify([{"src":"https://cdn.img.shangjiadao.cn/source/images/daka/banner/banner1.png","id":1,"selected":true}]);
         }
+        if(this.data.sid==this.data.activitySid){
+          data.banner = JSON.stringify([{"src":"https://cdn.img.shangjiadao.cn/source/images/dakav3/2c/activityindex/banner.png","id":1,"selected":true}]);
+        }
         this.setData({
           schoolInfo: data,
           loading:true