Browse Source

Merge branch 'master' of http://47.99.94.255:3000/web/workflow-mobile

dufeng 1 year ago
parent
commit
3df58051e3

+ 4 - 1
pages/workflowTask/approveCenter/doneList.vue

@@ -4,6 +4,7 @@
 		<view class="di-scroll-list">
 			<!-- 右滑 -->
 			<u-swipe-action
+				style="margin-bottom: 20rpx;border-radius: 10rpx;overflow: hidden;"
 				v-for="(item, index) in list"
 				:show="activeIndex === item[primaryKey]"
 				:key="index" 
@@ -39,5 +40,7 @@
 </script>
 
 <style>
-
+.di-scroll-list {
+	background: none;
+}
 </style>

+ 23 - 5
pages/workflowTask/approveCenter/index.vue

@@ -5,12 +5,19 @@
 			placeholder="查询流程"
 			v-model="keyword"
 			bg-color="#fff"
-			margin="0 0 10rpx 0"
-			:input-style="{fontSize: variables.mainFontSize}"
+			margin="16rpx 24rpx"
+			:input-style="{
+				fontSize: variables.mainFontSize,
+				padding: '0rpx 40rpx',
+			}"
 			:action-style="{fontSize: variables.mainFontSize}"
-			:border-color="variables.mainColor"
+			:border-color="'#F2F2F2'"
+			:bg-color="'#F2F2F2'"
+			:height="74"
 			@search="() => searchKeyWord = keyword"
 			@custom="() => searchKeyWord = keyword"
+			:show-action="false"
+			input-align="center"
 			/>
 		</view>
 		<view class="approve-list">
@@ -85,7 +92,18 @@
 		height: 100%;
 		display: flex;
 		flex-direction: column;
-		background-color: #fff;
-		padding: 10rpx;
+		// background-color: #fff;
+		// padding: 10rpx;
+		
+		.approve-search{
+			background-color: #fff;
+				padding: 0 10rpx;
+		}
+	}
+	
+	::v-deep {
+		.u-content {
+			background-color: #F2F2F2 !important;
+		}
 	}
 </style>

+ 4 - 1
pages/workflowTask/approveCenter/launchList.vue

@@ -4,6 +4,7 @@
 		<view class="di-scroll-list">
 			<!-- 右滑 -->
 			<u-swipe-action
+			    style="margin-bottom: 20rpx;border-radius: 10rpx;overflow: hidden;"
 				v-for="(item, index) in list"
 				:show="activeIndex === item[primaryKey]"
 				:key="index" 
@@ -54,5 +55,7 @@
 </script>
 
 <style>
-
+.di-scroll-list {
+	background: none;
+}
 </style>

+ 4 - 1
pages/workflowTask/approveCenter/todoList.vue

@@ -4,6 +4,7 @@
 		<view class="di-scroll-list">
 			<!-- 右滑 -->
 			<u-swipe-action
+				style="margin-bottom: 20rpx;border-radius: 10rpx;overflow: hidden;"
 				v-for="(item, index) in list"
 				:show="activeIndex === item[primaryKey]"
 				:key="index" 
@@ -67,5 +68,7 @@
 </script>
 
 <style lang="scss">
-
+.di-scroll-list {
+	background: none;
+}
 </style>

+ 1 - 0
pages/workflowTask/index.vue

@@ -60,4 +60,5 @@
 			overflow: hidden;
 		}
 	}
+	
 </style>

+ 5 - 2
pages/workflowTask/startWorkflow/processDefinitionList.vue

@@ -1,6 +1,8 @@
 <template>
-	<scroll-view :style="{height: `calc(${processDefinitionHeight}px - 20rpx)`}" class="di-scroll" scroll-y @scrolltolower="handleOnreachBottom" :refresher-triggered="triggered"
-		refresher-enabled @refresherrefresh="handlePullDownRefresh">
+	<scroll-view :style="{height: `calc(${processDefinitionHeight}px - 0rpx)`}" class="di-scroll" scroll-y @scrolltolower="handleOnreachBottom" :refresher-triggered="triggered"
+		refresher-enabled @refresherrefresh="handlePullDownRefresh"
+		refresher-background="#F3F4F6"
+		>
 		<view class="di-scroll-list">
 			<!-- 右滑 -->
 			<u-swipe-action
@@ -89,4 +91,5 @@
 </script>
 
 <style lang="scss">
+
 </style>

+ 26 - 7
pages/workflowTask/startWorkflow/startWorkflow.vue

@@ -5,15 +5,23 @@
 			placeholder="查询流程"
 			v-model="keyword"
 			bg-color="#fff"
-			margin="0 0 10rpx 0"
-			:input-style="{fontSize: variables.mainFontSize}"
+			margin="16rpx 24rpx"
+			:input-style="{
+				fontSize: variables.mainFontSize,
+				padding: '0rpx 40rpx',
+			}"
 			:action-style="{fontSize: variables.mainFontSize}"
-			:border-color="variables.mainColor"
+			:border-color="'#F2F2F2'"
+			:bg-color="'#F2F2F2'"
+			:height="74"
 			@search="() => searchKeyWord = keyword"
 			@custom="() => searchKeyWord = keyword"
+			:show-action="false"
+			input-align="center"
 			/>
+			
 			<u-tabs
-			font-size="24"
+			font-size="30"
 			:active-color="variables.mainColor"
 			inactive-color="#606266"
 			:current="current"
@@ -21,7 +29,7 @@
 			@change="handleChange"/>
 			<!-- 移动端只分两级, -->
 			<u-tabs
-			font-size="24"
+			font-size="30"
 			:active-color="variables.mainColor"
 			inactive-color="#606266"
 			:current="childCurrent"
@@ -160,7 +168,18 @@
 		height: 100%;
 		display: flex;
 		flex-direction: column;
-		background-color: #fff;
-		padding: 10rpx;
+		
+		
+		
+		.start-workflow-search {
+			background-color: #fff;
+				padding: 0 10rpx;
+		}
+	}
+	
+	::v-deep {
+		.u-content {
+			background-color: #F2F2F2 !important;
+		}
 	}
 </style>