@xtdev/xt-miniprogram-ui 1.2.84 → 1.2.86
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -230,6 +230,10 @@ Component({
|
|
|
230
230
|
console.log('onStartTakePhoto', e);
|
|
231
231
|
const _this = this;
|
|
232
232
|
const { customUpload, uploadApi, max, sourceType, fileList, fileType, tempFileList, version } = this.properties;
|
|
233
|
+
if (customUpload) {
|
|
234
|
+
_this.triggerEvent('upload', {});
|
|
235
|
+
return;
|
|
236
|
+
}
|
|
233
237
|
if (version === 'v2') {
|
|
234
238
|
_this.properties.getWatermarkData().then(watermarkData => {
|
|
235
239
|
_this.setData({
|
|
@@ -239,10 +243,6 @@ Component({
|
|
|
239
243
|
})
|
|
240
244
|
return false;
|
|
241
245
|
}
|
|
242
|
-
if (customUpload) {
|
|
243
|
-
_this.triggerEvent('upload', {});
|
|
244
|
-
return;
|
|
245
|
-
}
|
|
246
246
|
if (!uploadApi || !uploadApi.url) {
|
|
247
247
|
wx.showToast({
|
|
248
248
|
title: '请传入上传接口',
|
|
@@ -283,7 +283,6 @@ Component({
|
|
|
283
283
|
// 使用短边作为参考，确保横屏和竖屏时水印大小一致
|
|
284
284
|
const shortSide = Math.min(width, height);
|
|
285
285
|
const scale = shortSide / 750; // 以750rpx为基准计算缩放比
|
|
286
|
-
const isLandscape = width > height; // 是否横屏
|
|
287
286
|
|
|
288
287
|
const { watermarkData, currentTime, currentDateTime } = this.data;
|
|
289
288
|
const tagText = watermarkData.tagText || '拍照记录';
|
|
@@ -336,8 +335,7 @@ Component({
|
|
|
336
335
|
}
|
|
337
336
|
|
|
338
337
|
const infoAreaHeight = infoContentHeight;
|
|
339
|
-
|
|
340
|
-
const infoAreaWidth = isLandscape ? shortSide * 0.85 : width * 0.85;
|
|
338
|
+
const infoAreaWidth = width * 0.85;
|
|
341
339
|
const infoY = height - infoAreaHeight - 16 * scale; // 距离底部16rpx
|
|
342
340
|
|
|
343
341
|
// ============ 绘制标签（在info-container上方16rpx） ============
|