Merge remote-tracking branch 'origin/develop' into wxl-develop

src/pages/calendarthemeindex/index.js

@@ -2703,7 +2703,7 @@ Page({
   },
   goWebsiteIndex(){
     wx.navigateTo({
-      url: `/src/pages/websiteindex/index?sid=${this.data.sid}`,
+      url: `/src/pages/websiteindex/index?sid=${this.data.themeSelect.school_id}`,
     })
   },
   // 防止悬浮窗滚动页面滚动，无特殊意义

src/pages/growthrecord/index.js

@@ -404,7 +404,7 @@ Page({
     const visitor = LocalStorage.getItem('visitor');
     let initShareObj = {
       title: `${this.data.userInfo.nickname}的成长记录`,
-      path: `/src/pages/growthrecord/index?consumerId=${this.data.consumerId}sid=${this.data.sid}&w=${app.globalData.currentSchoolStudentId}`
+      path: `/src/pages/growthrecord/index?consumerId=${this.data.consumerId}&sid=${this.data.sid}&w=${app.globalData.currentSchoolStudentId}`
     }
     let shareObj = {
 
@@ -464,6 +464,7 @@ Page({
         }
       }
     }
+    console.log(shareObj.path,shareObj.title,'分享参数')
     return {
       title: shareObj.title,
       path: shareObj.path,

src/pages/morethemeindex/index.js

@@ -2743,7 +2743,7 @@ Page({
   },
   goWebsiteIndex(){
     wx.navigateTo({
-      url: `/src/pages/websiteindex/index?sid=${this.data.sid}`,
+      url: `/src/pages/websiteindex/index?sid=${this.data.moreTheme.school_id}`,
     })
   },
   showSelectClass(){
@@ -2790,11 +2790,6 @@ Page({
       })
     }
   },
-  goWebsiteindex(){
-    wx.navigateTo({
-      url: `/src/pages/websiteindex/index?sid=${this.data.sid}&tabIndex=${this.data.moreTheme.jump_type}`,
-    })
-  },
   goSharemoretheme(){
     wx.navigateTo({
       url: `/src/pages/sharemoretheme/index?tid=${this.data.moreTheme.id}`,

src/pages/themeindex/index.js

@@ -2384,7 +2384,7 @@ Page({
   },
   goWebsiteIndex(){
     wx.navigateTo({
-      url: `/src/pages/websiteindex/index?sid=${this.data.sid}`,
+      url: `/src/pages/websiteindex/index?sid=${this.data.themeSelect.school_id}`,
     })
   },
   videoErrorCallback (e) {