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

business/pages/circleindex/index.js

@@ -222,14 +222,6 @@ Page({
     const {bigtabtype} = e.currentTarget.dataset;
     that.setData({
       bigTabStatus: bigtabtype,
-      // hasmore: true,
-      // page: 1,
-      // mixedthemeList: [],
-      // mixedthemeTotal: 0,
-      // schedulesList:[],
-      // schedulesTotal: 0,
-      // memberList: [],
-      // memberTotal: 0,
     }, () => {
       that.doInit('init','tab');
     })
@@ -330,14 +322,6 @@ Page({
     for (var i in list_middle) {
       var d = list_middle[i];
       if (d.length > 0) {
-
-        // for(var i in d){
-        //   var m = d[i].start_time.slice(4,10).split('-');
-          
-        //   var startT = d[i].start_time.slice(11,16);
-        //   var endT = d[i].end_time.slice(11,16);
-        //   var newMonth = m[1]+'月'+m[2]+'日';
-        // }
         list_after.push({month: i, statics: d});
       }
     }

business/pages/circleindex/index.wxml

@@ -278,19 +278,7 @@
             <view class="has-nomore" wx:if="{{!hasmore && page>1}}">没有更多了</view>
             <view class="form-fixbtn" bindtap="addTheme">发布作业</view>
         </block>
-        
-        
     </view>
-    <!-- <poster-box
-        wx:if="{{posterBoxShow}}"
-        canvasimagepath="{{canvasImagePath}}"
-        bind:closeposter="closeposter"
-        bind:sharecallback="sharecallback"
-    >
-    </poster-box> -->
-    <!-- <view class="poste-box" id='canvas-container' wx:if="{{canvasShow}}">
-        <canvas class="mycanvas" canvas-id="myCanvas" style="width:100%;height:1334rpx;"/>
-    </view> -->
     <go-top wx:if="{{backTopValue}}"></go-top>
     <view class="copy-theme-box"   wx:if="{{showcopybox}}"  catchtouchmove="preventD"    >
         <view class="copy-theme-content"      >

business/pages/websiteindex/index.js

@@ -323,24 +323,6 @@ Page({
           schoolInfo: data ? data : '',
           tabList: _tabList,
         }, () => {
-          
-          // const that = this;
-          // wx.createSelectorQuery().select('#banner').boundingClientRect(function (rect) {
-          //   that.setData({
-          //     "boxTop.banner": rect ? rect.top : ''
-          //   })
-          // }).exec()
-          // wx.createSelectorQuery().select('#student-clock').boundingClientRect(function (rect) {
-          //   that.setData({
-          //     "boxTop.studentclock": rect ? rect.top : ''
-          //   })
-          // }).exec()
-          // wx.createSelectorQuery().select('#business-info').boundingClientRect(function (rect) {
-          //   that.setData({
-          //     "boxTop.businessinfo": rect ? rect.top : ''
-          //   })
-          // }).exec()
-
         })
       }
     }).catch((e) => {

src/pages/websiteindex/index.js

@@ -355,7 +355,6 @@ Page({
       cid
     } = e.detail;
     let clock = this.data.clockList.find(ele => ele.id == cid);
-    console.log(clock.comments.list, 'clock.comments.list');
     clock.comments.list = clock.comments.list.filter(ele => ele.id != eid);
     clock.comments.total--;
     this.setData({
@@ -539,11 +538,7 @@ Page({
     })
   },
   goclocklist() {
-    // wx.navigateTo({
-    //   // url: `/src/pages/websiteindex/clocklist?sid=${this.data.sid}`,
-    // })
     wx.reLaunch({
-      // url: `/src/pages/websiteindex/clocklist?sid=${this.data.sid}`,
       url: `/src/pages/papersquare/index?sid=${this.data.sid}`,
     })
   },