页面初始化

pages.json

@@ -446,6 +446,60 @@
             }
             
         }
+        ,{
+            "path" : "pages/oawork/business/list",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/oawork/business/add",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/oawork/business/info",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/oawork/business/select",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/oawork/approve/list",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/oawork/approve/info",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 
 	

pages/oawork/approve/info.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/oawork/approve/list.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/oawork/business/info.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/oawork/business/select.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/oawork/index.vue

@@ -4,15 +4,11 @@
 			
 		</u-navbar>
 		<view class="mainBody">
-			<view class="mainItem" v-for="(info,i) in  list" :key="i"
-			
-			@click="gotoUrl('pages/videofile/list')"
-			
-			>
+			<view class="mainItem" v-for="(info,i) in  list" :key="i" >
 				<view class="name">{{info.name}}</view>
 				<view class="grid">
-					<u-grid :col="4" :border="false">
-						<u-grid-item   v-for="(item,index) in info.list" :key="index" >
+					<u-grid :col="3" :border="false">
+						<u-grid-item   v-for="(item,index) in info.list" :key="index"   	@click="gotoItem(info,item)" >
 							<view class="gridItem" :style="item.bgColor?item.bgColor:info.bgColor">
 								<img :src="item.img?item.img:info.img" alt="">
 								
@@ -23,6 +19,8 @@
 				</view>
 			</view>
 		</view>
+		<u-divider  bg-color="#F2F4F4"  >已经到底了</u-divider>
+		
 	</view>
 </template>
 
@@ -44,59 +42,78 @@
 					{
 						name:"公文提报",
 						img:img1,
+						url:"/pages/oawork/business/list",
 						bgColor:"background: linear-gradient(90deg, rgba(82,222,216,1) 0%,rgba(89,196,196,1) 50%,rgba(22,164,167,1) 100%);",
 						list:[
 							{
-								name:"公文类型1",
-								type:"oaoao1"
+								name:"发文申请",
+								type:"oa2"
 							},
 							{
-								name:"公文类型2",
-								type:"oaoao1"
+								name:"合同审核表",
+								type:"oa3"
 							},
 							{
-								name:"公文类型3",
-								type:"oaoao1"
+								name:"收文处理专门笺",
+								type:"oa6"
 							}
 						],
 					},
 					{
 						name:"申请提交",
 						img:img2,
+						url:"/pages/oawork/business/list",
 						bgColor:"background-color: rgba(0, 185, 98, 1);",
 						
 						list:[
 							{
-								name:"公文类型1",
-								type:"oaoao1"
+								name:"打印机维护",
+								type:"oa1"
 							},
 							{
-								name:"公文类型1",
-								type:"oaoao1"
+								name:"计算机维护",
+								type:"oa4"
 							},
 							{
-								name:"公文类型1",
-								type:"oaoao1"
+								name:"公司申请单",
+								type:"oa5"
+							},
+							{
+								name:"外出登记单",
+								type:"oa7"
+							},
+							{
+								name:"网络信息发布",
+								type:"oa8"
+							},
+							{
+								name:"用车申请",
+								type:"oa9"
+							},
+							{
+								name:"运输生产事项",
+								type:"oa10"
 							}
 						],
 					},
 					{
 						name:"代办审批",
+						url:"/pages/oawork/approve/list",
 						img:img3,
 						bgColor:"background-color: rgba(22, 119, 255, 1);",
 						
 						list:[
 							{
 								name:"公文类型1",
-								type:"oaoao1"
+								type:"oa1"
 							},
 							{
 								name:"公文类型1",
-								type:"oaoao1"
+								type:"oa2"
 							},
 							{
 								name:"公文类型1",
-								type:"oaoao1"
+								type:"oa3"
 							}
 						],
 					},
@@ -109,6 +126,7 @@
 							{
 								name:"数据明细",
 								type:"oaoao1",
+								url:"/pages/oawork/data1",
 								img:img4,
 								bgColor:"background: url("+bg2+");",
 								
@@ -116,6 +134,7 @@
 							{
 								name:"数据分析",
 								type:"oaoao1",
+								url:"/pages/oawork/data1",
 								img:img5,
 								//bgColor:"background: radial-gradient(1.1496160000000002% 1.089584% at -8.7% -3.6999999999999997%, rgba(163,221,255,1) 0%,rgba(144,116,255,1) 100%);",
 								bgColor:"background: url("+bg1+");",
@@ -127,7 +146,11 @@
 			}
 		},
 		methods: {
-			
+			gotoItem(info,item){
+				uni.navigateTo({
+					url:(item.url?item.url:info.url)+"?oatype="+item.type
+				})
+			}
 		}
 	}
 </script>
@@ -137,16 +160,16 @@
 	.mainBody{
 		.mainItem{
 			color: rgba(16, 16, 16, 1);
-			font-size: 32rpx;
-			line-height: 20px;
+			font-size: 28rpx;
+			line-height: 40rpx;
 			border-radius: 8px;
 			background-color: rgba(255, 255, 255, 1);
-			margin: 16px;
-			padding: 12px 16px;
+			margin: 32rpx;
+			padding: 24rpx 32rpx;
 			//display: flex;
 			//justify-content: space-between;
 			.name{
-				
+				font-size: 36rpx;
 			}
 			.grid{
 				.gridItem{

uni_modules/uview-ui/components/u-divider/u-divider.vue

@@ -1,11 +1,16 @@
 <template>
 	<view>
-		<view  class="carNone"  v-show="isnone" >
-			<img src="@/assets/img/暂无数据-缺省页.png" alt="">
-			<p v-text="nonetext" ></p>
+		<view  class="carNone"  v-if="isnone" >
+			<!-- <img src="@/assets/img/暂无数据-缺省页.png" alt=""> -->
+			<view :style=" 'margin-top: '+nonetop+'px;'">
+				<u-empty  :text="nonetext" mode="search"></u-empty>
+				
+			</view>
+
+			<!-- <p v-text="nonetext" ></p> -->
 		</view>	
 	
-		<view class="u-divider" v-show="!isnone" :style="{
+		<view class="u-divider" v-else :style="{
 			height: height == 'auto' ? 'auto' : height + 'rpx',
 			backgroundColor: bgColor,
 			marginBottom: marginBottom + 'rpx',
@@ -52,6 +57,12 @@ export default {
 			type: String,
 			default: '没有找到相关内容'
 		},
+		nonetop: {
+			//列表显示为空显示文字
+			type: Number,
+			default: 80
+		},
+		
 		// 单一边divider横线的宽度(数值)，单位rpx。或者百分比
 		halfWidth: {
 			type: [Number, String],
@@ -80,7 +91,7 @@ export default {
 		// 整个divider的背景颜色
 		bgColor: {
 			type: String,
-			default: '#ffffff'
+			default: '#f4f4f4'
 		},
 		// 整个divider的高度单位rpx
 		height: {

uni_modules/uview-ui/components/u-navbar/u-navbar.vue

@@ -20,6 +20,17 @@
 						{{ title }}
 					</view>
 				</view>
+				<view class="u-navbar-content-title" v-if="titleLong" >
+					<view
+					    class="u-title u-line-1"
+					    :style="{
+							color: titleColor,
+							fontSize: titleSize + 'rpx',
+							fontWeight: titleBold ? 'bold' : 'normal'
+						}">
+						{{ titleLong }}
+					</view>
+				</view>
 				<view class="u-slot-content">
 					<slot></slot>
 				</view>
@@ -106,6 +117,10 @@
 				type: String,
 				default: ''
 			},
+			titleLong: {
+				type: String,
+				default: ''
+			},
 			// 标题的宽度，如果需要自定义右侧内容，且右侧内容很多时，可能需要减少这个宽度，单位rpx
 			titleWidth: {
 				type: [String, Number],

uni_modules/uview-ui/components/u-time-line-item/u-time-line-item.vue

@@ -6,6 +6,7 @@
 				<view class="u-dot">
 				</view>
 			</slot>
+			
 		</view>
 	</view>
 </template>
@@ -54,17 +55,19 @@
 	@import "../../libs/css/style.components.scss";
 	
 	.u-time-axis-item {
+		padding-left: 40rpx;
 		@include vue-flex;
 		flex-direction: column;
 		width: 100%;
 		position: relative;
-		margin-bottom: 32rpx;
+		margin-bottom: 0px;
 	}
 
 	.u-time-axis-node {
+		padding-left: 40rpx;
 		position: absolute;
 		top: 12rpx;
-		left: -40rpx;
+		left: -20rpx;
 		transform-origin: 0;
 		transform: translateX(-50%);
 		@include vue-flex;
@@ -73,7 +76,23 @@
 		z-index: 1;
 		font-size: 24rpx;
 	}
-
+	.u-time-axis-item:last-child::before {
+		content: "" !important;
+	
+		border-left: 0px solid #ddd;
+		
+	}
+	.u-time-axis-item::before {
+		content: " ";
+		position: absolute;
+		left: 0;
+		top: 12rpx;
+		width: 1px;
+		bottom: 0;
+		border-left: 1px solid #ddd;
+		transform-origin: 0 0;
+		transform: scaleX(0.5);
+	}
 	.u-dot {
 		height: 16rpx;
 		width: 16rpx;