Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/pages/settle/file.vue

@@ -322,11 +322,16 @@ export default {
 					break;
 			}
 			
-			await self.chooseImage("qiniu", {...attr, options: {count: 1}})
+			if (self.uploadType === 'id_card_front' || self.uploadType === 'id_card_back') {
+				await self.chooseImage("qiniu", {...attr, options: {count: 1}})
+			} else {
+				self.imgList = await self.chooseImg({count: 1})
+			}
+			
 			if(self.uploadType && self.imgList && self.imgList.length > 0) {
 				// 设置图片对象
 				self.imgObj[self.uploadType] = self.imgList
-				self.formShowList[index].imgs[key] = self.imgList[0].src
+				self.formShowList[index].imgs[key] = self.imgList[0].path
 				this.updateImgs()
 			}
 		},
@@ -349,14 +354,14 @@ export default {
 				
 				let imgs = []
 				otherImgs.map(item => {
-					const img = item.key || item.src || ''
+					const img = item.key || ''
 					imgs.push(img)
 				})
 				
 				this.fileInfo['other_photos'][photoType]['url'] = imgs.join(',')
 				return
 			}
-			this.fileInfo[uploadType] = uploadImgs[0].key || uploadImgs[0].src || ''
+			this.fileInfo[uploadType] = uploadImgs[0].key || ''
 		},
 		toUploadImg(item, index) {
 			this.uploadType = item.filedName
@@ -372,7 +377,7 @@ export default {
 		},
 		async checkIdCard(type) {
 			uni.showLoading({
-				title: '加载中'
+				title: '识别中'
 			})
 			let request = {
 				front: this.$u.api.checkSettleIDCardFront,
@@ -461,9 +466,9 @@ export default {
 
 			return formFlag;
 		},
-		async submitFileInfo() {
-			if (!this.submitBtnStatus) {
-				return
+		async submitFileInfo() {
+			if (!this.submitBtnStatus) {
+				return
 			}
 			if (!this.checkFileInfo()) {
 				return;
@@ -472,7 +477,7 @@ export default {
 			fileInfo.other_photos = JSON.stringify(fileInfo.other_photos)
 			let submitInfoData = {
 				...fileInfo,
-				recommender: getApp().globalData.settleRecommend
+				recommender: getApp().globalData.settleRecommend,
 			}
 			uni.showLoading({
 				title: '加载中……'
@@ -529,7 +534,7 @@ export default {
 		width: 100%;
 		height: 100%;
 		display: flex;
-		flex-direction: column;
+		flex-direction: column;
 		overflow-y:auto;
 	}
 
@@ -748,9 +753,9 @@ export default {
 			padding: 38rpx 30rpx 30rpx 30rpx;
 			margin-bottom: 20rpx;
 			font-size: 32rpx;
-			color: #333333;
-			.title-left-view {
-				font-weight: bold;
+			color: #333333;
+			.title-left-view {
+				font-weight: bold;
 			}
 
 			.title-image {