From a8618d0b5d1ebedef286e55c926f428cb877437c Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Fri, 6 Sep 2024 14:35:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8D=8E=E4=B8=BA?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=8F=8D=E9=A6=88=E7=9B=B8=E6=9C=BA=20?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/yk-authpup/yk-authpup.vue          |  328 ++++
 manifest.json                                 |    8 +-
 package.json                                  |   34 +-
 pages/device/new.vue                          | 1079 ++++++-------
 pages/home/feedback.vue                       |    7 +-
 pages/index/mine.vue                          |   22 +-
 pages/mine/about.vue                          |    2 +-
 pages/user/head.vue                           |  232 +--
 .../uni-file-picker/uni-file-picker.vue       | 1344 +++++++++--------
 .../uni-file-picker/upload-image.vue          |  671 ++++----
 10 files changed, 2110 insertions(+), 1617 deletions(-)
 create mode 100644 components/yk-authpup/yk-authpup.vue

diff --git a/components/yk-authpup/yk-authpup.vue b/components/yk-authpup/yk-authpup.vue
new file mode 100644
index 0000000..214d658
--- /dev/null
+++ b/components/yk-authpup/yk-authpup.vue
@@ -0,0 +1,328 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" :style="{top:isNativeHead?'':StatusBar}">
+		<view :class="[type, ani, animation ? 'ani' : '']" class="uni-custom uni-popup__wrapper" @click="close(true)">
+			<view class="uni-popup__wrapper-box">
+				<view class="title">{{authList[permissionID].title}}</view>
+				<view class="content">{{authList[permissionID].content}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'YkAuthpup',
+		props: {
+			// 开启动画
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			type: {
+				type: String,
+				default: 'top'
+			},
+			show: {
+				type: Boolean,
+				default: true
+			},
+			//是否是原生头部
+			isNativeHead:{
+				type: Boolean,
+				default: true
+			},
+			permissionID: {
+				type: [String, Number],
+				default: ''
+			}
+		},
+		data() {
+			return {
+				ani: '',
+				showPopup: false,
+				StatusBar:'',
+				refuseNum:'',//拒绝次数，
+				authList: {
+					'WRITE_EXTERNAL_STORAGE': {
+						title: "灿能物联存储空间/照片权限申请说明",
+						content: "便于您使用该功能上传您的照片/视频及用于更换头像、扫描二维码等场景中使用。"
+					},
+					'ACCESS_FINE_LOCATION': {
+						title: "XXX对地理位置权限申请说明",
+						content: "便于应用程序可以提供基于位置的服务、定位导航、附近搜索等功能。"
+					},
+					'CAMERA':{
+						title: "灿能物联对相机/摄像头权限申请说明",
+						content: "便于您使用该功能拍照上传您的照片/视频及用于更换头像、扫描二维码等场景中使用。"
+					},
+					'RECORD_AUDIO':{
+						title: "XXX对麦克风权限申请说明",
+						content: "便于您使用该功能进行录音、语音通话、发布语音、与客服语音沟通等场景中使用"
+					},
+					'CALL_PHONE': {
+						title: "XXX对拨打/管理电话权限申请说明",
+						content: "便于您使用该功能联系买家、骑手或者客服、业务经理与联系等场景下使用"
+					}
+				}
+			}
+		},
+		created() {
+			// #ifdef APP-PLUS
+			this.getSystemInfo();
+			// #endif
+		},
+		methods: {
+			//获取状态栏高度
+			getSystemInfo() {
+				let _this = this;
+				uni.getSystemInfo({
+					success: function(e) {
+						_this.StatusBar = e.statusBarHeight + 'px'; //用于自定义头部时，给手机状态栏留出位置,可通过isNativeHead这个参数控制
+					}
+				})
+			},
+			open() {
+				this.requestPermissions(this.permissionID);
+			},
+			close(type) {
+				this.ani = '';
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.showPopup = false;
+					}, 300)
+				})
+			},
+			//权限检测
+			requestPermissions(permissionID) {
+				let _this = this;
+				// #ifdef APP-PLUS
+				//判断安卓与ios设备
+			
+				if (plus.os.name == 'Android') {
+					let _permissionID = 'android.permission.' + permissionID;
+					plus.android.checkPermission(_permissionID,
+						granted => {
+								
+							if (granted.checkResult == -1) {
+								//还未授权当前查询的权限，打开权限申请目的自定义弹框
+								_this.showPopup = true;
+								_this.$nextTick(() => {
+									setTimeout(() => {
+										_this.ani = 'uni-' + _this.type
+									},30)
+								})
+							}
+						},
+						error => {
+							console.log(error.message);
+						}
+					);
+					plus.android.requestPermissions([_permissionID],
+						(e) => {
+							//关闭权限申请目的自定义弹框
+							_this.ani = '';
+							_this.$nextTick(() => {
+								setTimeout(() => {
+									_this.showPopup = false
+								}, 0)
+							})
+							console.log(e,'kkkkk')
+							if (e.granted.length > 0) {
+								//当前查询权限已授权，此时可以通知页面执行接下来的操作
+								_this.$emit('changeAuth');
+							}
+							if (e.deniedAlways.length > 0) {
+								//当前查询权限已被永久禁用，此时需要引导用户跳转手机系统设置去开启
+								uni.showModal({
+									title: '温馨提示',
+									content: '还没有该权限，立即去设置开启？',
+									cancelText: "取消",
+									confirmText: "去设置",
+									showCancel: true,
+									confirmColor: '#000',
+									cancelColor: '#666',
+									success: (res) => {
+										if (res.confirm) {
+											_this.goSetting();
+										}
+									}
+								})
+							}
+						})
+				} else {
+					//IOS不需要添加自定义弹框来描述权限目的，因为在配置文件的隐私信息访问的许可描述里可添加
+					//正常可以直接调用uni的API调起权限询问弹框使用各种权限，下面的判断使用场景主要是在IOS禁用某权限后，这个可以判断有无权限，进而引导用户跳转设置开启，仅列出了位置、相册、通讯录、相机、录音等权限，其他IOS权限可具体参考 https://ext.dcloud.net.cn/plugin?id=15787
+					let result = 0;
+					if (permissionID == 'ACCESS_FINE_LOCATION') {
+						//IOS检测位置权限
+						let cLLocationManager = plus.ios.importClass("CLLocationManager"),
+							authStatus = cLLocationManager.authorizationStatus(),
+							enable = cLLocationManager.locationServicesEnabled();
+						if (enable && authStatus != 2) {
+							result = 1;
+						} else {
+							result = 0;
+						}
+						plus.ios.deleteObject(cLLocationManager);
+					} else if (permissionID == 'WRITE_EXTERNAL_STORAGE') {
+						//IOS检测相册权限
+						let PHPhotoLibrary = plus.ios.importClass("PHPhotoLibrary"),
+							authStatus = PHPhotoLibrary.authorizationStatus();
+						if (authStatus === 3) {
+							result = 1;
+						} else {
+							result = 0;
+						}
+						plus.ios.deleteObject(PHPhotoLibrary);
+					} else if (permissionID == 'CAMERA') {
+						//IOS检测相机/摄像头权限
+						let avCaptureDevice = plus.ios.importClass("AVCaptureDevice"),
+						    authStatus = avCaptureDevice.authorizationStatusForMediaType("vide");
+						if (authStatus === 3) {
+						  result = 1;
+						} else {
+						  result = 0;
+						}
+						plus.ios.deleteObject(avCaptureDevice);
+					} else if (permissionID == 'CALL_PHONE') {
+						//IOS检测通讯录权限
+						let contactStore = plus.ios.importClass("CNContactStore"),
+							authStatus = contactStore.authorizationStatusForEntityType(0);
+						if (authStatus === 3) {
+							result = 1;
+						} else {
+							result = 0;
+						}
+						plus.ios.deleteObject(contactStore);
+					}else if(permissionID == 'RECORD_AUDIO'){
+						//IOS检测麦克风权限
+						let aVAudioSession = plus.ios.importClass("AVAudioSession"),
+						  aVAudio = aVAudioSession.sharedInstance(),
+						  authStatus = aVAudio.recordPermission();
+						if ([1684369017, 1970168948].includes(authStatus)) {
+						  result = 0;
+						} else {
+						  result = 1;
+						}
+						plus.ios.deleteObject(aVAudioSession);
+					}
+					if (result) {
+						//当前查询权限已授权，此时可以通知页面执行接下来的操作
+						that.$emit('changeAuth')
+					} else {
+						//当前查询的权限已禁用,引导用户跳转手机系统设置去开启
+						uni.showModal({
+							title: '温馨提示',
+							content: '还没有该权限，立即去设置开启？',
+							cancelText: "取消",
+							confirmText: "去设置",
+							showCancel: true,
+							confirmColor: '#000',
+							cancelColor: '#666',
+							success: (res) => {
+								if (res.confirm) {
+									_this.goSetting();
+								}
+							}
+						})
+					}
+				}
+				// #endif
+			},
+			//跳转手机系统设置
+			goSetting() {
+				if (plus.os.name == "iOS") {
+					var UIApplication = plus.ios.import("UIApplication");
+					var application2 = UIApplication.sharedApplication();
+					var NSURL2 = plus.ios.import("NSURL");
+					var setting2 = NSURL2.URLWithString("app-settings:");
+					application2.openURL(setting2);
+					plus.ios.deleteObject(setting2);
+					plus.ios.deleteObject(NSURL2);
+					plus.ios.deleteObject(application2);
+				} else {
+					var Intent = plus.android.importClass("android.content.Intent");
+					var Settings = plus.android.importClass("android.provider.Settings");
+					var Uri = plus.android.importClass("android.net.Uri");
+					var mainActivity = plus.android.runtimeMainActivity();
+					var intent = new Intent();
+					intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+					var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
+					intent.setData(uri);
+					mainActivity.startActivity(intent);
+				}
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	.uni-popup {
+		position: fixed;
+		top: 20px;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		z-index: 99999;
+		overflow: hidden;
+		&__wrapper {
+			position: absolute;
+			z-index: 999;
+			/* #ifndef APP-NVUE */
+			box-sizing: border-box;
+			/* #endif */
+			&.ani {
+				/* #ifndef APP-NVUE */
+				transition: all 0.3s;
+				/* #endif */
+			}
+			&.top {
+				top: 0;
+				width:705rpx;
+				/* #ifdef APP-NVUE */
+				left:22.5rpx;
+				/* #endif */
+				/* #ifndef APP-NVUE */
+				left:0;
+				transform: translateY(-705rpx);
+				/* #endif */
+			}
+			&-box {
+				position: relative;
+				/* #ifndef APP-NVUE */
+				box-sizing: border-box;
+				/* #endif */
+			}
+			&.uni-custom {
+				& .uni-popup__wrapper-box {
+					width: 705rpx;
+					/* #ifndef APP-NVUE */
+					margin: 0 22.5rpx;
+					/* #endif */
+					padding: 30upx;
+					background: #fff;
+					border: solid 2rpx #ddd;
+					/* #ifndef APP-NVUE */
+					box-sizing: border-box;
+					/* #endif */
+					border-radius: 16rpx;
+					.title{
+						font-size: 32rpx;
+						font-weight: bold;
+					}
+					.content{
+						margin-top: 16rpx;
+						line-height: 1.6;
+					}
+				}
+				&.top{
+					& .uni-popup__wrapper-box {
+						width: 705rpx;
+					}
+				}
+			}
+			&.uni-top{
+				transform: translateY(0);
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index c0263de..12c1338 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "灿能物联",
     "appid" : "__UNI__88BC25B",
     "description" : "",
-    "versionName" : "1.5.9",
-    "versionCode" : 159,
+    "versionName" : "1.6.0",
+    "versionCode" : 160,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -143,8 +143,8 @@
             "proxy" : {
                 "/api" : {
                     "https" : true,
-                    "target" : "https://pqmcn.com:8092/api",
-                    // "target" : "http://192.168.1.126:10215",
+                    // "target" : "https://pqmcn.com:8092/api",
+                    "target" : "http://192.168.1.126:10215",
                     "changOrigin" : true,
                     "pathRewrite" : {
                         "/api" : ""
diff --git a/package.json b/package.json
index f4b0e82..97c55d7 100644
--- a/package.json
+++ b/package.json
@@ -1,16 +1,20 @@
 {
-  "dependencies": {
-    "crypto-js": "^4.1.1",
-    "html2canvas": "^1.4.1",
-    "image-tools": "^1.4.0",
-    "jsrsasign": "^10.8.6",
-    "mqtt": "3.0.0",
-    "pinyin-pro": "^3.13.2",
-    "qs": "^6.11.2",
-    "vconsole": "^3.15.1"
-  },
-  "devDependencies": {
-    "@types/html5plus": "^1.0.2",
-    "@types/uni-app": "^1.4.4"
-  }
-}
+    "id": "yk-authpup",
+    "name": "解决软件在运行时，未见向用户告知权限申请的目的，华为等上架被拒问题",
+    "displayName": "解决软件在运行时，未见向用户告知权限申请的目的，华为等上架被拒问题",
+    "version": "1.0.5",
+    "description": "解决软件在运行时，未见向用户告知权限申请的目的，华为等上架被拒问题",
+    "keywords": [
+        "uniapp",
+        "华为上架",
+        "权限",
+        "权限申请",
+        "权限判断"
+    ],
+    "dcloudext": {
+        "category": [
+            "前端组件",
+            "通用组件"
+        ]
+    }
+}
\ No newline at end of file
diff --git a/pages/device/new.vue b/pages/device/new.vue
index 3c3e97e..7365dae 100644
--- a/pages/device/new.vue
+++ b/pages/device/new.vue
@@ -1,575 +1,588 @@
 <template>
-	<view class="new">
-		<template v-if="type == 1">
-			<view class="content">
-				<uni-forms>
-					<uni-forms-item label="设备识别码">
-						<view style="display: flex">
-							<uni-easyinput type="text" v-model="formData.nDid" placeholder="请输入设备识别码" />
-							<uni-icons
-								type="camera"
-								color="#007aff"
-								size="26"
-								class="ml20"
-								@click="scanCode"
-							></uni-icons>
-						</view>
-					</uni-forms-item>
-				</uni-forms>
-			</view>
-			<view class="btn-wrap">
-				<button class="btn-wrap-item" :loading="isLoading" :disabled='isLoading' @click="register">
-					{{ isLoading ? '注册中...' : '发起注册' }} 
-				</button>
-			</view>
-		</template>
-		<template v-else>
-			<view class="content">
-				<uni-forms>
-					<uni-forms-item label="项目">
-						<view style="display: flex; align-items: center">
-							<uni-data-select
-								v-model="formData.projectId"
-								:localdata="projectRange"
-								@change="queryTopologyDiagramPage"
-								:clear="false"
-							></uni-data-select>
-							<uni-icons
-								type="plusempty"
-								color="#007aff"
-								size="26"
-								class="ml20"
-								@click="createProject"
-							></uni-icons>
-						</view>
-					</uni-forms-item>
-					<!-- <uni-forms-item label="型号">
+    <view class="new">
+        <template v-if="type == 1">
+            <view class="content">
+                <uni-forms>
+                    <uni-forms-item label="设备识别码">
+                        <view style="display: flex">
+                            <uni-easyinput type="text" v-model="formData.nDid" placeholder="请输入设备识别码" />
+                            <uni-icons
+                                type="camera"
+                                color="#007aff"
+                                size="26"
+                                class="ml20"
+                                @click="scanCode"
+                            ></uni-icons>
+                        </view>
+                    </uni-forms-item>
+                </uni-forms>
+            </view>
+            <view class="btn-wrap">
+                <button class="btn-wrap-item" :loading="isLoading" :disabled="isLoading" @click="register">
+                    {{ isLoading ? '注册中...' : '发起注册' }}
+                </button>
+            </view>
+        </template>
+        <template v-else>
+            <view class="content">
+                <uni-forms>
+                    <uni-forms-item label="项目">
+                        <view style="display: flex; align-items: center">
+                            <uni-data-select
+                                v-model="formData.projectId"
+                                :localdata="projectRange"
+                                @change="queryTopologyDiagramPage"
+                                :clear="false"
+                            ></uni-data-select>
+                            <uni-icons
+                                type="plusempty"
+                                color="#007aff"
+                                size="26"
+                                class="ml20"
+                                @click="createProject"
+                            ></uni-icons>
+                        </view>
+                    </uni-forms-item>
+                    <!-- <uni-forms-item label="型号">
                         <uni-data-select v-model="formData.type" :localdata="typeRange"
                             @change="typeChange(item)"></uni-data-select>
                     </uni-forms-item> -->
-					<!--                    <uni-forms-item label="位置">-->
-					<!--                        <view style="display: flex;">-->
-					<!--                            <uni-easyinput-->
-					<!--                                :clearable="false"-->
-					<!--                                type="textarea"-->
-					<!--                                autoHeight-->
-					<!--                                v-model="formData.area"-->
-					<!--                                placeholder="请输入位置信息"-->
-					<!--                            />-->
-					<!--                            <uni-icons-->
-					<!--                                type="location"-->
-					<!--                                color="#007aff"-->
-					<!--                                size="26"-->
-					<!--                                class="ml20"-->
-					<!--                                @click="chooseLocation"-->
-					<!--                            ></uni-icons>-->
-					<!--                        </view>-->
-					<!--                    </uni-forms-item>-->
-					<uni-forms-item label="拓扑图" v-if="formData.projectId">
-						<view style="display: flex">
-							<view style="flex: 1">
-								<view v-if="formData.topologyDiagramUrl">
-									<image :src="formData.topologyDiagramUrl" style="width: 100%" mode="widthFix" />
-								</view>
-								<view v-else class="gplot gplot-empty center" @click="chooseGplot"> 选择拓扑图</view>
-							</view>
-							<uni-icons
-								type="image"
-								color="#007aff"
-								size="26"
-								class="ml20"
-								@click="chooseGplot"
-							></uni-icons>
-						</view>
-					</uni-forms-item>
-					<uni-forms-item label="监测点" v-if="pointList.length && formData.topologyDiagramUrl">
-						<view
-							class="point-item"
-							v-for="(item2, index2) in pointList"
-							:key="index2"
-							@click="editPoint(item2, index2)"
-						>
-							<view style="flex: 1" v-if="item2.name">{{ item2.name }}</view>
-							<view style="flex: 1; color: #999" v-else>请选择监测点</view>
-							<uni-icons type="compose" color="#007aff" size="26" class="ml20"></uni-icons>
-						</view>
-					</uni-forms-item>
-				</uni-forms>
-			</view>
-			<image class="gplot-image" ref="gplot-image" :src="formData.topologyDiagramUrl" mode="widthFix" />
-			<view class="btn-wrap">
-				<!-- <view class="btn-wrap-item" @click="add"> 添加监测点 </view> -->
-				<view class="btn-wrap-item" @click="submit"> 提交</view>
-			</view>
-			<uni-drawer ref="gplot" mode="right" :mask-click="false">
-				<scroll-view style="height: 100%" scroll-y="true">
-					<view class="content">
-						<image
-							class="gplot gplot-box"
-							mode="aspectFill"
-							:class="{ 'gplot-active': key == activeGplot }"
-							:src="item.filePath"
-							@click="activeGplot = key"
-							v-for="(item, key) in imageList"
-							:key="key"
-						/>
-						<view v-if="imageList.length === 0" style="text-align: center" class="mt50 mb50"
-							>暂无拓扑图
-						</view>
-						<view class="btn-wrap">
-							<view class="btn-wrap-item" @click="closeDrawer"> 取消</view>
-							<view class="btn-wrap-item ml20" @click="confirmGplot"> 确定</view>
-						</view>
-					</view>
-				</scroll-view>
-			</uni-drawer>
-			<uni-drawer ref="point" mode="right" :mask-click="false">
-				<scroll-view style="height: 100%" scroll-y="true">
-					<view style="background: #fff">
-						<view class="map-pin-box">
-							<image class="gplot" mode="widthFix" :src="formData.topologyDiagramUrl" />
+                    <!--                    <uni-forms-item label="位置">-->
+                    <!--                        <view style="display: flex;">-->
+                    <!--                            <uni-easyinput-->
+                    <!--                                :clearable="false"-->
+                    <!--                                type="textarea"-->
+                    <!--                                autoHeight-->
+                    <!--                                v-model="formData.area"-->
+                    <!--                                placeholder="请输入位置信息"-->
+                    <!--                            />-->
+                    <!--                            <uni-icons-->
+                    <!--                                type="location"-->
+                    <!--                                color="#007aff"-->
+                    <!--                                size="26"-->
+                    <!--                                class="ml20"-->
+                    <!--                                @click="chooseLocation"-->
+                    <!--                            ></uni-icons>-->
+                    <!--                        </view>-->
+                    <!--                    </uni-forms-item>-->
+                    <uni-forms-item label="拓扑图" v-if="formData.projectId">
+                        <view style="display: flex">
+                            <view style="flex: 1">
+                                <view v-if="formData.topologyDiagramUrl">
+                                    <image :src="formData.topologyDiagramUrl" style="width: 100%" mode="widthFix" />
+                                </view>
+                                <view v-else class="gplot gplot-empty center" @click="chooseGplot"> 选择拓扑图</view>
+                            </view>
+                            <uni-icons
+                                type="image"
+                                color="#007aff"
+                                size="26"
+                                class="ml20"
+                                @click="chooseGplot"
+                            ></uni-icons>
+                        </view>
+                    </uni-forms-item>
+                    <uni-forms-item label="监测点" v-if="pointList.length && formData.topologyDiagramUrl">
+                        <view
+                            class="point-item"
+                            v-for="(item2, index2) in pointList"
+                            :key="index2"
+                            @click="editPoint(item2, index2)"
+                        >
+                            <view style="flex: 1" v-if="item2.name">{{ item2.name }}</view>
+                            <view style="flex: 1; color: #999" v-else>请选择监测点</view>
+                            <uni-icons type="compose" color="#007aff" size="26" class="ml20"></uni-icons>
+                        </view>
+                    </uni-forms-item>
+                </uni-forms>
+            </view>
+            <image class="gplot-image" ref="gplot-image" :src="formData.topologyDiagramUrl" mode="widthFix" />
+            <view class="btn-wrap">
+                <!-- <view class="btn-wrap-item" @click="add"> 添加监测点 </view> -->
+                <view class="btn-wrap-item" @click="submit"> 提交</view>
+            </view>
+            <uni-drawer ref="gplot" mode="right" :mask-click="false">
+                <scroll-view style="height: 100%" scroll-y="true">
+                    <view class="content">
+                        <image
+                            class="gplot gplot-box"
+                            mode="aspectFill"
+                            :class="{ 'gplot-active': key == activeGplot }"
+                            :src="item.filePath"
+                            @click="activeGplot = key"
+                            v-for="(item, key) in imageList"
+                            :key="key"
+                        />
+                        <view v-if="imageList.length === 0" style="text-align: center" class="mt50 mb50"
+                            >暂无拓扑图
+                        </view>
+                        <view class="btn-wrap">
+                            <view class="btn-wrap-item" @click="closeDrawer"> 取消</view>
+                            <view class="btn-wrap-item ml20" @click="confirmGplot"> 确定</view>
+                        </view>
+                    </view>
+                </scroll-view>
+            </uni-drawer>
+            <uni-drawer ref="point" mode="right" :mask-click="false">
+                <scroll-view style="height: 100%" scroll-y="true">
+                    <view style="background: #fff">
+                        <view class="map-pin-box">
+                            <image class="gplot" mode="widthFix" :src="formData.topologyDiagramUrl" />
 
-							<movable-area class="map-pin-box-area">
-								<movable-view :x="point.lat" :y="point.lng" direction="all" @change="dragPoint">
-									<view class="point">
-										{{ point.alias || point.name }}
-									</view>
-								</movable-view>
-							</movable-area>
-						</view>
-					</view>
-					<view class="content">
-						<view class="content-des">请拖动图中的文字选择监测点位置</view>
-						<uni-forms>
-							<uni-data-select
-								v-model="point.position"
-								:localdata="positionList"
-								@change="positionChange"
-								disabled
-								:clear="false"
-							></uni-data-select>
-							<uni-easyinput
-								:clearable="false"
-								class="mt20"
-								type="text"
-								v-model="point.alias"
-								@change="aliasChange"
-								placeholder="别名（非必填）"
-							/>
-						</uni-forms>
-						<view class="btn-wrap">
-							<view class="btn-wrap-item" @click="closeDrawer"> 取消</view>
-							<view class="btn-wrap-item ml20" @click="addPoint"> 确定</view>
-						</view>
-					</view>
-				</scroll-view>
-			</uni-drawer>
-		</template>
-	</view>
+                            <movable-area class="map-pin-box-area">
+                                <movable-view :x="point.lat" :y="point.lng" direction="all" @change="dragPoint">
+                                    <view class="point">
+                                        {{ point.alias || point.name }}
+                                    </view>
+                                </movable-view>
+                            </movable-area>
+                        </view>
+                    </view>
+                    <view class="content">
+                        <view class="content-des">请拖动图中的文字选择监测点位置</view>
+                        <uni-forms>
+                            <uni-data-select
+                                v-model="point.position"
+                                :localdata="positionList"
+                                @change="positionChange"
+                                disabled
+                                :clear="false"
+                            ></uni-data-select>
+                            <uni-easyinput
+                                :clearable="false"
+                                class="mt20"
+                                type="text"
+                                v-model="point.alias"
+                                @change="aliasChange"
+                                placeholder="别名（非必填）"
+                            />
+                        </uni-forms>
+                        <view class="btn-wrap">
+                            <view class="btn-wrap-item" @click="closeDrawer"> 取消</view>
+                            <view class="btn-wrap-item ml20" @click="addPoint"> 确定</view>
+                        </view>
+                    </view>
+                </scroll-view>
+            </uni-drawer>
+        </template>
+        <yk-authpup ref="authpup" type="top" @changeAuth="changeAuth" permissionID="CAMERA"></yk-authpup>
+    </view>
 </template>
 <script>
 import { registerDevice, getModel, addDevice, queryByTopoId } from '@/common/api/device.js'
 import { getProjectList, queryTopologyDiagramPage } from '@/common/api/project.js'
-
+import ykAuthpup from '@/components/yk-authpup/yk-authpup'
 export default {
-	data() {
-		return {
-			loading: false,
-			type: 1,
-			formData: {
-				nDid: '',
-				projectId: '',
-				topologyDiagramUrl: '',
-				topologyDiagram: '',
-			},
-			projectRange: [],
-			point: {},
-			isLoading: false,
-			pointList: [],
-			activeGplot: 0,
-			positionList: [],
-			imageList: [],
-			isAdaptive: false, // 是否适应当前项目
-			dialogOpen: false,
-			options: {},
-		}
-	},
-	onBackPress() {
-		if (this.dialogOpen) {
-			this.closeDrawer()
-			return true
-		} else if (this.type === 3) {
-			return false
-		} else if (this.type === 2) {
-			this.type = 1
-			return true
-		} else {
-			return false
-		}
-	},
-	onLoad(o) {
-		this.options = o
-		let dictData = uni.getStorageSync(this.$cacheKey.dictData)
-		dictData.forEach((item) => {
-			if (item.code == 'Line_Position') {
-				this.positionList = item.children.map((item) => {
-					return {
-						...item,
-						text: item.name,
-						value: item.id,
-					}
-				})
-			}
-		})
-	},
-	onShow() {
-		let engineering = uni.getStorageSync(this.$cacheKey.engineering)
-		getProjectList({
-			pageNum: 1,
-			pageSize: 9999,
-			engineeringId: engineering.id,
-		}).then((res) => {
-			console.log(res)
-			let arr = [
-				...res.data.records.map((item) => {
-					return {
-						...item,
-						text: item.name,
-						value: item.id,
-					}
-				}),
-			]
-			this.projectRange = arr
-		})
-	},
-	methods: {
-		createProject() {
-			uni.navigateTo({
-				url: '/pages/project/new?from=newDevice',
-			})
-		},
-		resize() {
-			console.log(this.$refs['gplot-image'])
-		},
-		confirmGplot() {
-			this.formData.topologyDiagramUrl = this.imageList[this.activeGplot].filePath
-			this.formData.topologyDiagram = this.imageList[this.activeGplot].id
-			this.pointList.forEach((item) => {
-				console.log(item.position)
-				this.imageList[this.activeGplot].csLineTopologyTemplateVOList.forEach((item3) => {
-					console.log(item3.linePostion)
-					if (item3.linePostion === item.position) {
-						item.lat = item3.lat
-						item.lng = item3.lng
-					}
-				})
-			})
-			console.log(this.pointList)
-			this.$forceUpdate()
-			this.closeDrawer()
-			this.$nextTick(() => {
-				this.resize()
-			})
-		},
-		queryTopologyDiagramPage() {
-			setTimeout(() => {
-				if (!this.formData.projectId) {
-					return
-				}
-				queryTopologyDiagramPage({
-					projectId: this.formData.projectId,
-				}).then((res) => {
-					this.imageList = res.data.records.map((item) => {
-						return {
-							...item,
-							filePath: this.$config.static + item.filePath,
-						}
-					})
-					this.activeGplot = 0
-					if (this.imageList.length) {
-						this.confirmGplot()
-					} else {
-						this.formData.topologyDiagramUrl = ''
-						this.formData.topologyDiagram = ''
-					}
-				})
-			}, 100)
-		},
-		aliasChange(e) {
-			this.$forceUpdate()
-		},
-		positionChange(e) {
-			console.log(e)
-		},
-		projectChange(e) {},
-		scanCode() {
-			uni.scanCode({
-				success: (res) => {
-					console.log('条码类型：' + res.scanType)
-					console.log('条码内容：' + res.result)
-					let content = JSON.parse(res.result)
-					console.log(content)
-					if (content.type === 'NDID') {
-						this.formData.nDid = content.data
-						this.register()
-					}
-				},
-			})
-		},
-		register() {
-			if (!this.formData.nDid) {
-				return this.$util.toast('请输入设备识别码')
-			}
-			this.isLoading=true
-			registerDevice(this.formData.nDid, Number(this.options.type)).then((res) => {
-				getModel(this.formData.nDid).then((res) => {
-					console.log(res)
-					this.pointList = res.data.map((item) => {
-						return {
-							lat: 0,
-							lng: 0,
-							...item,
-						}
-					})
-					this.type = 2
-					
-						this.isLoading=false
-					
-				}).catch(()=>{
-	
-					this.isLoading=false
-			})
-				
-			}).catch(()=>{
-	
-					this.isLoading=false
-			})
-		},
-		chooseLocation() {
-			uni.chooseLocation({
-				success: function (res) {
-					this.address = res.name
-					console.log('位置名称：' + res.name)
-					console.log('详细地址：' + res.address)
-					console.log('纬度：' + res.latitude)
-					console.log('经度：' + res.longitude)
-				},
-			})
-		},
-		chooseGplot() {
-			this.$refs.gplot.open()
-			this.dialogOpen = true
-		},
-		closeDrawer() {
-			this.$refs.gplot.close()
-			this.$refs.point.close()
-			this.dialogOpen = false
-		},
-		add() {
-			this.$refs.point.open()
-		},
-		addPoint() {
-			if (!this.point.position) {
-				this.$util.toast('请选择监测点')
-				return
-			}
-			if (this.point.alias) {
-				this.point.name = this.point.alias
-			} else {
-				this.positionList.forEach((item) => {
-					if (item.id == this.point.position) {
-						this.point.name = item.name
-					}
-				})
-			}
-			if (this.point.coordinate) {
-				this.point.lat = this.point.coordinate.x
-				this.point.lng = this.point.coordinate.y
-			}
-			this.pointList[this.editIndex] = this.point
-			console.log(this.pointList)
-			this.closeDrawer()
-		},
-		deletePoint(index) {
-			this.pointList.splice(index, 1)
-		},
-		editPoint(item, index) {
-			this.point = item
-			console.log(this.point)
-			this.editIndex = index
-			if (!this.point.alias) {
-				let every = this.positionList.every((item) => item.name != this.point.name)
-				console.log(every)
-				if (every) {
-					this.point.alias = this.point.name
-				} else {
-					this.point.alias = ''
-				}
-			}
-			this.dialogOpen = true
-			this.$refs.point.open()
-			this.$forceUpdate()
-		},
-		dragPoint(e) {
-			console.log(e)
-			this.point.coordinate = {
-				x: e.detail.x,
-				y: e.detail.y,
-			}
-			// this.point.lat = e.detail.x
-			// this.point.lng = e.detail.y
-		},
-		submit() {
-			if (!this.formData.projectId) {
-				return this.$util.toast('请选择项目')
-			}
-			if (!this.formData.topologyDiagram) {
-				return this.$util.toast('请选择拓扑图')
-			}
-			// 检查pointLlist监测点是否重复，并给出提示
-			let arr = []
-			this.pointList.forEach((item) => {
-				arr.push(item.position)
-			})
-			let set = new Set(arr)
-			if (set.size !== arr.length) {
-				this.$util.toast('监测点不能重复')
-				return
-			}
-			addDevice({
-				...this.formData,
-				list: this.pointList,
-				ndid: this.formData.nDid,
-				process: Number(this.options.type),
-			}).then((res) => {
-				console.log(res)
-				this.$util.toast('提交成功')
-				setTimeout(() => {
-					this.type = 3
-					uni.navigateBack({ delta: 1 })
-				}, 1500)
-			})
-		},
-	},
+    components: {
+        ykAuthpup,
+    },
+    data() {
+        return {
+            loading: false,
+            type: 1,
+            formData: {
+                nDid: '',
+                projectId: '',
+                topologyDiagramUrl: '',
+                topologyDiagram: '',
+            },
+            projectRange: [],
+            point: {},
+            isLoading: false,
+            pointList: [],
+            activeGplot: 0,
+            positionList: [],
+            imageList: [],
+            isAdaptive: false, // 是否适应当前项目
+            dialogOpen: false,
+            options: {},
+        }
+    },
+    onBackPress() {
+        if (this.dialogOpen) {
+            this.closeDrawer()
+            return true
+        } else if (this.type === 3) {
+            return false
+        } else if (this.type === 2) {
+            this.type = 1
+            return true
+        } else {
+            return false
+        }
+    },
+    onLoad(o) {
+        this.options = o
+        let dictData = uni.getStorageSync(this.$cacheKey.dictData)
+        dictData.forEach((item) => {
+            if (item.code == 'Line_Position') {
+                this.positionList = item.children.map((item) => {
+                    return {
+                        ...item,
+                        text: item.name,
+                        value: item.id,
+                    }
+                })
+            }
+        })
+    },
+    onShow() {
+        let engineering = uni.getStorageSync(this.$cacheKey.engineering)
+        getProjectList({
+            pageNum: 1,
+            pageSize: 9999,
+            engineeringId: engineering.id,
+        }).then((res) => {
+            console.log(res)
+            let arr = [
+                ...res.data.records.map((item) => {
+                    return {
+                        ...item,
+                        text: item.name,
+                        value: item.id,
+                    }
+                }),
+            ]
+            this.projectRange = arr
+        })
+    },
+    methods: {
+        createProject() {
+            uni.navigateTo({
+                url: '/pages/project/new?from=newDevice',
+            })
+        },
+        resize() {
+            console.log(this.$refs['gplot-image'])
+        },
+        confirmGplot() {
+            this.formData.topologyDiagramUrl = this.imageList[this.activeGplot].filePath
+            this.formData.topologyDiagram = this.imageList[this.activeGplot].id
+            this.pointList.forEach((item) => {
+                console.log(item.position)
+                this.imageList[this.activeGplot].csLineTopologyTemplateVOList.forEach((item3) => {
+                    console.log(item3.linePostion)
+                    if (item3.linePostion === item.position) {
+                        item.lat = item3.lat
+                        item.lng = item3.lng
+                    }
+                })
+            })
+            console.log(this.pointList)
+            this.$forceUpdate()
+            this.closeDrawer()
+            this.$nextTick(() => {
+                this.resize()
+            })
+        },
+        queryTopologyDiagramPage() {
+            setTimeout(() => {
+                if (!this.formData.projectId) {
+                    return
+                }
+                queryTopologyDiagramPage({
+                    projectId: this.formData.projectId,
+                }).then((res) => {
+                    this.imageList = res.data.records.map((item) => {
+                        return {
+                            ...item,
+                            filePath: this.$config.static + item.filePath,
+                        }
+                    })
+                    this.activeGplot = 0
+                    if (this.imageList.length) {
+                        this.confirmGplot()
+                    } else {
+                        this.formData.topologyDiagramUrl = ''
+                        this.formData.topologyDiagram = ''
+                    }
+                })
+            }, 100)
+        },
+        aliasChange(e) {
+            this.$forceUpdate()
+        },
+
+        positionChange(e) {
+            console.log(e)
+        },
+
+        projectChange(e) {},
+        scanCode() {
+            if (plus.os.name == 'Android') {
+                this.$refs['authpup'].open()
+            } else {
+                this.changeAuth()
+            }
+        },
+        changeAuth() {
+            uni.scanCode({
+                success: (res) => {
+                    console.log('条码类型：' + res.scanType)
+                    console.log('条码内容：' + res.result)
+                    let content = JSON.parse(res.result)
+                    console.log(content)
+                    if (content.type === 'NDID') {
+                        this.formData.nDid = content.data
+                        this.register()
+                    }
+                },
+            })
+        },
+        register() {
+            if (!this.formData.nDid) {
+                return this.$util.toast('请输入设备识别码')
+            }
+            this.isLoading = true
+            registerDevice(this.formData.nDid, Number(this.options.type))
+                .then((res) => {
+                    getModel(this.formData.nDid)
+                        .then((res) => {
+                            console.log(res)
+                            this.pointList = res.data.map((item) => {
+                                return {
+                                    lat: 0,
+                                    lng: 0,
+                                    ...item,
+                                }
+                            })
+                            this.type = 2
+
+                            this.isLoading = false
+                        })
+                        .catch(() => {
+                            this.isLoading = false
+                        })
+                })
+                .catch(() => {
+                    this.isLoading = false
+                })
+        },
+        chooseLocation() {
+            uni.chooseLocation({
+                success: function (res) {
+                    this.address = res.name
+                    console.log('位置名称：' + res.name)
+                    console.log('详细地址：' + res.address)
+                    console.log('纬度：' + res.latitude)
+                    console.log('经度：' + res.longitude)
+                },
+            })
+        },
+        chooseGplot() {
+            this.$refs.gplot.open()
+            this.dialogOpen = true
+        },
+        closeDrawer() {
+            this.$refs.gplot.close()
+            this.$refs.point.close()
+            this.dialogOpen = false
+        },
+        add() {
+            this.$refs.point.open()
+        },
+        addPoint() {
+            if (!this.point.position) {
+                this.$util.toast('请选择监测点')
+                return
+            }
+            if (this.point.alias) {
+                this.point.name = this.point.alias
+            } else {
+                this.positionList.forEach((item) => {
+                    if (item.id == this.point.position) {
+                        this.point.name = item.name
+                    }
+                })
+            }
+            if (this.point.coordinate) {
+                this.point.lat = this.point.coordinate.x
+                this.point.lng = this.point.coordinate.y
+            }
+            this.pointList[this.editIndex] = this.point
+            console.log(this.pointList)
+            this.closeDrawer()
+        },
+        deletePoint(index) {
+            this.pointList.splice(index, 1)
+        },
+        editPoint(item, index) {
+            this.point = item
+            console.log(this.point)
+            this.editIndex = index
+            if (!this.point.alias) {
+                let every = this.positionList.every((item) => item.name != this.point.name)
+                console.log(every)
+                if (every) {
+                    this.point.alias = this.point.name
+                } else {
+                    this.point.alias = ''
+                }
+            }
+            this.dialogOpen = true
+            this.$refs.point.open()
+            this.$forceUpdate()
+        },
+        dragPoint(e) {
+            console.log(e)
+            this.point.coordinate = {
+                x: e.detail.x,
+                y: e.detail.y,
+            }
+            // this.point.lat = e.detail.x
+            // this.point.lng = e.detail.y
+        },
+        submit() {
+            if (!this.formData.projectId) {
+                return this.$util.toast('请选择项目')
+            }
+            if (!this.formData.topologyDiagram) {
+                return this.$util.toast('请选择拓扑图')
+            }
+            // 检查pointLlist监测点是否重复，并给出提示
+            let arr = []
+            this.pointList.forEach((item) => {
+                arr.push(item.position)
+            })
+            let set = new Set(arr)
+            if (set.size !== arr.length) {
+                this.$util.toast('监测点不能重复')
+                return
+            }
+            addDevice({
+                ...this.formData,
+                list: this.pointList,
+                ndid: this.formData.nDid,
+                process: Number(this.options.type),
+            }).then((res) => {
+                console.log(res)
+                this.$util.toast('提交成功')
+                setTimeout(() => {
+                    this.type = 3
+                    uni.navigateBack({ delta: 1 })
+                }, 1500)
+            })
+        },
+    },
 }
 </script>
 <style lang="scss">
 .new {
-	padding: 34rpx;
+    padding: 34rpx;
 
-	.new-btn {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin: 80rpx auto 0;
-		width: 320rpx;
-		background: $uni-theme-color;
-		color: #fff;
-		height: 80rpx;
-		border-radius: 12rpx;
-	}
+    .new-btn {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin: 80rpx auto 0;
+        width: 320rpx;
+        background: $uni-theme-color;
+        color: #fff;
+        height: 80rpx;
+        border-radius: 12rpx;
+    }
 
-	.content {
-		.content-des {
-			font-size: 28rpx;
-			color: #666;
-			margin-bottom: 20rpx;
-		}
+    .content {
+        .content-des {
+            font-size: 28rpx;
+            color: #666;
+            margin-bottom: 20rpx;
+        }
 
-		margin-bottom: 20rpx;
-		padding: 34rpx;
-		background: $uni-theme-white;
-		border-radius: 12rpx;
-	}
+        margin-bottom: 20rpx;
+        padding: 34rpx;
+        background: $uni-theme-white;
+        border-radius: 12rpx;
+    }
 
-	.gplot {
-		position: relative;
-		width: 100%;
-		height: 188rpx;
-	}
+    .gplot {
+        position: relative;
+        width: 100%;
+        height: 188rpx;
+    }
 
-	.gplot-empty {
-		margin: 0 auto;
-		border: 1px dashed #dcdfe6;
-		color: #999;
-		height: 188rpx;
-	}
+    .gplot-empty {
+        margin: 0 auto;
+        border: 1px dashed #dcdfe6;
+        color: #999;
+        height: 188rpx;
+    }
 
-	.gplot-box {
-		height: 280rpx;
-		margin: 0 auto;
-	}
+    .gplot-box {
+        height: 280rpx;
+        margin: 0 auto;
+    }
 
-	.gplot-active::after {
-		content: '';
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		box-sizing: border-box;
-		border: 8rpx solid $uni-theme-color;
-		// background: rgba(3, 3, 3, .5);
-	}
+    .gplot-active::after {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        box-sizing: border-box;
+        border: 8rpx solid $uni-theme-color;
+        // background: rgba(3, 3, 3, .5);
+    }
 
-	.btn-wrap {
-		margin-top: 40rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
+    .btn-wrap {
+        margin-top: 40rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
 
-		.btn-wrap-item {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			flex: 1;
-			background: $uni-theme-color;
-			color: #fff;
-			height: 80rpx;
-			border-radius: 12rpx;
-		}
-	}
+        .btn-wrap-item {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            flex: 1;
+            background: $uni-theme-color;
+            color: #fff;
+            height: 80rpx;
+            border-radius: 12rpx;
+        }
+    }
 }
 
 .map-pin-box {
-	position: relative;
-	width: 375px;
-	margin: 0 auto;
+    position: relative;
+    width: 375px;
+    margin: 0 auto;
 
-	.map-pin-box-area {
-		position: absolute;
-		width: 100%;
-		height: 100%;
-		top: 0;
-		left: 0;
-	}
+    .map-pin-box-area {
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        top: 0;
+        left: 0;
+    }
 
-	.point {
-		white-space: nowrap;
-		font-size: 24rpx;
-	}
+    .point {
+        white-space: nowrap;
+        font-size: 24rpx;
+    }
 }
 
 /deep/ .uni-drawer__content {
-	width: 100vw !important;
+    width: 100vw !important;
 }
 
 .point-item {
-	height: 72rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	border-top: 2rpx solid #e5e5e5;
-	border-color: rgb(229, 229, 229);
+    height: 72rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-top: 2rpx solid #e5e5e5;
+    border-color: rgb(229, 229, 229);
 }
 
 .point-item:first-of-type {
-	border-top: none;
+    border-top: none;
 }
 
 .gplot-image {
-	position: absolute;
-	left: -9999px;
-	width: 375px;
+    position: absolute;
+    left: -9999px;
+    width: 375px;
 }
 </style>
diff --git a/pages/home/feedback.vue b/pages/home/feedback.vue
index c4beb42..64fd767 100644
--- a/pages/home/feedback.vue
+++ b/pages/home/feedback.vue
@@ -14,7 +14,9 @@
                             <uni-easyinput type="textarea" v-model="formData.description" placeholder="请输入详细描述"/>
                         </uni-forms-item>
                         <uni-forms-item label="图片">
-                            <uni-file-picker :auto-upload="false" @select="fileChange" @delete="delImg"/>
+                            <uni-file-picker :auto-upload="false"  @select="fileChange"  @delete="delImg">
+								
+							</uni-file-picker>
                         </uni-forms-item>
                     </uni-forms>
                 </view>
@@ -54,6 +56,9 @@ export default {
             console.log(e);
             this.formData.files = this.formData.files.filter(item => item.url !== e.tempFilePath)
         },
+		pickerClick(){
+			console.log(123);
+		},
         fileChange(e) {
             console.log(e);
             e.tempFilePaths.forEach(item => {
diff --git a/pages/index/mine.vue b/pages/index/mine.vue
index 74be2fb..581eafd 100644
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -120,14 +120,19 @@
 				<view style="color: #6c6c6c; margin-top: 3rpx; ">　用于相机扫描二维码!</view>
 			</uni-popup-message>
 		</uni-popup>
+		<yk-authpup ref="authpup" type="top" @changeAuth="changeAuth" permissionID="CAMERA"></yk-authpup>
+
 	</view>
 </template>
 
 <script>
 import { roleUpdate, autoLogin } from '@/common/api/user'
 import { transferDevice, shareDevice } from '@/common/api/device'
-
+import ykAuthpup from "@/components/yk-authpup/yk-authpup";
 export default {
+	    components: {
+	        ykAuthpup
+	    },
 	data() {
 		return {
 			loading: true,
@@ -183,17 +188,24 @@ export default {
 				})
 			})
 		},
+		  changeAuth(){
+		            //这里是权限通过后执行自己的代码逻辑
+		            console.log('权限已授权，可执行自己的代码逻辑了');
+						// this.handleScon()
+						this.handleScon()
+		        },
 		jump(type) {
 			switch (type) {
 				case 'scan':
 					if (
-						plus.os.name == 'Android' &&
-						plus.navigator.checkPermission('android.permission.CAMERA') === 'undetermined'
+						plus.os.name == 'Android' 
+						// &&					plus.navigator.checkPermission('android.permission.CAMERA') === 'undetermined'
 					) {
 						//未授权
+						// this.$refs.alertDialog.open('bottom')
+					 this.$refs['authpup'].open()
+					// this.$refs.message.open()
 					
-					this.$refs.message.open()
-					this.$refs.alertDialog.open('bottom')
 					} else {
 						console.log(2)
 						this.handleScon()
diff --git a/pages/mine/about.vue b/pages/mine/about.vue
index ad9d05c..d7adaaf 100644
--- a/pages/mine/about.vue
+++ b/pages/mine/about.vue
@@ -4,7 +4,7 @@
             <view class="about">
                 <image src="/static/logo.png" class="logo"></image>
                 <view class="name">灿能物联</view>
-                <view class="version">Version 1.1.1</view>
+                <view class="version">Version 1.6.0</view>
             </view>
         </view>
     </Cn-page>
diff --git a/pages/user/head.vue b/pages/user/head.vue
index c5b8470..9a3d166 100644
--- a/pages/user/head.vue
+++ b/pages/user/head.vue
@@ -1,121 +1,147 @@
 <template>
-	<view>
-		<Cn-page :loading="loading">
-			<view slot="body">
-				<view class="head">
-					<image class="head-img" :src="userInfo.avatar" v-if="userInfo.avatar"></image>
-					<image class="head-img" src="/static/head.png" v-else></image>
-					<view class="head-setup">
-						<view class="head-setup-item" @click="take('album')">从相册选一张</view>
-						<view class="head-setup-item" @click="take('camera')">拍一张照片</view>
-					</view>
-				</view>
-			</view>
-		</Cn-page>
+    <view>
+        <Cn-page :loading="loading">
+            <view slot="body">
+                <view class="head">
+                    <image class="head-img" :src="userInfo.avatar" v-if="userInfo.avatar"></image>
+                    <image class="head-img" src="/static/head.png" v-else></image>
+                    <view class="head-setup">
+                        <view class="head-setup-item" @click="take('album')">从相册选一张</view>
+                        <view class="head-setup-item" @click="take('camera')">拍一张照片</view>
+                    </view>
+                </view>
+            </view>
+        </Cn-page>
 
-		<uni-popup ref="alertDialog" type="dialog">
-			<uni-popup-dialog
-				style="width: 90%; margin: 5%"
-				cancelText="禁止"
-				confirmText="允许"
-				title="权限说明"
-				content='是否允许"灿能物联"使用相机?'
-				@confirm="handleScon('camera')"
-				@close="dialogClose"
-			></uni-popup-dialog>
-		</uni-popup>
-		<uni-popup ref="message" type="message">
-			<uni-popup-message type="info" :duration="0" style="width: 90%; margin: 5%">
-				<view style="color: #909399; font-style: 16px">相机权限使用说明:</view>
-				<view style="color: #6c6c6c; margin-top: 3rpx; ">　用于拍照上传头像!</view>
-			</uni-popup-message>
-		</uni-popup>
-	</view>
+        <uni-popup ref="alertDialog" type="dialog">
+            <uni-popup-dialog
+                style="width: 90%; margin: 5%"
+                cancelText="禁止"
+                confirmText="允许"
+                title="权限说明"
+                content='是否允许"灿能物联"使用相机?'
+                @confirm="handleScon('camera')"
+                @close="dialogClose"
+            ></uni-popup-dialog>
+        </uni-popup>
+        <uni-popup ref="message" type="message">
+            <uni-popup-message type="info" :duration="0" style="width: 90%; margin: 5%">
+                <view style="color: #909399; font-style: 16px">相机权限使用说明:</view>
+                <view style="color: #6c6c6c; margin-top: 3rpx">　用于拍照上传头像!</view>
+            </uni-popup-message>
+        </uni-popup>
+        <yk-authpup ref="authpup" type="top" @changeAuth="changeAuth" permissionID="CAMERA"></yk-authpup>
+        <yk-authpup
+            ref="authpup1"
+            type="top"
+            @changeAuth="changeAuth"
+            permissionID="WRITE_EXTERNAL_STORAGE"
+        ></yk-authpup>
+    </view>
 </template>
 <script>
 import { uploadImage, getImageUrl } from '@/common/api/basic'
 import { apiUpdateUser } from '@/common/api/user'
+import ykAuthpup from '@/components/yk-authpup/yk-authpup'
 export default {
-	data() {
-		return {
-			loading: false,
-			userInfo: {},
-		}
-	},
-	methods: {
-		take(type) {
-			if (type == 'camera') {
-				if (
-					plus.os.name == 'Android' &&
-					plus.navigator.checkPermission('android.permission.CAMERA') === 'undetermined'
-				) {
-					//未授权
-					this.$refs.message.open()
-					this.$refs.alertDialog.open('bottom')
-				} else {
-					this.handleScon(type)
-				}
-			} else {
-				this.handleScon(type)
-			}
-		},
-		handleScon(type) {
-				this.$refs.message.close()
-			uni.chooseImage({
-				count: 1,
-				sizeType: ['original', 'compressed'],
-				sourceType: [type],
-				success: (res) => {
-				
-					uploadImage(res.tempFilePaths[0]).then((res) => {
-						console.log(res)
-						let result = JSON.parse(res[1].data)
-						apiUpdateUser({
-							headSculpture: result.data.minFileUrl,
-						}).then((res) => {
-							console.log(res)
-							this.userInfo.headSculpture = result.data.minFileUrl
-							this.userInfo.avatar = this.$config.static + result.data.minFileUrl
-							uni.setStorageSync(this.$cacheKey.userInfo, this.userInfo)
-							this.$forceUpdate()
-						})
-					})
-				},
-			})
-		},
-		dialogClose() {this.$refs.message.close()},
-	},
+    components: {
+        ykAuthpup,
+    },
+    data() {
+        return {
+            loading: false,
+            userInfo: {},
+            type: '',
+        }
+    },
+    methods: {
+        take(type) {
+            this.type = type
+            if (type == 'camera') {
+                if (plus.os.name == 'Android') {
+                    this.$refs['authpup'].open()
+                    //未授权
+                    // this.$refs.message.open()
+                    // this.$refs.alertDialog.open('bottom')
+                } else {
+                    this.handleScon(type)
+                }
+            } else {
+                if (plus.os.name == 'Android') {
+                    this.$refs['authpup1'].open()
+                    //未授权
+                    // this.$refs.message.open()
+                    // this.$refs.alertDialog.open('bottom')
+                } else {
+                    this.handleScon(type)
+                }
+                // this.handleScon(type)、
+            }
+        },
+        changeAuth() {
+            //这里是权限通过后执行自己的代码逻辑
+            console.log('权限已授权，可执行自己的代码逻辑了')
+            // this.handleScon()
+            this.handleScon(this.type)
+        },
+        handleScon(type) {
+            this.$refs.message.close()
+            uni.chooseImage({
+                count: 1,
+                sizeType: ['original', 'compressed'],
+                sourceType: [type],
+                success: (res) => {
+                    uploadImage(res.tempFilePaths[0]).then((res) => {
+                        console.log(res)
+                        let result = JSON.parse(res[1].data)
+                        apiUpdateUser({
+                            headSculpture: result.data.minFileUrl,
+                        }).then((res) => {
+                            console.log(res)
+                            this.userInfo.headSculpture = result.data.minFileUrl
+                            this.userInfo.avatar = this.$config.static + result.data.minFileUrl
+                            uni.setStorageSync(this.$cacheKey.userInfo, this.userInfo)
+                            this.$forceUpdate()
+                        })
+                    })
+                },
+            })
+        },
+        dialogClose() {
+            this.$refs.message.close()
+        },
+    },
 
-	onLoad(options) {
-		this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
-	},
+    onLoad(options) {
+        this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
+    },
 }
 </script>
 <style lang="scss">
 .head {
-	.head-img {
-		height: 750rpx;
-		width: 750rpx;
-	}
+    .head-img {
+        height: 750rpx;
+        width: 750rpx;
+    }
 
-	.head-setup {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		width: 750rpx;
-		padding-bottom: 60rpx;
-		background-color: #fff;
+    .head-setup {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 750rpx;
+        padding-bottom: 60rpx;
+        background-color: #fff;
 
-		.head-setup-item {
-			height: 100rpx;
-			line-height: 100rpx;
-			text-align: center;
-			border-top: 1rpx solid #e8e8e8;
-		}
-	}
+        .head-setup-item {
+            height: 100rpx;
+            line-height: 100rpx;
+            text-align: center;
+            border-top: 1rpx solid #e8e8e8;
+        }
+    }
 }
 /deep/ .uni-popup-message__box {
-	border-radius: 10rpx !important;
-	background-color: #fff;
+    border-radius: 10rpx !important;
+    background-color: #fff;
 }
 </style>
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
index 04ecdcf..023b33e 100644
--- a/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
@@ -1,665 +1,683 @@
-<template>
-	<view class="uni-file-picker">
-		<view v-if="title" class="uni-file-picker__header">
-			<text class="file-title">{{ title }}</text>
-			<!-- <text class="file-count">{{ filesList.length }}/{{ limitLength }}</text> -->
-		</view>
-		<upload-image v-if="fileMediatype === 'image' && showType === 'grid'" :readonly="readonly"
-			:image-styles="imageStyles" :files-list="filesList" :limit="limitLength" :disablePreview="disablePreview"
-			:delIcon="delIcon" @uploadFiles="uploadFiles" @choose="choose" @delFile="delFile">
-			<slot>
-				<view class="is-add">
-					<view class="icon-add"></view>
-					<view class="icon-add rotate"></view>
-				</view>
-			</slot>
-		</upload-image>
-		<upload-file v-if="fileMediatype !== 'image' || showType !== 'grid'" :readonly="readonly"
-			:list-styles="listStyles" :files-list="filesList" :showType="showType" :delIcon="delIcon"
-			@uploadFiles="uploadFiles" @choose="choose" @delFile="delFile">
-			<slot><button type="primary" size="mini">选择文件</button></slot>
+<template>
+	<view class="uni-file-picker">
+		<view v-if="title" class="uni-file-picker__header">
+			<text class="file-title">{{ title }}</text>
+			<!-- <text class="file-count">{{ filesList.length }}/{{ limitLength }}</text> -->
+		</view>
+		<upload-image
+			v-if="fileMediatype === 'image' && showType === 'grid'"
+			:readonly="readonly"
+			:image-styles="imageStyles"
+			:files-list="filesList"
+			:limit="limitLength"
+			:disablePreview="disablePreview"
+			:delIcon="delIcon"
+			@uploadFiles="uploadFiles"
+			@choose="choose"
+			@delFile="delFile"
+		>
+			<slot>
+				<view class="is-add">
+					<view class="icon-add"></view>
+					<view class="icon-add rotate"></view>
+				</view>
+			</slot>
+		</upload-image>
+		<upload-file
+			v-if="fileMediatype !== 'image' || showType !== 'grid'"
+			:readonly="readonly"
+			:list-styles="listStyles"
+			:files-list="filesList"
+			:showType="showType"
+			:delIcon="delIcon"
+			@uploadFiles="uploadFiles"
+			@choose="choose"
+			@delFile="delFile"
+		>
+			<slot><button type="primary" size="mini">选择文件</button></slot>
 		</upload-file>
-	</view>
-</template>
-
-<script>
-	import {
-		chooseAndUploadFile,
-		uploadCloudFiles
-	} from './choose-and-upload-file.js'
-	import {
-		get_file_ext,
-		get_extname,
-		get_files_and_is_max,
-		get_file_info,
-		get_file_data
-	} from './utils.js'
-	import uploadImage from './upload-image.vue'
-	import uploadFile from './upload-file.vue'
-	let fileInput = null
-	/**
-	 * FilePicker 文件选择上传
-	 * @description 文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=4079
-	 * @property {Object|Array}	value	组件数据，通常用来回显 ,类型由return-type属性决定
-	 * @property {Boolean}	disabled = [true|false]	组件禁用
-	 * 	@value true 	禁用
-	 * 	@value false 	取消禁用
-	 * @property {Boolean}	readonly = [true|false]	组件只读，不可选择，不显示进度，不显示删除按钮
-	 * 	@value true 	只读
-	 * 	@value false 	取消只读
-	 * @property {String}	return-type = [array|object]	限制 value 格式，当为 object 时 ，组件只能单选，且会覆盖
-	 * 	@value array	规定 value 属性的类型为数组
-	 * 	@value object	规定 value 属性的类型为对象
-	 * @property {Boolean}	disable-preview = [true|false]	禁用图片预览，仅 mode:grid 时生效
-	 * 	@value true 	禁用图片预览
-	 * 	@value false 	取消禁用图片预览
-	 * @property {Boolean}	del-icon = [true|false]	是否显示删除按钮
-	 * 	@value true 	显示删除按钮
-	 * 	@value false 	不显示删除按钮
-	 * @property {Boolean}	auto-upload = [true|false]	是否自动上传，值为true则只触发@select,可自行上传
-	 * 	@value true 	自动上传
-	 * 	@value false 	取消自动上传
-	 * @property {Number|String}	limit	最大选择个数 ，h5 会自动忽略多选的部分
-	 * @property {String}	title	组件标题，右侧显示上传计数
-	 * @property {String}	mode = [list|grid]	选择文件后的文件列表样式
-	 * 	@value list 	列表显示
-	 * 	@value grid 	宫格显示
-	 * @property {String}	file-mediatype = [image|video|all]	选择文件类型
-	 * 	@value image	只选择图片
-	 * 	@value video	只选择视频
-	 * 	@value all		选择所有文件
-	 * @property {Array}	file-extname	选择文件后缀，根据 file-mediatype 属性而不同
-	 * @property {Object}	list-style	mode:list 时的样式
-	 * @property {Object}	image-styles	选择文件后缀，根据 file-mediatype 属性而不同
-	 * @event {Function} select 	选择文件后触发
-	 * @event {Function} progress 文件上传时触发
-	 * @event {Function} success 	上传成功触发
-	 * @event {Function} fail 		上传失败触发
-	 * @event {Function} delete 	文件从列表移除时触发
-	 */
-	export default {
-		name: 'uniFilePicker',
-		components: {
-			uploadImage,
-			uploadFile
-		},
-		options: {
-			virtualHost: true
-		},
-		emits: ['select', 'success', 'fail', 'progress', 'delete', 'update:modelValue', 'input'],
-		props: {
-			// #ifdef VUE3
-			modelValue: {
-				type: [Array, Object],
-				default () {
-					return []
-				}
-			},
-			// #endif
-
-			// #ifndef VUE3
-			value: {
-				type: [Array, Object],
-				default () {
-					return []
-				}
-			},
-			// #endif
-            beforeRemove: {
-                type: Function,
-                default: () => {}
-            },
-			disabled: {
-				type: Boolean,
-				default: false
-			},
-			disablePreview: {
-				type: Boolean,
-				default: false
-			},
-			delIcon: {
-				type: Boolean,
-				default: true
-			},
-			// 自动上传
-			autoUpload: {
-				type: Boolean,
-				default: true
-			},
-			// 最大选择个数 ，h5只能限制单选或是多选
-			limit: {
-				type: [Number, String],
-				default: 9
-			},
-			// 列表样式 grid | list | list-card
-			mode: {
-				type: String,
-				default: 'grid'
-			},
-			// 选择文件类型  image/video/all
-			fileMediatype: {
-				type: String,
-				default: 'image'
-			},
-			// 文件类型筛选
-			fileExtname: {
-				type: [Array, String],
-				default () {
-					return []
-				}
-			},
-			title: {
-				type: String,
-				default: ''
-			},
-			listStyles: {
-				type: Object,
-				default () {
-					return {
-						// 是否显示边框
-						border: true,
-						// 是否显示分隔线
-						dividline: true,
-						// 线条样式
-						borderStyle: {}
-					}
-				}
-			},
-			imageStyles: {
-				type: Object,
-				default () {
-					return {
-						width: 'auto',
-						height: 'auto'
-					}
-				}
-			},
-			readonly: {
-				type: Boolean,
-				default: false
-			},
-			returnType: {
-				type: String,
-				default: 'array'
-			},
-			sizeType: {
-				type: Array,
-				default () {
-					return ['original', 'compressed']
-				}
+		
+	</view>
+</template>
+
+<script>
+import { chooseAndUploadFile, uploadCloudFiles } from './choose-and-upload-file.js'
+import { get_file_ext, get_extname, get_files_and_is_max, get_file_info, get_file_data } from './utils.js'
+import uploadImage from './upload-image.vue'
+import uploadFile from './upload-file.vue'
+let fileInput = null
+/**
+ * FilePicker 文件选择上传
+ * @description 文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=4079
+ * @property {Object|Array}	value	组件数据，通常用来回显 ,类型由return-type属性决定
+ * @property {Boolean}	disabled = [true|false]	组件禁用
+ * 	@value true 	禁用
+ * 	@value false 	取消禁用
+ * @property {Boolean}	readonly = [true|false]	组件只读，不可选择，不显示进度，不显示删除按钮
+ * 	@value true 	只读
+ * 	@value false 	取消只读
+ * @property {String}	return-type = [array|object]	限制 value 格式，当为 object 时 ，组件只能单选，且会覆盖
+ * 	@value array	规定 value 属性的类型为数组
+ * 	@value object	规定 value 属性的类型为对象
+ * @property {Boolean}	disable-preview = [true|false]	禁用图片预览，仅 mode:grid 时生效
+ * 	@value true 	禁用图片预览
+ * 	@value false 	取消禁用图片预览
+ * @property {Boolean}	del-icon = [true|false]	是否显示删除按钮
+ * 	@value true 	显示删除按钮
+ * 	@value false 	不显示删除按钮
+ * @property {Boolean}	auto-upload = [true|false]	是否自动上传，值为true则只触发@select,可自行上传
+ * 	@value true 	自动上传
+ * 	@value false 	取消自动上传
+ * @property {Number|String}	limit	最大选择个数 ，h5 会自动忽略多选的部分
+ * @property {String}	title	组件标题，右侧显示上传计数
+ * @property {String}	mode = [list|grid]	选择文件后的文件列表样式
+ * 	@value list 	列表显示
+ * 	@value grid 	宫格显示
+ * @property {String}	file-mediatype = [image|video|all]	选择文件类型
+ * 	@value image	只选择图片
+ * 	@value video	只选择视频
+ * 	@value all		选择所有文件
+ * @property {Array}	file-extname	选择文件后缀，根据 file-mediatype 属性而不同
+ * @property {Object}	list-style	mode:list 时的样式
+ * @property {Object}	image-styles	选择文件后缀，根据 file-mediatype 属性而不同
+ * @event {Function} select 	选择文件后触发
+ * @event {Function} progress 文件上传时触发
+ * @event {Function} success 	上传成功触发
+ * @event {Function} fail 		上传失败触发
+ * @event {Function} delete 	文件从列表移除时触发
+ */
+export default {
+	name: 'uniFilePicker',
+	components: {
+		uploadImage,
+		uploadFile,
+	},
+	options: {
+		virtualHost: true,
+	},
+	emits: ['select', 'success', 'fail', 'progress', 'delete', 'update:modelValue', 'input'],
+	props: {
+		// #ifdef VUE3
+		modelValue: {
+			type: [Array, Object],
+			default() {
+				return []
+			},
+		},
+		// #endif
+
+		// #ifndef VUE3
+		value: {
+			type: [Array, Object],
+			default() {
+				return []
+			},
+		},
+		// #endif
+		beforeRemove: {
+			type: Function,
+			default: () => {},
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+		disablePreview: {
+			type: Boolean,
+			default: false,
+		},
+		delIcon: {
+			type: Boolean,
+			default: true,
+		},
+		// 自动上传
+		autoUpload: {
+			type: Boolean,
+			default: true,
+		},
+		// 最大选择个数 ，h5只能限制单选或是多选
+		limit: {
+			type: [Number, String],
+			default: 9,
+		},
+		// 列表样式 grid | list | list-card
+		mode: {
+			type: String,
+			default: 'grid',
+		},
+		// 选择文件类型  image/video/all
+		fileMediatype: {
+			type: String,
+			default: 'image',
+		},
+		// 文件类型筛选
+		fileExtname: {
+			type: [Array, String],
+			default() {
+				return []
+			},
+		},
+		title: {
+			type: String,
+			default: '',
+		},
+		listStyles: {
+			type: Object,
+			default() {
+				return {
+					// 是否显示边框
+					border: true,
+					// 是否显示分隔线
+					dividline: true,
+					// 线条样式
+					borderStyle: {},
+				}
+			},
+		},
+		imageStyles: {
+			type: Object,
+			default() {
+				return {
+					width: 'auto',
+					height: 'auto',
+				}
+			},
+		},
+		readonly: {
+			type: Boolean,
+			default: false,
+		},
+		returnType: {
+			type: String,
+			default: 'array',
+		},
+		sizeType: {
+			type: Array,
+			default() {
+				return ['original', 'compressed']
+			},
+		},
+		sourceType: {
+			type: Array,
+			default() {
+				return ['camera', 'album']
+			},
+		},
+	},
+	data() {
+		return {
+			files: [],
+			localValue: [],
+		}
+	},
+	watch: {
+		// #ifndef VUE3
+		value: {
+			handler(newVal, oldVal) {
+				this.setValue(newVal, oldVal)
+			},
+			immediate: true,
+		},
+		// #endif
+		// #ifdef VUE3
+		modelValue: {
+			handler(newVal, oldVal) {
+				this.setValue(newVal, oldVal)
+			},
+			immediate: true,
+		},
+		// #endif
+	},
+	computed: {
+		filesList() {
+			let files = []
+			this.files.forEach((v) => {
+				files.push(v)
+			})
+			return files
+		},
+		showType() {
+			if (this.fileMediatype === 'image') {
+				return this.mode
+			}
+			return 'list'
+		},
+		limitLength() {
+			if (this.returnType === 'object') {
+				return 1
+			}
+			if (!this.limit) {
+				return 1
+			}
+			if (this.limit >= 9) {
+				return 9
+			}
+			return this.limit
+		},
+	},
+	created() {
+		// TODO 兼容不开通服务空间的情况
+		if (!(uniCloud.config && uniCloud.config.provider)) {
+			this.noSpace = true
+			uniCloud.chooseAndUploadFile = chooseAndUploadFile
+		}
+		this.form = this.getForm('uniForms')
+		this.formItem = this.getForm('uniFormsItem')
+		if (this.form && this.formItem) {
+			if (this.formItem.name) {
+				this.rename = this.formItem.name
+				this.form.inputChildrens.push(this)
+			}
+		}
+	},
+	methods: {
+		/**
+		 * 公开用户使用，清空文件
+		 * @param {Object} index
+		 */
+		clearFiles(index) {
+			if (index !== 0 && !index) {
+				this.files = []
+				this.$nextTick(() => {
+					this.setEmit()
+				})
+			} else {
+				this.files.splice(index, 1)
+			}
+			this.$nextTick(() => {
+				this.setEmit()
+			})
+		},
+		/**
+		 * 公开用户使用，继续上传
+		 */
+		upload() {
+			let files = []
+			this.files.forEach((v, index) => {
+				if (v.status === 'ready' || v.status === 'error') {
+					files.push(Object.assign({}, v))
+				}
+			})
+			return this.uploadFiles(files)
+		},
+		async setValue(newVal, oldVal) {
+			const newData = async (v) => {
+				const reg = /cloud:\/\/([\w.]+\/?)\S*/
+				let url = ''
+				if (v.fileID) {
+					url = v.fileID
+				} else {
+					url = v.url
+				}
+				if (reg.test(url)) {
+					v.fileID = url
+					v.url = await this.getTempFileURL(url)
+				}
+				if (v.url) v.path = v.url
+				return v
+			}
+			if (this.returnType === 'object') {
+				if (newVal) {
+					await newData(newVal)
+				} else {
+					newVal = {}
+				}
+			} else {
+				if (!newVal) newVal = []
+				for (let i = 0; i < newVal.length; i++) {
+					let v = newVal[i]
+					await newData(v)
+				}
+			}
+			this.localValue = newVal
+			if (this.form && this.formItem && !this.is_reset) {
+				this.is_reset = false
+				this.formItem.setValue(this.localValue)
+			}
+			let filesData = Object.keys(newVal).length > 0 ? newVal : []
+			this.files = [].concat(filesData)
+		},
+
+		/**
+		 * 选择文件
+		 */
+		choose(type) {
+			if (this.disabled) return
+			if (
+				this.files.length >= Number(this.limitLength) &&
+				this.showType !== 'grid' &&
+				this.returnType === 'array'
+			) {
+				uni.showToast({
+					title: `您最多选择 ${this.limitLength} 个文件`,
+					icon: 'none',
+				})
+				return
 			}
-		},
-		data() {
-			return {
-				files: [],
-				localValue: []
-			}
-		},
-		watch: {
-			// #ifndef VUE3
-			value: {
-				handler(newVal, oldVal) {
-					this.setValue(newVal, oldVal)
-				},
-				immediate: true
-			},
-			// #endif
-			// #ifdef VUE3
-			modelValue: {
-				handler(newVal, oldVal) {
-					this.setValue(newVal, oldVal)
-				},
-				immediate: true
-			},
-			// #endif
-		},
-		computed: {
-			filesList() {
-				let files = []
-				this.files.forEach(v => {
-					files.push(v)
-				})
-				return files
-			},
-			showType() {
-				if (this.fileMediatype === 'image') {
-					return this.mode
-				}
-				return 'list'
-			},
-			limitLength() {
-				if (this.returnType === 'object') {
-					return 1
-				}
-				if (!this.limit) {
-					return 1
-				}
-				if (this.limit >= 9) {
-					return 9
-				}
-				return this.limit
-			}
-		},
-		created() {
-			// TODO 兼容不开通服务空间的情况
-			if (!(uniCloud.config && uniCloud.config.provider)) {
-				this.noSpace = true
-				uniCloud.chooseAndUploadFile = chooseAndUploadFile
-			}
-			this.form = this.getForm('uniForms')
-			this.formItem = this.getForm('uniFormsItem')
-			if (this.form && this.formItem) {
-				if (this.formItem.name) {
-					this.rename = this.formItem.name
-					this.form.inputChildrens.push(this)
-				}
-			}
-		},
-		methods: {
-			/**
-			 * 公开用户使用，清空文件
-			 * @param {Object} index
-			 */
-			clearFiles(index) {
-				if (index !== 0 && !index) {
-					this.files = []
-					this.$nextTick(() => {
-						this.setEmit()
-					})
-				} else {
-					this.files.splice(index, 1)
-				}
-				this.$nextTick(() => {
-					this.setEmit()
-				})
-			},
-			/**
-			 * 公开用户使用，继续上传
-			 */
-			upload() {
-				let files = []
-				this.files.forEach((v, index) => {
-					if (v.status === 'ready' || v.status === 'error') {
-						files.push(Object.assign({}, v))
-					}
-				})
-				return this.uploadFiles(files)
-			},
-			async setValue(newVal, oldVal) {
-				const newData =  async (v) => {
-					const reg = /cloud:\/\/([\w.]+\/?)\S*/
-					let url = ''
-					if(v.fileID){
-						url = v.fileID
-					}else{
-						url = v.url
-					}
-					if (reg.test(url)) {
-						v.fileID = url
-						v.url = await this.getTempFileURL(url)
-					}
-					if(v.url) v.path = v.url
-					return v
-				}
-				if (this.returnType === 'object') {
-					if (newVal) {
-						await newData(newVal)
-					} else {
-						newVal = {}
-					}
-				} else {
-					if (!newVal) newVal = []
-					for(let i =0 ;i < newVal.length ;i++){
-						let v = newVal[i]
-						await newData(v)
-					}
-				}
-				this.localValue = newVal
-				if (this.form && this.formItem &&!this.is_reset) {
-					this.is_reset = false
-					this.formItem.setValue(this.localValue)
-				}
-				let filesData = Object.keys(newVal).length > 0 ? newVal : [];
-				this.files = [].concat(filesData)
-			},
-
-			/**
-			 * 选择文件
-			 */
-			choose() {
-
-				if (this.disabled) return
-				if (this.files.length >= Number(this.limitLength) && this.showType !== 'grid' && this.returnType ===
-					'array') {
-					uni.showToast({
-						title: `您最多选择 ${this.limitLength} 个文件`,
-						icon: 'none'
-					})
-					return
-				}
-				this.chooseFiles()
-			},
-
-			/**
-			 * 选择文件并上传
-			 */
-			chooseFiles() {
-				const _extname = get_extname(this.fileExtname)
-				// 获取后缀
-				uniCloud
-					.chooseAndUploadFile({
-						type: this.fileMediatype,
-						compressed: false,
-						sizeType: this.sizeType,
-						// TODO 如果为空，video 有问题
-						extension: _extname.length > 0 ? _extname : undefined,
-						count: this.limitLength - this.files.length, //默认9
-						onChooseFile: this.chooseFileCallback,
-						onUploadProgress: progressEvent => {
-							this.setProgress(progressEvent, progressEvent.index)
-						}
-					})
-					.then(result => {
-						this.setSuccessAndError(result.tempFiles)
-					})
-					.catch(err => {
-						console.log('选择失败', err)
-					})
-			},
-
-			/**
-			 * 选择文件回调
-			 * @param {Object} res
-			 */
-			async chooseFileCallback(res) {
-				const _extname = get_extname(this.fileExtname)
-				const is_one = (Number(this.limitLength) === 1 &&
-						this.disablePreview &&
-						!this.disabled) ||
-					this.returnType === 'object'
-				// 如果这有一个文件 ，需要清空本地缓存数据
-				if (is_one) {
-					this.files = []
-				}
-
-				let {
-					filePaths,
-					files
-				} = get_files_and_is_max(res, _extname)
-				if (!(_extname && _extname.length > 0)) {
-					filePaths = res.tempFilePaths
-					files = res.tempFiles
-				}
-
-				let currentData = []
-				for (let i = 0; i < files.length; i++) {
-					if (this.limitLength - this.files.length <= 0) break
-					files[i].uuid = Date.now()
-					let filedata = await get_file_data(files[i], this.fileMediatype)
-					filedata.progress = 0
-					filedata.status = 'ready'
-					this.files.push(filedata)
-					currentData.push({
-						...filedata,
-						file: files[i]
-					})
-				}
-				this.$emit('select', {
-					tempFiles: currentData,
-					tempFilePaths: filePaths
-				})
-				res.tempFiles = files
-				// 停止自动上传
-				if (!this.autoUpload || this.noSpace) {
-					res.tempFiles = []
-				}
-			},
-
-			/**
-			 * 批传
-			 * @param {Object} e
-			 */
-			uploadFiles(files) {
-				files = [].concat(files)
-				return uploadCloudFiles.call(this, files, 5, res => {
-						this.setProgress(res, res.index, true)
-					})
-					.then(result => {
-						this.setSuccessAndError(result)
-						return result;
-					})
-					.catch(err => {
-						console.log(err)
-					})
-			},
-
-			/**
-			 * 成功或失败
-			 */
-			async setSuccessAndError(res, fn) {
-				let successData = []
-				let errorData = []
-				let tempFilePath = []
-				let errorTempFilePath = []
-				for (let i = 0; i < res.length; i++) {
-					const item = res[i]
-					const index = item.uuid ? this.files.findIndex(p => p.uuid === item.uuid) : item.index
-
-					if (index === -1 || !this.files) break
-					if (item.errMsg === 'request:fail') {
-						this.files[index].url = item.path
-						this.files[index].status = 'error'
-						this.files[index].errMsg = item.errMsg
-						// this.files[index].progress = -1
-						errorData.push(this.files[index])
-						errorTempFilePath.push(this.files[index].url)
-					} else {
-						this.files[index].errMsg = ''
-						this.files[index].fileID = item.url
-						const reg = /cloud:\/\/([\w.]+\/?)\S*/
-						if (reg.test(item.url)) {
-							this.files[index].url = await this.getTempFileURL(item.url)
-						}else{
-							this.files[index].url = item.url
-						}
-
-						this.files[index].status = 'success'
-						this.files[index].progress += 1
-						successData.push(this.files[index])
-						tempFilePath.push(this.files[index].fileID)
-					}
-				}
-
-				if (successData.length > 0) {
-					this.setEmit()
-					// 状态改变返回
-					this.$emit('success', {
-						tempFiles: this.backObject(successData),
-						tempFilePaths: tempFilePath
-					})
-				}
-
-				if (errorData.length > 0) {
-					this.$emit('fail', {
-						tempFiles: this.backObject(errorData),
-						tempFilePaths: errorTempFilePath
-					})
-				}
-			},
-
-			/**
-			 * 获取进度
-			 * @param {Object} progressEvent
-			 * @param {Object} index
-			 * @param {Object} type
-			 */
-			setProgress(progressEvent, index, type) {
-				const fileLenth = this.files.length
-				const percentNum = (index / fileLenth) * 100
-				const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total)
-				let idx = index
-				if (!type) {
-					idx = this.files.findIndex(p => p.uuid === progressEvent.tempFile.uuid)
-				}
-				if (idx === -1 || !this.files[idx]) return
-				// fix by mehaotian 100 就会消失，-1 是为了让进度条消失
-				this.files[idx].progress = percentCompleted - 1
-				// 上传中
-				this.$emit('progress', {
-					index: idx,
-					progress: parseInt(percentCompleted),
-					tempFile: this.files[idx]
-				})
-			},
-
-			/**
-			 * 删除文件
-			 * @param {Object} index
-			 */
-			async delFile(index) {
-                let res = await this.beforeRemove({
-                    tempFile: this.files[index],
-                    tempFilePath: this.files[index].url
-                })
-                if (res === false) return
-				this.$emit('delete', {
-					tempFile: this.files[index],
-					tempFilePath: this.files[index].url
-				})
-				this.files.splice(index, 1)
-				this.$nextTick(() => {
-					this.setEmit()
-				})
-			},
-
-			/**
-			 * 获取文件名和后缀
-			 * @param {Object} name
-			 */
-			getFileExt(name) {
-				const last_len = name.lastIndexOf('.')
-				const len = name.length
-				return {
-					name: name.substring(0, last_len),
-					ext: name.substring(last_len + 1, len)
-				}
-			},
-
-			/**
-			 * 处理返回事件
-			 */
-			setEmit() {
-				let data = []
-				if (this.returnType === 'object') {
-					data = this.backObject(this.files)[0]
-					this.localValue = data?data:null
-				} else {
-					data = this.backObject(this.files)
-					if (!this.localValue) {
-						this.localValue = []
-					}
-					this.localValue = [...data]
-				}
-				// #ifdef VUE3
-				this.$emit('update:modelValue', this.localValue)
-				// #endif
-				// #ifndef VUE3
-				this.$emit('input', this.localValue)
-				// #endif
-			},
-
-			/**
-			 * 处理返回参数
-			 * @param {Object} files
-			 */
-			backObject(files) {
-				let newFilesData = []
-				files.forEach(v => {
-					newFilesData.push({
-                        ...v,
-						extname: v.extname,
-						fileType: v.fileType,
-						image: v.image,
-						name: v.name,
-						path: v.path,
-						size: v.size,
-						fileID:v.fileID,
-						url: v.url
-					})
-				})
-				return newFilesData
-			},
-			async getTempFileURL(fileList) {
-				fileList = {
-					fileList: [].concat(fileList)
-				}
-				const urls = await uniCloud.getTempFileURL(fileList)
-				return urls.fileList[0].tempFileURL || ''
-			},
-			/**
-			 * 获取父元素实例
-			 */
-			getForm(name = 'uniForms') {
-				let parent = this.$parent;
-				let parentName = parent.$options.name;
-				while (parentName !== name) {
-					parent = parent.$parent;
-					if (!parent) return false;
-					parentName = parent.$options.name;
-				}
-				return parent;
-			}
-		}
-	}
-</script>
-
-<style>
-	.uni-file-picker {
-		/* #ifndef APP-NVUE */
-		box-sizing: border-box;
-		overflow: hidden;
-		width: 100%;
-		/* #endif */
-		flex: 1;
-	}
-
-	.uni-file-picker__header {
-		padding-top: 5px;
-		padding-bottom: 10px;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: space-between;
-	}
-
-	.file-title {
-		font-size: 14px;
-		color: #333;
-	}
-
-	.file-count {
-		font-size: 14px;
-		color: #999;
-	}
-
-	.is-add {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		align-items: center;
-		justify-content: center;
-	}
-
-	.icon-add {
-		width: 50px;
-		height: 5px;
-		background-color: #f1f1f1;
-		border-radius: 2px;
-	}
-
-	.rotate {
-		position: absolute;
-		transform: rotate(90deg);
-	}
-</style>
+			
+			this.chooseFiles(type)
+		},
+
+		/**
+		 * 选择文件并上传
+		 */
+		chooseFiles(type) {
+			const _extname = get_extname(this.fileExtname)
+			
+			// 获取后缀
+			uniCloud
+				.chooseAndUploadFile({
+					type: this.fileMediatype,
+					compressed: false,
+					sourceType: [type],//type? :this.sourceType ,
+					sizeType: this.sizeType,
+					// TODO 如果为空，video 有问题
+					extension: _extname.length > 0 ? _extname : undefined,
+					count: this.limitLength - this.files.length, //默认9
+					onChooseFile: this.chooseFileCallback,
+					onUploadProgress: (progressEvent) => {
+						this.setProgress(progressEvent, progressEvent.index)
+					},
+				})
+				.then((result) => {
+					console.log('选择失败', result)
+					this.setSuccessAndError(result.tempFiles)
+				})
+				.catch((err) => {
+					console.log('选择失败', err)
+				})
+		},
+
+		/**
+		 * 选择文件回调
+		 * @param {Object} res
+		 */
+		async chooseFileCallback(res) {
+			const _extname = get_extname(this.fileExtname)
+			const is_one =
+				(Number(this.limitLength) === 1 && this.disablePreview && !this.disabled) ||
+				this.returnType === 'object'
+			// 如果这有一个文件 ，需要清空本地缓存数据
+			if (is_one) {
+				this.files = []
+			}
+
+			let { filePaths, files } = get_files_and_is_max(res, _extname)
+			if (!(_extname && _extname.length > 0)) {
+				filePaths = res.tempFilePaths
+				files = res.tempFiles
+			}
+
+			let currentData = []
+			for (let i = 0; i < files.length; i++) {
+				if (this.limitLength - this.files.length <= 0) break
+				files[i].uuid = Date.now()
+				let filedata = await get_file_data(files[i], this.fileMediatype)
+				filedata.progress = 0
+				filedata.status = 'ready'
+				this.files.push(filedata)
+				currentData.push({
+					...filedata,
+					file: files[i],
+				})
+			}
+			this.$emit('select', {
+				tempFiles: currentData,
+				tempFilePaths: filePaths,
+			})
+			res.tempFiles = files
+			// 停止自动上传
+			if (!this.autoUpload || this.noSpace) {
+				res.tempFiles = []
+			}
+		},
+
+		/**
+		 * 批传
+		 * @param {Object} e
+		 */
+		uploadFiles(files) {
+			files = [].concat(files)
+			return uploadCloudFiles
+				.call(this, files, 5, (res) => {
+					this.setProgress(res, res.index, true)
+				})
+				.then((result) => {
+					this.setSuccessAndError(result)
+					return result
+				})
+				.catch((err) => {
+					console.log(err)
+				})
+		},
+
+		/**
+		 * 成功或失败
+		 */
+		async setSuccessAndError(res, fn) {
+			let successData = []
+			let errorData = []
+			let tempFilePath = []
+			let errorTempFilePath = []
+			for (let i = 0; i < res.length; i++) {
+				const item = res[i]
+				const index = item.uuid ? this.files.findIndex((p) => p.uuid === item.uuid) : item.index
+
+				if (index === -1 || !this.files) break
+				if (item.errMsg === 'request:fail') {
+					this.files[index].url = item.path
+					this.files[index].status = 'error'
+					this.files[index].errMsg = item.errMsg
+					// this.files[index].progress = -1
+					errorData.push(this.files[index])
+					errorTempFilePath.push(this.files[index].url)
+				} else {
+					this.files[index].errMsg = ''
+					this.files[index].fileID = item.url
+					const reg = /cloud:\/\/([\w.]+\/?)\S*/
+					if (reg.test(item.url)) {
+						this.files[index].url = await this.getTempFileURL(item.url)
+					} else {
+						this.files[index].url = item.url
+					}
+
+					this.files[index].status = 'success'
+					this.files[index].progress += 1
+					successData.push(this.files[index])
+					tempFilePath.push(this.files[index].fileID)
+				}
+			}
+
+			if (successData.length > 0) {
+				this.setEmit()
+				// 状态改变返回
+				this.$emit('success', {
+					tempFiles: this.backObject(successData),
+					tempFilePaths: tempFilePath,
+				})
+			}
+
+			if (errorData.length > 0) {
+				this.$emit('fail', {
+					tempFiles: this.backObject(errorData),
+					tempFilePaths: errorTempFilePath,
+				})
+			}
+		},
+
+		/**
+		 * 获取进度
+		 * @param {Object} progressEvent
+		 * @param {Object} index
+		 * @param {Object} type
+		 */
+		setProgress(progressEvent, index, type) {
+			const fileLenth = this.files.length
+			const percentNum = (index / fileLenth) * 100
+			const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total)
+			let idx = index
+			if (!type) {
+				idx = this.files.findIndex((p) => p.uuid === progressEvent.tempFile.uuid)
+			}
+			if (idx === -1 || !this.files[idx]) return
+			// fix by mehaotian 100 就会消失，-1 是为了让进度条消失
+			this.files[idx].progress = percentCompleted - 1
+			// 上传中
+			this.$emit('progress', {
+				index: idx,
+				progress: parseInt(percentCompleted),
+				tempFile: this.files[idx],
+			})
+		},
+
+		/**
+		 * 删除文件
+		 * @param {Object} index
+		 */
+		async delFile(index) {
+			let res = await this.beforeRemove({
+				tempFile: this.files[index],
+				tempFilePath: this.files[index].url,
+			})
+			if (res === false) return
+			this.$emit('delete', {
+				tempFile: this.files[index],
+				tempFilePath: this.files[index].url,
+			})
+			this.files.splice(index, 1)
+			this.$nextTick(() => {
+				this.setEmit()
+			})
+		},
+
+		/**
+		 * 获取文件名和后缀
+		 * @param {Object} name
+		 */
+		getFileExt(name) {
+			const last_len = name.lastIndexOf('.')
+			const len = name.length
+			return {
+				name: name.substring(0, last_len),
+				ext: name.substring(last_len + 1, len),
+			}
+		},
+
+		/**
+		 * 处理返回事件
+		 */
+		setEmit() {
+			let data = []
+			if (this.returnType === 'object') {
+				data = this.backObject(this.files)[0]
+				this.localValue = data ? data : null
+			} else {
+				data = this.backObject(this.files)
+				if (!this.localValue) {
+					this.localValue = []
+				}
+				this.localValue = [...data]
+			}
+			// #ifdef VUE3
+			this.$emit('update:modelValue', this.localValue)
+			// #endif
+			// #ifndef VUE3
+			this.$emit('input', this.localValue)
+			// #endif
+		},
+
+		/**
+		 * 处理返回参数
+		 * @param {Object} files
+		 */
+		backObject(files) {
+			let newFilesData = []
+			files.forEach((v) => {
+				newFilesData.push({
+					...v,
+					extname: v.extname,
+					fileType: v.fileType,
+					image: v.image,
+					name: v.name,
+					path: v.path,
+					size: v.size,
+					fileID: v.fileID,
+					url: v.url,
+				})
+			})
+			return newFilesData
+		},
+		async getTempFileURL(fileList) {
+			fileList = {
+				fileList: [].concat(fileList),
+			}
+			const urls = await uniCloud.getTempFileURL(fileList)
+			return urls.fileList[0].tempFileURL || ''
+		},
+		/**
+		 * 获取父元素实例
+		 */
+		getForm(name = 'uniForms') {
+			let parent = this.$parent
+			let parentName = parent.$options.name
+			while (parentName !== name) {
+				parent = parent.$parent
+				if (!parent) return false
+				parentName = parent.$options.name
+			}
+			return parent
+		},
+	},
+}
+</script>
+
+<style>
+.uni-file-picker {
+	/* #ifndef APP-NVUE */
+	box-sizing: border-box;
+	overflow: hidden;
+	width: 100%;
+	/* #endif */
+	flex: 1;
+}
+
+.uni-file-picker__header {
+	padding-top: 5px;
+	padding-bottom: 10px;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	justify-content: space-between;
+}
+
+.file-title {
+	font-size: 14px;
+	color: #333;
+}
+
+.file-count {
+	font-size: 14px;
+	color: #999;
+}
+
+.is-add {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	align-items: center;
+	justify-content: center;
+}
+
+.icon-add {
+	width: 50px;
+	height: 5px;
+	background-color: #f1f1f1;
+	border-radius: 2px;
+}
+
+.rotate {
+	position: absolute;
+	transform: rotate(90deg);
+}
+</style>
diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue b/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue
index 0c1abe8..435aabb 100644
--- a/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue
+++ b/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue
@@ -1,292 +1,379 @@
-<template>
-	<view class="uni-file-picker__container">
-		<view class="file-picker__box" v-for="(item,index) in filesList" :key="index" :style="boxStyle">
-			<view class="file-picker__box-content" :style="borderStyle">
-				<image class="file-image" :src="item.url" mode="aspectFill" @click.stop="prviewImage(item,index)"></image>
-				<view v-if="delIcon && !readonly" class="icon-del-box" @click.stop="delFile(index)">
-					<view class="icon-del"></view>
-					<view class="icon-del rotate"></view>
-				</view>
-				<view v-if="(item.progress && item.progress !== 100) ||item.progress===0 " class="file-picker__progress">
-					<progress class="file-picker__progress-item" :percent="item.progress === -1?0:item.progress" stroke-width="4"
-					 :backgroundColor="item.errMsg?'#ff5a5f':'#EBEBEB'" />
-				</view>
-				<view v-if="item.errMsg" class="file-picker__mask" @click.stop="uploadFiles(item,index)">
-					点击重试
-				</view>
-			</view>
-		</view>
-		<view v-if="filesList.length < limit && !readonly" class="file-picker__box" :style="boxStyle">
-			<view class="file-picker__box-content is-add" :style="borderStyle" @click="choose">
-				<slot>
-					<view class="icon-add"></view>
-					<view class="icon-add rotate"></view>
-				</slot>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "uploadImage",
-		emits:['uploadFiles','choose','delFile'],
-		props: {
-			filesList: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			disabled:{
-				type: Boolean,
-				default: false
-			},
-			disablePreview: {
-				type: Boolean,
-				default: false
-			},
-			limit: {
-				type: [Number, String],
-				default: 9
-			},
-			imageStyles: {
-				type: Object,
-				default () {
-					return {
-						width: 'auto',
-						height: 'auto',
-						border: {}
-					}
-				}
-			},
-			delIcon: {
-				type: Boolean,
-				default: true
-			},
-			readonly:{
-				type:Boolean,
-				default:false
-			}
-		},
-		computed: {
-			styles() {
-				let styles = {
-					width: 'auto',
-					height: 'auto',
-					border: {}
-				}
-				return Object.assign(styles, this.imageStyles)
-			},
-			boxStyle() {
-				const {
-					width = 'auto',
-						height = 'auto'
-				} = this.styles
-				let obj = {}
-				if (height === 'auto') {
-					if (width !== 'auto') {
-						obj.height = this.value2px(width)
-						obj['padding-top'] = 0
-					} else {
-						obj.height = 0
-					}
-				} else {
-					obj.height = this.value2px(height)
-					obj['padding-top'] = 0
-				}
-
-				if (width === 'auto') {
-					if (height !== 'auto') {
-						obj.width = this.value2px(height)
-					} else {
-						obj.width = '33.3%'
-					}
-				} else {
-					obj.width = this.value2px(width)
-				}
-
-				let classles = ''
-				for(let i in obj){
-					classles+= `${i}:${obj[i]};`
-				}
-				return classles
-			},
-			borderStyle() {
-				let {
-					border
-				} = this.styles
-				let obj = {}
-				const widthDefaultValue = 1
-				const radiusDefaultValue = 3
-				if (typeof border === 'boolean') {
-					obj.border = border ? '1px #eee solid' : 'none'
-				} else {
-					let width = (border && border.width) || widthDefaultValue
-					width = this.value2px(width)
-					let radius = (border && border.radius) || radiusDefaultValue
-					radius = this.value2px(radius)
-					obj = {
-						'border-width': width,
-						'border-style': (border && border.style) || 'solid',
-						'border-color': (border && border.color) || '#eee',
-						'border-radius': radius
-					}
-				}
-				let classles = ''
-				for(let i in obj){
-					classles+= `${i}:${obj[i]};`
-				}
-				return classles
-			}
-		},
-		methods: {
-			uploadFiles(item, index) {
-				this.$emit("uploadFiles", item)
-			},
-			choose() {
-				this.$emit("choose")
-			},
-			delFile(index) {
-				this.$emit('delFile', index)
-			},
-			prviewImage(img, index) {
-				let urls = []
-				if(Number(this.limit) === 1&&this.disablePreview&&!this.disabled){
-					this.$emit("choose")
-				}
-				if(this.disablePreview) return
-				this.filesList.forEach(i => {
-					urls.push(i.url)
-				})
-
-				uni.previewImage({
-					urls: urls,
-					current: index
-				});
-			},
-			value2px(value) {
-				if (typeof value === 'number') {
-					value += 'px'
-				} else {
-					if (value.indexOf('%') === -1) {
-						value = value.indexOf('px') !== -1 ? value : value + 'px'
-					}
-				}
-				return value
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.uni-file-picker__container {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		box-sizing: border-box;
-		/* #endif */
-		flex-wrap: wrap;
-		margin: -5px;
-	}
-
-	.file-picker__box {
-		position: relative;
-		// flex: 0 0 33.3%;
-		width: 33.3%;
-		height: 0;
-		padding-top: 33.33%;
-		/* #ifndef APP-NVUE */
-		box-sizing: border-box;
-		/* #endif */
-	}
-
-	.file-picker__box-content {
-		position: absolute;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		left: 0;
-		margin: 5px;
-		border: 1px #eee solid;
-		border-radius: 5px;
-		overflow: hidden;
-	}
-
-	.file-picker__progress {
-		position: absolute;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		/* border: 1px red solid; */
-		z-index: 2;
-	}
-
-	.file-picker__progress-item {
-		width: 100%;
-	}
-
-	.file-picker__mask {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: center;
-		align-items: center;
-		position: absolute;
-		right: 0;
-		top: 0;
-		bottom: 0;
-		left: 0;
-		color: #fff;
-		font-size: 12px;
-		background-color: rgba(0, 0, 0, 0.4);
-	}
-
-	.file-image {
-		width: 100%;
-		height: 100%;
-	}
-
-	.is-add {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		align-items: center;
-		justify-content: center;
-	}
-
-	.icon-add {
-		width: 50px;
-		height: 5px;
-		background-color: #f1f1f1;
-		border-radius: 2px;
-	}
-
-	.rotate {
-		position: absolute;
-		transform: rotate(90deg);
-	}
-
-	.icon-del-box {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		align-items: center;
-		justify-content: center;
-		position: absolute;
-		top: 3px;
-		right: 3px;
-		height: 26px;
-		width: 26px;
-		border-radius: 50%;
-		background-color: rgba(0, 0, 0, 0.5);
-		z-index: 2;
-		transform: rotate(-45deg);
-	}
-
-	.icon-del {
-		width: 15px;
-		height: 2px;
-		background-color: #fff;
-		border-radius: 2px;
-	}
-</style>
+<template>
+	<view class="uni-file-picker__container">
+		<view class="file-picker__box" v-for="(item, index) in filesList" :key="index" :style="boxStyle">
+			<view class="file-picker__box-content" :style="borderStyle">
+				<image
+					class="file-image"
+					:src="item.url"
+					mode="aspectFill"
+					@click.stop="prviewImage(item, index)"
+				></image>
+				<view v-if="delIcon && !readonly" class="icon-del-box" @click.stop="delFile(index)">
+					<view class="icon-del"></view>
+					<view class="icon-del rotate"></view>
+				</view>
+				<view
+					v-if="(item.progress && item.progress !== 100) || item.progress === 0"
+					class="file-picker__progress"
+				>
+					<progress
+						class="file-picker__progress-item"
+						:percent="item.progress === -1 ? 0 : item.progress"
+						stroke-width="4"
+						:backgroundColor="item.errMsg ? '#ff5a5f' : '#EBEBEB'"
+					/>
+				</view>
+				<view v-if="item.errMsg" class="file-picker__mask" @click.stop="uploadFiles(item, index)">
+					点击重试
+				</view>
+			</view>
+		</view>
+		<view v-if="filesList.length < limit && !readonly" class="file-picker__box" :style="boxStyle">
+			<view class="file-picker__box-content is-add" :style="borderStyle" @click="choose">
+				<slot>
+					<view class="icon-add"></view>
+					<view class="icon-add rotate"></view>
+				</slot>
+			</view>
+		</view>
+		<view class="head-setup" v-if="headShow" @click="headShow = false">
+			<view class="head-setup-box">
+				<view class="head-setup-item" @click="take('camera')">拍摄</view>
+				<view class="head-setup-item" @click="take('album')">从相册选择</view>
+
+				<view class="head-setup-item" style="margin-top: 25rpx">取消</view>
+			</view>
+		</view>
+		<yk-authpup ref="authpup" type="top" @changeAuth="changeAuth" permissionID="CAMERA"></yk-authpup>
+		<yk-authpup
+			ref="authpup1"
+			type="top"
+			@changeAuth="changeAuth"
+			permissionID="WRITE_EXTERNAL_STORAGE"
+		></yk-authpup>
+	</view>
+</template>
+
+<script>
+import ykAuthpup from '@/components/yk-authpup/yk-authpup'
+export default {
+	components: {
+		ykAuthpup,
+	},
+	name: 'uploadImage',
+	emits: ['uploadFiles', 'choose', 'delFile'],
+	props: {
+		filesList: {
+			type: Array,
+			default() {
+				return []
+			},
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+		disablePreview: {
+			type: Boolean,
+			default: false,
+		},
+		limit: {
+			type: [Number, String],
+			default: 9,
+		},
+		imageStyles: {
+			type: Object,
+			default() {
+				return {
+					width: 'auto',
+					height: 'auto',
+					border: {},
+				}
+			},
+		},
+		delIcon: {
+			type: Boolean,
+			default: true,
+		},
+		readonly: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	computed: {
+		styles() {
+			let styles = {
+				width: 'auto',
+				height: 'auto',
+				border: {},
+			}
+			return Object.assign(styles, this.imageStyles)
+		},
+		boxStyle() {
+			const { width = 'auto', height = 'auto' } = this.styles
+			let obj = {}
+			if (height === 'auto') {
+				if (width !== 'auto') {
+					obj.height = this.value2px(width)
+					obj['padding-top'] = 0
+				} else {
+					obj.height = 0
+				}
+			} else {
+				obj.height = this.value2px(height)
+				obj['padding-top'] = 0
+			}
+
+			if (width === 'auto') {
+				if (height !== 'auto') {
+					obj.width = this.value2px(height)
+				} else {
+					obj.width = '33.3%'
+				}
+			} else {
+				obj.width = this.value2px(width)
+			}
+
+			let classles = ''
+			for (let i in obj) {
+				classles += `${i}:${obj[i]};`
+			}
+			return classles
+		},
+		borderStyle() {
+			let { border } = this.styles
+			let obj = {}
+			const widthDefaultValue = 1
+			const radiusDefaultValue = 3
+			if (typeof border === 'boolean') {
+				obj.border = border ? '1px #eee solid' : 'none'
+			} else {
+				let width = (border && border.width) || widthDefaultValue
+				width = this.value2px(width)
+				let radius = (border && border.radius) || radiusDefaultValue
+				radius = this.value2px(radius)
+				obj = {
+					'border-width': width,
+					'border-style': (border && border.style) || 'solid',
+					'border-color': (border && border.color) || '#eee',
+					'border-radius': radius,
+				}
+			}
+			let classles = ''
+			for (let i in obj) {
+				classles += `${i}:${obj[i]};`
+			}
+			return classles
+		},
+	},
+	data() {
+		return {
+			headShow: false,
+			type:''
+		}
+	},
+	methods: {
+		uploadFiles(item, index) {
+			this.$emit('uploadFiles', item)
+		},
+		choose() {
+			this.headShow = true
+			// this.$emit('choose')
+		},
+		take(type) {
+			this.type = type
+			if (type == 'camera') {
+				if (plus.os.name == 'Android') {
+					this.$refs['authpup'].open()
+					//未授权
+					// this.$refs.message.open()
+					// this.$refs.alertDialog.open('bottom')
+				} else {
+					this.$emit('choose',type)
+				}
+			} else {
+				if (plus.os.name == 'Android') {
+					this.$refs['authpup1'].open()
+					//未授权
+					// this.$refs.message.open()
+					// this.$refs.alertDialog.open('bottom')
+				} else {
+					this.$emit('choose',type)
+				}
+				// this.handleScon(type)、
+			}
+		},
+		 changeAuth() {
+		            //这里是权限通过后执行自己的代码逻辑
+		            console.log('权限已授权，可执行自己的代码逻辑了')
+		            // this.handleScon()
+		           this.$emit('choose',this.type)
+		        },
+		delFile(index) {
+			this.$emit('delFile', index)
+		},
+		prviewImage(img, index) {
+			let urls = []
+			if (Number(this.limit) === 1 && this.disablePreview && !this.disabled) {
+				this.$emit('choose')
+			}
+			if (this.disablePreview) return
+			this.filesList.forEach((i) => {
+				urls.push(i.url)
+			})
+
+			uni.previewImage({
+				urls: urls,
+				current: index,
+			})
+		},
+		value2px(value) {
+			if (typeof value === 'number') {
+				value += 'px'
+			} else {
+				if (value.indexOf('%') === -1) {
+					value = value.indexOf('px') !== -1 ? value : value + 'px'
+				}
+			}
+			return value
+		},
+	},
+}
+</script>
+
+<style lang="scss">
+.uni-file-picker__container {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	box-sizing: border-box;
+	/* #endif */
+	flex-wrap: wrap;
+	margin: -5px;
+}
+
+.file-picker__box {
+	position: relative;
+	// flex: 0 0 33.3%;
+	width: 33.3%;
+	height: 0;
+	padding-top: 33.33%;
+	/* #ifndef APP-NVUE */
+	box-sizing: border-box;
+	/* #endif */
+}
+
+.file-picker__box-content {
+	position: absolute;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	margin: 5px;
+	border: 1px #eee solid;
+	border-radius: 5px;
+	overflow: hidden;
+}
+
+.file-picker__progress {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	/* border: 1px red solid; */
+	z-index: 2;
+}
+
+.file-picker__progress-item {
+	width: 100%;
+}
+
+.file-picker__mask {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	justify-content: center;
+	align-items: center;
+	position: absolute;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	color: #fff;
+	font-size: 12px;
+	background-color: rgba(0, 0, 0, 0.4);
+}
+
+.file-image {
+	width: 100%;
+	height: 100%;
+}
+
+.is-add {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	align-items: center;
+	justify-content: center;
+}
+
+.icon-add {
+	width: 50px;
+	height: 5px;
+	background-color: #f1f1f1;
+	border-radius: 2px;
+}
+
+.rotate {
+	position: absolute;
+	transform: rotate(90deg);
+}
+
+.icon-del-box {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	align-items: center;
+	justify-content: center;
+	position: absolute;
+	top: 3px;
+	right: 3px;
+	height: 26px;
+	width: 26px;
+	border-radius: 50%;
+	background-color: rgba(0, 0, 0, 0.5);
+	z-index: 2;
+	transform: rotate(-45deg);
+}
+
+.icon-del {
+	width: 15px;
+	height: 2px;
+	background-color: #fff;
+	border-radius: 2px;
+}
+.head-setup {
+	background-color: #fff;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	z-index: 10;
+	width: 750rpx;
+	height: 100vh;
+	padding-bottom: 60rpx;
+	background-color: rgba(0, 0, 0, 0.4);
+	.head-setup-box {
+		position: fixed;
+		bottom: 15rpx;
+		left: 0;
+		.head-setup-item {
+			z-index: 12;
+			height: 100rpx;
+			width: 750rpx;
+			background-color: #fff;
+			line-height: 100rpx;
+			text-align: center;
+			border-top: 1rpx solid #e8e8e8;
+		}
+	}
+}
+</style>
\ No newline at end of file