Commit 06562315 authored by wangxuelai's avatar wangxuelai

''

parent 60221eab
...@@ -1643,7 +1643,7 @@ Page({ ...@@ -1643,7 +1643,7 @@ Page({
}, },
goTaggedpicture(){ goTaggedpicture(){
const imgString = JSON.stringify(this.data.commentDetail.filterImage.map((item)=>{return item.src})); const imgString = JSON.stringify(this.data.commentDetail.filterImage.map((item)=>{return item.src}));
const imgInfoList = JSON.stringify(this.data.imgInfoList) const imgInfoList = JSON.stringify(this.data.imgInfoList);
wx.navigateTo({ wx.navigateTo({
url: `/business/pages/commenteditor/taggedpicture?sid=${this.data.sid}&imgString=${imgString}&imgInfoList=${imgInfoList}`, url: `/business/pages/commenteditor/taggedpicture?sid=${this.data.sid}&imgString=${imgString}&imgInfoList=${imgInfoList}`,
}) })
...@@ -1654,7 +1654,8 @@ Page({ ...@@ -1654,7 +1654,8 @@ Page({
this.data.imgInfoList = new Array(imgUrls.length); this.data.imgInfoList = new Array(imgUrls.length);
const maxImgHeight = this.data.windowHeight - 180; const maxImgHeight = this.data.windowHeight - 180;
for(let i=0; i<imgUrls.length; i++){ for(let i=0; i<imgUrls.length; i++){
const url = imagify(imgUrls[i], 'image/resize,w_400/format,jpg/quality,q_50'); // const url = imagify(imgUrls[i], 'image/resize,w_800/format,jpg/quality,q_50');
const url = imagify(imgUrls[i]);
wxGetImageInfo({src:url}).then((res)=>{ wxGetImageInfo({src:url}).then((res)=>{
let imageWidth =''; let imageWidth ='';
let imageHeight = ''; let imageHeight = '';
......
...@@ -12,7 +12,6 @@ import { ...@@ -12,7 +12,6 @@ import {
import { import {
bOssAccess, cOssAccess, bOssAccess, cOssAccess,
} from '../../../service/common.js'; } from '../../../service/common.js';
var app = getApp(); var app = getApp();
Page({ Page({
...@@ -69,6 +68,7 @@ Page({ ...@@ -69,6 +68,7 @@ Page({
imgArr: thisImgs, imgArr: thisImgs,
imgInfoList: thisImgInfoList imgInfoList: thisImgInfoList
}) })
console.log(this.data.imgInfoList, 'imgInfoList');
this.data.initImgArr = JSON.parse(JSON.stringify(thisImgs)); this.data.initImgArr = JSON.parse(JSON.stringify(thisImgs));
this.data.initImgInfoList = JSON.parse(JSON.stringify(thisImgInfoList)); this.data.initImgInfoList = JSON.parse(JSON.stringify(thisImgInfoList));
this.getImgInfo(); this.getImgInfo();
...@@ -235,9 +235,11 @@ Page({ ...@@ -235,9 +235,11 @@ Page({
getImgInfo(){ getImgInfo(){
const { imgArr, AcSubIndex, imgInfoList } = this.data; const { imgArr, AcSubIndex, imgInfoList } = this.data;
const that = this; const that = this;
let url = imagify(imgArr[AcSubIndex], 'image/resize,w_400/format,jpg/quality,q_50'); // let url = imagify(imgArr[AcSubIndex], 'image/resize,w_400/format,jpg/quality,q_50');
let url = imagify(imgArr[AcSubIndex]);
const maxImgHeight = this.data.windowHeight - 180; const maxImgHeight = this.data.windowHeight - 180;
// let url = imgArr[AcSubIndex]; // let url = imgArr[AcSubIndex];
console.log(this.data.imgInfoList, 'imgInfoList');
if(imgInfoList[AcSubIndex] && imgInfoList[AcSubIndex].actTemPath) { if(imgInfoList[AcSubIndex] && imgInfoList[AcSubIndex].actTemPath) {
return; return;
} }
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<view class="content-box"> <view class="content-box">
<view class="img-wrapper" style="width: {{imgInfoList[AcSubIndex].imageWidth}}px; height:{{imgInfoList[AcSubIndex].imageHeight}}px"> <view class="img-wrapper" style="width: {{imgInfoList[AcSubIndex].imageWidth}}px; height:{{imgInfoList[AcSubIndex].imageHeight}}px">
<image class="myimg" src="{{myimg}}" wx:if="{{shortCanvas && myimg}}" style="height:{{imgInfoList[AcSubIndex].imageHeight}}px" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" /> <image class="myimg" src="{{myimg}}" wx:if="{{shortCanvas && myimg}}" style="height:{{imgInfoList[AcSubIndex].imageHeight}}px" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
<image class="cur-img" src="{{imgInfoList[AcSubIndex].isDraw ? imgArr[AcSubIndex] : filter.imagify(imgArr[AcSubIndex])}}" style="height:{{imgInfoList[AcSubIndex].imageHeight}}px" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" /> <image class="cur-img" src="{{imgInfoList[AcSubIndex].isDraw ? imgArr[AcSubIndex] : filter.imagify(imgArr[AcSubIndex], 'image/resize,w_750/format,jpg')}}" style="height:{{imgInfoList[AcSubIndex].imageHeight}}px" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
<canvas class="myCanvas {{shortCanvas? 'shortCanvas': ''}}" canvas-id="myCanvas" disable-scroll="true" bindtouchstart="doodleStart" bindtouchend="doodleEnd" bindtouchmove="doodleMove" style="width: {{imgInfoList[AcSubIndex].imageWidth}}px; height:{{imgInfoList[AcSubIndex].imageHeight}}px"></canvas> <canvas class="myCanvas {{shortCanvas? 'shortCanvas': ''}}" canvas-id="myCanvas" disable-scroll="true" bindtouchstart="doodleStart" bindtouchend="doodleEnd" bindtouchmove="doodleMove" style="width: {{imgInfoList[AcSubIndex].imageWidth}}px; height:{{imgInfoList[AcSubIndex].imageHeight}}px"></canvas>
<block wx:if="{{textArr.length>0}}"> <block wx:if="{{textArr.length>0}}">
<view class="text-box" animation="{{animationData}}" bindtouchstart="textMoveStart" bindtouchmove="textMove" bindtouchend="textMoveEnd" wx:for="{{textArr}}" data-index="{{index}}" wx:key="index" style="left: {{item.data.left}}px; top: {{item.data.top}}px"><view class="close" bindtap="deleteText"><image class="" src="{{imageRoot}}2b/comment/icon_cancal.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" /></view>{{item.value}}</view> <view class="text-box" animation="{{animationData}}" bindtouchstart="textMoveStart" bindtouchmove="textMove" bindtouchend="textMoveEnd" wx:for="{{textArr}}" data-index="{{index}}" wx:key="index" style="left: {{item.data.left}}px; top: {{item.data.top}}px"><view class="close" bindtap="deleteText"><image class="" src="{{imageRoot}}2b/comment/icon_cancal.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" /></view>{{item.value}}</view>
...@@ -47,4 +47,6 @@ ...@@ -47,4 +47,6 @@
</view> </view>
</view> </view>
<canvas canvas-id="tempCanvas" disable-scroll="true" style="width:200%; height:{{imgInfoList[AcSubIndex].imageHeight*2}}px; position:absolute;left:-999999px"></canvas> <!-- <canvas canvas-id="tempCanvas" disable-scroll="true" style="width:200%; height:{{imgInfoList[AcSubIndex].imageHeight*2}}px; position:absolute;left:-999999px"></canvas> -->
\ No newline at end of file <canvas canvas-id="tempCanvas" disable-scroll="true" style="width: {{imgInfoList[AcSubIndex].imageWidth * 2}}px; height:{{imgInfoList[AcSubIndex].imageHeight * 2}}px; position:absolute;left:-999999px"></canvas>
<!-- style="width: {{imgInfoList[AcSubIndex].imageWidth}}px; height:{{imgInfoList[AcSubIndex].imageHeight}}px" -->
\ No newline at end of file
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
font-family:PingFang SC; font-family:PingFang SC;
font-weight:500; font-weight:500;
color:rgba(3,202,241,1); color:rgba(3,202,241,1);
padding-left: 24rpx; padding: 12rpx 24rpx;
} }
.header-box .title .text{ .header-box .title .text{
font-size:30rpx; font-size:30rpx;
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
position: absolute; position: absolute;
left: 100rpx; left: 100rpx;
top: 100rpx; top: 100rpx;
z-index: 100; z-index: 104;
line-height: 30rpx; line-height: 30rpx;
/* overflow: auto; */ /* overflow: auto; */
/* padding-top: 18rpx; /* padding-top: 18rpx;
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
position: fixed; position: fixed;
left: 0; left: 0;
top: 0; top: 0;
z-index: 100; z-index: 109;
} }
.input-wrapper .sure-btn{ .input-wrapper .sure-btn{
width:100rpx; width:100rpx;
......
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