Merge remote-tracking branch 'origin/master'

pages/gridQuery/gridQuery.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 			<view >
-				<uni-title type="h3" :title="data.name+'职责:'"></uni-title><br/><br/>
+				<uni-title type="h5" :title="data.name+'职责:'" color="#666"></uni-title><br/><br/>
 			</view>
 
 			<view>

pages/handleAffairs/handleAffairs.vue

@@ -2,15 +2,15 @@
 
 	<view style="background-color:#fff ;">
 		<!-- 搜索栏 -->
-		<view class="input-view_contain">
+		<view class="input-view_contain data-v-53a1f34c">
 			<view class="input-view">
-				<uni-icons type="search" size="20" class="search-icon" @tap="confirm"></uni-icons>
 				<input confirm-type="search" class="nav-bar-input" type="text" placeholder="输入搜索内容" @confirm="confirm" v-model="title"/>
+				<uni-icons type="search" size="20" class="search-icon" @tap="confirm"></uni-icons>
 			</view>
 		</view>
 		<view class="spacing"></view>
 		<!-- 网格配置列表滑动 -->
-		<view>
+		<view class="image-hei">
 			<uni-swiper-dot :info="info" :current="current" field="content" :mode="mode">
 				<swiper class="swiper-box" style="height: 160rpx;">
 					<swiper-item v-for="(item ,index) in gridtType" :key="index">
@@ -61,7 +61,7 @@
 		                    <p @click="getmatter(item)">{{ item.title }}</p>
 		                </li> -->
 						<uni-list>
-							<uni-list-item  :title="item.title" v-for="(item,index) in recommendList" @click="getmatter(item)" clickable="true" ></uni-list-item>
+							<uni-list-item  class="list-item":title="item.title" v-for="(item,index) in recommendList" @click="getmatter(item)" clickable="true" link></uni-list-item>
 						</uni-list>
 		            </ul>
 		        </view>
@@ -73,7 +73,7 @@
 		                    <p @click="getmatter(item)">{{ item.title }}</p>
 		                </li> -->
 						<uni-list>
-							<uni-list-item  :title="item.title" v-for="(item,index) in favoriteList" @click="getmatter(item)" clickable="true" ></uni-list-item>
+							<uni-list-item class="list-item" :title="item.title" v-for="(item,index) in favoriteList" @click="getmatter(item)" clickable="true" link></uni-list-item>
 						</uni-list>
 		            </ul>
 		        </view>
@@ -246,7 +246,7 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 		position: relative;
 		display: flex;
 		width: 92%;
-		height: 6vh;
+		height: 8vh;
 		margin: auto;
 		border-radius: 10px;
 		border: 1px solid #19C56B;
@@ -282,11 +282,14 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 
 	}
 	.input-view_contain{
-		height: 6vh;
+		height: 50px;
 		width: 100%;
 		background-color: #07C160;
 	}
 	.input-view {
+		
+		justify-content: space-between;
+		align-items: center;
 		/* #ifndef APP-PLUS-NVUE */
 		display: flex;
 		/* #endif */
@@ -303,6 +306,7 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 		width: 96%;
 		.nav-bar-input{
 			margin: auto 0;
+			font-size: 15px;
 		}
 	}
 	.segmented-control {
@@ -331,4 +335,11 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 	.spacing {
 		height: 40rpx;
 	}
+	.image-hei{
+		height:80px
+	}
+	.list-item {
+	   border-bottom: 1px dotted #ccc;
+	   height:35px
+	}
 </style>

pages/topic/dept.vue

@@ -1,15 +1,18 @@
 <template>
 	<view>
-		<view class="btnContain">
-			<button 
-				v-for="(item,idx) in userType" 
-				@click="onclick(item,idx)"
-				:class="idx == currentIdx ? 'highlight' : 'not-highlight'"
-				:style="idx == 0 ? 'text-align:left' : 'text-align:right'"
-				>
-				{{item.dictLabel}}
-			</button>
-		</view>
+		
+			<view class="btnContain">
+				<button 
+					v-for="(item,idx) in userType" 
+					@click="onclick(item,idx)"
+					:class="idx == currentIdx ? 'highlight' : 'not-highlight'"
+					:style="idx == 0 ? 'text-align:left' : 'text-align:right'"
+					>
+					{{item.dictLabel}}
+				</button>
+			</view>
+		
+		
 		<view>
 			<uni-grid :column="2" :square="false" :highlight="false">
 				<uni-grid-item v-for="(item, index) in dataList" :index="index" :key="index">
@@ -37,7 +40,7 @@
 			return {
 				userType: [], // 初始化用户类型为空
 				dataList: [],
-				currentIdx:null,
+				currentIdx:0,
 			}
 		},
 		created() {
@@ -157,4 +160,5 @@
 		justify-content: center;
 		padding: 15px 0;
 	}
+	
 </style>

pages/topic/topic.vue

@@ -1,7 +1,13 @@
 <template>
 	<view>
-		<view style="height: 20%;">
-			<button v-for="(item,index) in userType" @click="onclick(item)">{{item.dictLabel}}
+		<view class="btnContain">
+			<button 
+				v-for="(item,idx) in userType" 
+				@click="onclick(item,idx)"
+				:class="idx == currentIdx ? 'highlight' : 'not-highlight'"
+				:style="idx == 0 ? 'text-align:left' : 'text-align:right'"
+				>
+				{{item.dictLabel}}
 			</button>
 		</view>
 		<view>
@@ -30,7 +36,7 @@
 			return {
 				userType: [], // 初始化用户类型为空
 				dataList: [],
-
+				currentIdx:0,
 			}
 		},
 		created() {
@@ -57,8 +63,8 @@
 				})
 				console.log(_that.dataList)
 			},
-			onclick(row) {
-				
+			onclick(row,idx) {
+				this.currentIdx = idx
 				let data = {
 					objectOfHandling: row.dictValue,
 					yesOrNoShow: "0"
@@ -87,10 +93,41 @@
 		justify-content: center;
 		height: 100vh;
 	} */
-
+	.not-highlight{
+		color:#000;
+	}
+	.highlight{
+		color:#FF673D;
+	}
+	
+	.btnContain{
+		position: relative;
+		width: 100%;
+		display: flex;
+		height: 20%;
+		background-color: #fff;
+		justify-content: space-between;
+	}
+	.btnContain::after{
+		content: '';
+		position: absolute;
+		width: 4rpx;
+		height: 40%;
+		left: 50%;
+		top: 30%;
+		z-index: 10;
+		margin: auto;
+		background-color: #E1E1E1;
+	}
 	button {
-		margin-bottom: 10px;
+		width: 30%;
+		border: none;
+		background-color: #fff;
 	}
+	button:after{
+		border: none;
+	}
+
 
 	.selected {
 		background-color: #007bff;