Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/task/audit/warehouse_approval.vue

@@ -30,7 +30,7 @@
 				<view class="left">干粮收购价格（元/公斤）</view>
 				<view class="right">{{list.dryGrainPrice}}</view>
 			</view>
-			<view class='row'>
+			<view class='row boder'>
 				<view class="left">销售上限</view>
 				<view class="right">{{list.saleLimit}}</view>
 			</view>
@@ -46,7 +46,7 @@
 					<view class="left">基准单价（元/公斤）</view>
 					<view class="right">{{item.basePrice}}</view>
 				</view>
-				<view  class="row" v-for="(item1,index1) in item.modelList" :key="index1">
+				<view  class="row" v-for="(item1,index1) in item.modelList" :key="index1" :class="index1==item.modelList.length-1?'boder':''">
 					<view v-if="list.paramType == '2'" class="left">{{item1.startWater}}-{{item1.endWater}}降幅（元/0.1%）</view>
 					<view v-else class="left">{{item1.startWater}}-{{item1.endWater}}扣重比</view>
 					<view class="right">{{item1.price}}</view>
@@ -54,9 +54,9 @@
 			</view>
 		</view>
 		<u-toast ref="uToast" />
-		<view style='padding:10px;' class='flex'>
-			<u-button  @click='reject' type="error">驳回</u-button>
-			<u-button  @click='audit' type="success">通过</u-button>
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button  @click='reject' type="error" class="btn1">驳回</u-button>
+			<u-button  @click='audit' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -173,7 +173,7 @@
 <style scoped lang="scss">
 	.warp {
 		margin: 10rpx;
-		padding: 20rpx 20rpx 140rpx 20rpx;
+		padding: 20rpx 20rpx 330rpx 20rpx;
 	}
 
 	.content1,
@@ -186,7 +186,7 @@
 			font-size: 28rpx;
 			font-weight: 600;
 			color: #333333;
-			text-align: center;
+			text-align: left;
 		}
 
 		.row {
@@ -208,11 +208,23 @@
 	}
 
 	.bottom-btn {
-		width: 92%;
+		width: 100%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom:0;
 		display: flex;
 		z-index: 2;
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
+		.btn1,.btn2{
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+		.btn1{
+			background: white;
+			color: #00C265;
+		}
 	}
 
 	.submit {
@@ -220,4 +232,8 @@
 		background: #22C572;
 		border-radius: 10rpx;
 	}
+	.boder{
+		border:0;
+		border-bottom: 0!important;
+	}
 </style>

pages/task/my_task.vue

@@ -1,27 +1,27 @@
 <template name="task">
 	<view class="content">
-		<view class="cu-bar search bg-white">
-			<view class="search-form round" v-hasPermission="'acquisitionPay.view11'">
+		<view class="content1-top">
+			<view class="search-form round">
 				<u-search placeholder="请输入合同编号、车牌号或派车编号" v-model="keyword" @search="searchKeyWord()"
 					@custom="searchKeyWord()"></u-search>
 			</view>
-		</view>
-		<view style='background:#fff;padding:0 15px;'>
-			<view @click='tabcarchange(1)' class='line' :class='statusFlag==1?"active":""'>未完成</view>
-			<view @click='tabcarchange(3)' class='line' :class='statusFlag==3?"active":""'>已完成</view>
+			<view>
+				<view @click='tabcarchange(1)' class='line' :class='statusFlag==1?"active":""'>未完成</view>
+				<view @click='tabcarchange(3)' class='line' :class='statusFlag==3?"active":""'>已完成</view>
+			</view>
 		</view>
 		<view class="introduce-section">
 			<view v-for="(item, index) in taskInfo" :key="index" class="guess-item" @click="navToDetailPage(item)">
 				<view class="title flex align-item-center">
 					<view>
-						<view>{{item.department}}:</view>
+						<view class="title-row1">{{item.department}}:</view>
 						<view style='font-size:12px;color:#878C9C;'>{{item.createDate}}</view>
 					</view>
 					<text v-if='statusFlag==1' style='color:#FE6430;'>{{item.messageTitle}}</text>
 					<text v-if='statusFlag==3' style='color:#AFB3BF;'>{{item.messageTitle}}</text>
 				</view>
 				<view class="flex title_b">
-					<view style='color:#878C9C;' class="title">
+					<view style='color:#878C9C;' class="title row2">
 						{{item.messageContent}}
 					</view>
 				</view>
@@ -101,6 +101,7 @@
 		},
 		onReachBottom() { //上拉触底函数
 			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+				this.pages+=1
 				if (this.statusFlag == 1) {
 					this.warehouseInOutInfo.currentPage += 1
 				} else {
@@ -438,7 +439,9 @@
 		border-radius: 3px;
 		margin: 3px;
 	}
-
+	.introduce-section{
+		// background: red;
+	}
 	.introduce-section .title_b .title-tip {
 		font-size: 13px;
 		height: 40px;
@@ -449,7 +452,6 @@
 	.introduce-section .title_b .title {
 		font-size: 13px;
 		height: 40px;
-		padding: 10px 0;
 		flex: 2.5;
 	}
 
@@ -463,22 +465,22 @@
 
 	.introduce-section .title {
 		justify-content: space-between;
+		align-items: flex-start;
 	}
 
 	.introduce-section .title text {
-		font-size: 14px;
-		height: 50px;
-		line-height: 50px;
+		font-size: 28rpx;
 	}
 
 	.introduce-section .title .title-tip {
 		flex: 1;
-		font-size: 15px;
+		font-size: 28rpx;
 		color: #FE6430;
 		font-weight: 500;
 		height: 50px;
 		line-height: 50px;
 		border-bottom: 1px solid #EEEEEE;
+		
 	}
 
 	.introduce-section .title .title-tip-a {
@@ -492,10 +494,10 @@
 	}
 
 	.introduce-section .guess-item {
-		border-radius: 10px;
+		border-radius: 10rpx;
 		background: #fff;
-		padding: 30upx 30upx 80upx;
-		margin: 10px;
+		padding: 32rpx;
+		margin: 20rpx;
 	}
 
 	.line {
@@ -518,10 +520,24 @@
 		left: 50%;
 		transform: translateX(-50%);
 		bottom: 0;
-		border-bottom: 1px solid #22C572;
+		border-bottom: 3px solid #22C572;
 	}
 
 	/deep/.u-action-active {
 		margin-right: 6px;
 	}
+	.content1-top{
+		background: white;
+		padding: 20rpx;
+		border-radius: 0 0 30rpx 30rpx;
+	}
+	.search-form{
+		margin-bottom: 20rpx;
+	}
+	.title-row1{
+		font-size: 34rpx;
+	}
+	.row2{
+		margin-top: 55rpx;
+	}
 </style>