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.154",
-    "versionCode" : 21154,
+    "versionName" : "2.1.155",
+    "versionCode" : 21155,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pages/task/my_task.vue

@@ -287,7 +287,7 @@
 						complete: () => {}
 					})
 				} else {
-					this.getIndexBuyData()
+					// this.getIndexBuyData()
 				}
 			})
 		},
@@ -449,6 +449,19 @@
 				this.$api.doRequest('get', url, data).then(res => {
 					if (res.data.code == 200) {
 						let data = res.data.data.records
+						console.log(data)
+						console.log(that.taskInfo)
+						if (res.data.data.records.length == 0 && this.pages == 1 && this.statusFlag ==
+							3 ||
+							res.data.data.records.length == 0 && this.pages == 1 && this
+							.statusFlag == 1 ||
+							res.data.data.records.length == 0 && this.pages == 1 && this
+							.statusFlag == 5||
+							res.data.data.records.length == 0 && this.pages == 1 && this
+							.statusFlag == 7) {
+							console.log()
+							this.taskInfo = []
+						}
 						//采购信息
 						if (data.length > 0) {
 							if (pages==1) {
@@ -464,6 +477,8 @@
 							that.isLoadMore = false
 							that.loadStatus = 'nomore'
 						}
+						
+						console.log(that.taskInfo)
 						for (var i = 0; i < this.taskInfo.length; i++) {
 							let _str = this.taskInfo[i]
 							// let a = this.getRoles()
@@ -535,17 +550,7 @@
 						} else {
 							that.isSole = false
 						}
-						if (res.data.data.records.length == 0 && this.pages == 1 && this.statusFlag ==
-							3 ||
-							res.data.data.records.length == 0 && this.pages == 1 && this
-							.statusFlag == 1 ||
-							res.data.data.records.length == 0 && this.pages == 1 && this
-							.statusFlag == 5||
-							res.data.data.records.length == 0 && this.pages == 1 && this
-							.statusFlag == 7) {
-							console.log()
-							this.taskInfo = []
-						}
+						
 						uni.hideLoading()
 					} else {
 						uni.hideLoading()