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,23 +1,28 @@
 <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">
+				
+				<uni-list >
+				        
+				    <uni-list-item v-for="(node, index) in nodes" :key="index" 
+				    :title="node.text"  
+				    :showArrow="node.type === 'folder'"
+				    :thumb="node.type === 'folder' ? '../../../static/folder.png' : '../../../static/yibiaobans.png'" 
+				    thumb-size="base" 
+				    clickable
+				    @click="clickHandler(node)"
+				    rightText="" />
+				    
+				    
+				</uni-list>
 
-        <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" 
-                :title="node.text"  
-                :showArrow="node.type === 'folder'"
-                :thumb="node.type === 'folder' ? '../../../static/folder.png' : '../../../static/yibiaobans.png'" 
-                thumb-size="base" 
-                clickable
-                @click="clickHandler(node)"
-                rightText="" />
-                
-                
-            </uni-list>
-            </swiper-item>
-        </swiper>
+			</view>
+		</view>
+		<!-- <view style="height: 1000rpx;"></view> -->
 	</view>
 </template>
 
@@ -28,18 +33,17 @@ export default {
 		return {
 			showSwiper: false,
 			imgUrls: [
-				'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/b4b60b10-5168-11eb-bd01-97bc1429a9ff.jpg',
-				'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/b1dcfa70-5168-11eb-bd01-97bc1429a9ff.jpg'
-			],
-
-            nodes: []
+				'../../../static/panelimg/panel2.png',
+				'../../../static/panelimg/panel1.png'
+				],
+			nodes: []
 		};
 	},
-    onLoad() {
-        setTimeout(()=>{
-            this.loadData('panel_list');
-        },350)
-    },
+	onLoad() {
+	    setTimeout(()=>{
+	        this.loadData('panel_list');
+	    },350)
+	},
 	/**
 	 * 当 searchInput 配置 disabled 为 true 时触发
 	 */
@@ -48,54 +52,40 @@ export default {
 			url: './search'
 		});
 	},
-    onPullDownRefresh() {
-        this.loadData('panel_list');
-    },
-	/**
-	 *  点击导航栏 buttons 时触发
-	 */
-	/* onNavigationBarButtonTap() {
-		uni.showModal({
-			title: '提示',
-			content: '用户点击了功能按钮，这里仅做展示。',
-			success: res => {
-				if (res.confirm) {
-					console.log('用户点击了确定');
-				}
-			}
-		});
-	} */
-
-    methods: {
-        loadData(pid) {
-            pid = pid || 'panel_list'
-            const param = {pid: pid}
-            
-            requestDir(param).then(res => {
-                this.nodes = res.data
-                uni.stopPullDownRefresh();
-            }).catch(e => {
-                uni.stopPullDownRefresh();
-            })
-        },
-        clickHandler(node) {
-            const param = {
-                    id: node.id,
-                    title: node.text,
-                    index: 4
-                }
-            if(node.type === 'panel') {
-                
-                uni.navigateTo({
-                    url: '../home/detail?detailDate=' + encodeURIComponent(JSON.stringify(param))
-                });
-                return
-            }
-            uni.navigateTo({
-                url: './folder?detailDate=' + encodeURIComponent(JSON.stringify(param))
-            });
-        }
-    }
+	onPullDownRefresh() {
+	    this.loadData('panel_list');
+	},
+	
+	methods: {
+	    loadData(pid) {
+	        pid = pid || 'panel_list'
+	        const param = {pid: pid}
+	        
+	        requestDir(param).then(res => {
+	            this.nodes = res.data
+	            uni.stopPullDownRefresh();
+	        }).catch(e => {
+	            uni.stopPullDownRefresh();
+	        })
+	    },
+	    clickHandler(node) {
+	        const param = {
+	                id: node.id,
+	                title: node.text,
+	                index: 4
+	            }
+	        if(node.type === 'panel') {
+	            
+	            uni.navigateTo({
+	                url: '../home/detail?detailDate=' + encodeURIComponent(JSON.stringify(param))
+	            });
+	            return
+	        }
+	        uni.navigateTo({
+	            url: './folder?detailDate=' + encodeURIComponent(JSON.stringify(param))
+	        });
+	    }
+	}
 };
 </script>
 
@@ -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>