客户动态优化

card/create/create.vue

@@ -583,7 +583,7 @@ export default {
 		 */
 		submitCard() {
 			let that = this;
-			if (!this.avatar) return req.msg('请上传头像');
+			if (!this.avatar) return req.msg('请上传名片页背景');
 			if (!this.realName) return req.msg('请填写你的真实姓名');
 			if (!this.jobNumber) return req.msg('请填写你的工号');
 			if (!this.brief) return req.msg('请填写个人简介');

mine/clientManage/clientManage.css

@@ -1,9 +1,29 @@
 page{
 	background-color: #f5f5f5;
 }
-.top-fixed{
+.tab{
 	position: fixed;
+	font-size: 32rpx;
+	height: 80rpx;
 	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	border-bottom: 2rpx solid #ededed;
+	z-index: 102;
+	background-color: #fff;
+}
+.tab-item{
+	text-align: center;
+	line-height: 80rpx;
+}
+.tab-item-active{
+	color: var(--main);
+	border-bottom: 2rpx solid var(--main);
+}
+.top-fixed{
+	position: fixed;
+	top: 80rpx;
 	right: 0;
 	left: 0;
 	background-color: #fff;
@@ -273,4 +293,43 @@ page{
 	margin: auto;
 	justify-content: center;
 	font-size: 32rpx;
+}
+
+
+/* 动态 */
+.log{margin: 20rpx 0 0;padding: 0rpx 40rpx 55rpx;}
+.log .tit{margin-bottom: 45rpx;}
+.log .li{padding-left: 60rpx;padding-bottom: 40rpx;position: relative;}
+.log-tit{font-size: 26rpx;color: #1A83FF;}
+.log .li text{display: block;color: #999;font-size: 26rpx;margin-top: 25rpx;}
+.log .li::before{content: '';display: block;width: 2rpx;background: #E2E7F1;position: absolute;top: 8rpx;left: 23rpx;bottom: -5rpx;z-index: 1;}
+.jcico{width: 26rpx;height: 26rpx;position: absolute;top: 5rpx;left: 12rpx;z-index: 2;}
+.time{font-size: 24rpx;color: #999;}
+.des{
+	font-size: 30rpx;
+	font-family: PingFang SC-Bold, PingFang SC;
+	/* font-weight: bold; */
+	color: #333333;
+	line-height: 42rpx;
+}
+.time-sort{
+	width: 120rpx;
+	height: 50rpx;
+	font-size: 24rpx;
+	font-family: PingFang SC-Bold, PingFang SC;
+	color: #333333;
+	margin-top: -10rpx;
+}
+.time-sort text{
+	font-size: 36rpx;
+	font-weight: bold;
+	margin-right: 10rpx;
+}
+.time-year{
+	height: 50rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC-Bold, PingFang SC;
+	font-weight: bold;
+	color: #333333;
+	margin: 50rpx 0;
 }

mine/clientManage/clientManage.vue

@@ -1,13 +1,17 @@
 <template>
 	<view>
-		<view class="top-fixed">
+		<view class="tab ddflex">
+			<view class="tab-item fflex" :class="tabIndex==1?'tab-item-active':''" @click="tabChange(1)">我的客户</view>
+			<view class="tab-item fflex" :class="tabIndex==2?'tab-item-active':''" @click="tabChange(2)">客户动态</view>
+		</view>
+		<view class="top-fixed" v-if="tabIndex==1">
 			<view class="search-box ddflex">
 				<view class="search-input ddflex fflex">
 					<image src="/static/images/ssico.png"></image>
 					<input @confirm="searchFn" confirm-type="search" @input="searchFn" v-model="searchVal" class="fflex"
 						placeholder="请输入客户昵称或真实姓名" />
 				</view>
-				<view style="margin: 0rpx 0rpx 0 20rpx;color: #2A82FD;text-align: right;font-size: 26rpx;" @click="jumpUrl('/mine/allDynamic/allDynamic')">客户动态></view>
+				<!-- <view style="margin: 0rpx 0rpx 0 20rpx;color: #2A82FD;text-align: right;font-size: 26rpx;" @click="jumpUrl('/mine/allDynamic/allDynamic')">客户动态></view> -->
 			</view>
 			<view class="filter ddflex">
 				<view :class="'filter-item fflex ddflex '+(filterType==2&&isShowPop?'f-active':'')" @click="changeFilterType(2)">
@@ -22,9 +26,9 @@
 		</view>
 		
 		
-		<view class="ceng" v-if="isShowPop" @click="hidePop()"></view>
+		<view class="ceng" :style="'top:calc(' +popBottom+' + '+(isShowPop?270:0)+'rpx' " v-if="isShowPop" @click="hidePop()"></view>
 		
-		<view class="hx-pop" :style="'top:calc(' +popBottom+' + '+(isShowPop?190:0)+'rpx' ">
+		<view class="hx-pop" :style="'top:calc(' +popBottom+' + '+(isShowPop?270:0)+'rpx' ">
 			<view class="pop-con" v-if="filterType==1">
 				<view class="pop-list">
 					<view v-for="(item, index) in dateList" :key="index" style="margin-bottom: 30rpx;">
@@ -50,50 +54,89 @@
 			</view>
 		</view>
 		
-		<view style="height: 190rpx;"></view>
+		<view style="height: 290rpx;" v-if="tabIndex==1"></view>
+		<view style="height: 120rpx;" v-if="tabIndex==2"></view>
 		<!-- 订单列表 -->
-		<view style="position: relative;overflow: hidden;" v-if="dataList.length>0">
-			<view class="register-box" v-for="item,index in dataList" :key="index" @click="jumpUrl('/mine/clientDetail/clientDetail?id='+item.id)">
-				<view class="register-title dflex fflex">
-					<image class="register-title-icon" :src="item.avatar?item.avatar:'/static/images/userimg.png'"></image>
-					<view class="flex" style="min-width: 0;">
-						<view class="ddflex">
-							<view class="card-name fflex tover">{{item.nickName?item.nickName:''}}</view>
-							<view v-if="item.mobile">
-								<image style="width: 140rpx;height: 64rpx;margin-left: 20rpx;" src="/mine/static/images/lx.png" @click.stop="goPhone(item.mobile)"></image>
+		<block v-if="tabIndex==1">
+			<view style="position: relative;overflow: hidden;" v-if="dataList.length>0">
+				<view class="register-box" v-for="item,index in dataList" :key="index" @click="jumpUrl('/mine/clientDetail/clientDetail?id='+item.id)">
+					<view class="register-title dflex fflex">
+						<image class="register-title-icon" :src="item.avatar?item.avatar:'/static/images/userimg.png'"></image>
+						<view class="flex" style="min-width: 0;">
+							<view class="ddflex">
+								<view class="card-name fflex tover">{{item.nickName?item.nickName:''}}</view>
+								<view v-if="item.mobile">
+									<image style="width: 140rpx;height: 64rpx;margin-left: 20rpx;" src="/mine/static/images/lx.png" @click.stop="goPhone(item.mobile)"></image>
+								</view>
+							</view>
+							<view class="card-name" style="line-height: 48rpx;margin-bottom: 10rpx;" v-if="item.realName">({{item.realName}})</view>
+							<view class="ddflex" style="margin-top: 4rpx;">
+								<block v-if="item.customTypeName&&item.customTypeName.length>0">
+									<view class="card-tag" v-for="it,idx in item.customTypeName" :key="idx+'s'">{{it}}</view>
+								</block>
+								<block v-if="item.labelName&&item.labelName.length>0">
+									<view class="card-tag card-tag-t" v-for="it,idx in item.labelName" :key="idx+'l'">{{it}}</view>
+								</block>
+							</view>
+							<view class="ddflex" style="font-size: 24rpx;color: #999;font-weight: 400;margin: 20rpx 0;">
+								<text>保单</text><text style="color: #000000;">{{item.warrantyCount?item.warrantyCount:0}}</text>
+								<view class="card-line" style="height: 23rpx;margin: 0 10rpx;"></view>
+								<text>共计保费</text><text style="color: #FF5700;">{{item.warrantyMoney?item.warrantyMoney:0}}元</text>
 							</view>
 						</view>
-						<view class="card-name" style="line-height: 48rpx;margin-bottom: 10rpx;" v-if="item.realName">({{item.realName}})</view>
-						<view class="ddflex" style="margin-top: 4rpx;">
-							<block v-if="item.customTypeName&&item.customTypeName.length>0">
-								<view class="card-tag" v-for="it,idx in item.customTypeName" :key="idx+'s'">{{it}}</view>
-							</block>
-							<block v-if="item.labelName&&item.labelName.length>0">
-								<view class="card-tag card-tag-t" v-for="it,idx in item.labelName" :key="idx+'l'">{{it}}</view>
+					</view>
+					<!-- <view class="ddflex" style="margin-top: 41rpx;font-size: 24rpx;padding: 0 30rpx;">
+						<view class="ddflex fflex">
+							<view style="color: #999;margin-right: 16rpx;">服务策略</view>
+							<view style="color: #333333;">刺激消费频率</view>
+						</view>
+						<view v-if="item.mobile">
+							<image style="width: 140rpx;height: 64rpx;margin-left: 20rpx;" src="/mine/static/images/lx.png" @click.stop="goPhone(item.mobile)"></image>
+						</view>
+					</view> -->
+				</view>
+			</view>
+			<view v-else class="nodata">
+				<image src="../../card/static/images/empty.png" mode="widthFix"></image>
+				<view>暂无数据</view>
+			</view>
+		</block>
+		<block v-if="tabIndex==2">
+			<view class="log">
+				<view v-if="logsList && logsList.length > 0" v-for="(it, index) in logsList" :key="index" @click="jumpUrl('/mine/clientDetail/clientDetail?id='+it.uid)">
+					<view class="time-year" v-if="todayYear!=it.year && index==0 || (index!=0 && (it.year!=logsList[index-1].year))">{{ it.year }}年</view>
+					<view class="dflex">
+						<view class="time-sort">
+							<block v-if="index==0 || (index!=0 && (it.day!=logsList[index-1].day||it.month!=logsList[index-1].month||it.year!=logsList[index-1].year))">
+								<text v-if="todayYear==it.year&&todayMonth==it.month&&todayDay==it.day">今日</text>
+								<block v-else>
+									<text>{{it.day}}</text>{{ it.month }}月
+								</block>
 							</block>
 						</view>
-						<view class="ddflex" style="font-size: 24rpx;color: #999;font-weight: 400;margin: 20rpx 0;">
-							<text>保单</text><text style="color: #000000;">{{item.warrantyCount?item.warrantyCount:0}}</text>
-							<view class="card-line" style="height: 23rpx;margin: 0 10rpx;"></view>
-							<text>共计保费</text><text style="color: #FF5700;">{{item.warrantyMoney?item.warrantyMoney:0}}元</text>
+						<view class="li fflex">
+							<image src="/mine/static/images/jcico.png" class="jcico"></image>
+							<view class="ddflex" style="width: 100%;margin-bottom: 20rpx;">
+								<image style="width: 80rpx;height: 80rpx;border-radius: 100%;margin-right: 20rpx;" :src="it.avatar?it.avatar:'/static/images/userimg.png'"></image>
+								<view class="fflex">
+									<view style="font-size: 28rpx;font-weight: bold;" class="ddflex">
+										<view class="tover " style="max-width: 250rpx;">{{it.nickName}}</view>
+										<view v-if="it.realName">({{it.realName}})</view>
+									</view>
+									<view class="time">{{ it.time }}</view>
+								</view>
+							</view>
+							<!-- <view class="des" v-if="it.brief">{{ it.brief }}</view> -->
+							<rich-text class="des" :nodes="it.content"></rich-text>
 						</view>
 					</view>
 				</view>
-				<!-- <view class="ddflex" style="margin-top: 41rpx;font-size: 24rpx;padding: 0 30rpx;">
-					<view class="ddflex fflex">
-						<view style="color: #999;margin-right: 16rpx;">服务策略</view>
-						<view style="color: #333333;">刺激消费频率</view>
-					</view>
-					<view v-if="item.mobile">
-						<image style="width: 140rpx;height: 64rpx;margin-left: 20rpx;" src="/mine/static/images/lx.png" @click.stop="goPhone(item.mobile)"></image>
-					</view>
-				</view> -->
+				<view v-if="!logsList || logsList.length == 0" class="nodata">
+					<image src="/mine/static/images/empty.png" mode="aspectFill"></image>
+					<view>暂无记录~</view>
+				</view>
 			</view>
-		</view>
-		<view v-else class="nodata">
-			<image src="../../card/static/images/empty.png" mode="widthFix"></image>
-			<view>暂无数据</view>
-		</view>
+		</block>
 	</view>
 </template>
 
@@ -107,7 +150,7 @@
 		props: {},
 		data() {
 			return {
-				
+				tabIndex:1,
 				filterType:null,
 				
 				popBottom: '-100%',
@@ -180,9 +223,24 @@
 				searchVal: '',
 				dataList: [],
 				isReference:false,
+				
+				
+				// 动态
+				form: {
+					page: 1,
+					limit: 10
+				},
+				isLoadDynamic: true,
+				logsList:[],
+				todayYear:'',
+				todayMonth:'',
+				todayDay:''
 			}
 		},
 		async onLoad(options) {
+			this.todayYear = new Date().getFullYear()
+			this.todayMonth = new Date().getMonth() + 1
+			this.todayDay = new Date().getDate()
 			await this.getDict()
 			await this.getDictCustomType()
 			this.getDataList()
@@ -196,8 +254,14 @@
 			}
 		},
 		onReachBottom() {
-			this.page++;
-			this.getDataList();
+			if(this.tabIndex==1){
+				this.page++;
+				this.getDataList();
+			}
+			if(this.tabIndex==2){
+				this.form.page++;
+				this.getPageList(false);
+			}
 		},
 		methods: {
 			jumpUrl(url) {
@@ -381,6 +445,86 @@
 					}
 				}); // 传参带入号码即可
 			},
+			
+			
+			tabChange(index){
+				if(this.tabIndex==index) return false
+				this.tabIndex = index
+				this.hidePop()
+				if(this.tabIndex==2){
+					this.form.page = 1
+					this.isLoadDynamic = true;
+					this.logsList = []
+					this.getPageList(true)
+				}else{
+					this.page = 1;
+					this.isLoad = true;
+					this.page=1;
+					this.dataList = [];
+					this.getDataList();
+				}
+			},
+			getPageList(isShow) {
+				if (!this.isLoadDynamic) return false;
+				this.isLoadDynamic = false;
+				let form = this.form;
+				uni.showLoading();
+				req.getRequest(
+					'/api/user/getUsersTrends',
+					form,
+					res => {
+						res  = res?res.list:[]
+						if(res&&res.length>0){
+							res.map(item=>{
+								let t = this.getDate(item.createDate)
+								item.year = t.year
+								item.month = t.month
+								item.day = t.day
+								item.time = (t.hour<10?('0'+t.hour):t.hour)+':'+(t.minute<10?('0'+t.minute):t.minute)
+							})
+						}
+						this.isShow = true;
+						if (res && res.length == 10) {
+							this.isLoadDynamic = true;
+						}
+						if (this.form.page > 1) {
+							res = this.logsList.concat(res);
+						}else{
+							this.goTop()
+						}
+						this.logsList = res;
+						uni.hideLoading();
+					},
+					isShow
+				);
+			},
+			getDate(dateStr){
+				if(!dateStr) return false
+				let date = new Date(dateStr)
+				const year = date.getFullYear();
+				const month = date.getMonth() + 1;
+				const day = date.getDate();
+				const hour = date.getHours();
+				const minute = date.getMinutes();
+				const second = date.getSeconds();
+				return {
+					year:year,
+					month:month,
+					day:day,
+					hour:hour,
+					minute:minute,
+					second:second,
+				}
+			},
+			goTop(e) {
+				// 一键回到顶部
+				if (uni.pageScrollTo) {
+					uni.pageScrollTo({
+						scrollTop: 0,
+						duration:100
+					});
+				}
+			}
 		},
 		mounted() {
 		}