lilei 4 vuotta sitten
vanhempi
commit
ec7844d7c4

+ 37 - 26
pages/organization/organization.vue

@@ -7,30 +7,34 @@
 				<u-icon class="structure-icon" name="arrow-right" color="#999" size="28"></u-icon>
 			</view>
 		</view>
-		<!-- 组织结构子节点 -->
-		<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)">
-				<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>
+		
+		<view>
+			<!-- 组织结构子节点 -->
+			<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)">
+					<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>
+				</view>
 			</view>
-		</view>
-		<!-- 门店列表 -->
-		<view class="list-con" :style="{'padding-top': organizationNowList && organizationNowList.length > 0 ? '0upx' : '88upx' }">
-			<view class="list-tit">门店列表</view>
-			<!-- 列表数据 -->
-			<view class="listData-con">
-				<view class="listData-item" v-for="(item, index) in list" :key="index" @click="goPage(item)">
-					<view class="listData-item-l">
-						<u-icon class="listData-item-l-icon" name="mendian" custom-prefix="xd-icon" size="40" color="#888"></u-icon>
-						<text class="listData-item-l-name">{{item.name}}</text>
-					</view>
-					<view class="listData-item-r">
-						<u-icon class="listData-item-r-icon" name="icon-xian-11" custom-prefix="xd-icon" size="24" color="#2b85e4"></u-icon>
+			<!-- 门店列表 -->
+			<view class="list-con">
+				<view class="list-tit">门店列表</view>
+				<!-- 列表数据 -->
+				<view class="listData-con">
+					<view class="listData-item" v-for="(item, index) in list" :key="index" @click="goPage(item)">
+						<view class="listData-item-l">
+							<u-icon class="listData-item-l-icon" name="mendian" custom-prefix="xd-icon" size="40" color="#888"></u-icon>
+							<text class="listData-item-l-name">{{item.name}}</text>
+						</view>
+						<view class="listData-item-r">
+							<u-icon class="listData-item-r-icon" name="icon-xian-11" custom-prefix="xd-icon" size="24" color="#2b85e4"></u-icon>
+						</view>
 					</view>
+					<u-empty :text="noDataText" img-width="120" v-if="list.length == 0 && status != 'loading'" style="padding: 150px 0 180px;background: #fff;" mode="list"></u-empty>
 				</view>
-				<u-empty :text="noDataText" img-width="120" v-if="list.length == 0 && status != 'loading'" style="padding: 150px 0 180px;background: #fff;" mode="list"></u-empty>
 			</view>
 		</view>
+		
 	</view>
 </template>
 
@@ -191,12 +195,16 @@
 		height: 100vh;
 	}
 	.organization-wrap{
-		position: relative;
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		> view{
+			&:last-child{
+				flex-grow: 1;
+				overflow: auto;
+			}
+		}
 		.organization-root-tit{
-			position: fixed;
-			left: 0;
-			top: 0;
-			width: 100%;
 			padding: 20upx 30upx;
 			line-height: 45upx;
 			background-color: #fff;
@@ -213,7 +221,7 @@
 			}
 		}
 		.organization-node-con{
-			padding: 88upx 30upx 0;
+			padding: 10upx;
 			background-color: #fff;
 			.organization-node-item{
 				display: flex;
@@ -228,11 +236,14 @@
 				&-icon{
 					flex-shrink: 0;
 				}
+				&:last-child{
+					border:0;
+				}
 			}
 		}
 		// 门店列表
 		.list-con{
-			padding: 0 20upx;
+			padding: 0 20upx 20upx;
 			.list-tit{
 				padding: 20upx 6upx;
 				border-bottom: 1upx solid #f8f8f8;

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 174 - 177
unpackage/dist/dev/app-plus/app-service.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 99 - 96
unpackage/dist/dev/app-plus/app-view.js


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä