'串联优化'

business/pages/calendarthemeindex/index.js

@@ -1558,5 +1558,10 @@ Page({
     wx.navigateTo({
       url: `/business/pages/themeeditor/index?tid=${this.data.tid}&sid=${this.data.sid}&editType=2`
     });
+  },
+  goEditLandcontent () {
+    wx.navigateTo({
+      url: `/business/pages/themead/index?id=${this.data.params.content_id}&sid=${this.data.sid}&editType=2`
+    })
   }
 });

business/pages/calendarthemeindex/index.wxml

@@ -255,7 +255,7 @@
                     <image class="icon-arr" src="{{imageRoot}}2b/themeindex/setting_right.png"></image>
                 </view>
             </view>
-            <view class="setting-item">
+            <view class="setting-item" bindtap="goEditLandcontent">
                 <view class="left">
                     <view class="item-label">打卡营销页设置</view>
                     <view class="item-desc">配置此页面后可在学生加入打卡前展示，此功能可收集有意向学生的联系方式。 <text class="more-tip">了解更多</text></view>

business/pages/themead/index.js

@@ -173,17 +173,8 @@ Page({
       return
     }
     this.data.publishing = true;
-    const sjdMediaEditor = this.selectComponent('#sjd-media-editor');
-    let content = JSON.parse(JSON.stringify(sjdMediaEditor.data.content));
-    let _content = content.filter((ele) => ele.value.trim() != '');
-    _content.forEach((ele) => {
-      if (ele.type == 'video' && ele.poster) {
-        delete ele.poster;
-      }
-    })
-    params.content = JSON.stringify(_content);
     const { introduceContent } = this.data;
-    const sjdMediaEditorList = []
+    const sjdMediaEditorList = [];
     for(let i = 0; i<introduceContent.length; i++){
       const sjdMediaEditor = this.selectComponent(`#sjd-media-editor${i}`);
       let content = JSON.parse(JSON.stringify(sjdMediaEditor.data.content));
@@ -200,7 +191,6 @@ Page({
     } catch (error) {
 
     }
-
     wx.showLoading({
       title: '保存中...'
     });

business/pages/themead/index.json

 {
-  "navigationBarTitleText": "打卡营销页设置",
+  "navigationBarTitleText": "营销页设置",
   "usingComponents": {
     "sjd-media-editor": "../../../components/sjdmediaeditor",
     "w-switch": "/dist/w-switch/index",

business/pages/themead/index.wxml

@@ -30,8 +30,10 @@
           <view class="tips">点击修改标题，最多15个字</view> 
         </view> -->
         <view>
-          <sjd-media-editor content="{{item.content}}" 
-            id="sjd-media-editor{{index}}" sid="{{sid}}" 
+          <sjd-media-editor
+            content="{{item.content}}" 
+            id="sjd-media-editor{{index}}"
+            sid="{{sid}}" 
             haveAddVoice="{{true}}"
             haveAddWxfile="{{true}}"
             bind:addVoice="addVoice" 

business/pages/themeeditor/index.js

@@ -293,7 +293,7 @@ Page({
         });
       } else if (editType == 2) {
         wx.setNavigationBarTitle({
-          title: '编辑作业打卡'
+          title: '编辑日历打卡'
         })
         this.loadCalendarThemeData({
           tid,
@@ -301,7 +301,7 @@ Page({
         });
       } else if (editType == 3) {
         wx.setNavigationBarTitle({
-          title: '编辑作业打卡'
+          title: '编辑闯关打卡'
         })
         this.unlockSubjectShow();
       }
@@ -878,7 +878,8 @@ Page({
           prevPage = pages[pages.length - 2]; //上一个页面
         }
         prevPage.setData({
-          showRefresh: true
+          showRefresh: true,
+          needRefresh: true,
         });
         wx.navigateBack({
           delta: 1, // 回退前 delta(默认为1) 页面

business/pages/themeeditor/lockthemelist.js

@@ -150,7 +150,7 @@ Page({
   toEdit () {
     const that = this;
     wx.navigateTo({
-      url: `/business/pages/themeeditor/index?id=0&tid=${this.data.tid}&sid=tid=${this.data.sid}&classes=[]&editType=3`,
+      url: `/business/pages/themeeditor/index?id=0&tid=${this.data.tid}&sid=${this.data.sid}&classes=[]&editType=3`,
       success() {
         that.closeSettingModal()
       }

business/pages/themeindex/index.js

@@ -254,6 +254,7 @@ Page({
     themeDetail({
       id: this.data.tid,
       school_id:this.data.sid,
+      extra: 'land_content'
     }).then((res) => {
       const {code, data} = res;
       if (code == 200) {
@@ -302,7 +303,6 @@ Page({
             path: `/src/pages/themeindex/index?tid=${this.data.tid}&id=${data.class_id}`
           }
         })
-
         this.setData({
           id: data.class_id,
           params: Object.assign(data, {
@@ -1305,5 +1305,10 @@ Page({
     wx.navigateTo({
       url: `/business/pages/themeeditor/index?tid=${this.data.tid}&sid=${this.data.sid}&editType=1`
     })
+  },
+  goEditLandcontent () {
+    wx.navigateTo({
+      url: `/business/pages/themead/index?id=${this.data.params.content_id}&sid=${this.data.sid}&editType=1`
+    })
   }
 })
\ No newline at end of file

business/pages/themeindex/index.wxml

@@ -202,7 +202,7 @@
               <image class="icon-arr" src="{{imageRoot}}2b/themeindex/setting_right.png"></image>
           </view>
       </view>
-      <view class="setting-item">
+      <view class="setting-item" bindtap="goEditLandcontent">
           <view class="left">
               <view class="item-label">打卡营销页设置</view>
               <view class="item-desc">配置此页面后可在学生加入打卡前展示，此功能可收集有意向学生的联系方式。 <text class="more-tip">了解更多</text></view>