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

pages/grain_pulse/my_grain_pulse.vue

@@ -122,7 +122,7 @@
 					}
 				})
 				}else{
-					this.$api.doRequest('get','/settledCompanyInfo/myCollection',{phone:this.userInfo.phone,pageSize:this.pageSize,
+					this.$api.doRequest('get','/settledCompanyInfo/myCollection',{loginPhone:this.userInfo.phone,pageSize:this.pageSize,
 							currentPage: this.currentPage,pcFlag:2}).then(res => {
 					if(res.data.code==200){
 						this.datalist=this.datalist.concat(res.data.data.records)

pages/grain_pulse/record.vue

@@ -225,7 +225,7 @@
 				this.$api.doRequest('get', '/settledCompanyDynamics/selectSettledCompanyDynamicsPage', {
 					currentPage: 1,
 					pageSize: 10,
-					loginPhone: this.userInfo.phone,
+					phone: this.userInfo.phone,
 					searchType: this.searchType
 				})
 				.then(res => {