合并分支 'wangxiaogang' 到 'master'

更改订单列表dom结构



查看合并请求 !128

@@ -174,12 +174,12 @@ class OrderSalesmanController extends WeChatBaseController
 //        $data['end_time'] = $param['end_time2'];
 //        $data['end_time'] = $param['end_time2'];
         $data['state'] = 5;
         $data['state'] = 5;
         $indentModel = new IndentModel();
         $indentModel = new IndentModel();
-//        $result = $indentModel->updateData(['id'=>['in',$indent_ids]],$data);
-//        if(empty($result)){
-//            $this->error('更新失败');
-//        }else{
+        $result = $indentModel->updateData(['id'=>['in',$indent_ids]],$data);
+        if(empty($result)){
+            $this->error('更新失败');
+        }else{
             $this->success('发货成功');
             $this->success('发货成功');
-//        }
+        }
     }
     }
     public function get_one(){
     public function get_one(){
         $id = $this->request->param('id',0,'intval');
         $id = $this->request->param('id',0,'intval');