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

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "2.1.199",
-    "versionCode" : 21199,
+    "versionName" : "2.1.201",
+    "versionCode" : 21201,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pages/task/audit/freight_setting_approval.vue

@@ -253,13 +253,13 @@
 			},
 			passSubmit() {
 				var that = this
-				if (!this.list.tranPriceIng && this.list.billingMethod == 1 && this.list.tranType == "汽运" || !this.list
-					.tranPriceIngCar && this.list
-					.billingMethod == 2 && this.list.tranType == "汽运" || !this.list.tranPriceIng && this.list.tranType !=
-					"汽运") {
-					this.$api.msg('运费单价不能为空')
-					return
-				}
+				// if (!this.list.tranPriceIng && this.list.billingMethod == 1 && this.list.tranType == "汽运" || !this.list
+				// 	.tranPriceIngCar && this.list
+				// 	.billingMethod == 2 && this.list.tranType == "汽运" || !this.list.tranPriceIng && this.list.tranType !=
+				// 	"汽运") {
+				// 	this.$api.msg('运费单价不能为空')
+				// 	return
+				// }
 				uni.showLoading({
 					title: "审核中"
 				})