From a7d4bb1da9544c73fab4a39ddea514db380cb385 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Sat, 27 Jan 2024 15:20:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E5=8F=98?=
 =?UTF-8?q?=E4=B8=BA=E6=89=93=E5=BC=80=E7=9B=B8=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Detail/DesignDetailAlter.vue       | 3 +++
 src/component/HomePage/ColorboardUpload.vue      | 1 +
 src/component/HomePage/Generate.vue              | 1 +
 src/component/HomePage/MarketingSketchUpload.vue | 1 +
 src/component/HomePage/MoodboardUpload.vue       | 1 +
 src/component/HomePage/PrintboardUpload.vue      | 1 +
 src/component/HomePage/SketchboardUpload.vue     | 1 +
 src/component/HomePage/Upload.vue                | 1 +
 src/component/HomePage/layout.vue                | 1 +
 src/component/HomePage/layoutMobile.vue          | 1 +
 src/tool/util.js                                 | 4 +++-
 src/views/LibraryPage.vue                        | 2 ++
 12 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue
index 8faed574..f86aaf70 100644
--- a/src/component/Detail/DesignDetailAlter.vue
+++ b/src/component/Detail/DesignDetailAlter.vue
@@ -106,6 +106,8 @@
 								<a-upload
 									:action="uploadUrl + '/api/element/upload'"
 									list-type="picture-card"
+									:capture="null"
+
 									:data="{
 										...upload,
 									}"
@@ -247,6 +249,7 @@
 								</div>
 							</div>
 							<a-upload
+								:capture="null"
 								v-show="colorFileList.length < 1"
 								list-type="picture-card"
 								:customRequest="function(){}"
diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue
index b54477fe..3bef571d 100644
--- a/src/component/HomePage/ColorboardUpload.vue
+++ b/src/component/HomePage/ColorboardUpload.vue
@@ -72,6 +72,7 @@
 								</div>
 							</div>
 							<a-upload
+								:capture="null"
 								v-show="fileList.length < 1"
 								list-type="picture-card"
 								:customRequest="function(){}"
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index 90c311f5..99cd6fe3 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -129,6 +129,7 @@
 					:class="[driver__.driver?'showEvents':'']"
                 >
                     <a-upload
+						:capture="null"
                         :action="uploadUrl + '/api/element/upload'"
                         list-type="picture-card"
                         :data="{
diff --git a/src/component/HomePage/MarketingSketchUpload.vue b/src/component/HomePage/MarketingSketchUpload.vue
index f7964023..9c130a0f 100644
--- a/src/component/HomePage/MarketingSketchUpload.vue
+++ b/src/component/HomePage/MarketingSketchUpload.vue
@@ -23,6 +23,7 @@
                     </div>
                     <div class="upload_file_item upload_component" v-show="fileList.length < 15">
                         <a-upload
+							:capture="null"
                             :action="uploadUrl + '/api/element/upload'"
                             list-type="picture-card"
                             :data="{
diff --git a/src/component/HomePage/MoodboardUpload.vue b/src/component/HomePage/MoodboardUpload.vue
index 26ddb878..d886f9ac 100644
--- a/src/component/HomePage/MoodboardUpload.vue
+++ b/src/component/HomePage/MoodboardUpload.vue
@@ -62,6 +62,7 @@
                             <a-upload
                                 :action="uploadUrl + '/api/element/upload'"
                                 list-type="picture-card"
+								:capture="null"
                                 :data="{
                                     ...upload,
                                 }"
diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue
index 95d94f0b..b4d2968f 100644
--- a/src/component/HomePage/PrintboardUpload.vue
+++ b/src/component/HomePage/PrintboardUpload.vue
@@ -54,6 +54,7 @@
                         <div class="upload_file_item upload_component" v-show="printboardList.length < 8">
                             <a-upload
                                 :action="uploadUrl + '/api/element/upload'"
+								:capture="null"
                                 list-type="picture-card"
                                 :before-upload="beforeUpload"
                                 :data="{
diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue
index 2d6ac337..5cfd168b 100644
--- a/src/component/HomePage/SketchboardUpload.vue
+++ b/src/component/HomePage/SketchboardUpload.vue
@@ -115,6 +115,7 @@
                         >
                             <a-upload
                                 :action="uploadUrl + '/api/element/upload'"
+								:capture="null"
                                 list-type="picture-card"
                                 :data="{
                                     ...upload,
diff --git a/src/component/HomePage/Upload.vue b/src/component/HomePage/Upload.vue
index 6e630c00..dd7abc24 100644
--- a/src/component/HomePage/Upload.vue
+++ b/src/component/HomePage/Upload.vue
@@ -14,6 +14,7 @@
 				<div class="upload_file_item upload_component" v-show="fileList.length < 10">
 					<a-upload
 						:action="uploadUrl + '/api/element/upload'"
+						:capture="null"
 						list-type="picture-card"
 						:data="{
 							...upload
diff --git a/src/component/HomePage/layout.vue b/src/component/HomePage/layout.vue
index 4b8544e7..e7ea718a 100644
--- a/src/component/HomePage/layout.vue
+++ b/src/component/HomePage/layout.vue
@@ -88,6 +88,7 @@
 				<a-spin size="large" />
 			</div>
 			<a-upload
+				:capture="null"
 				:action="uploadUrl + '/api/element/upload'"
 				list-type="picture-card"
 				:data="{
diff --git a/src/component/HomePage/layoutMobile.vue b/src/component/HomePage/layoutMobile.vue
index fb555fec..9f8d63b6 100644
--- a/src/component/HomePage/layoutMobile.vue
+++ b/src/component/HomePage/layoutMobile.vue
@@ -95,6 +95,7 @@
 				<a-spin size="large" />
 			</div>
 			<a-upload
+				:capture="null"
 				:action="uploadUrl + '/api/element/upload'"
 				list-type="picture-card"
 				:data="{
diff --git a/src/tool/util.js b/src/tool/util.js
index 9b7ed5b7..9dbc18f6 100644
--- a/src/tool/util.js
+++ b/src/tool/util.js
@@ -148,10 +148,12 @@ const formatTime = (timestamp, fmt) => {
 
 const isMoible = () => {
 	let is_mobile = navigator.userAgent.toLowerCase().match(/(ipad|ipod|iphone|android|coolpad|mmp|smartphone|midp|wap|xoom|symbian|j2me|blackberry|wince)/i) != null;
+	// alert(navigator.userAgent.toLowerCase())
+	var isiPad = /iPad/.test(navigator.platform) || (navigator.maxTouchPoints && navigator.maxTouchPoints > 2);
 	if (is_mobile) {
 		return true
 	} else {
-		return false
+		return isiPad
 	}
 }
 
diff --git a/src/views/LibraryPage.vue b/src/views/LibraryPage.vue
index d6e69213..0ac7844d 100644
--- a/src/views/LibraryPage.vue
+++ b/src/views/LibraryPage.vue
@@ -76,6 +76,7 @@
 										<div class="content_body_header_right">
 											<div :class="['header_operate_item' , 'fontSize','active']">
 												<a-upload
+													:capture="null"
 													v-show="uploadGenerate == 'Upload'"
 													:before-upload="beforeUpload"
 													:customRequest="customRequest "
@@ -266,6 +267,7 @@
 											v-show="selectGenerateList.length <= 2"
 										>
 											<a-upload
+												:capture="null"
 												:action="uploadUrl + '/api/element/upload'"
 												list-type="picture-card"
 												:before-upload="beforeUpload"