Merge pull request '更新bug' (#151) from hotfix/payment_bug_0203 into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/151

Application/Payment/Controller/PaymentController.class.php

@@ -358,7 +358,7 @@ class PaymentController extends BaseController
         //获取自身
         $remark = ($oldInfo['remark'] .'该打款由线上转为线下付款，原支付宝用户：'. $company_info['ali_user'].',支付宝账号为：'.$company_info['ali_account']);
         //修改自身
-        $res = M("company_statement_info","tab_")->where("id = {$id}")->save(['verify_status' => 2, 'pay_check' => 0, 'pay_check_member_id' => 0, 'pay_check_time' => 0, 'remark' => $remark]);
+        $res = M("company_statement_info","tab_")->where("id = {$id}")->save(['verify_status' => 2,'pay_status'=>0,'pay_time'=>0,'pay_info'=>'','pay_check' => 0, 'pay_check_member_id' => 0, 'pay_check_time' => 0, 'remark' => $remark]);
         if(empty($res)){
             $this->ajaxReturn(['status' =>0 ,'msg'=>'转换失败','data'=>[]]);
         }

Application/Payment/View/Payment/lists.html

@@ -282,11 +282,10 @@
                                 </if>
                                 <if condition="$data['pay_status'] eq -1">
                                   <a class='confirm changeCompanyInfo' data-id="{$data['id']}">更新打款信息</a>
+                                </if>
+                                <if condition="$data['pay_status'] neq 1">
                                   <a class='confirm changePayTapy' data-id="{$data['id']}">转线下打款</a>
                                 </if>
-<!--                                <if condition="$data['pay_check'] eq 0">-->
-<!--                                  <a class='confirm setPayment' data-id='{$data.id}'>打款信息确认</a>-->
-<!--                                </if>-->
                               </td>
                             </tr>
                             <volist name="data.son_info" id="s_data">