Browse Source

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/storeCheck-app into deploy

1004749546@qq.com 4 years ago
parent
commit
870addd231

+ 1 - 1
pages/myShopTour/myShopTour.vue

@@ -53,7 +53,7 @@
 								</u-grid>
 								</u-grid>
 							</view>
 							</view>
 						</view>
 						</view>
-						<u-empty style="padding-top: 30vh;height: auto;" text="暂无数据" img-width="120" v-if="list.length == 0 && status != 'loading'" mode="list"></u-empty>
+						<u-empty style="padding-top: 10vh;height: auto;" text="暂无数据" img-width="120" v-if="list.length == 0 && status != 'loading'" mode="list"></u-empty>
 						<u-loadmore bg-color="#f8f8f8" v-if="list.length < total || status == 'loading'" :status="status" class="loadmore" />
 						<u-loadmore bg-color="#f8f8f8" v-if="list.length < total || status == 'loading'" :status="status" class="loadmore" />
 					</scroll-view>
 					</scroll-view>
 				</swiper-item>
 				</swiper-item>

+ 1 - 1
pages/organization/organization.vue

@@ -8,7 +8,7 @@
 			</view>
 			</view>
 		</view>
 		</view>
 		<!-- 组织结构子节点 -->
 		<!-- 组织结构子节点 -->
-		<view class="organization-node-con">
+		<view class="organization-node-con" v-if="organizationNowList && organizationNowList.length > 0">
 			<view class="organization-node-item" v-for="(item, index) in organizationNowList" :key="index" @click="clickOrganization(item, index)">
 			<view class="organization-node-item" v-for="(item, index) in organizationNowList" :key="index" @click="clickOrganization(item, index)">
 				<text class="organization-node-item-name">{{item.name}}</text>
 				<text class="organization-node-item-name">{{item.name}}</text>
 				<u-icon class="organization-node-item-icon" name="arrow-right" color="#999" size="28"></u-icon>
 				<u-icon class="organization-node-item-icon" name="arrow-right" color="#999" size="28"></u-icon>

+ 2 - 2
pages/shopTourRecord/shopTourRecord.vue

@@ -45,8 +45,8 @@
 							</u-grid-item>
 							</u-grid-item>
 						</u-grid>
 						</u-grid>
 					</view>
 					</view>
-					<u-empty :text="noDataText" img-width="120" :margin-top="400" v-if="list.length == 0 && status != 'loading'" mode="list"></u-empty>
-					<view style="padding: 20upx;"><u-loadmore v-if="total > pageSize || status == 'loading'" :status="status" /></view>
+					<u-empty :text="noDataText" style="height: auto;padding-top: 10vh;" img-width="120" v-if="list.length == 0 && status != 'loading'" mode="list"></u-empty>
+					<view v-if="total > pageSize || status == 'loading'" style="padding: 20upx;"><u-loadmore :status="status" /></view>
 				</scroll-view>
 				</scroll-view>
 			</view>
 			</view>
 		</view>
 		</view>

+ 1 - 1
pages/spotCheckConfigure/spotCheckList.vue

@@ -17,7 +17,7 @@
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
-		<u-empty style="padding-top: 30vh;" :text="noDataText" v-if="list.length == 0 && status != 'loading'" mode="list"></u-empty>
+		<u-empty style="padding-top: 10vh;" :text="noDataText" v-if="list.length == 0 && status != 'loading'" mode="list"></u-empty>
 		<view style="padding: 20upx;" v-if="total > pageSize || status == 'loading'"><u-loadmore :status="status" /></view>
 		<view style="padding: 20upx;" v-if="total > pageSize || status == 'loading'"><u-loadmore :status="status" /></view>
 	</view>
 	</view>
 </template>
 </template>

+ 1 - 1
pages/toDoList/toDoList.vue

@@ -66,7 +66,7 @@
 									 </view>
 									 </view>
 								 </view>
 								 </view>
 							 </view>
 							 </view>
-							 <u-empty style="padding-top: 30vh;height: auto;" :text="noDataText" img-width="120" v-if="list.length==0 && status!='loading'" mode="list"></u-empty>
+							 <u-empty style="padding-top: 10vh;height: auto;" :text="noDataText" img-width="120" v-if="list.length==0 && status!='loading'" mode="list"></u-empty>
 							 <view v-if="index==current" style="padding: 20upx;">
 							 <view v-if="index==current" style="padding: 20upx;">
 								 <u-loadmore v-if="total>pageSize || status=='loading'" :status="status" />
 								 <u-loadmore v-if="total>pageSize || status=='loading'" :status="status" />
 							 </view>
 							 </view>

+ 2 - 3
pages/videoShopTour/videoShopTour.vue

@@ -25,7 +25,7 @@
 						<u-icon class="listData-item-r-icon" name="icon-xian-11" custom-prefix="xd-icon" size="24" color="#2b85e4"></u-icon>
 						<u-icon class="listData-item-r-icon" name="icon-xian-11" custom-prefix="xd-icon" size="24" color="#2b85e4"></u-icon>
 					</view>
 					</view>
 				</view>
 				</view>
-				<u-empty :text="noDataText" img-width="120" v-if="list.length == 0 && status != 'loading'" :margin-top="220" style="height: auto;" mode="list"></u-empty>
+				<u-empty :text="noDataText" img-width="120" v-if="list.length == 0 && status != 'loading'" style="height: auto;padding-top: 10vh;" mode="list"></u-empty>
 			</scroll-view>
 			</scroll-view>
 		</view>
 		</view>
 	</view>
 	</view>
@@ -147,14 +147,13 @@
 		}
 		}
 		// 门店列表
 		// 门店列表
 		.list-con{
 		.list-con{
-			margin-top: 10upx;
 			.list-tit{
 			.list-tit{
 				padding: 20upx 30upx;
 				padding: 20upx 30upx;
 				border-bottom: 1upx solid #f8f8f8;
 				border-bottom: 1upx solid #f8f8f8;
 			}
 			}
 			.listData-con{
 			.listData-con{
 				padding: 0 30upx;
 				padding: 0 30upx;
-				height: calc(100vh - 165px);
+				height: calc(100vh - 190px);
 				box-sizing: border-box;
 				box-sizing: border-box;
 				.listData-item{
 				.listData-item{
 					display: flex;
 					display: flex;

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/app-plus/app-view.js


Some files were not shown because too many files changed in this diff