1

www/protected/controllers/ROrderController.php

@@ -268,8 +268,8 @@ class ROrderController extends AdminController{
 
             if ($flag && $res){
                 foreach ($orders as $value) {
-                    $value->status = $status;
-                    $value->save();
+                   $value->status = $status;
+                   $value->save();
                 }
             }
 
@@ -320,7 +320,7 @@ class ROrderController extends AdminController{
                     $wechat->sendMessage($wechat_data);
                 }
             }
-
+        
         }
 
         //取消订单
@@ -406,7 +406,7 @@ class ROrderController extends AdminController{
                 $flag = 1;
             }
         }else if($order->channel == 'jingbai'){
-            if($status ==3){//已接单
+           if($status ==3){//已接单
                 $res = self::UpdateStatusForJingBai($order->OrderNo,(string)$order->_id, $status,$order->remark);
                 $flag = 1;
             }else if($status ==6){//服务完成
@@ -924,11 +924,11 @@ class ROrderController extends AdminController{
         $data['OrderId'] = $orderId;
         $data['HouseKeepingId']     = $HouseKeepingId;
         $data['Remark'] = $remark;
-        if ($status == 3){//已接单
-            $data['StatusCode'] = '01';
-        } else if($status == 6){//已完成
-            $data['StatusCode'] = '02';
-        }
+       if ($status == 3){//已接单
+           $data['StatusCode'] = '01';
+       } else if($status == 6){//已完成
+           $data['StatusCode'] = '02';
+       }
 
         $data['Time'] = date('Y-m-d H:i:s');
         $data['Sign'] = md5($data['OrderId'].$data['StatusCode'].$data['Remark'].$data['HouseKeepingId'].$data['Time'].$key);

www/protected/modules/moonclub/controllers/WebController.php

@@ -43,11 +43,11 @@ class WebController extends MoonClubBaseController {
                         $userAr->unionid = 'xiangyuhui';
                         $u_criteria = new EMongoCriteria();
                         $u_criteria->user_name('==',$userInfo['nickname']);
-                        /* $olduser = RUser::model()->find($u_criteria);
-                         if($olduser){
-                             $user_new_neme = $userAr->user_name.'_'.substr(time(),-7);
-                             $userAr->user_name = $user_new_neme;
-                         }*/
+                       /* $olduser = RUser::model()->find($u_criteria);
+                        if($olduser){
+                            $user_new_neme = $userAr->user_name.'_'.substr(time(),-7);
+                            $userAr->user_name = $user_new_neme;
+                        }*/
                         $result = $userAr->save();
                         if($result){
                             //异步同步微信头像到七牛
@@ -100,7 +100,7 @@ class WebController extends MoonClubBaseController {
     //检查微信登录页
     public function actionWxIndex() {
         $wxConfig = Yii::app()->params['xyhWxConfig'];
-
+        
         $home_page = Yii::app()->getRequest()->getParam("home_page",'');
         $redirectURI = 'http://' . $_SERVER['HTTP_HOST'] . Yii::app()->request->baseUrl . '/index.php?r=/moonclub/web/index';
         if($home_page){

www/protected/modules/moonclub/views/reserve/month.php

@@ -5,7 +5,7 @@
 	<title>享月会</title>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
 	<meta name="viewport"
-		  content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
+	      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
 	<meta name="apple-mobile-web-app-capable" content="yes">
 	<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
 	<meta http-equiv="Pragma" content="no-cache">
@@ -44,8 +44,8 @@
 <h1 style="text-align: center">预约</h1>
 <div class="">
 	<form action="" method='post'
-		  class="container  form-horizontal  ng-valid ng-dirty ng-valid-parse" id='singlesDay'
-		  style="margin-bottom: 15%; ">
+	      class="container  form-horizontal  ng-valid ng-dirty ng-valid-parse" id='singlesDay'
+	      style="margin-bottom: 15%; ">
 		<div class="container">
 			<!--姓名-->
 			<div class="form-group">
@@ -56,14 +56,14 @@
 			<div class="form-group">
 				<label>您的号码:</label>
 				<input type="text" name="mobile" class="form-control"
-					   placeholder="请输入您的手机号码" ng-model="phone"/>
+				       placeholder="请输入您的手机号码" ng-model="phone"/>
 			</div>
 			<!--房型-->
 			<div class="form-group">
 				<label>咨询套餐:</label>
 				<select name="homeType" onchange="theforever(this.value)" class="form-control" ng-model="Type"
-						ng-init="Type=TypeList[0].id"
-						ng-options="type.name as type.name for type in TypeList" id="">
+				        ng-init="Type=TypeList[0].id"
+				        ng-options="type.name as type.name for type in TypeList" id="">
 					<option value="">--请选择--</option>
 				</select>
 			</div>
@@ -72,7 +72,7 @@
 			<div class="form-group">
 				<label>预产日期:</label>
 				<input name="num" class="form-control" style="background-color: #fff;" id="demo1" type="text" readonly=""
-					   placeholder="请选择日期"/>
+				       placeholder="请选择日期"/>
 				<input type="hidden" name="user_id" id="userId">
 			</div>
 			<!--按钮-->
@@ -95,11 +95,11 @@
 <div class="model" style="width: 100%;position: fixed;top: 0;background: rgba(0,0,0,0.4)">
 	<!--错误提示容器-->
 	<div class="model-box"
-		 style="border-radius: 10px;height:130px;display:none;width: 70%;background: #fff;margin: 0 auto;top:25%;left:15%;position: fixed;">
+	     style="border-radius: 10px;height:130px;display:none;width: 70%;background: #fff;margin: 0 auto;top:25%;left:15%;position: fixed;">
 		<div class="model-title"
-			 style="font-family: '微软雅黑', 'Microsoft YaHei', 'STHeiti Light';width: 100%;text-align: center;font-size: 1.1rem;margin-top: 5%;"></div>
+		     style="font-family: '微软雅黑', 'Microsoft YaHei', 'STHeiti Light';width: 100%;text-align: center;font-size: 1.1rem;margin-top: 5%;"></div>
 		<div class="model-content"
-			 style="font-family: '微软雅黑', 'Microsoft YaHei', 'STHeiti Light';margin: 0 auto;width: 80%;background: #2f004e;color:rgb(255, 255, 255);font-size: 1.3rem;margin-top: 30px;text-align: center;padding: 5px 0 5px 0"></div>
+		     style="font-family: '微软雅黑', 'Microsoft YaHei', 'STHeiti Light';margin: 0 auto;width: 80%;background: #2f004e;color:rgb(255, 255, 255);font-size: 1.3rem;margin-top: 15px;text-align: center;padding: 5px 0 5px 0"></div>
 	</div>
 </div>
 </body>
@@ -120,9 +120,9 @@
 		})
 		/*表单提交进行判断*/
 		$('#SinglesDayBtn').on('click', function () {
-				/*获取user_id*/
-				var ref=window.location.href.split("=");
-				$("#userId").val(ref[2]);
+			/*获取user_id*/
+			var ref=window.location.href.split("=");
+			$("#userId").val(ref[2]);
 				/*姓名是否为空*/
 				if ($scope.username == undefined) {
 					model('请重填', '确认您的姓名');

www/webapp/moonclub/js/page/home.js

@@ -164,10 +164,10 @@ define(['$', 'template', 'IScroll',  'user', 'native', 'config', 'address', 'api
 					});
 				}, 200);
 				/*setTimeout(function () {
-				 // pageData.scroll = new IScroll('#homeScroll');
-				 // $(".box-container").height($(window).height());
-				 // $("#homeScroll").height($(window).height())
-				 }, 500);*/
+					// pageData.scroll = new IScroll('#homeScroll');
+					// $(".box-container").height($(window).height());
+					// $("#homeScroll").height($(window).height())
+				}, 500);*/
 
 				setInterval(function () {
 					// console.log($("#homeScroll").height($(window).height()));

www/webapp/moonclub/tpl/home/index.html

@@ -45,7 +45,7 @@
 				<div class="im"><img src="http://odulvej8l.bkt.clouddn.com/%E5%92%A8%E8%AF%A2-01.png" alt="" width="20" height="20"><div>咨询</div></div>
 			</div>
 			<div style="position: fixed;width: 100%;bottom: 0;"><img src="http://odulvej8l.bkt.clouddn.com/footer%28BAT-2%29.png"
-																	 style="display: block;width: 100%;" alt=""></div>
+			                                                         style="display: block;width: 100%;" alt=""></div>
 		</div>
 	</div>
 </div>