Merge branch 'master' of http://47.98.226.240:3000/twt/operatingCompany

operatingCompany/pages/entryReport/entryReport.vue

@@ -255,17 +255,20 @@
 					this.shopData = list
 					
 					
-					// if (this.page == 1 && list.length == 0) {
-					// 	this.noMoreShow = false
-					// } else if (list.length < 20) {
-					// 	this.noMoreShow = true
-					// }
+					
 					// if (this.page == 1) {
 					// 	this.shopData = list
 					// } else {
 					// 	this.shopData = this.shopData.concat(list)
 					// }
-
+					
+					// if(list.length < 10){
+					// 	this.noMoreShow = false
+					// }
+					// else {
+					// 	this.noMoreShow = true
+					// }
+					
 				})
 			},
 		},

operatingCompany/pages/entryReport/historyReport.vue

@@ -79,10 +79,8 @@
 		<!-- 上拉 加载更多 -->
 		<view class="noMore" v-if="noMoreShow">没有更多数据</view>
 		<!-- 无数据空白页 -->
-		<view class="nodataBox" v-if="shopData.length == 0">
-			<image src="../../static/img/pic_empty_def.png" mode="widthFix" class="nodataImg"></image>
-			<view class="noTxt">暂无数据</view>
-		</view>
+		
+		<nodata v-if="shopData.length==0"></nodata>
 
 		<timeChose ref="timepop" @returnDate="returnDate" :isShow="timeShow"></timeChose>
 		
@@ -90,10 +88,12 @@
 </template>
 
 <script>
-	import timeChose from '@/components/timeChose/timeChose.vue'
+	import timeChose from '@/components/timeChose/timeChose.vue'
+	import nodata from '../../components/nodata/nodata.vue'
 	export default {
 		components: {
-			timeChose
+			timeChose,
+			nodata
 		},
 		data() {
 			return {
@@ -210,16 +210,19 @@
 							item[key] = this.$praseStrEmpty(item[key])
 						}
 					})
-
-					if (this.page == 1 && list.length == 0) {
-						this.noMoreShow = false
-					} else if (list.length < 20) {
-						this.noMoreShow = true
-					}
+
+					
 					if (this.page == 1) {
 						this.shopData = list
 					} else {
 						this.shopData = this.shopData.concat(list)
+					}
+					
+					if(list.length < 10){
+						this.noMoreShow = false
+					}
+					else {
+						this.noMoreShow = true
 					}
 
 				})

operatingCompany/pages/reportManage/reportManage.vue

@@ -259,17 +259,20 @@
 						}
 					})
 
-					if (this.page == 1 && list.length == 0) {
-						this.noMoreShow = false
-					} else if (list.length < 20) {
-						this.noMoreShow = true
-					}
+					
 					if (this.page == 1) {
 						this.shopData = list
 					} else {
 						this.shopData = this.shopData.concat(list)
 					}
-
+
+
+					if(list.length < 10){
+						this.noMoreShow = false
+					}
+					else {
+						this.noMoreShow = true
+					}
 				})
 			},
 			

operatingCompany/pages/shop/shopIndex/index.vue

@@ -288,20 +288,20 @@
 						}
 					})
 
-					if (this.page == 1 && list.length == 0) {
-						this.noMoreShow = false
-					} else if (list.length < 20) {
-						this.noMoreShow = true
-					}
+					
 					if (this.page == 1) {
 						this.shopData = list
 						
 					} else {
 						this.shopData = this.shopData.concat(list)
 					}
-					if(this.shopData.length == 0){
+					
+					if(list.length < 10){
 						this.noMoreShow = false
 					}
+					else {
+						this.noMoreShow = true
+					}
 					
 				})
 			},

operatingCompany/pages/shop/shopIndex/reviews.vue

@@ -153,18 +153,20 @@
 						}
 					})
 
-					if (this.page == 1 && list.length == 0) {
-						this.noMoreShow = false
-					} else if (list.length < 20) {
-						this.noMoreShow = true
-					}
+					
 					if (this.page == 1) {
 						this.shopData = list
 					} else {
 						this.shopData = this.shopData.concat(list)
 					}
 					
-					console.log(this.shopData);
+					if(list.length < 10){
+						this.noMoreShow = false
+					}
+					else {
+						this.noMoreShow = true
+					}
+					
 				})
 			},
 			

operatingCompany/pages/team/manageStore.vue

@@ -106,17 +106,20 @@
 						}
 					})
 					
-					if (this.page == 1 && list.length == 0) {
-						this.noMoreShow = false
-					} else if (list.length < 20) {
-						this.noMoreShow = true
-					}
+					
 					if (this.page == 1) {
 						this.shopData = list
 					} else {
 						this.shopData = this.shopData.concat(list)
 					}
-
+
+					if(list.length < 10){
+						this.noMoreShow = false
+					}
+					else {
+						this.noMoreShow = true
+					}
+					
 				})
 			},
 

operatingCompany/pages/team/myTeam.vue

@@ -92,16 +92,20 @@
 						}
 					})
 
-					if (this.page == 1 && list.length == 0) {
-						this.noMoreShow = false
-					} else if (list.length < 20) {
-						this.noMoreShow = true
-					}
+					
 					if (this.page == 1) {
 						this.shopData = list
 					} else {
 						this.shopData = this.shopData.concat(list)
-					}
+					}
+					
+					if(list.length < 10){
+						this.noMoreShow = false
+					}
+					else {
+						this.noMoreShow = true
+					}
+					
 				})
 			}
 		},

operatingCompany/pages/teamStore/teamStore.vue

@@ -229,17 +229,21 @@
 						}
 					})
 
-					if (this.page == 1 && list.length == 0) {
-						this.noMoreShow = false
-					} else if (list.length < 20) {
-						this.noMoreShow = true
-					}
+					
 					if (this.page == 1) {
 						this.shopData = list
 					} else {
 						this.shopData = this.shopData.concat(list)
 					}
-
+					
+					
+					if(list.length < 10){
+						this.noMoreShow = false
+					}
+					else {
+						this.noMoreShow = true
+					}
+					
 				})
 			}
 		},

operatingCompany/pages/upcoming/upcoming.vue

@@ -81,17 +81,20 @@
 						}
 					})
 
-					if (this.page == 1 && list.length == 0) {
-						this.noMoreShow = false
-					} else if (list.length < 20) {
-						this.noMoreShow = true
-					}
+					
 					if (this.page == 1) {
 						this.shopData = list
 					} else {
 						this.shopData = this.shopData.concat(list)
 					}
-
+					
+					if(list.length < 10){
+						this.noMoreShow = false
+					}
+					else {
+						this.noMoreShow = true
+					}
+					
 				})
 			}
 		},