@xtdev/xt-miniprogram-ui 1.2.88 → 1.2.90

package/libs/xt-uploader/index.js

@@ -198,6 +198,12 @@ Component({
     onCameraError(e) {
       console.log("onCameraError:", e);
     },
+    onCameraCancel(){
+      this.setData({
+        showCamera: false,
+        watermarkData: {}
+      });
+    },
     /**
      * 重新上传
      * @param {*} e

package/libs/xt-uploader/index.wxml

@@ -52,6 +52,6 @@
   </view>
 </view>
   <!-- 相机页面 -->
-<xt-water-camera wx:if="{{showCamera}}" watermarkType="banquet" watermarkData="{{watermarkData}}" bind:confirm="onPhotoConfirm" bind:error="onCameraError" />
+<xt-water-camera wx:if="{{showCamera}}" watermarkType="banquet" watermarkData="{{watermarkData}}" bind:confirm="onPhotoConfirm" bind:error="onCameraError" bind:cancel="onCameraCancel"/>
 
 

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

@@ -405,9 +405,9 @@ Component({
       ctx.fill();
 
       // 时间文字
-      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.fillStyle = '#6722AB';
+      ctx.fillText(currentHours, tagX + tagWidth + tagPaddingH, tagY + tagHeight / 2 + 3);
+      ctx.fillText(currentMinutes, tagX + tagWidth + tagPaddingH + 70 * scale, tagY + tagHeight / 2 + 3);
 
       ctx.font = `bold ${nameFontSize}px "PingFang SC", sans-serif`;
       ctx.fillText(":", tagX + tagWidth + tagPaddingH + 56 * scale, tagY + tagHeight / 2);
@@ -562,5 +562,9 @@ Component({
         this.clockInterval = null;
       }
     },
+
+    cancel(){
+      this.triggerEvent('cancel');
+    },
   },
 });

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

@@ -61,6 +61,7 @@
       </view>
       <image class="shutter-icon" bind:tap="switchCamera" src="https://img.tanjiu.cn/home/Jmiyy8h2SiZ8YaMWrNTzcHS3C5XGap3c.png" mode="aspectFit" binderror="" bindload=""></image>
     </view>
+    <image class="close-btn" bind:tap="cancel" src="https://img.tanjiu.cn/home/YC2FD8x6SB2m6HEfaZCYaFnmn8wzQdEt.png"></image>
   </view>
 
   <!-- 预览区域 -->

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

@@ -52,7 +52,7 @@
 .tag-container .tag-time {
   padding: 12rpx;
   background-color: #fff;
-  color: #333;
+  color: #6722AB;
   font-size: 48rpx;
   font-weight: bold;
   font-family: FengTan-Regular;
@@ -123,6 +123,14 @@
   margin-right: 8rpx;
 }
 
+.close-btn {
+  position: absolute;
+  top: 40rpx;
+  left: 40rpx;
+  width: 48rpx;
+  height: 48rpx;
+}
+
 .shutter-area {
   position: absolute;
   bottom: 40rpx;
@@ -205,8 +213,8 @@
   position: fixed;
   left: -9999rpx;
   top: -9999rpx;
-  width: 1px;
-  height: 1px;
+  width: 100vw;
+  height: 100vh;
 }
 
 .loading-overlay {
@@ -250,4 +258,4 @@
 .shutter-icon{
   width: 48rpx;
   height: 48rpx;
-}
+}

package/package.json

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