dos

Application/Common/Conf/config.php

@@ -13,7 +13,7 @@ return array(
     'AUTH_CLIENT_ID' => 'zhida_app',
     'AUTH_CLIENT_ID' => 'zhida_app',
     'AUTH_CLIENT_PASSWORD' => 'izhida',
     'AUTH_CLIENT_PASSWORD' => 'izhida',
     /* CDN路径配置。配置之后可以在模版文件中使用__CDN__ */
     /* CDN路径配置。配置之后可以在模版文件中使用__CDN__ */
-   '__CDN__' => 'http://static3.iacode.cn/cdn1/x50-avatar/v1.4.1',
+   '__CDN__' => 'http://static3.iacode.cn/cdn1/x50-avatar/v1.4.2',
     // '__CDN__' => '/Public/static', // @readme <-- 上线时修改这里
     // '__CDN__' => '/Public/static', // @readme <-- 上线时修改这里
     'URL_MODEL' => 3,
     'URL_MODEL' => 3,
     'STORAGE_PATH' => WEB_ROOT_PATH . '/Data/Storage',
     'STORAGE_PATH' => WEB_ROOT_PATH . '/Data/Storage',

Application/Home/View/default/layout.tpl

@@ -9,7 +9,7 @@
     <meta name="format-detection" content="telephone=no">
     <meta name="format-detection" content="telephone=no">
     {:assign var=projectId value=0}
     {:assign var=projectId value=0}
     {:assign var=rem value=false}
     {:assign var=rem value=false}
-    {:assign var=version value='6.0.4'}
+    {:assign var=version value='6.1.0'}
     {:block name='projectx'}{:/block}
     {:block name='projectx'}{:/block}
     {:if $rem == true}
     {:if $rem == true}
     <meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1, user-scalable=no">
     <meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1, user-scalable=no">

Public/static/css/index.css

@@ -60,12 +60,12 @@ canvas img {
   right: 0;
   right: 0;
   margin: 0 auto;
   margin: 0 auto;
   overflow: hidden;
   overflow: hidden;
-
 }
 }
 
 
 .page {
 .page {
   top: 50%;
   top: 50%;
   transform: translate(0, -50%);
   transform: translate(0, -50%);
+  overflow: unset;
 }
 }
 
 
 .L-arrow,
 .L-arrow,

Public/static/js/common.js

@@ -52,8 +52,8 @@ var canvas = false,
 $(document).ready(function () {
 $(document).ready(function () {
     if ($('.page').height() < document.documentElement.clientHeight) {
     if ($('.page').height() < document.documentElement.clientHeight) {
         var scale = document.documentElement.clientHeight / $('.page').height();
         var scale = document.documentElement.clientHeight / $('.page').height();
-        $('.page').css({
-            'transform': 'translate(0%,-50%) scale(1,' + scale + ')'
+        $('.bg').css({
+            'transform': 'scale(1,' + scale + ')'
         });
         });
     }
     }
     $('.container').css('height', document.documentElement.clientHeight + 'px');
     $('.container').css('height', document.documentElement.clientHeight + 'px');
@@ -65,7 +65,7 @@ $(document).ready(function () {
     $('input[type=text]').on('focus', function () {
     $('input[type=text]').on('focus', function () {
         $('.inputTip').hide();
         $('.inputTip').hide();
         //  $('.start').hide();
         //  $('.start').hide();
-    })
+    });
     $('input[type=text]').on('blur', function () {
     $('input[type=text]').on('blur', function () {
         window.scrollTo(0, 0);
         window.scrollTo(0, 0);
         if ($.trim($(this).val()) === '') {
         if ($.trim($(this).val()) === '') {
@@ -75,7 +75,7 @@ $(document).ready(function () {
             $('.inputTip').hide();
             $('.inputTip').hide();
             // $('.start').show();
             // $('.start').show();
         }
         }
-    })
+    });
     $('.again').on('click', function () {
     $('.again').on('click', function () {
         $('.swiperBox,.make,.username,.upload').show();
         $('.swiperBox,.make,.username,.upload').show();
         $('.again,.saveTip').hide();
         $('.again,.saveTip').hide();
@@ -85,7 +85,7 @@ $(document).ready(function () {
         ctx.clearRect(0, 0, canvas.width, canvas.height);
         ctx.clearRect(0, 0, canvas.width, canvas.height);
         ctx.fillStyle = "#ffffff";
         ctx.fillStyle = "#ffffff";
         ctx.fillRect(0, 0, canvas.width, canvas.height);
         ctx.fillRect(0, 0, canvas.width, canvas.height);
-    })
+    });
     $('.make').on('click', function () {
     $('.make').on('click', function () {
         if (!inited) {
         if (!inited) {
             return;
             return;
@@ -150,26 +150,26 @@ $(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 () {
         if (firstSwiper) {
         if (firstSwiper) {
             firstSwiper.slideNext();
             firstSwiper.slideNext();
         }
         }
-    })
+    });
     $('.R-arrow').on('click', function () {
     $('.R-arrow').on('click', function () {
         if (firstSwiper) {
         if (firstSwiper) {
             firstSwiper.slidePrev();
             firstSwiper.slidePrev();
         }
         }
-    })
+    });
     $('.choose1').on('click', function () {
     $('.choose1').on('click', function () {
         showPage1();
         showPage1();
-    })
+    });
     $('.choose2').on('click', function () {
     $('.choose2').on('click', function () {
         $('.upload').show();
         $('.upload').show();
         $('.imgTip').find('canvas').hide();
         $('.imgTip').find('canvas').hide();
         showPage2();
         showPage2();
-    })
+    });
     $('input[type=file]').on('change', function () {
     $('input[type=file]').on('change', function () {
         $('.imgTip').find('canvas').show();
         $('.imgTip').find('canvas').show();
         $('.usertips').show();
         $('.usertips').show();