同步正式服与测试服代码

www/protected/controllers/ROrderController.php

@@ -3,7 +3,6 @@ class ROrderController extends AdminController{
 
     public function actionIndex()
     {
-
         $status_option = ROrder::$status_option;
         $status = CommonFn::getComboboxData($status_option, 100, true, 100);
 

www/protected/modules/o2o/controllers/OrderController.php

@@ -40,7 +40,7 @@ class  OrderController extends O2oBaseController{
             //$criteria_user->addCond('status','==',1);
             $order = ROrder::model()->findAll($criteria_user);
             $o = CommonFn::getRowsFromCursor($order);
-            foreach($o as $value){
+           foreach($o as $value){
                 if ($value['status'] == 0 || $value['status'] == -1){
                     $t = ROrder::model()->get($value['_id']);
                     $t->delete();

www/protected/modules/o2o/views/advisory/SinglesDay.php

@@ -77,7 +77,7 @@
         <div style="display: inline-block;max-width: 100%;margin-bottom: 5px;font-weight: 700;">性别:</div>
         <div>
           <label class="radio-inline">
-            <input type="radio" name="sex" value="男" ng-model="sex">男
+            <input type="radio" name="sex" value="男" ng-model="sex">先生
           </label>
           <label class="radio-inline">
             <input type="radio" name="sex" value="女" ng-model="sex">女

www/webapp/o2o/js/model/product.js

@@ -1143,7 +1143,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                 is_extra: 0,
                 order: 0,
                 type: "9",
-                type_str: "活动产品",
+                type_str: "双11虹口区日常保洁特价体验",
                 extra: [
                     {
                         type: "一室一卫",

www/webapp/o2o/js/page/placeOrder.js

@@ -50,7 +50,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 	/* 重置页面时调用，重新生成IScroll */
 	function fixScroll(pageData) {
 		setInterval(function () {
-			if (product.name == "活动产品") {
+			if (product.name == "双11虹口区日常保洁特价体验") {
 				$('.show-time-picker').css('display', 'none');
 				$('.show-coupon-picker').css('display', 'none');
 				$('.table-link-label').css('display', 'none');
@@ -783,7 +783,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 					return;
 				}
 
-				if (!order.bookingTimeStr&& product.name !== "活动产品") {
+				if (!order.bookingTimeStr&& product.name !== "双11虹口区日常保洁特价体验") {
 					$doc.trigger('spa:openpanel', ['simpleAlert', {
 						message: '请选择上门时间'
 					}]);
@@ -826,7 +826,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 						order.reset();
 						$('.booking-time', $view).html('请选择');
 						if (res.data.status == 1) {
-							if(res.data.products_str=='活动产品'){
+							if(res.data.products_str=='双11虹口区日常保洁特价体验'){
 								$doc.trigger('spa:navigate', {
 									hash: 'bargain'
 								});