uview-plus 3.4.40 → 3.4.42

package/components/u-qrcode/qrcode.js

@@ -1036,11 +1036,10 @@ let QRCode = {};
             usingComponents: opt.usingComponents,
             showLoading: opt.showLoading,
             loadingText: opt.loadingText,
-            that: opt.that
         };
 
         let canvas = null;
-        
+
         if (typeof opt === 'string') { // 只编码ASCII字符串
             opt = {
                 text: opt
@@ -1087,11 +1086,11 @@ let QRCode = {};
             }
             return options.foreground;
         }
-        
+
         let getCanvas = async (id) => {
             return new Promise((resolve, reject)=>{
                 try {
-                    const query = uni.createSelectorQuery().in(this.options.that);
+                    const query = uni.createSelectorQuery().in(this.options.context);
                     query.select(`#${id}`)
                     .fields({ node: true, size: true })
                     .exec((res) => {
@@ -1101,11 +1100,15 @@ let QRCode = {};
                 catch (e) {
                     console.error("createCanvasContextFail",e)
                 }
-                
             })
         }
         // 创建canvas
         let createCanvas = async function (options) {
+            let isApp = false;
+            // #ifdef APP
+            isApp = true;
+            // #endif
+
             if(options.showLoading){
                 uni.showLoading({
                     title: options.loadingText,
@@ -1124,9 +1127,18 @@ let QRCode = {};
                 canvas.width = options.size;
                 canvas.height = options.size;
                 // #endif
-
+                // #ifdef APP
+                ctx = uni.createCanvasContext(options.canvasId, options.context);
+                // #endif
+                // #ifndef APP
                 ctx = canvas.getContext('2d');
+                // #endif
+
             }
+            // 设置组件中data里面的ctx
+            options.context.ctx = ctx;
+            options.context.canvas = canvas;
+
             var count = qrCodeAlg.getModuleCount();
             var ratioSize = options.size;
             var ratioImgSize = options.imageSize;
@@ -1160,12 +1172,14 @@ let QRCode = {};
                     ctx.drawImage(options.image, x, y, ratioImgSize, ratioImgSize);
                 }
                 else {
-                    // #ifdef H5
+                    // #ifdef H5 || APP
                     const img = new Image();
                     // #endif
-                    // #ifndef H5
+
+                    // #ifndef H5 || APP
                     const img = canvas.createImage();
                     // #endif
+
                     img.onload = () => {
                         ctx.drawImage(img, x, y, ratioImgSize, ratioImgSize);
                     };
@@ -1173,7 +1187,7 @@ let QRCode = {};
                 }
                 // 画圆角矩形
                 function drawRoundedRect(ctxi, x, y, width, height, r, lineWidth, fill, stroke) {
-                    if (options.nvueContext) {
+                    if (options.nvueContext || isApp) {
                         ctxi.setLineWidth(lineWidth);
                         ctxi.setFillStyle(options.background);
                         ctxi.setStrokeStyle(options.background);
@@ -1208,7 +1222,7 @@ let QRCode = {};
             }
             setTimeout(() => {
                 // canvas2 绘制是自动的不需要手动绘制
-                if(options.nvueContext){
+                if(options.nvueContext || isApp){
                     ctx.draw(true, () => {
                         // 保存到临时区域
                         setTimeout(() => {