Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

# Conflicts:
#	pages/task/audit/universalityAudit.vue

config/index.js

@@ -3,7 +3,9 @@ const dev = {
 	// baseUrl: 'http://localhost:8080/',
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
-	baseUrlNew: 'http://192.168.110.9:9888/',
+	// baseUrlNew: 'http://192.168.110.9:9888/',
+	// baseUrlNew: 'http://192.168.110.138:8090/',
+	// baseUrlNew: 'http://192.168.110.9:9888/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',

pages/business/businessNew.vue

@@ -476,7 +476,6 @@
 							this.goods[i].imgList = arr
 							this.$forceUpdate()
 						})
-
 					}
 				}else{
 					uni.hideLoading()
@@ -608,6 +607,8 @@
 				}
 
 				.right {
+					display:flex;
+					align-items: center;
 					padding: 10rpx 20rpx;
 					border: 1px solid #CDCDCD;
 					border-radius: 50rpx;

pages/task/audit/universalityAudit.vue

@@ -226,7 +226,6 @@
 						});
 					}
 				});
-
 			},
 			filterFileType(index, lists) {
 				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {