Merge branch 'master' of http://192.168.30.2:3000/bonus/bonus-material-app
This commit is contained in:
commit
c0f90cc4ee
|
|
@ -517,7 +517,11 @@ export default {
|
||||||
// 拍照前先进行聚焦
|
// 拍照前先进行聚焦
|
||||||
console.log('拍照前聚焦...');
|
console.log('拍照前聚焦...');
|
||||||
console.log('开始拍照...');
|
console.log('开始拍照...');
|
||||||
CameraPreview.takePicture({width:this.screenWidth, height:this.screenHeight, quality: 50}, async (base64PictureData) => {
|
CameraPreview.takePicture({
|
||||||
|
width: this.screenWidth,
|
||||||
|
height: this.screenHeight,
|
||||||
|
quality: 50
|
||||||
|
}, async (base64PictureData) => {
|
||||||
console.log('拍照返回数据', base64PictureData);
|
console.log('拍照返回数据', base64PictureData);
|
||||||
await this.processImage(base64PictureData);
|
await this.processImage(base64PictureData);
|
||||||
});
|
});
|
||||||
|
|
@ -831,9 +835,18 @@ export default {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
transition: opacity 0.3s;
|
transition: opacity 0.3s;
|
||||||
}
|
}
|
||||||
.custom-toast.top { top: 0; }
|
|
||||||
.custom-toast.bottom { bottom: 0; }
|
.custom-toast.top {
|
||||||
.custom-toast.show { opacity: 1; }
|
top: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.custom-toast.bottom {
|
||||||
|
bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.custom-toast.show {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
.page-container {
|
.page-container {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
@ -888,6 +901,7 @@ export default {
|
||||||
z-index: 3;
|
z-index: 3;
|
||||||
pointer-events: auto;
|
pointer-events: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.control-btn {
|
.control-btn {
|
||||||
width: 100rpx;
|
width: 100rpx;
|
||||||
height: 100rpx;
|
height: 100rpx;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue