From 10dfe84822224bd9bd5085d33ae5aa2841325d82 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Wed, 28 Jun 2023 10:10:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E4=B8=8A=E4=BC=A0=E5=B8=A6?=
 =?UTF-8?q?=E4=B8=8A=E5=88=86=E7=B1=BBpid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/adminapi/controller/PublicController.php         | 7 ++++---
 crmeb/app/adminapi/controller/v1/file/SystemAttachment.php | 5 ++++-
 template/admin/src/api/uploadPictures.js                   | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/crmeb/app/adminapi/controller/PublicController.php b/crmeb/app/adminapi/controller/PublicController.php
index 0fd00d819..1bc31e70f 100644
--- a/crmeb/app/adminapi/controller/PublicController.php
+++ b/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);
     }
 }
diff --git a/crmeb/app/adminapi/controller/v1/file/SystemAttachment.php b/crmeb/app/adminapi/controller/v1/file/SystemAttachment.php
index 01bb604e2..e470cff10 100644
--- a/crmeb/app/adminapi/controller/v1/file/SystemAttachment.php
+++ b/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]);
     }
 
diff --git a/template/admin/src/api/uploadPictures.js b/template/admin/src/api/uploadPictures.js
index 8ad8c5d1b..5a116f38c 100644
--- a/template/admin/src/api/uploadPictures.js
+++ b/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'
   });
 }