修改志愿者列表

@@ -47,6 +47,11 @@ class OrderModel extends Model
              ->where($map)
              ->where($map)
              ->find();
              ->find();
          $goodModel=new GoodsModel();
          $goodModel=new GoodsModel();
+         $order_info['remark']=cmf_replace_content_file_url(htmlspecialchars_decode($order_info['remark']));
+         $order_info['content_info']=cmf_replace_content_file_url(htmlspecialchars_decode($order_info['content_info']));
+         $order_info['reason']=cmf_replace_content_file_url(htmlspecialchars_decode($order_info['reason']));
+
+
          $order_info['good']=$goodModel->getGoods($order_info['good_id']);
          $order_info['good']=$goodModel->getGoods($order_info['good_id']);
          return $order_info;
          return $order_info;
     }
     }

@@ -1019,7 +1019,7 @@ class SecondController extends RestBaseController
      * @method POST
      * @method POST
      *
      *
      *
      *
-     *@param name:type type:int require:1 other: desc:类型0,待审核1,已发放
+     *@param name:type type:int require:1 other: desc:类型-1,已拒绝0,待审核1,已发放
      *@header name:XX-Token require:1 default: desc:token
      *@header name:XX-Token require:1 default: desc:token
      *
      *
      *
      *
@@ -1038,6 +1038,7 @@ class SecondController extends RestBaseController
         if (!empty($list)){
         if (!empty($list)){
             foreach ($list as $k=>$v){
             foreach ($list as $k=>$v){
                 $list[$k]['pic']=cmf_get_image_url($v['pic']);
                 $list[$k]['pic']=cmf_get_image_url($v['pic']);
+
             }
             }
         }
         }
         $this->success('',$data);
         $this->success('',$data);
@@ -1056,6 +1057,9 @@ class SecondController extends RestBaseController
      *
      *
      *@return order_sn:订单号
      *@return order_sn:订单号
      *@return content_info:虚拟订单信息
      *@return content_info:虚拟订单信息
+     *@return remark:备注信息
+     *@return reason:拒绝原因
+     *@return content_info:虚拟订单信息
      *@return is_real:是否为虚拟订单
      *@return is_real:是否为虚拟订单
      *@return expend:消耗工时
      *@return expend:消耗工时
      *@return good:商品信息
      *@return good:商品信息

@@ -62,6 +62,9 @@ class OrderController extends AdminBaseController
     public function editPost(){
     public function editPost(){
         $id = input('id');
         $id = input('id');
         $data=input();
         $data=input();
+        $data['content_info']=htmlspecialchars(cmf_replace_content_file_url(htmlspecialchars_decode($data['content_info']), true));
+        $data['remark']=htmlspecialchars(cmf_replace_content_file_url(htmlspecialchars_decode($data['remark']), true));
+        $data['reason']=htmlspecialchars(cmf_replace_content_file_url(htmlspecialchars_decode($data['reason']), true));
         $result=db('orders')->where('id',$id)->update($data);
         $result=db('orders')->where('id',$id)->update($data);
         if ($result){
         if ($result){
             $this->success('编辑成功');
             $this->success('编辑成功');

@@ -82,7 +82,7 @@
                     <tr>
                     <tr>
                         <th width="100">备注信息<span class="form-required">*</span></th>
                         <th width="100">备注信息<span class="form-required">*</span></th>
                         <td>
                         <td>
-                            <script type="text/plain" id="content2" name="content_info">{:cmf_replace_content_file_url(htmlspecialchars_decode($data.remark))}</script>
+                            <script type="text/plain" id="content2" name="remark">{:cmf_replace_content_file_url(htmlspecialchars_decode($data.remark))}</script>
                         </td>
                         </td>
                     </tr>
                     </tr>
 
 
@@ -91,7 +91,7 @@
                         <tr>
                         <tr>
                             <th width="100">发放内容<span class="form-required">*</span></th>
                             <th width="100">发放内容<span class="form-required">*</span></th>
                             <td>
                             <td>
-                                <script type="text/plain" id="content" name="content_info">{:cmf_replace_content_file_url(htmlspecialchars_decode($data.content))}</script>
+                                <script type="text/plain" id="content" name="content_info">{:cmf_replace_content_file_url(htmlspecialchars_decode($data.content_info))}</script>
                             </td>
                             </td>
                         </tr>
                         </tr>
                     </if>
                     </if>
@@ -99,7 +99,7 @@
                     <tr>
                     <tr>
                         <th width="100">拒绝原因<span class="form-required"></span></th>
                         <th width="100">拒绝原因<span class="form-required"></span></th>
                         <td>
                         <td>
-                            <script type="text/plain" id="content1" name="content_info">{:cmf_replace_content_file_url(htmlspecialchars_decode($data.reason))}</script>
+                            <script type="text/plain" id="content1" name="reason">{:cmf_replace_content_file_url(htmlspecialchars_decode($data.reason))}</script>
                         </td>
                         </td>
                     </tr>
                     </tr>