优化

card/cardFound/cardFound.vue

@@ -38,7 +38,7 @@
 			</view>
 		</view>
 		<!-- @click="jumpUrl('/card/cardList/cardList')" -->
-		<view class="found-more ddflex" >
+		<view class="found-more ddflex" @click="jumpUrl('/card/cardList/cardList')">
 			<image src="../../static/images/found_more.png"></image>
 			寻找更多保险顾问
 		</view>

card/cardList/cardList.css

@@ -57,7 +57,7 @@ page{
 	justify-content: center;
 }
 .f-active{
-	color: #009AFF;
+	color: var(--main);
 }
 
 /* 弹窗 */

card/cardList/cardList.vue

@@ -14,7 +14,7 @@
 					<image class="filter-item-icon" :style="filterType==1&&isShowPop?'transform: rotate(180deg);':''" src="../static/images/down.png"></image>
 				</view>
 				<view :class="'filter-item fflex ddflex '+(areaIndex!=-1?'f-active':'')" @click="changeFilterType(1)">
-					{{areaIndex!=-1?areaList[areaIndex].label:'全国'}}
+					地区
 					<image class="filter-item-icon" :style="filterType==1&&isShowPop?'transform: rotate(180deg);':''" src="../static/images/down.png"></image>
 				</view>
 				<view :class="'filter-item fflex ddflex '+(stateIndex!=-1?'f-active':'')" @click="changeFilterType(2)">
@@ -56,38 +56,38 @@
 		<view style="height: 190rpx;"></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('/card/cardDetail/cardDetail')">
-				<view class="register-title ddflex fflex" @click.stop="jumpUrl('/card/cardDetail/cardDetail')">
+			<view class="register-box" v-for="item,index in dataList" :key="index" @click="jumpUrl('/card/cardDetail/cardDetail?id='+item.id)">
+				<view class="register-title ddflex 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>
-							<image style="width: 64rpx;height: 64rpx;margin-left: 10rpx;" src="../static/images/wxth.png"></image>
+							<view class="card-name fflex tover">{{item.realName?item.realName:''}}</view>
+							<image style="width: 64rpx;height: 64rpx;margin-left: 10rpx;" src="/card/static/images/wxChat.png"></image>
 						</view>
 						<view class="ddflex" style="margin-top: 4rpx;">
-							<view class="card-tag">高级组经理</view>
-							<view class="card-tag">入司10年</view>
+							<view class="card-tag">{{ item.jobName }}</view>
+							<view class="card-tag">入司{{item.inDate?getAge(item.inDate):1}}年</view>
 						</view>
 						<view class="card-area ddflex">
-							<image src="/static/pages/images/dzico.png"></image>
-							<view class="flex tover">中电软件园中电软件园中电软件园中电软件园</view>
-							<view style="color: #A1A1A1;margin-left: 10rpx;">距离5.23km</view>
+							<image src="/card/static/images/area.png"></image>
+							<view class="flex tover">{{item.address}}</view>
+							<view style="color: #A1A1A1;margin-left: 10rpx;">距离{{item.distance>1000?((item.distance/1000).toFixed(2)+'km'):(item.distance+'m')}}</view>
 						</view>
 					</view>
 				</view>
 				<view class="ddflex" style="margin-top: 41rpx;">
 					<view class="flex">
-						<view class="card-data">1678</view>
+						<view class="card-data">{{item.cntCust?item.cntCust:0}}</view>
 						<view class="card-label">服务客户</view>
 					</view>
 					<view class="card-line"></view>
 					<view class="flex">
-						<view class="card-data">1678</view>
+						<view class="card-data">{{item.cntCntr?item.cntCntr:0}}</view>
 						<view class="card-label">保单件数</view>
 					</view>
 					<view class="card-line"></view>
 					<view class="flex">
-						<view class="card-data">1678</view>
+						<view class="card-data">{{item.thumbs?item.thumbs:0}}</view>
 						<view class="card-label">用户评价</view>
 					</view>
 				</view>
@@ -103,6 +103,8 @@
 <script>
 	const app = getApp();
 	const req = require("../../utils/request.js");
+	const util = require('../../utils/util.js');
+	const QQMapWX = require("../../utils/qqmap.js");
 
 	export default {
 		components: {},
@@ -170,11 +172,22 @@
 				isLoad: true,
 				searchVal: '',
 				dataList: [],
-				isReference:false
+				isReference:false,
+				latitude: '23.027923',
+				longitude: '113.753815',
 			}
 		},
 		onLoad(options) {
-			this.getDataList()
+			QQMapWX.initMap();
+			req.getLocation(res => {
+				const to = {
+					latitude: res.latitude,
+					longitude: res.longitude
+				};
+				this.latitude = res.latitude;
+				this.longitude = res.longitude;
+				this.getDataList()
+			});
 		},
 		onShow() {
 			if(this.isReference){
@@ -267,6 +280,8 @@
 				let queryParams = {
 					page: this.page,
 					limit: this.limit,
+					latitude: this.latitude,
+					longitude: this.longitude,
 				}
 				if (this.searchVal) {
 					queryParams.search = this.searchVal
@@ -286,7 +301,7 @@
 					queryParams.state = this.stateList[this.stateIndex].value;
 				}
 				req.getRequest('/api/visiting/card/cardInfoList', queryParams, data => {
-					data = [1,2]
+					data = data.list
 					if (data != null && data.length == this.limit) {
 						this.isLoad = true;
 					}
@@ -314,24 +329,9 @@
 				}
 			
 			},
-			// 取消订单
-			quxiao(item){
-				this.$showModal({
-					title: '提示',
-					content: '确定取消订单？',
-					cancelText: '取消',
-					confirmText: '确认'
-				})
-				.then(res => {
-					req.postRequest('/api/order/cancel',{id:item.id},res=>{
-						req.msg('订单已取消')
-						item.state = 8
-					})
-				})
-				.catch(err => {
-					
-				});
-			}
+			getAge(date) {
+				return util.getAge(date)
+			},
 		},
 		mounted() {
 			const systemInfo = uni.getSystemInfoSync();

components/service-contact/index.vue

@@ -1,19 +1,21 @@
 <template>
-	<view v-if="recommendCard">
-		<view style="height: 136rpx;"></view>
-		<view class="sc-box ddflex">
-			<image class="sc-header" :src="recommendCard.avatar?recommendCard.avatar:'../../static/images/userimg.png'">
-			</image>
-			<view class="sc-name">
-				<view>{{recommendCard.realName}}</view>
-				<view class="sc-tag">{{recommendCard.jobName}}</view>
+	<view v-if="!loading">
+		<view v-if="recommendCard&&userInfo.id!=recommendCard.userId">
+			<view style="height: 136rpx;"></view>
+			<view class="sc-box ddflex">
+				<image class="sc-header" :src="recommendCard.avatar?recommendCard.avatar:'../../static/images/userimg.png'">
+				</image>
+				<view class="sc-name">
+					<view>{{recommendCard.realName}}</view>
+					<view class="sc-tag">{{recommendCard.jobName}}</view>
+				</view>
+				<view class="sc-line"></view>
+				<view class="sc-contact" @click="jumpSingleChatRoom()">
+					<image src="/static/images/wxChat.png"></image>
+					<view>聊一聊</view>
+				</view>
+				<view class="sc-btn flex" @click="toIndex">进入我的微页</view>
 			</view>
-			<view class="sc-line"></view>
-			<view class="sc-contact" @click="jumpSingleChatRoom()">
-				<image src="/static/images/wxChat.png"></image>
-				<view>聊一聊</view>
-			</view>
-			<view class="sc-btn flex" @click="toIndex">进入我的微页</view>
 		</view>
 	</view>
 </template>
@@ -25,7 +27,9 @@
 	export default {
 		data() {
 			return {
-				recommendCard: {}
+				userInfo:{},
+				recommendCard: {},
+				loading:true
 			};
 		},
 
@@ -34,6 +38,7 @@
 		watch: {},
 
 		mounted() {
+			this.userInfo = req.getStorage('userInfo')
 			this.getRecommendCard()
 		},
 
@@ -42,6 +47,7 @@
 			getRecommendCard() {
 				req.getRequest('/api/visiting/card/recommendCardInfo', {}, res => {
 					this.recommendCard = res
+					this.loading = false
 				})
 			},
 

match/activityReview/activityReview.css

@@ -0,0 +1,165 @@
+page{
+	background-color: #fff;
+}
+.top-fixed{
+	position: fixed;
+	top: 0;
+	right: 0;
+	left: 0;
+	background-color: #fff;
+	z-index: 101;
+}
+.search-box{
+	padding: 30rpx;
+	background-color: #fff;
+}
+
+.search-text{
+	color: #999999;
+}
+
+
+.search-input{
+	height: 76rpx;
+	line-height: 76rpx;;
+	background: #F5F5F5;
+	border-radius: 60rpx;
+	padding: 0 26rpx;
+	font-size: 24rpx;
+}
+.search-input input{
+	font-size: 24rpx;
+}
+.search-input image{
+	width: 34rpx;
+	height: 34rpx;
+	margin-right: 26rpx;
+}
+.search-all{
+	color: #2a82fd;
+	font-size: 30rpx;
+	margin-left: 46rpx;
+}
+
+
+.title{
+	line-height: 50rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC-Bold, PingFang SC;
+	font-weight: bold;
+	color: #333333;
+	padding: 0 30rpx;
+}
+.title text{
+	font-size: 24rpx;
+	font-family: PingFang SC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #A1A1A1;
+	margin-left: 20rpx;
+}
+
+.padd30{
+	padding: 30rpx;
+}
+.act-bar{
+	padding-bottom:42rpx ;
+	border-bottom: 2rpx solid #E8E8E8;
+	margin-bottom: 40rpx;
+}
+.act-bar:last-child{
+	border-bottom: none;
+}
+.act-pic{
+	position: relative;
+	width: 270rpx;
+	height: 174rpx;
+	border-radius: 6rpx 6rpx 6rpx 6rpx;
+	margin-right: 24rpx;
+}
+.act-pic image{
+	width: 100%;
+	height: 100%;
+	border-radius: 6rpx 6rpx 6rpx 6rpx;
+}
+.act-pic-tag{
+	position: absolute;
+	top: 0;
+	left: 0;
+	background-color: rgba(0, 0, 0, 0.7);
+	border-radius: 6rpx 0rpx 15rpx 0rpx;
+	padding: 0 10rpx;
+	line-height: 28rpx;
+	font-size: 20rpx;
+	font-family: PingFang SC-Regular, PingFang SC;
+	font-weight: 400;
+	text-align: center;
+	color: #FFFFFF;
+}
+.act-title{
+	max-height: 80rpx;
+	line-height: 40rpx;
+	font-size: 28rpx;
+	font-family: PingFang SC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #000000;
+}
+.act-time{
+	line-height: 33rpx;
+	font-size: 24rpx;
+	font-family: PingFang SC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #999999;
+	margin-top: 10rpx;
+}
+.act-bottom{
+	justify-content: space-between;
+	margin-top: 20rpx;
+}
+.act-bottom-look{
+	font-size: 24rpx;
+	font-family: PingFang SC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #999999;
+}
+.act-bottom-look image{
+	width: 28rpx;
+	height: 28rpx;
+	margin-right: 6rpx;
+}
+.act-edit{
+	width: 113rpx;
+	height: 52rpx;
+	line-height: 52rpx;
+	background: #27D699;
+	border-radius: 26rpx 26rpx 26rpx 26rpx;
+	opacity: 1;
+	text-align: center;
+	font-size: 24rpx;
+	font-family: PingFang SC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #FFFFFF;
+}
+
+.act-create{
+	width: 110rpx;
+	height: 110rpx;
+	background: var(--main);
+	box-shadow: 0rpx 4rpx 24rpx 1rpx rgba(0,155,98,0.2);
+	opacity: 1;
+	font-size: 24rpx;
+	font-family: PingFang SC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #FFFFFF;
+	text-align: center;
+	border-radius: 100%;
+	padding: 20rpx;
+	box-sizing: border-box;
+	position: fixed;
+	bottom: 200rpx;
+	right: 30rpx;
+}
+.act-create image{
+	width: 39rpx;
+	height: 39rpx;
+	margin: auto;
+}

match/activityReview/activityReview.vue

@@ -0,0 +1,132 @@
+<template>
+	<view>
+		<view class="top-fixed">
+			<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>
+		</view>
+		<view style="height: 150rpx;"></view>
+		<view class="title">
+			我的活动<text>共{{total}}个</text>
+		</view>
+		<view class="padd30" v-if="pageList.length>0">
+			<view class="act-bar ddflex" v-for="item,index in pageList">
+				<view class="act-pic">
+					<image :src="item.pic" mode="aspectFill"></image>
+					<view class="act-pic-tag" v-if="item.state==0">审核中</view>
+					<view class="act-pic-tag" v-if="item.state==6">审核失败</view>
+				</view>
+				<view class="flex">
+					<view class="act-title tovers">{{item.title}}</view>
+					<view class="act-time">活动时间：{{formatTime(item.endTime)}}</view>
+					<view class="act-bottom ddflex">
+						<view class="act-bottom-look ddflex">
+							<image src="../static/images/person.png"></image>
+							{{item.person}}人
+						</view>
+						<view class="act-edit" @click="jumpUrl('/match/activityEdit/activityEdit?id='+item.id)">审核</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="nodata nosp bgfff" v-else>
+			<image :src="picUrlss+'empty_sp.png'"></image>
+			<text>暂无活动</text>
+		</view>
+		<view class="act-create" @click="jumpUrl('/match/activityEdit/activityEdit')">
+			<image src="../static/images/add.png"></image>
+			<view>发布</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	const app = getApp();
+	const req = require("../../utils/request.js");
+	import util from "../../utils/util.js";
+	export default {
+		components: {},
+		props: {},
+		data() {
+			return {
+				picUrlss:req.public.picUrls,
+				pageList: [],
+				isLoad: true,
+				form: {
+					page: 1,
+					limit: 10
+				},
+				searchVal:'',
+				total:0
+			}
+		},
+		onLoad(options) {
+			this.getPageList()
+		},
+		onShow() {
+			
+		},
+		onReachBottom: function() {
+			this.form.page++;
+			this.getPageList(false);
+		},
+		methods: {
+			jumpUrl(url){
+				uni.navigateTo({
+					url:url
+				})
+			},
+			getPageList(isShow) {
+				if (!this.isLoad) return false;
+				this.isLoad = false;
+				let form = this.form;
+				if(this.searchVal){
+					form.search = this.searchVal
+				}else{
+					form.search = ''
+				}
+				uni.showLoading();
+				req.getRequest(
+					'/api/match/page',
+					form,
+					res => {
+						this.total = res.total
+						res  = res?res.list:[]
+						this.isShow = true;
+						if (res && res.length == 10) {
+							this.isLoad = true;
+						}
+						if (this.form.page > 1) {
+							res = this.pageList.concat(res);
+						}
+						this.pageList = res;
+						uni.hideLoading();
+					},
+					isShow
+				);
+			},
+			searchFn(){
+				this.isLoad = true
+				this.form.page=1
+				this.getPageList()
+			},
+			formatTime(date){
+				date = new Date(date.replace(/-/g, '/'))
+				return util.formatTime(date).t3
+			},
+		},
+		mounted() {
+			
+		},
+		onPageScroll: function(e) {
+		}
+	}
+</script>
+
+<style>
+	@import "./activityReview.css";
+</style>

mine/collect/collect.css

@@ -7,6 +7,6 @@
 .zhtit{font-size: 30rpx;color: #333;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;}
 .guige{font-size: 22rpx;color: #999;margin-top: 5rpx;}
 .jiage{display: flex;display: -webkit-flex;align-items: center;justify-content: space-between;margin-top: 55rpx;}
-.zhjia{font-size:28rpx;color: #FE0419;}
-.zhjia text{font-size: 36rpx;}
+.zhjia{font-size:24rpx;color: #999;}
+.zhjia text{font-size: 24rpx;}
 .btn{font-size: 22rpx;color: #333;width: 136rpx;height: 46rpx;border-radius: 25rpx;border: 2rpx solid #D2D2D2;text-align: center;line-height: 46rpx;}

mine/collect/collect.vue

@@ -3,12 +3,12 @@
 <!--mine/collect/collect.wxml-->
 <view class="list" v-if="pageList.length > 0">
 	<view v-for="(item, index) in pageList" :key="index" class="li">
-		<image :src="item.pic" @tap="redirectDetail" :data-id="item.id" mode="aspectFit" class="cimg"></image>
+		<image :src="item.pic" @tap="redirectDetail" :data-id="item.id" mode="aspectFill" class="cimg"></image>
 		<view class="zhinfo">
 			<view class="zhtit" @tap="redirectDetail" :data-id="item.id">{{item.title}}</view>
 			<!-- <view class="guige">规格：15g</view> -->
 			<view class="jiage">
-				<view class="zhjia" @tap="redirectDetail" :data-id="item.id">￥<text>{{item.salePrice}}</text></view>
+				<view class="zhjia" @tap="redirectDetail" :data-id="item.id"><text>{{item.endTime}}</text></view>
 				<view class="btn" :data-index="index" @tap="clickCollect">取消收藏</view>
 			</view>
 		</view>
@@ -62,7 +62,8 @@ export default {
       if (!this.isLoad) return false;
       this.isLoad = false;
       let that = this;
-      req.getRequest('/api/collect/product', this.form, data => {
+      req.getRequest('/api/match/collectPage', this.form, data => {
+		  data = data?data.list:[]
         if (data && data.length == 10) this.isLoad = true;
         if (that.form.page > 1) data = that.pageList.concat(data);
         that.setData({
@@ -87,25 +88,26 @@ export default {
     },
 
     clickCollect(event) {
-      let _ts = this;
-
-      const index = event.currentTarget.dataset.index;
-      const page = this.pageList[index];
-      req.postRequest('/api/collect', {
-        bindId: page.id,
-        type: 1
-      }, data => {
-        _ts.pageList.splice(index, 1);
-
-        _ts.setData({
-          pageList: _ts.pageList
-        });
-      });
+		let _ts = this;
+		
+		const index = event.currentTarget.dataset.index;
+		const page = this.pageList[index];
+		var dataP = {};
+		dataP.type =2 //、产品 2、活动 3、未知 4、内容 5、课程 6、老师 7、素材 8、题目 9、资料领取 10、招聘职位 12、用户须知 13、素材 15、医院科室 16、海报 20、医生 21 新闻 23名片
+		dataP.behavior = 2; //1、关注 2、收藏 3、点赞 4、浏览 5、确认 6、分享
+		dataP.bindId = page.id;
+		req.postRequestLoding('/api/v3/behavior/save', dataP, data => {
+			_ts.pageList.splice(index, 1);
+			
+			_ts.setData({
+			  pageList: _ts.pageList
+			});
+		});
     },
 
     redirectDetail(event) {
       uni.navigateTo({
-        url: '/product/detail/detail?id=' + event.currentTarget.dataset.id
+        url: '/match/activityDetail/activityDetail?id=' + event.currentTarget.dataset.id
       });
     }
 

office/addActivity/addActivity.vue

@@ -10,7 +10,7 @@
 				<image :src="item.pic" mode="aspectFill" class="pic"></image>
 				<view class="fflex">
 					<view class="title tovers">{{ item.title }}</view>
-					<view class="money">¥{{ item.enlistMoney }}</view>
+					<view class="money">{{ item.endTime }}</view>
 				</view>
 				<view class="btn" :style="item.isAdd?'background-color: var(--main);color: #fff;':''">{{item.isAdd?'已添加':'添加'}}</view>
 			</view>

office/detail/detail.vue

@@ -206,10 +206,10 @@
 				<image src="../static/images/pl_ico.png"></image>
 				<view class="ipt">说点什么吧</view>
 			</view>
-			<view class="bot-btn" @click="submitFabulous(5)">
+			<!-- <view class="bot-btn" @click="submitFabulous(5)">
 				<image :src="'../static/images/' + (detail.isCollection == 1 ? 'collect_h' : 'collect') + '.png'"></image>
 				<view>收藏</view>
-			</view>
+			</view> -->
 			<view class="bot-btn" @click="submitFabulous(2)">
 				<image :src="'../../static/images/' + (detail.isPraise == 1 ? 'like_h' : 'like') + '.png'"></image>
 				<view>点赞</view>

office/news/news.vue

@@ -64,31 +64,15 @@
 		</view>
 		<view style="height: 160rpx"></view>
 		<view class="btn-after" @click="submit()">发布帖子</view>
-		<!-- <view class="bot">
-			<navigator url="/office/tree/index" hover-class="none" class="type ddflex">
-				<view>动态类型</view>
-				<view :class="'sel fflex' + (treeObj ? ' active':'')">{{ treeObj ? treeObj.name : '选择合适的动态类型' }}</view>
-				<image src="../static/images/rico.png" class="rico"></image>
-			</navigator>
-			<navigator url="/office/topic/topic" hover-class="none" class="topic ddflex" v-if="!topicId">
-				<view class="canyu ddflex">
-					<image :src="'../static/images/' + (htObj.title ? 'll_ht_h.png' : 'll_ht.png')"></image>
-					<view class="fflex tover">{{ htObj ? htObj.title : '参与话题' }}</view>
-				</view>
-				<view class="sel fflex">{{ htObj ? '' : '选择合适的话题让更多人看到' }}</view>
-				<image src="../static/images/rico.png" class="rico"></image>
-			</navigator>
-			<view class="bot-b ddflex">
-				<view class="btns fflex ddflex">
-					<navigator :url="'/office/vote/vote' + (pollObj ? '?pollId=' + pollObj.id : '')" hover-class="none"><image src="../static/images/ll_tp.png"></image><view class="point" v-if="pollObj"></view></navigator>
-					<navigator url="/office/product/product" hover-class="none">
-						<image src="../static/images/ll_cp.png"></image>
-						<view class="new" v-if="productList.length > 0">{{ productList.length }}</view>
-					</navigator>
-				</view>
-				<view class="btn" @click="submit()">发表</view>
+		
+		<view class="ceng" @click="hidePop" v-if="isShowPop"></view>
+		<view class="popup savepadding" :style="'bottom:'+popBottom">
+			<view class="pop-list">
+				<view class="li" @tap="uploadImgs">图片</view>
+				<view class="li" @tap="uploadVodChangeHandle">视频</view>
 			</view>
-		</view> -->
+			<view class="pop-cancel" @click="hidePop">取消</view>
+		</view>
 	</view>
 </template>
 

pages.json

@@ -504,6 +504,12 @@
 					}
 				},
 				{
+					"path": "activityReview/activityReview",
+					"style": {
+						"navigationBarTitleText": "活动审核"
+					}
+				},
+				{
 					"path": "activityEdit/activityEdit",
 					"style": {
 						"navigationBarTitleText": "创建活动"

pages/found/found.vue

@@ -67,6 +67,7 @@
 				bottomBlankHeignt: app.globalData.isIPhoneX ? 68 : 0,
 				page: 1,
 				pageList: [],
+				searchVal:'',
 				isLoad: true,
 				isUpdate: false, // 是否更新消息
 				hasmore: false,
@@ -159,7 +160,11 @@
 					limit: 10,
 					code:that.fxList[that.fxIndex].code
 				};
-
+				if(this.searchVal){
+					form.title=this.searchVal
+				}else{
+					delete form.title
+				}
 				if (form.page == 1 && !isShowLoading) {
 					req.loadIng('加载中');
 					isShowLoading = true;
@@ -205,6 +210,11 @@
 					}
 				});
 			},
+			searchFn(){
+				this.isLoad = true
+				this.page = 1
+				this.getFxContenteList(this.fxList[this.fxIndex].code)
+			},
 			captureTime(time) {
 				return util.formatTime(new Date(time.replace(/\-/g, '/'))).t2;
 			},

pages/index/index.vue

@@ -31,7 +31,7 @@
 						<view>{{recommendCard.realName}}的微页</view>
 						<image src="/static/images/rico2.png" class="rico"></image>
 					</view>
-					<view class="service-person-number">(工号:{{recommendCard.jobNumber}}) <text v-if="recommendCard&&userInfo.userType!=1">欢迎您来到我的微页</text></view>
+					<view class="service-person-number">(工号:{{recommendCard.jobNumber}}) <text v-if="recommendCard&&userInfo.id!=recommendCard.userId">欢迎您来到我的微页</text></view>
 				</view>
 			</view>
 			<view style="margin: 20rpx 30rpx 0;justify-content: space-between;" class="ddflex">
@@ -124,22 +124,22 @@
 					</view>
 				</view>
 
-				<block v-if="tbalList[tbalIndex].contentList&&tbalList[tbalIndex].contentList.length>0">
-					<view class="tbal-item ddflex" v-for="it in tbalList[tbalIndex].contentList"
+				<block v-if="tbalContentList.length>0">
+					<view class="tbal-item ddflex" v-for="it in tbalContentList"
 						@click="jumpUrl('/topic/content/content?id='+it.id)">
 						<!-- @click="jumpUrl('/topic/alContent/alContent?id='+it.id)" -->
 						<image class="tbal-pic" :src="it.pic?it.pic:'/static/images/lj_img.png'" mode="aspectFill"></image>
 						<view class="flex">
 							<view class="tbal-title">{{it.title}}</view>
 							<view class="ddflex">
-								<view class="ddflex flex">
+								<view class="flex">
 									<view class="tbal-price">
 										{{it.fieldValues&&it.fieldValues.yearMoney?it.fieldValues.yearMoney:'0'}}
 									</view>
 									<view class="tbal-price-text">年缴费</view>
 								</view>
 								<view class="tbal-line"></view>
-								<view class="ddflex flex">
+								<view class="flex">
 									<view class="tbal-price">
 										{{it.fieldValues&&it.fieldValues.allMoney?it.fieldValues.allMoney:'0'}}
 									</view>
@@ -297,14 +297,14 @@
 				复制微信号
 			</view>
 		</view>
-		<msgNumber :bottom="recommendCard&&userInfo.userType!=1?'350rpx':'230rpx'"></msgNumber>
+		<msgNumber :bottom="recommendCard&&userInfo.id!=recommendCard.userId?'350rpx':'230rpx'"></msgNumber>
 		<!-- <view class="chat-fixed" v-if="recommendCard">
 			<view class="chat-box ddflex" @click="jumpSingleChatRoom()">
 				<image :src="recommendCard.avatar?recommendCard.avatar:'../../static/pages/images/userimg.png'"></image>
 				<view class="chat-lyl">聊一聊</view>
 			</view>
 		</view> -->
-		<view :class="'chat-fixed '+(chatShow?'chat-fixed-long':'')" v-if="recommendCard&&userInfo.userType!=1">
+		<view :class="'chat-fixed '+(chatShow?'chat-fixed-long':'')" v-if="recommendCard&&userInfo.id!=recommendCard.userId">
 			<view class="chat-box ddflex" @click="jumpSingleChatRoom()">
 				<image :src="recommendCard.avatar?recommendCard.avatar:'../../static/pages/images/userimg.png'"></image>
 				<view v-if="chatShowText" class="fflex tover"
@@ -407,6 +407,7 @@
 
 				tbalList: [], //投保案例
 				tbalIndex: 0, //投保案例tab
+				tbalContentList: [],
 
 				lpalList: [], //理赔案例
 
@@ -592,13 +593,28 @@
 			// 获取投保案例
 			async getTbal() {
 				this.tbalList = await this.getContentList(req.public.tbalCode)
-				this.tbalList[this.tbalIndex].contentList = await this.getContentPageList(this.tbalList[this.tbalIndex]
+				this.tbalContentList = await this.getContentPageList(this.tbalList[this.tbalIndex]
 					.code)
 				this.$forceUpdate()
 			},
 			// 获取理赔案例
 			async getLpal() {
-				this.lpalList = await this.getContentList(req.public.lpalCode)
+				if(this.lpalList.length==0){
+					this.lpalList = await this.getContentList(req.public.lpalCode)
+				}else{
+					// 防止页面onShow时内容闪动
+					let lpal = await this.getContentList(req.public.lpalCode)
+					for(let i=0;i<lpal.length;i++){
+						let item = lpal[i]
+						for(let j=0;j<this.lpalList.length;j++){
+							let it = this.lpalList[i]
+							if(it.id==item.id){
+								item.contentList = it.contentList?it.contentList:[]
+							}
+						}
+						
+					}
+				}
 				this.lpalList.map(async item => {
 					item.contentList = await this.getContentPageList(item.code)
 					this.$forceUpdate()
@@ -651,7 +667,7 @@
 			async changeTbalTab(index) {
 				if (this.tbalIndex == index) return false;
 				this.tbalIndex = index
-				this.tbalList[this.tbalIndex].contentList = await this.getContentPageList(this.tbalList[this.tbalIndex]
+				this.tbalContentList = await this.getContentPageList(this.tbalList[this.tbalIndex]
 					.code)
 				this.$forceUpdate()
 			},

pages/user/user.css

@@ -256,4 +256,16 @@ page {background: #F0F0F0;}
 }
 .pop-scroll::-webkit-scrollbar {
 	display: none;
+}
+.service-person-btn{
+	background-color: #FF5700;
+	font-size: 24rpx;
+	color: #FFFFFF;
+	width: 140rpx;
+	height: 48rpx;
+	line-height: 48rpx;
+	text-align: center;
+	border-radius: 50rpx;
+	margin-left: 20rpx;
+	margin-right: 30rpx;
 }

pages/user/user.vue

@@ -32,18 +32,17 @@
 			</view>
 			<view class="datas dflex">
 				<!-- @click="jumpUrl('mine/coupons/coupons')" -->
-				<navigator url="" hover-class="none" class="li"
-					>
-					<text>{{ userInfos.coupon ? userInfos.coupon : '0' }}</text>
+				<navigator url="" hover-class="none" class="li" @click="jumpUrl('mine/collect/collect')">
+					<text>{{ myCount.matchNo ? myCount.matchNo : '0' }}</text>
 					我的收藏
 				</navigator>
 				<navigator url="" hover-class="none" class="li" @click="jumpUrl('mine/follow/index')">
-					<text>{{ userInfos.integral ? userInfos.integral : '0' }}</text>
+					<text>{{ myCount.followNo ? myCount.followNo : '0' }}</text>
 					我的关注
 				</navigator>
 				<navigator url="" hover-class="none" class="li"
 					@click="jumpUrl('match/activity/activity')">
-					<text>{{ userInfos.collect ? userInfos.collect : '0' }}</text>
+					<text>{{ myCount.enlistMatchNo ? myCount.enlistMatchNo : '0' }}</text>
 					参与活动
 				</navigator>
 				<!-- <navigator url="/mine/footprint/footprint" hover-class="none" class="li"><text>{{footprint?footprint:'0'}}</text>足迹</navigator> -->
@@ -98,14 +97,19 @@
 					<view class="flex">我的顾问</view>
 				</navigator>
 				<view class="service-person">
-					<view class="ddflex" @click="jumpUrl('/card/index/index')">
+					<view class="dflex" @click="jumpUrl('/card/index/index')">
 						<image class="service-person-header" :src="recommendCard.avatar?recommendCard.avatar:'../../static/pages/images/userimg.png'"></image>
-						<view>
-							<view class="service-person-name ddflex">
-								<view>Hi~我是{{recommendCard.realName}}</view>
-								<image src="/static/images/rico2.png" class="rico"></image>
+						<view class="fflex">
+							<view class="dflex">
+								<view class="fflex">
+									<view class="service-person-name ddflex">
+										<view>Hi~我是{{recommendCard.realName}}</view>
+										<image src="/static/images/rico2.png" class="rico"></image>
+									</view>
+									<view class="service-person-number">(工号:{{recommendCard.jobNumber}}) 您的1V1专属保险顾问</view>
+								</view>
+								<view class="service-person-btn" @click="jumpSingleChatRoom()">在线咨询</view>
 							</view>
-							<view class="service-person-number">(工号:{{recommendCard.jobNumber}}) 欢迎您来到我的微页</view>
 							<view class="service-person-options ddflex">
 								<view class="service-person-option ddflex">
 									<image src="/static/pages/images/dz_hui.png"></image>
@@ -130,7 +134,7 @@
 						<view class="order-line" v-if="recommendCard.phone&&recommendCard.wechat"></view>
 						<view class="ddflex flex" style="justify-content: center;" @click.stop="isShowCodePop=true">
 							<image style="width: 35rpx;height: 28rpx;" src="/static/pages/images/qw.png"></image>
-							<view>加企微信</view>
+							<view>加微信</view>
 						</view>
 					</view>
 				</view>
@@ -185,7 +189,7 @@
 			@closeUpdate="closeUpdate" @updateInfo="updateInfo" @updateMobile="updateMobile"></update-userinfo>
 
 
-		<msgNumber></msgNumber>
+		<msgNumber bottom="230rpx"></msgNumber>
 		
 		<view class="ceng2" v-if="isShowCodePop" @click="isShowCodePop = false"  @touchmove.stop.prevent="moveHandle"></view>
 		<view class="code-pop" v-if="isShowCodePop">
@@ -257,7 +261,12 @@
 				isUpdateMobile: false, //绑定手机号
 				recommendCard:{},
 				isShowCodePop:false,
-				isShowBind:false
+				isShowBind:false,
+				myCount:{
+					enlistMatchNo:0,
+					followNo:0,
+					matchNo:0
+				}
 			};
 		},
 
@@ -309,6 +318,7 @@
 				this.getMy();
 				this.getAbout();
 				this.getRecommendCard()
+				this.getMyCount()
 				this.noLogin = true;
 			} else {
 				this.noLogin = false;
@@ -465,6 +475,18 @@
 					}
 				})
 			},
+			jumpSingleChatRoom() {
+				if (this.recommendCard) {
+					req.jumpSingleChatRoom(this.recommendCard.userId, this.recommendCard.avatar, this.recommendCard
+						.realName);
+				}
+			
+			},
+			getMyCount(){
+				req.getRequest('/api/my/count',{},res=>{
+					this.myCount = res
+				})
+			}
 		},
 		created() {
 			const systemInfo = uni.getSystemInfoSync();

pages/web/web.vue

@@ -25,7 +25,7 @@
 			let that = this;
 			let token = req.getStorage('AUTH_TOKEN');
 			let webUrl = options.url
-			this.webUrl = webUrl
+			this.webUrl = decodeURIComponent(webUrl)
 			console.log('地址>>>>>',webUrl)
 
 			// if (!req.getStorage('userInfo')) {

topic/content/content.vue

@@ -69,12 +69,14 @@ export default {
 			viewMore: false,
 			config: {},
 			userInfo:{},
-			query:{}
+			query:{},
+			id:null
 		};
 	},
 
 	onLoad: async function(options) {
 		this.query = options
+		this.id = options.id;
 		await  req.silenceLogin(options.userId, '');
 		setTimeout(()=>{
 			this.userInfo = req.getStorage('userInfo')
@@ -83,7 +85,6 @@ export default {
 			withShareTicket: true,
 			menus: ['shareAppMessage', 'shareTimeline']
 		});
-		this.id = options.id;
 		await this.getDetail();
 		this.getContentList();
 		// await this.monitor();

topics/home/home.vue

@@ -509,7 +509,7 @@ export default {
 				req.msg('已关注');
 				setTimeout(()=>{
 					this.getFocusState();
-				},500)
+				},1000)
 				this.getUserDetail();
 			})
 		},
@@ -519,11 +519,11 @@ export default {
 				bindId: this.userId,
 				type: 11
 			}
-			req.postRequest(api.behavior_delete,params,data=>{
+			req.postRequest(api.behavior_save,params,data=>{
 				req.msg('已取消关注');
 				setTimeout(()=>{
 					this.getFocusState();
-				},500)
+				},1000)
 				this.getUserDetail();
 			})
 		},