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

src/pages/mycalendart/index.js

@@ -251,20 +251,28 @@ Page({
     // this.selfClockGet('up');
   },
   onShareAppMessage: function (option) { // return custom share data when user share.
-    const {from, target} = option;
+    const {
+      from,
+      target
+    } = option;
     let initShareObj = {
       title: `打卡日历`,
       path: `/src/pages/mycalendart/index?tid=${this.data.tid}&id=${this.data.id}&clockdate=${this.data.clockdate}`
     }
-    let shareObj = {
-    }
+    let shareObj = {}
     if (from == 'menu') {
       shareObj = initShareObj;
     } else if (from == 'button') {
       if (!target.dataset.info) {
         shareObj = initShareObj;
       } else {
-        const {target: {dataset: {info}}} = option;
+        const {
+          target: {
+            dataset: {
+              info
+            }
+          }
+        } = option;
         shareObj = {
           title: `${info.school_student.nickname}的打卡详情`,
           path: `/src/pages/clockdetail/index?tid=${info.subject_id}&cid=${info.id}`
@@ -276,7 +284,7 @@ Page({
       path: shareObj.path,
       success: (res) => {
         // 转发成功之后的回调
-        if(res.errMsg == 'shareAppMessage:ok'){
+        if (res.errMsg == 'shareAppMessage:ok') {
           this.setData({
             shareObj: initShareObj
           })
@@ -745,27 +753,19 @@ Page({
     const month = Number(_activeDay.month) < 10 ? '0' + _activeDay.month : _activeDay.month
     const day = Number(_activeDay.day) < 10 ? '0' + _activeDay.day : _activeDay.day
     const clockdate = _activeDay.year + '-' + month + '-' + day;
-    if (this.data.isClock) { // 已经打过卡了，生成日签
-      // this.generatePoster();
-      // wx.showModal({
-      //   title: '提示',
-      //   content: '您已经打过卡了'
-      // })
+    if (this.data.themeSelect.my_clock_circle_user) { //
+      wx.navigateTo({
+        url: `/src/pages/clockeditor/index?id=${this.data.id}&tid=${this.data.themeSelect.id}&cid=0&pagefrom=calendarthemeindex&clockdate=${clockdate}`
+      })
     } else {
-      if (this.data.themeSelect.my_clock_circle_user) { //
+      if (this.data.circleInfo.had_password) {
+        this.setData({
+          showPsdDia: true
+        })
+      } else {
         wx.navigateTo({
           url: `/src/pages/clockeditor/index?id=${this.data.id}&tid=${this.data.themeSelect.id}&cid=0&pagefrom=calendarthemeindex&clockdate=${clockdate}`
         })
-      } else {
-        if (this.data.circleInfo.had_password) {
-          this.setData({
-            showPsdDia: true
-          })
-        } else {
-          wx.navigateTo({
-            url: `/src/pages/clockeditor/index?id=${this.data.id}&tid=${this.data.themeSelect.id}&cid=0&pagefrom=calendarthemeindex&clockdate=${clockdate}`
-          })
-        }
       }
     }
   },
@@ -794,8 +794,7 @@ Page({
       }
     }
   },
-  shareFriend() {
-  },
+  shareFriend() {},
   // generatePoster () {
   //   getApp().mtj.trackEvent('gene_theme_poster', {});
   // },
@@ -1707,7 +1706,7 @@ Page({
         }
       }
     }
-    console.log(result,'result')
+    console.log(result, 'result')
     setTodoLabels({
       days: result
     })