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

business/pages/commenteditor/index.js

@@ -341,7 +341,6 @@ Page({
   },
   shortWordsList() {
     shortWordsList({
-      // subject_id: this.data.tid,
       school_id:this.data.sid
     }).then((res) => {
       if (res.data.list) {

business/pages/themead/index.js

@@ -20,6 +20,7 @@ var app = getApp();
 import {
   bOssAccess,
 } from '../../../service/common.js';
+import regexp from '../../../constants/regexp.js';
 Page({
   data: {
     editType: 1,
@@ -195,30 +196,6 @@ Page({
   saveLockPost() {
     const that = this;
     const { params } = this.data
-    // if (params.title.trim() == '') {
-    //   wx.showToast({
-    //     title: '请输入模板名称',
-    //     duration: 1500,
-    //     icon: 'none',
-    //   })
-    //   return;
-    // }
-    // if (params.name.trim() == '') {
-    //   wx.showToast({
-    //     title: '请输入老师姓名',
-    //     duration: 1500,
-    //     icon: 'none',
-    //   })
-    //   return;
-    // }
-    // if (params.mobile == '' && params.img=='') {
-    //   wx.showToast({
-    //     title: '请添加手机号码或者上传微信二维码',
-    //     duration: 1500,
-    //     icon: 'none',
-    //   })
-    //   return;
-    // }
     if (this.data.publishing) {
       return
     }

service/common.js

@@ -332,6 +332,15 @@ function bTokenExchange(data) {
 		needToken: true
 	})
 }
+
+function authLogin(data) {
+	return wxRequest({
+		url: apis.customer.common.bTokenExchange,
+		data,
+		method: 'POST',
+		errorresolve: 1,
+	})
+}
 function getVerifyCode(data) {
     return wxRequest({
         url: apis.getVerifyCode,
@@ -503,6 +512,7 @@ export {
 	getMember,
 	teacherPcLoginReport,
 	bTokenExchange,
+	authLogin,
 	getVerifyCode,
 	getAccountList,
 	getMemberMe,

src/pages/calendarthemeindex/index.js

@@ -318,13 +318,13 @@ Page({
     const clockdate = _activeDay.year + month + day;
     let myBaseinfo = this.data.myBaseinfo;
     let initShareObj = {
-      title: `我正在参加【${this.data.themeSelect.title}】的打卡`,
-      path: `/src/pages/beforeinvitation/index?tid=${this.data.tid}&consumerId=${visitor && visitor.id || 0}&d=${clockdate.substr(2)}&w=${app.globalData.currentSchoolStudentId}`
+      title: `我正在参加打卡【${this.data.themeSelect.title}】`,
+      path: `/src/pages/calendarthemeindex/landpage?tid=${this.data.tid}&sid=${this.data.sid}&consumerId=${visitor && visitor.id || 0}&d=${clockdate.substr(2)}&w=${app.globalData.currentSchoolStudentId}`
     }
     if (from == 'menu') {
       shareObj = initShareObj;
       app.setSharerLog({
-        source_path: 'src/pages/beforeinvitation/index',
+        source_path: 'src/pages/calendarthemeindex/landpage',
         source_id: this.data.tid,
         source_type_model: 5,
         param: JSON.stringify({
@@ -388,7 +388,7 @@ Page({
         }
       }else{
         app.setSharerLog({
-          source_path: 'src/pages/beforeinvitation/index',
+          source_path: 'src/pages/calendarthemeindex/landpage',
           source_id: this.data.tid,
           source_type_model: 5,
           param: JSON.stringify({

src/pages/calendarthemeindex/index.wxml

@@ -99,7 +99,7 @@
 
         <view class="section clock-section">
             <view class="title">已打卡<text class="static">{{clockTotal + selfcount}}</text>人</view>
-            <block wx:if="{{themeSelect.is_cheat == 0 || (themeSelect.is_cheat == 1 && activeDay.isClock) || (themeSelect.is_cheat == 1 && !isSchoolStudent) || (clockTotal + selfcount) == 0}}">
+            <block wx:if="{{themeSelect.is_cheat == 0 || (themeSelect.is_cheat == 1 && activeDay.isClock) || (themeSelect.is_cheat == 1 && isSchoolStudent)}}">
                 <view class="clock-list" wx:if="{{!emptyPage}}">
                     <block wx:for="{{clockList}}" wx:key="bigindex" wx:for-index="bigindex" wx:for-item="bigitem">
                         <view class="clock-item" wx:key="index" wx:for="{{bigitem}}">

src/pages/calendarthemeindex/landpage.js

@@ -245,10 +245,8 @@ Page({
     let myBaseinfo = this.data.myBaseinfo;
     let shareObj = {};
     let initShareObj = {
-      title: `我正在参加【${this.data.themeSelect.title}】的打卡`,
-      path: `/src/pages/themeindex/landpage?&tid=${
-        this.data.tid
-      }&sid=${this.data.sid}&consumerId=${(visitor && visitor.id) || 0}&w=${
+      title: `我正在参加打卡【${this.data.themeSelect.title}】`,
+      path: `/src/pages/calendarindex/landpage?&tid=${this.data.tid}&sid=${this.data.sid}&consumerId=${(visitor && visitor.id) || 0}&w=${
         app.globalData.currentSchoolStudentId
       }`
     };
@@ -258,9 +256,8 @@ Page({
       source_type_model: 5,
       source_path: "src/pages/beforeinvitation/index",
       source_id: this.data.tid,
-      source_type_model: 5,
       param: JSON.stringify({
-        query: `tid=${this.data.tid}&consumerId=${(visitor && visitor.id) ||
+        query: `tid=${this.data.tid}&sid=${this.data.tid}&consumerId=${(visitor && visitor.id) ||
           0}&w=${app.globalData.currentSchoolStudentId}`
       })
     });

src/pages/clockdetail/newindex.js

@@ -459,7 +459,6 @@ Page({
               content_100: data.content.length > 100 ? data.content.substr(0, 100) + '...' : data.content,
               contentexpand: false
             }),
-            id: data.class_id,
             sid: data.school_id,
             hasData: true,
             // tid: data.subject_id
@@ -476,16 +475,14 @@ Page({
             type: 32,
             open_id: visitor1 && visitor1.openid,
             school_id: data.school_id,
-            remark: '',
-            class_id: data.class_id
+            remark: ''
           })
           if(this.data.isQrcodeIn){
             activityLog({
               type: 39,
               open_id: visitor1 && visitor1.openid,
               school_id: data.school_id,
-              remark: '',
-              class_id: data.class_id
+              remark: ''
             })
           }
           this.newLikeIndex(data.id, function (likeRes) {
@@ -734,12 +731,12 @@ Page({
     switch (this.data.clock.subject_type) {
       case 1:
         wx.redirectTo({
-          url: `/src/pages/themeindex/index?tid=${this.data.tid}`
+          url: `/src/pages/themeindex/landpage?tid=${this.data.tid}&sid=${this.data.sid}`
         })
         break;
       case 2:
         wx.redirectTo({
-          url: `/src/pages/calendarthemeindex/index?tid=${this.data.tid}`
+          url: `/src/pages/calendarthemeindex/landpage?tid=${this.data.tid}&sid=${this.data.sid}`
         })
         break;
       case 3:
@@ -1641,7 +1638,7 @@ Page({
       mobile: mobile,
       school_id: this.data.sid,
       source_type: 1,
-      custom:this.data.clock.class_id+'_'+this.data.clock.subject.subject_type+'-'+this.data.clock.subject.id,
+      custom: this.data.clock.class_id+'_'+this.data.clock.subject.subject_type+'-'+this.data.clock.subject.id,
       share_student_id: app.globalData.sharerStudentId || '',
     }).then((res) => {
       const {

src/pages/clockdetail/newindex.wxml

@@ -107,7 +107,7 @@
         
         <view class="right">
           <view class="title">{{clock.subject.title}}</view>
-          <view class="password-tips" wx:if="{{themeDetailData.join_rule_type == 2}}">密码加入</view>
+          <view class="password-tips" wx:if="{{themeDetailData.join_rule_type == 3}}">密码加入</view>
             
           <view class="line-item">
             <view class="num-box">1位好友参与</view>

src/pages/mytask/index.js

@@ -284,7 +284,7 @@ Page({
     } = e.currentTarget;
     this.themeNoticeRead(theme);
     if (theme.subject_type == 1) {
-      if (theme.is_join == 1) {
+      if (theme.is_join != 1) {
         wx.navigateTo({
           url: `/src/pages/themeindex/index?&tid=${theme.id}&sid=${this.data.sid}`
         });
@@ -294,7 +294,7 @@ Page({
         });
       }
     } else if (theme.subject_type == 2) {
-      if (theme.is_join == 1) {
+      if (theme.is_join != 1) {
         wx.navigateTo({
           url: `/src/pages/calendarthemeindex/index?&tid=${theme.id}&sid=${this.data.sid}`
         });

src/pages/themeindex/index.js

@@ -358,18 +358,17 @@ Page({
     let shareObj = {
     }
     let initShareObj = {
-      title: `我正在参加【${this.data.circleInfo.title}】的打卡`,
-      path: `/src/pages/beforeinvitation/index?tid=${this.data.tid}&consumerId=${visitor && visitor.id || 0}&w=${app.globalData.currentSchoolStudentId}`
+      title: `我正在参加打卡【${this.data.themeSelect.title}】`,
+      path: `/src/pages/themeindex/landpage?tid=${this.data.tid}&sid=${this.data.sid}&consumerId=${visitor && visitor.id || 0}&w=${app.globalData.currentSchoolStudentId}`
     }
     if (from == 'menu') {
       shareObj = initShareObj;
       app.setSharerLog({
         source_type_model: 5,
-        source_path: 'src/pages/beforeinvitation/index',
+        source_path: 'src/pages/themeindex/landpage',
         source_id: this.data.tid,
-        source_type_model: 5,
         param: JSON.stringify({
-          query: `tid=${this.data.tid}&consumerId=${visitor && visitor.id || 0}&w=${app.globalData.currentSchoolStudentId}`
+          query: `tid=${this.data.tid}&sid=${this.data.sid}&consumerId=${visitor && visitor.id || 0}&w=${app.globalData.currentSchoolStudentId}`
         })
       });
     } else if (from == 'button') {
@@ -429,11 +428,11 @@ Page({
         }
       }else{
         app.setSharerLog({
-          source_path: 'src/pages/beforeinvitation/index',
+          source_path: 'src/pages/themeindex/landpage',
           source_type_model: 5,
           source_id: this.data.tid,
           param: JSON.stringify({
-            query: `tid=${this.data.tid}&consumerId=${visitor && visitor.id || 0}&w=${app.globalData.currentSchoolStudentId}`
+            query: `tid=${this.data.tid}&sid=${this.data.sid}&consumerId=${visitor && visitor.id || 0}&w=${app.globalData.currentSchoolStudentId}`
           })
         });
         shareObj = initShareObj;
@@ -442,7 +441,11 @@ Page({
 
     return {
       title: shareObj.title,
-      path: shareObj.path
+      path: shareObj.path,
+      imageUrl: imagify(
+        this.data.themeSelect.land_content.cover ||
+          "https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/sharemoretheme/newunlockbg.png"
+      ),
     }
   },
   judgeIsSchoolStudent (sid) {

src/pages/themeindex/index.wxml

@@ -80,7 +80,7 @@
 
     <view class="section clock-section">
         <view class="title">已打卡<text class="static">{{clockTotal + selfcount}}</text>人</view>
-        <block wx:if="{{themeSelect.is_cheat == 0 || (themeSelect.is_cheat == 1 && isClock) || (themeSelect.is_cheat == 1 && !isSchoolStudent) || (clockTotal + selfcount) == 0}}">
+        <block wx:if="{{themeSelect.is_cheat == 0 || (themeSelect.is_cheat == 1 && isClock) || (themeSelect.is_cheat == 1 && isSchoolStudent) }}">
             <view class="clock-list" wx:if="{{!emptyPage}}">
                 <block wx:for="{{clockList}}" wx:key="bigindex" wx:for-index="bigindex" wx:for-item="bigitem">
                     <view class="clock-item" wx:key="index" wx:for="{{bigitem}}">

src/pages/themeindex/index.wxss

@@ -96,7 +96,6 @@ page {
       transform: translateY(-50%);
   } */
 .instro-box .media-box {
-  margin-top: -12rpx;
 }
 /* 头部banner+介绍 end*/
 

src/pages/themeindex/landpage.js

@@ -251,32 +251,27 @@ Page({
     let myBaseinfo = this.data.myBaseinfo;
     let shareObj = {};
     let initShareObj = {
-      title: `我正在参加【${this.data.themeSelect.title}】的打卡`,
-      path: `/src/pages/themeindex/landpage?tid=${
-        this.data.tid
-      }&sid=${this.data.sid}&consumerId=${(visitor && visitor.id) || 0}&w=${
+      title: `我正在参加打卡【${this.data.themeSelect.title}】`,
+      path: `/src/pages/themeindex/landpage?tid=${this.data.tid}&sid=${this.data.sid}&consumerId=${(visitor && visitor.id) || 0}&w=${
         app.globalData.currentSchoolStudentId
       }`
     };
-    // if (from == "menu") {
     shareObj = initShareObj;
     app.setSharerLog({
       source_type_model: 5,
-      source_path: "src/pages/beforeinvitation/index",
+      source_path: "src/pages/themeindex/landpage",
       source_id: this.data.tid,
-      source_type_model: 5,
       param: JSON.stringify({
-        query: `tid=${this.data.tid}&consumerId=${(visitor && visitor.id) ||
+        query: `tid=${this.data.tid}&sid=${this.data.tid}&consumerId=${(visitor && visitor.id) ||
           0}&w=${app.globalData.currentSchoolStudentId}`
       })
     });
-    // }
     console.log(shareObj);
 
     return {
       title: shareObj.title,
       imageUrl: imagify(
-        this.data.themeSelect.banner ||
+        this.data.themeSelect.land_content.cover ||
           "https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/sharemoretheme/newunlockbg.png"
       ),
       path: shareObj.path

src/pages/themeindex/landpage.wxss

@@ -98,7 +98,6 @@ page {
     transform: translateY(-50%);
 } */
 .instro-bx .media-box {
-  margin-top: -12rpx;
 }
 /* 头部banner+介绍 end*/
 

ucenter/index.wxml

@@ -120,25 +120,41 @@
             <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 class="menu-item">
+            <loginbtn loginCode="{{loginCode}}"/>
+            <view class="menu-item-inner" bindtap="loginToManager" wx:if="{{ userInfo.mobile }}">
+                <image class="menuicon" src="{{imageRoot}}2c/ucenter2/icon_tologin.png?{{imageVersion}}"></image>
+                <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="desc">老师/校长在这里登录</text>
+            </button>
         </view>
 
-        <view class="menu-item" bindtap="loginToManager" wx:if="{{ storageUser && storageUser.token }}">
+
+        <!-- <view class="menu-item" bindtap="loginToManager" wx:if="{{ storageUser && storageUser.token }}">
             <loginbtn loginCode="{{loginCode}}"/>
             <image class="menuicon" src="{{imageRoot}}2c/ucenter2/icon_tologin.png?{{imageVersion}}"></image>
             <text class="title">新登录</text>
             <text class="desc"></text>
         </view>
-        <button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" class="menu-item" wx:else>
-            <!-- <loginbtn loginCode="{{loginCode}}"/> -->
+        <button class="menu-item" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" wx:else>
+            <loginbtn loginCode="{{loginCode}}"/>
             <image class="menuicon" src="{{imageRoot}}2c/ucenter2/icon_tologin.png?{{imageVersion}}"></image>
             <text class="title">新登录</text>
             <text class="desc"></text>
-        </button>
+        </button> -->
         <view class="menu-item" bindtap="loginToManagerWaitDel">
             <loginbtn loginCode="{{loginCode}}"/>
             <image class="menuicon" src="{{imageRoot}}2c/ucenter2/icon_tologin.png?{{imageVersion}}"></image>

ucenter/index.wxss

@@ -363,4 +363,13 @@ page{
     font-weight: bold;
     border-radius: 20rpx;
     margin: 14rpx 0;
+}
+.menu-item-inner{
+    width:100%;
+    display:flex;
+    align-items:center;
+    flex-direction:column;
+    position:relative;
+    margin:0;
+    background:#fff;
 }
\ No newline at end of file