Browse Source

扫码上传带上分类pid

evoxwht 2 years ago
parent
commit
10dfe84822

+ 4 - 3
crmeb/app/adminapi/controller/PublicController.php

@@ -59,15 +59,16 @@ class PublicController
      */
     public function scanUpload(Request $request, $upload_type = 0, $type = 0)
     {
-        [$file, $uploadToken] = $request->postMore([
+        [$file, $uploadToken, $pid] = $request->postMore([
             ['file', 'file'],
-            ['uploadToken', '']
+            ['uploadToken', ''],
+            ['pid', 0]
         ], true);
         $service = app()->make(SystemAttachmentServices::class);
         if ($service->cacheDriver()->get('scan_upload') != $uploadToken) {
             return app('json')->fail(410086);
         }
-        $service->upload(0, $file, $upload_type, $type, '', $uploadToken);
+        $service->upload($pid, $file, $upload_type, $type, '', $uploadToken);
         return app('json')->success(100032);
     }
 }

+ 4 - 1
crmeb/app/adminapi/controller/v1/file/SystemAttachment.php

@@ -145,9 +145,12 @@ class SystemAttachment extends AuthController
      */
     public function scanUploadQrcode()
     {
+        $pid = $this->request->getMore([
+            ['pid', 0]
+        ], true);
         $uploadToken = md5(time());
         $this->service->cacheDriver()->set('scan_upload', $uploadToken, 600);
-        $url = sys_config('site_url') . '/app/upload?token=' . $uploadToken;
+        $url = sys_config('site_url') . '/app/upload?token=' . $uploadToken . '&pid=' . $pid;
         return app('json')->success(['url' => $url]);
     }
 

+ 1 - 1
template/admin/src/api/uploadPictures.js

@@ -118,7 +118,7 @@ export function onlineUpload(data) {
  */
 export function scanUploadCode() {
   return request({
-    url: 'scan_upload/qrcode ',
+    url: 'file/scan_upload/qrcode ',
     method: 'delete'
   });
 }