Skip to content

W
wechatapp.shangjiadao.com
Commit c512e40e authored by sujie@126.com's avatar sujie@126.com
Browse files
Options

dd\

parent fdbd0ef7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 471 additions and 137 deletions
components/goTop/index.js
View file @ c512e40e
......@@ -3,6 +3,7 @@ Component({
data: {
imageRoot: app.globalData.imageRoot,
imageVersion: app.globalData.imageVersion,
localImageRoot: '../../images/',
},
properties: {
// show: {
......
components/goTop/index.wxml
View file @ c512e40e
<!--src/components/goTop/index.wxml-->
<view class="goTop-box" bindtap="goTop" >
<image class="gotop-img" src="{{imageRoot}}2c/common/gettop.png?{{imageVersion}}" lazy-load="false" binderror="" bindload=""></image>
<image class="gotop-img" src="{{localImageRoot}}2c/papersquare/upup.png?{{imageVersion}}" lazy-load="false" binderror="" bindload=""></image>
</view>
components/goTop/index.wxss
View file @ c512e40e
/* src/components/goTop/index.wxss */
/* src/components/goTop/index.wxss */
.goTop-box{
width:63rpx;
height:63rpx;
background:rgba(255,255,255,.9);
border:1px solid rgba(209,209,209,1);
border-radius:10rpx;
width:86rpx;
height:86rpx;
background:rgba(255,255,255,1);
box-shadow:0px 0px 24rpx 0px rgba(4,0,0,0.08);
border-radius:50%;
display: flex;
text-align: center;
position: fixed;
right: 45rpx;
bottom:100rpx;
right: 38rpx;
bottom:50%;
justify-content: center;
align-items: center;
z-index: 10;
}
.goTop-box .gotop-img{
display: block;
width: 28rpx;
height: 35rpx;
width:86rpx;
height:86rpx;
}
filter/index.wxs
View file @ c512e40e
......@@ -559,6 +559,29 @@ function numDiffer(){
var result = arguments[0] - arguments[1]
return result.toFixed(1);
}
// 数字 转换
function numberToCn(num){
if(num>999){
var _length = num.length;
var unit = '千'
var flag = parseInt(num / 1000)
if(_length== 4){
unit = '千'
flag = parseInt(num / 1000)
}
if(_length== 5){
unit = '万'
flag = parseInt(num / 10000)
}
if(_length== 6){
unit = '0万'
flag = parseInt(num / 100000)
}
return flag + unit + '余'
}
return num;
}
module.exports = {
formatDate: formatDate,
timeCompare: timeCompare,
......@@ -606,5 +629,6 @@ module.exports = {
Mathceil:Mathceil,
toFix: toFix,
sum: sum,
numDiffer: numDiffer
numDiffer: numDiffer,
numberToCn: numberToCn
}
\ No newline at end of file
src/components/clockitemv2/index.js
View file @ c512e40e
......@@ -85,6 +85,10 @@ Component({
type:Number,
value:1
},
schoolDetail:{
type: Object,
value: {}
}
},
data: {
imageRoot: app.globalData.imageRoot,
......@@ -98,6 +102,7 @@ Component({
name: ''
},
t:'',
schoolDetail:''
},
created () {
},
......@@ -724,5 +729,10 @@ Component({
touchEnd(e) {
this.touchEndTime = e.timeStamp
},
goSchoolIndex(){
wx.navigateTo({
url: `/src/pages/websiteindex/index?sid=${this.data.clock.school_id}`
})
}
},
})
\ No newline at end of file
src/components/clockitemv2/index.wxml
View file @ c512e40e
This diff is collapsed.
src/components/clockitemv2/index.wxss
View file @ c512e40e
......@@ -33,15 +33,17 @@
margin-bottom: 24rpx;
}
.sign-item {
padding: 24rpx 18rpx 0rpx;
padding: 24rpx 0rpx 0 0rpx;
margin: 0 38rpx;
background-color: #fff;
position: relative;
overflow: hidden;
border-bottom: 1px solid rgba(236,236,236,1);
}
.sign-item .sign-user-info {
display: flex;
justify-content: space-between;
margin-bottom: 30rpx;
margin-bottom: 20rpx;
position: relative;
}
.sign-item .sign-user-info.single {
......@@ -80,8 +82,8 @@
}
.sign-item .sign-user-info .sign-user-avator{
display: block;
width: 70rpx;
height: 70rpx;
width: 64rpx;
height: 64rpx;
border-radius: 50%;
margin-right: 22rpx;
}
......@@ -91,10 +93,10 @@
justify-content: center;
}
.sign-item .sign-user-info .sign-user-name-box .sign-user-name {
font-size: 32rpx;
font-size: 30rpx;
font-family:PingFang SC;
font-weight:600;
color:#444;
font-weight:bold;
color:rgba(35,35,35,1);
letter-spacing: 2rpx;
max-width: 400rpx;
word-break: break-all;
......@@ -107,7 +109,7 @@
padding-top: 15rpx;
}
.sign-item .sign-user-info .sign-user-name-box .sign-create-box .sign-create-time {
font-size: 22rpx;
font-size: 20rpx;
line-height: 1;
color: #929292;
}
......@@ -115,9 +117,9 @@
font-size: 24rpx;
}
.sign-item .sign-user-info .sign-user-name-box .sign-create-box .sign-count {
padding-left: 32rpx;
padding: 0 16rpx;
color: #7F7F7F;
font-size: 22rpx;
font-size: 20rpx;
line-height: 1;
}
.sign-item .sign-user-info .stamp-box{
......@@ -144,9 +146,9 @@
z-index: 2;
}
.sign-item-content-text {
color: #000000;
color:rgba(35,35,35,1);
font-size: 28rpx;
line-height: 39rpx;
line-height: 1.2;
letter-spacing: 2rpx;
word-wrap:break-word;
}
......@@ -349,8 +351,8 @@
.mediacontent .mediabox .bigimgbox.optionc{
width: 202rpx;
float: left;
margin-right: 6rpx;
margin-bottom: 6rpx;
margin-right: 8rpx;
margin-bottom: 8rpx;
position: relative;
}
.mediacontent .mediabox .imgbox {
......@@ -361,7 +363,7 @@
display: flex;
align-items: center;
justify-content: space-between;
padding: 30rpx 0;
padding: 8rpx 0 20rpx 0;
position: relative;
z-index: 2;
}
......@@ -370,15 +372,24 @@
color: #737373;
}
.operate-box .opt-box{
width: 100%;
display: flex;
align-items: center;
}
.operate-box .opt-box .btn{
flex: 1;
justify-content: center;
display: flex;
align-items: center;
position: relative;
margin-right: 30rpx;
}
.operate-box .opt-box .fingureup-btn{
justify-content: flex-start;
}
.operate-box .opt-box .share-btn{
justify-content: flex-end;
}
.operate-box .opt-box .btn:last-of-type{
margin-right: 0;
}
......@@ -388,9 +399,17 @@
margin-right: 10rpx;
display: block;
}
.operate-box .opt-box .btn .fingureuplike{
width: 28rpx;
height: 27rpx;
}
.operate-box .opt-box .btn .messageconment{
width: 32rpx;
height: 28rpx;
}
.operate-box .opt-box .btn .icon-share{
width: 44rpx;
height: 44rpx;
height: 34rpx;
}
.operate-box .opt-box .btn .btnname{
color: #737373;
......@@ -399,19 +418,19 @@
line-height: 1;
}
.operate-box .opt-box .btn .btnname.active {
color: #FF6161;
/* color: #FF6161; */
}
.detail-operate-box {
padding: 60rpx 0;
padding: 32rpx 0;
}
.detail-operate-box .opt-box .btn .iconimg{
width: 50rpx;
height: 44rpx;
/* width: 50rpx;
height: 44rpx; */
}
.detail-operate-box .opt-box .btn .icon-share{
width: 56rpx;
height: 56rpx;
/* width: 56rpx;
height: 56rpx; */
}
.detail-operate-box .opt-box .btn .btnname{
font-size: 28rpx;
......@@ -420,13 +439,20 @@
.expand-content {
text-align: left;
padding-bottom: 36rpx;
padding-bottom: 18rpx;
position: relative;
z-index: 2;
}
.expand-content text {
color: #ffd146;
font-size: 28rpx;
font-size:28rpx;
font-family:PingFang;
font-weight:500;
color:rgba(84,119,147,1);
margin-right: 6rpx;
}
.expand-content image{
width: 11rpx;
height: 18rpx;
}
.location-box {
display: flex;
......@@ -459,8 +485,8 @@
width:600rpx;
}
.comment-comments{
background:rgba(252,252,252,1);
padding: 0 18rpx;
/* background:rgba(252,252,252,1); */
/* padding: 0 38rpx; */
}
.comment-content {
overflow: hidden;
......@@ -492,12 +518,13 @@
}
.teacher-opencomment-itembox{
padding: 0 16rpx 0 24rpx;
border-bottom: 1px solid rgba(0,0,0,0.05);
/* border-bottom: 1px solid rgba(0,0,0,0.05); */
margin-bottom: 10rpx;
}
.teacher-opencomment-itembox.teacher-comment-header-box.fingureupbox {
margin-bottom: 0;
padding-bottom: 10rpx;
/* padding-bottom: 10rpx; */
padding: 0;
}
.teacher-opencomment-itembox:last-of-type{
border-bottom: none
......@@ -901,7 +928,7 @@
} */
.theme-name-box{
/* width: 100%; */
display: inline-block;
/* display: inline-block; */
/* align-items: flex-start;
background: #FAFAFA;
border: 1px solid rgba(230,230,230,1);
......@@ -911,8 +938,11 @@
padding: 10rpx 21rpx;
z-index: 5;
position: relative; */
margin-bottom: 20rpx;
}
.theme-name-box .theme-name-box-inner{
width: 674rpx;
margin: 0 auto;
display: flex;
align-items: flex-start;
background: #FAFAFA;
......@@ -931,6 +961,20 @@
font-size: 24rpx;
color:rgba(102,102,102,1);
}
.theme-name-box .theme-name-box-inner .goclock-btn{
width:107rpx;
height:44rpx;
background:rgba(255,209,70,1);
border-radius:21rpx;
font-size:20rpx;
font-family:PingFang;
font-weight:500;
color:rgba(255,255,255,1);
display: flex;
align-items: center;
justify-content: center;
margin-left: 80rpx;
}
.theme-name-box .dotdot-img{
width: 23rpx;
min-width: 23rpx;
......@@ -953,6 +997,11 @@
}
.theme-name-box .content{
padding-right: 15rpx;
width: 360rpx;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
display: block;
}
.famous-teacher .famous-teacher-name{
font-size:28rpx;
......@@ -1006,53 +1055,72 @@
}
.detail-theme-box{
height: auto;
background: rgba(255,255,255,1);
border:1px solid rgba(236,236,236,1);
box-shadow:0px 0px 10rpx 0px rgba(0, 0, 0, 0.06);
border-radius:10rpx;
background:rgba(247,247,247,1);
border-radius:8rpx;
}
.detail-theme-box .theme-box{
display: flex;
align-items: center;
justify-content: space-between;
padding: 30rpx 30rpx 25rpx 30rpx;
padding: 28rpx 24rpx;
border-bottom: 1px solid rgba(232,232,230,1);
}
.detail-theme-box .content-box{
.detail-theme-box .theme-box .left{
display: flex;
align-items: center;
}
.detail-theme-box .content-box .title{
font-size: 26rpx;
font-family:PingFang SC;
font-weight:500;
color:rgba(65,65,65,1);
padding-bottom: 16rpx;
line-height: 34rpx;
.detail-theme-box .theme-box .dotdot-img{
width:22rpx;
height:22rpx;
margin-right: 12rpx;
}
.detail-theme-box .content-box .count{
display: flex;
.detail-theme-box .theme-box .name{
font-size:22rpx;
font-family:PingFang SC;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(152,152,152,1);
color:rgba(136,136,136,1);
line-height:32rpx;
padding-right: 20rpx;
}
.detail-theme-box .theme-box .content{
font-size:22rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(136,136,136,1);
line-height:32rpx;
width: 120rpx;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
.detail-theme-box .content-box .count .students-num{
padding-right: 90rpx;
.detail-theme-box .theme-box .count1{
font-size:22rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(136,136,136,1);
line-height:32rpx;
padding-right: 20rpx;
}
.detail-theme-box .content-box .count .theme-num{
.detail-theme-box .theme-box .count2{
font-size:22rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(136,136,136,1);
line-height:32rpx;
}
.detail-theme-box .btn-box{
width:144rpx;
height:54rpx;
background:rgba(255,255,255,1);
border:2rpx solid rgba(255,209,70,1);
border-radius:27rpx;
font-size:24rpx;
font-family:PingFang SC;
.detail-theme-box .goclock-btn{
width:107rpx;
height:44rpx;
background:rgba(255,209,70,1);
border-radius:21rpx;
font-size:20rpx;
font-family:PingFang;
font-weight:500;
color:rgba(255,192,0,1);
color:rgba(255,255,255,1);
display: flex;
justify-content: center;
align-items: center;
justify-content: center;
}
.detail-likes-list {
display: flex;
......@@ -1065,8 +1133,8 @@
padding-bottom: 20rpx;
}
.detail-likes-list .fingureupoicon{
width: 27rpx;
height: 25rpx;
width: 28rpx;
height: 28rpx;
margin-right: 20rpx;
}
.detail-likes-list .count {
......
src/pages/clockdetail/index.js
View file @ c512e40e
......@@ -2,7 +2,7 @@ import {
adInfoGet,
getPrize,
newLikeIndex,
newCommentIndex
newCommentIndex,
} from '../../../service/customer/circleindex.js';
import {
clockDetail
......@@ -33,6 +33,9 @@ import {
wxGetImageInfo,
wxPreviewImage
} from '../../../utilities/wxApi.js';
import {
getSchoolDetail
} from '../../../service/customer/schoolindex.js';
import regexp from '../../../constants/regexp.js';
var app = getApp();
......@@ -95,6 +98,7 @@ Page({
canvasImagePath: '',
painting: null,
imageIndex: 0,
schoolDetail:''
},
......@@ -399,6 +403,7 @@ Page({
this.queryActivtySchoolInfo(this.data.sid);
this.adInfoGet()
})
this.schoolInfoGet(data.school_id)
this.newLikeIndex(data.id, function (likeRes) {
if (likeRes.data.list[that.data.clock.id]) {
that.data.clock.likes = likeRes.data.list[that.data.clock.id];
......@@ -1136,4 +1141,18 @@ Page({
url: `/src/pages/websiteindex/index?sid=${this.data.sid}`,
})
},
//基本信息
schoolInfoGet(sid) {
getSchoolDetail(sid).then((res) => {
const {
code,
data
} = res;
if (code == 200) {
this.setData({
schoolDetail: data,
})
}
})
},
})
\ No newline at end of file
src/pages/clockdetail/newindex.js
View file @ c512e40e
......@@ -2,7 +2,8 @@ import {
getPrize,
newLikeIndex,
newCommentIndex,
circleDetail
circleDetail,
fingureUp,
} from '../../../service/customer/circleindex.js';
import {
clockDetail,
......@@ -44,7 +45,10 @@ import {
} from '../../../utilities/wxApi.js';
import {
studentidentity
} from '../../../service/customer/signup.js'
} from '../../../service/customer/signup.js';
import {
getSchoolDetail
} from '../../../service/customer/schoolindex.js';
import regexp from '../../../constants/regexp.js';
var app = getApp();
......@@ -129,6 +133,8 @@ Page({
noUserinfo: false,
isQrcodeIn:false,
hasmore: true,
schoolDetail:'',
backTopValue: false, //返回顶部
},
/**
......@@ -276,15 +282,35 @@ Page({
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onPageScroll: function (e) { // Do something when page scroll
console.log(1111111)
let that = this;
let scrollTop = e.scrollTop;
let backTopValue = scrollTop > 800 ? true : false;
this.debounce(() => {
that.setData({
backTopValue,
})
}, 200)()
},
closeAd() {
this.setData({
adShow: false
})
},
debounce(func, wait) {
const that = this;
return function () {
let context = this;
let args = arguments;
if (that.data.debouncetimeout) clearTimeout(that.data.debouncetimeout);
that.data.debouncetimeout = setTimeout(() => {
func.apply(context, args)
}, wait);
}
},
toGetAd() {
this.setData({
adGetShow: true
......@@ -433,6 +459,7 @@ Page({
}, () => {
this.queryActivtySchoolInfo(this.data.sid);
this.circleDetailGet(data.class_id)
this.schoolInfoGet(data.school_id)
this.randomstudents()
this.oddjobschools()
this.userShow()
......@@ -613,6 +640,66 @@ Page({
clock: this.data.clock
})
},
myfingureUp(){
const type = this.data.clock.had_like == 1 ? 2 : 1;
let clock = this.data.clock;
const customerId = app.globalData.currentSchoolStudentId;
const visitor = LocalStorage.getItem('visitor');
const nickname=visitor && visitor.userInfo && visitor.userInfo.nickName;
const avatar = visitor && visitor.userInfo && visitor.userInfo.avatarUrl;
fingureUp({
clock_record_id: this.data.clock.id,
now_student_id: app.globalData.currentSchoolStudentId,
type // 1 点赞 2 取消点赞
}).then((res) => {
const integral = res.integral || 0;
const {code, data} = res;
if (code == 200) {
if (type == 1) {
clock.had_like = 1;
if (!clock.likes) {
clock.likes = {
list: [{
student_id: customerId,
nickname: nickname,
avatar: avatar
}],
total: 1
}
} else {
if(clock.likes.list.find(ele=>ele.student_id==customerId)){
return false;
}
clock.likes.list.push({
student_id: customerId,
nickname: nickname,
avatar: avatar
});
clock.likes.total++;
}
if (integral > 0) {
this.setData({
scoreFeedBackStatus: {
integral: integral,
show: true,
scoretype: 2,
}
})
this.autoclosefeedback();
}
} else if (type == 2) {
if(clock.likes.list.find(ele=>ele.student_id==customerId)){
clock.had_like = 0;
clock.likes.total--;
clock.likes.list = clock.likes.list.filter(ele => ele.student_id != customerId);
}
}
}
this.setData({
clock: this.data.clock
})
})
},
// 跟打卡列表组件相关联的操作
goClock() {
switch (this.data.clock.subject_type) {
......@@ -1688,4 +1775,18 @@ Page({
}).then(() => {
})
},
//基本信息
schoolInfoGet(sid) {
getSchoolDetail(sid).then((res) => {
const {
code,
data
} = res;
if (code == 200) {
this.setData({
schoolDetail: data,
})
}
})
},
})
\ No newline at end of file
src/pages/clockdetail/newindex.json
View file @ c512e40e
......@@ -12,6 +12,7 @@
"btn-drag":"../../../components/btndrag",
"w-countdown": "../../../dist/w-countdown/index",
"sjd-media-show": "../../../components/sjdmediashow",
"guidecollection": "../../../components/guidecollection"
"guidecollection": "../../../components/guidecollection",
"go-top": "../../../components/goTop"
}
}
\ No newline at end of file
src/pages/clockdetail/newindex.wxml
View file @ c512e40e
......@@ -62,6 +62,7 @@
bind:expandLikes="expandLikes"
bind:expandContent="expandContent"
type="{{1}}"
schoolDetail="{{schoolDetail}}"
withthemetitle="{{true}}"
headerclick="{{true}}"
bind:playvoice="playvoice"
......@@ -119,7 +120,7 @@
</view> -->
<view class="introduce" wx:if="{{clockList.length>0}}" style="{{clockList.length<clockTotal ? 'padding-bottom: 44rpx' : ''}}">
<view class="title">为你推荐更多优秀作品</view>
<view class="title">内容推荐</view>
<!-- <view class="line-16"></view> -->
<view class="content">
<view class="clock-box" wx:for="{{clockList}}"
......@@ -203,11 +204,19 @@
</view>
</view>
</view> -->
<view class="new-footer-box" wx:if="{{isMarketting&&noUserinfo}}">
<!-- <view class="new-footer-box"> -->
<!-- <view class="new-footer-box" wx:if="{{isMarketting&&noUserinfo}}">
<button class="" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" data-index="{{1}}"></button>
<view class="center animation">立即免费领取试听课</view>
<image class="footer-bg" src="" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
</view> -->
<view class="footer-box">
<view class="business-box" bindtap="goWebsiteindex">
<image class="" src="{{localImageRoot}}/2c/papersquare/websitehome.png" mode="aspectFit|aspectFill|widthFix" />机构
</view>
<view class="like-box" bindtap="myfingureUp">
<image class="" src="{{localImageRoot}}/2c/papersquare/{{ clock.had_like == 1 ? 'yellowlike' : 'konglike'}}.png" mode="aspectFit|aspectFill|widthFix" />点赞
</view>
<view class="clock-box" bindtap="goClock">立即打卡</view>
</view>
<view class="" data-editor="commenteditor">
......@@ -222,4 +231,5 @@
initial-time="0" autoplay="false" loop="false" direction="0" bindplay="" bindpause="" bindended=""
bindtimeupdate="" bindwaiting="" binderror="" bindfullscreenchange="screenchange">
</video>
</view>
\ No newline at end of file
</view>
<go-top wx:if="{{backTopValue}}"></go-top>
\ No newline at end of file
src/pages/clockdetail/newindex.wxss
View file @ c512e40e
......@@ -369,13 +369,13 @@
}
.introduce .title{
width:100%;
height:90rpx;
height:98rpx;
background:rgba(247,247,247,1);
font-size:24rpx;
font-size:36rpx;
font-family:PingFang SC;
font-weight:400;
color:rgba(137,137,137,1);
line-height:90rpx;
font-weight:700;
color:rgba(35,35,35,1);
line-height:98rpx;
text-align: center;
}
.introduce .line-16 {
......@@ -646,4 +646,56 @@
font-weight:bold;
color:rgba(255,255,255,1);
line-height:1;
}
.footer-box{
width:100%;
background:rgba(255,255,255,1);
box-shadow:0px -2rpx 8rpx 0px rgba(100,96,84,0.2);
position: fixed;
left: 0;
bottom: 0;
display: flex;
align-items: center;
padding: 30rpx 20rpx;
}
.footer-box .business-box{
font-size:26rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(63,73,83,1);
display: flex;
align-items: center;
margin-right: 60rpx;
}
.footer-box .business-box image{
width: 38rpx;
height: 46rpx;
margin-right: 16rpx;
}
.footer-box .like-box{
font-size:26rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(63,73,83,1);
display: flex;
align-items: center;
}
.footer-box .like-box image{
width: 30rpx;
height: 30rpx;
margin-right: 18rpx;
}
.footer-box .clock-box{
width:358rpx;
height:72rpx;
background:rgba(255,209,70,1);
border-radius:8rpx;
font-size:32rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:700;
color:rgba(35,35,35,1);
line-height:72rpx;
letter-spacing:2rpx;
text-align: center;
margin-left: 70rpx;
}
\ No newline at end of file
src/pages/papersquare/index.js
View file @ c512e40e
......@@ -129,6 +129,7 @@ Page({
galleryLoading: false,
galleryEmptyPage: false,
erpStudentId: 0,
backTopValue: false
},
onLoad: function (options) { // Do some initialize when page load.
let that = this;
......@@ -190,6 +191,7 @@ Page({
bigtab: 1
})
}
this.lastWallGet();//最新一次精选
if(that.data.bigtab==1){
wx.setNavigationBarColor({
frontColor: '#000000',
......@@ -203,7 +205,6 @@ Page({
frontColor: '#000000',
backgroundColor:'#FFD146'
})
that.lastWallGet();//最新一次精选
that.wallRankingGet();//上月精选列表
that.clockRankingGet();//坚持之星
that.hotRankingGet();//人气之星
......@@ -220,6 +221,29 @@ Page({
});
})
},
onPageScroll: function (e) { // Do something when page scroll
let that = this;
let scrollTop = e.scrollTop;
let backTopValue = scrollTop > 800 ? true : false;
this.debounce(() => {
that.setData({
backTopValue,
})
}, 200)()
},
debounce(func, wait) {
const that = this;
return function () {
let context = this;
let args = arguments;
if (that.data.debouncetimeout) clearTimeout(that.data.debouncetimeout);
that.data.debouncetimeout = setTimeout(() => {
func.apply(context, args)
}, wait);
}
},
getGalleryCount() {
return courseGalleryList({
page: this.data.galleryPage,
......@@ -486,9 +510,9 @@ Page({
page: that.data.clockPage,
perPage: that.data.perPage,
school_id: that.data.sid,
type: Number(this.data.clocktype),
type: 2,
hidden_dismissed_class: 1,
// now_consumer_id: visitor && visitor.id,
now_consumer_id: visitor && visitor.id,
now_student_id: this.data.userInfo.id,
}).then((res) => {
const {
......@@ -660,6 +684,8 @@ Page({
case 'insist':
consumer_id = item.student_id;
break;
default:
consumer_id = item.student_id;
}
wx.navigateTo({
url: `/src/pages/growthrecord/index?consumerId=${consumer_id}&sid=${this.data.sid}`,
......@@ -1267,7 +1293,6 @@ Page({
frontColor: '#000000',
backgroundColor:'#FFD146'
})
this.lastWallGet();//最新一次精选
this.wallRankingGet();//上月精选列表
this.clockRankingGet();//坚持之星
this.hotRankingGet();//人气之星
......
src/pages/papersquare/index.wxml
View file @ c512e40e
<wxs src="../../../filter/index.wxs" module="filter" />
<view class="header-card" style="padding-top: {{titleBarHeight}}px;">
<view class="header-title-box">
<view class="title">机构圈</view>
<view class="title">习作广场</view>
<view class="sub-title">学生学习动态都在这里显示</view>
</view>
<view class="little-star-box">
......@@ -11,18 +11,18 @@
<view class="detail-box">
<view class="student-info">
<view class="avatar-box">
<image class="" src="http://pic.qqtn.com/up/2019-11/2019111908374581038.jpg" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
<image class="" src="{{filter.imagify(lastWallData.avatar)}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
</view>
<view class="name-count-box">
<view class="name">仲由</view>
<view class="name">{{lastWallData.nickname}}</view>
<view class="count">
<view class="count1">坚持学习989天</view>
<view class="count2">获赞989个</view>
<view class="count1">坚持学习{{lastWallData.days}}天</view>
<view class="count2">获赞{{lastWallData.like_count}}个</view>
</view>
</view>
</view>
<view class="btn-box">成长记录</view>
<view class="btn-box" data-item='{{lastWallData}}' bindtap="goGrowthRecord">成长记录</view>
</view>
</view>
......@@ -34,13 +34,13 @@
<view class="top-fix">
<view class="header-tab">
<view class="tab-item {{bigtab == 1? 'active': ''}}" data-type="1" bindtap="bigTapEvent">
今日打卡
打卡
</view>
<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>
</view>
<!-- <view class="tab-box" wx:if="{{bigtab==1}}">
......@@ -416,4 +416,5 @@
>
</scoregetfeedback>
<guidecollection/>
</view>
\ No newline at end of file
</view>
<go-top wx:if="{{backTopValue}}"></go-top>
\ No newline at end of file
src/pages/papersquare/index.wxss
View file @ c512e40e
......@@ -129,7 +129,7 @@ page{
background: #fff;
}
.top-fix{
width: 70%;
width: 60%;
/* position: fixed;
top: 0;
z-index: 9; */
......
src/pages/websiteindex/index.js
View file @ c512e40e
......@@ -1253,7 +1253,6 @@ Page({
}, () => {})
},
schoolInfoGet() {
console.log(2222)
getSchoolDetail(this.data.sid).then((res) => {
const {
code,
......
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