Merge remote-tracking branch 'origin/lvtz_clock' into wxl-user-optimize

business/pages/circleeditor/index.wxml

@@ -86,13 +86,13 @@
     </view>
     <view class="devided-line"></view>
 
-    <view class="form-box form-switch-box">
+    <!-- <view class="form-box form-switch-box">
         <view class="form-item">
             <view class="switch-title">潜在学员审核后才能加入班级</view>
             <w-switch slot="content" value="{{ needPsd }}" color="#16B0FD" size="small" bind:onChange="remindswitch" />
         </view>
-        
-    </view>
+    </view> -->
+    
     <view class="devided-line"></view>
     <view class="editor-box">
         <view class="box-title">

business/pages/classservice/classdetail.wxml

@@ -30,12 +30,10 @@
                 <view class="title">邀请学员</view>
             </view>
         </permission-box>
-        <permission-box cinfigid="30002">
-            <view class="opt-btnitem" bindtap="goClocklist" slot="menubtn">
-                <image class="icon" src="{{imageRoot}}2b/circleindex/icon_clock.png?{{imageVersion}}"></image>
-                <view class="title">作业打卡</view>
-            </view>
-        </permission-box>
+        <view class="opt-btnitem" bindtap="goClocklist">
+            <image class="icon" src="{{imageRoot}}2b/circleindex/icon_clock.png?{{imageVersion}}"></image>
+            <view class="title">作业打卡</view>
+        </view>
         <!-- <permission-box>
             <view class="opt-btnitem" bindtap="bindRankingList" slot="menubtn">
                 <view class="opt-btnitem" bindtap="bindRankingList" slot="menubtn">

business/pages/classservice/teacherindex.wxml

@@ -107,34 +107,32 @@
     <view class="modal {{modelHideClass? 'hide': ''}}"  hidden="{{!modalshow}}">
         <view class="mask" bindtap="hidemodal"></view>
         <view class="modal-content">
-            <permission-box cinfigid="30002">
-                <view class="part-box" slot="menubtn">
-                    <view class="part-title">发布任务</view>
-                    <view class="part-list">
-                        <view class="part-item bg-FFA922" bindtap="addTheme" data-btnname="fbaddTheme1" data-createtype="1">
-                            <image class="item-icon" src="{{imageRoot}}2b/deskcenter2/add_zuoye.png?{{imageRoot}}"/>
-                            <view class="item-title-box">
-                                <view class="item-title">作业打卡</view>
-                                <view class="item-desc">每日家庭作业</view>
-                            </view>
+            <view class="part-box" slot="menubtn">
+                <view class="part-title">发布任务</view>
+                <view class="part-list">
+                    <view class="part-item bg-FFA922" bindtap="addTheme" data-btnname="fbaddTheme1" data-createtype="1">
+                        <image class="item-icon" src="{{imageRoot}}2b/deskcenter2/add_zuoye.png?{{imageRoot}}"/>
+                        <view class="item-title-box">
+                            <view class="item-title">作业打卡</view>
+                            <view class="item-desc">每日家庭作业</view>
                         </view>
-                        <view class="part-item bg-2AACFA" bindtap="addTheme" data-btnname="fbaddTheme2" data-createtype="2">
-                            <image class="item-icon" src="{{imageRoot}}2b/deskcenter2/add_rili.png?{{imageRoot}}"/>
-                            <view class="item-title-box">
-                                <view class="item-title">日历打卡</view>
-                                <view class="item-desc">养成学习习惯</view>
-                            </view>
+                    </view>
+                    <view class="part-item bg-2AACFA" bindtap="addTheme" data-btnname="fbaddTheme2" data-createtype="2">
+                        <image class="item-icon" src="{{imageRoot}}2b/deskcenter2/add_rili.png?{{imageRoot}}"/>
+                        <view class="item-title-box">
+                            <view class="item-title">日历打卡</view>
+                            <view class="item-desc">养成学习习惯</view>
                         </view>
-                        <view class="part-item bg-24CCA9" bindtap="addTheme" data-btnname="fbaddTheme3" data-createtype="3">
-                            <image class="item-icon" src="{{imageRoot}}2b/deskcenter2/add_chuang.png?{{imageRoot}}"/>
-                            <view class="item-title-box">
-                                <view class="item-title">闯关打卡</view>
-                                <view class="item-desc">每日家庭作业</view>
-                            </view>
+                    </view>
+                    <view class="part-item bg-24CCA9" bindtap="addTheme" data-btnname="fbaddTheme3" data-createtype="3">
+                        <image class="item-icon" src="{{imageRoot}}2b/deskcenter2/add_chuang.png?{{imageRoot}}"/>
+                        <view class="item-title-box">
+                            <view class="item-title">闯关打卡</view>
+                            <view class="item-desc">每日家庭作业</view>
                         </view>
                     </view>
                 </view>
-            </permission-box>
+            </view>
             <permission-box cinfigid="80001">
                 <view class="part-box" slot="menubtn">
                     <view class="part-title">机构动态</view>

src/pages/calendarthemeindex/index.js

@@ -2116,11 +2116,7 @@ Page({
               },
               { // 打卡详情
                 type: 'text',
-                breakWord: true,
-                width: 450,
-                lineHeight: 35,
-                MaxLineNumber: 2,
-                content: `在〔${themeSelect.title.length > 28 ? themeSelect.title.substr(0, 28) + '...' : themeSelect.title }〕完成打卡`,
+                content: `在〔${themeSelect.title}〕完成打卡`,
                 fontSize: 24,
                 color: '#4F4F4F',
                 textAlign: 'left',
@@ -2287,11 +2283,7 @@ Page({
             },
             { // 打卡详情
               type: 'text',
-              breakWord: true,
-              width: 450,
-              lineHeight: 35,
-              MaxLineNumber: 2,
-              content: `在〔${themeSelect.title.length > 28 ? themeSelect.title.substr(0, 28) + '...' : themeSelect.title }〕完成打卡`,
+              content: `在〔${themeSelect.title}〕完成打卡`,
               fontSize: 24,
               color: '#4F4F4F',
               textAlign: 'left',

ucenter/index.wxml

@@ -120,12 +120,12 @@
             <text class="desc"></text>
         </view>
         
-        <!-- <view class="menu-item" bindtap="loginToManager">
+        <view class="menu-item" bindtap="loginToManager">
             <loginbtn loginCode="{{loginCode}}"/>
             <image class="menuicon" src="{{imageRoot}}2c/ucenter2/icon_tologin.png?{{imageVersion}}"></image>
             <text class="title">机构登录</text>
             <text class="desc">老师/校长在这里登录</text>
-        </view> -->
+        </view>
 
         <view class="menu-item">
             <loginbtn loginCode="{{loginCode}}"/>