Merge branch 'master' into release

Public/static/js/common.js

@@ -34,9 +34,9 @@ function preloadimages(obj, complete_cb, progress_cb) {
 }
 }
 preloadImageList = []
 preloadImageList = []
 for (var i = 1; i <= 2; i++) {
 for (var i = 1; i <= 2; i++) {
-    preloadImageList.push(window.base_resource_url + '/image2/cover/' + i + '.png');
+    preloadImageList.push('/Public/static/image2/cover/' + i + '.png');
 }
 }
-preloadImageList.push(window.base_resource_url + '/image2/cover/3.png');
+preloadImageList.push('/Public/static/image2/cover/3.png');
 preloadimages(preloadImageList, function () {
 preloadimages(preloadImageList, function () {
     init();
     init();
 }, function (progress) {});
 }, function (progress) {});
@@ -101,7 +101,7 @@ $(document).ready(function () {
             $('.again,.saveTip').show();
             $('.again,.saveTip').show();
             var img, canvas2, ctx2;
             var img, canvas2, ctx2;
             if (custom) {
             if (custom) {
-                img = loadedImages[window.base_resource_url + '/image2/cover/1.png'];
+                img = loadedImages['/Public/static/image2/cover/1.png'];
                 canvas2 = canvas;
                 canvas2 = canvas;
                 ctx2 = ctx;
                 ctx2 = ctx;
             } else {
             } else {
@@ -139,8 +139,6 @@ $(document).ready(function () {
             ctx2.fillText(text, left, top * 2);
             ctx2.fillText(text, left, top * 2);
             $('.page:visible').find('.showBox').show().html('<img src="' + canvas2.toDataURL('image/png') + '">');
             $('.page:visible').find('.showBox').show().html('<img src="' + canvas2.toDataURL('image/png') + '">');
         });
         });
-
-
     })
     })
     $('input[type=text]').on('input', onInput);
     $('input[type=text]').on('input', onInput);
     $('.L-arrow').on('click', function () {
     $('.L-arrow').on('click', function () {
@@ -242,7 +240,7 @@ var init = function () {
     canvas = $('canvas').get(0);
     canvas = $('canvas').get(0);
     ctx = canvas.getContext('2d');
     ctx = canvas.getContext('2d');
     ctx.scale(2, 2);
     ctx.scale(2, 2);
-    var img = loadedImages[window.base_resource_url + '/image2/cover/3.png'];
+    var img = loadedImages['/Public/static/image2/cover/3.png'];
     canvas.width = img.width;
     canvas.width = img.width;
     canvas.height = img.height;
     canvas.height = img.height;
 }
 }
@@ -259,7 +257,7 @@ var drawImage = function () {
         ctx.drawImage(uploadedImg, -uploadedImg.width / 2, -uploadedImg.height / 2);
         ctx.drawImage(uploadedImg, -uploadedImg.width / 2, -uploadedImg.height / 2);
         ctx.restore();
         ctx.restore();
     }
     }
-    var img = loadedImages[window.base_resource_url + '/image2/cover/3.png'];
+    var img = loadedImages['/Public/static/image2/cover/3.png'];
     ctx.drawImage(img, 0, 0);
     ctx.drawImage(img, 0, 0);
 }
 }
 var showPage1 = function () {
 var showPage1 = function () {
@@ -273,7 +271,7 @@ var showPage1 = function () {
         });
         });
         swiperHtml.appendTo('.swiperBox');
         swiperHtml.appendTo('.swiperBox');
         for (var i = 1; i < 3; i++) {
         for (var i = 1; i < 3; i++) {
-            var img = window.base_resource_url + '/image2/cover/' + (3 - i) + '.png';
+            var img = '/Public/static/image2/cover/' + (3 - i) + '.png';
             images.push(loadedImages[img]);
             images.push(loadedImages[img]);
             var item = $('<div class="img"><img src="' + img + '" /></div>');
             var item = $('<div class="img"><img src="' + img + '" /></div>');
             item.wrap('<div class="swiper-slide"></div>').parent().prependTo($('#firstSwiper').find('.swiper-wrapper'));
             item.wrap('<div class="swiper-slide"></div>').parent().prependTo($('#firstSwiper').find('.swiper-wrapper'));