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.184",
-    "versionCode" : 21184,
+    "versionName" : "2.1.188",
+    "versionCode" : 21188,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pageD/identity/companyIdentity.vue

@@ -211,7 +211,7 @@
 		},
 		methods: {
 			filterFileType(index, lists) {
-				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
+				if (lists[index].fileType != 'jpeg' &&lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
 					lists.splice(index, 1);
 					// 当前文件不支持
 					uni.showModal({

pages/task/audit/warehouse_warrant.vue

@@ -134,7 +134,7 @@
 				<text class="text_css">粮食指标.xls</text>
 			</view>
 		</view>
-		<flow :auditList="auditList" @status='getStatus'></flow>
+		<flow key="warehouse_warrant" :auditList="auditList" @status='getStatus'></flow>
 		<view v-if='show' class="shade">
 			<view class="wrap">
 				<view class="alert-top">