名片筛选条件

card/cardDetail/cardDetail.vue

@@ -40,7 +40,7 @@
 			<view class="user-des">
 				<rich-text :nodes="cardInfo.brief ? cardInfo.brief : ''"></rich-text>
 			</view>
-			<image class="user-code" src="/static/images/lj_img.png"></image>
+			<image class="user-code" :src="code?code:'/static/images/lj_img.png'"></image>
 			<view class="user-btn" @click="submit">
 				选TA做专属顾问
 			</view>
@@ -66,6 +66,7 @@
 				id:null,
 				cardInfo:{},
 				evaluateInfo:{},
+				code:'',
 				loading:true
 			}
 		},
@@ -96,6 +97,7 @@
 					uni.hideLoading()
 					this.loading = false
 					this.getEvaluate()
+					this.getCodeUrl()
 				});
 			},
 			// 获取评论
@@ -104,6 +106,20 @@
 					this.evaluateInfo = res
 				})
 			},
+			getCodeUrl() {
+					let that = this; //获取小程序码
+					const params = {
+						page: 'card/index/index',
+						scene: this.cardInfo.id
+					};
+					return new Promise((resolve, reject) => {
+						req.getRequest('/api/other/program/code', params, url => {
+							// console.log(url);
+							this.code = url
+							resolve();
+						});
+					});
+				},
 			getAge(date) {
 				return util.getAge(date)
 			},

card/cardList/cardList.css

@@ -67,15 +67,19 @@ page{
 .default{position: absolute;top: 55rpx;right: 60rpx;font-size: 28rpx;color: #999;}
 .default image{width: 36rpx;height: 36rpx;margin-right: 14rpx;}
 .pop-tit{font-size: 32rpx;color: #263343;font-weight: bold;margin-top: 60rpx;padding: 0 60rpx;}
-.pop-con{padding: 0 60rpx;}
+.pop-con{padding: 0 60rpx;max-height: 500rpx;overflow: scroll;}
+
 .pop-list{flex-wrap: wrap;}
-.pop-list .li{width: 189rpx;height: 70rpx;background: #F3F5F7;border-radius: 35rpx;font-size: 30rpx;color: #333;text-align: center;line-height: 70rpx;align-items: flex-start;margin: 30rpx 30rpx 0 0;}
-.pop-list .li:nth-child(3n){margin-right: 0;}
-.pop-list .li.active{background: var(--mina);color: #fff;}
+.pop-list .li{height: 70rpx;font-size: 30rpx;color: #333;text-align: left;line-height: 70rpx;margin: 30rpx 0;border-bottom: 2rpx solid #ebebeb;}
+.pop-list .li:last-child{border-bottom:none}
+.pop-list .li.active{color: var(--main);}
+.pop-list .opt{padding: 0 20rpx; height: 60rpx;background: #fff;border-radius: 10rpx;font-size: 30rpx;color: #999;text-align: center;line-height: 60rpx;align-items: flex-start;margin: 30rpx 30rpx 0 0;border: 2rpx solid #ebebeb;}
+/* .pop-list .opt:nth-child(3n){margin-right: 0;} */
+.pop-list .opt.opt-active{color: var(--main);border: 2rpx solid var(--main);}
 .pop-time{margin-top: 30rpx;font-size: 30rpx;color: #333;}
 .pop-time text{margin: 0 25rpx;}
 .date-ipt{width: 262rpx;height: 70rpx;background: #F3F5F7;border-radius: 35rpx;box-sizing: border-box;padding: 0 30rpx;font-size: 28rpx;color: #A5A5A5;line-height: 70rpx;}
-.pop-btn{margin-top: 80rpx;padding: 30rpx;}
+.pop-btn{padding: 30rpx;}
 .pop-btn view{height: 90rpx;line-height: 90rpx;font-size: 32rpx;text-align: center;box-sizing: border-box;border-radius: 6rpx;}
 .pop-btn view:first-child{width: 250rpx; color: #fff;border-top: 1rpx solid #f5f5f5;line-height: 79rpx;background-color: #cccccc;margin-right: 30rpx;}
 .pop-btn view:last-child{color: #fff;background: var(--mina);}

card/cardList/cardList.vue

@@ -9,17 +9,21 @@
 				</view>
 			</view>
 			<view class="filter ddflex">
-				<view :class="'filter-item fflex ddflex '+(dateIndex!=-1?'f-active':'')" @click="changeFilterType(1)">
-					{{dateIndex!=-1?dateList[dateIndex].label:'智能筛选'}}
-					<image class="filter-item-icon" :style="filterType==1&&isShowPop?'transform: rotate(180deg);':''" src="../static/images/down.png"></image>
+				<view :class="'filter-item fflex ddflex '+(filterType==2&&isShowPop?'f-active':'')" @click="changeFilterType(2)">
+					<text style="max-width: 150rpx;" class="tover">{{stateIndex!=-1?stateList[stateIndex].label:'智能筛选'}}</text>
+					<image class="filter-item-icon" :style="filterType==2&&isShowPop?'transform: rotate(180deg);':''" src="../static/images/down.png"></image>
 				</view>
-				<view :class="'filter-item fflex ddflex '+(areaIndex!=-1?'f-active':'')" @click="changeFilterType(1)">
-					地区
-					<image class="filter-item-icon" :style="filterType==1&&isShowPop?'transform: rotate(180deg);':''" src="../static/images/down.png"></image>
+				<view class="fflex">
+					<picker mode="region" v-model="regionIndex" @change="regionChange">
+						<view :class="'filter-item fflex ddflex '+(areaIndex!=-1?'f-active':'')" @click="changeFilterType(3)">
+							<text style="max-width: 150rpx;" class="tover">{{regionText?regionText:'地区'}}</text>
+							<image class="filter-item-icon" :style="filterType==1&&isShowPop?'transform: rotate(180deg);':''" src="../static/images/down.png"></image>
+						</view>
+					</picker>
 				</view>
-				<view :class="'filter-item fflex ddflex '+(stateIndex!=-1?'f-active':'')" @click="changeFilterType(2)">
-					{{stateIndex!=-1?stateList[stateIndex].label:'筛选'}}
-					<image class="filter-item-icon" :style="filterType==2&&isShowPop?'transform: rotate(180deg);':''" src="../static/images/down.png"></image>
+				<view :class="'filter-item fflex ddflex '+(filterType==1&&isShowPop?'f-active':'')" @click="changeFilterType(1)">
+					筛选
+					<image class="filter-item-icon" :style="filterType==1&&isShowPop?'transform: rotate(180deg);':''" src="../static/images/down.png"></image>
 				</view>
 			</view>
 		</view>
@@ -29,25 +33,25 @@
 		
 		<view class="hx-pop" :style="'top:calc(' +popBottom+' + '+(isShowPop?190:0)+'rpx' ">
 			<view class="pop-con" v-if="filterType==1">
-				<view class="pop-list ddflex">
-					<view :class="'li' + (dateIndex == index ? ' active' : '')" v-for="(item, index) in dateList" :key="index" @click="switchType(index)">{{ item.label }}</view>
-				</view>
-				<view class="pop-time ddflex">
-					<picker mode="date" class="date-ipt" @change="changeStartTime">
-						<view :class="startTime ? '' : 'placeholder'">{{ startTime ? startTime : '选择日期' }}</view>
-					</picker>
-					<text>至</text>
-					<picker mode="date" class="date-ipt" @change="changeEndTime">
-						<view :class="endTime ? '' : 'placeholder'">{{ endTime ? endTime : '选择日期' }}</view>
-					</picker>
+				<view class="pop-list">
+					<view v-for="(item, index) in dateList" :key="index" style="margin-bottom: 30rpx;">
+						<view>{{ item.title }}</view>
+						<view class="ddflex">
+							<view :class="'opt' + (it.isActive? ' opt-active' : '')" v-for="(it, idx) in item.option" :key="idx" @click="switchFilterType(index,idx)">
+								<view>{{ it.label }}</view>
+							</view>
+						</view>
+					</view>
 				</view>
 			</view>
 			<view class="pop-con" v-if="filterType==2">
-				<view class="pop-list ddflex">
-					<view :class="'li' + (stateIndex == index ? ' active' : '')" v-for="(item, index) in stateList" :key="index" @click="switchType(index)">{{ item.label }}</view>
+				<view class="pop-list">
+					<view :class="'li' + (stateIndex == index ? ' active' : '')" v-for="(item, index) in stateList" :key="index" @click="switchType(index)">
+						{{ item.label }}
+					</view>
 				</view>
 			</view>
-			<view class="pop-btn ddflex">
+			<view class="pop-btn ddflex" v-if="filterType!=2">
 				<view @click="reset">重置</view>
 				<view class="fflex" @click="confirm">确定</view>
 			</view>
@@ -122,50 +126,77 @@
 				// 时间类型 1、今日 2、昨日 3、近7日 4、近30天 5、本月 6、本季度 7、本年度
 				dateList: [
 					{
-						label: '今日',
-						value: 1
-					},
-					{
-						label: '昨日',
-						value: 2
-					},
-					{
-						label: '近7日',
-						value: 3
-					},
-					{
-						label: '近30天',
-						value: 4
-					},
-					
-					{
-						label: '本月',
-						value: 5
-					},
-					{
-						label: '本季度',
-						value: 6
-					},
-					{
-						label: '本年度',
-						value: 7
+						title:'性别',
+						key:'sex',
+						option:[
+							{
+								label: '男',
+								value: 1
+							},{
+								label: '女',
+								value: 2
+							},
+						]
+					},{
+						title:'入司时间',
+						key:'inDate',
+						option:[
+							{
+								label: '1~2年',
+								value: 1
+							},{
+								label: '2~3年',
+								value: 2
+							},{
+								label: '3~4年',
+								value: 3
+							},{
+								label: '4年以上',
+								value: 4
+							}
+						]
+					},{
+						title:'职务',
+						key:'job',
+						option:[
+							{
+								label: '经理',
+								value: 1
+							},{
+								label: '负责人',
+								value: 2
+							},{
+								label: '业务员',
+								value: 3
+							}
+						]
 					}
+					
 				],
 				startTime: '',
 				endTime: '',
 				
-				stateIndex: -1,
+				regionText:'',
+				regionCode:[],
+				areaIndex:-1,
+				
+				stateIndex: 0,
 				stateList:[{
-						label: '开通成功',
-						value: 7
+						label: '智能推荐',
+						value: 'distance'
+					},{
+						label: '评价分从高到低',
+						value: 'avage'
 					},
 					{
-						label: '待支付',
-						value: 1
+						label: '浏览量从高到低',
+						value: 'bCount',
+						behavior:4
 					},
 					{
-						label: '取消支付',
-						value: 8
+						label: '点赞量从高到低',
+						value: 'bCount',
+						behavior:3
 					}],
 				page: 1,
 				limit: 10,
@@ -179,13 +210,14 @@
 		},
 		onLoad(options) {
 			QQMapWX.initMap();
-			req.getLocation(res => {
+			req.getLocation(async res => {
 				const to = {
 					latitude: res.latitude,
 					longitude: res.longitude
 				};
 				this.latitude = res.latitude;
 				this.longitude = res.longitude;
+				await this.getDict()
 				this.getDataList()
 			});
 		},
@@ -207,11 +239,33 @@
 					url: url
 				})
 			},
+			getDict(){
+				return new Promise((r,j)=>{
+					req.getRequest('/api/other/dict/info',{dictType:'job'},res=>{
+						this.dateList.map(item=>{
+							if(item.key=='job'){
+								item.option = []
+								res.map(it=>{
+									item.option.push({
+										label:it.dictName,
+										value:it.dictValue
+									})
+								})
+							}
+						})
+						r(res)
+					})
+				})
+			},
 			// 切换筛选类型
 			changeFilterType(type){
-				this.openPop()
-				if(this.filterType==type) return false
+				// if(this.filterType==type) return false
 				this.filterType = type
+				if(type==3) {
+					this.hidePop()
+					return false
+				}
+				this.openPop()
 			},
 			// 打开弹窗
 			openPop(){
@@ -226,41 +280,25 @@
 			
 			// 筛选
 			switchType(index) {
-				if(this.filterType==1){
-					if (this.dateIndex == index) return false;
-					this.dateIndex = index;
-					this.startTime = '';
-					this.endTime = '';
+				if (this.stateIndex == index) return false;
+				this.stateIndex = index;
+				this.confirm()
+			},
+			switchFilterType(index,idx) {
+				if(!this.dateList[index].option[idx].isActive){
+					this.dateList[index].option.map(item=>{
+						item.isActive = false
+					})
+					this.dateList[index].option[idx].isActive = true
 				}else{
-					if (this.stateIndex == index) return false;
-					this.stateIndex = index;
+					this.dateList[index].option[idx].isActive = false
 				}
+				this.dateList = JSON.parse(JSON.stringify(this.dateList))
 			},
-			changeStartTime(e) {
-				const endTime = new Date(this.endTime);
-				const startTime = new Date(e.detail.value);
-				if (endTime.getTime() < startTime.getTime()) {
-					req.msg('开始时间不能小于结束时间');
-					return false;
-				}
-				this.startTime = e.detail.value;
-				this.dateIndex = -1;
-				if(!this.endTime){
-					this.endTime = this.startTime
-				}
-			},
-			changeEndTime(e) {
-				const endTime = new Date(e.detail.value);
-				const startTime = new Date(this.startTime);
-				if (endTime.getTime() < startTime.getTime()) {
-					req.msg('结束时间不能小于开始时间');
-					return false;
-				}
-				this.endTime = e.detail.value;
-				this.dateIndex = -1;
-				if(!this.startTime){
-					this.startTime = this.endTime
-				}
+			regionChange(e){
+				this.regionText = e.detail.value.join('')
+				this.regionCode = e.detail.code
+				this.confirm()
 			},
 			confirm() {
 				this.hidePop();
@@ -269,9 +307,15 @@
 			},
 			reset() {
 				this.dateIndex = -1;
-				this.stateIndex = -1;
-				this.startTime = '';
-				this.endTime = '';
+				this.stateIndex = 0;
+				this.dateList.map(item=>{
+					item.option.map(it=>{
+						it.isActive = false
+					})
+				})
+				this.dateList = JSON.parse(JSON.stringify(this.dateList))
+				this.regionText=''
+				this.regionCode=[]
 			},
 			// 分页查询
 			getDataList() {
@@ -284,7 +328,7 @@
 					longitude: this.longitude,
 				}
 				if (this.searchVal) {
-					queryParams.search = this.searchVal
+					queryParams.realName = this.searchVal
 				}
 				// 时间筛选
 				if (this.dateIndex != -1) {
@@ -298,8 +342,45 @@
 				
 				// 状态筛选
 				if (this.stateIndex != -1) {
-					queryParams.state = this.stateList[this.stateIndex].value;
+					queryParams.orderFiled = this.stateList[this.stateIndex].value;
+					if(this.stateList[this.stateIndex].behavior){
+						queryParams.behavior = this.stateList[this.stateIndex].behavior;
+					}
+				}
+				if(this.regionCode.length>0){
+					queryParams.areaCode = this.regionCode[2]
 				}
+				this.dateList.map(item=>{
+					if(item.key=="sex"){
+						let sl = item.option.filter(it=>{return it.isActive})
+						if(sl.length>0){
+							queryParams.gender = sl[0].value
+						}
+					}
+					if(item.key=="job"){
+						let jl = item.option.filter(it=>{return it.isActive})
+						if(jl.length>0){
+							queryParams.job = jl[0].value
+						}
+					}
+					if(item.key=="inDate"){
+						console.log('indate')
+						let il = item.option.filter(it=>{return it.isActive})
+						console.log(il)
+						if(il.length>0){
+							let d = il[0].value
+							if(d==4){
+								queryParams.endTime = this.getYear(d+1)
+							}else{
+								queryParams.startTime = this.getYear(d)
+								queryParams.endTime = this.getYear(d+1)
+							}
+						}
+					}
+					if(item.key=="job"){
+						// queryParams.gender = item.option.filter(it=>{return it.isActive})[0].value
+					}
+				})
 				req.getRequest('/api/visiting/card/cardInfoList', queryParams, data => {
 					data = data.list
 					if (data != null && data.length == this.limit) {
@@ -315,6 +396,14 @@
 					console.log('列表数据>>>', this.dataList);
 				})
 			},
+			getYear(index){
+				let dateTime = new Date().getFullYear(); /* 获取现在的年份 */
+			    dateTime = new Date(new Date().setFullYear(dateTime-index))
+				let y = dateTime.getFullYear()
+				let m = dateTime.getMonth()+1<10?('0'+(dateTime.getMonth()+1)):dateTime.getMonth()+1
+				let d = dateTime.getDate()<10?('0'+(dateTime.getDate())):dateTime.getDate()
+			    return y+'-'+m+'-'+d
+			},
 			// 搜索
 			searchFn() {
 				this.page = 1;

card/index/index.css

@@ -676,4 +676,137 @@ page {
 	color: #7A7B7F;
 	text-align: center;
 	margin-top: 30rpx;
-}
+}
+
+.index-tab{
+	padding: 30rpx 30rpx 10rpx;
+}
+.index-tab view{
+	margin-right: 40rpx;
+	color: #7A7B7F;
+	font-weight: bold;
+	font-size: 32rpx;
+}
+.index-tab-active{
+	color: #333333 !important;
+	position: relative;
+}
+
+.index-tab-active::after{
+	content: '';
+	width: 30rpx;
+	height: 7rpx;
+	background: #27D699;
+	border-radius: 4rpx 4rpx 4rpx 4rpx;
+	opacity: 1;
+	position: absolute;
+	bottom: -17rpx;
+	left: 50%;
+	transform: translateX(-50%);
+}
+
+
+/* 动态 */
+.list{
+	border-top: 20rpx solid #f5f5f5;
+}
+.list .li{background: #fff;padding: 40rpx 30rpx 45rpx;margin-bottom: 20rpx;margin: 30rpx;border-radius: 10rpx;}
+.userimg{width: 66rpx;height: 66rpx;border-radius: 50%;margin-right: 12rpx;}
+.name{font-size: 28rpx;color: #333;font-weight: bold;}
+.vip-tag{width: 41rpx;height: 31rpx;margin-left: 10rpx;}
+.time{font-size: 24rpx;color: #999;}
+.area{font-size: 24rpx;color: #999;margin-top: 8rpx;}
+.des{font-size: 30rpx;color: #000;line-height: 50rpx;margin: 30rpx 0 0;-webkit-line-clamp: 5;}
+.wen{display: inline-block;width: 60rpx;height: 34rpx;background: #3DB4FF;border-radius: 4rpx;font-size: 24rpx;color: #fff;text-align: center;line-height: 34rpx;margin-right: 15rpx;}
+
+.link{height: 150rpx;background: #F8F8F8;border-radius: 16rpx;padding: 24rpx;font-size: 28rpx;color: #333;box-sizing: border-box;margin-top: 30rpx;}
+.link image{width: 102rpx;height: 102rpx;border-radius: 12rpx;margin-right: 12rpx;}
+.video{margin: 20rpx 0 0;position: relative;}
+.video video{width: 100%;height: 397rpx;border-radius: 15rpx;display: block;}
+.video-play{position: absolute;top: 0;left: 0;right: 0;bottom: 0;justify-content: center;background: rgba(0,0,0,.5);border-radius: 15rpx;}
+.video-play image{width: 82rpx;height: 82rpx;}
+.imgbox{flex-wrap: wrap;margin-top: 20rpx;}
+.imgbox image{width: 222rpx;height: 222rpx;border-radius: 16rpx;margin: 0 12rpx 12rpx 0;}
+.imgbox image:nth-child(3n){margin-right: 0;}
+.topic{height: 40rpx;background: #E1FFF4;border-radius: 20rpx;font-size: 20rpx;color: var(--main);padding: 0 20rpx 0 10rpx;margin-top: 18rpx;}
+.topic image{width: 28rpx;height: 28rpx;margin-right: 7rpx;}
+.loca{margin-top: 20rpx;font-size: 20rpx;color: #666;}
+.loca image{width: 26rpx;height: 31rpx;margin-right: 8rpx;}
+.loca text{margin-right: 10rpx;}
+
+.step-box{
+	background-color: #f7f8fa;
+	border-radius: 16rpx;
+	padding: 40rpx;
+	margin-top: 30rpx;
+	color: var(--main);
+}
+.step-date{
+	font-size: 64rpx;
+	font-weight: 500;
+}
+.step-label{
+	font-size: 24rpx;
+	font-weight: 500;
+}
+.step-pic{
+	width: 150rpx;
+	height: 150rpx;
+	background: #E2E2E2;
+	border-radius: 16rpx 16rpx 16rpx 16rpx;
+	opacity: 1;
+	margin-right: 20rpx;
+}
+.step-title{
+	height: 74rpx;
+	line-height: 37rpx;
+	font-size: 26rpx;
+	font-family: PingFang SC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #1A1F30;
+}
+.step-price{
+	line-height: 33rpx;
+	font-size: 24rpx;
+	font-family: PingFang SC-Medium, PingFang SC;
+	font-weight: 500;
+	color: #999;
+}
+.step-btn{
+	width: 94rpx;
+	height: 46rpx;
+	line-height: 46rpx;
+	background: var(--main);
+	border-radius: 23rpx 23rpx 23rpx 23rpx;
+	opacity: 1;
+	text-align: center;
+	font-size: 28rpx;
+	color: #FFFFFF;
+}
+
+.product{height: 168rpx;margin-top: 30rpx;overflow: hidden;}
+.pro-view{height: 168rpx;padding-bottom: 20rpx;white-space: nowrap;}
+.pro-view .li{display: inline-block;width: 554rpx;height: 168rpx;background: #F7F8FA;border-radius: 16rpx;margin-right: 20rpx;padding: 16rpx;box-sizing: border-box;}
+.pro-view1 .li{width: 688rpx;}
+/* .pro-view .li:first-child{margin-left: 30rpx;} */
+/* .pro-view .li:last-child{margin-right: 30rpx;} */
+.pro-pic{width: 136rpx;height: 136rpx;border-radius: 16rpx;background: #fff;margin-right: 19rpx;}
+.title{white-space: initial;font-size: 26rpx;color: #1A1F30;line-height: 37rpx;height: 74rpx;}
+.opts{justify-content: space-between;margin-top: 10rpx;}
+.money{font-size: 24rpx;color: var(--main);}
+.pro-btn{width: 94rpx;height: 46rpx;background: var(--main);border-radius: 23rpx;font-size: 28rpx;color: #fff;text-align: center;line-height: 46rpx;}
+.opt{font-size: 24rpx;color: #999;margin-top: 30rpx;justify-content: flex-end;}
+.opt image{width: 33rpx;height: 33rpx;margin-right: 8rpx;}
+.opt .ddflex{margin-left: 50rpx;}
+.opt-share{font-size: 24rpx;color: #999;margin-left: 50rpx !important;}
+.vote-box{margin-top: 50rpx;}
+.vote-box.ends{background: #f8f8f8;margin-top: 30rpx;padding: 20rpx;}
+.vote-tit{font-size: 28rpx;color: #000;}
+.vote-list .lis{height: 74rpx;background: #F9FAFC;border: 1rpx solid #EBEBEB;border-radius: 8rpx;font-size: 30rpx;color: var(--main);text-align: center;line-height: 74rpx;margin-top: 20rpx;padding: 0 28rpx;position: relative;overflow: hidden;}
+.end .lis{text-align: left;color: #9B9B9B;}
+.end .lis view{position: relative;z-index: 2;}
+.end .lis view.percent{position: absolute;top: 0;bottom: 0;left: 0;background: #F0F0F0;z-index: 0;}
+.end .lis.active{color: var(--main);}
+.end .lis.active view.percent{background: #E1FFF4;}
+.vote-can{font-size: 22rpx;color: #999;margin-top: 15rpx;}
+.vote-can text{margin-right: 15rpx;}

card/index/index.vue

@@ -78,8 +78,8 @@
 					 @click="jumpUrl('/card/poster/poster?id'+cardInfo.id)">
 					<image src="/card/static/images/fx.png"></image>分享名片</view>
 			</view>
-			<view class="save-text ddflex" v-if="cardId">
-				<image src="/card/static/images/save.png" @click="saveToPhone()"></image>保存到通讯录
+			<view class="save-text ddflex" v-if="cardId" @click="saveToPhone()">
+				<image src="/card/static/images/save.png"></image>保存到通讯录
 			</view>
 			<view class="btns ddflex" v-if="!cardId" style="justify-content: center;">
 				<view class="share-ta ddflex" style="background: linear-gradient(84deg, #6FE5BC 0%, #27D699 100%);width: 260rpx;margin-right: 30rpx;"
@@ -144,12 +144,12 @@
 			</view>
 			<view class="ddflex" style="justify-content: center;margin-top: 40rpx;">
 				<view class="pf-number">
-				{{evaluateInfo.info.avage}}<text style="font-size: 24rpx;color: #333333;font-weight: 400;margin-left: 10rpx;">分</text>
+				{{evaluateInfo.info?evaluateInfo.info.avage:0}}<text style="font-size: 24rpx;color: #333333;font-weight: 400;margin-left: 10rpx;">分</text>
 				</view>
 				<uni-rate style="justify-content: center;margin-left: 30rpx;" class="ddflex" color="#999999" active-color="#FF4600" :readonly="true" size="18" allow-half :value="evaluateInfo.info.avage/2" />
 			</view>
-			<view class="pf-note">综合评分 {{evaluateInfo.info.total}}人评分</view>
-			<view class="pf-data">
+			<view class="pf-note">综合评分 {{evaluateInfo.info?evaluateInfo.info.total:0}}人评分</view>
+			<view class="pf-data" v-if="evaluateInfo.evaluateDTO">
 				<view class="pf-user ddflex">
 					<view class="ddflex">
 						<image class="pf-user-header" :src="evaluateInfo.evaluateDTO.avatar?evaluateInfo.evaluateDTO.avatar:'../../static/images/userimg.png'"></image>
@@ -171,74 +171,206 @@
 			<view class="pf-btn" v-if="cardId" @click="jumpUrl('/card/evaluate/evaluate?id='+cardInfo.id)">点击输入您的评价</view>
 		</view>
 		
-		<view class="box brief" v-if="cardInfo.honorImg">
-			<view class="tit ddflex">
-				<view class="flex ddflex">
-					<image src="/card/static/images/shry.png"></image>
-					<view>所获荣誉</view>
+		<view class="ddflex index-tab">
+			<view :class="tabType==1?'index-tab-active':''" @click="tabChange(1)">个人主页</view>
+			<view :class="tabType==2?'index-tab-active':''" @click="tabChange(2)">最新动态</view>
+		</view>
+		
+		<block v-if="tabType==1">
+			<view class="box brief" v-if="cardInfo.honorImg">
+				<view class="tit ddflex">
+					<view class="flex ddflex">
+						<image src="/card/static/images/shry.png"></image>
+						<view>所获荣誉</view>
+					</view>
+				</view>
+				<view class="contacts" style="height: 300rpx;margin-top: 20rpx;">
+					<scroll-view scroll-x="true" class="contact" style="height: 300rpx;">
+						<view class=" ry-image" v-for="item,index in cardInfo.honorImg.split(',')" @click="previewImg(cardInfo.honorImg.split(','),index)">
+							<image :src="item" mode="aspectFill"></image>
+						</view>
+					</scroll-view>
 				</view>
 			</view>
-			<view class="contacts" style="height: 300rpx;margin-top: 20rpx;">
-				<scroll-view scroll-x="true" class="contact" style="height: 300rpx;">
-					<view class=" ry-image" v-for="item,index in cardInfo.honorImg.split(',')" @click="previewImg(cardInfo.honorImg.split(','),index)">
-						<image :src="item" mode="aspectFill"></image>
+			<view class="box brief" v-if="cardInfo.styleImg">
+				<view class="tit ddflex">
+					<view class="flex ddflex">
+						<image src="/card/static/images/grfc.png"></image>
+						<view>个人风采</view>
 					</view>
-				</scroll-view>
-			</view>
-		</view>
-		<view class="box brief" v-if="cardInfo.styleImg">
-			<view class="tit ddflex">
-				<view class="flex ddflex">
-					<image src="/card/static/images/grfc.png"></image>
-					<view>个人风采</view>
+				</view>
+				<view class="contacts" style="height: 300rpx;margin-top: 20rpx;">
+					<scroll-view scroll-x="true" class="contact" style="height: 300rpx;">
+						<view class=" ry-image" v-for="item in cardInfo.styleImg.split(',')" @click="previewImg(cardInfo.styleImg.split(','),index)">
+							<image :src="item" mode="aspectFill"></image>
+						</view>
+					</scroll-view>
 				</view>
 			</view>
-			<view class="contacts" style="height: 300rpx;margin-top: 20rpx;">
-				<scroll-view scroll-x="true" class="contact" style="height: 300rpx;">
-					<view class=" ry-image" v-for="item in cardInfo.styleImg.split(',')" @click="previewImg(cardInfo.styleImg.split(','),index)">
-						<image :src="item" mode="aspectFill"></image>
+			<view class="box brief">
+				<view class="tit ddflex">
+					<view class="flex ddflex">
+						<image src="/card/static/images/grjj.png"></image>
+						<view>个人简介</view>
 					</view>
-				</scroll-view>
-			</view>
-		</view>
-		<view class="box brief">
-			<view class="tit ddflex">
-				<view class="flex ddflex">
-					<image src="/card/static/images/grjj.png"></image>
-					<view>个人简介</view>
+					<!-- <image v-if="!cardId" src="../static/images/bj_ico.png" class="edit" @tap="jumpUrl('/card/editDesc/editDesc?id=' + cardInfo.id)"></image> -->
 				</view>
-				<!-- <image v-if="!cardId" src="../static/images/bj_ico.png" class="edit" @tap="jumpUrl('/card/editDesc/editDesc?id=' + cardInfo.id)"></image> -->
+				<view class="bri"><rich-text :nodes="cardInfo.brief ? cardInfo.brief : ''"></rich-text></view>
 			</view>
-			<view class="bri"><rich-text :nodes="cardInfo.brief ? cardInfo.brief : ''"></rich-text></view>
-		</view>
-		<view class="box brief">
-			<view class="tit ddflex">
-				<view class="flex ddflex">
-					<image src="/card/static/images/gsjj.png"></image>
-					<view>公司简介</view>
+			<view class="box brief">
+				<view class="tit ddflex">
+					<view class="flex ddflex">
+						<image src="/card/static/images/gsjj.png"></image>
+						<view>公司简介</view>
+					</view>
+					<!-- <image v-if="!cardId" src="../static/images/bj_ico.png" class="edit" @tap="jumpUrl('/card/editDesc/editDesc?id=' + cardInfo.id)"></image> -->
 				</view>
-				<!-- <image v-if="!cardId" src="../static/images/bj_ico.png" class="edit" @tap="jumpUrl('/card/editDesc/editDesc?id=' + cardInfo.id)"></image> -->
+				<view class="bri"><rich-text :nodes="cardInfo.companyIntroduction ? cardInfo.companyIntroduction : ''"></rich-text></view>
 			</view>
-			<view class="bri"><rich-text :nodes="cardInfo.companyIntroduction ? cardInfo.companyIntroduction : ''"></rich-text></view>
-		</view>
-		<!-- <view class="box videos">
-			<view class="tit ddflex">
-				<view class="flex ddflex">
-					<image src="../static/images/sp_ico.png"></image>
-					<view>我的视频</view>
+		</block>
+		
+		
+		<block v-if="tabType==2">
+			<view class="list" v-if="pageList && pageList.length > 0">
+				<view class="li" v-for="(item, index) in pageList" :key="index">
+					<view class="user ddflex">
+						<image :src="item.userDTO.avatar" mode="aspectFill" class="userimg" @click="toUserHomePage(item.userDTO.id)"></image>
+						<view class="fflex">
+							<view class="namea ddflex">
+								<view class="name fflex ddflex" @click="toUserHomePage(item.userDTO.id)">
+									{{ item.userDTO.nickName }}
+									<image v-if="item.userDTO.levelGrade > 0" src="../../static/images/vip_tag.png" class="vip-tag"></image>
+								</view>
+								<view class="time">{{ item.time }}</view>
+							</view>
+							<view class="area" @click="toUserHomePage(item.userDTO.id)" v-if="item.userDTO.cityName">{{ item.userDTO.provinceName }} {{ item.userDTO.cityName }}</view>
+						</view>
+					</view>
+					<!-- 分享的动态 -->
+					<block v-if="item.source">
+						<view class="link ddflex" @click="jumpUrlDetail(item)">
+							<block v-if="item.url&&item.url.length>0"><image mode="aspectFill" v-if="idx == 0" v-for="(it, idx) in item.url" :src="it" :key="idx"></image></block>
+							<view class="fflex tover"><rich-text :nodes="item.content"></rich-text></view>
+						</view>
+					</block>
+					<!-- 非分享的动态 -->
+					<block v-else>
+						<view v-if="item.type == 2" class="des tovers" @click="jumpUrlDetail(item)">
+							<view class="wen">提问</view>
+							{{ removeHtml(item.content) }}
+						</view>
+						<view class="des" v-else @click="jumpUrlDetail(item)"><rich-text :nodes="item.content"></rich-text></view>
+						
+						
+						<!-- //如果有投票，就不显示图片 -->
+						<block v-if="!item.qyPoll">
+						<view class="video" v-if="item.isHaveVideo && config.open_community_video == 1">
+							<video :src="item.url" :show-center-play-btn="false" :controls="item.isControls" :autoplay="item.isControls" :id="'myVideo'+index" @pause="videoPause(index)" @ended="videoEnded(index)"></video>
+							<view class="video-play ddflex" @click="videoPlay(index)" v-if="item.isShowPlayBtn"><image src="../../static/images/play.png"></image></view>
+						</view>
+						<view class="imgbox ddflex" @click="jumpUrlDetail(item)" v-if="!item.isHaveVideo"><!-- @click="previewImgss(item.url, idx)" -->
+							<block v-if="item.url&&item.url.length>0">
+								<image mode="aspectFill" v-for="(it, idx) in item.url" :src="it" :key="idx"></image>
+							</block>
+						</view>
+						</block>
+						<!-- 话题 -->
+						<view class="ddflex" v-if="item.qyDialogu">
+							<view class="topic ddflex" @click="jumpUrl('/topics/detail/detail?topicId=' + item.qyDialogu.id)">
+								<image src="../../static/images/topic.png"></image>
+								{{ item.qyDialogu.title }}
+							</view>
+						</view>
+						<view class="loca ddflex" @click="jumpUrlPoi(item,'/office/poi/index')" v-if="item.poiName"><image :src="picUrlss+'office_images/loca.png'"></image><text v-if="item.poiDistance > 0">{{item.poiDistance ? item.poiDistance < 1000 ? item.poiDistance+'m' : (item.poiDistance/1000).toFixed(1)+'km' : ''}}</text>{{item.poiName}}</view>
+						<!-- 投票 -->
+						<view :class="'vote-box' + (item.qyPoll.isEnd ? ' ends' : '')" v-if="item.qyPoll">
+							<view class="vote-tit">{{ item.qyPoll.title }}</view>
+							<block v-if="item.qyPoll.isVote == 1">
+								<view class="vote-list end" @click="jumpUrlDetail(item)">
+									<view :class="'lis ddflex  ' + (itpy.isVote == 1 ? 'active' : '')" v-for="(itpy, idex) in JSON.parse(item.qyPoll.optionJson)" :key="idex">
+										<view class="percent" :style="'width:' + parseFloat(itpy.proportion) + '%;'"></view>
+										<view class="fflex">{{ itpy.name }}</view>
+										<view>{{ parseFloat(itpy.proportion) + '%' }}</view>
+									</view>
+								</view>
+							</block>
+							<block v-else>
+								<view class="vote-list">
+									<view class="lis" v-for="(itpy, idex) in JSON.parse(item.qyPoll.optionJson)" :key="idex" @click="submitPoll(item, index, idex)">
+										{{ itpy.name }}
+									</view>
+								</view>
+							</block>
+							<view class="vote-can" v-if="item.qyPoll.isEnd"><text>{{item.qyPoll.voteCount}}人参与</text>投票已结束</view>
+						</view>
+						<block v-if="item.type==10||item.type==11">
+							<view v-if="item.type==10" class="ddflex step-box" style="justify-content: space-between;" @click="jumpUrl('/exercise/record/record?userId=' + item.userId)">
+								<view>
+									<view class="step-date">{{item.wxRun.step}}</view>
+									<view class="step-label">步数</view>
+								</view>
+								<view>
+									<view class="step-date">{{item.wxRun.index}}</view>
+									<view class="step-label" style="text-align: right;">名次</view>
+								</view>
+							</view>
+							<view v-if="item.type==11" class="ddflex step-box" style="justify-content: space-between;" @click="jumpUrl('/match/activityDetail/activityDetail?id=' + item.matchContent.id)">
+								<image class="step-pic" :src="item.matchContent.pic" mode="aspectFill"></image>
+								<view class="fflex">
+									<view class="step-title tovers">{{item.matchContent.title}}</view>
+									<view class="ddflex" style="justify-content: space-between;margin-top: 10rpx;">
+										<view class="step-price">{{item.matchContent.endTime}}</view>
+										<view  class="step-btn">查看</view>
+									</view>
+								</view>
+							</view>
+						</block>
+						<view v-if="item.userGroupId" class="ddflex step-box" style="padding: 25rpx 21rpx;" @click="jumpUrl('/office/team/index?id=' + item.userGroupId)">
+							<image style="width: 24rpx;height: 24rpx;margin-right: 13rpx;" src="../../static/images/link.png"></image>
+							<view style="font-weight: 500;color: #999999;">Team：</view>
+							<view>{{item.userGroupTitle}}</view>
+						</view>
+						<block v-else>
+							<view class="product" v-if="item.products && item.products.length > 0">
+								<view scroll-x="true" :class="'pro-view' + (item.products.length == 1 ? ' pro-view1' : '')">
+									<view class="li" v-for="(it, idx) in item.products" :key="idx" @click="toProductDetail(it)">
+										<view class="ddflex">
+											<image :src="it.pic + '?x-oss-process=style/w375'" mode="aspectFill" class="pro-pic"></image>
+											<view class="fflex">
+												<view class="title tovers">{{ it.title }}</view>
+												<view class="opts ddflex">
+													<view class="money">￥{{ it.salePrice }}</view>
+													<view class="pro-btn">购买</view>
+												</view>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</block>
+					</block>
+					<view class="opt ddflex" v-if="!item.source && type != 3">
+						<view class="fflex" @click="jumpUrlDetail(item)">{{ item.count.browseCount }}次浏览</view>
+						<view class="ddflex" @click="submitFabulous(2, item.id, index)">
+							<image :src="'../../static/images/' + (item.isPraise == 1 ? 'like_h' : 'like') + '.png'"></image>
+							{{ item.count.fabulousCount < 99 ? item.count.fabulousCount : '99+' }}
+						</view>
+						<view class="ddflex" @click="jumpUrlDetail(item)">
+							<image src="../../static/images/comment.png"></image>
+							{{ item.count.commentCount < 99 ? item.count.commentCount : '99+' }}
+						</view>
+						<button open-type="share" class="opt-share ddflex">
+							<image src="../../static/images/share.png"></image>
+							分享
+						</button>
+					</view>
 				</view>
-				<image v-if="cardInfo.videoId && !cardId" @click="uploadVodChangeHandle()"
-					src="../static/images/bj_ico.png" class="edit"></image>
 			</view>
-			<view class="video">
-				<video v-if="cardInfo.videoId" controls="true" class="video-sp" :src="videoInfo.playUrl"></video>
-				<view v-else class="not" @click="uploadVodChangeHandle()">
-					<image src="../static/images/add_ico1.png"></image>
-					<view>点击添加个人介绍视频</view>
-				</view>
+			<view class="nodata" v-else>
+				<image :src="picUrlss + 'empty_jl.png'"></image>
+				<text>{{ type == 1 ? '暂无动态' : type == 2 ? '暂无提问' : type == 3 ? '暂无日记' : '' }}</text>
 			</view>
-		</view>
-		<view class="also" v-if="cardId" @click="jumpUrl('/card/create/create')">我也要创建电子名片</view> -->
+		</block>
 		
 		<serviceContact></serviceContact>
 	</view>
@@ -253,6 +385,7 @@ import util from '../../utils/util.js';
 	export default {
 		data() {
 			return {
+				picUrlss: req.public.picUrls,
 				systems: {},
 				isTop: 0,
 				options: {},
@@ -271,7 +404,20 @@ import util from '../../utils/util.js';
 				
 				evaluateInfo:null,//评分
 				
-				loading:true
+				tabType:1,
+				
+				loading:true,
+				
+				config: {},
+				isLoad: true,
+				form: {
+					page: 1,
+					limit: 10
+				},
+				pageList: [],
+				userId: '',
+				videoCurrent: null,
+				videoContext: '',
 			};
 		},
 		components:{ serviceContact },
@@ -286,13 +432,17 @@ import util from '../../utils/util.js';
 		},
 
 		async onShow() {
+			this.getConfig()
 			if (this.scene) {
 				await this.loadCodeParams();
 			}
 			await req.silenceLogin(this.options.userId ? this.options.userId : '', '')
 			this.getCardInfo();
 		},
-
+		onReachBottom() {
+			this.form.page++;
+			this.getOfficeList();
+		},
 		onShareAppMessage(res) {
 			if (res.from == 'button') {
 				let userInfo = req.getStorage('userInfo');
@@ -318,7 +468,20 @@ import util from '../../utils/util.js';
 
 		methods: {
 			
-			
+			getConfig() {
+				var _this = this;
+				return new Promise((res, rej) => {
+					req.g(
+						'/api/other/config',
+						data => {
+							req.setStorage('configRes', JSON.stringify(data));
+							this.config = data;
+							res(data);
+						},
+						true
+					);
+				});
+			},
 			loadCodeParams() {
 				let _ts = this;
 				return new Promise((resolve, reject) => {
@@ -366,6 +529,10 @@ import util from '../../utils/util.js';
 				}
 				req.getRequest(url, dataP, data => {
 					this.cardInfo = data;
+					this.userId = this.cardInfo.userId
+					if(this.pageList.length==0){
+						this.getOfficeList();
+					}
 					console.log('isFirst')
 					if (this.cardId && this.cardInfo.userId == req.getStorage('userInfo').id) {
 						this.cardId = null
@@ -417,22 +584,21 @@ import util from '../../utils/util.js';
 			},
 			// 存入通讯录
 			saveToPhone() {
+				console.log('saveToPhone')
 				uni.addPhoneContact({
 					nickName: this.cardInfo.realName,
 					firstName: this.cardInfo.realName,
 					mobilePhoneNumber: this.cardInfo.phone,
 					success: (res) => {
-						this.$showModal({
-								title: '提示',
-								content: '已存入通讯录，请前往手机通讯录查看',
-								showCancel: false,
-							})
-							.then(res => {
-
-							})
-							.catch(err => {});
+						console.log(res)
+						uni.showModal({
+							title: '提示',
+							content: '已存入通讯录，请前往手机通讯录查看',
+							showCancel: false,
+						})
 					},
-					fail: () => {
+					fail: (err) => {
+						console.log(err)
 						req.msg('存入失败')
 					}
 				})
@@ -681,7 +847,136 @@ import util from '../../utils/util.js';
 				req.getRequest('/api/evaluate/cardInfo',{bindId:this.cardInfo.id,type:2},res=>{
 					this.evaluateInfo = res
 				})
-			}
+			},
+			
+			tabChange(type){
+				if(type==this.tabType) return false
+				this.tabType = type
+			},
+			
+			getOfficeList() {
+				let that = this;
+				var pramData = this.form;
+				// pramData.type = this.type;
+				pramData.orderType = 2;
+				pramData.userId = this.userId;
+				if (!this.isLoad) return false;
+				this.isLoad = false;
+				req.getRequest('/api/v3/moments/page', pramData, data => {
+					if(data.list&&data.list.length > 0){
+						this.total = data.total
+						data.list.map(it=>{
+							if(it.qyPoll && it.qyPoll.isEnd){
+								it.qyPoll.voteCount = that.sum(JSON.parse(it.qyPoll.optionJson))
+							}
+							if(it.url){
+								let h = it.url.substring(it.url.lastIndexOf('.') + 1)
+								if(h.indexOf('mp4')<0&&h.indexOf('MP4')<0){
+									it.url = it.url.split(',');
+								}else{
+									it.isHaveVideo = true
+									it.isControls = false
+									it.isShowPlayBtn = true
+								}
+							}
+							it.content = '<div style="overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 5;-webkit-box-orient: vertical;word-break: break-all;">' + it.content + '</div>'
+							return it;
+						})
+					}
+					if (data.list && data.list.length >= this.form.limit) {
+						this.isLoad = true;
+					}
+					if (this.form.page > 1) {
+						data.list = this.pageList.concat(data.list);
+					}
+					this.pageList = data.list;
+					this.isShowView = true;
+				});
+			},
+			sum(arr) {
+				var s = 0;
+				for (var i=arr.length-1; i>=0; i--) {
+					if(arr[i].count){
+						s += Number(arr[i].count);
+					}
+				}
+				return s;
+			},
+			//提交点赞、取消点赞；收藏、取消收藏
+			submitFabulous(type, id, index) {
+				if (!req.isLogins(true)) {
+					return;
+				}
+				var dataP = {};
+				dataP.type = type; //1，观看 ，2点赞，3评论，4分享，5收藏
+				dataP.momentsId = id;
+				req.postRequestLoding('/api/v3/fabulous/save', dataP, data => {
+					if (type == 2) {
+						//动态点赞
+						if (this.pageList[index].isPraise == 1) {
+							//已赞
+							this.pageList[index].isPraise = 0;
+							this.pageList[index].count.fabulousCount--;
+						} else {
+							this.pageList[index].isPraise = 1;
+							this.pageList[index].count.fabulousCount++;
+						}
+					}
+				});
+			},
+			
+			//提交投票
+			submitPoll(item, pIndex, pollIndex) {
+				if(item.qyPoll.isEnd) return false;
+				var dataP = {};
+				// dataP.id = item.id;
+				dataP.pollId = item.qyPoll.id;
+				var pollObjList = JSON.parse(item.qyPoll.optionJson);
+				dataP.pollOptionCode = pollObjList[pollIndex].code;
+				req.postRequest('/api/v3/poll/saveDetails', dataP, data => {
+					req.msg('投票成功');
+					//图片完之后要将该投票的对象返回，便于做渲染%
+					this.pageList[pIndex].qyPoll = data;
+				});
+			},
+			videoPlay(index){
+				var that = this;
+				var curIdx = index;
+				this.pageList[index].isControls = true
+				this.pageList[index].isShowPlayBtn = false
+				// 有播放时先将prev暂停，再播放当前点击的current
+				if (that.videoCurrent != null) {
+					var videoContextPrev = uni.createVideoContext('myVideo' + that.videoCurrent)
+					if (that.videoCurrent != curIdx) {
+						this.pageList[that.videoCurrent].isControls = false
+						this.pageList[that.videoCurrent].isShowPlayBtn = true
+						
+						videoContextPrev.stop()
+					}
+					that.videoCurrent = curIdx
+					var videoContextCurrent = uni.createVideoContext('myVideo' + curIdx)
+					videoContextCurrent.play()
+				} else {  
+					// 没有播放时播放视频
+					that.videoCurrent = curIdx
+					var videoContext = uni.createVideoContext('myVideo' + curIdx) // 对应的视频id
+					videoContext.play()
+				}
+			},
+			videoPause(index){
+				this.pageList[index].isControls = false
+				this.pageList[index].isShowPlayBtn = true
+			},
+			videoEnded(index){
+				this.pageList[index].isControls = false
+				this.pageList[index].isShowPlayBtn = true
+			},
+			jumpUrlDetail(item) {
+				this.jumpUrl('/office/detail/detail?contentId=' + item.id);
+			},
+			toUserHomePage(userId) {
+				this.jumpUrl('/topics/home/home?userId=' + userId);
+			},
 		},
 		mounted() {
 			const systemInfo = uni.getSystemInfoSync();

office/news/news.css

@@ -4,7 +4,7 @@ page{background: #fff;}
 #editor {width: 100%;height: 200px;background-color: #fff;padding-top: 30rpx;font-style: normal;font-size: 32rpx;color: #333;}
 .ql-editor.ql-blank:before {color: #999;font-style: normal;}
 .imgbox{margin-top: 60rpx;flex-wrap: wrap;}
-.imgs{width: 160rpx;height: 160rpx;position: relative;border-radius: 8rpx;margin: 0 19rpx 25rpx 0;}
+.imgs{width: 158rpx;height: 158rpx;position: relative;border-radius: 8rpx;margin: 0 19rpx 25rpx 0;}
 .imgbox .imgs:nth-child(4n){margin-right: 0;}
 .img{width: 100%;height: 100%;border-radius: 8rpx;}
 .del{width: 36rpx;height: 36rpx;position: absolute;top: -15rpx;right: -15rpx;}

office/news/news.vue

@@ -9,13 +9,13 @@
 					<image src="../static/images/close.png" class="del" @tap="cleanimages(index)"></image>
 				</view>
 				<view class="video" :hidden="!videoInfo">
-					<video :src="videoInfo.playUrl" :poster="videoInfo.coverURL" :show-center-play-btn="false" :controls="isControls" :autoplay="isControls" :id="'myVideo'+index"></video>
+					<video :src="videoInfo" :show-center-play-btn="false" :controls="isCotrols" :autoplay="isCotrols" :id="'myVideo'"></video>
 					<view class="video-play ddflex" @click="videoPlay()" v-if="isShowPlayBtn"><image src="../../static/images/play.png"></image></view>
 					<image src="../static/images/close.png" class="del" @click="clearVideo"></image>
 				</view>
 				<block v-if="zhiPicUrls.length < picCount && !videoInfo">
 					<view class="upload ddflex" @click="uploadImgs" v-if="config.open_community_video != 1 || zhiPicUrls.length > 0"><image src="../static/images/upload.png"></image>上传图片</view>
-					<view class="upload ddflex" @click="showPop" v-if="config.open_community_video == 1"><image src="../static/images/upload.png"></image>上传图片或视频</view>
+					<view class="upload ddflex" @click="showPop" v-if="config.open_community_video == 1&&zhiPicUrls.length == 0"><image src="../static/images/upload.png"></image>上传图片或视频</view>
 				</block>
 			</view>
 		</view>
@@ -132,9 +132,6 @@ export default {
 		});
 		
 		this.placeholderText = '请输入内容';
-		if(this.config.open_community_video == 1){
-			this.getVodInfo()
-		}
 		QQMapWX.initMap();
 		let location = {
 			latitude: req.getStorage('loctionAddressMap').location.lat,
@@ -255,7 +252,7 @@ export default {
 			}
 			//视频
 			if (this.videoInfo) {
-				dataPream.url = this.videoInfo.playUrl;
+				dataPream.url = this.videoInfo;
 			}
 			//话题
 			if(this.topicId){
@@ -323,76 +320,6 @@ export default {
 			this.isShowPopCenter = false
 			this.popBottom = '-100%'
 		},
-		getVodInfo(){
-			req.getRequest('/api/v3/vod/vodInfo',{},data=>{
-				this.vodInfo = data;
-			})
-		},
-		getPlayInfo(videoId){
-			req.getRequest('/api/v3/vod/playInfo',{videoId:videoId},data=>{
-				this.videoInfo = data
-			})
-		},
-		createUploader(){
-			let self = this;
-			return new VODUpload({
-				timeout: 60000,
-				partSize: 1048576,
-				parallel: 5,
-				retryCount: 3,
-				retryDuration: 2,
-				region: this.regionId,
-				userId: this.accountId,
-				// 开始上传
-				onUploadstarted: function (uploadInfo) {
-					uni.showLoading({
-						title: '视频上传中'
-					})
-					console.log('uploadInfo==',uploadInfo)
-					if (!uploadInfo.videoId) {
-						req.getRequest('/api/v3/vod/uploadAuth?fileName=' + self.fileName,{},res=>{
-							var data = res;
-							self.uploader.setUploadAuthAndAddress(uploadInfo, data.uploadAuth, data.uploadAddress, data.videoId)
-						})
-						self.isStart = true;
-					} else {
-						req.getRequest('/api/v3/vod/refreshUploadAuth?videoId=' + uploadInfo.videoId,{},res=>{
-							var data = res;
-							self.uploader.setUploadAuthAndAddress(uploadInfo, data.uploadAuth, data.uploadAddress, data.videoId)
-						})
-					}
-				},
-				// 文件上传成功
-				onUploadSucceed: function (uploadInfo) {
-					// req.msg("视频上传成功");
-					self.getPlayInfo(uploadInfo.videoId);
-					setTimeout(() => {
-						self.isStart = false;
-					}, 1000);
-					uni.hideLoading()
-				},
-				// 文件上传失败
-				onUploadFailed: function (uploadInfo, code, message) {
-					req.msg("文件上传失败");
-				},
-				// 取消文件上传
-				onUploadCanceled: function (uploadInfo, code, message) {
-					req.msg("文件已暂停上传");
-				},
-				// 文件上传进度，单位：字节, 可以在这个函数中拿到上传进度并显示在页面上
-				onUploadProgress: function (uploadInfo, totalSize, progress) {
-					var progressPercent = Math.ceil(progress * 100);
-					// self.$set(self.uploader, 'authProgress', progressPercent);
-				},
-				// 上传凭证超时
-				onUploadTokenExpired: function (uploadInfo) {
-					req.getRequest('/api/v3/vod/refreshUploadAuth?videoId=' + uploadInfo.videoId,{},res=>{
-						var data = res;
-						self.uploader.resumeUploadWithAuth(data.uploadAuth)
-					})
-				}
-			})
-		},
 		uploadVodChangeHandle: function (e) {
 			let self = this;
 			self.hidePop()
@@ -408,17 +335,19 @@ export default {
 				console.log('视频文件==',res)
 				var file = {url: res.tempFiles[0].tempFilePath, coverUrl: res.tempFiles[0].thumbTempFilePath};
 				self.fileName = res.tempFiles[0].tempFilePath.substring(res.tempFiles[0].tempFilePath.lastIndexOf('/') + 1)
-				// if (self.uploader) {
-				// 	self.uploader.stopUpload();
-				// 	self.authProgress = 0;
-				// }
-				var userData = '{"Vod":{}}';
-				self.uploader = self.createUploader();
-				self.uploader.addFile(file, null, null, null, userData);
-				self.uploader.startUpload();
+				uni.showLoading({
+					title: '视频上传中'
+				})
+				self.upLoadVideo(res.tempFiles[0].tempFilePath)
 			  },
 		  })
 		},
+		upLoadVideo(tempFilePath){
+			req.uploadFile('/api/nocheck/upload',tempFilePath,res=>{
+				this.videoInfo = res.src
+				uni.hideLoading()
+			})
+		},
 		clearVideo(){
 			this.videoInfo = ''
 		},

office/poi/index.vue

@@ -326,7 +326,7 @@
 				}
 				if(item.relationMatch){
 					uni.navigateTo({
-						url: '/pages/main/show/show?id='+item.relationMatch.id
+						url: '/match/activityDetail/activityDetail?id='+item.relationMatch.id
 					})
 					return false;
 				}

office/search/index.vue

@@ -180,7 +180,7 @@
 				</view>
 				<view v-if="item.relationMatch" class="ddflex"
 					style="background: #F7F8FC;border-radius: 10rpx;padding: 18rpx 20rpx;margin-top: 20rpx;margin-left: 96rpx;color: #999;font-size: 24rpx;"
-					@click="jumpUrl('/pages/main/show/show?id='+item.relationMatch.id)">
+					@click="jumpUrl('/match/activityDetail/activityDetail?id='+item.relationMatch.id)">
 					来自
 					<view class="fflex tover" style="color: var(--main);">{{item.relationMatch.title}}</view>
 				</view>
@@ -504,7 +504,7 @@
 				}
 				if(item.relationMatch){
 					uni.navigateTo({
-						url: '/pages/main/show/show?id='+item.relationMatch.id
+						url: '/match/activityDetail/activityDetail?id='+item.relationMatch.id
 					})
 					return false;
 				}

office/team/index.vue

@@ -32,7 +32,7 @@
 			</view>
 			<view v-if="teamInfo.relationMatch" class="ddflex"
 				style="padding: 18rpx 0;margin-top: 20rpx;color: #999;font-size: 24rpx;"
-				@click="jumpUrl('/pages/main/show/show?id='+teamInfo.relationMatch.id)">
+				@click="jumpUrl('/match/activityDetail/activityDetail?id='+teamInfo.relationMatch.id)">
 				来自
 				<view class="fflex tover" style="color: var(--main);">{{teamInfo.relationMatch.title}}</view>
 			</view>
@@ -124,7 +124,7 @@
 								<view class="step-label" style="text-align: right;">名次</view>
 							</view>
 						</view>
-						<view v-if="item.type==11" class="ddflex step-box" style="justify-content: space-between;" @click="jumpUrl('/pages/main/show/show?id=' + item.matchContent.id)">
+						<view v-if="item.type==11" class="ddflex step-box" style="justify-content: space-between;" @click="jumpUrl('/match/activityDetail/activityDetail?id=' + item.matchContent.id)">
 							<image class="step-pic" :src="item.matchContent.pic" mode="aspectFill"></image>
 							<view class="fflex">
 								<view class="step-title tovers">{{item.matchContent.title}}</view>
@@ -277,7 +277,7 @@
 			joinTeam(item,index){
 				if(this.teamInfo.relationMatch){
 					uni.navigateTo({
-						url: '/pages/main/show/show?id='+this.teamInfo.relationMatch.id
+						url: '/match/activityDetail/activityDetail?id='+this.teamInfo.relationMatch.id
 					})
 					return false;
 				}

pages/index/index.css

@@ -713,6 +713,7 @@ page{background: #fff;}
 	width: 114rpx;
 	height: 114rpx;
 	margin-left: 10rpx;
+	border-radius: 10rpx;
 }
 
 

pages/interactive/index.vue

@@ -255,8 +255,8 @@
 					<view class="fflex">
 						<view class="ddflex">
 							<view class="team-tit tover" style="max-width: calc(100% - 80rpx);">{{item.title}}</view>
-							<view v-if="item.relationMatch" style="margin-left: 10rpx; width: 60rpx;line-height: 29rpx;font-size: 20rpx;color: #FFFFFF;background: linear-gradient(56deg, #FF7000 0%, #FF9100 100%);border-radius: 5rpx;text-align: center;">赛事</view>
-							<view v-else style="margin-left: 10rpx;width: 60rpx;line-height: 29rpx;font-size: 20rpx;color: #FFFFFF;background: linear-gradient(48deg, #5190FF 0%, #78A9FF 100%);border-radius: 5rpx;text-align: center;">社区</view>
+							<!-- <view v-if="item.relationMatch" style="margin-left: 10rpx; width: 60rpx;line-height: 29rpx;font-size: 20rpx;color: #FFFFFF;background: linear-gradient(56deg, #FF7000 0%, #FF9100 100%);border-radius: 5rpx;text-align: center;">赛事</view> -->
+							<!-- <view v-else style="margin-left: 10rpx;width: 60rpx;line-height: 29rpx;font-size: 20rpx;color: #FFFFFF;background: linear-gradient(48deg, #5190FF 0%, #78A9FF 100%);border-radius: 5rpx;text-align: center;">社区</view> -->
 						</view>
 						<view class="team-sta">
 							<text>{{item.memberNum}}成员</text>

topics/home/home.vue

@@ -187,7 +187,7 @@
 								<view class="step-label" style="text-align: right;">名次</view>
 							</view>
 						</view>
-						<view v-if="item.type==11" class="ddflex step-box" style="justify-content: space-between;" @click="jumpUrl('/pages/main/show/show?id=' + item.matchContent.id)">
+						<view v-if="item.type==11" class="ddflex step-box" style="justify-content: space-between;" @click="jumpUrl('/match/activityDetail/activityDetail?id=' + item.matchContent.id)">
 							<image class="step-pic" :src="item.matchContent.pic" mode="aspectFill"></image>
 							<view class="fflex">
 								<view class="step-title tovers">{{item.matchContent.title}}</view>
@@ -573,7 +573,7 @@ export default {
 			}
 			if(item.relationMatch){
 				uni.navigateTo({
-					url: '/pages/main/show/show?id='+item.relationMatch.id
+					url: '/match/activityDetail/activityDetail?id='+item.relationMatch.id
 				})
 				return false;
 			}