Merge branch 'master' of http://git.2weisou.com/wangxiao/NewZkgj

pages/center/Piabodata/StaffAnalysis.vue

@@ -589,9 +589,9 @@
 		text-align: center;
 	}
 	.timepicktime>view:nth-of-type(2){
-		width: 50rpx;
+		width: 49rpx;
 		height: 100%;
-		border-left: 1px solid  #E0E0E0;
+		// border-left: 1px solid  #E0E0E0;
 	}
 	.timepickpick{
 		width: 110rpx;

pages/center/Piabodata/Theteamcompared.vue

@@ -1066,9 +1066,9 @@
 		text-align: center;
 	}
 	.timepicktime>view:nth-of-type(2){
-		width: 50rpx;
+		width: 49rpx;
 		height: 100%;
-		border-left: 1px solid  #E0E0E0;
+		// border-left: 1px solid  #E0E0E0;
 	}
 	.timepickpick{
 		width: 110rpx;

pages/center/Piabodata/TrendAnalysis.vue

@@ -1236,9 +1236,9 @@
 	}
 
 	.timepicktime>view:nth-of-type(2) {
-		width: 50rpx;
+		width: 49rpx;
 		height: 100%;
-		border-left: 1px solid #E0E0E0;
+		// border-left: 1px solid #E0E0E0;
 	}
 
 	.timepickpick {
@@ -1329,4 +1329,7 @@
 		border-right:none ;
 		border-bottom:none ;
 	}
+	.grid:nth-child(3){
+		width: 50.5%;
+	}
 </style>

pages/center/consumer/consumerDetail.vue

@@ -105,7 +105,7 @@
 			
 			<!-- 跟进记录 -->
 			<view class="tabactive2" v-if="activeTotal==1" style="min-height: 600rpx;">
-				<view v-if="fllowList.length==0" style="width: 100%;height: 100%;display: flex;align-items: center;background-color: #FFFFFF;">
+				<view v-if="fllowList.length==0" style="width: 100%;height:600rpx;display: flex;align-items: center;background-color: #FFFFFF;">
 					<view style="width: 100%;padding-top: 60rpx;">
 						<view style="width: 100%;text-align: center;">
 							<image style="width: 220rpx;height: 200rpx;" src="https://static.quhouse.com/zhikong_xcx_img/nodatalist.png" mode=""></image>
@@ -664,12 +664,12 @@
 					font-size: 30rpx;
 					font-weight: 400;
 					color: #666666;
-					line-height: 30rpx;
+					line-height: 46rpx;
 					.content-sec-lab1{
 						color: #333333;
 					}
 					.content-sec-tips{
-						max-width:174rpx ;
+						max-width:120rpx ;
 						height: 46rpx;
 						background: #F2F2F2;
 						border-radius: 6rpx;
@@ -681,7 +681,7 @@
 						font-size: 26rpx;
 						font-weight: 400;
 						color: #333333;
-						margin-right: 24rpx;
+						margin-right: 20rpx;
 						box-sizing: border-box;
 						padding: 10rpx 24rpx;
 					}

pages/center/consumer/edit.vue

@@ -103,7 +103,7 @@
 												{{item.name}}
 											</view>
 										</view>
-										<view class="con-msg-con">
+										<view class="con-msg-con" :style="{borderBottom:index==allList.length-1?'none':'1px solid #E0E0E0'}">
 											<view v-for="(item1,i) in item.children" :key="index" @click="Edittag(item,item1,index,i)" :style="{border:item1.selected==0?'1px solid #0A6EE9':'1px solid #E0E0E0'}" class="chebox" >
 												{{item1.label}}
 											</view>
@@ -119,6 +119,9 @@
 				确定
 			</view>
 		</view>
+		<view class="" style="height: 220rpx;" >
+			<!-- :style="{marginTop:allList.length!=0?'0':'500rpx'}" -->
+		</view>
 		
 		<!-- 客户等级 -->
 		<u-select v-model="levelshow" :list="levellist" @confirm="levelshowCallback"></u-select>
@@ -394,9 +397,13 @@
 	}
 	
 	.submit{
-		height: 228rpx;
+		position: fixed;
+		bottom: 20rpx;
+		left: 20rpx;
+		height: 120rpx;
+		background: #FFFFFF;
 		.btn{
-			margin: 60rpx auto;
+			// margin: 60rpx auto;
 			text-align: center;
 			width: 690rpx;
 			height: 88rpx;
@@ -406,9 +413,6 @@
 			font-weight: 400;
 			color: #FFFFFF;
 			line-height: 88rpx;
-			position: fixed;
-			bottom: 20rpx;
-			left: 20rpx;
 		}
 	}
 	.con-msg-con{