退货录入拍照功能调整

resources/views/rejected/create.blade.php

@@ -295,17 +295,16 @@
                                     <td>@{{item.remark}}</td>
                                     <td>
                                         <div align="center" @mouseleave="removeCommonImg('common_img_'+item.id)" @mouseenter="commonImg('img_'+item.id,item.upload_files)">
-                                            <button class="btn btn-outline-secondary" @click="takePhoto(item.id,i)">拍照上传</button>
+                                            <button class="btn btn-outline-secondary btn-sm" @click="takePhoto(item.id,i)">拍照上传</button>
                                             <div :id="'img_'+item.id">
                                                 <img v-for="uploadFile in item.upload_files"  :src="imgPrefix+uploadFile.url+'-thumbnail.'+uploadFile.type">
                                             </div>
                                         </div>
                                     </td>
-                                    @can('退货管理-删除')
-                                        <td>
-                                            <button class="btn btn-outline-danger" @click="deleteItem">删</button>
-                                        </td>
-                                    @endcan
+                                    <td class="text-center">
+                                        <button class="btn btn-outline-success btn-sm" @click="enableCamera(true);">开启摄像头</button>
+                                        @can('退货管理-删除')<button class="btn btn-outline-danger btn-sm" @click="deleteItem">删</button>@endcan
+                                    </td>
                                 </tr>
                             </table>
                         </div>
@@ -1296,19 +1295,15 @@
                 },
                 //拍照
                 takePhoto(id,index){
-                    this.enableCamera(true);
-                    setTimeout(()=>{
-                        let photo=document.getElementById('photo');
-                        let canvas=document.getElementById('canvas');
-                        //绘制canvas图形
-                        canvas.getContext('2d').drawImage(photo, 0, 0, 400, 300);
-                        let img = document.getElementById('canvas').toDataURL();
-                        // 这里的img就是得到的图片
-                        this.closeCamera();
-                        let blob=this.dataUrlToBlob(img);
-                        this.submitFile(blob,id,index);
-                        // photo.style.display='none';
-                    },2500)
+                    let photo=document.getElementById('photo');
+                    let canvas=document.getElementById('canvas');
+                    //绘制canvas图形
+                    canvas.getContext('2d').drawImage(photo, 0, 0, 400, 300);
+                    let img = document.getElementById('canvas').toDataURL();
+                    // 这里的img就是得到的图片
+                    this.closeCamera();
+                    let blob=this.dataUrlToBlob(img);
+                    this.submitFile(blob,id,index);
                 },
                 dataUrlToBlob(imgDataUrl) {
                     let imgUrl = window.atob(imgDataUrl.split(',')[1])

resources/views/rejected/edit.blade.php

@@ -256,13 +256,16 @@
                                     <td>@{{item.remark}}</td>
                                     <td>
                                         <div align="center" @mouseleave="removeCommonImg('common_img_'+item.id)" @mouseenter="commonImg('img_'+item.id,item.upload_files)">
-                                            <button class="btn btn-outline-secondary" @click="takePhoto(item.id,i)">拍照上传</button>
+                                            <button class="btn btn-outline-secondary btn-sm" @click="takePhoto(item.id,i)">拍照上传</button>
                                             <div :id="'img_'+item.id">
                                                 <img v-for="uploadFile in item.upload_files"  :src="imgPrefix+uploadFile.url+'-thumbnail.'+uploadFile.type">
                                             </div>
                                         </div>
                                     </td>
-                                    @can('退货管理-删除')<td><button class="btn btn-outline-danger" @click="deleteItem">删</button></td>@endcan
+                                    <td>
+                                        <button class="btn btn-outline-success btn-sm" @click="enableCamera(true);">开启摄像头</button>
+                                        @can('退货管理-删除') <button class="btn btn-outline-danger btn-sm" @click="deleteItem">删</button>@endcan
+                                    </td>
                                 </tr>
                             </table>
                         </div>
@@ -1049,19 +1052,15 @@
                 },
                 //拍照
                 takePhoto(id,index){
-                    this.enableCamera(true);
-                    setTimeout(()=>{
-                        let photo=document.getElementById('photo');
-                        let canvas=document.getElementById('canvas');
-                        //绘制canvas图形
-                        canvas.getContext('2d').drawImage(photo, 0, 0, 400, 300);
-                        let img = document.getElementById('canvas').toDataURL();
-                        // 这里的img就是得到的图片
-                        this.closeCamera();
-                        let blob=this.dataUrlToBlob(img);
-                        this.submitFile(blob,id,index);
-                        // photo.style.display='none';
-                    },2000)
+                    let photo=document.getElementById('photo');
+                    let canvas=document.getElementById('canvas');
+                    //绘制canvas图形
+                    canvas.getContext('2d').drawImage(photo, 0, 0, 400, 300);
+                    let img = document.getElementById('canvas').toDataURL();
+                    // 这里的img就是得到的图片
+                    this.closeCamera();
+                    let blob=this.dataUrlToBlob(img);
+                    this.submitFile(blob,id,index);
                 },
                 dataUrlToBlob(imgDataUrl) {
                     let imgUrl = window.atob(imgDataUrl.split(',')[1])