瀏覽代碼

Merge branch 'test' of git.oschina.net:yiguanjia/php into test

DengTao 8 年之前
父節點
當前提交
dc3f857dfa

+ 2 - 2
www/protected/modules/o2o/views/web/index.php

@@ -89,10 +89,10 @@
     }
     }
     var debug = false;
     var debug = false;
     var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/dist/js/main.js?v=20160960804';
     var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/dist/js/main.js?v=20160960804';
-    if (debug) {
+   /* if (debug) {
       main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/js/main.js?v=' + (new Date()).getTime();
       main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/js/main.js?v=' + (new Date()).getTime();
       document.getElementById('debugMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/debuggap.js';
       document.getElementById('debugMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/debuggap.js';
-    }
+    }*/
     document.getElementById('graceMain').setAttribute('data-main', main);
     document.getElementById('graceMain').setAttribute('data-main', main);
     document.getElementById('graceMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/require.js';
     document.getElementById('graceMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/require.js';
   })();
   })();

File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/js/build/template.js


File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/js/main.js


File diff suppressed because it is too large
+ 0 - 1
www/webapp/o2o/js/build/template.js


File diff suppressed because it is too large
+ 0 - 2
www/webapp/o2o/tpl/home/index.html


Some files were not shown because too many files changed in this diff