|
@ -40,7 +40,7 @@ |
|
|
<uni-load-more :status="loadingType" /> |
|
|
<uni-load-more :status="loadingType" /> |
|
|
</view> |
|
|
</view> |
|
|
<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button> |
|
|
<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button> |
|
|
<winScanPackJob ref="scanPopup" @getResult='getScanResult'></winScanPackJob> |
|
|
<winScanPackJob ref="scanPopup" @getResult='getScanResult' ></winScanPackJob> |
|
|
<jobList ref="jobList" @selectItem="selectItem"></jobList> |
|
|
<jobList ref="jobList" @selectItem="selectItem"></jobList> |
|
|
<comMessage ref="comMessage"></comMessage> |
|
|
<comMessage ref="comMessage"></comMessage> |
|
|
</view> |
|
|
</view> |
|
@ -290,9 +290,12 @@ |
|
|
this.loadingType = "nomore"; |
|
|
this.loadingType = "nomore"; |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
this.jobList = type === "refresh" ? list : this.jobList.concat(list); |
|
|
this.jobList = type === "refresh" ? list : this.jobList.concat(list); |
|
|
this.pageNo++; |
|
|
this.pageNo++; |
|
|
|
|
|
if(this.pageNo==2){ |
|
|
|
|
|
this.openScanPopup() |
|
|
|
|
|
} |
|
|
}).catch(error => { |
|
|
}).catch(error => { |
|
|
if (type === "refresh") { |
|
|
if (type === "refresh") { |
|
|
uni.stopPullDownRefresh(); |
|
|
uni.stopPullDownRefresh(); |
|
|