@xtdev/xt-miniprogram-ui 1.2.85 → 1.2.87

package/libs/xt-uploader/index.js

@@ -230,6 +230,10 @@ Component({
         console.log('onStartTakePhoto', e);
         const _this = this;
         const { customUpload, uploadApi, max, sourceType, fileList, fileType, tempFileList, version } = this.properties;
+        if (customUpload) {
+          _this.triggerEvent('upload', {});
+          return;
+        }
         if (version === 'v2') {
           _this.properties.getWatermarkData().then(watermarkData => {
             _this.setData({
@@ -239,10 +243,6 @@ Component({
           })
           return  false;
         }
-        if (customUpload) {
-          _this.triggerEvent('upload', {});
-          return;
-        }
         if (!uploadApi || !uploadApi.url) {
           wx.showToast({
             title: '请传入上传接口',

package/libs/xt-uploader/index.wxss

@@ -19,6 +19,7 @@
 .file_box {
   display: flex;
   flex-wrap: wrap;
+  gap: 12rpx 0;
 }
 
 .file_item {

package/libs/xt-water-camera/index.js

@@ -33,7 +33,9 @@ Component({
   },
 
   data: {
-    currentTime: '', // 当前时间 HH:mm
+    currentTime: "", // 当前时间
+    currentHours: '', // 当前时间 HH
+    currentMinutes: '', // 当前时间 mm
     currentDateTime: '', // 完整日期时间
     previewImage: '', // 预览图片路径
     isLoading: false,
@@ -43,6 +45,7 @@ Component({
 
   lifetimes: {
     attached() {
+      this.initFont();
       this.initComponent();
     },
     detached() {
@@ -51,6 +54,18 @@ Component({
   },
 
   methods: {
+    initFont() {
+      wx.loadFontFace({
+        family: 'FengTan-Regular', // 注意：这里的名称要和下面使用时完全一致
+        source: 'url("https://img.tanjiu.cn/home/C706753403526887.ttf")',
+        success: () => {
+          console.log('字体加载成功');
+        },
+        fail: (err) => {
+          console.error('字体加载失败', err);
+        }
+      });
+    },
     /**
      * 初始化组件
      */
@@ -89,6 +104,8 @@ Component({
 
         this.setData({
           currentTime: `${hours}:${minutes}`,
+          currentHours: hours,
+          currentMinutes: minutes,
           currentDateTime: `${year}年${month}月${day}日${hours}:${minutes}`,
         });
       };
@@ -284,19 +301,19 @@ Component({
       const shortSide = Math.min(width, height);
       const scale = shortSide / 750; // 以750rpx为基准计算缩放比
 
-      const { watermarkData, currentTime, currentDateTime } = this.data;
+      const { watermarkData, currentHours, currentMinutes, currentDateTime } = this.data;
       const tagText = watermarkData.tagText || '拍照记录';
       const tagColor = '#7b2d8e'; // 固定紫色
 
       // ============ 尺寸参数（与CSS保持一致）============
       const radius = 8 * scale;
       const tagPaddingV = 12 * scale; // 标签垂直padding
-      const tagPaddingH = 24 * scale; // 标签水平padding
+      const tagPaddingH = 12 * scale; // 标签水平padding
       const tagFontSize = 40 * scale; // 标签字体大小
-      const timeFontSize = 40 * scale; // 时间字体大小
+      const timeFontSize = 48 * scale; // 时间字体大小
 
-      const infoPaddingV = 24 * scale; // 信息区垂直padding
-      const infoPaddingH = 20 * scale; // 信息区水平padding
+      const infoPaddingV = 16 * scale; // 信息区垂直padding
+      const infoPaddingH = 16 * scale; // 信息区水平padding
       const infoX = 16 * scale; // 距离左边16rpx
 
       // 文字尺寸
@@ -306,7 +323,7 @@ Component({
 
       // 警告标签尺寸
       const warningFontSize = 20 * scale;
-      const warningPaddingH = 12 * scale;
+      const warningPaddingH = 8 * scale;
       const warningPaddingV = 4 * scale;
       const warningRadius = 4 * scale;
       const warningMarginRight = 8 * scale;
@@ -345,7 +362,7 @@ Component({
       const tagHeight = tagFontSize + tagPaddingV * 2;
 
       const tagX = infoX; // 与info-container左对齐
-      const tagY = infoY - tagHeight - 16 * scale; // 在info-container上方16rpx
+      const tagY = infoY - tagHeight - 12 * scale; // 在info-container上方16rpx
 
       // 标签背景（左上和左下圆角）
       ctx.fillStyle = tagColor;
@@ -358,8 +375,8 @@ Component({
       ctx.fillText(tagText, tagX + tagPaddingH, tagY + tagHeight / 2);
 
       // 时间背景（右上和右下圆角）
-      ctx.font = `bold ${timeFontSize}px "PingFang SC", sans-serif`;
-      const timeTextWidth = ctx.measureText(currentTime).width;
+      ctx.font = `bold ${timeFontSize}px "FengTan-Regular"`;
+      const timeTextWidth = ctx.measureText("00:00").width;
       const timeWidth = timeTextWidth + tagPaddingH * 2;
 
       ctx.fillStyle = '#ffffff';
@@ -367,8 +384,13 @@ Component({
       ctx.fill();
 
       // 时间文字
-      ctx.fillStyle = '#333333';
-      ctx.fillText(currentTime, tagX + tagWidth + tagPaddingH, tagY + tagHeight / 2);
+      ctx.fillStyle = '#000000';
+      ctx.fillText(currentHours, tagX + tagWidth + tagPaddingH, tagY + tagHeight / 2 + 2);
+      ctx.fillText(currentMinutes, tagX + tagWidth + tagPaddingH + 70 * scale, tagY + tagHeight / 2 + 2);
+
+      ctx.font = `bold ${nameFontSize}px "PingFang SC", sans-serif`;
+      ctx.fillText(":", tagX + tagWidth + tagPaddingH + 56 * scale, tagY + tagHeight / 2);
+
 
       // ============ 绘制信息区背景 ============
       // 渐变背景（从左到右，90deg）
@@ -393,7 +415,7 @@ Component({
 
       // 业务信息行
       if (watermarkData.businessInfo) {
-        ctx.font = `${businessFontSize}px "PingFang SC", sans-serif`;
+        ctx.font = `bold ${businessFontSize}px "PingFang SC", sans-serif`;
         ctx.fillStyle = '#ffffff';
         ctx.fillText(watermarkData.businessInfo, textX, currentY);
 
@@ -408,7 +430,7 @@ Component({
 
       // 店铺名称
       if (watermarkData.shopName) {
-        ctx.font = `${businessFontSize}px "PingFang SC", sans-serif`;
+        ctx.font = `bold ${businessFontSize}px "PingFang SC", sans-serif`;
         ctx.fillStyle = '#ffffff';
         ctx.fillText(watermarkData.shopName, textX, currentY);
         currentY += businessFontSize + infoRowMargin;
@@ -418,13 +440,13 @@ Component({
       let dateTimeX = textX;
       if (watermarkData.timeWarning) {
         // 绘制时间异常标签
-        ctx.font = `${warningFontSize}px "PingFang SC", sans-serif`;
+        ctx.font = `bold ${warningFontSize}px "PingFang SC", sans-serif`;
         const warningText = '时间异常';
         const warningTextWidth = ctx.measureText(warningText).width;
         const warningTagWidth = warningTextWidth + warningPaddingH * 2;
         const warningTagHeight = warningFontSize + warningPaddingV * 2;
 
-        ctx.fillStyle = '#ff4d4f';
+        ctx.fillStyle = '#DB1C1C';
         this.drawRoundRect(ctx, textX, currentY, warningTagWidth, warningTagHeight, warningRadius);
         ctx.fill();
 
@@ -435,7 +457,7 @@ Component({
 
         dateTimeX = textX + warningTagWidth + warningMarginRight;
       }
-      ctx.font = `${infoFontSize}px "PingFang SC", sans-serif`;
+      ctx.font = `bold ${infoFontSize}px "PingFang SC", sans-serif`;
       ctx.fillStyle = '#ffffff';
       ctx.fillText(currentDateTime, dateTimeX, currentY);
       currentY += infoFontSize + infoRowMargin;
@@ -444,13 +466,13 @@ Component({
       let addressX = textX;
       if (watermarkData.locationWarning) {
         // 绘制位置异常标签
-        ctx.font = `${warningFontSize}px "PingFang SC", sans-serif`;
+        ctx.font = `bold ${warningFontSize}px "PingFang SC", sans-serif`;
         const warningText = '位置异常';
         const warningTextWidth = ctx.measureText(warningText).width;
         const warningTagWidth = warningTextWidth + warningPaddingH * 2;
         const warningTagHeight = warningFontSize + warningPaddingV * 2;
 
-        ctx.fillStyle = '#ff4d4f';
+        ctx.fillStyle = '#DB1C1C';
         this.drawRoundRect(ctx, textX, currentY, warningTagWidth, warningTagHeight, warningRadius);
         ctx.fill();
 
@@ -462,7 +484,7 @@ Component({
         addressX = textX + warningTagWidth + warningMarginRight;
       }
       const address = watermarkData.address;
-      ctx.font = `${infoFontSize}px "PingFang SC", sans-serif`;
+      ctx.font = `bold ${infoFontSize}px "PingFang SC", sans-serif`;
       ctx.fillStyle = '#ffffff';
       ctx.fillText(address, addressX, currentY);
       currentY += infoFontSize + infoRowMargin;

package/libs/xt-water-camera/index.wxss

@@ -41,7 +41,7 @@
 }
 
 .tag-container .tag-label {
-  padding: 12rpx 24rpx;
+  padding: 16rpx 12rpx;
   background-color: #7b2d8e;
   color: #fff;
   font-size: 40rpx;
@@ -50,11 +50,12 @@
 }
 
 .tag-container .tag-time {
-  padding: 12rpx 24rpx;
+  padding: 12rpx;
   background-color: #fff;
   color: #333;
-  font-size: 40rpx;
+  font-size: 48rpx;
   font-weight: bold;
+  font-family: FengTan-Regular;
   border-radius: 0 8rpx 8rpx 0;
 }
 
@@ -109,8 +110,9 @@
 
 .warning-tag {
   display: inline-block;
-  background-color: #ff4d4f;
+  background-color: #DB1C1C;
   color: #fff;
+  font-weight: 800;
   font-size: 20rpx;
   padding: 4rpx 12rpx;
   border-radius: 4rpx;
@@ -199,8 +201,8 @@
   position: fixed;
   left: -9999rpx;
   top: -9999rpx;
-  width: 100vw;
-  height: 100vh;
+  width: 1px;
+  height: 1px;
 }
 
 .loading-overlay {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xtdev/xt-miniprogram-ui",
-  "version": "1.2.85",
+  "version": "1.2.87",
   "description": "",
   "miniprogram": "libs",
   "publishConfig": {