fix

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.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/clockdetail/newindex.js

@@ -731,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:

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/themeindex/index.js

@@ -441,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

@@ -271,7 +271,7 @@ Page({
     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

ucenter/index.js

@@ -23,7 +23,8 @@ import {
   commonwaitjobGet
 } from '../service/business/common.js';
 import {
-  bTokenExchange
+  bTokenExchange,
+  authLogin
 } from '../service/common.js'
 import {
   getActivities,
@@ -105,6 +106,7 @@ Page({
       this.setData({
         loginCode: res.code 
       })
+      console.log(res,this.data.loginCode,'水水飞洒')
     })
     // app.getCurrentSchoolStudentId({
     //   source_id: this.data.sid,
@@ -302,7 +304,8 @@ Page({
     this.log('loginToManager')
     const visitor = LocalStorage.getItem('visitor') || {};
     let user = LocalStorage.getItem('user');
-    console.log(user,'user')
+    // console.log(user,'user');
+
     // if(user && user.token){
     //   wx.navigateTo({
     //     url: `/business/pages/exchangebusiness/index?from=1`
@@ -310,13 +313,16 @@ Page({
     //   return 
     // }
     const { encryptedData, iv } = e.detail;
+    console.log(that.data.loginCode,iv,encryptedData,)
+
     if (e.detail.errMsg == 'getPhoneNumber:fail user deny') { //用户点击拒绝
       wx.showToast({
         title: '获取手机号失败',
         icon: 'none'
       })
     } else { //允许授权执行跳转
-      bTokenExchange({
+      console.log(22232322)
+      authLogin({
         type: 5,
         mobile_code: that.data.loginCode,
         mobile_iv: iv,

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="{{ storageUser && storageUser.token }}">
+                <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