7.14 提交
This commit is contained in:
@@ -118,6 +118,7 @@ Component({
|
||||
canvasWidth: width,
|
||||
background: res.path
|
||||
});
|
||||
that.chooseBi();
|
||||
}
|
||||
})
|
||||
},
|
||||
@@ -166,7 +167,7 @@ Component({
|
||||
})
|
||||
},
|
||||
colorChange(e) {
|
||||
this.tapBtn(e);
|
||||
//this.tapBtn(e);
|
||||
const color = e.currentTarget.dataset.color;
|
||||
this.setData({
|
||||
selectColor: color
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
<!--painting-2.wxml-->
|
||||
<van-overlay show="{{showPaint}}" z-index="99999999" >
|
||||
<view class="upage" style="position:reltive;background-color: #000;height:100vh;" catch:tap="hideBarsHandler" wx:if="{{showPaint}}" >
|
||||
<!-- <view class="ui-navigatorbar myclass colorCalss" >
|
||||
<van-icon name="arrow-left" bindtap="hideTuya"
|
||||
color="#fff"
|
||||
class="ui-navigatorbar-back colorCalss" />
|
||||
<view class="ui-title colorCalss">涂鸦</view>
|
||||
</view> -->
|
||||
|
||||
|
||||
<canvas canvas-id="myCanvas" disable-scroll="true" bindtouchstart="touchStart"
|
||||
bindtouchmove="touchMove" bindtouchend="touchEnd" wx:if="{{hasChoosedImg}}"
|
||||
@@ -15,21 +10,7 @@
|
||||
<image src="{{background}}" mode="" class="imgcover" wx:if="{{hasChoosedImg}}"/>
|
||||
</canvas>
|
||||
<view class="failText" wx:if="{{!hasChoosedImg}}" bindtap="addImg" >没有选择照片,点击重新选择</view>
|
||||
<!-- <view class="bottom">
|
||||
<block wx:for="{{btnInfo}}" wx:key="{{index}}">
|
||||
<view class="list-item" data-type="{{item.type}}" style="background: {{item.background}}" bindtap="tapBtn"></view>
|
||||
</block>
|
||||
</view> -->
|
||||
<!-- <view class="choose-box" wx:if="{{width}}">
|
||||
<view class="color-box" style="background: {{'rgb(' + r + ', ' + g + ', ' + b + ')'}}; height: {{w}}px; border-radius: {{w/2}}px"></view>
|
||||
<slider min="1" max="50" step="1" show-value="true" value="{{w}}" bindchange="changeWidth"/>
|
||||
</view> -->
|
||||
<!-- <view class="choose-box" wx:if="{{color}}">
|
||||
<view class="color-box" style="background: {{'rgb(' + r + ', ' + g + ', ' + b + ')'}}; height: {{w}}px; border-radius: {{w/2}}px"></view>
|
||||
<slider min="0" max="255" step="1" show-value="true" activeColor="red" value="{{r}}" data-color="r" bindchange="changeColor"/>
|
||||
<slider min="0" max="255" step="1" show-value="true" activeColor="green" value="{{g}}" data-color="g" bindchange="changeColor"/>
|
||||
<slider min="0" max="255" step="1" show-value="true" activeColor="blue" value="{{b}}" data-color="b" bindchange="changeColor"/>
|
||||
</view> -->
|
||||
|
||||
<!-- 涂鸦工具区 -->
|
||||
<view style="padding: 30rpx 32rpx 50rpx;position: fixed;bottom:0;width:100%;box-sizing: border-box;" >
|
||||
<view class="space" style="padding-bottom: 20rpx; color: #FFF; font-size: 30rpx; line-height: 56rpx;display: flex;width:100%">
|
||||
@@ -61,15 +42,5 @@
|
||||
<view style="width: 50rpx; text-align: right;">{{selectSize}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="choose-box-flex" wx:if="{{clear}}">
|
||||
<view class="choose-item" bindtap="chooseEraser">
|
||||
<view class="choose-img" style='background: url("http://ov8a2tdri.bkt.clouddn.com/wx-app/icon-5.png") white no-repeat; background-size: 26px 26px;background-position: 2px 2px; border: {{eraser ? "2px solid #888" : "2px solid transparent"}}'></view>
|
||||
<view>橡皮擦</view>
|
||||
</view>
|
||||
<view class="choose-item" bindtap="clearCanvas">
|
||||
<view class="choose-img" style='background: url("http://ov8a2tdri.bkt.clouddn.com/wx-app/icon-4.png") white no-repeat; background-size: 26px 26px;background-position: 2px 2px;'></view>
|
||||
<view>清空</view>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</van-overlay>
|
||||
@@ -46,6 +46,8 @@ page {
|
||||
.upage {
|
||||
position: relative;
|
||||
z-index:999;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
@@ -98,7 +100,10 @@ page {
|
||||
.space {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
text-shadow: 2px 2px 1px #000000;
|
||||
/* text-shadow: 2px 2px 1px #000000; */
|
||||
color: white;
|
||||
text-shadow: -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black, 1px 1px 0 black;
|
||||
|
||||
}
|
||||
.bottom {
|
||||
width: 750rpx;
|
||||
@@ -155,4 +160,11 @@ page {
|
||||
bottom:0;
|
||||
z-index:-1;
|
||||
position: absolute;
|
||||
}
|
||||
.canbox{
|
||||
flex: 1;
|
||||
/* height:400rpx; */
|
||||
width:100%;
|
||||
overflow-y: scroll;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
}
|
||||
Reference in New Issue
Block a user