Merge branch 'wxl-develop' of git.server:wangxuelai/wechatapp.shangjiadao.com into sj-dev-v2

dist/w-countdown/index.js

@@ -58,6 +58,9 @@ WussComponent({
     },
     downTime:99,
   },
+  attached () {
+    this._downTime()
+  },
   detached() {
     if (this.data.themeId) {
       wx.setStorage({
@@ -70,7 +73,6 @@ WussComponent({
   },
   pageLifetimes: {
     show() {
-      this._downTime()
     },
     hide() {
       clearInterval(this.downtimer);

src/pages/activityindex/index.js

@@ -170,6 +170,13 @@ Page({
     }).catch((err) => {
 
     });
+    const visitor = LocalStorage.getItem('visitor');
+    activityLog({
+      type:20,
+      open_id: visitor && visitor.openid,
+      school_id: this.data.activitySid,
+      remark: ''
+    })
   },
   // 打卡并跳转到主题页
   clockgotheme() {