Commit 157d8981 authored by wangxuelai's avatar wangxuelai

'ss'

parent 136574b7
......@@ -919,5 +919,11 @@
"networkTimeout": {
"uploadFile": 600000
},
"plugins": {
"contactPlugin": {
"version": "1.3.0",
"provider": "wx104a1a20c3f81ec2"
}
},
"sitemapLocation": "sitemap.json"
}
\ No newline at end of file
......@@ -327,7 +327,7 @@
<image class="media-type-icon-img media-type-icon-picture" src="{{imageRoot}}2b/comment/biaoji.png?{{imageVersion}}" ></image>
</view>
<view class="media-type-name">
标记
添加标记
</view>
</view>
</view>
......
......@@ -66,14 +66,16 @@ Page({
const thisImgs = imgString ? JSON.parse(imgString) : [];
const thisImgInfoList = imgInfoList ? JSON.parse(imgInfoList) : new Array(thisImgs.length);
thisImgInfoList.forEach((ele) => {
ele.copyactTemPath = ele.actTemPath;
if (ele && ele.actTemPath) {
ele.copyactTemPath = ele.actTemPath;
}
})
this.setData({
sid,
imgArr: thisImgs,
imgInfoList: thisImgInfoList,
paintBoxWidth: this.data.windowWidth,
paintBoxHeight: this.data.windowHeight - 180,
paintBoxHeight: this.data.windowHeight - 140,
})
this.data.initImgArr = JSON.parse(JSON.stringify(thisImgs));
this.data.initImgInfoList = JSON.parse(JSON.stringify(thisImgInfoList));
......@@ -252,8 +254,8 @@ Page({
[`imgInfoList[${AcSubIndex}].height`]: imgInfoList[AcSubIndex].height,
})
} else {
imgInfoList[AcSubIndex].width = this.data.paintBoxWidth;
imgInfoList[AcSubIndex].height = imgInfoList[AcSubIndex].width / currentImgRate;
imgInfoList[AcSubIndex].height = this.data.paintBoxHeight;
imgInfoList[AcSubIndex].width = imgInfoList[AcSubIndex].height * currentImgRate;
this.setData({
[`imgInfoList[${AcSubIndex}].width`]: imgInfoList[AcSubIndex].width,
[`imgInfoList[${AcSubIndex}].height`]: imgInfoList[AcSubIndex].height,
......
export default {
imageRoot: 'https://cdn.img.shangjiadao.cn/qingxiao/dakav2/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: '5.0',
imageVersion: '20200420',
// 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'
......
......@@ -714,5 +714,11 @@ Page({
})
});
},
true() {}
true() {},
startmessage(e) {
console.log(e, 'eeee');
},
completemessage(e) {
console.log(e, 'e');
}
});
......@@ -6,6 +6,7 @@
"activity-bar":"../../components/activitybar",
"loginbtn":"../../components/loginbtn",
"guidecollection": "../../components/guidecollection",
"sjdbottombar":"../../components/sjdbottombar"
"sjdbottombar":"../../components/sjdbottombar",
"cell": "plugin://contactPlugin/cell"
}
}
\ No newline at end of file
......@@ -134,7 +134,7 @@
<text class="desc"></text>
</button>
</view>
<!-- <cell bind:startmessage="startmessage" styleType="3" bind:completemessage="completemessage" button-text="sdadadsa" plugid='81204713f9e5b3f10c110bf430b06c84'/> -->
<!-- <view bindtap="loginToManagerWaitDel">创建新校区</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