活动校区 打卡详情展示介绍及按钮

business/pages/circleeditor/index.wxml

@@ -118,25 +118,12 @@
     <view class="devided-line"></view>
 
     <view class="button-box" wx:if="{{id!=0}}">
-        <view class="btn btn-save" bindtap="saveCircle">保存
-            <form report-submit="true" bindsubmit="formIdCreate" class="createidform">
-                <button form-type="submit" class="createidbutton">生成form</button>
-            </form>
-        </view>
-        <view class="btn btn-delete" bindtap="delateCircle">
-            删除班级
-            <form report-submit="true" bindsubmit="formIdCreate" class="createidform">
-                <button form-type="submit" class="createidbutton">生成form</button>
-            </form>
-        </view>
+        <view class="btn btn-save" bindtap="saveCircle">保存</view>
+        <view class="btn btn-delete" bindtap="delateCircle">删除班级</view>
     </view>
     <view class="button-box" wx:else>
         <view class="btn btn-save bigbtn-save" bindtap="saveCircle">
-            保存
-            <form report-submit="true" bindsubmit="formIdCreate" class="createidform">
-                <button form-type="submit" class="createidbutton">生成form</button>
-            </form>
-        </view>
+保存</view>
     </view>
     <sound-recording
         show="{{audioStatus.show}}"

src/pages/clockdetail/newindex.js

@@ -148,7 +148,8 @@ Page({
     clockGetting: false,
     studentsList: [],//打卡学员头像列表
     studentTotal: 0,
-    themeDetailData: ''
+    themeDetailData: '',
+    isexpand: true
   },
 
   /**
@@ -184,7 +185,6 @@ Page({
         o: o || ''
       })
     }
-    console.log(this.data.tid,this.data.cid,'参数')
     app.getCurrentSchoolStudentId({
       source_id: this.data.tid,
       source_type: 8,
@@ -317,7 +317,6 @@ Page({
   // 获取打卡学员头像列表
   getModeStudent () {
     let type = this.data.clock.subject_type;
-    console.log('type',type);
     let params = {};
     if(type==3){
       params = {mode_id: this.data.clock.subject.unlock_mode_id}
@@ -498,7 +497,6 @@ Page({
             hasData: true,
             // tid: data.subject_id
           }, () => {
-            console.log(this.data.clock,'clock')
             this.queryActivtySchoolInfo(this.data.sid);
             this.circleDetailGet(data.class_id)
             this.schoolInfoGet(data.school_id)
@@ -568,7 +566,6 @@ Page({
         data
       } = res;
       if (code == 200) {
-        console.log(data, 'themeDetailDatathemeDetailData')
         this.setData({
           moreTheme: data,
           themeDetailData: data
@@ -937,7 +934,6 @@ Page({
   },
   showcommenteditor1(e) {
     this.data.bigindex = e.currentTarget.dataset.bigindex;
-    console.log(e.currentTarget.dataset.bigindex,'e.currentTarget.dataset.bigindex')
     this.setData({
       commentclock: e.detail,
       commenteditor1: true
@@ -1497,7 +1493,6 @@ Page({
       integral
     } = e.detail;
     const {bigindex,index} = e.currentTarget.dataset;
-    console.log(bigindex, e)
     let clock = this.data.clockList[bigindex].find(ele => ele.id == cid);
     if (type == 2) { // 取消点赞
       if(clock.likes.list.find(ele=>ele.student_id==customerId)){

src/pages/clockdetail/newindex.wxml

@@ -103,26 +103,16 @@
             <image class="animation" src="{{imageRoot}}2c/clockdetail/ling.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
         </view>
     </view> -->
-    <view  wx:if="{{isMarketting&&noUserinfo}}" style="background: #fff; padding-bottom:40rpx"> 
-    <!-- <view style="background: #fff; padding-bottom:40rpx">  -->
-        <view class="new-marketing-box" wx:if="{{isMarketting&&noUserinfo}}">
-        <!-- <view class="new-marketing-box"> -->
+
+    <!-- 领取体验课 -->
+    <view wx:if="{{isMarketting&&noUserinfo}}"> 
+        <view class="new-marketing-box">
             <button class="" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber"></button>
             <image class="lingt-img lightanimation" src="{{imageRoot}}2c/clockitem/light.png?{{imageVersion}}" ></image>
             <image class="advert-img" src="{{imageRoot}}2c/clockitem/advert.png?{{imageVersion}}" ></image>
         </view>
     </view>
       
-
-    <!--
-    <view class="introduce" style="padding: 0" wx:if="{{circleDetail.content.length > 0&&noUserinfo}}">
-        <view class="sjd-media-show-box" wx:if="{{circleDetail.content.length > 0}}">
-            <sjd-media-show content="{{circleDetail.content}}" expandeddefault="{{false}}" bind:playvoice="playvoice" bind:pausevoice="pausevoice" bind:voiceslide="voiceslide" audioStorage="{{audioStorage}}" bind:slidestart="slidestart" bind:slideend="slideend" bind:videoplay="videoplay"
-                bind:playvideo="playvideo" widthtext="{{true}}"></sjd-media-show>
-        </view>
-    </view>
-    -->
-
     <!-- 我也要打卡 加入 -->
     <view class="join-box">
         <view class="left">
@@ -157,6 +147,26 @@
         <image wx:if="{{!themeDetailData.ad_banner || themeDetailData.ad_banner=='null' || themeDetailData.ad_banner=='https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/morethemeindex/adbanner.png'}}" class="icon_click" src="{{imageRoot}}2c/clockitemv2/icon_click.gif?{{imageVersion}}" ></image>
       </view>
     </view>
+    <view class="introduce" style="border-top: 20rpx solid #EFEFEF;" wx:if="{{circleDetail.content.length > 0 && noUserinfo}}">
+        <view class="sjd-media-show-box">
+            <sjd-media-show 
+            content="{{circleDetail.content}}" 
+            noheight="{{false}}"
+            expandeddefault="{{false}}"
+            expanded="{{isexpand}}"
+            bind:playvoice="playvoice" 
+            bind:pausevoice="pausevoice" 
+            bind:voiceslide="voiceslide" 
+            audioStorage="{{audioStorage}}" 
+            bind:slidestart="slidestart" 
+            bind:slideend="slideend" 
+            bind:videoplay="videoplay"
+            bind:playvideo="playvideo"
+            widthtext="{{false}}"
+            >
+        </sjd-media-show>
+        </view>
+    </view>
 
     <!-- 内容推荐 -->
     <view class="introduce" wx:if="{{clockList.length>0}}" style="{{clockList.length<clockTotal ? 'padding-bottom: 44rpx' : ''}}" style="display: none;">

src/pages/clockdetail/newindex.wxss

@@ -69,7 +69,7 @@
     animation: leftfade 2s linear forwards;
 }
 page{
-    padding-bottom: 80rpx;
+    padding-bottom: 160rpx;
 }
 .container{
     overflow-x: hidden;