Merge branch 'dev' of github.com:dataease/dataease into dev

mobile/.gitignore

@@ -0,0 +1,17 @@
+.DS_Store
+node_modules/
+dist/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+package-lock.json
+tests/**/coverage/
+
+# Editor directories and files
+.hbuilderx
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln

mobile/src/pages/tabBar/dir/index.vue

@@ -1,8 +1,11 @@
 <template>
-	<view class="page dataease-main">
+	<view class="page">
+		<swiper indicator-dots="true">
+			<swiper-item v-for="(img, key) in imgUrls" :key="key"><image :src="img" /></swiper-item>
+		</swiper>
+		<view class=" ">
+			<view class="uni-title">
 				
-        <swiper  class="swiper-box" style="flex: 1;" :duration="300" >
-            <swiper-item class="swiper-item" >
 				<uni-list >
 				        
 				    <uni-list-item v-for="(node, index) in nodes" :key="index" 
@@ -16,8 +19,10 @@
 				    
 				    
 				</uni-list>
-            </swiper-item>
+
-        </swiper>
+			</view>
+		</view>
+		<!-- <view style="height: 1000rpx;"></view> -->
 	</view>
 </template>
 
@@ -28,10 +33,9 @@ export default {
 		return {
 			showSwiper: false,
 			imgUrls: [
-				'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/b4b60b10-5168-11eb-bd01-97bc1429a9ff.jpg',
+				'../../../static/panelimg/panel2.png',
-				'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/b1dcfa70-5168-11eb-bd01-97bc1429a9ff.jpg'
+				'../../../static/panelimg/panel1.png'
 				],
-
 			nodes: []
 		};
 	},
@@ -51,20 +55,6 @@ export default {
 	onPullDownRefresh() {
 	    this.loadData('panel_list');
 	},
-	/**
-	 *  点击导航栏 buttons 时触发
-	 */
-	/* onNavigationBarButtonTap() {
-		uni.showModal({
-			title: '提示',
-			content: '用户点击了功能按钮，这里仅做展示。',
-			success: res => {
-				if (res.confirm) {
-					console.log('用户点击了确定');
-				}
-			}
-		});
-	} */
 	
 	methods: {
 	    loadData(pid) {
@@ -110,31 +100,4 @@ swiper,
 .page-section-title {
 	margin-top: 50rpx;
 }
-
-.dataease-main {
-    
-    position: fixed;
-    left: var(--window-left);
-    right: var(--window-right);
-    top: 40px;
-    padding: 5px;
-    height: calc(100vh - 90px);
-    
-}
-.swiper-box {
-    flex: 1;
-    background-color: #ffffff;
-    height: calc(100vh - 100px);
-}
-
-.swiper-item {
-    flex: 1;
-    flex-direction: row;
-}
-
-.uni-list {
-    overflow-y: scroll;
-    height: calc(100vh - 100px);
-}
-
 </style>