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()=='日常'){
+      if($('#formProductName').html()=='双11虹口区日常保洁特价体验'){
         /*调出表单*/
         $('#orderForm').removeClass('am-hide');
         $('#orderForm1').removeClass('am-hide');
@@ -554,4 +554,4 @@
       }
     );
   }
-</script>
+</script>

www/webapp/o2o/tpl/recharge/index.html

@@ -15,8 +15,8 @@
 				{{include './cell'}}
 			</ul>
 			<div class="ad-hide" style="text-align: center;"><span style="font-size: 0.6rem">点击立即充值，即表示您已经同意壹管家</span><span
-				style="font-size: 0.6rem;font-weight: 600;display: block;" class="pay-agreement"></span>
-				<span style="font-size: 0.6rem;">《<span style="text-decoration: underline;color: #0A246A">充返活动协议</span>》</span>
+				style="font-size: 0.6rem;font-weight: 600;display: block;" ></span>
+				<span  style="font-size: 0.6rem;">《<span class="pay-agreement" style="text-decoration: underline;color: #0A246A">充返活动协议</span>》</span>
 				<span style="display: inline-block;font-size: 0.6rem;font-weight: 600; " class="pay-rule"><span
 					style="text-decoration: underline;color: #0A246A">活动规则</span></span>
 			</div>