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

business/pages/deskcenter/themetemplate.js

@@ -129,12 +129,12 @@ Page({
   bindTemplateSelected(e) {
     const { id } = e.currentTarget.dataset;
     wx.navigateTo({
-      url: `/business/pages/themeeditor/index?tid=0&sid=${this.data.sid}&editType=1&tempid=${id}`
+      url: `/business/pages/themeeditor/index?tid=0&sid=${this.data.sid}&editType=1&tempid=${id}&fromLogin=1`
     })
   },
   createCustom() {
     wx.navigateTo({
-      url: `/business/pages/themeeditor/index?tid=0&sid=${this.data.sid}&editType=1`
+      url: `/business/pages/themeeditor/index?tid=0&sid=${this.data.sid}&editType=1&fromLogin=1`
     })
   }
 });

business/pages/morethemeindex/index.js

@@ -321,6 +321,9 @@ Page({
           hadCommentTotal: Number(data.review_count || 0),
           noCommentTotal: Number(data.not_review_count || 0),
         })
+        wx.setNavigationBarTitle({
+          title: data.title
+        })
       }
     }).catch((err) => {
       wx.hideLoading()

business/pages/morethemeindex/index.json

 {
-  "navigationBarTitleText": "闯关打卡",
+  "navigationBarTitleText": "关卡",
   "enablePullDownRefresh": true,
   "usingComponents": {
     "sjd-media-show": "../../../components/sjdmediashow",

business/pages/morethemeindex/index.wxml

@@ -8,10 +8,10 @@
   <view class="theme-index-container">
     <view class="page-topbg">
       <view class="top-title">{{params.title}}</view>
-      <view class="top-publish">{{params.subject_creator && params.subject_creator.nickname || ''}}  {{filter.formatDateWithChinese(params.created_at)}}发布</view>
+      <view class="top-publish">{{params.unlock_mode && params.unlock_mode.subject_creator && params.unlock_mode.subject_creator.nickname || ''}}  {{filter.formatDateWithChinese(params.created_at)}}发布</view>
       <view class="top-content" wx:if="{{params.content.length > 0}}">
         <view class="top-ask">
-          <text style="vertical-align: middle;">今日作业要求：</text>
+          <text style="vertical-align: middle;">关卡内容详情：</text>
           <block wx:for='{{params.content}}' wx:key='content'>
             <text class="text-block" wx:if='{{item.type=="text"}}'>{{item.value}}</text>
             <text class="text-type" wx:if='{{item.type=="img"}}'>[图片]</text>
@@ -95,7 +95,7 @@
   <view class="mask" bindtap="closeDetailModal"></view>
   <view class="modal-content">
     <view class="modal-title">
-      打卡内容详情
+      关卡内容详情
       <image class="icon-close" src="{{imageRoot}}2b/themeindex/close_icon.png" bindtap="closeDetailModal"></image>
     </view>
     <view class="modal-detail-wrap" wx:if="{{params.content.length > 0}}">

business/pages/organizationalmgt/newinfo.js

@@ -526,7 +526,7 @@ Page({
         if (res.code == 200) { // 成功的操作
           if (this.data.sid == 0) { // 新增的操作
             wx.redirectTo({
-              url: `/business/pages/deskcenter/themetemplate?sid=${this.data.sid}`
+              url: `/business/pages/deskcenter/themetemplate?sid=${res.data.id}`
               // url: `/business/pages/organizationalmgt/qxknow?sid=${res.data.id}`
             });
           } else {

business/pages/themeeditor/index.js

@@ -244,6 +244,7 @@ Page({
     // has_subjects_count: 0,
     
     tempid: 0,//作业模板id,
+    fromLogin: 0,//是否来源新注册创建 1是0不是
   },
   onLoad: function(options) { // Do some initialize when page load.
     const that = this;
@@ -254,7 +255,8 @@ Page({
       my,
       classes,
       editType,
-      tempid
+      tempid,
+      fromLogin
     } = options;
     this.setData({
       tid,
@@ -262,7 +264,8 @@ Page({
       sid: sid || '',
       my: my || 0,
       editType,
-      tempid: tempid || 0
+      tempid: tempid || 0,
+      fromLogin: fromLogin || 0
     });
     if (tid == 0) {
       const currentclasses = classes ? JSON.parse(decodeURIComponent(classes)) : [];
@@ -891,12 +894,17 @@ Page({
       if (code == 200) {
         wx.hideLoading();
         if (this.data.tid == 0 || this.data.clone == 1) { // 生成新闯关打卡
-          this.setData({
-            confirmId: data.id,
-            successDailogShow: true
-          }, () => {
+          if(this.data.fromLogin){
+            wx.reLaunch({
+              url: `/business/pages/deskcenter/index?sid=${this.data.sid}`,
+            })
+          } else {
+            this.setData({
+              confirmId: data.id,
+              successDailogShow: true
+            })
             this.data.publishing = false;
-          })
+          }
         } else {
           const pages = getCurrentPages();
           let curPage = null;
@@ -1025,12 +1033,18 @@ Page({
       wx.hideLoading();
       if (code == 200) {
         if (this.data.tid == 0 || this.data.clone == 1) { // 生成新闯关打卡
-          this.setData({
-            confirmId: data.id,
-            successDailogShow: true
-          }, () => {
-            this.data.publishing = false;
-          })
+          if(this.data.fromLogin){
+            LocalStorage.setItem('dakarole', 1);
+            wx.reLaunch({
+              url: `/business/pages/deskcenter/index?sid=${this.data.sid}`,
+            })
+          } else {
+            this.setData({
+              confirmId: data.id,
+              successDailogShow: true
+            })
+          }
+          this.data.publishing = false;
         } else {
           const pages = getCurrentPages();
           let curPage = null;
@@ -2336,12 +2350,17 @@ Page({
       const { code, data } = res;
       if (res.code == 200) {
         if (this.data.tid == 0 || this.data.clone == 1) { // 生成新闯关打卡
-          this.setData({
-            confirmId: data.id,
-            successDailogShow: true
-          }, () => {
+          if(this.data.fromLogin){
+            wx.reLaunch({
+              url: `/business/pages/deskcenter/index?sid=${this.data.sid}`,
+            })
+          } else {
+            this.setData({
+              confirmId: data.id,
+              successDailogShow: true
+            })
             this.data.publishing = false;
-          })
+          }
         } else {
           const pages = getCurrentPages();
           let curPage = null;

business/pages/themeeditor/lockthemelist.wxml

@@ -43,14 +43,14 @@
         </view>
         <view class="setting-item" bindtap="toEdit">
             <view class="left">
-                <view class="item-label">闯关打卡设置</view>
-                <view class="item-desc">作业内容、作业要求、参与打卡方式等设置</view>
+                <view class="item-label">打卡设置</view>
+                <view class="item-desc">每天最多闯关数、增加关卡数、每关打卡次数、参与方式等设置</view>
             </view>
             <view class="right">
                 <image class="icon-arr" src="{{imageRoot}}2b/themeindex/setting_right.png"></image>
             </view>
         </view>
-        <view class="setting-item" bindtap="goEditLandcontent">
+        <!-- <view class="setting-item" bindtap="goEditLandcontent">
             <view class="left">
                 <view class="item-label">打卡营销页设置</view>
                 <view class="item-desc">配置此页面后可在学生加入打卡前展示，此功能可收集有意向学生的联系方式。 <text class="more-tip">了解更多</text></view>
@@ -58,7 +58,7 @@
             <view class="right">
                 <image class="icon-arr" src="{{imageRoot}}2b/themeindex/setting_right.png"></image>
             </view>
-        </view>
+        </view> -->
     </view>
     </view>
   </view>

business/style/themeindex.wxss

@@ -310,7 +310,7 @@
   border-bottom: 2rpx solid #f1f2f3;
 }
 .modal-setup .setting-list .setting-item .left {
-  width: 80%;
+  width: 90%;
 }
 .modal-setup .setting-list .setting-item .left .item-label {
   font-size: 26rpx;

src/pages/calendarthemeindex/landpage.js

@@ -412,11 +412,11 @@ Page({
         this.setData({
           themeSelect: data
         });
-        // if(this.data.themeSelect.is_clock){
-        //   wx.redirectTo({
-        //     url: `/src/pages/calendarthemeindex/index?tid=${this.data.themeSelect.id}&sid=${this.data.sid}`
-        //   })
-        // }
+        if(this.data.themeSelect.is_join){
+          wx.redirectTo({
+            url: `/src/pages/calendarthemeindex/index?tid=${this.data.themeSelect.id}&sid=${this.data.sid}`
+          })
+        }
       }
     });
   },

src/pages/themeindex/landpage.js

@@ -383,12 +383,12 @@ Page({
           themeSelect: data,
           sid: data.school_id
         });
-        // 已打卡 直接跳转
-        // if(this.data.themeSelect.is_clock){
-        //   wx.redirectTo({
-        //     url: `/src/pages/themeindex/index?tid=${this.data.themeSelect.id}&sid=${this.data.sid}`
-        //   })
-        // }
+        // 已加入 直接跳转
+        if(this.data.themeSelect.is_join){
+          wx.redirectTo({
+            url: `/src/pages/themeindex/index?tid=${this.data.themeSelect.id}&sid=${this.data.sid}`
+          })
+        }
       }
     });
   },

ucenter/index.wxml

@@ -124,13 +124,13 @@
             <loginbtn loginCode="{{loginCode}}"/>
             <view class="menu-item-inner" bindtap="loginToManager" wx:if="{{ loginStatus==1 }}">
                 <image class="menuicon" src="{{imageRoot}}2c/ucenter2/icon_tologin.png?{{imageVersion}}"></image>
-                <text class="title">机构登录(新)</text>
+                <text class="title">机构登录</text>
                 <text class="desc">老师/校长在这里登录</text>
             </view>
             
             <button class="menu-item-inner" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" wx:else>
                 <image class="menuicon" src="{{imageRoot}}2c/ucenter2/icon_tologin.png?{{imageVersion}}"></image>
-                <text class="title">机构登录(新)</text>
+                <text class="title">机构登录</text>
                 <text class="desc">老师/校长在这里登录</text>
             </button>
         </view>