Merge branch 'master' into Haozi

app/Services/LogService.php

@@ -0,0 +1,26 @@
+<?php
+
+
+namespace App\Services;
+
+
+use App\Log;
+use Illuminate\Support\Facades\Request;
+
+class LogService
+{
+    static public function log($method,$type,$description,$id_user=null){
+        if(!$id_user){
+            $id_user = '';
+            $user=auth()->user();
+            if($user) $id_user = $user['id'];
+        }
+        (new Log([
+            'operation'=>$method,
+            'type'=>$type,
+            'description'=>$description,
+            'id_user'=>$id_user,
+            'ip'=>Request::ip()
+        ]))->save();
+    }
+}

resources/views/order/issue/index.blade.php

@@ -103,11 +103,11 @@
                         <th class=" align-middle td-yellow" v-if="isShowOrderInfo" rowspan="2" style="min-width: 70px">区</th>
                         <th class=" align-middle td-yellow" v-if="isShowOrderInfo" rowspan="2" style="min-width:300px">收货人地址</th>
                         <th class=" align-middle td-yellow" v-if="isShowOrderInfo" colspan="3" style="min-width:300px">原始商品明细</th>
-                        <th class=" align-middle" rowspan="2" >退回单号</th>
-                        @cannot('客户不可见')
+{{--                        @cannot('客户不可见')--}}
                         <th class="  align-middle" rowspan="2" v-if="!isShowRejectedBill" style="min-width:50px">展开</th>
+                            <th class=" align-middle" rowspan="2" v-if="isShowRejectedBill" style="min-width:75px">退回单号</th>
                         <th class="  align-middle" colspan="5" v-if="isShowRejectedBill" style="min-width: 450px">返回商品明细</th>
-                        @endcannot
+{{--                        @endcannot--}}
                         <th class="bg-whit  align-middle" rowspan="2" style="min-width: 115px">情况说明</th>
                         <th class="  align-middle" rowspan="2" style="min-width: 115px">问题类别</th>
                         <th class="  align-middle" colspan="3" style="min-width: 115px">处理结果</th>
@@ -266,15 +266,15 @@
                         {{--商品明细 结束--}}
 
                         {{--退单商品明细 开始--}}
-                        <td class="text-muted">
+{{--                        @cannot('客户不可见')--}}
+                        <td class="p-0 m-0" v-if="!isShowRejectedBill && index === 0 " style="width:50px;" :rowspan="orderIssues.length" >
+                            <span class="btn  btn-outline-secondary "  @click="showRejectedBill"  :style="orderIssues.length>4 ?'{height: 200px;line-height: 100px':''" >展开退单列</span>
+                        </td>
+                        <td class="text-muted" v-if="isShowRejectedBill">
                             <template v-if="orderIssue.rejected_bill">
                                 @{{ orderIssue.rejected_bill.logistic_number_return }}
                             </template>
                         </td>
-                        @cannot('客户不可见')
-                        <td class="p-0 m-0" v-if="!isShowRejectedBill && index === 0 " style="width:50px;" :rowspan="orderIssues.length" >
-                            <span class="btn  btn-outline-secondary "  @click="showRejectedBill"  :style="orderIssues.length>4 ?'{height: 200px;line-height: 100px':''" >展开退单列</span>
-                        </td>
                         <td class="p-0" :id="orderIssue.id+'rejectedBill'" valign="middle" align="center" colspan="5"
                             v-if="isShowRejectedBill">
                             <div v-if="orderIssue.rejected_bill" class="m-0 p-0">
@@ -295,7 +295,7 @@
                                 </button>
                             </div>
                         </td>
-                        @endcannot
+{{--                        @endcannot--}}
                         {{--退单商品明细 结束--}}
 
                         <td >@{{ orderIssue.result_explain}}</td>