Просмотр исходного кода

用户修改不存在手机号情况

haozi 5 лет назад
Родитель
Сommit
cfb108c181

+ 1 - 1
resources/views/maintenance/user/edit.blade.php

@@ -49,7 +49,7 @@
                         <label for="email" class="col-2 col-form-label text-right">手机号</label>
                         <div class="col-8">
                             <input type="text" class="form-control @error('phone') is-invalid @enderror"
-                                   name="phone" autocomplete="off" value="@if(old('phone')){{old('phone')}}@else{{$user->userDetail->mobile_phone}}@endif" required>
+                                   name="phone" autocomplete="off" value="@if(old('phone')){{old('phone')}}@else{{$user->userDetail ? $user->userDetail->mobile_phone : ''}}@endif" required>
                             @error('phone')
                             <span class="invalid-feedback" role="alert">
                                 <strong>{{ $message }}</strong>

+ 11 - 11
resources/views/order/index/delivering.blade.php

@@ -24,22 +24,22 @@
                     </div>
                     @can('订单管理-批量备注')<button @click="modal()" type="button" class="btn btn-sm ml-2 btn-outline-primary">批量备注追加</button>@endcan
                     @can('订单管理-编辑')
-                        <span class="btn btn-sm tooltipTarget ml-2" @click="freezeAll" style="cursor: pointer" title="订单的冻结条件要只局限在“创建订单”,“分配完成”,“拣货完成”,“播种完成”"
-                              :class="[checkData.length>0?'btn-dark':'btn-outline-dark']">冻结</span>
-                        <button type="button" @click="thaw(checkData,true)" class="btn btn-sm tooltipTarget" title="解除已冻结订单"
-                                :class="[checkData.length>0?'btn-dark':'btn-outline-danger']" style="opacity: 0.7">解冻</button>
-                        <span class="btn btn-sm tooltipTarget ml-2" @click="deAllocationAll" style="cursor: pointer"  title="订单的取消分配条件要只局限在“分配完成”或“部分分配”"
-                              :class="[checkData.length>0?'btn-dark':'btn-outline-dark']">取消分配</span>
-                        <button type="button" @click="resetLogisticsGetMark()" class="btn btn-sm "
-                                :class="[checkData.length>0?'btn-dark':'btn-outline-secondary']">重置快递获取标记</button>
+                        <span class="btn btn-sm tooltipTarget ml-1 btn-outline-dark"  @click="freezeAll" style="cursor: pointer" title="订单的冻结条件要只局限在“创建订单”,“分配完成”,“拣货完成”,“播种完成”"
+                              :class="[checkData.length>0?'btn-dark text-light':'']" >冻结</span>
+                        <button type="button" @click="thaw(checkData,true)" class="btn btn-sm tooltipTarget ml-1" title="解除已冻结订单"
+                                :class="[checkData.length>0?'btn-danger':'btn-outline-danger']" style="opacity: 0.7">解冻</button>
+                        <span class="btn btn-sm tooltipTarget ml-1" @click="deAllocationAll" style="cursor: pointer"  title="订单的取消分配条件要只局限在“分配完成”或“部分分配”"
+                              :class="[checkData.length>0?'btn-dark':'btn-outline-dark'] ">取消分配</span>
+                        <button type="button" @click="resetLogisticsGetMark()" class="btn btn-sm ml-1 btn-outline-secondary" style="background: #d7e8df;"
+                                :class="[checkData.length>0?'btn-dark text-black':''] ">重置快递获取标记</button>
                     @endcan
-                    @can('订单管理-订单-生成问题件')<button  @click="orderIssueTag()" type="button" class="btn btn-sm ml-2 btn-outline-primary "
+                    @can('订单管理-订单-生成问题件')<button  @click="orderIssueTag()" type="button" class="btn btn-sm ml-1 btn-outline-primary "
                                                  :class="[checkData.length>0?'btn-dark':'btn-outline-primary']">标记问题件</button>@endcan
                     @can('订单管理-订单-生成退货单')
-                        <button class="btn btn-sm ml-2" :class="[checkData.length>0?'btn-dark':'btn-outline-danger']" @click="isRejectedBillExist()"
+                        <button class="btn btn-sm ml-1" :class="[checkData.length>0?'btn-danger':'btn-outline-danger']" @click="isRejectedBillExist()"
                             style="opacity: 0.7">生成退货单</button>
                     @endcan
-                    <button class="btn btn-sm ml-2 btn-primary" v-if="checkData.length>0" @click="copyLogisticNumber()">复制快递单号</button>
+                    <button class="btn btn-sm ml-1 btn-primary" v-if="checkData.length>0" @click="copyLogisticNumber()">复制快递单号</button>
                 </div>
                 <div class="modal fade " style="top: 20%" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
                     <div class="modal-dialog">