Browse Source

前端gjy

gjy 4 years ago
parent
commit
75197f1282
1 changed files with 28 additions and 43 deletions
  1. 28 43
      unimall-app/pages/user/task.vue

+ 28 - 43
unimall-app/pages/user/task.vue

@@ -9,57 +9,23 @@
 				 @touchstart="ListTouchStart" @touchmove="ListTouchMove" @touchend="ListTouchEnd" :data-target="'move-box-' + index"
 			>
 			<view class='wrap' >
-				<view   class="flex justify-between padding-xs">
-				  <view class=" padding-xs">
-					  <view v-if="item.taskStatus == 1" class="cu-capsule radius">
-					  	<view class="cu-tag bg-green">
-					  		{{item.taskType}}
-					  	</view>
-					  	<view class="cu-tag line-green">
-					  		{{item.gmtUpdate}}
-					  	</view>
-					  </view>
-					  <view  v-else class="cu-capsule radius">
-					  	<view class="cu-tag bg-gray">
-					  		{{item.taskType}}
-					  	</view>
-					  	<view class="cu-tag line-gray">
-					  		{{item.gmtUpdate}}
-					  	</view>
-					  </view>
+				<view  style='align-items: center;' class="flex justify-between padding-xs">
+					<view class=" padding-xs">
+						<view class="radius">
+							<view style='font-weight: 600;font-size: 16px;margin-bottom: 5px;'>{{item.taskType}}<text v-if='item.carNo'>({{item.carNo}})</text></view>
+					  		<view style='color:#ccc;'>{{item.gmtUpdate}}</view>
+						</view>
 				  </view>
-				  <view class=" padding-xs">
-						<view v-if="item.taskStatus == 1" class="cu-tag line-green">
+						<view v-if="item.taskStatus == 1" class="tag-green line-green">
 							未完成
 						</view>
-						<view  v-if="item.taskStatus == 2" class="cu-tag line-gray">
+						<view  v-if="item.taskStatus == 2" class="tag-gray line-gray">
 							已完成
 						</view>
-						<view  v-if="item.taskStatus == 3" class="cu-tag line-red">
+						<view  v-if="item.taskStatus == 3" class="tag-red line-red">
 							已改派
 						</view>
-				  </view>
-				</view>
-				<view v-if="item.carNo" class="flex justify-between padding-xs ">
-				  <view class=" padding-xs">
-					  <view v-if="item.taskStatus == 1" class="cu-capsule radius">
-					  	<view class="cu-tag bg-orange">
-					  		{{item.carNo}}
-					  	</view>
-					  </view>
-					  <view  v-else-if="item.carNo" class="cu-capsule radius">
-					  	<view class="cu-tag bg-gray">
-					  		{{item.carNo}}
-					  	</view>
-					  </view>
-				  </view>
-				  <view v-if="item.carStatus &&item.companyId !=2" class=" padding-xs">	
-					  <view  class="cu-tag line-green">
-						{{item.carStatus}}
-					  </view>
-				  </view>
 				</view>
-				
 			</view>
 			<view v-if="item.companyId != 2" class="move" v-show='item.show==true' @click.stop="hided(item,$event)">
 				<view class="bg-red">删除</view>
@@ -1041,6 +1007,25 @@
 	.wrap{
 		width:100%;
 	}
+	.tag-green{
+		border: 1px solid #39b54a;
+		padding: 4px 13px;
+		border-radius: 30px;
+		height:30px;
+	}
+	.tag-gray{
+		border: 1px solid #aaaaaa;
+		padding: 4px 13px;
+		border-radius: 30px;
+		height:30px;
+	}
+	.tag-red{
+		border: 1px solid #e54d42;
+		padding: 4px 13px;
+		border-radius: 30px;
+		height:30px;
+	}
+	
 	.cu-list>.cu-item .move{
 		width: 110px;
 	}