merge

www/webapp/common/js/config-native.js

@@ -18,9 +18,9 @@ define(['require'], function(require) {
     test = false;
   }
   if (test) {
-    apiPath = 'http:// apitest.yiguanjia.me';
+    apiPath = 'http://apitest.yiguanjia.me';
   } else {
-    apiPath = 'http:// api.yiguanjia.me';
+    apiPath = 'http://api.yiguanjia.me';
   }
 
   var ua = navigator.userAgent.toLowerCase();

www/webapp/o2o/js/build/.cache/success/index.js

@@ -1,4 +1,4 @@
-/*TMODJS:{"version":8,"md5":"74bc9c6ef2591cfdf6c4a8b2bd0c4c8f"}*/
+/*TMODJS:{"version":10,"md5":"74bc9c6ef2591cfdf6c4a8b2bd0c4c8f"}*/
 template('success/index',function($data,$filename
 /**/) {
 'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,WX=$data.WX,$out='';if(showNavBar ){