Merge branch 'zjl_commit_20200526'

resources/views/selfOrder/content.blade.php

@@ -390,7 +390,7 @@
                                     @endif
 
                                     @if ($v['status'] == -1 && !$v['cancel_reason']) 
-                                        <a class="btn btn-danger input-cancel-reason" href="javascript:;" data-oid="{{$v['order_id']}}">填写取消原因</a>
+                                        <a class="btn btn-danger input-cancel-reason" href="javascript:;" data-oid="{{$v['order_id']}}" data-type="4">填写取消原因</a>
                                     @endif
                                 </div>
                             </td>