Commit 2ae8d373 authored by lvtz's avatar lvtz

fix

parent 90b45432
......@@ -1182,12 +1182,14 @@ page{
}
.select-student-dailog .dailog-content{
width: 100%;
height: 80vh;
height: 80%;
position: absolute;
left: 0;
bottom: 0;
background:rgba(255,255,255,1);
border-radius:20rpx 20rpx 0px 0px;
display: flex;
flex-direction: column;
}
.select-student-dailog .dailog-content .search-box{
width:525rpx;
......@@ -1219,8 +1221,10 @@ page{
text-align: center;
}
.select-student-dailog .dailog-content .student-list{
flex: 1;
display: flex;
flex-wrap: wrap;
/* height: calc(80vh - 30px); */
}
.select-student-dailog .dailog-content .student-list .student-item{
display: inline-block;
......
......@@ -511,11 +511,12 @@ Page({
prevImg (e) {
const {dataset} = e.currentTarget;
const current = dataset.src;
const comment = dataset.comment || '';
const images = this.data.reviewDetail.content.img;
const works = this.data.reviewDetail.works;
let _images = images.filter((ele) => ele.type == 'image').map(ele => ele.src);
let _works = works.filter((ele) => ele.type == 'image').map(ele => ele.src);
wxPreviewImage({
urls: _images,
urls: _images.concat(_works),
current: current,
type: 'clockitem'
})
......
......@@ -73,7 +73,7 @@
</view>
<view class="img-box" wx:if="{{(reviewDetail.content.img && reviewDetail.content.img.length>0) || (reviewDetail.works && reviewDetail.works.length>0)}}">
<view class="bigimgbox" wx:for="{{reviewDetail.works}}" wx:for-item="video" wx:key="index" style="{{reviewDetail.content.img.length>0 ? 'margin-bottom: 20rpx' :''}}">
<view class="imgbox" wx:if="{{video.type == 'image'}}" data-src="{{video.src}}" style="{{video.students && video.students.length>0 ? 'border-radius: 8rpx 8rpx 0 0;' :''}}">
<view class="imgbox" wx:if="{{video.type == 'image'}}" data-src="{{video.src}}" bindtap="prevImg" style="{{video.students && video.students.length>0 ? 'border-radius: 8rpx 8rpx 0 0;' :''}}">
<image class="img" src="{{filter.imagify(video.src, 'image/resize,w_640/format,jpg/quality,q_80')}}" mode="widthFix" lazy-load="true" binderror="" bindload="" style="{{video.students && video.students.length>0 ? 'border-radius: 8rpx 8rpx 0 0;' :''}}"></image>
</view>
</view>
......
export default {
imageRoot: 'https://cdn.img.shangjiadao.cn/qingxiao/daka/images/',
// host: 'https://qxapi.qingxiao.online/daka',
// host2: 'https://wx.m.shangjiadao.cn',
host: 'https://qxapi.qingxiao.online/daka',
host2: 'https://wx.m.shangjiadao.cn',
storageVersion: '4.0',
imageVersion: '20191104',
host: 'https://clock.wp53.cn',
host2: 'https://test.wp53.cn',
// host: 'https://clock.wp53.cn',
// host2: 'https://test.wp53.cn',
appId: 'wxc1246ea029394785',
miniProgram: {
clock: 'wxdeee20e52a1fd7ee'
......
......@@ -52,7 +52,7 @@ Page({
selectCardLong: false,
imgSrc: '',
sharePage: 'src/pages/papersquare/classsharereview', // TODO 换路径 src/pages/papersquare/classsharereview 事例src/pages/clockdetail/newindex
sharePage: 'src/pages/papersquare/reviewdetail', // TODO 换路径 src/pages/papersquare/classsharereview 事例src/pages/clockdetail/newindex
},
onLoad: function (options) {
const {sid,rid,type,id} = options;
......@@ -85,6 +85,7 @@ Page({
},
initPost(scene, page) {
console.log(scene, 'scene');
// wx.showLoading({
// title: '长图生成中...'
// })
......
......@@ -5,7 +5,8 @@ import {
getRandomFilename,
audioorigin,
matchBlacklist,
LocalStorage
LocalStorage,
scenQueryGet
} from '../../../utilities/index.js';
import {
classroomdetailGet,
......@@ -77,6 +78,7 @@ Page({
if (options.scene) {
let sceneQuery = scenQueryGet(options.scene);
const {s,c, r, t} = sceneQuery;
console.log(sceneQuery)
this.setData({
sid: s,
id: c,
......@@ -548,7 +550,7 @@ Page({
generatelongimg(){
const {sid,id,rid,type} = this.data;
wx.navigateTo({
url: `/src/pages/papersquare/classreviewshare?sid=${sid}&cid=${id}&rid=${rid}&type=${type}`
url: `/src/pages/papersquare/classreviewshare?sid=${sid}&id=${id}&rid=${rid}&type=${type}`
})
}
})
\ No newline at end of file
......@@ -63,7 +63,7 @@
</view>
<view class="img-box" wx:if="{{(reviewDetail.content.img && reviewDetail.content.img.length>0) || (reviewDetail.works && reviewDetail.works.length>0)}}">
<view class="bigimgbox" wx:for="{{reviewDetail.works}}" wx:for-item="video" wx:key="index" style="{{reviewDetail.content.img.length>0 ? 'margin-bottom: 20rpx' :''}}">
<view class="imgbox" wx:if="{{video.type == 'image'}}" data-src="{{video.src}}" style="{{video.students && video.students.length>0 ? 'border-radius: 8rpx 8rpx 0 0;' :''}}">
<view class="imgbox" wx:if="{{video.type == 'image'}}" data-src="{{video.src}}" bindtap="prevImg" style="{{video.students && video.students.length>0 ? 'border-radius: 8rpx 8rpx 0 0;' :''}}">
<image class="img" src="{{filter.imagify(video.src, 'image/resize,w_640/format,jpg/quality,q_80')}}" mode="widthFix" lazy-load="true" binderror="" bindload="" style="{{video.students && video.students.length>0 ? 'border-radius: 8rpx 8rpx 0 0;' :''}}"></image>
</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