dos

Public/static/js/common.js

+var loadedImages = {};
+
 function preloadimages(obj, complete_cb, progress_cb) {
 function preloadimages(obj, complete_cb, progress_cb) {
     var loaded = 0;
     var loaded = 0;
     var toload = 0;
     var toload = 0;
@@ -5,10 +7,12 @@ function preloadimages(obj, complete_cb, progress_cb) {
     toload = obj.length;
     toload = obj.length;
     for (var i = 0; i < obj.length; i++) {
     for (var i = 0; i < obj.length; i++) {
         images[i] = new Image();
         images[i] = new Image();
+        images[i].crossOrigin = "Anonymous";
+        images[i].setAttribute('crossOrigin', 'anonymous');
         images[i].src = obj[i];
         images[i].src = obj[i];
-        console.log(obj[i]);
+        images[i].url = obj[i];
+        //console.log( images[i].src );
         images[i].onload = load;
         images[i].onload = load;
-        images[i].setAttribute('crossOrigin', 'anonymous');
         images[i].onerror = load;
         images[i].onerror = load;
         images[i].onabort = load;
         images[i].onabort = load;
     }
     }
@@ -17,6 +21,7 @@ function preloadimages(obj, complete_cb, progress_cb) {
     }
     }
 
 
     function load() {
     function load() {
+        loadedImages[this.url] = this;
         ++loaded;
         ++loaded;
         if (progress_cb) {
         if (progress_cb) {
             progress_cb(loaded / toload);
             progress_cb(loaded / toload);
@@ -26,11 +31,9 @@ function preloadimages(obj, complete_cb, progress_cb) {
         }
         }
     }
     }
 }
 }
-
-var picUrl = window.base_resource_url + '/image2/';
-
+var picUrl = window.base_resource_url + '/images/';
 var preloadImageList = [
 var preloadImageList = [
-    picUrl + 'share.jpg',
+    // picUrl + 'share.png',
 ];
 ];
 if ($('div').length > 0) {
 if ($('div').length > 0) {
     $.each($('div'), function (index, val) {
     $.each($('div'), function (index, val) {
@@ -53,6 +56,10 @@ let canvasinfo = initCanvas('.block', 'uploadCanvas', 257, 257),
     uploadCtx = canvasinfo[1];
     uploadCtx = canvasinfo[1];
 
 
 let imgInfo = {};
 let imgInfo = {};
+var blackUrl, black;
+
+
+blackUrl = $('.block').css('background-image').replace(/^url\((['"]?)(.*)\1\)$/, '$2');
 preloadimages(preloadImageList, function () {}, function (progress) {});
 preloadimages(preloadImageList, function () {}, function (progress) {});
 
 
 $(document).ready(function () {
 $(document).ready(function () {
@@ -205,6 +212,7 @@ function initCanvas(target, id, canvasWidth, canvasHeight, useRem = false) {
         canvasWidth = pxToRem(canvasWidth);
         canvasWidth = pxToRem(canvasWidth);
         canvasHeight = pxToRem(canvasHeight);
         canvasHeight = pxToRem(canvasHeight);
     }
     }
+    black = loadedImages[blackUrl];
     $(target).append($('<canvas id="' + id + '" width="' + canvasWidth + '" height="' + canvasHeight + '"></canvas>'));
     $(target).append($('<canvas id="' + id + '" width="' + canvasWidth + '" height="' + canvasHeight + '"></canvas>'));
     canvas = $('#' + id)[0];
     canvas = $('#' + id)[0];
     ctx = canvas.getContext("2d");
     ctx = canvas.getContext("2d");