Merge branch 'master' into release

Application/Home/View/default/layout.tpl

@@ -105,14 +105,14 @@
         var timeline_desc = '一键定制你的vivo S7e头像';
         var timeline_desc = '一键定制你的vivo S7e头像';
         window.wxFriendData = {
         window.wxFriendData = {
             'link': link,
             'link': link,
-            'imgUrl': link + '/Public/static/image2/share.jpg',
+            'imgUrl': link + '/Public/static/image2/share.jpg?v=1',
             'title': friend_title,
             'title': friend_title,
             'desc': friend_desc,
             'desc': friend_desc,
             success: function () {}
             success: function () {}
         };
         };
         window.wxTimelineData = {
         window.wxTimelineData = {
             'link': link,
             'link': link,
-            'imgUrl': link + '/Public/static/image2/share.jpg',
+            'imgUrl': link + '/Public/static/image2/share.jpg?v=1',
             'title': timeline_desc,
             'title': timeline_desc,
             success: function () {}
             success: function () {}
         };
         };

Public/static/css/main.min.css

-body{margin:0;padding:0;-webkit-text-size-adjust:none;}.hide{display:none;}.page{width:640px;height:1238px;position:relative;display:none;overflow:hidden;margin:0 auto;}.page-2143{display:block}input,textarea,img{border:0;top:0;left:0;width:100%;height:100%;margin:0;padding:0;}input,textarea{background:transparent;}input[type=file]{opacity:0;}.res-30300{position:absolute;opacity:1;width:640px;height:1238px;background: url(../images/3414_1604716671.jpg)left top no-repeat;}.res-30301{position:absolute;opacity:1;left:180px;top:1021px;width:281px;height:67px;background: url(../images/7692_1604716674.png)left top no-repeat;}.res-30302{position:absolute;opacity:1;left:231px;top:863px;width:178px;height:24px;background: url(../images/4735_1604716676.png)left top no-repeat;}.res-30303{position:absolute;opacity:1;left:180px;top:1021px;width:281px;height:67px;background: url(../images/3230_1604716676.png)left top no-repeat;}.res-30363{position:absolute;opacity:1;top:1px;width:303px;height:25px;background: url(../images/1551_1604765467.png)left top no-repeat;}.res-30308{position:absolute;left:141px;top:473px;width:360px;height:360px;}.res-30362{position:absolute;opacity:1;left:167px;top:941px;width:304px;height:25px;background: url(../images/2725_1604765470.png)left top no-repeat;}.res-30306{position:absolute;opacity:1;left:62px;top:243px;width:516px;height:140px;background: url(../images/7076_1604716677.png)left top no-repeat;}.res-30307{position:absolute;opacity:1;left:42px;top:30px;width:152px;height:40px;background: url(../images/3618_1594984624.png)left top no-repeat;}.res-30309{position:absolute;left:141px;top:473px;width:360px;height:360px;background: url(../images/8975_1604723171.jpg)left top no-repeat;}
+body{margin:0;padding:0;-webkit-text-size-adjust:none;}.hide{display:none;}.page{width:640px;height:1238px;position:relative;display:none;overflow:hidden;margin:0 auto;}.page-2143{display:block}input,textarea,img{border:0;top:0;left:0;width:100%;height:100%;margin:0;padding:0;}input,textarea{background:transparent;}input[type=file]{opacity:0;}.res-30300{position:absolute;opacity:1;width:640px;height:1238px;background: url(../images/3414_1604716671.jpg)left top no-repeat;}.res-30301{position:absolute;opacity:1;left:180px;top:1021px;width:281px;height:67px;background: url(../images/7692_1604716674.png)left top no-repeat;}.res-30364{position:absolute;opacity:1;left:231px;top:863px;width:178px;height:24px;background: url(../images/560_1604772001.png)left top no-repeat;}.res-30303{position:absolute;opacity:1;left:180px;top:1021px;width:281px;height:67px;background: url(../images/3230_1604716676.png)left top no-repeat;}.res-30363{position:absolute;opacity:1;top:1px;width:303px;height:27px;background: url(../images/1551_1604765467.png)left top no-repeat;}.res-30308{position:absolute;left:141px;top:473px;width:360px;height:360px;}.res-30362{position:absolute;opacity:1;left:167px;top:941px;width:304px;height:27px;background: url(../images/2725_1604765470.png)left top no-repeat;}.res-30306{position:absolute;opacity:1;left:62px;top:243px;width:516px;height:140px;background: url(../images/7076_1604716677.png)left top no-repeat;}.res-30307{position:absolute;opacity:1;left:42px;top:30px;width:152px;height:40px;background: url(../images/3618_1594984624.png)left top no-repeat;}.res-30365{position:absolute;left:141px;top:473px;width:360px;height:360px;background: url(../images/8965_1604775277.jpg)left top no-repeat;}
\ No newline at end of file

Public/static/js/common.js

@@ -119,7 +119,7 @@ $(document).ready(function () {
         // top = 0;
         // top = 0;
         // if (browser.versions.iPhone) top = 0
         // if (browser.versions.iPhone) top = 0
         ctx2.fillStyle = '#000';
         ctx2.fillStyle = '#000';
-        ctx2.font = 'normal 135px normal';
+        ctx2.font = 'bolder 135px normal';
 
 
         ctx2.textAlign = 'left';
         ctx2.textAlign = 'left';
         ctx2.textBaseline = 'top';
         ctx2.textBaseline = 'top';