Merge branch 'test'

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

@@ -124,7 +124,7 @@ class ReserveController extends MoonClubBaseController
             if ($reserve->status == 2) {
                 $data[$key]['status'] = Reserve::$status_option[2];//已处理
             } else {
-                $data[$key]['status'] = Reserve::$status_option[1];//待处理
+                $data[$key]['status'] = Reserve::$status_option[1];//待处理 
             }
             $data[$key]['num'] = $reserve->num;
 

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

@@ -21,7 +21,7 @@
 						</div>
 						<div class="booking-box-2">
 							<div>预约状态：<span>{{e.status}}</span></div>
-							<div>联系我们：400 921 0901</div>
+							<div>联系我们：400 8800 365</div>
 							<div>联系地址：{{e.area}}</div>
 						</div>
 					</div>