Merge branch 'master' of http://gitlab.frkj.cc/php/ZhiHuiJiaoWu_UniApp

components/AQ/AQTabber.vue

@@ -7,16 +7,16 @@
 			<view class="fui-custom__wrap">
 				<view class="title" style="font-size: 36rpx;text-align: center;padding: 36rpx 0;">快捷新增</view>
 				<view class="but-style">
-					<view class="but-style-top">
-						<view class="left" @click="writingFollowUp">
-							<image src="@/static/images/index/writing.png" class="drop-image-x"></image>
-							<view class="title-x">添加跟进记录</view>
-						</view>
-						<view class="right" @click="newTask">
-							<image src="@/static/images/index/task.png" class="drop-image-x"></image>
-							<view class="title-x">转交跟进任务</view>
-						</view>
-					</view>
+<!--					<view class="but-style-top">-->
+<!--						<view class="left" @click="writingFollowUp">-->
+<!--							<image src="@/static/images/index/writing.png" class="drop-image-x"></image>-->
+<!--							<view class="title-x">添加跟进记录</view>-->
+<!--						</view>-->
+<!--						<view class="right" @click="newTask">-->
+<!--							<image src="@/static/images/index/task.png" class="drop-image-x"></image>-->
+<!--							<view class="title-x">转交跟进任务</view>-->
+<!--						</view>-->
+<!--					</view>-->
 					<view class="but-style-below" @click="addClues">
 						<image src="@/static/images/index/addto.png" class="drop-image-x"></image>
 						<view class="title-x">添加客户</view>
@@ -196,7 +196,8 @@
 	}
 	.fui-custom__wrap {
 		width: 100%;
-		height: 600rpx;
+		//height: 600rpx;
+		height: 450rpx;
 	}
 	.title{
 		font-size: 36rpx;