fix

business/pages/commenteditor/index.js

@@ -332,7 +332,6 @@ Page({
   },
   shortWordsList() {
     shortWordsList({
-      class_id: this.data.id,
       school_id:this.data.sid
     }).then((res) => {
       if (res.data.list) {

business/pages/themead/index.js

@@ -20,6 +20,7 @@ var app = getApp();
 import {
   bOssAccess,
 } from '../../../service/common.js';
+import regexp from '../../../constants/regexp.js';
 Page({
   data: {
     editType: 1,
@@ -195,30 +196,6 @@ Page({
   saveLockPost() {
     const that = this;
     const { params } = this.data
-    // if (params.title.trim() == '') {
-    //   wx.showToast({
-    //     title: '请输入模板名称',
-    //     duration: 1500,
-    //     icon: 'none',
-    //   })
-    //   return;
-    // }
-    // if (params.name.trim() == '') {
-    //   wx.showToast({
-    //     title: '请输入老师姓名',
-    //     duration: 1500,
-    //     icon: 'none',
-    //   })
-    //   return;
-    // }
-    // if (params.mobile == '' && params.img=='') {
-    //   wx.showToast({
-    //     title: '请添加手机号码或者上传微信二维码',
-    //     duration: 1500,
-    //     icon: 'none',
-    //   })
-    //   return;
-    // }
     if (this.data.publishing) {
       return
     }

src/pages/calendarthemeindex/index.js

@@ -318,13 +318,13 @@ Page({
     const clockdate = _activeDay.year + month + day;
     let myBaseinfo = this.data.myBaseinfo;
     let initShareObj = {
-      title: `我正在参加【${this.data.themeSelect.title}】的打卡`,
-      path: `/src/pages/beforeinvitation/index?tid=${this.data.tid}&consumerId=${visitor && visitor.id || 0}&d=${clockdate.substr(2)}&w=${app.globalData.currentSchoolStudentId}`
+      title: `我正在参加打卡【${this.data.themeSelect.title}】`,
+      path: `/src/pages/calendarthemeindex/landpage?tid=${this.data.tid}&sid=${this.data.sid}&consumerId=${visitor && visitor.id || 0}&d=${clockdate.substr(2)}&w=${app.globalData.currentSchoolStudentId}`
     }
     if (from == 'menu') {
       shareObj = initShareObj;
       app.setSharerLog({
-        source_path: 'src/pages/beforeinvitation/index',
+        source_path: 'src/pages/calendarthemeindex/landpage',
         source_id: this.data.tid,
         source_type_model: 5,
         param: JSON.stringify({
@@ -388,7 +388,7 @@ Page({
         }
       }else{
         app.setSharerLog({
-          source_path: 'src/pages/beforeinvitation/index',
+          source_path: 'src/pages/calendarthemeindex/landpage',
           source_id: this.data.tid,
           source_type_model: 5,
           param: JSON.stringify({

src/pages/calendarthemeindex/landpage.js

@@ -245,10 +245,8 @@ Page({
     let myBaseinfo = this.data.myBaseinfo;
     let shareObj = {};
     let initShareObj = {
-      title: `我正在参加【${this.data.themeSelect.title}】的打卡`,
-      path: `/src/pages/themeindex/landpage?&tid=${
-        this.data.tid
-      }&sid=${this.data.sid}&consumerId=${(visitor && visitor.id) || 0}&w=${
+      title: `我正在参加打卡【${this.data.themeSelect.title}】`,
+      path: `/src/pages/calendarindex/landpage?&tid=${this.data.tid}&sid=${this.data.sid}&consumerId=${(visitor && visitor.id) || 0}&w=${
         app.globalData.currentSchoolStudentId
       }`
     };
@@ -258,9 +256,8 @@ Page({
       source_type_model: 5,
       source_path: "src/pages/beforeinvitation/index",
       source_id: this.data.tid,
-      source_type_model: 5,
       param: JSON.stringify({
-        query: `tid=${this.data.tid}&consumerId=${(visitor && visitor.id) ||
+        query: `tid=${this.data.tid}&sid=${this.data.tid}&consumerId=${(visitor && visitor.id) ||
           0}&w=${app.globalData.currentSchoolStudentId}`
       })
     });

src/pages/clockdetail/newindex.js

@@ -459,7 +459,6 @@ Page({
               content_100: data.content.length > 100 ? data.content.substr(0, 100) + '...' : data.content,
               contentexpand: false
             }),
-            id: data.class_id,
             sid: data.school_id,
             hasData: true,
             // tid: data.subject_id
@@ -476,16 +475,14 @@ Page({
             type: 32,
             open_id: visitor1 && visitor1.openid,
             school_id: data.school_id,
-            remark: '',
-            class_id: data.class_id
+            remark: ''
           })
           if(this.data.isQrcodeIn){
             activityLog({
               type: 39,
               open_id: visitor1 && visitor1.openid,
               school_id: data.school_id,
-              remark: '',
-              class_id: data.class_id
+              remark: ''
             })
           }
           this.newLikeIndex(data.id, function (likeRes) {
@@ -1641,7 +1638,7 @@ Page({
       mobile: mobile,
       school_id: this.data.sid,
       source_type: 1,
-      custom:this.data.clock.class_id+'_'+this.data.clock.subject.subject_type+'-'+this.data.clock.subject.id,
+      custom: this.data.clock.class_id+'_'+this.data.clock.subject.subject_type+'-'+this.data.clock.subject.id,
       share_student_id: app.globalData.sharerStudentId || '',
     }).then((res) => {
       const {

src/pages/mytask/index.js

@@ -284,7 +284,7 @@ Page({
     } = e.currentTarget;
     this.themeNoticeRead(theme);
     if (theme.subject_type == 1) {
-      if (theme.is_join == 1) {
+      if (theme.is_join != 1) {
         wx.navigateTo({
           url: `/src/pages/themeindex/index?&tid=${theme.id}&sid=${this.data.sid}`
         });
@@ -294,7 +294,7 @@ Page({
         });
       }
     } else if (theme.subject_type == 2) {
-      if (theme.is_join == 1) {
+      if (theme.is_join != 1) {
         wx.navigateTo({
           url: `/src/pages/calendarthemeindex/index?&tid=${theme.id}&sid=${this.data.sid}`
         });

src/pages/themeindex/index.js

@@ -358,18 +358,17 @@ Page({
     let shareObj = {
     }
     let initShareObj = {
-      title: `我正在参加【${this.data.circleInfo.title}】的打卡`,
-      path: `/src/pages/beforeinvitation/index?tid=${this.data.tid}&consumerId=${visitor && visitor.id || 0}&w=${app.globalData.currentSchoolStudentId}`
+      title: `我正在参加打卡【${this.data.themeSelect.title}】`,
+      path: `/src/pages/themeindex/landpage?tid=${this.data.tid}&sid=${this.data.sid}&consumerId=${visitor && visitor.id || 0}&w=${app.globalData.currentSchoolStudentId}`
     }
     if (from == 'menu') {
       shareObj = initShareObj;
       app.setSharerLog({
         source_type_model: 5,
-        source_path: 'src/pages/beforeinvitation/index',
+        source_path: 'src/pages/themeindex/landpage',
         source_id: this.data.tid,
-        source_type_model: 5,
         param: JSON.stringify({
-          query: `tid=${this.data.tid}&consumerId=${visitor && visitor.id || 0}&w=${app.globalData.currentSchoolStudentId}`
+          query: `tid=${this.data.tid}&sid=${this.data.sid}&consumerId=${visitor && visitor.id || 0}&w=${app.globalData.currentSchoolStudentId}`
         })
       });
     } else if (from == 'button') {
@@ -429,11 +428,11 @@ Page({
         }
       }else{
         app.setSharerLog({
-          source_path: 'src/pages/beforeinvitation/index',
+          source_path: 'src/pages/themeindex/landpage',
           source_type_model: 5,
           source_id: this.data.tid,
           param: JSON.stringify({
-            query: `tid=${this.data.tid}&consumerId=${visitor && visitor.id || 0}&w=${app.globalData.currentSchoolStudentId}`
+            query: `tid=${this.data.tid}&sid=${this.data.sid}&consumerId=${visitor && visitor.id || 0}&w=${app.globalData.currentSchoolStudentId}`
           })
         });
         shareObj = initShareObj;

src/pages/themeindex/landpage.js

@@ -251,26 +251,21 @@ Page({
     let myBaseinfo = this.data.myBaseinfo;
     let shareObj = {};
     let initShareObj = {
-      title: `我正在参加【${this.data.themeSelect.title}】的打卡`,
-      path: `/src/pages/themeindex/landpage?tid=${
-        this.data.tid
-      }&sid=${this.data.sid}&consumerId=${(visitor && visitor.id) || 0}&w=${
+      title: `我正在参加打卡【${this.data.themeSelect.title}】`,
+      path: `/src/pages/themeindex/landpage?tid=${this.data.tid}&sid=${this.data.sid}&consumerId=${(visitor && visitor.id) || 0}&w=${
         app.globalData.currentSchoolStudentId
       }`
     };
-    // if (from == "menu") {
     shareObj = initShareObj;
     app.setSharerLog({
       source_type_model: 5,
-      source_path: "src/pages/beforeinvitation/index",
+      source_path: "src/pages/themeindex/landpage",
       source_id: this.data.tid,
-      source_type_model: 5,
       param: JSON.stringify({
-        query: `tid=${this.data.tid}&consumerId=${(visitor && visitor.id) ||
+        query: `tid=${this.data.tid}&sid=${this.data.tid}&consumerId=${(visitor && visitor.id) ||
           0}&w=${app.globalData.currentSchoolStudentId}`
       })
     });
-    // }
     console.log(shareObj);
 
     return {

src/pages/themeindex/landpage.wxss

@@ -98,7 +98,6 @@ page {
     transform: translateY(-50%);
 } */
 .instro-bx .media-box {
-  margin-top: -12rpx;
 }
 /* 头部banner+介绍 end*/