merge lvtz_home

business/pages/themeeditorlock/index.wxml

@@ -158,11 +158,21 @@
   </view>
   <view class="introduce-setting">
     <view class="title-box">闯关介绍</view>
-    <view class="introduce-box">
-      <view class="content-inputbox">添加闯关介绍</view>
+    <view class="introduce-box" wx:for="{{introduceContent}}" wx:key="index">
+      <view class="close-box" data-index="{{index}}" bindtap="delIntroduce">
+        <image class="" src="{{imageRoot}}2b/themeeditorlock/closexicon.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
+      </view>
+        
+      <view class="introduce-title">
+        <input class="" value="{{item.title}}" type="text" placeholder="请输入标题" placeholder-style="" data-index="{{index}}" placeholder-class="input-placeholder" maxlength="15" focus="false" bindinput="introducetitleipt">
+        </input>
+        <view class="tips">点击修改标题，最多15个字</view> 
+      </view>
       <view class="sjd-component-box">
-        <sjd-media-editor content="{{params.introduce}}" 
-          id="sjd-media-editor" sid="{{sid}}" 
+        <sjd-media-editor content="{{item.content}}" 
+          id="sjd-media-editor{{index}}" sid="{{sid}}" 
+          haveAddVoice="{{false}}"
+          haveAddWxfile="{{false}}"
           bind:addVoice="addVoice" 
           placeholder="{{placeholder}}" 
           bind:playvoice="playvoice" 
@@ -178,6 +188,7 @@
           <!-- bind:posterloaderr="posterloaderr" -->
       </view>
     </view>
+    <view class="add-btn" bindtap="addIntroduce">添加板块</view>
   </view> 
     
   <view class="dialog-modal" wx:if="{{showConfirmDialog}}">

business/pages/themeeditorlock/index.wxss

@@ -580,11 +580,42 @@ page{
 }
 .introduce-setting .introduce-box {
   width:100%;
-  min-height:317rpx;
   background:rgba(255,255,255,1);
   border:2px dashed rgba(208,208,208,1);
   border-radius:10rpx;
-  padding-bottom: 30rpx;
+  padding: 36rpx 24rpx 30rpx 24rpx;
+  position: relative;
+  margin-bottom: 60rpx;
+}
+.introduce-setting .introduce-box  .close-box{
+  position: absolute;
+  top: -25rpx;
+  right: -25rpx;
+}
+.introduce-setting .introduce-box  .close-box image{
+  width: 50rpx;
+  height: 50rpx;
+}
+.introduce-title {
+
+}
+.introduce-title input{
+  width:390rpx;
+  height:83rpx;
+  background:rgba(244,244,244,1);
+  border-radius:10rpx;
+  padding: 0 28rpx;
+  margin: 0 auto;
+  font-weight: bold;
+}
+.introduce-title .tips{
+  font-size:24rpx;
+  font-family:PingFang SC;
+  font-weight:400;
+  color:rgba(157,157,157,1);
+  line-height: 1;
+  padding: 18rpx 0 22rpx 0;
+  text-align: center;
 }
 .introduce-setting .introduce-box .content-inputbox{
   font-size:28rpx;
@@ -594,6 +625,22 @@ page{
   text-align: center;
   padding: 72rpx 0 83rpx 0;
 }
+.introduce-setting .add-btn{
+  width:427rpx;
+  height:65rpx;
+  background:rgba(255,255,255,1);
+  border:2rpx solid rgba(101,184,244,1);
+  border-radius:33rpx;
+  font-size:26rpx;
+  font-family:PingFang SC;
+  font-weight:400;
+  color:rgba(101,184,244,1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 0 auto;
+  margin-top: 56rpx;
+}
 .addRadio{
   padding: 0 30rpx;
   height:68rpx;

components/sjdmediaeditor/index.js

@@ -36,6 +36,14 @@ Component({
       type: Boolean,
       value: false,
     },
+    haveAddVoice:{
+      type: Boolean,
+      value: true,
+    },
+    haveAddWxfile: {
+      type: Boolean,
+      value: true,
+    },
     maxTextBoxLength: {
       type: Number,
       value: 999

components/sjdmediaeditor/index.wxml

@@ -94,7 +94,7 @@
             </view>
             <view class="media-type-name">图片</view>
         </view>
-        <view class="media-type-item" bindtap="addVoice" wx:if="{{voiceBoxLength < maxVoiceBoxLength}}">
+        <view class="media-type-item" bindtap="addVoice" wx:if="{{voiceBoxLength < maxVoiceBoxLength}}" wx:if="{{haveAddVoice}}">
             <form report-submit="true" bindsubmit="formIdCreate" class="createidform">
                 <button form-type="submit" class="createidbutton">生成form</button>
             </form>
@@ -112,7 +112,7 @@
             </view>
             <view class="media-type-name">视频</view>
         </view>
-        <view class="media-type-item" bindtap="addWxfile" wx:if="{{videoBoxLength < maxVideoBoxLength}}">
+        <view class="media-type-item" bindtap="addWxfile" wx:if="{{videoBoxLength < maxVideoBoxLength}}" wx:if="{{haveAddWxfile}}">
             <form report-submit="true" bindsubmit="formIdCreate" class="createidform">
                 <button form-type="submit" class="createidbutton">生成form</button>
             </form>

src/pages/sharemoretheme/index.js

@@ -160,7 +160,7 @@ Page({
         } catch (e) {
           introduce = []
         }
-        data.introduce = introduce;
+        data.introduce =  introduce && introduce[0] ? (introduce[0].content || introduce[0].title ? introduce : [{title:'', content: introduce }] ) : '';
         let sign_up_content = {};
         try {
           sign_up_content = JSON.parse(data.sign_up_content);
@@ -171,6 +171,7 @@ Page({
         wx.setNavigationBarTitle({
           title: data.title
         })
+        console.log(data.introduce,'introduce')
         this.setData({
           moreTheme: data,
           sid: data.school_id,

src/pages/sharemoretheme/index.wxml

@@ -42,9 +42,13 @@
       </view>
       <view class="content-box1 content-box2"  wx:if="{{tabIndex==0 && moreTheme.introduce.length > 0}}">
         <view class="box-title">打卡介绍</view>
-        <view class="mediabox">
+        <view class="mediabox" wx:for="{{moreTheme.introduce}}" wx:key="index">
+          <view class="title-wrapper">
+            <view class="title">{{item.title}} <view class="title-bg"></view></view>
+          </view> 
+          <view class="media-box">
             <sjd-media-show
-              content="{{moreTheme.introduce}}"
+              content="{{item.content}}"
               bind:playvoice="playvoice"
               bind:pausevoice="pausevoice"
               bind:voiceslide="voiceslide"
@@ -57,8 +61,9 @@
               text="详情"
               bind:playvideo="playvideo"
               defineheight="{{400}}"
-          >
-          </sjd-media-show>
+            >
+            </sjd-media-show>
+          </view>
         </view>
       </view>
       <view class="content-box1 content-box2"  wx:if="{{tabIndex==1}}">

src/pages/sharemoretheme/index.wxss

@@ -24,6 +24,31 @@ page{
 .mediabox {
     width: 702rpx;
     margin: 0 auto;
+    margin-bottom: 64rpx;
+}
+.mediabox .title-wrapper{
+    text-align: center;
+}
+.mediabox .title{
+    display: inline-block;
+    font-size:34rpx;
+    font-family:PingFang SC;
+    font-weight:bold;
+    color:rgba(32,32,32,1);
+    line-height:1;
+    text-align: center;
+    margin: 0 auto;
+    margin-bottom: 20rpx;
+    position: relative;
+}
+.mediabox .title .title-bg{
+    width: 90%;
+    height:15rpx;
+    background:rgba(255,209,70,.4);
+    border-radius:8rpx;
+    position: absolute;
+    left: 0;
+    bottom: -7rpx;
 }
 .content-box{
     /* width:702rpx; */