stellar-ui-v2 1.40.17 → 1.40.18

package/components/ste-app-share/draw.js

@@ -1,3 +1,15 @@
+async function getImage(src) {
+	const image = await uni.getImageInfo({ src: src });
+	if (Array.isArray(image)) {
+		const [e, img] = image;
+		if (e) throw e;
+		return img;
+	} else if (image.path) {
+		return image;
+	}
+	throw new Error('获取图片失败');
+}
+
 /**
  * @param {UniApp.CanvasContext} ctx
  * @param {{background:string;title:string;message:string;qrcode:string}} poster
@@ -21,7 +33,7 @@ export function drawPoster(ctx, poster, data) {
 		// 绘制宽高一致的图片
 		if (data.image) {
 			try {
-				const image = await uni.getImageInfo({ src: data.image });
+				const image = await getImage(data.image);
 				ctx.drawImage(image.path, 0, 40, width, width);
 			} catch (e) {
 				console.error(e);
@@ -46,7 +58,7 @@ export function drawPoster(ctx, poster, data) {
 			ctx.setFontSize(20);
 			ctx.setFillStyle('#ff0000');
 			ctx.setTextAlign('left');
-			ctx.fillText(`￥${data.price}`, 10, width + 125);
+			ctx.fillText(`￥${data.price}`, 10, width + 130);
 		}
 
 		// 绘制文字
@@ -54,12 +66,12 @@ export function drawPoster(ctx, poster, data) {
 			ctx.setFontSize(12);
 			ctx.setFillStyle('#666666');
 			ctx.setTextAlign('left');
-			ctx.fillText(poster.message, 10, height - 20);
+			ctx.fillText(poster.message, 10, height - 25);
 		}
 		// 绘制qrcode
 		if (poster.qrcode) {
 			try {
-				const qrcode = await uni.getImageInfo({ src: poster.qrcode });
+				const qrcode = await getImage(poster.qrcode);
 				ctx.drawImage(qrcode.path, width - 80, width + 80, 70, 70);
 			} catch (e) {
 				console.error(e);

package/components/ste-app-share/ste-app-share.vue

@@ -25,14 +25,12 @@
 						<image class="footer-icon" src="../../static/shoucang.png" mode="widthFix"></image>
 						<text>微信收藏</text>
 					</view>
+					<view class="footer-item" @click="downloadPoster" v-if="viewPoster">
+						<image class="footer-icon" src="../../static/haibao.png" mode="widthFix"></image>
+						<text>生成海报</text>
+					</view>
 				</view>
 			</scroll-view>
-			<view class="footer-share-list">
-				<view class="footer-item" @click="downloadPoster" v-if="viewPoster">
-					<image class="footer-icon" src="../../static/haibao.png" mode="widthFix"></image>
-					<text>生成海报</text>
-				</view>
-			</view>
 		</view>
 	</view>
 </template>
@@ -116,13 +114,13 @@ export default {
 						this.ctx.width = canvas.width;
 						this.ctx.height = canvas.height;
 
-						drawPoster(this.ctx, this.poster, this.data).then(() => {
+						drawPoster(this.ctx, this.poster, this.data).finally(() => {
 							this.loading = false;
 						});
 					})
 					.exec();
 			} else {
-				drawPoster(this.ctx, this.poster, this.data).then(() => {
+				drawPoster(this.ctx, this.poster, this.data).finally(() => {
 					this.loading = false;
 				});
 			}
@@ -166,8 +164,8 @@ export default {
 	.content-box {
 		position: absolute;
 		width: 660rpx;
-		height: 1020rpx;
-		top: 120rpx;
+		height: 960rpx;
+		top: 90rpx;
 		left: 50%;
 		transform: translateX(-50%);
 		z-index: 9;

package/components/ste-video/ste-video.vue

@@ -525,13 +525,15 @@ export default {
 					this.isInitCapture = true;
 					const p = video.play();
 					if (p !== undefined) {
-						p.then(() => {
-							video.pause();
-							video.currentTime = 0;
-							this.isInitCapture = false;
-						}).catch(() => {
-							this.isInitCapture = false;
-						});
+						setTimeout(() => {
+							p.then(() => {
+								video.pause();
+								video.currentTime = 0;
+								this.isInitCapture = false;
+							}).catch(() => {
+								this.isInitCapture = false;
+							});
+						}, 100)
 					} else {
 						this.isInitCapture = false;
 					}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "stellar-ui-v2",
-	"version": "1.40.17",
+	"version": "1.40.18",
 	"description": "StellarUI组件库",
 	"main": "stellar-ui/index.js",
 	"private": false,