完工组件&&相机组件修改

src/common/classify.data.js

@@ -68,7 +68,7 @@ export default [{
 				"fieldsTitle": "电缆",
 				"fieldsName": "file",
 				"fieldsType": "file",
-				"key": "短裙",
+				"key": "电缆",
 				"icon": "https://cdn.uviewui.com/uview/common/classify/1/5.jpg",
 				"cat": 10
 			},
@@ -76,7 +76,7 @@ export default [{
 				"fieldsTitle": "管材",
 				"fieldsName": "file",
 				"fieldsType": "file",
-				"key": "短裙",
+				"key": "管材",
 				"icon": "https://cdn.uviewui.com/uview/common/classify/1/5.jpg",
 				"cat": 10
 			},
@@ -98,54 +98,30 @@ export default [{
 				"icon": "https://cdn.uviewui.com/uview/common/classify/1/7.jpg",
 				"cat": 10
 			},
-			{
-				"fieldsTitle": "多级选择",
-				"fieldsName": "mutiPicker",
-				"fieldsType": "mutipicker",
-				"required": true,
-				"key": "妈妈装",
-				"icon": "https://cdn.uviewui.com/uview/common/classify/1/8.jpg",
-				"cat": 10
-			},
-			{
-				"fieldsTitle": "时间选择",
-				"fieldsName": "time",
-				"fieldsType": "time",
-				"required": true,
-				"key": "牛仔裤",
-				"icon": "https://cdn.uviewui.com/uview/common/classify/1/9.jpg",
-				"cat": 10
-			},
+			// {
+			// 	"fieldsTitle": "多级选择",
+			// 	"fieldsName": "mutiPicker",
+			// 	"fieldsType": "mutipicker",
+			// 	"required": true,
+			// 	"key": "妈妈装",
+			// 	"icon": "https://cdn.uviewui.com/uview/common/classify/1/8.jpg",
+			// 	"cat": 10
+			// },
+			// {
+			// 	"fieldsTitle": "时间选择",
+			// 	"fieldsName": "time",
+			// 	"fieldsType": "time",
+			// 	"required": true,
+			// 	"key": "牛仔裤",
+			// 	"icon": "https://cdn.uviewui.com/uview/common/classify/1/9.jpg",
+			// 	"cat": 10
+			// },
 			{
 				"fieldsTitle": "备注",
 				"key": "备注",
 				"fieldsType": "textarea",
 				"icon": "https://cdn.uviewui.com/uview/common/classify/1/10.jpg",
 				"cat": 10
-			},
-			{
-				"fieldsTitle": "休闲裤",
-				"key": "休闲裤",
-				"icon": "https://cdn.uviewui.com/uview/common/classify/1/11.jpg",
-				"cat": 10
-			},
-			{
-				"fieldsTitle": "雪纺衫",
-				"key": "雪纺衫",
-				"icon": "https://cdn.uviewui.com/uview/common/classify/1/12.jpg",
-				"cat": 10
-			},
-			{
-				"fieldsTitle": "防晒衣",
-				"key": "防晒衣",
-				"icon": "https://cdn.uviewui.com/uview/common/classify/1/13.jpg",
-				"cat": 10
-			},
-			{
-				"fieldsTitle": "礼服/婚纱",
-				"key": "礼服婚纱",
-				"icon": "https://cdn.uviewui.com/uview/common/classify/1/14.jpg",
-				"cat": 10
 			}
 		]
 	},

src/components/createCom/XhFiles.vue

@@ -29,7 +29,11 @@
 		name: 'XhFiles',
 		components: {},
 		mixins: [objMixin,baseFile],
-		props: {},
+		props: {
+			files: {
+				type: Array,
+			}
+		},
 		filters:{},
 		data() {
 			return {
@@ -41,7 +45,8 @@
 					{
 						text: '拍照'
 					}
-				]
+				],
+				takeStatus: false,
 			}
 		},
 		computed: {
@@ -49,7 +54,22 @@
 				return this.item.settings || []
 			}
 		},
-		watch: {},
+		watch: {
+			'takeStatus': function(val, oldVal){
+				this.$emit('getTakeStatus', {status: val, index: this.itemIndex})
+			},
+			'files': { // 处理相机拍照返回的图片
+				handler (val) {
+					this.imgList = val.map(v => {
+						v.path = v.src
+						return v
+					})
+					this.setValue()
+				},
+				deep:true,
+				immediate: true,
+			}
+		},
 		mounted() {},
 		methods: {
 			selectUpload(){
@@ -79,7 +99,7 @@
 					return
 				}
 				// 使用拍照工具拍摄
-				
+				this.takeStatus = true
 			},
 			setValue() {
 				const dataValue = []

src/components/createCom/XhLocation.vue

@@ -29,7 +29,7 @@
 				let str = ''
 				const dataValue = this.dataValue
 				if(dataValue && dataValue.length>1){
-					str = '经度：'+dataValue[0]+','+'维度：'+dataValue[1]
+					str = '经度：'+dataValue[0].toFixed(4)+'，'+'纬度：'+dataValue[1].toFixed(4)
 				}
 				return str
 			},

src/components/photo/preview.vue

@@ -26,7 +26,6 @@
 				standardId: '',
 				images: [],
 				files: [],
-				fileMaps: [],
 				keys: [],
 				token: '',
 				product: '',
@@ -74,7 +73,7 @@
 						})
 					}
 				}
-				photo.allImages.unshift(photo.tempPath.mixWater)
+				
 				if(photo.currentItem){
 					photo.currentItem.imageList.unshift(photo.tempPath.mixWater)
 				}
@@ -139,34 +138,16 @@
 				self.confirmUpload(true)
 			},
 			submitFile() {
-				let self = this
-				if(self.keys.length) {
-					for (let s of self.keys) {
-						self.$u.api.saveImage({
-							"token": self.token,
-							"standardId": self.standardId,
-							"url": s,
-						}).then(async res =>{
-							console.log(res, "云服务保存图片");
-							if(res.result.code) {
-								// TODO 参数是否要来回传递
-								const photo = getApp().globalData.photo
-								photo.currentItemLength = photo.currentItemLength + 1
-								uni.hideLoading()
-								// 当前项的图片显示
-								// 拍照项张数目增加 等于10张
-								if(photo.currentItemLength<10){
-									this.$emit('changeType', 1)
-								}else{
-									this.$emit('finish')
-								}
-							} else {
-								uni.showToast({
-									title:'图片上传失败 '+ res.result.msg
-								})
-							}
-						})
-					}
+				const photo = getApp().globalData.photo
+				photo.currentItemLength = photo.currentItemLength + 1
+				uni.hideLoading()
+				// 当前项的图片显示
+				// 拍照项张数目增加 等于10张
+				photo.allImages.unshift(this.fileMaps[0])
+				if(photo.currentItemLength<10){
+					this.$emit('changeType', 1)
+				}else{
+					this.$emit('finish')
 				}
 			},
 			downloadImages() {

src/components/take/index.vue

@@ -111,7 +111,8 @@
 		created(e) {
 			const photo = getApp().globalData.photo
 			getApp().trackPage('拍照页')
-			photo.allImages = []
+			photo.allImages = []
+			photo.currentItemLength = 0
 			// this.ctx = uni.createCameraContext();
 			this.updateTime()
 			this.getLocation()

src/pages.json

@@ -26,8 +26,8 @@
 			"path": "pages/order/complete",
 			"style": {
 				"navigationBarTitleText": "订单-完工配置",
-				"navigationBarBackgroundColor": "#2272FF",
-				"navigationBarTextStyle": "white"
+				"navigationStyle": "custom",
+				"disableScroll": true
 			}
 		},{
 			"path": "pages/order/feedback",