浏览代码

修改7牛时间戳

DengTao 8 年之前
父节点
当前提交
5946a657d2
共有 3 个文件被更改,包括 13 次插入12 次删除
  1. 1 0
      www/index.php
  2. 9 9
      www/protected/controllers/ROrderController.php
  3. 3 3
      www/protected/views/rOrder/index.php

+ 1 - 0
www/index.php

@@ -15,6 +15,7 @@
     }
 	
     if (trim($env) == 'develop'){
+        ini_set('mongo.long_as_object', 1);
         define('DB_CONNETC', 'mongodb://127.0.0.1:27017');
         $config=dirname(__FILE__).'/protected/config/develop.php';
         $environment = 'develop';

+ 9 - 9
www/protected/controllers/ROrderController.php

@@ -147,7 +147,7 @@ class ROrderController extends AdminController{
 
         $status = intval(Yii::app()->request->getParam('status',1));
 
-        $count = intval(Yii::app()->request->getParam('count',1));
+        $counts = intval(Yii::app()->request->getParam('count',1));
 
         $booking_time = intval(Yii::app()->request->getParam('booking_time', time()));
 
@@ -171,7 +171,7 @@ class ROrderController extends AdminController{
         //$technician_id = intval(Yii::app()->request->getParam('technician', 0));
         //$technician_name = Yii::app()->request->getParam('technician_name', '');
 
-        if(!$count){
+        if(!$counts){
             CommonFn::requestAjax(false, '购买数量错误');
         }
 
@@ -234,7 +234,7 @@ class ROrderController extends AdminController{
         if (empty($order)){
             CommonFn::requestAjax(false, '订单不存在');
         }
-        
+
         if(($order->status!=-1||$order->status!=-2)&&($status==-1||$status==-2)){
             foreach ($order->coupons as $user_coupon) {
                 $user_coupon = UserCoupon::get($user_coupon);
@@ -272,8 +272,8 @@ class ROrderController extends AdminController{
                     );
 
                     if (!empty($order->append_orders)) {
-                        $count = count($order->append_orders);
-                        $wechat_data['news']['articles'][0]['description'] .= "\n\n本订单包含" . $count . "个追加订单,请注意查看。";
+                        $counts = count($order->append_orders);
+                        $wechat_data['news']['articles'][0]['description'] .= "\n\n本订单包含" . $counts . "个追加订单,请注意查看。";
                     }
                     $wechat->sendMessage($wechat_data);
                 }
@@ -336,7 +336,7 @@ class ROrderController extends AdminController{
         $order->booking_time = $booking_time;
         $order->deal_time = $deal_time;
         $order->remark = $remark;
-        $order->count = $count;
+        $order->counts = $counts;
 
         //$order->station = new MongoId($station);
         // 是否通知保洁师
@@ -460,7 +460,7 @@ class ROrderController extends AdminController{
         echo json_encode($result);exit;
 
 
-        
+
     }
 
     public function actionAdd () {
@@ -617,7 +617,7 @@ class ROrderController extends AdminController{
             $data['procession_append_order_id'] = $key;
             $data['code'] = 2;
         }
-    
+
         echo json_encode($data);
     }
 
@@ -633,7 +633,7 @@ class ROrderController extends AdminController{
         $id = Yii::app()->request->getParam('id', '');
         $technician_id = intval(Yii::app()->request->getParam('reset_technician', 0));
         $technician_name = Yii::app()->request->getParam('reset_technician_name', '');
-        
+
         // 保洁师信息检查
         // 根据ID直接查询保洁师信息(优先使用联想功能)
         if ($technician_id != 0) {

+ 3 - 3
www/protected/views/rOrder/index.php

@@ -98,7 +98,7 @@
                                 <li class="f_item">
                                     <div class="box">
                                         <div class="f_label">
-                                            <span>地址/联系方式: </span>
+                                            <span>地址/联系方式1: </span>
                                         </div>
                                         <div class="box_flex f_content">
                                             <span  id="address_contact" style="width: 250px;"></span>
@@ -961,7 +961,7 @@
                 }
             }
         ]],
-        
+
         onSelect: function(index, row){
             $('#technician_id').val(0);
             $('#setTechnician_content').removeAttr('readonly');
@@ -1149,7 +1149,7 @@
         editable: false,
         onSelect: function () {
             search_content();
-        } 
+        }
     });
 
     // ------ content form ------