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

src/components/createCom/XhScan.vue

@@ -64,5 +64,7 @@
 	}
 	.input-item{
 		background: #F4F5F7;
+		border-radius: 12rpx;
+		padding-left: 20rpx;	
 	}
 </style>

src/components/photo/preview.vue

@@ -61,8 +61,8 @@
 				if(!photo.tempPath){
 					return
 				}
-				let path = ''
-				if(photo.tempPath.origin && photo.waterSetting && photo.waterSetting.has_origin){
+				let path = ''
+				if(photo.tempPath.origin){
 					// 保存原图到本地
 					path = photo.tempPath.origin
 					let result =  await this.saveLocal(path)
@@ -73,18 +73,18 @@
 						})
 					}
 				}
+				// if(photo.currentItem){
+				// 	photo.currentItem.imageList.unshift(photo.tempPath.mixWater)
+				// }
 				
-				if(photo.currentItem){
-					photo.currentItem.imageList.unshift(photo.tempPath.mixWater)
-				}
 				// if(photo.productList && photo.productList[photo.topIndex]){
 				// 	const topArr = photo.productList[photo.topIndex]
 				// 	if(topArr[photo.itemIndex]){
 				// 		topArr[photo.itemIndex].imageList.push(photo.tempPath.mixWater)
 				// 	}
 				// }
-				// photo.
-				if(photo.tempPath.mixWater){
+				// photo.
+				if(photo.tempPath.mixWater){
 					// 保存水印处理图片到本地
 					path = photo.tempPath.mixWater
 					let result1 =  await this.saveLocal(path)

src/pages/order/complete.vue

@@ -466,7 +466,8 @@
                     case 'location':
                         formType = 'location'
                         break
-                    case 'scan':
+                    case 'scan':
+					case 'machine_code':
                         formType = 'scan'
                         break
                     case 'picker':