'fixbug'

business/pages/calendarthemeindex/index.wxml

@@ -8,8 +8,8 @@
     <view class="theme-index-container">
         <view class="page-topbg">
             <view class="top-title">{{params.title}}</view>
-            <view class="top-publish">{{params.created_at}}</view>
-            <view class="top-content" wx:if="{{params.content.length>0}}">
+            <view class="top-publish">{{params.subject_creator && params.subject_creator.nickname || ''}}  {{filter.formatDateWithChinese(params.created_at)}}发布</view>
+            <view class="top-content">
                 <view class="weeks-box" >
                     <view class="item-box" >
                         <view class="item-box" >
@@ -23,7 +23,7 @@
                         <image class="btn" src="{{imageRoot}}2b/themeindex/date-icon.png"></image>
                     </view>
                 </view>
-                <view class="top-ask">
+                <view class="top-ask"  wx:if="{{params.content.length>0}}">
                     <text style="vertical-align: middle;">今日作业要求：</text>
                     <block wx:for='{{params.content}}' wx:key='content'>
                         <text class="text-block" wx:if='{{item.type=="text"}}'>{{item.value}}</text>
@@ -32,7 +32,7 @@
                         <text class="text-type" wx:if='{{item.type=="voice"}}'>[音频]</text>
                     </block>
                 </view>
-                <view class="top-detail" bindtap="goLoodDetail">查看详情</view>
+                <view class="top-detail" bindtap="goLoodDetail"  wx:if="{{params.content.length>0}}">查看详情</view>
             </view>
         </view>
         <!-- 打卡率 及未打卡学员 -->

business/pages/morethemeindex/index.wxml

@@ -5,14 +5,11 @@
       <view class="home-text">首页</view>
     </view>
   </btn-drag>
-
-
-
   <view class="theme-index-container">
     <view class="page-topbg">
       <view class="top-title">{{params.title}}</view>
-      <view class="top-publish">{{params.created_at}}</view>
-      <view class="top-content">
+      <view class="top-publish">{{params.subject_creator && params.subject_creator.nickname || ''}}  {{filter.formatDateWithChinese(params.created_at)}}发布</view>
+      <view class="top-content" wx:if="{{params.content.length > 0}}">
         <view class="top-ask">
           <text style="vertical-align: middle;">今日作业要求：</text>
           <block wx:for='{{params.content}}' wx:key='content'>
@@ -25,7 +22,7 @@
         <view class="top-detail" bindtap="goLoodDetail">查看详情</view>
       </view>
     </view>
-    <view class="greybox"></view>
+    <!-- <view class="greybox"></view> -->
     <view class="shift-box">
       <view class="small-sort-item" data-onesmallsort="1" bindtap="onesmallsortselect">
         <view class="inner-box {{oneSmallSort == 1 ? 'active' : ''}} ">全部 {{circleAllTotal}}</view>

business/pages/morethemeindex/index.wxss

@@ -11,7 +11,8 @@
     rgba(22, 176, 253, 1) 0%,
     rgba(22, 176, 253, 1) 100%
   );
-  height: 280rpx;
+  /* height: 280rpx; */
+  min-height: 160rpx;
   padding: 18rpx 24rpx;
 }
 .theme-index-container .page-topbg .top-title {

business/pages/themeeditor/index.js

@@ -78,7 +78,6 @@ Page({
       is_encrypt: 0,
       force_status: 2,
       force_num: 0,
-     
       text_require_status: 2,
       text_require_num: 0,
       image_require_status: 2,
@@ -296,7 +295,7 @@ Page({
     } else {
       if (editType == 1) {
         wx.setNavigationBarTitle({
-          title: '编辑作业打卡'
+          title: clone == 1 ? '复制作业打卡' : '编辑作业打卡'
         })
         this.loadThemeData({
           tid,
@@ -304,7 +303,7 @@ Page({
         });
       } else if (editType == 2) {
         wx.setNavigationBarTitle({
-          title: '编辑日历打卡'
+          title: clone == 1 ? '复制日历打卡' : '编辑日历打卡'
         })
         this.loadCalendarThemeData({
           tid,
@@ -312,13 +311,11 @@ Page({
         });
       } else if (editType == 3) {
         wx.setNavigationBarTitle({
-          title: '编辑闯关打卡'
+          title:  clone == 1 ? '复制闯关打卡' : '编辑闯关打卡'
         })
         this.unlockSubjectShow();
       }
     }
-    
-    
     initCalendar({
       multi: true,
       defaultDay: 0,
@@ -664,6 +661,7 @@ Page({
             push_time:data.calendar_set.push_time,
             join_rule_type: data.join_rule_type,
             join_secret: data.join_secret,
+            class_ids: data.classes.map(ele => ele.id).join(','),
           },
           selectRestDays:selectRestDaysArr,
           classes: data.classes.map(ele => ({title: ele.title, id: ele.id})),
@@ -727,6 +725,7 @@ Page({
             join_secret: data.join_secret,
             class_ids: data.classes.map((ele) => ele.id).join(','),
           },
+
           classes: data.classes.map(ele => ({title: ele.title, id: ele.id})),
           themeAdInfo: {
             id: (data.land_content && data.land_content.id) || 0,
@@ -856,6 +855,7 @@ Page({
       rest_dates: restdates.join(','),
       content_id: this.data.calendarThemeAdInfo.id,
     })
+    console.log(data, 'data');
     themeEditor(data).then((res) => {
       const {
         code,
@@ -2385,6 +2385,7 @@ Page({
             push_time: data.push_time,
             sign_up_status: data.sign_up_status,
             has_subjects_count: data.has_subjects_count,
+            class_ids: data.classes.map(ele => ele.id).join(','),
           },
           lastSubjectCount: Number(data.subject_count),
           radioname: data.sign_up_content ? data.sign_up_content.radioname : '',

business/pages/themeeditor/lockthemelist.js

@@ -137,9 +137,10 @@ Page({
           lockparams: {
             title: data.title,
             created_at: data.created_at,
-            teacher: {
-              name: data.teacher && data.teacher.nickname,
-              id: data.teacher && data.teacher.id,
+            content_id: data.content_id,
+            subject_creator: {
+              nickname: data.subject_creator && data.subject_creator.nickname,
+              id: data.subject_creator && data.subject_creator.id,
             }
           }
         })
@@ -188,5 +189,10 @@ Page({
     wx.navigateTo({
       url: `/business/pages/unlockclocksituation/index?tid=${this.data.tid}&sid=${this.data.sid}`
     })
+  },
+  goEditLandcontent () {
+    wx.navigateTo({
+      url: `/business/pages/themead/index?id=${this.data.lockparams.content_id}&sid=${this.data.sid}&editType=3`
+    })
   }
 })
\ No newline at end of file

business/pages/themeeditor/lockthemelist.json

 {
-  "navigationBarTitleText": "新建作业打卡",
+  "navigationBarTitleText": "闯关打卡",
   "enablePullDownRefresh": true,
   "usingComponents": {
     "sjd-media-editor": "../../../components/newsjdmediaeditor",

business/pages/themeeditor/lockthemelist.wxml

@@ -2,7 +2,7 @@
 <view class="container">
   <view class="titlebox">
     <view class="miantitle">{{lockparams.title}}</view>
-    <view class="teacherdesc">{{lockparams.teacher.name}} {{lockparams.created_at}}发布</view>
+    <view class="teacherdesc">{{lockparams.subject_creator.nickname}} {{filter.formatDateWithChinese(lockparams.created_at)}}发布</view>
   </view>
   <view wx:for="{{lockSubjects}}" wx:key="index">
     <view class="themesorttitle">第{{index + 1}}关</view>
@@ -43,14 +43,14 @@
         </view>
         <view class="setting-item" bindtap="toEdit">
             <view class="left">
-                <view class="item-label">作业打卡设置</view>
+                <view class="item-label">闯关打卡设置</view>
                 <view class="item-desc">作业内容、作业要求、参与打卡方式等设置</view>
             </view>
             <view class="right">
                 <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>
@@ -58,7 +58,7 @@
             <view class="right">
                 <image class="icon-arr" src="{{imageRoot}}2b/themeindex/setting_right.png"></image>
             </view>
-        </view> -->
+        </view>
     </view>
     </view>
   </view>

business/pages/themeindex/index.wxml

@@ -8,8 +8,8 @@
   <view class="theme-index-container">
     <view class="page-topbg">
       <view class="top-title">{{params.title}}</view>
-      <view class="top-publish">{{params.subject_creator && params.subject_creator.nickname}}  {{params.created_at}}发布</view>
-      <view class="top-content">
+      <view class="top-publish">{{params.subject_creator && params.subject_creator.nickname || ''}}  {{filter.formatDateWithChinese(params.created_at)}}发布</view>
+      <view class="top-content" wx:if="{{params.content.length > 0}}">
         <view class="top-ask">
           <text style="vertical-align: middle;">今日作业要求：</text>
           <block wx:for='{{params.content}}' wx:key='content'>

business/pages/themeindex/index.wxss

@@ -11,7 +11,7 @@
     rgba(22, 176, 253, 1) 0%,
     rgba(22, 176, 253, 1) 100%
   );
-  height: 280rpx;
+  min-height: 160rpx;
   padding: 18rpx 24rpx;
 }
 .theme-index-container .page-topbg .top-title {

filter/index.wxs

@@ -80,7 +80,7 @@ function formatDateWithChinese(date) {
 	var hour = h < 10 ? '0' + h : h;
 	var mi = time.getMinutes();
 	var minute = mi < 10 ? '0' + mi : mi;
-	return y + '年' + month + '月' + day + '    ' + hour + ':' + minute;
+	return y + '年' + month + '月' + day + '日    ' + hour + ':' + minute;
 }
 function formatDateRemoveYear (date) {
 	var time = getDate(date * 1000);