Merge branch 'wxl-user-optimize' of git.server:wangxuelai/wechatapp.shangjiadao.com into lvtz_clock

business/pages/themeeditor/index.wxml

@@ -321,7 +321,6 @@
           </view>
         </view>
         <view class="locksubjectlist">
-          <!-- <view class="locksubjectitem" wx:for="{{lockSubjects.slice(currentSortIndex * 10,currentSortIndex * 10 + 10)}}" wx:key="index"> -->
           <view class="locksubjectitem" wx:for="{{lockSubjectLists}}" wx:key="index" data-item="{{item}}" data-index="{{index}}" bindtap="goModifyClockSubject">
             <view class="topbox">
               <view class="sorttitle">第{{currentSortIndex * 10 + index + 1}}关</view>
@@ -340,8 +339,8 @@
 <view class="modal-dialog" wx:if="{{changesubjectCountInputShow}}">
   <view class="modal-mask"></view>
   <view class="modal-box">
-      <input type="number" placeholder="请输入闯关打卡关卡总数" value="{{copySubjectCount}}" bindinput="subjectCountInput" />
-      <view>
+      <input type="number" placeholder="请输入闯关打卡关卡总数" class="inputPsd" value="{{copySubjectCount}}" bindinput="subjectCountInput" />
+      <view class="modal-btn-box">
           <view class="modal-btn" bindtap="hideChangePsd">关闭</view>
           <view class="modal-btn" bindtap="sureChangePsd">确定</view>
       </view>
@@ -369,17 +368,18 @@
   </view>
 </view>
 <view class="modal-dialog success-dailog" wx:if="{{successDailogShow}}" catchtouchmove="true">
-    <view class="modal-mask"></view>
+    <view class="modal-mask" bindtap="gothemeindex"></view>
     <view class="modal-box">
-        <image class="top-imgbg" src="{{imageRoot}}2b/themeeditor/dailog-bj.png?{{imageVersion}}"/>
-        <view class="modal-content">
-          <view class="main-title">作业创建成功</view>
-          <view class="sub-title">可以邀请学员打卡了</view> 
-        </view>
-        <view class="modal-btngroup">
-            <view class="btn" bindtap="hideDailogShow" bindtap="bindToThemeindex">进入管理后台</view>
-            <button class="btn btn-primary" open-type="share">分享给学员</button>  
-        </view>
+      <image class="iconclose" src="{{imageRoot}}common/icon_close.png" bindtap="gothemeindex"></image>
+      <image class="successicon" src="{{imageRoot}}2b/themeeditor/successicon.png"></image>
+      <view class="successtext">创建成功</view>
+      <view class="successguidetext">打卡可以方便记录和统计作业情况,</view>
+      <view class="successguidetext"> 督促孩子在家学习。</view>
+      <button class="btn btn-primary sharebtn" open-type="share">
+        <image class="wechaticon" src="{{imageRoot}}2b/themeeditor/wechat.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
+        分享给学员
+      </button>
+      <view class="shareguidetext"> 分享到微信群，邀请学生参与打卡!</view>
     </view>
 </view>
 <expiredTip/>

business/pages/themeeditor/index.wxss

@@ -434,6 +434,57 @@ page{
   left: 0;
   top: -90rpx;
 }
+.modal-dialog.success-dailog .modal-box{
+  height: initial;
+} 
+.success-dailog .modal-box .iconclose {
+  width: 24rpx;
+  height: 24rpx;
+  position: absolute;
+  right: 20rpx;
+  top: 20rpx;
+}
+.success-dailog .modal-box .successtext {
+  color: #222222;
+  font-size: 34rpx;
+  text-align: center;
+  line-height: 1;
+  margin-bottom: 22rpx;
+}
+.success-dailog .modal-box .successguidetext {
+  color: #555555;
+  font-size: 26rpx;
+  text-align: center;
+}
+.success-dailog .modal-box .sharebtn{
+  display: flex;
+  align-items: center; 
+  justify-content: center;
+  background-color: #02AE5F;
+  width: 478rpx;
+  height: 100rpx;
+  border-radius: 50rpx;
+  color: #fff;
+  margin: 56rpx auto 16rpx;
+}
+.success-dailog .modal-box .shareguidetext {
+  color: #999999;
+  font-size: 22rpx;
+  text-align: center;
+  padding-bottom: 22rpx;
+}
+.success-dailog .modal-box .sharebtn .wechaticon {
+  width: 52rpx;
+  height: 44rpx;
+  display: block;
+  margin-right: 20rpx;
+}
+.success-dailog .modal-box .successicon {
+  width: 166rpx;
+  height: 166rpx;
+  display: block;
+  margin: 74rpx auto 44rpx;
+}
 .success-dailog .modal-box .modal-content{
   padding: 160rpx 0 70rpx;
 }
@@ -910,4 +961,39 @@ page{
   justify-content: center;
   margin: 0 auto;
   margin-top: 46rpx;
+}
+.modal-btn-box {
+  display: flex;
+  align-items: center;
+}
+.modal-dialog .modal-box .modal-btn{
+  width: 100%;
+  height: 100rpx;
+  display: flex;
+  flex: 1;
+  align-items: center;
+  justify-content: center;
+  border-top: 1px solid rgba(0,0,0,.05);
+  font-size: 30rpx;
+  color: #434343;
+  font-weight: bold;
+}
+.modal-dialog .modal-box .inputPsd {
+  width: 420rpx;
+  height: 78rpx;
+  border-radius: 38rpx;
+  background:rgba(238,238,237,1);
+  display: block;
+  margin: 80rpx auto;
+  text-align: center;
+  padding: 0 30rpx;
+}
+.modal-dialog .modal-box .modal-btn:first-child {
+  border-right: 1px solid rgba(0,0,0,.05);
+}
+.modal-dialog .modal-box .modal-btn:last-child {
+  color: #65B8F4;
+}
+.borderbottom1px {
+  border-bottom: 1px solid #F1F2F3;
 }
\ No newline at end of file

business/pages/themeeditor/lockthemelist.js

@@ -30,7 +30,8 @@ Page({
       }
     },
     lockSubjects: [],
-    settingModalShow: false
+    settingModalShow: false,
+    needRefresh: false,
   },
   onLoad: function(options) { // Do some initialize when page load.
    const { sid, tid } = options;
@@ -44,6 +45,10 @@ Page({
 
   },
   onShow: function() { // Do something when page show.
+    if (this.data.needRefresh) {
+      this.unlockSubjectShow();
+      this.data.needRefresh = false;
+    }
   },
   onHide: function() { // Do something when page hide.