Merge remote-tracking branch 'origin/sj-dev-optimize' into wxl-youhua

components/sjdmediaeditor/index.js

@@ -124,7 +124,6 @@ Component({
           textBoxLength: this.countCaculate('text', this.data.content)
         })
       })
-      console.log(this.data.content, 'this.data.content')
     },
     addImg () { // 添加图片的操作
       if (this.data.maxImgBoxLength == this.data.imgBoxLength) { // 当等于10条了不能继续添加
@@ -172,7 +171,7 @@ Component({
         title: `图片上传中`,
         mask: true
       })
-      const imageArrBox = this.data.imageArrBox;
+      let imageArrBox = JSON.parse(JSON.stringify(this.data.imageArrBox));
       let filename = `${access.dir}${getRandomFilename(imageArrBox[uploadingIndex])}`;
       wxUploadFile({
         url: access.host,
@@ -193,7 +192,7 @@ Component({
             title: `上传成功`
           })
           let uploadingIndex = this.data.uploadingIndex + 1;
-          let content = this.data.content;
+          let content = JSON.parse(JSON.stringify(this.data.content));
           content.push({
             type: 'img',
             value: filename
@@ -312,7 +311,7 @@ Component({
           wx.showToast({
             title: '上传成功'
           })
-          let content = this.data.content;
+          let content = JSON.parse(JSON.stringify(this.data.content));
           content.push({
             type: 'video',
             value: filename
@@ -349,7 +348,7 @@ Component({
       const {currentTarget} = e;
       const index = currentTarget.dataset.index;
       const type = currentTarget.dataset.type;
-      let content = this.data.content;
+      let content = JSON.parse(JSON.stringify(this.data.content));
       content.splice(index, 1);
       // 删除录音的操作
       if (type == 'voice') {
@@ -387,7 +386,7 @@ Component({
       }) 
     },
     pushVoice ({src, duration}) {
-        let content = this.data.content;
+      let content = JSON.parse(JSON.stringify(this.data.content));
         content.push({
           type: 'voice',
           value: src,

dist/w-countdown/index.wxml

@@ -13,7 +13,7 @@
         秒
     </view>
     <view class="down"     >
-        
+        <image class="" src="{{localImageRoot}}common/cutdown/readCutd.gif" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
     </view>
 </view>
 <view class="clock-cut"      wx:if="{{isRead==2}}">

src/pages/morethemeindex/index.js

@@ -1329,8 +1329,8 @@ Page({
       showCancel: false
     })
   },
-  generateNewPoster(init) { // 生成日签
-    if (this.data.themeSelect.my_clock_count<=0) { // 未打卡状态不让生成日签
+  generateNewPoster(flag) { // 生成日签
+    if (flag !=1 && this.data.themeSelect.my_clock_count<=0) { // 未打卡状态不让生成日签
       wx.showToast({
         title: '请先打卡',
         icon: 'none'
@@ -2334,7 +2334,7 @@ Page({
         })
         if (this.data.pagefrom == 'clockeditor' && choose.my_clock_count>0) {
           setTimeout(()=>{
-            this.generateNewPoster();
+            this.generateNewPoster(1);
           },1500) 
         }
         this.chooseSub(choose);

src/pages/readthemeindex/index.wxml

 <wxs src="./../../../filter/index.wxs" module="filter" />
 <view class="container">
     <view class="theme-index-container clearfix">
-        <!-- <view class="ad-box"      wx:if="{{adInfo.status == 1 && adShow}}">
-            <image class="adimg" animation="{{attentionAnim}}" bindtap="toGetAd"
-                src="{{imageRoot}}2c/circleindex/adimg.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix"
-                lazy-load="false" binderror="" bindload=""></image>
-            <image class="closeicon" bindtap="closeAd" src="{{imageRoot}}2c/common/closeicon.png?{{imageVersion}}"
-                mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
-        </view> -->
-        <view class="theme-detail-box"     >
-            <view class="theme-index-title"     >
+        <view class="theme-detail-box">
+            <view class="theme-index-title">
                 <form report-submit="true" bindsubmit="formIdCreate" class="createidform">
                     <button form-type="submit" class="createidbutton">
                     </button>
                 </form>
-                <view class="big-title"     >
+                <view class="big-title">
                     {{themeSelect.title}}
                 </view>
-                <view class="big-time"     >{{themeSelect.created_at}}
+                <view class="big-time">{{themeSelect.created_at}}
                 </view>
             </view>
-            <view class=""     
+            <view class=""
                 wx:if="{{(!noUser && auditStatus == 3) || themeSelect.is_encrypt == 0}}">
                 <view class="{{detailExpand ? 'sjd-media-show-box noheight' : 'sjd-media-show-box'}}"  
                        wx:if="{{themeSelect.content.length > 0}}">
@@ -32,19 +25,19 @@
                     </sjd-media-show>
                 </view>
             </view>
-            <view class="small-gray-box"     ></view>
+            <view class="small-gray-box"></view>
         </view>
-        <view class="footer-box"     >
-            <view class="cutdown-box"     >
-                <view class="text"     >
+        <view class="footer-box">
+            <view class="cutdown-box">
+                <view class="text">
                     阅读倒计时
                 </view>
-                <view class=""      wx:if="{{!isExpire}}">
+                <view class="" wx:if="{{!isExpire}}">
                     <w-countdown time="{{ cutDownDate }}" bindcallback="countdownComplate" themeId="{{themeSelect.id}}" format="MM" isRead="{{1}}"/>
                 </view>
-                <view class=""      wx:if="{{isExpire}}">00:00</view>
+                <view class="" wx:if="{{isExpire}}">00:00</view>
             </view>
-            <view class="btn-box"      style="{{isExpire?'':'opacity:0.4'}}" bindtap="goClock"> 
+            <view class="btn-box" style="{{isExpire?'':'opacity:0.4'}}" bindtap="goClock"> 
                 去打卡
                 <form report-submit="true" bindsubmit="formIdCreate" class="createidform">
                     <button form-type="submit" class="createidbutton">
@@ -62,31 +55,24 @@
         <view class='poste_box' id='canvas-container' wx:if="{{canvasShow}}">
             <canvas canvas-id="myCanvas" style="width:100%;height:1334rpx;" />
         </view>
-        <!-- <sjd-bullet
-            cid="{{id}}"
-            tid="{{tid}}"
-        >
-        </sjd-bullet> -->
         <sjd-contact wx:if="{{concatDiaShow}}" address="{{circleInfo.clock_address}}" bind:closecontact="closecontact">
         </sjd-contact>
-        <!-- <prize-get wx-if="{{adGetShow}}" bind:closeAdModal="closeAdModal" adInfo="{{adInfo}}" circleid="{{id}}">
-        </prize-get> -->
         <btn-drag bind:btnDragEvent='goindex' tobottomDis='88' width='60' height="60" catchtouchmove="ture">
             <view class="gohome gohome-c" bindtap="goindex" slot="dragcontent">
                 <form report-submit="true" bindsubmit="formIdCreate" class="createidform">
                     <button form-type="submit" class="createidbutton">生成form</button>
                 </form>
-                <view class="home-text"     >首页</view>
+                <view class="home-text">首页</view>
             </view>
         </btn-drag>
     </view>
     <go-top wx:if="{{backTopValue}}"></go-top>
-    <view class=""      data-editor="commenteditor">
+    <view class="" data-editor="commenteditor">
         <comment-editor wx:if="{{commenteditor}}" prams="{{commentclock}}" bind:hidecommenteditor="hidecommenteditor"
             type="2c"></comment-editor>
     </view>
-    <view class="videodialog"      wx:if="{{videostatus.videoShow}}">
-        <view class="videodialogmask"      bindtap="closeVideo"></view>
+    <view class="videodialog" wx:if="{{videostatus.videoShow}}">
+        <view class="videodialogmask" bindtap="closeVideo"></view>
         <video class="" src="{{filter.transformOssVideofy(videostatus.src)}}" id="{{videostatus.videoId}}"
             initial-time="0" autoplay="false" loop="false" direction="0" bindplay="" bindpause="" bindended=""
             bindtimeupdate="" bindwaiting="" binderror="" bindfullscreenchange="screenchange">