Merge branch 'permission_lvtz' of git.server:wangxuelai/wechatapp.shangjiadao.com into sj-dev-dev

business/pages/classservice/teachremind.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "上课提醒",
   "enablePullDownRefresh": true,
   "usingComponents": {
-    "btn-drag":"../../../components/btndrag"
+    "btn-drag":"../../../components/btndrag",
+    "permission-box":"../../components/permissionbox"
   }
 }
\ No newline at end of file

business/pages/classservice/teachremind.wxml

@@ -77,8 +77,10 @@
             <view class="line">赶快去点名上课吧！</view>
         </view>
           
-    </view>  
-    <view class="rollcall-btn" bindtap="goRollcallIndex">点名</view>
+    </view>
+    <permission-box cinfigid="6">
+        <view class="rollcall-btn" bindtap="goRollcallIndex" slot="menubtn">{{schedulesDetail.call_time?'编辑点名':'点名'}}</view>
+    </permission-box>
 
     <btn-drag bind:btnDragEvent='goDeskCenter' tobottomDis='88' width='45' height="45" catchtouchmove="ture">
         <view class="gohome" slot="dragcontent">

src/pages/myschedule/index.js

@@ -452,6 +452,7 @@ Page({
   bindHideModalLeave(e){
     let that = this;
     that.setData({
+      leaveContent: '',
       modalLeaveShow: false
     })
   },

src/pages/myschedule/landpage.js

@@ -333,6 +333,7 @@ Page({
   bindHideModalLeave(e){
     let that = this;
     that.setData({
+      leaveContent: '',
       modalLeaveShow: false
     })
   },