Skip to content

W
wechatapp.shangjiadao.com
Commit 14584e25 authored by lvtz's avatar lvtz
Browse files
Options

fix

parent 90f9bfb6
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 29 deletions
src/components/gallerycard/index.wxml
View file @ 14584e25
......@@ -302,7 +302,7 @@
</view>
<view class="comment-content" wx:if="{{type!=1}}">
<view class="commen-comment-box" wx:if="{{clock.comments && clock.comments.total}}">
<view class="response-item" wx:for="{{clock.comments.list}}" wx:for-item="comment" wx:for-index="id" wx:key="{{id}}">
<view class="response-item" wx:for="{{clock.comments.list}}" wx:for-item="comment" wx:for-index="id" wx:key="id">
<text class="nickname" data-type="child" data-comment="{{comment}}" catchtap="goUserGrowthRecord">{{comment.nickname.length > 9 ? filter.slice(comment.nickname, 8) : comment.nickname}}</text>
<view class="teacher-tag" wx:if="{{comment.comment_user_type!=2}}">老师</view>
<text class="maohao" wx:if="{{!comment.comment_passive_user_id}}">:</text>
......
src/pages/growthrecord/index.js
View file @ 14584e25
......@@ -3,8 +3,6 @@ time: 2018-11-07
author: wxl
*/
import {
// clockList,
// grothRecordClockList,
adInfoGet,
getPrize,
circleDetail,
......@@ -265,7 +263,6 @@ Page({
onLoad: function(options) { // Do some initialize when page load.
let that = this;
if (options.scene) {
console.log(options.scene, 'options.scene')
let sceneQuery = newScenQueryGet(options.scene);
if (sceneQuery.type == 1) {
const {s,i, ctd, p} = sceneQuery.queryObj;
......@@ -273,17 +270,16 @@ Page({
}
this.setData({
sid: s || 0,
id: i,
id2: i,
// id: i,
// id2: i,
consumerId: ctd,
advertisementshow: true
})
} else if (sceneQuery.type == 2) {
console.log(sceneQuery.queryObj, 'sceneQuery.queryObj');
this.setData({
sid: sceneQuery.queryObj[3],
id: sceneQuery.queryObj[1],
id2: sceneQuery.queryObj[1],
// id: sceneQuery.queryObj[1],
// id2: sceneQuery.queryObj[1],
consumerId: sceneQuery.queryObj[2],
advertisementshow: true
})
......@@ -292,8 +288,8 @@ Page({
const {sid, id, consumerId} = options;
this.setData({
sid: sid || 0,
id: id || '',
id2: id || '',
// id: id || '',
// id2: id || '',
consumerId,
advertisementshow: true
})
......@@ -339,9 +335,11 @@ Page({
this.userShow('init');
})
});
this.getClasshonors();
// this.getClasshonors();
this.getRandrank();//弹幕
this.getclockRankingList(); //获取个人排名百分比
// this.clockListGet('init');
this.customerStaticGet()
})
},
onReady: function() { // Do something when page ready.
......@@ -480,7 +478,7 @@ Page({
}
},
judgeWhichBigTab () {
let otherParams = (this.data.id && this.data.id!=0)? {class_id: this.data.id}: ''
let otherParams = ''
return Promise.all([
clockList(Object.assign(otherParams,{
page: 1,
......@@ -508,7 +506,7 @@ Page({
})
},
getclockRankingList() {
let otherParams = (this.data.id && this.data.id!=0) ? {class_id: this.data.id } : {school_id: this.data.sid};
let otherParams = {school_id: this.data.sid};
rankrecord(Object.assign(otherParams,{
page: 1,
perPage: 1,
......@@ -715,7 +713,7 @@ Page({
},
//用户勋章
getClasshonors() {
let otherParams = (this.data.id && this.data.id!=0) ? {class_id: this.data.id } : {school_id: this.data.sid}
let otherParams = {school_id: this.data.sid}
honors(Object.assign(otherParams,{
student_id: this.data.consumerId
})).then((res) => {
......@@ -948,11 +946,13 @@ Page({
retract: false
})
},
// 切换班级
circleSelect () {
this.setData({
circleSelecting: !this.data.circleSelecting
})
},
// 选择全部
selectAllRecord (e) {
let selectedCircle = {};
let filteredCircleList = this.data.totleCircleList;
......@@ -987,6 +987,7 @@ Page({
this.getGalleryList('init');
}
},
// 选择班级
circleClick (e) {
let currentTarget = e.currentTarget;
let circle = currentTarget.dataset.circle;
......@@ -1037,7 +1038,8 @@ Page({
}
}).then(() => {
if (this.data.userInfo && type == 'init') {
this.clrcleListGet();
// this.clrcleListGet();
this.clockListGet('init')
}
})
},
......@@ -1157,7 +1159,6 @@ Page({
},
customerStaticGet (ids) {
customerStaticGet({
class_id: ids,
student_id: this.data.consumerId,
school_id: this.data.sid
}).then((res) => {
......@@ -2101,7 +2102,7 @@ Page({
this.setData({
galleryLoading: true
})
let otherParams = (this.data.id && this.data.id!=0)? {class_id: this.data.id}: {};
let otherParams = {};
growthCourseGalleryList({
...otherParams,
page: that.data.galleryPage,
......
src/pages/growthrecord/index.wxml
View file @ 14584e25
<wxs src="./../../../filter/index.wxs" module="filter" />
<view class="container">
<cover-view class="circle-select-wrap {{circleSelecting?'circle-select-wrap2': ''}}" style="{{!chartshow ? 'display: none' : ''}}">
<!-- <cover-view class="circle-select-wrap {{circleSelecting?'circle-select-wrap2': ''}}" style="{{!chartshow ? 'display: none' : ''}}">
<cover-view class="circle-box" style="{{!circleSelecting? 'margin-bottom: 13rpx':''}}">
<cover-view class="select-name-box" wx:if="{{filterType == 1}}">
<cover-view class="title">{{selectedCircle.title}}</cover-view>
......@@ -30,7 +30,7 @@
</cover-view>
</block>
</cover-view>
</cover-view>
</cover-view> -->
<block wx:if="{{userInfo && userInfo.id}}">
<view class="header-box">
<view class="person-info">
......@@ -62,7 +62,7 @@
</view>
<view class="datainfo-wrap">
<view class="medal-box">
<!-- <view class="medal-box">
<view class="medal-left">
<image class="pic-medal" src="{{imageRoot}}2c/growthrecord/icon_medal.png?{{imageVersion}}"></image>
<view class="num">{{static.honor || 0}}勋章</view>
......@@ -70,7 +70,7 @@
<view class="medal-right" >
<view class="medalimg medalimg{{item.honor_id}}" wx:for="{{honorsList}}" wx:key="index"><image class="newmodal" src="{{imageRoot}}{{item.src}}?{{imageVersion}}"></image><text class="num" wx:if="{{item.honor_count>1}}">×{{item.honor_count}}</text></view>
</view>
</view>
</view> -->
<view class="static-box">
<!-- <view class="static-item" wx:if="{{filterType == 1}}"> -->
......@@ -92,13 +92,13 @@
</view>
</view>
</view>
<view class="chart-box" style="{{!chartshow ? 'display: none' : ''}}">
<!-- <view class="chart-box" style="{{!chartshow ? 'display: none' : ''}}">
<view class="chartbox-header">{{filterType == 1 ? '综合能力测评' : ''}}{{filterType == 2 ? '综合评分成长趋势' : ''}}</view>
<view class="chart-box-content" hover-class="none" hover-stop-propagation="false">
<canvas canvas-id="scoretrendcanvas" style="width: {{windowWidth}}px; height: 150px;" hidden="{{filterType == 1}}"></canvas>
<canvas canvas-id="scoreviewcanvas" style="width: {{windowWidth}}px; height: 300px; margin: 0 auto" hidden="{{filterType == 2}}"></canvas>
</view>
</view>
</view> -->
<view class="get-student" wx:if="{{newStudent}}">
<!-- <view class="get-student"> -->
<view class="booking-box" wx:if="{{getStudent}}" bindtap="formBoxShow">
......@@ -181,6 +181,7 @@
bind:expandLikes="expandLikes"
bind:expandContent="expandContent"
type="{{0}}"
sid="{{sid}}"
othertype="{{1}}"
withthemetitle="{{true}}"
headerclick="{{true}}"
......
src/pages/growthrecord/index.wxss
View file @ 14584e25
......@@ -5,7 +5,7 @@
.container {
width: 100%;
overflow-x: hidden;
padding: 96rpx 0 40rpx;
padding-bottom: 40rpx;
}
/* 选择班级 */
.circle-select-wrap{
......
src/pages/papersquare/classreviewshare.wxml
View file @ 14584e25
......@@ -25,7 +25,7 @@
</view>
<view class="scroll-box">
<view class="tab-box">
<view class="tab-item {{item.type == bigType? 'active': ''}}" bindtap="changeBigTab" data-bigtype="{{item.type}}" wx:for="{{bigTab}}" wx:key="">{{item.title}}</view>
<view class="tab-item {{item.type == bigType? 'active': ''}}" bindtap="changeBigTab" data-bigtype="{{item.type}}" wx:for="{{bigTab}}" wx:key="index">{{item.title}}</view>
</view>
<scroll-view
scroll-y="{{false}}"
......@@ -34,7 +34,7 @@
scroll-left = "{{scrollLeft}}"
wx:if="{{bigType==1}}"
>
<view class="cardbox {{bigType==1 && currentIndex == index ? 'selected' : ''}}" data-item="{{item}}" bindtap="selectCard" wx:for="{{tempImgArr1}}" wx:key="">
<view class="cardbox {{bigType==1 && currentIndex == index ? 'selected' : ''}}" data-item="{{item}}" bindtap="selectCard" wx:for="{{tempImgArr1}}" wx:key="index">
<view class="card">
<image class="cardbg" src="{{item.icon_src}}"></image>
</view>
......@@ -48,7 +48,7 @@
scroll-left = "{{scrollLeft}}"
wx:if="{{bigType==2}}"
>
<view class="cardbox {{bigType==2 && currentIndex == index ? 'selected' : ''}}" data-item="{{item}}" data-islong="1" bindtap="" wx:for="{{tempImgArr2}}" wx:key="">
<view class="cardbox {{bigType==2 && currentIndex == index ? 'selected' : ''}}" data-item="{{item}}" data-islong="1" bindtap="" wx:for="{{tempImgArr2}}" wx:key="index">
<view class="card">
<image class="cardbg" src="{{item.icon_src}}"></image>
</view>
......
src/pages/themeindex/landpage.wxml
View file @ 14584e25
......@@ -128,7 +128,7 @@
<view class="tip">邀请你加入</view>
</view>
</view>
<view class="btn btn-home" bindtap="goWebsiteIndex" else>
<view class="btn btn-home" bindtap="goWebsiteIndex" wx:else>
<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