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

business/pages/classmgt/index.wxml

@@ -23,40 +23,32 @@
   </view>
 
   <view class="commonlist-bigwrap commonlist-bigwrap-round" wx:if="{{!emptyPage}}">
-    <view class="commonlist-box" wx:for="{{classList}}" wx:key="index" wx:for-item="pageItem">
-      <view class="commonlist-item" wx:for="{{pageItem}}" wx:key="idx" data-id="{{item.id}}" bindtap='goClassIndex'>
-        <form report-submit="true" bindsubmit="formIdCreate" class="createidform">
-          <button form-type="submit" class="createidbutton"></button>
-        </form>
-        <view class="item-titlebox">
-          <view class="item-title">{{item.title}}</view>
-          <view class="itme-state state-4" wx:if="{{item.graduation_status==2}}">已结业</view>
-        </view>
-        <view class="item-contentbox">
-          <view class="content-item">
-            <view class="item-label"><view class="text">老师</view>：</view>
-            <view class="item-text">{{item.school_teachers.length>0?item.teacherArr:'暂未分配老师'}}</view>
-          </view>
-          <view class="content-item">
-            <view class="item-label"><view class="text">学员</view>：</view>
-            <view class="item-text">{{item.class_student_count}}/{{item.capacity}}</view>
-          </view>
-          <!-- <view class="content-item">
-            <view class="item-label">开班时间：</view>
-            <view class="item-text"></view>
-          </view> -->
-          <view class="content-item">
-            <view class="item-label"><view class="text">教学进度</view>：</view>
-            <view class="item-text">{{item.expended}}/{{item.total}}</view>
-          </view>
-          <!-- <view class="content-item">
-            <view class="item-label">上课时间：</view>
-            <view class="item-text">
-              <view class="item-line" wx:for="{{item.clock_count}}" wx:key="">每周六 12:00-16:00</view>
+    <view class="commonlist-box" >
+      <block wx:for="{{classList}}" wx:key="index" wx:for-item="pageItem">
+        <view class="commonlist-item" wx:for="{{pageItem}}" wx:key="idx" data-id="{{item.id}}" bindtap='goClassIndex'>
+            <form report-submit="true" bindsubmit="formIdCreate" class="createidform">
+              <button form-type="submit" class="createidbutton"></button>
+            </form>
+            <view class="item-titlebox">
+              <view class="item-title">{{item.title}}</view>
+              <view class="itme-state state-4" wx:if="{{item.graduation_status==2}}">已结业</view>
             </view>
-          </view> -->
-        </view>
-      </view>
+            <view class="item-contentbox">
+              <view class="content-item">
+                <view class="item-label"><view class="text">老师</view>：</view>
+                <view class="item-text">{{item.school_teachers.length>0?item.teacherArr:'暂未分配老师'}}</view>
+              </view>
+              <view class="content-item">
+                <view class="item-label"><view class="text">学员</view>：</view>
+                <view class="item-text">{{item.class_student_count}}/{{item.capacity}}</view>
+              </view>
+              <view class="content-item">
+                <view class="item-label"><view class="text">教学进度</view>：</view>
+                <view class="item-text">{{item.expended}}/{{item.total}}</view>
+              </view>
+            </view>
+          </view>
+      </block>
     </view>
     <list-loading loading="{{listLoading}}"></list-loading>
   </view>

src/pages/sharemoretheme/index.wxml

@@ -16,21 +16,15 @@
           </button>
         </form> 
       </view>
-      <view class="content-box1"      wx:if="{{tabIndex==0}}">
-          <view class="unlock-box"     >关卡总数：{{moreTheme.subject_count || 0}}关</view>
-          <view class="rule-box"     >闯关规则：每日可闯{{moreTheme.unlock_limit || 0}}关;每关最多挑战{{moreTheme.max_clock_count || 0}}次</view>
+      <view class="content-box1" wx:if="{{tabIndex==0}}">
+          <view class="unlock-box" >关卡总数：{{moreTheme.subject_count || 0}}关</view>
+          <view class="rule-box" >闯关规则：每日可闯{{moreTheme.unlock_limit || 0}}关;每关最多挑战{{moreTheme.max_clock_count || 0}}次</view>
       </view>
-      <view class="content-box1 content-box2"      wx:if="{{tabIndex==1}}">
-        <view class="list-item"      wx:for="{{subjects}}" wx:key="{{index}}">{{item.title}}</view>
+      <view class="content-box1 content-box2"  wx:if="{{tabIndex==1}}">
+        <view class="list-item"  wx:for="{{subjects}}" wx:key="{{index}}">{{item.title}}</view>
       </view>
-      <!-- <view class="bottom-box"     >
-        已有:<image binderror="" bindload="" class="" lazy-load=""
-          src="{{filter.imagify(item)}}" wx:for="{{student}}" wx:key="{{index}}">
-        </image>
-        <view class="text"     >等{{moreTheme.clock_student_count}}名同学参加</view>
-      </view> -->
     </view>
-    <view class="footer-box"      bindtap="goMoretheme">
+    <view class="footer-box" bindtap="goMoretheme">
       开始闯关
       <form report-submit="true" bindsubmit="formIdCreate" class="createidform">
         <button form-type="submit" class="createidbutton">
@@ -38,10 +32,10 @@
       </form> 
     </view>
   </view>
-  <view class="dailog-box"      wx:if="{{dailogShow}}">
-      <view class="content-box"     >
-          <view class="title"     >该主题设有密码</view>
-          <view class="ipt-box"     >
+  <view class="dailog-box" wx:if="{{dailogShow}}">
+      <view class="content-box" >
+          <view class="title" >该主题设有密码</view>
+          <view class="ipt-box" >
               <input type="number" placeholder-class="placeholderclass" class="iteminput" maxlength="6" value="{{password}}" bindinput="passwordInput" placeholder="请输入密码"></input>
           </view>
           <view class="dailog-footer-box"     >