Skip to content

W
wechatapp.shangjiadao.com
Commit 608e24db authored by lvtz's avatar lvtz
Browse files
Options

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

parents 3e88aaf9 4c1777b7
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 61 deletions
business/pages/classservice/classdetail.wxml
View file @ 608e24db
......@@ -36,12 +36,13 @@
<view class="title">作业打卡</view>
</view>
</permission-box>
<permission-box>
<!-- <permission-box>
<view class="opt-btnitem" bindtap="bindRankingList" slot="menubtn">
<view class="opt-btnitem" bindtap="bindRankingList" slot="menubtn">
<image class="icon" src="{{imageRoot}}2b/circleindex/icon_rank.png?{{imageVersion}}"></image>
<view class="title">排行榜</view>
</view>
</permission-box>
</permission-box> -->
</view>
<view class="devided-line"></view>
......
business/pages/classservice/classdetail.wxss
View file @ 608e24db
......@@ -71,7 +71,7 @@ page{
.opt-btngroup{
display: flex;
align-items: center;
justify-content: center;
justify-content: space-around;
}
.opt-btngroup .opt-btnitem{
/* flex: 1; */
......
constants/parameter.js
View file @ 608e24db
......@@ -516,5 +516,26 @@ export default [
sharer_source_id: 'sid',
qrcode_source_id: '',
source_type_model: 1
},
{
"root": "src/pages/themeindex/landpage",
"name": "作业打卡营销页",
sharer_source_id: 'tid',
qrcode_source_id: 't',
source_type_model: 1
},
{
"root": "src/pages/calendarthemeindex/landpage",
"name": "日历打卡营销页",
sharer_source_id: 'tid',
qrcode_source_id: 't',
source_type_model: 1
},
{
"root": "src/pages/calendarthemeindex/landpage",
"name": "日历打卡营销页",
sharer_source_id: 'tid',
qrcode_source_id: 't',
source_type_model: 1
}
]
src/pages/calendarthemeindex/index.js
View file @ 608e24db
......@@ -227,8 +227,8 @@ Page({
})
}
app.getCurrentSchoolStudentId({
source_id: this.data.sid,
source_type: 7,
source_id: this.data.tid,
source_type: 8,
}).then(() => {
// this.getmycalendar();
this.themeDetail();
......
src/pages/calendarthemeindex/landpage.js
View file @ 608e24db
......@@ -159,8 +159,8 @@ Page({
}
app
.getCurrentSchoolStudentId({
source_id: this.data.sid,
source_type: 7
source_id: this.data.tid,
source_type: 8
})
.then(() => {
this.userShow();
......
src/pages/morethemeindex/index.js
View file @ 608e24db
......@@ -278,8 +278,8 @@ Page({
})
}
app.getCurrentSchoolStudentId({
source_id: this.data.sid,
source_type: 7,
source_id: this.data.tid,
source_type: 9,
}).then(() => {
this.userShow();
})
......
src/pages/papersquare/index.js
View file @ 608e24db
......@@ -1591,44 +1591,45 @@ Page({
source_type: 10,
}).then(() => {
that.judgeIsSchoolStudent(this.data.sid, () => {
that.judgeWhichBigTab().then((res) => {
const { clockTotal, galleryTotal } = res;
if (clockTotal > 0) {
this.setData({
bigtab: 1
})
} else if (galleryTotal > 0) {
this.setData({
bigtab: 3
})
} else {
this.setData({
bigtab: 1
})
}
this.lastWallGet();//最新一次精选
if(that.data.bigtab==1){
wx.setNavigationBarColor({
frontColor: '#000000',
backgroundColor:'#fff',
})
if(this.data.userInfo){
this.clockListGet('init');
}
}else if(that.data.bigtab==2){
that.wallRankingGet();//上月精选列表
that.clockRankingGet();//坚持之星
that.hotRankingGet();//人气之星
} else if (that.data.bigtab == 3){
this.setData({
galleryList: [],
galleryLoading: false,
})
this.data.galleryPage = 1;
this.data.galleryHasMore = true;
this.getGalleryList('init');
// that.judgeWhichBigTab().then((res) => {
// console.log(res, '222');
// const { clockTotal, galleryTotal } = res;
// if (clockTotal > 0) {
// this.setData({
// bigtab: 1
// })
// } else if (galleryTotal > 0) {
// this.setData({
// bigtab: 3
// })
// } else {
// this.setData({
// bigtab: 1
// })
// }
// this.lastWallGet();//最新一次精选
// });
if(that.data.bigtab==1){
wx.setNavigationBarColor({
frontColor: '#000000',
backgroundColor:'#fff',
})
if(this.data.userInfo){
this.clockListGet('init');
}
});
}else if(that.data.bigtab==2){
that.wallRankingGet();//上月精选列表
that.clockRankingGet();//坚持之星
that.hotRankingGet();//人气之星
} else if (that.data.bigtab == 3){
this.setData({
galleryList: [],
galleryLoading: false,
})
this.data.galleryPage = 1;
this.data.galleryHasMore = true;
// this.getGalleryList('init');
}
});
})
},
......@@ -1898,7 +1899,7 @@ Page({
})
this.data.galleryPage = 1;
this.data.galleryHasMore = true;
this.getGalleryList('down');
// this.getGalleryList('down');
}
},
......@@ -1909,7 +1910,7 @@ Page({
if (this.data.bigtab == 1) {
this.clockListGet('up');
} else if (this.data.bigtab == 3) {
this.getGalleryList('up');
// this.getGalleryList('up');
}
},
......@@ -2630,7 +2631,7 @@ audioStorage[value].isWaiting = true;
frontColor: '#000000',
backgroundColor:'#fff',
})
this.getGalleryList('init');
// this.getGalleryList('init');
}
},
clockTapEvent(e) {
......
src/pages/papersquare/index.wxml
View file @ 608e24db
......@@ -8,7 +8,7 @@
<view class="title">习作广场</view>
<view class="sub-title">学生学习动态都在这里显示</view>
</view>
<view class="little-star-box">
<!-- <view class="little-star-box">
<view class="star-title">
<image class="" src="{{imageRoot}}2c/papersquare/king.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" /> 人气小明星
</view>
......@@ -30,9 +30,7 @@
<view class="btn-box" data-item='{{lastWallData}}' bindtap="goGrowthRecord">成长记录</view>
</view>
<view class="empty-little-star" wx:else>暂无数据</view>
</view>
</view> -->
</view>
<view class="top-fix-wrapper" style="{{fixHonorTab ? 'padding-top:'+statusBarHeight+'px; margin-top:-'+statusBarHeight+'px' : ''}}">
<view class="top-fix">
......@@ -43,9 +41,9 @@
<view class="tab-item {{bigtab == 3? 'active': ''}}" data-type="3" bindtap="bigTapEvent">
课堂
</view>
<view class="tab-item {{bigtab == 2? 'active': ''}}" data-type="2" bindtap="bigTapEvent">
<!-- <view class="tab-item {{bigtab == 2? 'active': ''}}" data-type="2" bindtap="bigTapEvent">
榜单
</view>
</view> -->
</view>
<!-- <view class="tab-box" wx:if="{{bigtab==1}}">
<view class="tab-item {{clocktype == 1? 'active': ''}}" data-type="1" bindtap="clockTapEvent">最新点评</view>
......@@ -358,7 +356,7 @@
</view>
<view class="more-honor-btn" bindtap="goMoreHonor" wx:if="{{(activeHonorTab == 3 && wallList && wallList.length>10) || (activeHonorTab == 1 && daysTop && daysTop.length>10) || (activeHonorTab == 2 && hotRankingList && hotRankingList.length>10)}}">查看更多排名 <image class="" src="{{imageRoot}}2b/organizationalmgt/right.png" mode="aspectFit|aspectFill|widthFix" /></view>
</view>
<view wx:if="{{bigtab == 3}}">
<!-- <view wx:if="{{bigtab == 3}}">
<view>
<block wx:if="{{!galleryEmptyPage}}">
<block wx:for="{{galleryList}}" wx:for-item="bigitem" wx:key="bigindex" wx:for-index="bigindex">
......@@ -405,7 +403,7 @@
</view>
<list-loading loading="{{galleryLoading}}"></list-loading>
</view>
</view>
</view> -->
<view class="modal modal-getprice" wx:if="{{getPriceModalShow}}">
<view class="mask"></view>
<view class="modal-box">
......
src/pages/themeindex/index.js
View file @ 608e24db
......@@ -229,8 +229,8 @@ Page({
})
}
app.getCurrentSchoolStudentId({
source_id: this.data.sid,
source_type: 7,
source_id: this.data.tid,
source_type: 8,
}).then(() => {
this.setData({
activitybarloaded: true,
......
src/pages/themeindex/landpage.js
View file @ 608e24db
......@@ -151,8 +151,8 @@ Page({
}
app
.getCurrentSchoolStudentId({
source_id: this.data.sid,
source_type: 10
source_id: this.data.tid,
source_type: 8
})
.then(() => {
this.setData({
......
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