Merge remote-tracking branch 'origin/lvtz_clock' into wxl-user-optimize

business/components/commentClockItemShare/index.wxml

@@ -10,7 +10,7 @@
             </button>
              <view class="share-item" bindtap="goPoster">
               <image src="{{imageRoot}}2b/themeindex/share_poster.png"></image>
-              <view class="share-item-name">生成海报{{shareModalShow}}</view>
+              <view class="share-item-name">生成海报</view>
             </view>
         </view>
         <view class="close-img" bindtap="closeShareModal">

business/pages/themeeditor/index.js

@@ -169,7 +169,7 @@ Page({
       videoId: '',
       src: ''
     },
-    placeholder: '请输入打卡主题的具体要求，如：演唱歌曲《小小少年》\r\n演唱歌曲《小小少年》，具体要求\r\n1.跟随伴奏唱一段副歌\r\n2.视频录下唱歌过程\r\n3.上传歌唱视频打卡成功\r\n如果有该歌曲示例视频，你可以点击上传视频，供学员参考。',
+    placeholder: '请输入打卡作业的具体要求，如：演唱歌曲《小小少年》\r\n演唱歌曲《小小少年》，具体要求\r\n1.跟随伴奏唱一段副歌\r\n2.视频录下唱歌过程\r\n3.上传歌唱视频打卡成功\r\n如果有该歌曲示例视频，你可以点击上传视频，供学员参考。',
     audioStorage: {
 
     },
@@ -787,7 +787,7 @@ Page({
     if (_params.title.trim() === '') {
       wx.showModal({
         title: '提示',
-        content: '请输入主题名称',
+        content: '请输入作业名称',
         confirm: true,
         showCancel: false
       })
@@ -796,7 +796,7 @@ Page({
     if (_params.title.trim().length > 20) {
       wx.showModal({
         title: '提示',
-        content: '主题名称不能超过20个字',
+        content: '作业名称不能超过20个字',
         confirm: true,
         showCancel: false
       })
@@ -925,7 +925,7 @@ Page({
     if (_params.title.trim() === '') {
       wx.showModal({
         title: '提示',
-        content: '请输入主题名称',
+        content: '请输入作业名称',
         confirm: true,
         showCancel: false
       })
@@ -934,7 +934,7 @@ Page({
     if (_params.title.trim().length > 36) {
       wx.showModal({
         title: '提示',
-        content: '主题名称不能超过36个字',
+        content: '作业名称不能超过36个字',
         confirm: true,
         showCancel: false
       })
@@ -2397,7 +2397,7 @@ Page({
     })
   },
   // 闯关打卡的相关代码
-  // 新建打卡成功跳转到不同的主题详情页
+  // 新建打卡成功跳转到不同的详情页
   gothemeindex() {
     if (this.data.editType == 1) { // 跳转到作业打卡
       wx.redirectTo({

src/pages/clockdetail/newindex.wxml

@@ -8,50 +8,8 @@
 </btn-drag>
 -->
 <view class="container" style="{{isMarketting&&noUserinfo ?' padding:70rpx 0 110rpx 0' : ''}}">
-    <!-- <view class="top-box" wx:if="{{isMarketting&&noUserinfo&&topBox}}">
-        <view class="avatar-box">
-            <image class="avatar" src="{{filter.imagify(item.avatar)}}" style="left: {{-12*index}}rpx;" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""  wx:for="{{randomstudents}}"  wx:key="index" wx:if="{{index<5}}"/>
-            <image class="icon" style="left: {{randomstudents.length>5?(-12*5):(-12*(randomstudents.length))}}rpx;" src="{{imageRoot}}2c/clockdetail/dot.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
-        </view>
-        <view class="title">{{randomstudents.length}}人都在该机构学习</view>
-        <view class="nav-btn" bindtap="goWebsiteindex">
-            <view class="text">马上看</view>
-            <image class="arrow" src="{{imageRoot}}2c/clockdetail/arrow.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
-        </view>
-        <view class="close-btn" bindtap="closeTopBox">
-            <image class="close" src="{{imageRoot}}2c/clockdetail/close.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
-        </view>           
-    </view> -->
-
-    <!-- 
-    <view class="new-top-box" wx:if="{{isMarketting&&noUserinfo}}">
-        <view class="title">机构环境及师资介绍尽在机构微官网</view>
-        <view class="btn" bindtap="goWebsiteindex">打开</view>
-    </view>
-    -->
-      
+    
     <view class="barrage-box {{barrageChange?'leftfade':''}}" wx:if="{{isMarketting && barrageText && noUserinfo}}">{{barrageText}}</view>
-    <!-- <view class="barrage-box {{barrageChange?'leftfade':''}}">{{barrageText}}</view> -->
-    <!-- <view class="banner-box" wx:if="{{(clock.imageCount+clock.videoCount)>0}}">
-        <view class="swiper-box">
-            <swiper indicator-dots="{{false}}" style="height:{{swiperHeight*2}}rpx;" show-fullscreen-btn="{{false}}"show-play-btn="false" bindchange="playSwiperChange" current="{{currentInit}}" > 
-                <block wx:for="{{clock.video_parse}}" wx:for-index="playindex" wx:for-item="video" wx:key="{{playindex}}">
-                    <swiper-item>
-                        <view class="imgbox" wx:if="{{video.type == 'image'}}" data-src="{{video.src}}" bindtap="prevImg">
-                            <image class="img" src="{{filter.imagify(video.src, '')}}" mode="aspectFit|aspectFill|widthFix" lazy-load="true" binderror="" bindload=""></image>
-                        </view>
-                        <view class="imgbox" wx:if="{{video.type == 'video'}}" data-src="{{video.src}}" data-from="clockitem" bindtap="playvideo">
-                            <image class="img" src="{{filter.videoPoster(video.src, 'image/resize,w_320/format,jpg/quality,q_50')}}" mode="aspectFill" lazy-load="true" binderror="" bindload="" data-src="{{video.src}}"></image>
-                            <view class="video-play-icon-box" data-src="{{video.src}}">
-                                <image class="video-play-icon" data-src="{{video.src}}" src="{{imageRoot}}2c/common/playicon.png?{{imageVersion}}" mode="aspectFill" lazy-load="true" binderror="" bindload=""></image>
-                            </view>
-                        </view>
-                    </swiper-item>   
-                </block>
-            </swiper>
-            <view class="progress">{{currentIndex+1}}/{{clock.imageCount+clock.videoCount}}</view>   
-        </view>
-    </view> -->
     <view class="clock-detail-box">
         <clock-item
         clock="{{clock}}"
@@ -107,7 +65,7 @@
         
         <view class="right">
           <view class="title">{{clock.subject.title}}</view>
-          <view class="password-tips" wx:if="{{themeDetailData.join_rule_type == 3}}">密码加入</view>
+          <!-- <view class="password-tips" wx:if="{{themeDetailData.join_rule_type == 3}}">密码加入</view> -->
             
           <view class="line-item">
             <view class="num-box">1位好友参与</view>
@@ -201,19 +159,6 @@
     <image class="footer-bg" src="" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
 </view>
 
-<!--
-<view class="footer-box">
-    <view class="business-box" bindtap="goWebsiteindex">
-        <image class="" src="{{imageRoot}}2c/papersquare/websitehome.png" mode="aspectFit|aspectFill|widthFix" />机构
-    </view>
-    <view class="like-box" bindtap="myfingureUp">
-        <view class="fingureup-animation-wrapper {{fingureAnimation ? 'fingureAnimation' : ''}}" style="{{clock.had_like ? 'background-position: right;' : ''}}"></view>
-        点赞
-    </view> 
-    <view class="clock-box" bindtap="goClock">立即打卡</view>
-</view>
--->
-
 <view class="" data-editor="commenteditor">
     <comment-editor wx:if="{{commenteditor}}" prams="{{commentclock}}" bind:hidecommenteditor="hidecommenteditor" type="2c"></comment-editor>
 </view>