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

www/protected/modules/o2o/views/myOrder/info.php

@@ -441,7 +441,7 @@
 
     $('#has_come_container').click(function () {
       console.log();
-      if($('#formProductName').html()=='双11虹口区日常保洁特价体验'){
+      if($('#formProductName').html()=='民宿保洁'){
         /*调出表单*/
         $('#orderForm').removeClass('am-hide');
         $('#orderForm1').removeClass('am-hide');