Commit bf14aac9 authored by lvtz's avatar lvtz

fix

parent 93f5ab2c
{
"pages": [
"ucenter/index",
"business/pages/webview/index",
"business/pages/helpcenter/feedbacksubmit",
"business/pages/helpcenter/myfeedback",
"business/pages/helpcenter/index",
"business/pages/helpcenter/detail"
"business/pages/webview/index"
],
"subpackages": [
{
"root": "business/pages/helpcenter",
"name": "businesshelpcenter",
"pages": [
"feedbacksubmit",
"myfeedback",
"index",
"detail"
]
},
{
"root": "business/pages/loginregistermgt",
"name": "businessloginregistermgt",
......
......@@ -129,8 +129,10 @@ Component({
this.setData({
visitor: LocalStorage.getItem('visitor'),
})
// const customerId = LocalStorage.getItem('visitor') && LocalStorage.getItem('visitor').studentId;
const customerId = app.globalData.currentSchoolStudentId;
const customerId = LocalStorage.getItem('visitor') && LocalStorage.getItem('visitor').studentId;
// const customerId = app.globalData.currentSchoolStudentId;
this.setData({
customerId,
activtySchoolInfo: {
......
......@@ -503,8 +503,12 @@ Page({
if (data) {
this.data.myBaseinfo = data.student;
this.setData({
isSchoolStudent: !data.is_visitor,
isSchoolStudent: !data.is_visitor
})
this.judgeIsClock(this.data.tid);
this.clockListGet('init');
this.selfClockGet();
console.log(this.data.myBaseinfo,'我的信息')
} else {
this.setData({
isSchoolStudent: false,
......@@ -517,8 +521,6 @@ Page({
userShow() {
const visitor = LocalStorage.getItem('visitor');
this.themeDetail();
this.clockListGet('init');
this.selfClockGet();
return
studentidentity({
class_id: this.data.id,
......@@ -597,7 +599,6 @@ Page({
isexpand: !this.data.isexpand
})
},
onTabItemTap(item) {},
getCircleDetail(id) {
circleDetail({
class_id: id
......@@ -685,11 +686,13 @@ Page({
return false
}
this.queryActivtySchoolInfo(data.school_id);
this.judgeIsClock(this.data.tid);
this.schoolInfoGet(data.school_id)
this.websitehomeGet(data.school_id)
this.judgeIsSchoolStudent(data.school_id)
// this.judgeIsClock(this.data.tid);
// this.adInfoGet()
this.getCircleDetail(data.class_id);
// this.getCircleDetail(data.class_id);
data.content = JSON.parse(data.content);
const nowTime = new Date(res.datetime.replace(/-/g, '/')).getTime();
const startTime = new Date(data.homework_set.publish_time.replace(/-/g, '/')).getTime();
......@@ -761,8 +764,8 @@ Page({
const visitor = LocalStorage.getItem('visitor');
judgeIsClock({
subject_id: tid,
student_id: this.data.studentId,
now_student_id: this.data.studentId,
student_id: this.data.myBaseinfo.id,
now_student_id: this.data.myBaseinfo.id,
}).then((res) => {
const {
code,
......@@ -877,9 +880,9 @@ Page({
page: 1,
perPage: 1,
subject_id: this.data.tid,
now_student_id: this.data.studentId,
now_student_id: this.data.myBaseinfo.id,
// exclude_consumer_id: visitor.id,
student_id: this.data.studentId,
student_id: this.data.myBaseinfo.id,
}).then((res) => {
const {
code,
......@@ -907,7 +910,6 @@ Page({
that.setData({
selfClockDetail: clockDetail,
})
console.log(this.data.selfClockDetail,'自己打卡')
})
this.newCommentIndex(clockDetail.id, function (likeRes) {
if (likeRes.data.list[clockDetail.id]) {
......@@ -965,9 +967,9 @@ Page({
perPage: this.data.clockPerPage,
subject_id: this.data.tid,
// school_id: 39,
exclude_student_id: this.data.studentId,
exclude_student_id: this.data.myBaseinfo.id,
sort_type:2,
now_student_id: this.data.studentId,
now_student_id: this.data.myBaseinfo.id,
// exclude_self: true
}).then((res) => {
const {
......@@ -1551,8 +1553,7 @@ Page({
perPage: 1,
school_id: this.data.themeSelect.school_id,
type: 1,
student_id: this.data.studentId,
class_id: this.data.themeSelect.class_id
student_id: this.data.myBaseinfo.id
})
}).then((res) => {
const {
......
......@@ -76,7 +76,6 @@ Page({
qrcodeGenerating: false,
audioStorage: {},
concatDiaShow: false,
selfcount: 0,
currentVoice: "", // 当前播放的录音
voiceInterval: null,
clockGetting: false,
......@@ -86,16 +85,6 @@ Page({
prizeGetting: false,
userguide: false,
userguideb: false,
position: {
shareBtn: {
top: 0,
left: 0
},
clockBtn: {
top: 0,
left: 0
}
},
guideBStep: 1,
backTopValue: false, //返回顶部
attentionAnim: {}, // 创建动画,
......@@ -142,8 +131,6 @@ Page({
isSchoolStudent: false,
myBaseinfo: "",
debouncetimeout: null,
countDownPositionTop: 0,
countdownShow: true,
needREfresh: false,
bigindex: undefined,
studentId: "",
......@@ -193,6 +180,7 @@ Page({
advertisementshow: true
});
}
console.log(this.data.pageScene,'pageScene')
app
.getCurrentSchoolStudentId({
source_id: this.data.id,
......@@ -546,11 +534,6 @@ Page({
this.setData({
isClock: false
});
// this.positionGet('countdown', (rect) => {
// this.setData({
// countDownPositionTop: rect.top + 30,
// })
// })
} else {
data.imgVideo_parse = JSON.parse(data.video);
data.img_parse = [];
......
......@@ -66,7 +66,7 @@
<view class="section recomend-clockbox">
<view class="title">精选打卡预览({{clockTotal}}篇打卡)</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) || clockTotal == 0}}">
<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}}">
......@@ -116,15 +116,15 @@
<view class="footer-box">
<view class="footer-innerbox" >
<!-- 来源于分享 就显示邀请 否则回到微官网 -->
<view class="btn btn-inviteinfo" wx:if="{{true}}">
<view class="btn btn-inviteinfo" wx:if="{{pageScene}}">
<image class="avatar" src="https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/sharemoretheme/newunlockbg.png"></image>
<view class="info">
<view class="nickname">***</view>
<view class="tip">邀请你加入</view>
</view>
</view>
<view class="btn btn-home" bindtap="goWebsiteIndex" wx:if="{{false}}">
<image class="icon-home" src="{{imageRoot}}common/icon_home.png?{{imageVersion}}"></image>
<view class="btn btn-home" bindtap="goWebsiteIndex" wx:if="{{!pageScene}}">
<image class="icon-home" src="{{localImageRoot}}common/icon_home.png?{{imageVersion}}"></image>
<view class="tip">学校首页</view>
</view>
<!-- 没有手机号 需要授权 但是如果加入类型为密码加入 则在输入密码才授权-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment