小程序3期开始

.gitignore

@@ -1,2 +1,3 @@
 unpackage/
-node_modules/
+node_modules/
+.Ds_Store

.hbuilderx/launch.json

@@ -4,7 +4,7 @@
     "configurations": [{
             "type": "uniCloud",
             "default": {
-                "launchtype": "remote"
+                "launchtype": "local"
             }
         }
     ]

components/areaCode.vue

@@ -0,0 +1,78 @@
+<template>
+	<view class="select-box">
+		<u-popup v-model="areacodeShow" mode="bottom">
+			<view class="box" style="color: #333333;font-size: 28rpxrpx;">请选择您的国际区号</view>
+			<view class="box" style="color: #2C83FF;" @click="areacode('852')">香港+852</view>
+			<view class="box" style="color: #2C83FF;" @click="areacode('866')">台湾+866</view>
+			<view class="box" style="color: #2C83FF;" @click="areacode('1')">美国+1</view>
+			<view class="box" style="color: #2C83FF;" @click="areacode('65')">新加坡+65</view>
+			<view class="box box-bottom" style="color: #A9AFB8;" @click="cancel">取消</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		User
+	} from "@/config/api.js"
+	export default {
+		watch: {
+			isAreaCode() {
+				this.areacodeShow = this.isAreaCode
+			},
+			typesignup() {
+				this.signupType = this.typesignup
+			}
+		},
+		data() {
+			return {
+				areacodeShow: false,
+			}
+		},
+		props: {
+			isAreaCode: {
+				type: Boolean,
+				default: false,
+			},
+			areaCode: {
+				type: Object
+			},
+		},
+		methods: {
+			areacode(num) {
+				User.countryCcodeAdd({
+					CountryCode: num
+				}).then(res => {
+					if (res.Ret == 200) {
+						this.areacodeShow = false
+						this.$parent.isAreaCode = false
+						this.$parent.isNeedAddCountryCode = false
+						this.$parent.signupAdd(this.areaCode.id, this.areaCode.type)
+					}
+				})
+			},
+			cancel() {
+				this.areacodeShow = false
+				this.$parent.isAreaCode = false
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.select-box {
+		width: 100%;
+
+		.box {
+			height: 95prx;
+			line-height: 95rpx;
+			text-align: center;
+			font-size: 32rpx;
+			border-bottom: 1rpx solid #EBEBEB;
+		}
+
+		.box-bottom {
+			border-bottom: none !important;
+		}
+	}
+</style>

components/modalDialog.vue

@@ -1,143 +1,251 @@
 <template>
-	<view>
-			<u-modal v-model="show" :content="content" :content-style="{fontSize: '32rpx'}" @confirm="contentBtn" :show-title="false"></u-modal>
-			<u-modal v-model="goFollowShow" :content-style="{fontSize: '32rpx'}" @confirm="goFollowShowBtn" :show-cancel-button="true" confirm-text="去关注" @cancel="cancel" :show-title="false" :cancel-style="{borderRight:'1rpx solid #EBEBEB'}">
-				<view class="slot-content">
-								<rich-text :nodes="accounts"></rich-text>
-							</view>
-			</u-modal>
-						<u-modal v-model="cancelShow" :content="canceltext" :content-style="{fontSize: '32rpx',lineHeight: '80rpx'}"  @confirm="cancelShowBtn" @cancel="cancelBtn" :show-title="false" :show-cancel-button="true" :cancel-style="{borderRight:'1rpx solid #EBEBEB'}"></u-modal>
+	<view>
+		<u-modal v-model="show" :content="content" :content-style="{fontSize: '32rpx'}" @confirm="contentBtn"
+			:show-title="false" confirm-text="知道了" :confirm-style="{fontWeight: '700'}"></u-modal>
+
+		<!-- 关注公众号 -->
+		<u-modal v-model="goFollowShow" :content-style="{fontSize: '32rpx'}" @confirm="goFollowShowBtn"
+			:show-cancel-button="true" confirm-text="去关注" @cancel="cancel" :show-title="false"
+			:cancel-style="{borderRight:'1rpx solid #EBEBEB'}" :confirm-style="{fontWeight: '700'}">
+			<view class="slot-content">
+				<rich-text :nodes="accounts"></rich-text>
+			</view>
+		</u-modal>
+
+
+
+		<u-modal v-model="cancelShow" :content="canceltext" :content-style="{fontSize: '32rpx',lineHeight: '80rpx'}"
+			:confirm-style="{fontWeight: '700'}" @confirm="cancelShowBtn" @cancel="cancelBtn" :show-title="false"
+			:show-cancel-button="true" :cancel-style="{borderRight:'1rpx solid #EBEBEB'}"></u-modal>
+
+		<!-- 立即申请 -->
+		<u-modal v-model="applyIsShow" :content-style="{fontSize: '32rpx'}" @confirm="applyIsShowBtn"
+			:show-cancel-button="true" confirm-text="立即申请" @cancel="applyIsShowCancel" :show-title="false"
+			:cancel-style="{borderRight:'1rpx solid #EBEBEB'}" :confirm-style="{fontWeight: '700'}">
+			<view class="slot-content">
+				<rich-text :nodes="jurisdictionText"></rich-text>
+			</view>
+		</u-modal>
+		
+		<!-- 拨打电话 -->
+		<u-modal v-model="showhasPermission" :content-style="{fontSize: '32rpx'}" @confirm="showhasPermissionBtn"
+			:show-cancel-button="true" confirm-text="拨号" @cancel="showhasPermissionCancel" :show-title="false"
+			:cancel-style="{borderRight:'1rpx solid #EBEBEB'}" :confirm-style="{fontWeight: '700'}">
+			<view class="slot-content">
+				<rich-text :nodes="hasPermissionText"></rich-text>
+			</view>
+		</u-modal>
+		<u-modal v-model="showRelation" confirm-text="知道了" :confirm-style="{fontWeight: '700'}"
+			:content="contentRelation"></u-modal>
 	</view>
 </template>
 
-<script>
-	import {activity} from "@/config/api.js"
+<script>
+	import {
+		activity
+	} from "@/config/api.js"
 	export default {
 		data() {
-			return {
-				goFollowShow:false,
-				show: false,
-				cancelShow:false,
-				content: '',
-				accounts:'',
-				canceltext:''
+			return {
+				goFollowShow: false,
+				show: false,
+				cancelShow: false,
+				applyIsShow: false,
+				showRelation: false,
+				showhasPermission: false,
+				contentRelation: '申请已提交,请等待销售人员与您联系',
+				content: '',
+				accounts: '',
+				canceltext: '',
+				jurisdictionText: '',
+				hasPermissionText: '',
 			}
-		},
-		props:{
-			isShow:{
-				type:Boolean,
-				default:false
-			},
-			signupType:{
-				type:Number,
-			},
-			signupStatus:{
-				type:String
-			},
-			goFollow:{
-				type:Boolean
-			},
-			isCancelShow:{
-				type:Boolean,
-				default:false
-			},
-			idTypeCancel:{
-				type:Object
-			}
-		},
-		watch:{
-			goFollow(){
-				this.goFollowShow=this.goFollow
-			},
-			isShow(){
-				this.show=this.isShow
-			},
-			signupType(){
-				// if(this.signupStatus!=='Success') return
-					if(this.signupType==1){
-						this.content='预约成功，已加入您的活动日程'
-						this.accounts=`
-					预约成功，已加入您的活动日程<br/><br/>
-					
-					关注【弘则研究】公众号，及时获取活动时间变更通知
-				`
-					}else {
-						this.content='报名成功，已加入您的活动日程'
-						this.accounts=`
-							报名成功，已加入您的活动日程<br/><br/>
-							
-							关注【弘则研究】公众号，及时获取活动时间变更通知
-						`
-					}
-					
-			},
-			signupStatus(){
-				if(this.signupStatus=='FullStarffed') {
-					this.content='此活动报名人数已满，请留意下期活动'
-				}else if (this.signupStatus=='TwoPeople'){
-					this.content='单机构最多2人报名同一活动，您所在机构报名人数已满'
-				}else if (this.signupStatus=='BreakPromise'){
-					this.content='由于爽约次数过多，您暂时被限制报名资格'
-				}else if (this.signupStatus=='Overtime'){
-					this.content='活动开始前1小时内无法预约，请联系对口销售处理'
-				}
-			},
-			'idTypeCancel.type':{
-				 handler: function() {
-				if(this.idTypeCancel.type==1) {
-					this.canceltext="您要取消此次活动预约外呼吗？"
-				}else {
-					this.canceltext="您要取消此次活动预约报名吗？"
-				}
-				},
-				 deep: true
-			},
-			isCancelShow(){
-				this.cancelShow=this.isCancelShow
-			}
 		},
-		methods: {
-			contentBtn(){
-				this.$parent.isShow=false
-				this.show=false
-			},
-			goFollowShowBtn(){
-				this.$parent.goFollow=false
-				this.goFollowShow=false
-			},
-			cancel(){
-				this.$parent.goFollow=false
-				this.goFollowShow=false
-			},
-			cancelBtn(){
-				this.$parent.isCancelShow=false
-				this.cancelShow=false
-			},
-			cancelShowBtn(){
-				activity.signupCancel({
-					ActivityId:this.idTypeCancel.id,
-					SignupType:this.idTypeCancel.type,
-				}).then(res=>{
-					if(res.Ret==200){
-						console.log(res);
-					}
-				})
+		props: {
+			isShow: {
+				type: Boolean,
+				default: false
+			},
+			signupType: {
+				type: Number,
+			},
+			signupStatus: {
+				type: String
+			},
+			goFollow: {
+				type: Boolean
+			},
+			isCancelShow: {
+				type: Boolean,
+				default: false
+			},
+			idTypeCancel: {
+				type: Object
+			},
+			jurisdictionList: {
+				type: Object
+			},
+			applyForIsShow: { //潜在用户
+				type: Boolean
+			},
+			isShowhasPermission: { //联系销售
+				type: Boolean
+			},
+			hasPermission: { //权限字段
+				type: String
+			}
+
+		},
+		watch: {
+			goFollow() {
+				this.goFollowShow = this.goFollow
+			},
+			isShow() {
+				this.show = this.isShow
+			},
+			signupType() {
+				if (this.signupType == 1) {
+					this.content = '预约成功，已加入您的活动日程'
+					this.accounts = `
+					预约成功，已加入您的活动日程<br/><br/>
+					
+					关注【弘则研究】公众号，及时获取活动时间变更通知
+				`
+				} else {
+					this.content = '报名成功，已加入您的活动日程'
+					this.accounts = `
+							报名成功，已加入您的活动日程<br/><br/>
+							
+							关注【弘则研究】公众号，及时获取活动时间变更通知
+						`
+				}
+
+			},
+			signupStatus() {
+				if (this.signupStatus == 'FullStarffed') {
+					this.content = '此活动报名人数已满，请留意下期活动'
+				} else if (this.signupStatus == 'TwoPeople') {
+					this.content = '单机构最多2人报名同一活动，您所在机构报名人数已满'
+				} else if (this.signupStatus == 'BreakPromise') {
+					this.content = '由于爽约次数过多，您暂时被限制报名资格'
+				} else if (this.signupStatus == 'Overtime') {
+					this.content = '活动开始前1小时内无法预约，请联系对口销售处理'
+				}
+			},
+			'idTypeCancel.type': {
+				handler: function() {
+					if (this.idTypeCancel.type == 1) {
+						this.canceltext = "您要取消此次活动预约外呼吗？"
+					} else {
+						this.canceltext = "您要取消此次活动的报名吗？"
+					}
+				},
+				deep: true
+			},
+			isCancelShow() {
+				this.cancelShow = this.isCancelShow
+			},
+			applyForIsShow() {
+				this.jurisdictionText = this.jurisdictionList.PopupMsg
+				this.applyIsShow = this.applyForIsShow
+			},
+			isShowhasPermission() {
+				this.hasPermissionText = this.jurisdictionList.PopupMsg
+				this.showhasPermission = this.isShowhasPermission
+			}
+		},
+		methods: {
+			contentBtn() {
+				this.$parent.isShow = false
+				this.show = false
+				this.$emit('cancelShowBtn', this.idTypeCancel, this.signupType, this.idTypeCancel.isNum)
+			},
+			//去关注
+			goFollowShowBtn() {
+				this.$parent.goFollow = false
+				this.goFollowShow = false
+				this.$emit('cancelShowBtn', this.idTypeCancel, this.signupType, this.idTypeCancel.isNum)
+				uni.navigateTo({
+					url: '/pages/accountsOfficial/accountsOfficial'
+				})
+			},
+			cancel() {
+				this.$parent.goFollow = false
+				this.goFollowShow = false
+
+				this.$emit('cancelShowBtn', this.idTypeCancel, this.signupType, this.idTypeCancel.isNum)
+			},
+			cancelBtn() {
+				this.$parent.isCancelShow = false
+				this.cancelShow = false
+			},
+			cancelShowBtn() {
+				activity.signupCancel({
+					ActivityId: this.idTypeCancel.id,
+					SignupType: this.idTypeCancel.type,
+				}).then(res => {
+					if (res.Ret == 200) {
+						this.idTypeCancel.cutId = res.Data.ActivityId
+						if (this.signupType == 1) {
+							uni.showToast({
+								title: '预约外呼已取消',
+								duration: 2000
+							});
+						} else {
+							uni.showToast({
+								title: '已取消报名',
+								duration: 2000
+							});
+						}
+						this.$emit('cancelShowBtn', this.idTypeCancel, this.signupType, this.idTypeCancel.isNum)
+					}
+					this.$parent.isCancelShow = false
+					this.cancelShow = false
+				})
+			},
+			//立即申请
+			applyIsShowBtn() {
+				this.applyIsShow = false
+				this.$parent.applyForIsShow = false
+				if (this.hasPermission == 3) {
+					uni.navigateTo({
+						url: "/pages/applyTrial/applyTrial"
+					})
+				} else if (this.hasPermission == 4) {
+					this.showRelation = true
+				}
+			},
+			applyIsShowCancel() {
+				this.applyIsShow = false
+				this.$parent.applyForIsShow = false
+			},
+			showhasPermissionBtn() {
+				uni.makePhoneCall({
+					phoneNumber: this.jurisdictionList.SellerMobile //仅为示例
+				});
+				this.showhasPermission = false
+				this.$parent.isShowhasPermission = false
+			},
+			showhasPermissionCancel() {
+				this.showhasPermission = false
+				this.$parent.isShowhasPermission = false
 			}
 		}
 	}
 </script>
 
-<style scoped lang="scss">
-	.slot-content {
-			width: 100%;
-			padding: 50rpx;
-			text-align: center;
-			font-size: 32rpx;
-			color: #0F1826;
-			line-height: 48rpx;
-			
-		}
-		.u-model__footer__button.data-v-3626fcec {
-			border-right: 1rpx solid #333;
-		}
+<style scoped lang="scss">
+	.slot-content {
+		width: 100%;
+		padding: 50rpx;
+		text-align: center;
+		font-size: 32rpx;
+		color: #0F1826;
+		line-height: 48rpx;
+
+	}
+
+	.u-model__footer__button.data-v-3626fcec {
+		border-right: 1rpx solid #333;
+	}
 </style>

config/api.js

@@ -82,7 +82,15 @@ export const User = {
 	 */
 	applyTry: params => {
 		return postHttp('/user/apply/try',params,0)
-	}
+	},
+	//获取是否需要填写区号接口
+	countryCcode: params => {
+		return getHttp('/user/countryCcode/isNeedAdd',params,0)
+	},
+	//上传用户区号接口
+	countryCcodeAdd: params => {
+		return postHttp('/user/countryCcode/Add',params,0)
+	},
 }
 
 /* 首页 */
@@ -131,6 +139,10 @@ export const Search = {
 	/* 搜索  KeyWord */
 	getResult: params => {
 		return getHttp('/search/list',params,0)
+	}	,
+	/* 报告搜索  KeyWord */
+	getResultReport: params => {
+		return getHttp('/search/report/list',params,0)
 	}	
 }
 
@@ -198,4 +210,16 @@ export const activity ={
 	signupCancel: params => {
 		return postHttp('/activity/signup/cancel',params)
 	},
+	/* 获取活动列表接口*/
+	getScheduleList: params => {
+		return getHttp('/activity/scheduleList',params)
+	},
+	/* 活动取消报名接口*/
+	meetingReminderAdd: params => {
+		return postHttp('/activity/meetingReminder/add',params)
+	},
+	/* 取消会议提醒接口*/
+	meetingReminderCancel: params => {
+		return postHttp('/activity/meetingReminder/cancel',params)
+	},
 }

config/config.js

@@ -1,5 +1,5 @@
 
- export const baseUrl = 'http://8.136.199.33:8500/api';//小程序开发接口地址
+export const baseUrl = 'http://8.136.199.33:8500/api';//小程序开发接口地址
 //export const baseUrl = 'https://cygx.hzinsights.com/api';//小程序线上接口地址
 // #ifdef H5
 export const H5baseUrl=process.env.NODE_ENV === 'development'?window.location.origin+'/':baseUrl

config/request.js

@@ -79,9 +79,11 @@ export const getHttp = (url,data,status=1)=> {
 				status && uni.hideLoading();
 				res.data.Ret === 403 && uni.showModal({
 					title: '',
+					confirmColor:'#3385FF',
 					content: res.data.Msg,
 					showCancel: false
 				});
+				register(res.data.Ret)
 				resolve(res.data)
 			},
 			fail: (error) => {
@@ -124,9 +126,11 @@ export const postHttp = (url,data,status=1)=> {
 				status && uni.hideLoading();
 				res.data.Ret === 403 && uni.showModal({
 					title: '',
+					confirmColor:'#3385FF',
 					content: res.data.Msg,
 					showCancel: false
 				});
+				register(data)
 				resolve(res.data)
 			},
 			fail: (error) => {
@@ -142,4 +146,11 @@ export const postHttp = (url,data,status=1)=> {
 			}
 		});
 	})
+}
+function register(data){
+	if(data===408) {
+		uni.navigateTo({
+		url:'/pages/login/login'
+		})
+	}
 }

pages.json

@@ -153,6 +153,33 @@
 		    }
 		    
 		}
+        ,{
+            "path" : "pages/activitySearch/activitySearch",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "搜索",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/networkAttend/networkAttend",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/accountsOfficial/accountsOfficial",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "关注公众号",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -185,8 +212,8 @@
 		{
 			"pagePath": "pages/activity/activity",
 			"text": "活动",
-			"iconPath": "static/img/tab/my_ico.png",
-			"selectedIconPath": "static/img/tab/my_actico.png"
+			"iconPath": "static/img/activity_ico.png",
+			"selectedIconPath": "static/img/activity_act.png"
 		},
 			{
 				"pagePath": "pages/my/my",

pages/accountsOfficial/accountsOfficial.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		<web-view src="https://mp.weixin.qq.com/s/jMGsvazoR3sze5WpIP5wLg"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/activity/activity.vue

@@ -1,692 +1,1187 @@
-<template>
-	<view class="activity-content">
-		<!-- tabs -->
-		<view class="top-content">
-			<view class="tab">
-				<view class="tab-item" v-for="(item,index) in tabs" :key="item.id">
-					<view class="scroll-tab-item" :class="{active:tabsActive==index}" @click="toggleTab(item,index)">{{item.name}}
-					<image src="@/static/img/border_act.png" class="border_act" v-if="tabsActive==index" mode=""></image>
-					</view>
-					
-				</view>
-			</view>
-			<!-- 搜索 -->
-			<view class="index-fixed">
-				<icon type="search" size="15" class="search_ico"/>
-				<text>请输入关键字</text>
-			</view>
-			<view class="select-conyent">
-				<van-dropdown-menu active-color="#333333">
-				<van-dropdown-item id="statusstate" :title="activeStateName">
-						<view class="menu-items">
-							<view class="menu-items-box" @click="overallBtn('statusstate',key)" v-for="key in listActivityStaus" :key="key.Id">
-								<view class="items-box">
-									<u-icon v-if="key.IsChoose" name="checkbox-mark"  color="#2C83FF" size="24"></u-icon>
-								</view>
-								<text>{{key.StatusName}}</text>
-							</view>
-						</view>
-						<view class="replacement-box">
-							<view class="replacement">
-								<text @click="replacementBtn('statusstate')" class="replacement-box">重置</text>
-								<text @click="replacementConfirm('statusstate')">确定</text>
-							</view>
-						</view>
-					</van-dropdown-item>
-				<van-dropdown-item id="industry" :title="chartPermissionName">
-					<view class="decide">
-						<view class="items-box">
-							<u-icon v-if="isShowJurisdiction" name="checkbox-mark"  color="#2C83FF" size="24"></u-icon>
-						</view>
-						<text @click="isJurisdiction">始终只展示有权限的行业</text>
-					</view>
-						<view class="menu-items">
-							<view class="menu-items-box" v-for="item in listChartPermission" :key="item.ChartPermissionId" @click="overallClick('industry',item)">
-								<view class="items-box">
-									<u-icon v-if="item.IsChoose" name="checkbox-mark"  color="#2C83FF" size="24"></u-icon>
-								</view>
-								<text>{{item.PermissionName}}</text>
-							</view>
-						</view>
-						<view class="replacement">
-							<text @click="replacementBtn('industry')" class="replacement-box">重置</text>
-							<text @click="replacementConfirm('industry')">确定</text>
-						</view>
-					</van-dropdown-item>
-				<van-dropdown-item id="genre" :title="activityTypeName">
-						<view class="menu-items">
-							<view class="menu-items-box" @click="overallActivity('genre',item)" v-for="(item,index) in listActivityType" :key="item.ActivityTypeId">
-								<view class="items-box">
-									<u-icon v-if="item.IsChoose" name="checkbox-mark"  color="#2C83FF" size="24"></u-icon>
-								</view>
-								<text>{{item.ActivityTypeName}}</text>
-							</view>
-						</view>
-						<view class="replacement">
-							<text @click="replacementBtn('genre')" class="replacement-box">重置</text>
-							<text @click="replacementConfirm('genre')">确定</text>
-						</view>
-					</van-dropdown-item>
-				
-				
-				
-				</van-dropdown-menu>
-			</view>
-			
-			</view>
-			<view class="box-content">
-				<view class="content-list" v-for="(item,index) in collectList" :key="index">
-					<view class="list-top" @click="goDetail(item)">
-					<view class="list-top-box">
-						<text>{{item.ActivityTypeName}}</text>
-						<view class="city">
-							<image src="../../static/img/advice_ico.png" mode=""></image>
-							<text>城市</text>
-						</view>
-					</view>
-						<text style="color: #2ACDD9; font-size: 26rpx;">{{item.ActiveState == 1 ? '未开始': item.ActiveState == 2 ?'进行中' :'已结束'}}</text>
-					</view>
-					<view class="list-center" @click="goDetail(item)">
-						<text class="title">{{item.ActivityName}}</text>
-						<text v-if="item.Expert">专家背景：{{item.Expert}}</text>
-						<text v-if="item.DistinguishedGuest">嘉宾：{{item.DistinguishedGuest}}</text>
-						<text>活动时间：{{item.ActivityTime}}</text>
-					</view>
-					<view class="list-bottom">
-						<view class="multi" v-if="item.ActivityTypeId==1||item.ActivityTypeId==2||(item.ActivityTypeId==3&&item.IsLimitPeople==0)">
-							<text v-if="item.IsSignup!==1" @click="signupAdd(item.ActivityId,1)">预约外呼</text>
-							<text v-else @click="signupCancel(item.ActivityId,1)">取消外呼</text>
-							<text style="border-left: 1px solid #E5E5E5;">会议提醒</text>
-						</view>
-						<view class="multi-text" v-else>
-							<text v-if="item.IsSignup!==1" @click="signupAdd(item.ActivityId,2)">我要报名（{{item.SignupNum}}/{{item.LimitPeopleNum}}）</text>
-							<text v-else @click="signupCancel(item.ActivityId,2)">取消报名（{{item.SignupNum}}/{{item.LimitPeopleNum}}）</text>
-						</view>
-					</view>
-				</view>
-					<u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20" v-if="totalPage>1"/>
-			</view>
-			<modalDialog :isShow="isShow" :signupType="signupType" :goFollow="goFollow" :signupStatus="signupStatus" :isCancelShow="isCancelShow" :idTypeCancel="idTypeCancel"/>
-	</view>
-</template>
-
-<script>
-	import {activity} from "@/config/api.js"
-	import { Throttle } from '@/config/util.js'
-	import modalDialog from '@/components/modalDialog.vue'
-	let app = getApp()
-	export default {
-		data() {
-			return {
-				tabs:[{
-					name:'全部活动',
-					id:1
-				},
-				{
-					name:'我的日程',
-					id:2
-				},],
-				tabsActive:0,
-				page_no:1,
-				pageSize:10,
-				collectList:[],
-				status:'loadmore',
-				totalPage:'',
-				haveData:true,
-				loadText: {
-					loadmore: '上拉加载更多',
-					loading: '加载中',
-					nomore: '已经到底了'
-				},
-				listActivityStaus:[],//状态
-				listActivityType:[],//类型
-				listChartPermission:[],//分类
-				isShowJurisdiction:false,
-				activeState:'1',//活动进行状态
-				activityTypeIds:'',//活动类型id 多个用 , 隔开
-				chartPermissionIds:'',//行业id 多个用 , 隔开
-				activeStateName:'未开始',
-				chartPermissionName:'行业分类',
-				activityTypeName:'活动类型',
-				isShowJurisdiction:false,
-				isGain:true,
-				signupType:'',//关注类型
-				goFollow:false,//是否关注公众号
-				signupStatus:'Success',//4个不同的类型提示文案
-				isShow:false,//弹框
-				isCancelShow:false,
-				idTypeCancel:{
-					id:'',
-					type:1
-				}
-			}
-		},
-		computed:{
-			//是否仅展示有权限的，1是，0否 默认为0
-			isId(){	
-				return this.isShowJurisdiction ? 1:0
-			}
-		},
-		watch:{
-		},
-		components: {
-			modalDialog
-		},
-		onLoad(option) {
-			if(option.typeName) {
-				console.log(option);
-				this.activeState=option.statesId//活动进行状态
-				this.activityTypeIds=option.typeIds//活动类型id 多个用 , 隔开
-				this.chartPermissionIds=option.chartIds//行业id 多个用 , 隔开
-				this.activeStateName=option.stateName
-				this.chartPermissionName=option.chartName
-				this.activityTypeName=option.typeName
-				this.isGain=false
-				console.log(this.activeState);
-				console.log(this.activityTypeIds);
-				console.log(this.chartPermissionIds);
-			}else {
-				this.isGain=true
-			}
-			this.getUserSearchContent()
-		},
-		/* 触底 */
-		onReachBottom: Throttle(function() {
-				if(this.status === 'nomore') return ;
-				this.status = 'loading';
-				this.page_no++;
-				this.getList()
-			}),	
-		methods: {
-			//获取列表
-			getList(){
-				activity.getActivityList({
-					PageSize:this.pageSize,
-					CurrentIndex:this.page_no,
-					ActiveState:this.activeState,//活动进行状态
-					ActivityTypeIds:this.activityTypeIds,//活动类型id 多个用 , 隔开
-					ChartPermissionIds:this.chartPermissionIds,//行业id 多个用 , 隔开
-				}).then(res=>{
-					if(res.Ret !== 200) return
-					this.status = this.page_no < res.Data.Paging.Pages ? 'loadmore' : 'nomore';
-					this.totalPage = res.Data.Paging.Pages;//总页数
-					if(this.page_no === 1) {
-						this.collectList = res.Data.List || [];
-						this.haveData = this.collectList.length ? true : false
-						if(this.refresh) {
-							uni.stopPullDownRefresh();
-							this.refresh = false;
-						} 
-					}else {
-						this.collectList.push(...res.Data.List)
-					}
-				})
-			},
-			//获取活动详情接口
-			getUserSearchContent(){
-				activity.getUserSearchContent({
-					IsShowJurisdiction:this.isId
-				}).then(res=>{
-					this.isShowJurisdiction=res.Data.IsShowJurisdiction
-					this.listActivityStaus=res.Data.ListActivityStaus
-					this.listActivityType=res.Data.ListActivityType
-					this.listChartPermission=res.Data.ListChartPermission
-					if(this.isGain) {
-						this.preserve()
-					}else {
-						this.getList()
-					}
-					
-				})
-			},
-			//报名
-			signupAdd(id,type){
-				activity.signupAdd({
-					ActivityId:id,
-					SignupType:type,
-				}).then(res=>{
-					if(res.Ret==200){
-						console.log(res);
-						if(!res.Data.GoFollow){	
-							this.isShow=true
-							console.log(this.isShow);
-						}
-						this.signupType=res.Data.SignupType
-						this.goFollow=res.Data.GoFollow
-						this.signupStatus=res.Data.SignupStatus
-					}
-				})
-			},
-			//取消报名
-			signupCancel(id,type){
-				this.isCancelShow=true
-				this.idTypeCancel={
-					id,
-					type
-				}
-				// activity.signupCancel({
-				// 	ActivityId:id,
-				// 	SignupType:type,
-				// }).then(res=>{
-				// 	if(res.Ret==200){
-						
-				// 	}
-				// })
-			},
-			preserve(){
-				const arr=[]
-				const str=[]
-				this.listActivityStaus.forEach(item=>{
-					if(item.IsChoose) {
-						arr.push(item.Id)
-						str.push(item.StatusName)
-					}
-				})
-				if(str.length==this.listActivityStaus.length) {
-					this.activeStateName='所有状态'
-				}else if(str.length<=0) {
-					this.activeStateName='活动状态'
-				}else {
-					this.activeStateName=str.join(',')
-				}
-				this.activeState = arr.join(',')
-				const hyArr=[]
-				const hyStr=[]
-				this.listChartPermission.forEach(key=>{
-						if(key.IsChoose){
-							hyArr.push(key.ChartPermissionId)
-							hyStr.push(key.PermissionName)
-						}
-					})	
-					if(hyStr.length==this.listChartPermission.length) {
-						this.chartPermissionName='所有行业'
-					}else if(hyStr.length<=0){
-						this.chartPermissionName='行业分类'
-					}else {
-						this.chartPermissionName=hyStr.join(',')
-					}
-					this.chartPermissionIds = hyArr.join(',')
-					const lxArr=[]
-					const lxStr=[]
-					this.listActivityType.forEach(key=>{
-							if(key.IsChoose){
-								lxArr.push(key.ActivityTypeId)
-								lxStr.push(key.ActivityTypeName)
-							}
-						})	
-						if(lxStr.length==this.listActivityType.length) {
-							this.activityTypeName='所有活动'
-						}else if(lxStr.length<=0){
-							this.activityTypeName='活动类型'
-						}else{this.activityTypeName=lxStr.join(',')}
-						this.activityTypeIds = lxArr.join(',')
-						this.getList()
-			},
-			toggleTab(item,index){
-				if(this.tabsActive!==index) {
-					this.tabsActive=index
-				}
-			},
-			//状态的下拉选择
-			overallBtn(type,item){
-					const arr=[]
-					const str=[]
-				this.listActivityStaus.forEach(key=>{
-						if(key.Id==item.Id){
-							key.IsChoose=!key.IsChoose
-						}
-					})
-				this.listActivityStaus.forEach(key=>{
-						if(key.IsChoose){
-							arr.push(key.Id)
-							str.push(key.StatusName)
-						}
-					})	
-					if(str.length==this.listActivityStaus.length) {
-						this.activeStateName='所有状态'
-					}else if(str.length<=0) {
-						this.activeStateName='活动状态'
-					}else {
-						this.activeStateName=str.join(',')
-					}
-					this.activeState = arr.join(',')
-
-			},
-			// 行业的下拉选择
-			overallClick(type,item){
-				const arr=[]
-				const str=[]
-				this.listChartPermission.forEach(key=>{
-						if(key.ChartPermissionId==item.ChartPermissionId){
-							key.IsChoose=!key.IsChoose
-						}
-					})
-				this.listChartPermission.forEach(key=>{
-						if(key.IsChoose){
-							arr.push(key.ChartPermissionId)
-							str.push(key.PermissionName)
-						}
-					})	
-					if(str.length==this.listChartPermission.length) {
-						this.chartPermissionName='所有行业'
-					}else if(str.length<=0){
-						this.chartPermissionName='行业分类'
-					}else {
-						this.chartPermissionName=str.join(',')
-					}
-					this.chartPermissionIds = arr.join(',')
-				
-			},
-			//类型的下拉选择
-			overallActivity(type,item){
-				const arr=[]
-				const str=[]
-				this.listActivityType.forEach(key=>{
-						if(key.ActivityTypeId==item.ActivityTypeId){
-							key.IsChoose=!key.IsChoose
-						}
-					})
-				this.listActivityType.forEach(key=>{
-						if(key.IsChoose){
-							arr.push(key.ActivityTypeId)
-							str.push(key.ActivityTypeName)
-						}
-					})	
-					if(str.length==this.listActivityType.length) {
-						this.activityTypeName='所有活动'
-					}else if(str.length<=0){
-						this.activityTypeName='活动类型'
-					}else{this.activityTypeName=str.join(',')}
-					this.activityTypeIds = arr.join(',')
-			},
-			/* 新布局产业选项重置按钮 */
-			replacementBtn(type){
-				if(type=='statusstate'){
-					this.listActivityStaus.forEach(item=>item.IsChoose=false)
-					this.listActivityStaus[0].IsChoose=true
-					this.activeState='1'
-					this.activeStateName='未开始'
-				}else if(type=='industry') {
-					this.listChartPermission.forEach(item=>item.IsChoose=false)
-					this.chartPermissionIds=''
-					this.chartPermissionName='行业分类'
-				}else {
-					this.listActivityType.forEach(item=>item.IsChoose=false)
-					this.activityTypeIds=''
-					this.activityTypeName='活动类型'
-				}
-			},
-			/* 新布局产业选项确定按钮 */
-			replacementConfirm(type){
-				this.page_no=1
-				if(type=='statusstate'){
-					
-						console.log('状态');
-				}else if(type=='industry') {
-				
-					console.log('行业');
-				}else {
-				
-					console.log('活动');
-				}
-				this.getList()
-				this.selectComponent(`#${type}`).toggle();
-			},
-			goDetail(item){
-				this.$store.dispatch('checkHandle').then(res => {
-					app.globalData.isAuth = res.IsAuth;
-					app.globalData.isBind = res.IsBind;
-					if((!res.IsAuth) && (!res.IsBind)) { // 已授权已绑定
-						uni.navigateTo({
-							url:'/pages/activityDetail/activityDetail?id=' + item.ActivityId,
-						});
-					}else if(res.IsAuth) { //未授权
-						uni.navigateTo({
-							url:'/pages/authGuide/authGuide'
-						})
-					}else if(res.IsBind && !res.IsAuth){ //已授权未绑定
-						uni.navigateTo({
-							url:'/pages/login/login'
-						})
-					}
-				})
-				
-			},
-			isJurisdiction(){
-				this.isShowJurisdiction = !this.isShowJurisdiction
-				this.getUserSearchContent()
-			}
-		},	
-		/**
-		* 用户点击分享
-		*/
-		onShareAppMessage: function (res) {
-			return {
-				title: '活动',
-				path: '/pages/activity/activity?statesId='+this.activeState+'&typeIds='+this.activityTypeIds+'&chartIds='+this.chartPermissionIds+'&stateName='+this.activeStateName+'&chartName='+this.chartPermissionName+'&typeName='+this.activityTypeName ,
-				success: (res)=> {
-				},
-				fail: (err)=> {
-				}
-			}
-		},
-	}
-</script>
-
-<style scoped lang="scss">
-.activity-content {
-	background-color: #f6f6f6;
-	.top-content{
-		width: 100%;
-		background-color: #fff;
-		padding: 0 30rpx;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 999;
-		.tab {
-			display: flex;
-			font-size: 32rpx;
-			color: #707070;
-			.tab-item {
-				flex: 1;
-				text-align: center;
-				.scroll-tab-item {
-					height: 78rpx;
-					line-height: 48rpx;
-					position: relative;
-					.border_act {
-						position: absolute;
-						height: 6rpx;
-						width: 340rpx;
-						left: 0;
-						bottom: 0rpx;
-					}
-				}
-				.active {
-					color: #3385FF;
-					font-weight: bold;
-					font-size: 34rpx;
-				}
-				image {
-					
-				}
-			}
-		}
-		.index-fixed {
-			margin-top: 40rpx;
-			width: 100%;
-			display: flex;
-			align-items: center;
-			height: 70rpx;
-			background: #F6F6F6;
-			border: 1rpx solid #E5E5E5;
-			opacity: 1;
-			border-radius: 35rpx;
-			padding-left: 34rpx;
-			color: #8D8D8D;
-			font-size: 24rpx; 
-			.search_ico {
-				padding-right: 16rpx;
-			}
-		}
-		.select-conyent {
-			margin-top: 10rpx;
-			.decide {
-				display: flex;
-				align-items: center;
-				margin: 0 auto;
-				height: 110rpx;
-				width: 690rpx;
-				border-bottom: 1px solid #E5E5E5;
-			}
-			.items-box {
-				 width: 40rpx;
-			}
-			.menu-items {
-					background-color: #fff;
-					 width: 100%;
-					  display: flex;
-					  flex-wrap:wrap;
-					  padding: 30rpx 30rpx 0;
-					  .menu-items-box {
-						  display: flex;
-						  width: 50%;
-						  font-size: 28rpx;
-						  font-weight: 400;
-						  margin-bottom: 40rpx;
-						 
-					  }
-			}
-			.replacement-box {
-				background-color: #fff;
-				padding-bottom: 40rpx;
-				border-radius: 0rpx 0rpx 16rpx 16rpx;
-			}
-			.replacement {
-			margin: 0rpx 30rpx 20rpx;
-			display: flex;
-			background-color: #2C83FF;
-			opacity: 1;
-			height: 60rpx;
-			line-height: 58rpx;
-			font-size: 28rpx;
-			font-weight: 400;
-			color: #FFFFFF;
-			border-radius: 30rpx;
-			text {
-				flex: 1;
-				text-align: center;
-				
-			}
-			
-			.replacement-box {
-				border: 1rpx solid #2C83FF;
-				opacity: 1;
-				color: #2C83FF;
-				background: #FFFFFF;
-				border-radius: 28rpx 0rpx 28rpx 28rpx;
-			}
-	 }
-		}
-	}
-	.box-content {
-		padding: 300rpx 34rpx 0;
-		.content-list {
-			box-sizing: border-box;
-			overflow: hidden;
-			margin-top: 30rpx;
-			height: 396rpx;
-			width: 100%;
-			background: #FFFFFF;
-			box-shadow: 0px 3rpx 6rpx rgba(141, 141, 141, 0.16);
-			border-radius: 16rpx;
-			font-size: 28rpx;
-			.list-top {
-				margin: 0 30rpx;
-				display: flex;
-				justify-content: space-between;
-				border-bottom:1rpx solid #E5E5E5 ;
-				height: 82rpx;
-				line-height: 82rpx;
-				color: #333333;
-				font-size: 32rpx;
-				.list-top-box {
-					display: flex;
-				}
-				.city {
-					margin-left: 40rpx;
-					display: flex;
-					color: #3385FF;
-					align-items: center;
-					font-size: 26rpx;
-					image {
-						width: 27rpx;
-						height: 32rpx;
-						margin-right:12rpx;
-					}
-				}
-			}
-			.list-center {
-				height: 234rpx;
-				width: 100%;
-				color: #333333;
-				line-height: 60rpx;
-				.title {
-					padding: 10rpx;
-					padding-left: 35rpx;
-					white-space:nowrap;
-					overflow:hidden;
-					text-overflow:ellipsis;
-				}
-				text {
-					padding-left: 50rpx;
-				}
-			}
-			.list-bottom {
-				height: 80rpx;
-				border-top: 1px solid #E5E5E5;
-				.multi {
-					display: flex;
-					text-align: center;
-					line-height: 80rpx;
-					color: #3385FF;
-					text {
-						width: 50%;
-					}
-				}
-				.multi-text {
-					line-height: 80rpx;
-					color: #3385FF;
-					width: 100%;
-					text-align: center;
-				}
-			}
-		}
-	}
-}
-/deep/.van-dropdown-menu {
-	  background-color: #fff;
-	  box-shadow: none !important;
-	  padding-top: 20rpx;
-  }
- 
-/deep/.van-dropdown-menu__item{
-		box-sizing: border-box;
-		width: 190rpx;
-		margin-right:40rpx;
-		padding-right: 20rpx;
-		height: 51rpx;
-        border-radius: 26rpx;
-		background: #F8F8FA;
-	}
-/deep/.van-dropdown-item{
-	margin-top: -10rpx;
-}
-/deep/[data-index='2'] {
-		margin-right:0rpx;
-}
-/deep/ .van-ellipsis {
-	font-size: 24rpx;
-}
+<template>
+	<view class="container activity-content">
+		<!-- tabs -->
+		<view class="top-content">
+			<view class="tab">
+				<view class="tab-item" v-for="(item,index) in tabs" :key="item.id">
+					<view class="scroll-tab-item" :class="{active:tabsActive==index}" @click="toggleTab(item,index)">
+						{{item.name}}
+						<image src="@/static/img/border_act.png" class="border_act" v-if="tabsActive==index" mode="">
+						</image>
+					</view>
+
+				</view>
+			</view>
+			<!-- 搜索 -->
+			<view class="index-fixed" v-if="tabsActive==0" @click="goSearch">
+				<icon type="search" size="15" class="search_ico" />
+				<text>请输入关键字</text>
+			</view>
+			<view class="select-conyent" v-if="tabsActive==0">
+				<van-dropdown-menu active-color="#333333">
+					<van-dropdown-item id="statusstate" :title="activeStateName">
+						<view class="menu-items">
+							<view class="menu-items-box" @click="overallBtn('statusstate',key)"
+								v-for="key in listActivityStaus" :key="key.Id">
+								<view class="items-box">
+									<u-icon v-if="key.IsChoose" name="checkbox-mark" color="#2C83FF" size="24"></u-icon>
+								</view>
+								<text>{{key.StatusName}}</text>
+							</view>
+						</view>
+						<view class="replacement-box">
+							<view class="replacement">
+								<text @click="replacementBtn('statusstate')" class="replacement-box">重置</text>
+								<text @click="replacementConfirm('statusstate')">确定</text>
+							</view>
+						</view>
+					</van-dropdown-item>
+					<van-dropdown-item id="industry" :title="chartPermissionName">
+						<view class="decide">
+							<view class="items-box">
+								<u-icon v-if="isShowJurisdiction" name="checkbox-mark" color="#2C83FF" size="24">
+								</u-icon>
+							</view>
+							<text @click="isJurisdiction">始终只展示有权限的行业</text>
+						</view>
+						<view class="menu-dashed">
+
+						</view>
+						<view class="menu-items">
+							<view class="menu-items-box" v-for="item in listChartPermission"
+								:key="item.ChartPermissionId" @click="overallClick('industry',item)">
+								<view class="items-box">
+									<u-icon v-if="item.IsChoose" name="checkbox-mark"
+										:color="isShowJurisdiction?'#ccc':'#2C83FF'" size="24"></u-icon>
+								</view>
+								<text>{{item.PermissionName}}</text>
+							</view>
+						</view>
+						<view class="replacement">
+							<text @click="replacementBtn('industry')" class="replacement-box">重置</text>
+							<text @click="replacementConfirm('industry')">确定</text>
+						</view>
+					</van-dropdown-item>
+					<van-dropdown-item id="genre" :title="activityTypeName">
+						<view class="menu-items">
+							<view class="menu-items-box" @click="overallActivity('genre',item)"
+								v-for="(item,index) in listActivityType" :key="item.ActivityTypeId">
+								<view class="items-box">
+									<u-icon v-if="item.IsChoose" name="checkbox-mark" color="#2C83FF" size="24">
+									</u-icon>
+								</view>
+								<text>{{item.ActivityTypeName}}</text>
+							</view>
+						</view>
+						<view class="replacement">
+							<text @click="replacementBtn('genre')" class="replacement-box">重置</text>
+							<text @click="replacementConfirm('genre')">确定</text>
+						</view>
+					</van-dropdown-item>
+
+
+
+				</van-dropdown-menu>
+			</view>
+
+		</view>
+		<view class="box-content" :class="{head:tabsActive==1}" v-if="haveData">
+			<view class="content-list" v-for="(item,index) in collectList" :key="index">
+				<view class="list-top" @click="goDetail(item)">
+					<view class="list-top-box">
+						<text class="title">{{item.ActivityTypeName}}</text>
+						<view class="city" v-if="item.City">
+							<image src="../../static/img/location.png" mode=""></image>
+							<text>{{item.City}}</text>
+						</view>
+					</view>
+					<text style="color: #2ACDD9; font-size: 26rpx;" v-if="item.ActiveState==1">未开始</text>
+					<text style="color: #FF4040; font-size: 26rpx;" v-if="item.ActiveState==2">进行中</text>
+					<text style="color: #999999; font-size: 26rpx;" v-if="item.ActiveState==3">已结束</text>
+				</view>
+				<view class="" style="display: flex;">
+					<view class="list-center" @click="goDetail(item)">
+
+						<text class="title" v-if="item.IsBrackets==1">{{item.ActivityName}}</text>
+						<text class="title-two" v-else>艾尔复盘</text>
+						<view class="setting-center">
+							<view class="">
+								<view class="box-expert" style="padding-bottom: 30rpx ;"
+									v-if="item.ActivityTypeName=='专家电话会'||item.ActivityTypeName=='专家线下沙龙'">
+									<view style="width: 140rpx;">
+										专家背景：
+									</view>
+									<view style="width:400rpx;">{{item.Expert}}</view>
+								</view>
+								<text style="padding-bottom: 30rpx ;"
+									v-if="item.ActivityTypeName=='公司调研电话会'||item.ActivityTypeName=='公司线下调研'">嘉宾：{{item.DistinguishedGuest}}</text>
+								<text style="padding-bottom: 30rpx ;"
+									v-if="item.ActivityTypeName=='分析师电话会'||item.ActivityTypeName=='分析师线下沙龙'">主讲人：{{item.Speaker}}</text>
+							</view>
+						</view>
+
+						<text style="padding-bottom: 30rpx ;">活动时间：{{item.ActivityTime}}</text>
+					</view>
+					<view class="" style="display: flex;align-items: center;padding-right: 30rpx;">
+						<u-icon style="padding-bottom: 30rpx ;" name="arrow-right" color="#BDBDBD" size="34"></u-icon>
+					</view>
+				</view>
+				<view class="list-bottom"
+					v-if="item.ActiveState==1 &&(item.IsLimitPeople==1 && item.ActivityTypeName=='公司调研电话会')">
+					<view class="multi-text">
+						<text v-if="item.IsSignup!==1"
+							@click="wanttosignup(item.ActivityId)">我要报名（{{item.SignupNum}}/{{item.LimitPeopleNum}}）</text>
+						<text v-else
+							@click="signupCancel(item.ActivityId,2,item.ActivityTime)">{{item.SignupType ==1?'取消外呼':'取消报名'}}（{{item.SignupNum}}/{{item.LimitPeopleNum}}）</text>
+
+					</view>
+				</view>
+				<view class="list-bottom" v-else-if="item.ActiveState==1">
+					<view class="multi"
+						v-if="item.ActivityTypeId==1||item.ActivityTypeId==2||(item.ActivityTypeId==3&&item.IsLimitPeople==0)">
+						<text class="multi-outbound" v-if="item.IsSignup!==1"
+							@click="signupAdd(item.ActivityId,1)">预约外呼</text>
+						<text class="multi-outbound" v-else
+							@click="signupCancel(item.ActivityId,1,item.ActivityTime)">取消外呼</text>
+						<text class="multi-remind" v-if="item.IsCancelMeetingReminder==0"
+							style="border-left: 1px solid #E5E5E5;"
+							@click="meetingReminderAdd(item.ActivityId)">会议提醒</text>
+						<text class="multi-remind" v-else style="border-left: 1px solid #E5E5E5;"
+							@click="meetingReminderCancel(item.ActivityId)">取消会议提醒</text>
+					</view>
+					<view class="multi-text" v-else>
+						<text v-if="item.IsSignup!==1"
+							@click="signupAdd(item.ActivityId,3)">我要报名（{{item.SignupNum}}/{{item.LimitPeopleNum}}）</text>
+						<text v-else
+							@click="signupCancel(item.ActivityId,3,item.ActivityTime)">取消报名（{{item.SignupNum}}/{{item.LimitPeopleNum}}）</text>
+					</view>
+				</view>
+			</view>
+			<u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20" v-if="totalPage>1" />
+
+		</view>
+		<view class="nodata" v-else>
+			<image src="@/static/img/act_search.png" mode="" class="nodata_ico"></image>
+			<text>暂无日程</text>
+		</view>
+		<modalDialog :isShow="isShow" :signupType="signupType" :goFollow="goFollow" :signupStatus="signupStatus"
+			:isCancelShow="isCancelShow" :idTypeCancel="idTypeCancel" @cancelShowBtn="cancelEnsure"
+			:isShowhasPermission="isShowhasPermission" :applyForIsShow="applyForIsShow" :hasPermission="hasPermission"
+			:jurisdictionList="jurisdictionList" />
+		<areaCode :isAreaCode="isAreaCode" :areaCode="areaCode" />
+		<view class="select-box">
+			<u-popup v-model="selectShow" mode="bottom">
+				<view style="color: #333333;font-size: 28rpxrpx;">请选择参会方式</view>
+				<view style="color: #2C83FF;" @click="signupAdd('id',1)">预约外呼</view>
+				<view style="color: #2C83FF;" @click="signupAdd('id',2)">自主拨入</view>
+				<view style="color: #A9AFB8;" @click="selectShow=false">取消</view>
+			</u-popup>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		activity,
+		User
+	} from "@/config/api.js"
+	import {
+		Throttle
+	} from '@/config/util.js'
+	import modalDialog from '@/components/modalDialog.vue'
+	import areaCode from "@/components/areaCode.vue"
+	let app = getApp()
+	export default {
+		data() {
+			return {
+				tabs: [{
+						name: '全部活动',
+						id: 1
+					},
+					{
+						name: '我的日程',
+						id: 2
+					},
+				],
+				tabsActive: 0,
+				page_no: 1,
+				pageSize: 10,
+				collectList: [],
+				status: 'loadmore',
+				totalPage: '',
+				haveData: true,
+				loadText: {
+					loadmore: '上拉加载更多',
+					loading: '加载中',
+					nomore: '已经到底了'
+				},
+				listActivityStaus: [], //状态
+				listActivityType: [], //类型
+				listChartPermission: [], //分类
+				isShowJurisdiction: '',
+				activeState: '1', //活动进行状态
+				activityTypeIds: '', //活动类型id 多个用 , 隔开
+				chartPermissionIds: '', //行业id 多个用 , 隔开
+				activeStateName: '未开始',
+				chartPermissionName: '行业分类',
+				activityTypeName: '活动类型',
+				isShowJurisdiction: false,
+				isGain: true,
+				signupType: '', //关注类型
+				goFollow: false, //是否关注公众号
+				signupStatus: 'Success', //4个不同的类型提示文案
+				isShow: false, //弹框
+				isCancelShow: false,
+				idTypeCancel: {
+					id: '',
+					type: 1,
+					cutId: '',
+					state: '',
+					isNum: false
+				},
+				isId: 0,
+				isAreaCode: false,
+				areaCode: {
+					id: '',
+					type: ''
+				},
+				isNeedAddCountryCode: false,
+				selectShow: false,
+				activityIdAdd: '',
+				hasPermission: '', //是否有权限
+				jurisdictionList: {
+					SellerMobile: '',
+					PopupMsg: '',
+					OperationMode: '',
+				},
+				isShowhasPermission: false, //拨打销售电话
+				applyForIsShow: false, //潜在用户
+			}
+		},
+		watch: {
+			tabsActive() {
+
+			},
+		},
+		components: {
+			modalDialog,
+			areaCode
+		},
+		onLoad(option) {
+			this.countryCcode() //判断是否加区号
+			if (option.typeName) {
+				this.activeState = option.statesId //活动进行状态
+				this.activityTypeIds = option.typeIds //活动类型id 多个用 , 隔开
+				this.chartPermissionIds = option.chartIds //行业id 多个用 , 隔开
+				this.activeStateName = option.stateName
+				this.chartPermissionName = option.chartName
+				this.activityTypeName = option.typeName
+				this.tabsActive = option.tabs
+				this.isGain = false
+			} else {
+				this.isGain = true
+			}
+			if (this.tabsActive == 1) {
+				this.getScheduleList()
+			} else {
+				if (this.isGain) {
+					this.getList()
+				}
+				this.getUserSearchContent()
+			}
+
+		},
+		//切换tabs 刷新页面
+		onTabItemTap() {
+			this.activeStateName = '未开始'
+			this.chartPermissionName = '行业分类'
+			this.activityTypeName = '活动类型'
+			this.activeState = '1' //活动进行状态
+			this.activityTypeIds = '' //活动类型id 多个用 , 隔开
+			this.chartPermissionIds = '' //行业id 多个用 , 隔开
+			this.page_no = 1
+			this.collectList = []
+			this.getList()
+			this.getUserSearchContent()
+		},
+		methods: {
+			wanttosignup(id) {
+				this.activityIdAdd = id
+				this.selectShow = true
+			},
+			//获取列表
+			getList() {
+				activity.getActivityList({
+					PageSize: this.pageSize,
+					CurrentIndex: this.page_no,
+					ActiveState: this.activeState, //活动进行状态
+					ActivityTypeIds: this.activityTypeIds, //活动类型id 多个用 , 隔开
+					ChartPermissionIds: this.chartPermissionIds, //行业id 多个用 , 隔开
+					IsShowJurisdiction: this.isId
+				}).then(res => {
+					if (res.Ret !== 200) return
+					this.status = this.page_no < res.Data.Paging.Pages ? 'loadmore' : 'nomore';
+					this.totalPage = res.Data.Paging.Pages; //总页数
+					if (this.page_no === 1) {
+						this.collectList = res.Data.List || [];
+						this.haveData = this.collectList.length ? true : false
+						if (this.refresh) {
+							uni.stopPullDownRefresh();
+							this.refresh = false;
+						}
+					} else {
+						this.collectList.push(...res.Data.List)
+					}
+				})
+			},
+			//我的日程
+			getScheduleList() {
+				activity.getScheduleList({
+					PageSize: this.pageSize,
+					CurrentIndex: this.page_no,
+				}).then(res => {
+					if (res.Ret !== 200) return
+					this.status = this.page_no < res.Data.Paging.Pages ? 'loadmore' : 'nomore';
+					this.totalPage = res.Data.Paging.Pages; //总页数
+					if (this.page_no === 1) {
+						this.collectList = res.Data.List || [];
+						this.haveData = this.collectList.length ? true : false
+						if (this.refresh) {
+							uni.stopPullDownRefresh();
+							this.refresh = false;
+						}
+					} else {
+						this.collectList.push(...res.Data.List)
+					}
+				})
+			},
+			//获取活动详情接口
+			getUserSearchContent(name) {
+				activity.getUserSearchContent({
+					IsShowJurisdiction: this.isId
+				}).then(res => {
+					this.isShowJurisdiction = res.Data.IsShowJurisdiction
+					this.listActivityStaus = res.Data.ListActivityStaus
+					this.listActivityType = res.Data.ListActivityType
+					this.listChartPermission = res.Data.ListChartPermission || []
+					if (this.isGain) {
+						// this.preserve()
+					} else {
+						this.shareOption()
+					}
+					if (name == 'traverse') {
+						const hyArr = []
+						this.listChartPermission.forEach(key => {
+							if (key.IsChoose) {
+								hyArr.push(key.ChartPermissionId)
+							}
+						})
+
+						this.chartPermissionIds = hyArr.join(',')
+					}
+
+				})
+			},
+			shareOption() {
+				const arr = this.activeState.split(',').map(item => item - 0)
+				this.listActivityStaus.forEach(item => {
+					if (arr.indexOf(item.Id) !== -1) {
+						item.IsChoose = true
+					} else {
+						item.IsChoose = false
+					}
+				})
+
+				const hyarr = this.chartPermissionIds.split(',').map(item => item - 0)
+				this.listChartPermission.forEach(key => {
+					if (hyarr.indexOf(key.ChartPermissionId) !== -1) {
+						key.IsChoose = true
+					} else {
+						key.IsChoose = false
+					}
+				})
+				const lxarr = this.activityTypeIds.split(',').map(item => item - 0)
+				this.listActivityType.forEach(key => {
+					if (lxarr.indexOf(key.ActivityTypeId) !== -1) {
+						key.IsChoose = true
+					} else {
+						key.IsChoose = false
+					}
+				})
+				this.preserve()
+			},
+			//获取是否需要填写区号接口
+			countryCcode() {
+				User.countryCcode().then(res => {
+					if (res.Ret == 200) {
+						this.isNeedAddCountryCode = res.Data.IsNeedAddCountryCode
+					}
+				})
+			},
+			//报名
+			signupAdd(id, type) {
+				if (app.globalData.isBind && !app.globalData.isAuth) {
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+					return
+				}
+				this.selectShow = false
+				if (id == 'id') {
+					id = this.activityIdAdd
+				}
+				if (this.isNeedAddCountryCode) {
+					this.isAreaCode = true
+					this.areaCode = {
+						id,
+						type,
+					}
+				} else {
+					activity.signupAdd({
+						ActivityId: id,
+						SignupType: type,
+					}).then(res => {
+						if (res.Ret == 200) {
+							this.hasPermission = res.Data.HasPermission
+							if (this.hasPermission == 1) {
+								const index = this.collectList.findIndex(item => item.ActivityId == id)
+								this.collectList[index].SignupType = type
+								if (res.Data.GoFollow && res.Data.SignupStatus !== 'Success' || !res.Data
+									.GoFollow) {
+									this.isShow = true
+								} else {
+									this.goFollow = res.Data.GoFollow
+								}
+								this.signupType = res.Data.SignupType
+								this.signupStatus = res.Data.SignupStatus
+								this.idTypeCancel = {
+									cutId: res.Data.ActivityId,
+									state: 1
+								}
+							} else if (this.hasPermission == 2) {
+								this.jurisdictionList.SellerMobile = res.Data.SellerMobile
+								this.jurisdictionList.PopupMsg = res.Data.PopupMsg
+								this.isShowhasPermission = true
+							} else if (this.hasPermission == 3 || this.hasPermission == 4) {
+								this.jurisdictionList.PopupMsg = res.Data.PopupMsg
+								this.applyForIsShow = true
+							}
+
+
+						}
+					})
+				}
+			},
+			//取消报名
+			signupCancel(id, type, time) {
+				const str = time.replace(/-/g, '/')
+				const date = new Date(str)
+				const times = date.getTime()
+				const num = new Date().getTime()
+				if (times - num <= 3600000) {
+					uni.showModal({
+						confirmText: '知道了',
+						showCancel: false,
+						confirmColor: '#3385FF',
+						content: type == 1 ? '活动开始前1小时内无法取消预约外呼，请联系对口销售处理' : '活动开始前1小时内无法取消报名，请联系对口销售处理'
+					})
+					return
+				}
+				this.isCancelShow = true
+				this.idTypeCancel = {
+					id,
+					type,
+					cutId: '',
+					state: 0,
+					isNum: true
+				}
+			},
+			//遍历
+			preserve() {
+				const arr = []
+				const str = []
+				this.listActivityStaus.forEach(item => {
+					if (item.IsChoose) {
+						arr.push(item.Id)
+						str.push(item.StatusName)
+					}
+				})
+				if (str.length == this.listActivityStaus.length) {
+					this.activeStateName = '所有状态'
+				} else if (str.length <= 0) {
+					this.activeStateName = '活动状态'
+				} else {
+					this.activeStateName = str.join(',')
+				}
+				this.activeState = arr.join(',')
+				const hyArr = []
+				const hyStr = []
+				this.listChartPermission.forEach(key => {
+					if (key.IsChoose) {
+						hyArr.push(key.ChartPermissionId)
+						hyStr.push(key.PermissionName)
+					}
+				})
+				if (hyStr.length == this.listChartPermission.length) {
+					this.chartPermissionName = '所有行业'
+				} else if (hyStr.length <= 0) {
+					this.chartPermissionName = '行业分类'
+				} else {
+					this.chartPermissionName = hyStr.join(',')
+				}
+				this.chartPermissionIds = hyArr.join(',')
+				const lxArr = []
+				const lxStr = []
+				this.listActivityType.forEach(key => {
+					if (key.IsChoose) {
+						lxArr.push(key.ActivityTypeId)
+						lxStr.push(key.ActivityTypeName)
+					}
+				})
+				if (lxStr.length == this.listActivityType.length) {
+					this.activityTypeName = '所有活动'
+				} else if (lxStr.length <= 0) {
+					this.activityTypeName = '活动类型'
+				} else {
+					this.activityTypeName = lxStr.join(',')
+				}
+				this.activityTypeIds = lxArr.join(',')
+				this.getList()
+			},
+			//头部tabs切换
+			toggleTab(item, index) {
+				if (this.tabsActive !== index) {
+					this.tabsActive = index
+				}
+				this.page_no = 1
+				this.collectList = []
+				this.status = 'loadmore'
+				if (this.tabsActive == 0) {
+					this.getList()
+				} else {
+					this.getScheduleList()
+				}
+			},
+			//状态的下拉选择
+			overallBtn(type, item) {
+				this.listActivityStaus.forEach(key => {
+					if (key.Id == item.Id) {
+						key.IsChoose = !key.IsChoose
+					}
+				})
+			},
+			// 行业的下拉选择
+			overallClick(type, item) {
+				if (this.isShowJurisdiction) return
+				this.listChartPermission.forEach(key => {
+					if (key.ChartPermissionId == item.ChartPermissionId) {
+						key.IsChoose = !key.IsChoose
+					}
+				})
+			},
+			//类型的下拉选择
+			overallActivity(type, item) {
+				this.listActivityType.forEach(key => {
+					if (key.ActivityTypeId == item.ActivityTypeId) {
+						key.IsChoose = !key.IsChoose
+					}
+				})
+
+			},
+			/* 新布局产业选项重置按钮 */
+			replacementBtn(type) {
+				if (type == 'statusstate') {
+					this.listActivityStaus.forEach(item => item.IsChoose = false)
+					this.listActivityStaus[0].IsChoose = true
+					this.activeState = '1'
+					this.activeStateName = '未开始'
+				} else if (type == 'industry') {
+					this.chartPermissionIds = ''
+					this.isShowJurisdiction = false
+					this.isId = 2
+					this.getUserSearchContent()
+					this.listChartPermission.forEach(item => item.IsChoose = false)
+					this.chartPermissionName = '行业分类'
+				} else {
+					this.listActivityType.forEach(item => item.IsChoose = false)
+					this.activityTypeIds = ''
+					this.activityTypeName = '活动类型'
+				}
+			},
+			/* 新布局产业选项确定按钮 */
+			replacementConfirm(type) {
+				this.page_no = 1
+				if (type == 'statusstate') {
+					const arr = []
+					const str = []
+					this.listActivityStaus.forEach(key => {
+						if (key.IsChoose) {
+							arr.push(key.Id)
+							str.push(key.StatusName)
+						}
+					})
+					if (str.length == this.listActivityStaus.length) {
+						this.activeStateName = '所有状态'
+					} else if (str.length <= 0) {
+						this.activeStateName = '活动状态'
+					} else {
+						this.activeStateName = str.join(',')
+					}
+					this.activeState = arr.join(',')
+				} else if (type == 'industry') {
+					const arr = []
+					const str = []
+					this.listChartPermission.forEach(key => {
+						if (key.IsChoose) {
+							arr.push(key.ChartPermissionId)
+							str.push(key.PermissionName)
+						}
+					})
+					if (str.length == this.listChartPermission.length) {
+						this.chartPermissionName = '所有行业'
+					} else if (str.length <= 0) {
+						this.chartPermissionName = '行业分类'
+					} else {
+						this.chartPermissionName = str.join(',')
+					}
+					this.chartPermissionIds = arr.join(',')
+
+				} else {
+					const arr = []
+					const str = []
+					this.listActivityType.forEach(key => {
+						if (key.IsChoose) {
+							arr.push(key.ActivityTypeId)
+							str.push(key.ActivityTypeName)
+						}
+					})
+					if (str.length == this.listActivityType.length) {
+						this.activityTypeName = '所有活动'
+					} else if (str.length <= 0) {
+						this.activityTypeName = '活动类型'
+					} else {
+						this.activityTypeName = str.join(',')
+					}
+					this.activityTypeIds = arr.join(',')
+				}
+				this.getList()
+				this.selectComponent(`#${type}`).toggle();
+			},
+			//去往详情页面
+			goDetail(item) {
+				if (!app.globalData.isAuth && !app.globalData.isBind) { // 已授权已绑定
+					uni.navigateTo({
+						url: '/pages/activityDetail/activityDetail?id=' + item.ActivityId,
+					});
+				} else if (app.globalData.isAuth) { //未授权
+					uni.navigateTo({
+						url: '/pages/authGuide/authGuide'
+					})
+				} else if (app.globalData.isBind && !app.globalData.isAuth) { //已授权未绑定
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+				}
+			},
+			//是否展示有权限的行业
+			isJurisdiction() {
+				if (this.isShowJurisdiction) {
+					this.isId = 2
+				} else {
+					this.isId = 1
+				}
+				this.getUserSearchContent('traverse')
+			},
+			//取消弹框的确认事件
+			cancelEnsure(obj, type, unm) {
+				this.selectShow = false
+				if (this.tabsActive == 0) {
+					if (obj.cutId == 0) return
+					if (type == 1) {
+						this.collectList.forEach(item => {
+							if (obj.cutId == item.ActivityId) {
+								item.IsSignup = obj.state
+								if (unm) {
+									item.SignupNum = item.SignupNum - 1
+								} else {
+									item.SignupNum = item.SignupNum + 1
+								}
+							}
+						})
+					} else {
+						this.collectList.forEach(item => {
+							if (obj.cutId == item.ActivityId) {
+								item.IsSignup = obj.state
+								if (unm) {
+									item.SignupNum = item.SignupNum - 1
+								} else {
+									item.SignupNum = item.SignupNum + 1
+								}
+							}
+						})
+					}
+
+				} else {
+					this.getScheduleList()
+				}
+			},
+			//搜索事件
+			goSearch() {
+				/*  */
+				this.$store.dispatch('checkHandle').then(res => {
+					app.globalData.isAuth = res.IsAuth;
+					app.globalData.isBind = res.IsBind;
+					if ((!res.IsAuth) && (!res.IsBind)) { //已授权已绑定
+						uni.navigateTo({
+							url: '/pages/activitySearch/activitySearch',
+						});
+					} else if (res.IsAuth) { //未授权
+						uni.navigateTo({
+							url: '/pages/authGuide/authGuide'
+						})
+					} else if (res.IsBind && !res.IsAuth) { //已授权未绑定
+						uni.navigateTo({
+							url: '/pages/login/login'
+						})
+					}
+				})
+			},
+			//添加会议提醒接口
+			meetingReminderAdd(id) {
+				if (app.globalData.isBind && !app.globalData.isAuth) {
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+					return
+				}
+				activity.meetingReminderAdd({
+					ActivityId: id
+				}).then(res => {
+					if (res.Ret == 200) {
+						this.hasPermission = res.Data.HasPermission
+						if (this.hasPermission == 1) {
+							uni.showModal({
+								confirmText: '知道了',
+								confirmColor: '#3385FF',
+								content: res.Msg,
+								showCancel: false,
+								success: (res) => {
+
+									this.collectList.forEach(item => {
+										if (id == item.ActivityId) {
+											item.IsCancelMeetingReminder = 1
+										}
+									})
+								}
+							})
+						} else if (this.hasPermission == 2) {
+							this.jurisdictionList.SellerMobile = res.Data.SellerMobile
+							this.jurisdictionList.PopupMsg = res.Data.PopupMsg
+							this.isShowhasPermission = true
+						} else if (this.hasPermission == 3 || this.hasPermission == 4) {
+							this.jurisdictionList.PopupMsg = res.Data.PopupMsg
+							this.applyForIsShow = true
+						}
+
+					}
+				})
+			},
+			//取消会议提醒接口
+			meetingReminderCancel(id) {
+				activity.meetingReminderCancel({
+					ActivityId: id
+				}).then(res => {
+					if (res.Ret == 200) {
+						uni.showModal({
+							confirmText: '知道了',
+							confirmColor: '#3385FF',
+							content: res.Msg,
+							showCancel: false,
+							success: (res) => {
+								if (res.confirm) {
+									this.collectList.forEach(item => {
+										if (id == item.ActivityId) {
+											item.IsCancelMeetingReminder = 0
+										}
+									})
+								}
+							}
+						})
+					}
+				})
+			},
+			authentication() {
+				/*  */
+				this.$store.dispatch('checkHandle').then(res => {
+					app.globalData.isAuth = res.IsAuth;
+					app.globalData.isBind = res.IsBind;
+				})
+			}
+
+		},
+		onShow() {
+			this.authentication()
+		},
+		/**
+		 * 用户点击分享
+		 */
+		onShareAppMessage: function(res) {
+			return {
+				title: '活动',
+				path: '/pages/activity/activity?statesId=' + this.activeState + '&typeIds=' + this.activityTypeIds +
+					'&chartIds=' + this.chartPermissionIds + '&stateName=' + this.activeStateName + '&chartName=' +
+					this.chartPermissionName + '&typeName=' + this.activityTypeName + '&tabs=' + this.tabsActive,
+				success: (res) => {},
+				fail: (err) => {}
+			}
+		},
+		/* 触底 */
+		onReachBottom: Throttle(function() {
+			if (this.status === 'nomore') return;
+			this.status = 'loading';
+			this.page_no++;
+			if (this.tabsActive == 0) {
+				this.getList()
+			} else {
+				this.getScheduleList()
+			}
+		}),
+		/* 下拉刷新 */
+		onPullDownRefresh: Throttle(function() {
+			this.page_no = 1;
+			this.refresh = true;
+			if (this.tabsActive == 0) {
+				this.getList()
+			} else {
+				this.getScheduleList()
+			}
+		}),
+	}
+</script>
+
+<style scoped lang="scss">
+	.activity-content {
+		background-color: #F7F7F7;
+
+		.top-content {
+			width: 100%;
+			background-color: #fff;
+			padding: 0 30rpx;
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 999;
+
+			.tab {
+				display: flex;
+				font-size: 32rpx;
+				color: #707070;
+
+				.tab-item {
+					flex: 1;
+					text-align: center;
+
+					.scroll-tab-item {
+						height: 78rpx;
+						line-height: 48rpx;
+						position: relative;
+
+						.border_act {
+							position: absolute;
+							height: 6rpx;
+							width: 340rpx;
+							left: 0;
+							bottom: 0rpx;
+						}
+					}
+
+					.active {
+						color: #3385FF;
+						font-weight: bold;
+						font-size: 34rpx;
+					}
+
+					image {}
+				}
+			}
+
+			.index-fixed {
+				margin-top: 40rpx;
+				width: 100%;
+				display: flex;
+				align-items: center;
+				height: 70rpx;
+				background: #F6F6F6;
+				border: 1rpx solid #E5E5E5;
+				opacity: 1;
+				border-radius: 35rpx;
+				padding-left: 34rpx;
+				color: #8D8D8D;
+				font-size: 24rpx;
+
+				.search_ico {
+					padding-right: 16rpx;
+				}
+			}
+
+			.select-conyent {
+				margin-top: 10rpx;
+
+				.decide {
+					background-color: #F8F8FA;
+					display: flex;
+					align-items: center;
+					margin: 0 auto;
+					height: 110rpx;
+					width: 100%;
+					padding-left: 30rpx;
+				}
+
+				.items-box {
+					width: 40rpx;
+				}
+
+				.menu-items {
+					background-color: #F8F8FA;
+					width: 100%;
+					display: flex;
+					flex-wrap: wrap;
+					padding: 30rpx 30rpx 0;
+
+					.menu-items-box {
+						display: flex;
+						width: 50%;
+						font-size: 28rpx;
+						font-weight: 400;
+						margin-bottom: 40rpx;
+
+					}
+				}
+
+				.replacement-box {
+					background-color: #fff;
+					padding-bottom: 40rpx;
+					border-radius: 0rpx 0rpx 16rpx 16rpx;
+				}
+
+				.replacement {
+					margin: 0rpx 30rpx 20rpx;
+					display: flex;
+					background-color: #2C83FF;
+					opacity: 1;
+					height: 60rpx;
+					line-height: 58rpx;
+					font-size: 28rpx;
+					font-weight: 400;
+					color: #FFFFFF;
+					border-radius: 30rpx;
+
+					text {
+						flex: 1;
+						text-align: center;
+
+					}
+
+					.replacement-box {
+						border: 1rpx solid #2C83FF;
+						opacity: 1;
+						color: #2C83FF;
+						background: #FFFFFF;
+						border-radius: 28rpx 0rpx 28rpx 28rpx;
+					}
+				}
+			}
+		}
+
+		.head {
+			padding-top: 80rpx !important;
+		}
+
+		.menu-dashed {
+			margin: 0 auto;
+			width: 682rpx;
+			border-bottom: 2rpx solid #E5E5E5;
+		}
+
+		.box-content {
+			padding: 300rpx 34rpx 20rpx;
+			background-color: #F7F7F7;
+
+			.content-list {
+				box-sizing: border-box;
+				overflow: hidden;
+				margin-top: 30rpx;
+				// height: 396rpx;
+				width: 100%;
+				background: #FFFFFF;
+				box-shadow: 0px 3rpx 6rpx rgba(141, 141, 141, 0.16);
+				border-radius: 16rpx;
+				font-size: 28rpx;
+
+				.list-top {
+					margin: 0 30rpx;
+					display: flex;
+					justify-content: space-between;
+					border-bottom: 1rpx solid #E5E5E5;
+					height: 82rpx;
+					line-height: 82rpx;
+					color: #333333;
+					font-size: 32rpx;
+
+					.list-top-box {
+						display: flex;
+
+						.title {
+							color: #333333;
+							font-size: 30rpx;
+							font-weight: bold;
+						}
+					}
+
+					.city {
+						margin-left: 40rpx;
+						display: flex;
+						color: #3385FF;
+						align-items: center;
+						font-size: 26rpx;
+
+						image {
+							width: 27rpx;
+							height: 32rpx;
+							margin-right: 12rpx;
+						}
+					}
+				}
+
+				.list-center {
+					width: 100%;
+					color: #333333;
+
+					.title {
+						padding: 20rpx 30rpx 24rpx 30rpx;
+						line-height: 46rpx;
+						color: #333;
+						font-size: 28rpx;
+						font-weight: bold;
+						text-indent: -14rpx
+					}
+
+					.title-two {
+						padding-left: 30rpx;
+						padding-bottom: 24rpx;
+						padding-top: 20rpx;
+						line-height: 46rpx;
+						color: #333;
+						font-size: 28rpx;
+						font-weight: bold;
+					}
+
+					text {
+						padding-left: 30rpx;
+					}
+
+					.setting-center {
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						padding-right: 30rpx;
+
+						.box-expert {
+							margin-left: 30rpx;
+							display: flex;
+
+						}
+					}
+				}
+
+				.list-bottom {
+					height: 80rpx;
+
+					// border-top: 1px solid #E5E5E5;
+					.multi {
+						display: flex;
+						text-align: center;
+						line-height: 80rpx;
+						color: #3385FF;
+
+						text {
+							width: 50%;
+						}
+
+						.multi-outbound {
+							background: #3385FF;
+							color: #FFFFFF;
+							border-radius: 0px 0px 0px 16rpx;
+						}
+
+						.multi-remind {
+							background: #EBF4FF;
+							color: #3385FF;
+							border-radius: 0px 0px 16rpx 0px;
+						}
+					}
+
+					.multi-text {
+						line-height: 80rpx;
+						color: #FFFFFF;
+						width: 100%;
+						text-align: center;
+						background: #3385FF;
+						opacity: 1;
+						border-radius: 0px 0px 16rpx 16rpx;
+					}
+				}
+			}
+		}
+
+		.nodata {
+			padding-top: 350rpx;
+
+			image {
+				width: 374rpx;
+				height: 288rpx;
+			}
+		}
+
+		.select-box {
+			width: 100%;
+
+			view {
+				height: 95prx;
+				line-height: 95rpx;
+				text-align: center;
+				font-size: 32rpx;
+				border-bottom: 1rpx solid #EBEBEB;
+				;
+			}
+		}
+
+		/deep/.van-dropdown-menu {
+			background-color: #fff;
+			box-shadow: none !important;
+			padding-top: 20rpx;
+		}
+
+		/deep/.van-dropdown-menu__item {
+			box-sizing: border-box;
+			width: 190rpx;
+			margin-right: 40rpx;
+			padding-right: 20rpx;
+			height: 51rpx;
+			border-radius: 26rpx;
+			background: #F8F8FA;
+		}
+
+		/deep/.van-dropdown-item {
+			margin-top: -10rpx;
+		}
+
+		/deep/[data-index='2'] {
+			margin-right: 0rpx;
+		}
+
+		/deep/ .van-ellipsis {
+			font-size: 24rpx;
+		}
+	}
 </style>

pages/activityDetail/activityDetail.vue

@@ -1,173 +1,484 @@
-<template>
-	<view class="activity-detail">
-		<view class="notice" v-if="detailData.IsLimitPeople==1">
-		<van-notice-bar color="#FFFFFF"  background="#FE9000"  text="该活动参与名额有限，报名客户请按时参加，爽约会影响您的后续报名资格"/>
-		</view>
-		<view class="content">
-			 <view v-if="detailData.ActivityName" class="dialog-title">{{detailData.ActivityName}}</view>
-			      <view class="city-box">
-			      	<text v-if="detailData.ActivityTypeName">活动类型：{{detailData.ActivityTypeName}}</text>
-			      	<view class="city">
-			      		<image src="../../static/img/advice_ico.png" mode=""></image>
-						<text>城市{{detailData.City}}</text>
-			      	</view>
-			      </view>
-				   <text v-if="detailData.ChartPermissionName">所属行业：{{detailData.ChartPermissionName}}</text>
-			        <text v-if="detailData.ActivityTimeText">活动时间：{{detailData.ActivityTimeText}}</text>
-			        <text v-if="detailData.DistinguishedGuest">嘉&nbsp;&nbsp; &nbsp; &nbsp;宾：{{detailData.DistinguishedGuest}}</text>
-			        <text v-if="detailData.Host">主&nbsp; 持&nbsp; 人：{{detailData.Host}}</text>
-			        <text v-if="detailData.Expert">专&nbsp;&nbsp; &nbsp; &nbsp;家：{{detailData.Expert}}</text>
-			        <text v-if="detailData.City">城&nbsp;&nbsp; &nbsp; &nbsp;市：{{detailData.City}}</text>
-			        <view v-if="detailData.MainlandTell">大陆拨入：
-					<text class="phone" @click="phonebtn(detailData.MainlandTell)">{{detailData.MainlandTell}}</text>
-					</view>
-			        <view v-if="detailData.HongKongTell">香港拨入：
-					<text @click="phonebtn(detailData.HongKongTell)" class="phone">{{detailData.HongKongTell}}</text>
-					</view>
-			        <view v-if="detailData.TaiwanTell">台湾拨入：
-					<text @click="phonebtn(detailData.TaiwanTell)" class="phone">{{detailData.TaiwanTell}}</text>
-					</view>
-			        <view v-if="detailData.AmericaTell">美国拨入：
-					<text @click="phonebtn(detailData.AmericaTell)" class="phone">{{detailData.AmericaTell}}</text>
-					</view>
-			        <text v-if="detailData.ReportLink">报告链接：{{detailData.ReportLink}}</text>
-			        <text v-if="detailData.OnlineParticipation">网络参会：{{detailData.OnlineParticipation}}</text>
-			        <text v-if="detailData.OnlineParticipation">参会密码：{{detailData.OnlineParticipation}}</text>
-			        <text v-if="detailData.Address">活动地址：{{detailData.Address}}</text>
-			        <text v-if="detailData.Highlights">活动亮点：{{detailData.Highlights}}</text>
-			        <text v-if="detailData.Theme">主&nbsp;&nbsp; &nbsp; &nbsp;题：{{detailData.Theme}}</text>
-			        <text v-if="detailData.Remarks">备&nbsp;&nbsp; &nbsp; &nbsp;注：{{detailData.Remarks}}</text>
-		</view>
-		<view class="content-bottom">
-			<view class="make-outbound">
-				预约外呼
-			</view>
-			<view class="make-outbound">
-				取消外呼
-			</view>
-			<view class="make-conference">
-				会议提醒
-				<text>(会前15分钟推送微信消息提醒)</text>
-			</view>
-			<view class="make-conference">
-				取消会议提醒
-				<text>(会前15分钟推送微信消息提醒)</text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {activity} from "@/config/api.js"
-	export default {
-		data() {
-			return {
-				id:10,
-				detailData:{}
-			}
-		},
-		methods: {
-			getActivityDetail(){
-				activity.getActivityDetail({
-					ActivityId:this.id
-				}).then(res =>{
-					if(res.Ret==200){
-						this.detailData=res.Data
-					}
-					console.log(res);
-				})
-			},
-			phonebtn(phone) {
-				console.log(11);
-				console.log(phone);
-				uni.makePhoneCall({
-				    phoneNumber:phone
-				});
-			},
-		},
-		onLoad(option) {
-			// this.id=option.id
-			this.getActivityDetail()
-		}
-	}
-</script>
-
-<style lang="scss">
-	.activity-detail {
-		.notice {
-			height: 60rpx;
-			width: 100%;
-		}
-		.content {
-			padding: 34rpx;
-			color: #333333;
-			font-size: 28rpx;
-			view{padding-left:20rpx ;}
-			text {
-				line-height: 80rpx;
-				padding-left:20rpx ;
-			}
-			.phone {
-				padding: 0;
-				display: inline-block;
-				color: #2C83FF;
-			}
-			.dialog-title {
-				width: 682rpx;
-				padding:20rpx 0;
-				background: #F2F2F2;
-				opacity: 0.8;
-				font-size: 30rpx; 
-				font-weight: bold; 
-				margin-bottom: 15rpx;
-			}
-			.city-box {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				text {
-					padding: 0;
-				}
-				.city {
-					display: flex;
-					color: #2088FF;
-					align-items: center;
-					image {
-						width: 27rpx;
-						height: 32rpx;
-						margin-right:12rpx;
-					}
-				}
-			}
-		}
-		.content-bottom {
-			margin: 30rpx 0;
-			.make-outbound {
-				margin: 0 auto;
-				width: 368rpx;
-				height: 80rpx;
-				background: linear-gradient(268deg, #2DDBFF 0%, #1599FF 49%, #005EFF 100%);
-				opacity: 1;
-				border-radius: 4rpx;
-				color: #FFFFFF;
-				font-size: 34rpx;
-				line-height: 80rpx;
-				text-align: center;
-			}
-			.make-conference {
-				margin: 30rpx auto ;
-				width: 368rpx;
-				height: 80rpx;
-				border: 2px solid #2C83FF;
-				opacity: 1;
-				border-radius: 4rpx;
-				padding-top: 10rpx;
-				text-align: center;
-				color: #2C83FF;
-				text {
-					font-size: 16rpx;
-				}
-			}
-		}
-	}
+<template>
+	<view class="activity-detail">
+		<view class="" v-if="haveAuth==1">
+			<view class="notice" v-if="detailData.IsLimitPeople==1">
+				<van-notice-bar color="#FFFFFF" background="#FE9000"
+					text="该活动参与名额有限，报名客户请按时参加，若不能及时参加请联系销售取消，爽约会影响您的后续报名资格" />
+			</view>
+			<view class="content">
+				<view v-if="detailData.ActivityName" class="dialog-title">{{detailData.ActivityName}}</view>
+				<view class="city-box">
+					<text v-if="detailData.ActivityTypeName">活动类型：{{detailData.ActivityTypeName}}</text>
+					<view class="city" v-if="detailData.City">
+						<image src="../../static/img/location.png" mode=""></image>
+						<text>{{detailData.City}}</text>
+					</view>
+				</view>
+				<text v-if="detailData.ChartPermissionName">所属行业：{{detailData.ChartPermissionName}}</text>
+				<text v-if="detailData.ActivityTimeText">活动时间：{{detailData.ActivityTimeText}}</text>
+				<text v-if="detailData.DistinguishedGuest">嘉&nbsp;&nbsp; &nbsp;
+					&nbsp;宾：{{detailData.DistinguishedGuest}}</text>
+				<text v-if="detailData.Host">主&nbsp; 持&nbsp; 人：{{detailData.Host}}</text>
+				<text v-if="detailData.Expert">专&nbsp;&nbsp; &nbsp; &nbsp;家：{{detailData.Expert}}</text>
+				<text v-if="detailData.City">城&nbsp;&nbsp; &nbsp; &nbsp;市：{{detailData.City}}</text>
+				<view v-if="detailData.MainlandTell">大陆拨入：
+					<text class="phone" @click="phonebtn(detailData.MainlandTell)">{{detailData.MainlandTell}}</text>
+				</view>
+				<view v-if="detailData.HongKongTell">香港拨入：
+					<text @click="phonebtn(detailData.HongKongTell)" class="phone">{{detailData.HongKongTell}}</text>
+				</view>
+				<view v-if="detailData.TaiwanTell">台湾拨入：
+					<text @click="phonebtn(detailData.TaiwanTell)" class="phone">{{detailData.TaiwanTell}}</text>
+				</view>
+				<view v-if="detailData.AmericaTell">美国拨入：
+					<text @click="phonebtn(detailData.AmericaTell)" class="phone">{{detailData.AmericaTell}}</text>
+
+				</view>
+				<text v-if="detailData.ReportLink">报告链接：{{detailData.ReportLink}}</text>
+
+				<text
+					v-if="detailData.OnlineParticipation">拨入密码：{{detailData.IsSignup==1?detailData.OnlineParticipation:'请报名获取'}}</text>
+			</view>
+
+			<view class="network" v-if="detailData.OnlineParticipation">
+				<view class="network-left">网络参会：{{detailData.OnlineParticipation}} </view>
+				<view class="network-right" @click="networkBtn" style="color: #2C83FF;">
+					{{detailData.OnlineParticipation}}
+				</view>
+			</view>
+			<view v-if="detailData.Address" class="network">
+				<view class="network-left">活动地址：</view>
+				<view class="network-right" v-if="detailData.IsSignup==0 && detailData.ActivityTypeName=='公司线下调研'">请报名获取
+				</view>
+				<view class="network-right" v-else>{{detailData.Address}}</view>
+			</view>
+			<view v-if="detailData.Highlights" class="network">
+				<view class="network-left">活动亮点： </view>
+				<view class="network-right">{{detailData.Highlights}}
+				</view>
+			</view>
+			<view v-if="detailData.Theme" class="network">
+				<view class="network-left">主&nbsp;&nbsp; &nbsp; &nbsp;题： </view>
+				<view class="network-right">{{detailData.Theme}}
+				</view>
+			</view>
+			<view v-if="detailData.Remarks" class="network">
+				<view class="network-left">备&nbsp;&nbsp; &nbsp; &nbsp;注： </view>
+				<view class="network-right">{{detailData.Remarks}}
+				</view>
+			</view>
+			<view class="network" v-if="detailData.ReportLink">
+				<view class="network-left">相关报告：</view>
+				<view class="network-right" style="color: #2C83FF;" @click="goDetail">
+					查看报告链接
+				</view>
+			</view>
+			<view class="" style="height: 50rpx;"></view>
+			<view>
+
+				<view class="content-bottom"
+					v-if="detailData.ActivityTypeId==1||detailData.ActivityTypeId==2||(detailData.ActivityTypeId==3&&detailData.IsLimitPeople==0)||(detailData.IsLimitPeople==0 && detailData.ActivityTypeName=='公司线下调研')">
+					<view class="" v-if="detailData.ActiveState==1">
+						<view class="make-outbound" @click="signupCancel(1)" v-if="detailData.IsSignup==1">
+							取消外呼
+						</view>
+						<view class="make-outbound" v-else @click="signupAdd(1)">
+							预约外呼
+						</view>
+						<view @click="meetingReminderCancel" class="make-conference"
+							v-if="detailData.IsCancelMeetingReminder==1">
+							取消会议提醒
+							<text>(会前15分钟推送微信消息提醒)</text>
+						</view>
+						<view @click="meetingReminderAdd" class="make-conference" v-else>
+							会议提醒
+							<text>(会前15分钟推送微信消息提醒)</text>
+						</view>
+					</view>
+				</view>
+				<view class="bottom-env" v-else>
+					<view class="apply-box" v-if="detailData.ActiveState==1">
+						<view class="cancel-apply">
+							报名人数：<text>{{detailData.SignupNum}}</text>/{{detailData.LimitPeopleNum}}
+						</view>
+						<view v-if="detailData.IsSignup==0" class="ok-apply" @click="wanttosignup">
+							{{detailData.SignupType==1?'预约外呼':'我要报名'}}
+						</view>
+						<view v-else class="ok-apply" @click="signupCancel(2)">
+							{{detailData.SignupType==1?'取消外呼':'取消报名'}}
+						</view>
+					</view>
+				</view>
+				<view class="select-box">
+					<u-popup v-model="selectShow" mode="bottom">
+						<view style="color: #333333;font-size: 28rpxrpx;">请选择参会方式</view>
+						<view style="color: #2C83FF;" @click="signupAdd(1)">预约外呼</view>
+						<view style="color: #2C83FF;" @click="signupAdd(2)">自主拨入</view>
+						<view style="color: #A9AFB8;" @click="selectShow=false">取消</view>
+					</u-popup>
+				</view>
+			</view>
+			<modalDialog :isShow="isShow" :signupType="signupType" :goFollow="goFollow" :signupStatus="signupStatus"
+				:isCancelShow="isCancelShow" :idTypeCancel="idTypeCancel" @cancelShowBtn="cancelEnsure" />
+			<areaCode :isAreaCode="isAreaCode" :areaCode="areaCode" />
+		</view>
+		<view v-else>
+			<jurisdiction :haveAuth="haveAuth" :industryMsg="industryMsg" :sellerMobile="sellerMobile"></jurisdiction>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		activity,
+		User
+	} from "@/config/api.js"
+	import modalDialog from '@/components/modalDialog.vue'
+	import jurisdiction from "./jurisdiction/components.vue"
+	let app = getApp()
+	export default {
+		data() {
+			return {
+				id: '',
+				detailData: {},
+				isShowJurisdiction: false,
+				isGain: true,
+				signupType: '', //关注类型
+				goFollow: false, //是否关注公众号
+				signupStatus: 'Success', //4个不同的类型提示文案
+				isShow: false, //弹框
+				isCancelShow: false,
+				idTypeCancel: {
+					id: '',
+					type: 1,
+					cutId: '',
+					state: ''
+				},
+				selectShow: false,
+				isAreaCode: false,
+				areaCode: {
+					id: '',
+					type: ''
+				},
+				isNeedAddCountryCode: false,
+				haveAuth: '',
+				industryMsg: '',
+				sellerMobile: ''
+			}
+		},
+		components: {
+			modalDialog,
+			jurisdiction
+		},
+		methods: {
+			//获取是否需要填写区号接口
+			countryCcode() {
+				User.countryCcode().then(res => {
+					if (res.Ret == 200) {
+						this.isNeedAddCountryCode = res.Data.IsNeedAddCountryCode
+					}
+				})
+			},
+			getActivityDetail() {
+				activity.getActivityDetail({
+					ActivityId: this.id
+				}).then(res => {
+					if (res.Ret == 200) {
+						this.haveAuth = res.Data.HasPermission
+						this.industryMsg = res.Data.PopupMsg.split('：', 1)
+						this.sellerMobile = res.Data.SellerMobile
+						if (res.Data.HasPermission == 1) {
+							console.log(11);
+							this.detailData = res.Data.Detail
+							console.log(res.Data.Detail);
+							console.log(this.detailData);
+							let pages = getCurrentPages()
+							let prevPage = pages[pages.length - 2]
+							const index = prevPage.$vm.collectList.findIndex(item => item.ActivityId == this.id)
+							prevPage.$vm.collectList[index].IsSignup = this.detailData.IsSignup
+							prevPage.$vm.collectList[index].SignupNum = this.detailData.SignupNum
+							prevPage.$vm.collectList[index].IsCancelMeetingReminder = this.detailData
+								.IsCancelMeetingReminder
+						}
+					}
+				})
+			},
+			phonebtn(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone
+				});
+			},
+			//报名
+			signupAdd(type) {
+				if (this.isNeedAddCountryCode) {
+					this.isAreaCode = true
+					this.areaCode = {
+						id,
+						type
+					}
+				} else {
+					activity.signupAdd({
+						ActivityId: Number(this.id),
+						SignupType: type,
+					}).then(res => {
+						if (res.Ret == 200) {
+							if (res.Data.GoFollow && res.Data.SignupStatus !== 'Success' || !res.Data.GoFollow) {
+								this.isShow = true
+							} else {
+								this.goFollow = res.Data.GoFollow
+							}
+							this.signupType = res.Data.SignupType
+							this.signupStatus = res.Data.SignupStatus
+							this.idTypeCancel = {
+								cutId: res.Data.ActivityId,
+								state: 1
+							}
+
+						}
+					})
+				}
+				this.selectShow = false
+			},
+			//取消报名
+			signupCancel(type) {
+				this.isCancelShow = true
+				this.idTypeCancel = {
+					id: Number(this.id),
+					type,
+					cutId: '',
+					state: 0
+				}
+			},
+			networkBtn() {
+				uni.navigateTo({
+					url: '/pages/networkAttend/networkAttend?url=' + this.detailData.OnlineParticipation,
+				})
+			},
+			cancelEnsure() {
+				this.getActivityDetail()
+
+			},
+			goDetail() {
+				uni.navigateTo({
+					url: '/pages/reportDetail/reportDetail?idReport=' + this.detailData.ReportLink,
+				})
+			},
+			meetingReminderAdd() {
+				activity.meetingReminderAdd({
+					ActivityId: Number(this.id)
+				}).then(res => {
+					if (res.Ret == 200) {
+						uni.showModal({
+							confirmText: '知道了',
+							confirmColor: '#3385FF',
+							content: res.Msg,
+							showCancel: false,
+							success: (res) => {
+								if (res.confirm) {
+									this.getActivityDetail()
+								}
+							}
+						})
+					}
+				})
+			},
+			//取消会议提醒接口
+			meetingReminderCancel() {
+				activity.meetingReminderCancel({
+					ActivityId: Number(this.id)
+				}).then(res => {
+					if (res.Ret == 200) {
+						uni.showModal({
+							confirmText: '知道了',
+							confirmColor: '#3385FF',
+							content: res.Msg,
+							showCancel: false,
+							success: (res) => {
+								if (res.confirm) {
+									this.getActivityDetail()
+								}
+							}
+						})
+					}
+				})
+
+			},
+			wanttosignup() {
+				if (this.detailData.IsLimitPeople == 1 && this.detailData.ActivityTypeName == '公司调研电话会') {
+					this.selectShow = true
+				} else {
+					this.signupAdd(3)
+				}
+			},
+		},
+		onLoad(option) {
+			this.id = option.id
+			this.countryCcode()
+			this.getActivityDetail()
+		}
+	}
+</script>
+
+<style lang="scss">
+	.activity-detail {
+		padding-bottom: 100rpx;
+
+		.notice {
+			height: 60rpx;
+			width: 100%;
+		}
+
+		.content {
+			padding: 34rpx 34rpx 0rpx;
+			margin-bottom: -20rpx;
+			color: #333333;
+			font-size: 28rpx;
+
+			view {
+				padding-left: 20rpx;
+			}
+
+			text {
+				line-height: 80rpx;
+				padding-left: 20rpx;
+			}
+
+			.phone {
+				padding: 0;
+				display: inline-block;
+				color: #2C83FF;
+			}
+
+			.dialog-title {
+				width: 682rpx;
+				padding: 20rpx 0;
+				background: #F2F2F2;
+				opacity: 0.8;
+				font-size: 30rpx;
+				font-weight: bold;
+				margin-bottom: 15rpx;
+			}
+
+			.city-box {
+				display: flex;
+				align-items: center;
+
+				text {
+					padding: 0;
+				}
+
+				.city {
+					display: flex;
+					color: #2088FF;
+					align-items: center;
+
+					image {
+						width: 27rpx;
+						height: 32rpx;
+						margin-right: 12rpx;
+					}
+				}
+			}
+
+		}
+
+		.network {
+			margin-top: 30rpx;
+			display: flex;
+			padding-left: 54rpx;
+
+			.network-left {
+				width: 150rpx;
+			}
+
+			.network-right {
+				width: 480rpx;
+			}
+		}
+
+		.content-bottom {
+			margin: 50rpx 0 30rpx;
+
+			.make-outbound {
+				margin: 0 auto;
+				width: 368rpx;
+				height: 80rpx;
+				background: linear-gradient(268deg, #2DDBFF 0%, #1599FF 49%, #005EFF 100%);
+				opacity: 1;
+				border-radius: 4rpx;
+				color: #FFFFFF;
+				font-size: 34rpx;
+				line-height: 80rpx;
+				text-align: center;
+			}
+
+			.make-conference {
+				margin: 30rpx auto;
+				width: 368rpx;
+				height: 80rpx;
+				border: 2px solid #2C83FF;
+				opacity: 1;
+				border-radius: 4rpx;
+				padding-top: 10rpx;
+				text-align: center;
+				color: #2C83FF;
+
+				text {
+					font-size: 16rpx;
+				}
+			}
+		}
+
+		.bottom-env {
+			position: fixed;
+			bottom: 0;
+			padding-bottom: constant(safe-area-inset-bottom);
+			padding-bottom: env(safe-area-inset-bottom);
+			left: 0;
+			width: 100%;
+			background-color: #FFFFFF;
+		}
+
+		.apply-box {
+			width: 100%;
+			height: 100rpx;
+			display: flex;
+			font-size: 32rpx;
+			color: #333333;
+			line-height: 100rpx;
+
+			.cancel-apply {
+				display: flex;
+				padding-left: 50rpx;
+				flex: 1;
+				border: 2rpx solid #005eff;
+				background-color: #fff;
+
+				text {
+					color: #005EFF;
+				}
+			}
+
+			.ok-apply {
+				flex: 1;
+				background: linear-gradient(268deg, #2DDBFF 0%, #1599FF 49%, #005EFF 100%);
+				text-align: center;
+				color: #FFFFFF;
+			}
+		}
+
+		.select-box {
+			width: 100%;
+
+			view {
+				height: 95prx;
+				line-height: 95rpx;
+				text-align: center;
+				font-size: 32rpx;
+				border-bottom: 1rpx solid #EBEBEB;
+				;
+			}
+		}
+
+	}
 </style>

pages/activityDetail/jurisdiction/components.vue

@@ -0,0 +1,138 @@
+<template>
+	<view class="noauth-cont" v-if="haveAuth===2||haveAuth===3||haveAuth===4">
+		<image src="@/static/img/noauth.png" class="noauth-ico"></image>
+		<block v-if="haveAuth==3">
+			<view class="tip">{{industryMsg}}</view>
+			<view class="btn-cont" @click="applyAuth">
+				立即申请
+			</view>
+		</block>
+		<block v-if="haveAuth==4">
+			<view class="tip">{{industryMsg}}</view>
+			<view class="btn-cont" @click="applyAuth">
+				立即申请
+			</view>
+		</block>
+		<view class="tip" v-if="haveAuth===2">
+			<text>
+				{{industryMsg}}:
+			</text>
+			<text @click="callPhone(sellerMobile)"><text style="color:#D4BF86;">{{sellerMobile}}</text></text>
+		</view>
+		<view class="btn-cont back-btn" @click="backIndex"> 返回</view>
+	</view>
+</template>
+
+<script>
+	import {
+		User
+	} from '@/config/api.js'
+	export default {
+		props: {
+			haveAuth: {
+				type: Number,
+				required: true
+			},
+			industryMsg: {
+				type: String,
+				required: true
+			},
+			sellerMobile: {
+				type: String,
+				required: true
+			}
+		},
+		data() {
+			return {
+
+			};
+		},
+		methods: {
+			/* 无权限申请开通权限 */
+			applyAuth() {
+				/* 区分是否是潜在用户 */
+				this.haveAuth === 3 ?
+					uni.navigateTo({
+						url: "/pages/applyTrial/applyTrial"
+					}) :
+					uni.showModal({
+						title: '',
+						content: '您已经提交过申请了，请耐心等待',
+						showCancel: false,
+						confirmColor: '#3385FF',
+						success: function(res) {}
+					});
+			},
+			// 返回首頁
+			backIndex() {
+				uni.navigateBack()
+			},
+			callPhone(num) {
+				uni.makePhoneCall({
+					phoneNumber: num
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.noauth-cont {
+		padding-top: 150rpx;
+		text-align: center;
+		font-size: 28rpx;
+
+		.noauth-ico {
+			width: 365rpx;
+			height: 229rpx;
+			margin-bottom: 70rpx;
+		}
+
+		.tip {
+			width: 532rpx;
+			margin: 0 auto 100rpx;
+
+			.contract {
+				padding: 40rpx 90rpx 0;
+				line-height: 44rpx;
+
+				text {
+					display: inline-block;
+				}
+			}
+		}
+
+		.btn-cont {
+			width: 368rpx;
+			height: 80rpx;
+			// position: relative;
+			background: linear-gradient(268deg, #2DDBFF 0%, #1599FF 49%, #005EFF 100%);
+			color: #fff;
+			font-size: 34rpx;
+			margin: 0 auto;
+			text-align: center;
+			line-height: 80rpx;
+
+			&.back-btn {
+				background: linear-gradient(268deg, #2DDBFF 0%, #1599FF 49%, #005EFF 100%) !important;
+				// border: 2rpx solid #3385FF;
+				color: #fff;
+				margin-top: 30rpx;
+			}
+
+			.btn_bg {
+				width: 100%;
+				height: 80rpx;
+				position: absolute;
+				left: 0;
+				top: 0;
+			}
+
+			.btn-txt {
+				width: 100%;
+				position: absolute;
+				z-index: 1;
+			}
+		}
+	}
+</style>

pages/activitySearch/activitySearch.vue

@@ -0,0 +1,1189 @@
+<template>
+	<view class="container activity-content">
+		<!-- tabs -->
+		<view class="top-content">
+			<!-- 搜索 -->
+			<view class="searchTarget-header">
+				<input type="text" placeholder="请输入关键字" placeholder-class="sea_ipt_placeholder" class="sea_ipt"
+					v-model="searchTxt" focus="true" confirm-type="search" @confirm="searchHandle" />
+				<icon type="search" size="15" class="sea_ico" />
+				<view class="ipt-right">
+					<icon type="clear" size="16" color="#E0E0E0" v-show="searchTxt" @click="clearIpt" />
+					<text class="line">|</text>
+					<text @click="searchHandle" style="color: #3385FF;">搜索</text>
+				</view>
+			</view>
+			<view class="search-cont-top" v-if="!isShowSearch&&historySearchList.length">
+				<view class="cont-tit">
+					<text>搜索历史</text>
+					<image src="@/static/img/empty_ico.png" class="empty_ico" @click="clearHistory"></image>
+				</view>
+				<view class="targetList">
+					<view class="target-item" v-for="(item,index) in historySearchList" :key="index"
+						@click="chooseTarget(item)">{{item}}</view>
+				</view>
+			</view>
+			<!-- 选择 -->
+			<view class="select-conyent" v-if="isShowSearch">
+				<van-dropdown-menu active-color="#333333">
+					<van-dropdown-item id="statusstate" :title="activeStateName">
+						<view class="menu-items">
+							<view class="menu-items-box" @click="overallBtn('statusstate',key)"
+								v-for="key in listActivityStaus" :key="key.Id">
+								<view class="items-box">
+									<u-icon v-if="key.IsChoose" name="checkbox-mark" color="#2C83FF" size="24"></u-icon>
+								</view>
+								<text>{{key.StatusName}}</text>
+							</view>
+						</view>
+						<view class="replacement-box">
+							<view class="replacement">
+								<text @click="replacementBtn('statusstate')" class="replacement-box">重置</text>
+								<text @click="replacementConfirm('statusstate')">确定</text>
+							</view>
+						</view>
+					</van-dropdown-item>
+					<van-dropdown-item id="industry" :title="chartPermissionName">
+						<view class="decide">
+							<view class="items-box">
+								<u-icon v-if="isShowJurisdiction" name="checkbox-mark" color="#2C83FF" size="24">
+								</u-icon>
+							</view>
+							<text @click="isJurisdiction">始终只展示有权限的行业</text>
+						</view>
+						<view class="menu-dashed">
+
+						</view>
+						<view class="menu-items">
+							<view class="menu-items-box" v-for="item in listChartPermission"
+								:key="item.ChartPermissionId" @click="overallClick('industry',item)">
+								<view class="items-box">
+									<u-icon v-if="item.IsChoose" name="checkbox-mark"
+										:color="isShowJurisdiction?'#ccc':'#2C83FF'" size="24"></u-icon>
+								</view>
+								<text>{{item.PermissionName}}</text>
+							</view>
+						</view>
+						<view class="replacement">
+							<text @click="replacementBtn('industry')" class="replacement-box">重置</text>
+							<text @click="replacementConfirm('industry')">确定</text>
+						</view>
+					</van-dropdown-item>
+					<van-dropdown-item id="genre" :title="activityTypeName">
+						<view class="menu-items">
+							<view class="menu-items-box" @click="overallActivity('genre',item)"
+								v-for="(item,index) in listActivityType" :key="item.ActivityTypeId">
+								<view class="items-box">
+									<u-icon v-if="item.IsChoose" name="checkbox-mark" color="#2C83FF" size="24">
+									</u-icon>
+								</view>
+								<text>{{item.ActivityTypeName}}</text>
+							</view>
+						</view>
+						<view class="replacement">
+							<text @click="replacementBtn('genre')" class="replacement-box">重置</text>
+							<text @click="replacementConfirm('genre')">确定</text>
+						</view>
+					</van-dropdown-item>
+
+
+
+				</van-dropdown-menu>
+			</view>
+
+		</view>
+		<view class="box-content" v-if="haveData" :class="{head:tabsActive==1}">
+			<view class="content-list" v-for="(item,index) in collectList" :key="index">
+				<view class="list-top" @click="goDetail(item)">
+					<view class="list-top-box">
+						<text class="title">{{item.ActivityTypeName}}</text>
+						<view class="city" v-if="item.City">
+							<image src="../../static/img/location.png" mode=""></image>
+							<text>{{item.City}}</text>
+						</view>
+					</view>
+					<text style="color: #2ACDD9; font-size: 26rpx;" v-if="item.ActiveState==1">未开始</text>
+					<text style="color: #FF4040; font-size: 26rpx;" v-if="item.ActiveState==2">进行中</text>
+					<text style="color: #999999; font-size: 26rpx;" v-if="item.ActiveState==3">已结束</text>
+				</view>
+				<view class="" style="display: flex;">
+					<view class="list-center" @click="goDetail(item)">
+						<text class="title" v-if="item.IsBrackets==1">{{item.ActivityName}}</text>
+						<text class="title-two" v-else>艾尔复盘</text>
+						<view class="setting-center">
+							<view class="">
+								<view class="box-expert" style="padding-bottom: 30rpx ;"
+									v-if="item.ActivityTypeName=='专家电话会'||item.ActivityTypeName=='专家线下沙龙'">
+									<view style="width: 140rpx;">
+										专家背景：
+									</view>
+									<view style="width:400rpx;">{{item.Expert}}</view>
+								</view>
+								<text style="padding-bottom: 30rpx ;"
+									v-if="item.ActivityTypeName=='公司调研电话会'||item.ActivityTypeName=='公司线下调研'">嘉宾：{{item.DistinguishedGuest}}</text>
+								<text style="padding-bottom: 30rpx ;"
+									v-if="item.ActivityTypeName=='分析师电话会'||item.ActivityTypeName=='分析师线下沙龙'">主讲人：{{item.Speaker}}</text>
+							</view>
+						</view>
+						<text style="padding-bottom: 30rpx ;">活动时间：{{item.ActivityTime}}</text>
+					</view>
+
+					<view class="" style="display: flex;align-items: center;padding-right: 30rpx;">
+						<u-icon style="padding-bottom: 30rpx ;" name="arrow-right" color="#BDBDBD" size="34"></u-icon>
+					</view>
+				</view>
+				<view class="list-bottom"
+					v-if="item.ActiveState==1 &&(item.IsLimitPeople==1 && item.ActivityTypeName=='公司调研电话会')">
+					<view class="multi-text">
+						<text v-if="item.IsSignup!==1"
+							@click="wanttosignup(item.ActivityId)">我要报名（{{item.SignupNum}}/{{item.LimitPeopleNum}}）</text>
+						<text v-else
+							@click="signupCancel(item.ActivityId,2,item.ActivityTime)">{{item.SignupType ==1?'取消外呼':'取消报名'}}（{{item.SignupNum}}/{{item.LimitPeopleNum}}）</text>
+
+					</view>
+				</view>
+				<view class="list-bottom" v-else-if="item.ActiveState==1">
+					<view class="multi"
+						v-if="item.ActivityTypeId==1||item.ActivityTypeId==2||(item.ActivityTypeId==3&&item.IsLimitPeople==0)">
+						<text class="multi-outbound" v-if="item.IsSignup!==1"
+							@click="signupAdd(item.ActivityId,1)">预约外呼</text>
+						<text class="multi-outbound" v-else
+							@click="signupCancel(item.ActivityId,1,item.ActivityTime)">取消外呼</text>
+						<text class="multi-remind" v-if="item.IsCancelMeetingReminder==0"
+							style="border-left: 1px solid #E5E5E5;"
+							@click="meetingReminderAdd(item.ActivityId)">会议提醒</text>
+						<text class="multi-remind" v-else style="border-left: 1px solid #E5E5E5;"
+							@click="meetingReminderCancel(item.ActivityId)">取消会议提醒</text>
+					</view>
+					<view class="multi-text" v-else>
+						<text v-if="item.IsSignup!==1"
+							@click="signupAdd(item.ActivityId,3)">我要报名（{{item.SignupNum}}/{{item.LimitPeopleNum}}）</text>
+						<text v-else
+							@click="signupCancel(item.ActivityId,3,item.ActivityTime)">取消报名（{{item.SignupNum}}/{{item.LimitPeopleNum}}）</text>
+					</view>
+				</view>
+			</view>
+			<u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20" v-if="totalPage>1" />
+		</view>
+		<view class="nodata" v-else>
+			<image src="@/static/img/act_search.png" mode="" class="nodata_ico"></image>
+			<text>未找到搜索结果</text>
+		</view>
+		<modalDialog :isShow="isShow" :signupType="signupType" :goFollow="goFollow" :signupStatus="signupStatus"
+			:isCancelShow="isCancelShow" :idTypeCancel="idTypeCancel" @cancelShowBtn="cancelEnsure"
+			:isShowhasPermission="isShowhasPermission" :applyForIsShow="applyForIsShow" :hasPermission="hasPermission"
+			:jurisdictionList="jurisdictionList" />
+		<areaCode :isAreaCode="isAreaCode" :areaCode="areaCode" />
+		<view class="select-box">
+			<u-popup v-model="selectShow" mode="bottom">
+				<view style="color: #333333;font-size: 28rpxrpx;">请选择参会方式</view>
+				<view style="color: #2C83FF;" @click="signupAdd('id',1)">预约外呼</view>
+				<view style="color: #2C83FF;" @click="signupAdd('id',2)">自主拨入</view>
+				<view style="color: #A9AFB8;" @click="selectShow=false">取消</view>
+			</u-popup>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		activity,
+		User
+	} from "@/config/api.js"
+	import {
+		Throttle
+	} from '@/config/util.js'
+	import modalDialog from '@/components/modalDialog.vue'
+	let app = getApp()
+	export default {
+		data() {
+			return {
+				searchTxt: '',
+				page_no: 1,
+				pageSize: 10,
+				collectList: [],
+				isShowSearch: false,
+				status: 'loadmore',
+				totalPage: '',
+				haveData: true,
+				loadText: {
+					loadmore: '上拉加载更多',
+					loading: '加载中',
+					nomore: '已经到底了'
+				},
+				listActivityStaus: [], //状态
+				listActivityType: [], //类型
+				listChartPermission: [], //分类
+				isShowJurisdiction: false,
+				activeState: "1,2,3", //活动进行状态
+				activityTypeIds: '', //活动类型id 多个用 , 隔开
+				chartPermissionIds: '', //行业id 多个用 , 隔开
+				activeStateName: '全部状态',
+				chartPermissionName: '行业分类',
+				activityTypeName: '活动类型',
+				isShowJurisdiction: false,
+				isGain: true,
+				signupType: '', //关注类型
+				goFollow: false, //是否关注公众号
+				signupStatus: 'Success', //4个不同的类型提示文案
+				isShow: false, //弹框
+				isCancelShow: false,
+				idTypeCancel: {
+					id: '',
+					type: 1,
+					cutId: '',
+					state: '',
+					isNum: false
+				},
+				isAreaCode: false,
+				areaCode: {
+					id: '',
+					type: ''
+				},
+				isNeedAddCountryCode: false,
+				selectShow: false,
+				isId: 0,
+				activityIdAdd: '',
+				// 历史搜索列表
+				historySearchList: [],
+				hasPermission: '', //是否有权限
+				jurisdictionList: {
+					SellerMobile: '',
+					PopupMsg: '',
+					OperationMode: '',
+				},
+				isShowhasPermission: false, //拨打销售电话
+				applyForIsShow: false, //潜在用户
+			}
+		},
+		computed: {},
+		watch: {
+			searchTxt() {
+				if (this.length > 0) {
+					// this.searchTxt
+				}
+			}
+		},
+		components: {
+			modalDialog
+		},
+		onLoad(option) {
+			if (this.$db.get('historySearchListActivity')) {
+				let historyList = JSON.parse(this.$db.get('historySearchListActivity'));
+				this.historySearchList = historyList;
+			}
+			if (option.text) {
+				this.activeState = option.statesId //活动进行状态
+				this.activityTypeIds = option.typeIds //活动类型id 多个用 , 隔开
+				this.chartPermissionIds = option.chartIds //行业id 多个用 , 隔开
+				this.activeStateName = option.stateName
+				this.chartPermissionName = option.chartName
+				this.activityTypeName = option.typeName
+				this.searchTxt = option.text
+				this.isGain = false
+				this.isShowSearch = true
+			} else {
+				this.isGain = true
+			}
+			if (option.text) {
+				this.searchHandle()
+			}
+			this.countryCcode()
+		},
+		/* 触底 */
+		onReachBottom: Throttle(function() {
+			if (this.status === 'nomore') return;
+			this.status = 'loading';
+			this.page_no++;
+			this.getList()
+		}),
+		methods: {
+			wanttosignup(id) {
+				this.activityIdAdd = id
+				this.selectShow = true
+			},
+			//获取是否需要填写区号接口
+			countryCcode() {
+				User.countryCcode().then(res => {
+					if (res.Ret == 200) {
+						this.isNeedAddCountryCode = res.Data.IsNeedAddCountryCode
+					}
+				})
+			},
+			searchHandle() {
+				if (this.searchTxt) {
+					//添加搜索记录
+					if (!this.historySearchList.includes(this.searchTxt)) {
+						this.historySearchList.unshift(this.searchTxt);
+						this.$db.set('historySearchListActivity', JSON.stringify(this.historySearchList))
+					}
+					this.isShowSearch = true
+					if (this.isGain) {
+						this.empty()
+						this.getList()
+					}
+					this.getUserSearchContent()
+				} else {
+					this.$util.toast('请输入关键字')
+				}
+			},
+			// 选择历史搜索
+			chooseTarget(item) {
+				this.searchTxt = item;
+				this.collectList = [];
+				this.page_no = 1;
+				this.searchHandle()
+			},
+			/* 历史搜索清空 */
+			clearHistory() {
+				this.historySearchList = [];
+				this.$db.del('historySearchListActivity');
+			},
+			//获取列表
+			getList() {
+				activity.getActivityList({
+					PageSize: this.pageSize,
+					CurrentIndex: this.page_no,
+					ActiveState: this.activeState, //活动进行状态
+					ActivityTypeIds: this.activityTypeIds, //活动类型id 多个用 , 隔开
+					ChartPermissionIds: this.chartPermissionIds, //行业id 多个用 , 隔开
+					KeyWord: this.searchTxt,
+				}).then(res => {
+					if (res.Ret !== 200) return
+					this.status = this.page_no < res.Data.Paging.Pages ? 'loadmore' : 'nomore';
+					this.totalPage = res.Data.Paging.Pages; //总页数
+					if (this.page_no === 1) {
+						this.collectList = res.Data.List || [];
+						this.haveData = this.collectList.length ? true : false
+						if (this.refresh) {
+							uni.stopPullDownRefresh();
+							this.refresh = false;
+						}
+					} else {
+						this.collectList.push(...res.Data.List)
+					}
+				})
+			},
+			//获取活动详情接口
+			getUserSearchContent(name) {
+				activity.getUserSearchContent({
+					IsShowJurisdiction: this.isId
+				}).then(res => {
+					if (this.isGain) {
+						res.Data.ListActivityStaus.forEach(item => {
+							item.IsChoose = true
+						})
+					}
+					this.isShowJurisdiction = res.Data.IsShowJurisdiction
+					this.listActivityStaus = res.Data.ListActivityStaus
+					this.listActivityType = res.Data.ListActivityType
+					this.listChartPermission = res.Data.ListChartPermission || []
+					if (this.isGain) {
+						// this.preserve()
+					} else {
+						this.shareOption()
+					}
+					if (name == 'traverse') {
+						const hyArr = []
+						this.listChartPermission.forEach(key => {
+							if (key.IsChoose) {
+								hyArr.push(key.ChartPermissionId)
+							}
+						})
+
+						this.chartPermissionIds = hyArr.join(',')
+					}
+				})
+			},
+			//报名
+			signupAdd(id, type) {
+				if (app.globalData.isBind && !app.globalData.isAuth) {
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+					return
+				}
+				this.selectShow = false
+				if (id == 'id') {
+					id = this.activityIdAdd
+				}
+				if (this.isNeedAddCountryCode) {
+					this.isAreaCode = true
+					this.areaCode = {
+						id,
+						type
+					}
+				} else {
+					activity.signupAdd({
+						ActivityId: id,
+						SignupType: type,
+					}).then(res => {
+						if (res.Ret == 200) {
+							this.hasPermission = res.Data.HasPermission
+							if (this.hasPermission == 1) {
+								const index = this.collectList.findIndex(item => item.ActivityId == id)
+								this.collectList[index].SignupType = type
+								if (res.Data.GoFollow && res.Data.SignupStatus !== 'Success' || !res.Data
+									.GoFollow) {
+									this.isShow = true
+								} else {
+									this.goFollow = res.Data.GoFollow
+								}
+								this.signupType = res.Data.SignupType
+								this.signupStatus = res.Data.SignupStatus
+								this.idTypeCancel = {
+									cutId: res.Data.ActivityId,
+									state: 1
+								}
+							} else if (this.hasPermission == 2) {
+								this.jurisdictionList.SellerMobile = res.Data.SellerMobile
+								this.jurisdictionList.PopupMsg = res.Data.PopupMsg
+								this.isShowhasPermission = true
+							} else if (this.hasPermission == 3 || this.hasPermission == 4) {
+								this.jurisdictionList.PopupMsg = res.Data.PopupMsg
+								this.applyForIsShow = true
+							}
+
+						}
+					})
+				}
+			},
+			//取消报名
+			signupCancel(id, type, time) {
+				const str = time.replace(/-/g, '/')
+				const date = new Date(str)
+				const times = date.getTime()
+				const num = new Date().getTime()
+				if (times - num <= 3600000) {
+					console.log(1);
+					uni.showModal({
+						confirmText: '知道了',
+						showCancel: false,
+						confirmColor: '#3385FF',
+						content: type == 1 ? '活动开始前1小时内无法取消预约外呼，请联系对口销售处理' : '活动开始前1小时内无法取消报名，请联系对口销售处理'
+					})
+					return
+				}
+				this.isCancelShow = true
+				this.idTypeCancel = {
+					id,
+					type,
+					cutId: '',
+					state: 0,
+					isNum: true
+				}
+			},
+			shareOption() {
+				const arr = this.activeState.split(',').map(item => item - 0)
+				this.listActivityStaus.forEach(item => {
+					if (arr.indexOf(item.Id) !== -1) {
+						item.IsChoose = true
+					} else {
+						item.IsChoose = false
+					}
+				})
+
+				const hyarr = this.chartPermissionIds.split(',').map(item => item - 0)
+				this.listChartPermission.forEach(key => {
+					if (hyarr.indexOf(key.ChartPermissionId) !== -1) {
+						key.IsChoose = true
+					} else {
+						key.IsChoose = false
+					}
+				})
+				const lxarr = this.activityTypeIds.split(',').map(item => item - 0)
+				this.listActivityType.forEach(key => {
+					if (lxarr.indexOf(key.ActivityTypeId) !== -1) {
+						key.IsChoose = true
+					} else {
+						key.IsChoose = false
+					}
+				})
+				this.preserve()
+			},
+
+			preserve() {
+				const arr = []
+				const str = []
+				this.listActivityStaus.forEach(item => {
+					if (item.IsChoose) {
+						arr.push(item.Id)
+						str.push(item.StatusName)
+					}
+				})
+				if (str.length == this.listActivityStaus.length) {
+					this.activeStateName = '所有状态'
+				} else if (str.length <= 0) {
+					this.activeStateName = '活动状态'
+				} else {
+					this.activeStateName = str.join(',')
+				}
+				this.activeState = arr.join(',')
+				const hyArr = []
+				const hyStr = []
+				this.listChartPermission.forEach(key => {
+					if (key.IsChoose) {
+						hyArr.push(key.ChartPermissionId)
+						hyStr.push(key.PermissionName)
+					}
+				})
+				if (hyStr.length == this.listChartPermission.length) {
+					this.chartPermissionName = '所有行业'
+				} else if (hyStr.length <= 0) {
+					this.chartPermissionName = '行业分类'
+				} else {
+					this.chartPermissionName = hyStr.join(',')
+				}
+				this.chartPermissionIds = hyArr.join(',')
+				const lxArr = []
+				const lxStr = []
+				this.listActivityType.forEach(key => {
+					if (key.IsChoose) {
+						lxArr.push(key.ActivityTypeId)
+						lxStr.push(key.ActivityTypeName)
+					}
+				})
+				if (lxStr.length == this.listActivityType.length) {
+					this.activityTypeName = '所有活动'
+				} else if (lxStr.length <= 0) {
+					this.activityTypeName = '活动类型'
+				} else {
+					this.activityTypeName = lxStr.join(',')
+				}
+				this.activityTypeIds = lxArr.join(',')
+				this.getList()
+			},
+			//状态的下拉选择
+			overallBtn(type, item) {
+				this.listActivityStaus.forEach(key => {
+					if (key.Id == item.Id) {
+						key.IsChoose = !key.IsChoose
+					}
+				})
+			},
+			// 行业的下拉选择
+			overallClick(type, item) {
+				if (this.isShowJurisdiction) return
+				this.listChartPermission.forEach(key => {
+					if (key.ChartPermissionId == item.ChartPermissionId) {
+						key.IsChoose = !key.IsChoose
+					}
+				})
+			},
+			//类型的下拉选择
+			overallActivity(type, item) {
+				this.listActivityType.forEach(key => {
+					if (key.ActivityTypeId == item.ActivityTypeId) {
+						key.IsChoose = !key.IsChoose
+					}
+				})
+			},
+			/* 新布局产业选项重置按钮 */
+			replacementBtn(type) {
+				if (type == 'statusstate') {
+					this.listActivityStaus.forEach(item => item.IsChoose = false)
+					this.listActivityStaus[0].IsChoose = true
+					this.activeState = '1'
+					this.activeStateName = '未开始'
+				} else if (type == 'industry') {
+					this.chartPermissionIds = ''
+					this.isShowJurisdiction = false
+					this.isId = 2
+					this.getUserSearchContent()
+					this.listChartPermission.forEach(item => item.IsChoose = false)
+					this.chartPermissionName = '行业分类'
+				} else {
+					this.listActivityType.forEach(item => item.IsChoose = false)
+					this.activityTypeIds = ''
+					this.activityTypeName = '活动类型'
+				}
+			},
+			empty() {
+				this.listActivityStaus.forEach(item => item.IsChoose = true)
+				this.activeState = '1,2,3'
+				this.activeStateName = '全部状态'
+				this.chartPermissionIds = ''
+				this.listChartPermission.forEach(item => item.IsChoose = false)
+				this.chartPermissionName = '行业分类'
+				this.listActivityType.forEach(item => item.IsChoose = false)
+				this.activityTypeIds = ''
+				this.activityTypeName = '活动类型'
+			},
+			/* 新布局产业选项确定按钮 */
+			replacementConfirm(type) {
+				this.page_no = 1
+				if (type == 'statusstate') {
+					const arr = []
+					const str = []
+					this.listActivityStaus.forEach(key => {
+						if (key.IsChoose) {
+							arr.push(key.Id)
+							str.push(key.StatusName)
+						}
+					})
+					if (str.length == this.listActivityStaus.length) {
+						this.activeStateName = '所有状态'
+					} else if (str.length <= 0) {
+						this.activeStateName = '活动状态'
+					} else {
+						this.activeStateName = str.join(',')
+					}
+					this.activeState = arr.join(',')
+				} else if (type == 'industry') {
+					const arr = []
+					const str = []
+					this.listChartPermission.forEach(key => {
+						if (key.IsChoose) {
+							arr.push(key.ChartPermissionId)
+							str.push(key.PermissionName)
+						}
+					})
+					if (str.length == this.listChartPermission.length) {
+						this.chartPermissionName = '所有行业'
+					} else if (str.length <= 0) {
+						this.chartPermissionName = '行业分类'
+					} else {
+						this.chartPermissionName = str.join(',')
+					}
+					this.chartPermissionIds = arr.join(',')
+
+				} else {
+					const arr = []
+					const str = []
+					this.listActivityType.forEach(key => {
+						if (key.IsChoose) {
+							arr.push(key.ActivityTypeId)
+							str.push(key.ActivityTypeName)
+						}
+					})
+					if (str.length == this.listActivityType.length) {
+						this.activityTypeName = '所有活动'
+					} else if (str.length <= 0) {
+						this.activityTypeName = '活动类型'
+					} else {
+						this.activityTypeName = str.join(',')
+					}
+					this.activityTypeIds = arr.join(',')
+				}
+				this.getList()
+				this.selectComponent(`#${type}`).toggle();
+			},
+			/* 表单清空 */
+			clearIpt() {
+				this.searchTxt = ''
+				this.collectList = []
+				this.haveData = true
+				this.isShowSearch = false
+			},
+			//文章详情
+			goDetail(item) {
+				if ((!app.globalData.isAuth) && (!app.globalData.isBind)) { // 已授权已绑定
+					uni.navigateTo({
+						url: '/pages/activityDetail/activityDetail?id=' + item.ActivityId,
+					});
+				} else if (app.globalData.isAuth) { //未授权
+					uni.navigateTo({
+						url: '/pages/authGuide/authGuide'
+					})
+				} else if (app.globalData.isBind && !app.globalData.isAuth) { //已授权未绑定
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+				}
+			},
+			isJurisdiction() {
+				if (this.isShowJurisdiction) {
+					this.isId = 2
+				} else {
+					this.isId = 1
+				}
+				this.getUserSearchContent('traverse')
+			},
+			//取消弹框的确认事件
+			cancelEnsure(obj, type, unm) {
+				if (obj.cutId == 0) return
+				this.collectList.forEach(item => {
+					if (obj.cutId == item.ActivityId) {
+						item.IsSignup = obj.state
+						if (unm) {
+							item.SignupNum = item.SignupNum - 1
+						} else {
+							item.SignupNum = item.SignupNum + 1
+						}
+					}
+				})
+			},
+			//添加会议提醒接口
+			meetingReminderAdd(id) {
+				if (app.globalData.isBind && !app.globalData.isAuth) {
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+					return
+				}
+				activity.meetingReminderAdd({
+					ActivityId: id
+				}).then(res => {
+					if (res.Ret == 200) {
+						this.hasPermission = res.Data.HasPermission
+						if (this.hasPermission == 1) {
+							uni.showModal({
+								confirmText: '知道了',
+								confirmColor: '#3385FF',
+								content: res.Msg,
+								showCancel: false,
+								success: (res) => {
+
+									this.collectList.forEach(item => {
+										if (id == item.ActivityId) {
+											item.IsCancelMeetingReminder = 1
+										}
+									})
+
+								}
+							})
+						} else if (this.hasPermission == 2) {
+							this.jurisdictionList.SellerMobile = res.Data.SellerMobile
+							this.jurisdictionList.PopupMsg = res.Data.PopupMsg
+							this.isShowhasPermission = true
+						} else if (this.hasPermission == 3 || this.hasPermission == 4) {
+							this.jurisdictionList.PopupMsg = res.Data.PopupMsg
+							this.applyForIsShow = true
+						}
+
+					}
+				})
+			},
+			//取消会议提醒接口
+			meetingReminderCancel(id) {
+				activity.meetingReminderCancel({
+					ActivityId: id
+				}).then(res => {
+					if (res.Ret == 200) {
+						uni.showModal({
+							confirmText: '知道了',
+							confirmColor: '#3385FF',
+							content: res.Msg,
+							showCancel: false,
+							success: (res) => {
+								if (res.confirm) {
+									this.collectList.forEach(item => {
+										if (id == item.ActivityId) {
+											item.IsCancelMeetingReminder = 0
+										}
+									})
+								}
+							}
+						})
+					}
+				})
+			},
+			authentication() {
+				/*  */
+				this.$store.dispatch('checkHandle').then(res => {
+					app.globalData.isAuth = res.IsAuth;
+					app.globalData.isBind = res.IsBind;
+				})
+			}
+
+		},
+		onShow() {
+			this.authentication()
+		},
+		/**
+		 * 用户点击分享
+		 */
+		onShareAppMessage: function(res) {
+			return {
+				title: '活动',
+				path: '/pages/activitySearch/activitySearch?statesId=' + this.activeState + '&typeIds=' + this
+					.activityTypeIds + '&chartIds=' + this.chartPermissionIds + '&stateName=' + this.activeStateName +
+					'&chartName=' + this.chartPermissionName + '&typeName=' + this.activityTypeName + '&text=' + this
+					.searchTxt,
+				success: (res) => {},
+				fail: (err) => {}
+			}
+		},
+		/* 下拉刷新 */
+		onPullDownRefresh: Throttle(function() {
+			this.page_no = 1;
+			this.refresh = true;
+			if (this.tabsActive == 0) {
+				this.getList()
+			} else {
+				this.getScheduleList()
+			}
+		}),
+	}
+</script>
+
+<style scoped lang="scss">
+	.activity-content {
+		background-color: #F7F7F7;
+
+		.top-content {
+			width: 100%;
+			background-color: #fff;
+			padding: 0 30rpx;
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 999;
+
+			.search-cont-top {
+				margin-top: 30rpx;
+
+				.cont-tit {
+					color: #666;
+					font-size: 28rpx;
+					margin-bottom: 30rpx;
+					display: flex;
+					justify-content: space-between;
+
+					.empty_ico {
+						width: 32rpx;
+						height: 33rpx;
+					}
+				}
+
+				.targetList {
+					display: flex;
+					flex-wrap: wrap;
+
+					// justify-content: space-between;
+					.target-item {
+						padding: 4rpx 18rpx;
+						color: #4A4A4A;
+						font-size: 26rpx;
+						// border: 1rpx solid #3385ff;
+						background-color: #F7F7F7;
+						margin-bottom: 30rpx;
+						margin-right: 30rpx;
+						border-radius: 20rpx;
+					}
+				}
+			}
+
+			.searchTarget-header {
+				position: relative;
+				width: 100%;
+				background-color: #fff;
+				padding: 20rpx 0;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.sea_ipt_placeholder {
+					color: #E5E5E5;
+				}
+
+				.sea_ipt {
+					width: 682rpx;
+					height: 70rpx;
+					line-height: 70rpx;
+					box-sizing: border-box;
+					border: 1rpx solid #E5E5E5;
+					background-color: rgba(245, 245, 245, 0.2);
+					font-size: 26rpx;
+					color: #4A4A4A;
+					padding: 0 180rpx 0 78rpx;
+					border-radius: 70rpx;
+				}
+
+				.sea_ico {
+					width: 31rpx;
+					height: 31rpx;
+					position: absolute;
+					left: 48rpx;
+					top: 50%;
+					transform: translateY(-50%);
+				}
+
+				.ipt-right {
+					display: flex;
+					align-items: center;
+					position: absolute;
+					right: 59rpx;
+					top: 50%;
+					transform: translateY(-50%);
+					color: #3385FF;
+
+					.line {
+						margin: 0 21rpx;
+						color: #E0E0E0;
+					}
+				}
+			}
+
+			.menu-dashed {
+				margin: 0 auto;
+				width: 682rpx;
+				border-bottom: 2rpx solid #E5E5E5;
+			}
+
+			.select-conyent {
+				.decide {
+					background-color: #F8F8FA;
+					display: flex;
+					align-items: center;
+					margin: 0 auto;
+					height: 110rpx;
+					width: 100%;
+				}
+
+				.items-box {
+					width: 40rpx;
+				}
+
+				.menu-items {
+					background-color: #F8F8FA;
+					width: 100%;
+					display: flex;
+					flex-wrap: wrap;
+					padding: 30rpx 30rpx 0;
+
+					.menu-items-box {
+						display: flex;
+						width: 50%;
+						font-size: 28rpx;
+						font-weight: 400;
+						margin-bottom: 40rpx;
+
+					}
+				}
+
+				.replacement-box {
+					background-color: #fff;
+					padding-bottom: 40rpx;
+					border-radius: 0rpx 0rpx 16rpx 16rpx;
+				}
+
+				.replacement {
+					margin: 0rpx 30rpx 20rpx;
+					display: flex;
+					background-color: #2C83FF;
+					opacity: 1;
+					height: 60rpx;
+					line-height: 58rpx;
+					font-size: 28rpx;
+					font-weight: 400;
+					color: #FFFFFF;
+					border-radius: 30rpx;
+
+					text {
+						flex: 1;
+						text-align: center;
+
+					}
+
+					.replacement-box {
+						border: 1rpx solid #2C83FF;
+						opacity: 1;
+						color: #2C83FF;
+						background: #FFFFFF;
+						border-radius: 28rpx 0rpx 28rpx 28rpx;
+					}
+				}
+			}
+		}
+
+		.head {
+			// padding-top: 80rpx !important;
+			// padding-bottom: 30rpx !important;
+		}
+
+		.box-content {
+			padding: 200rpx 34rpx 20rpx;
+			background-color: #F7F7F7;
+
+			.content-list {
+				box-sizing: border-box;
+				overflow: hidden;
+				margin-top: 30rpx;
+				// height: 396rpx;
+				width: 100%;
+				background: #FFFFFF;
+				box-shadow: 0px 3rpx 6rpx rgba(141, 141, 141, 0.16);
+				border-radius: 16rpx;
+				font-size: 28rpx;
+
+				.list-top {
+					margin: 0 30rpx;
+					display: flex;
+					justify-content: space-between;
+					border-bottom: 1rpx solid #E5E5E5;
+					height: 82rpx;
+					line-height: 82rpx;
+					color: #333333;
+					font-size: 32rpx;
+
+					.list-top-box {
+						display: flex;
+
+						.title {
+							color: #333333;
+							font-size: 30rpx;
+							font-weight: bold;
+						}
+					}
+
+					.city {
+						margin-left: 40rpx;
+						display: flex;
+						color: #3385FF;
+						align-items: center;
+						font-size: 26rpx;
+
+						image {
+							width: 27rpx;
+							height: 32rpx;
+							margin-right: 12rpx;
+						}
+					}
+				}
+
+				.list-center {
+					width: 100%;
+					color: #333333;
+
+					.title {
+						padding: 20rpx 30rpx 24rpx 30rpx;
+						line-height: 46rpx;
+						color: #333;
+						font-size: 28rpx;
+						font-weight: bold;
+						text-indent: -14rpx
+					}
+
+					.title-two {
+						padding-left: 30rpx;
+						padding-bottom: 24rpx;
+						padding-top: 20rpx;
+						line-height: 46rpx;
+						color: #333;
+						font-size: 28rpx;
+						font-weight: bold;
+					}
+
+					text {
+						padding-left: 30rpx;
+					}
+
+					.setting-center {
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						padding-right: 30rpx;
+
+						.box-expert {
+							margin-left: 30rpx;
+							display: flex;
+
+						}
+					}
+				}
+
+				.list-bottom {
+					height: 80rpx;
+
+					// border-top: 1px solid #E5E5E5;
+					.multi {
+						display: flex;
+						text-align: center;
+						line-height: 80rpx;
+						color: #3385FF;
+
+						text {
+							width: 50%;
+						}
+
+						.multi-outbound {
+							background: #3385FF;
+							color: #FFFFFF;
+							border-radius: 0px 0px 0px 16rpx;
+						}
+
+						.multi-remind {
+							background: #EBF4FF;
+							color: #3385FF;
+							border-radius: 0px 0px 16rpx 0px;
+						}
+					}
+
+					.multi-text {
+						line-height: 80rpx;
+						color: #FFFFFF;
+						width: 100%;
+						text-align: center;
+						background: #3385FF;
+						opacity: 1;
+						border-radius: 0px 0px 16rpx 16rpx;
+					}
+				}
+			}
+		}
+
+		.nodata {
+			padding-top: 350rpx;
+
+			image {
+				width: 374rpx;
+				height: 288rpx;
+			}
+		}
+
+		.select-box {
+			width: 100%;
+
+			view {
+				height: 95prx;
+				line-height: 95rpx;
+				text-align: center;
+				font-size: 32rpx;
+				border-bottom: 1rpx solid #EBEBEB;
+				;
+			}
+		}
+
+		.select-box {
+			width: 100%;
+
+			view {
+				height: 95prx;
+				line-height: 95rpx;
+				text-align: center;
+				font-size: 32rpx;
+				border-bottom: 1rpx solid #EBEBEB;
+				;
+			}
+		}
+	}
+
+	/deep/.van-dropdown-menu {
+		background-color: #fff;
+		box-shadow: none !important;
+		padding-top: 20rpx;
+	}
+
+	/deep/.van-dropdown-menu__item {
+		box-sizing: border-box;
+		width: 190rpx;
+		margin-right: 40rpx;
+		padding-right: 20rpx;
+		height: 51rpx;
+		border-radius: 26rpx;
+		background: #F8F8FA;
+	}
+
+	/deep/.van-dropdown-item {
+		margin-top: -10rpx;
+	}
+
+	/deep/[data-index='2'] {
+		margin-right: 0rpx;
+	}
+
+	/deep/ .van-ellipsis {
+		font-size: 24rpx;
+	}
+</style>

pages/applyResult/applyResult.vue

@@ -12,7 +12,7 @@
 				<text v-else>请等待销售人员与您联系</text>
 			</view> -->
 			<view class="btn-cont" @click="goIndex">
-        返回首页
+        返回
 <!-- 				<image src="@/static/img/btn_bg.png" class="btn_bg"></image>
 				<text class="btn-txt">返回首页</text> -->
 			</view>
@@ -35,9 +35,12 @@
 				});
 			},
 			goIndex() {
-				uni.switchTab({
-					url:'/pages/index/index',
+				uni.navigateBack({
+				    delta: 2
 				})
+				// uni.switchTab({
+				// 	url:'/pages/index/index',
+				// })
 			}
 		},
 		onLoad(option) {
@@ -74,7 +77,7 @@
 			width: 368rpx;
 			height: 80rpx;
 			// position: relative;
-      background-color: #3385FF;
+			background:linear-gradient(268deg, #2DDBFF 0%, #1599FF 49%, #005EFF 100%);
 			color: #fff;
 			font-size: 34rpx;
 			margin: 140rpx auto 0;

pages/applyTrial/applyTrial.vue

@@ -202,7 +202,7 @@
 			width: 368rpx;
 			height: 80rpx;
 			// position: relative;
-       background-color: #3385FF;
+			background:linear-gradient(268deg, #2DDBFF 0%, #1599FF 49%, #005EFF 100%);
 			color: #fff;
 			font-size: 34rpx;
 			margin: 120rpx auto 0;

pages/index/index.vue

@@ -19,9 +19,9 @@
 				class="scroll-tab" 
 				:scroll-into-view="'_'+tabIndex">
 					<block v-for="(item, index) in tabBars" :key="item.ChartPermissionId">
-						<view :id="'_'+index" class="scroll-tab-item" :class="{ active: tabAct_id === item.ChartPermissionId }" @click.stop="toggleTab(item,index)">
+						<view :id="'_'+index" class="scroll-tab-item" :class="{ active: tabAct_id == item.ChartPermissionId }" @click.stop="toggleTab(item,index)">
 						{{item.PermissionName}}
-						<image src="@/static/img/border_act.png" mode="" class="border_act" v-if="tabAct_id === item.ChartPermissionId"></image>
+						<image src="@/static/img/border_act.png" mode="" class="border_act" v-if="tabAct_id == item.ChartPermissionId"></image>
 						</view>
 					</block>
 				</scroll-view>
@@ -100,7 +100,20 @@ export default {
 			immediate:true
 		}
 	},
+	//切换tab 刷新的
+	// onTabItemTap(){
+	// 	this.page_no=1
+	// 	this.dataList=[]
+	// 	this.tabAct_id=0
+	// 	this.getReportList()
+	// },
 	onLoad(optios) {
+		
+		if(optios.tabid){
+			this.tabAct_id = optios.tabid
+			this.getReportList();
+		}
+		
 		this.getTabs();
 	},
 	onShow() {
@@ -125,7 +138,7 @@ export default {
 			Home.getList({
 				PageSize: this.pageSize,
 				CurrentIndex: this.pageNum,
-				ChartPermissionId:this.tabAct_id || 0
+				ChartPermissionId:Number(this.tabAct_id) || 0
 			}).then(res => {
 				if(res.Ret === 200) {
 					this.status = this.pageNum < res.Data.Paging.Pages ? 'loadmore' : 'nomore'
@@ -236,8 +249,8 @@ export default {
 	onShareAppMessage: function (res) {
 		return {
 			title: '您手边的弘则研究素材检索库',
-			path: '/pages/index/index',
-			imageUrl: '/static/img/home_share.png',
+			path:  '/pages/index/index?tabid='+this.tabAct_id,
+			imageUrl: this.tabAct_id==0 ?'/static/img/home_share.png' : '' ,
 			success: (res)=> {
 			},
 			fail: (err)=> {

pages/networkAttend/networkAttend.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		 <web-view :src="url"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				url:''
+			};
+		},
+		onLoad(opion) {
+			this.url=opion.url
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/reportDetail/reportDetail.vue

@@ -40,7 +40,7 @@
 				<text>返回首页</text>
 			</view> -->
 			<view class="btn-cont back-btn" @click="backIndex">
-        返回首页
+        返回
 				<!-- <image src="@/static/img/btn_bg.png" class="btn_bg"></image> -->
 				<!-- <text class="btn-txt">返回首页</text> -->
 			</view>
@@ -140,10 +140,11 @@
 					});
 			},
 			// 返回首頁
-			backIndex() {
-				uni.switchTab({
-					url:'/pages/index/index',
-				})
+			backIndex() {
+				uni.navigateBack()
+				// uni.switchTab({
+				// 	url:'/pages/index/index',
+				// })
 			},
 			callPhone(num) {
 				uni.makePhoneCall({
@@ -195,7 +196,7 @@
 			}
 		},
 		onShow() {
-			this.readTiem=0
+		this.readTiem=0
 		this.setIntervalTiem=setInterval(() => {
 			      this.readTiem++
 			    },1000)
@@ -386,16 +387,16 @@
 			width: 368rpx;
 			height: 80rpx;
 			// position: relative;
-      background-color: #3385FF;
+			background:linear-gradient(268deg, #2DDBFF 0%, #1599FF 49%, #005EFF 100%);
 			color: #fff;
 			font-size: 34rpx;
 			margin: 0 auto;
 			text-align: center;
 			line-height: 80rpx;
 			&.back-btn {
-         background-color: #fff !important;
-         border: 2rpx solid #3385FF;
-         color: #3385FF;
+				background:linear-gradient(268deg, #2DDBFF 0%, #1599FF 49%, #005EFF 100%)!important;
+				// border: 2rpx solid #3385FF;
+				color:  #fff;
 				margin-top: 30rpx;
 			}
 			.btn_bg {

pages/reportForm/components/strategy.vue

@@ -1,237 +1,248 @@
-<template>
-  		<!-- 季度策略 -->
-	<view class="industrial-container">
-    <!-- 季度策略 -->
-    <view class="collect-ul">
-    			<view class="collect-ltem" v-for="(item,index) in collectList" :key="index" @click="goDetail(item,index)">
-    			<view class="item-left">
-				<text class="title text_twoLine" >{{item.Title}}
-              <text class="reg-text" v-if="item.IsRed"></text>
-              </text>
-              <text v-if="isText" :class="threeFour?'text-threeFour':'text_one'" >
-			  {{item.Abstract}}
-			  </text>
-    				<text class="text_twoLine desc">{{item.PublishDate}}</text>
-    				</view>
-    				<u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
-    			</view>
-    			<u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20" v-if="totalPage>1"/>
-    		</view>
-	</view>
-</template>
-
-<script>
-  import { Reports } from '@/config/api.js' 
-  import { Throttle } from '@/config/util.js' 
-  let app = getApp()
-	export default {
-    props:{
-      strategyIndexTwo:{
-        type:Number
-      },
-      isNum:{
-         type:Number
-      },
-	  tabAct_idTwo:{
-		  type:Number
-	  },
-	  pageNumFather:{
-		  type:Number,
-		  default:null
-	  },
-	  matchTypeName:{
-		  type:String
-	  }
-    },
-		data() {
-			return {
-          refresh: false,//正在下拉
-          page_no:1,
-          pageSize:10,
-          collectList:[],
-          haveData:true,
-          status:'loadmore',
-          loadText: {
-          	loadmore: '上拉加载更多',
-          	loading: '加载中',
-          	nomore: '已经到底了'
-          },
-          totalPage:'',
-		  isShow:false,
-          threeFour:false,
-          isText:true
-			};
-		},
-    watch:{
-      matchTypeName:{
-        handler() {
-        	if(this.matchTypeName=="资金流向"||this.matchTypeName=="大类资产"){
-              this.threeFour=true
-            }
-            if(this.matchTypeName=="周度思考"||this.matchTypeName=="估值研究") {
-              this.isText=false
-            }else {
-              this.isText=true
-            }
-        	},
-        	immediate:true
-        },
-        isNum:{
-          handler() {
-          		if(this.status === 'nomore') return ;
-          		this.status = 'loading';
-          		this.page_no++;
-          		this.getCollectList()
-          	},
-        },
-		tabAct_idTwo:{
-			handler() {
-				this.page_no=1,
-				this.pageSize=10,
-				this.getCollectList()
-				},
-				// immediate:true
-		},
-		pageNumFather:{
-			handler(){
-					if(this.pageNumFather){
-					this.page_no=1
-					this.getCollectList()
-					}
-				}
-		}
-      },
-    mounted() {
-     if(this.tabAct_idTwo){
-		  this.getCollectList()
-	 }
-    },
-	methods:{
-    /* 获取列表 */
-    getCollectList() {
-    	Reports.getTacticsList({
-    		PageSize: this.pageSize,
-    		CurrentIndex: this.page_no,
-			CategoryId:this.tabAct_idTwo
-    	}).then(res => {
-    		if(res.Ret === 200) {
-    			this.status = this.page_no < res.Data.Paging.Pages ? 'loadmore' : 'nomore';
-    			this.totalPage = res.Data.Paging.Pages;//总页数
-    			if(this.page_no === 1) {
-    				this.collectList = res.Data.List || [];
-    				this.haveData = this.collectList.length ? true : false
-    				if(this.refresh) {
-    					uni.stopPullDownRefresh();
-    					this.refresh = false;
-    				} 
-    			}else {
-    				this.collectList = this.collectList.concat(res.Data.List)
-    			}
-    		}
-    	})
-    },
-   goDetail(item,index) {
-   	/* 无需授权且已绑定 检验是或否有权限 */
-	if(index==0) {
-		this.$emit('hideIsred',this.isShow)
-	}
-	this.collectList[index].IsRed=false
-	
-	// 	console.log(this.collectList[index])
-   	this.$store.dispatch('checkHandle').then(res => {
-   		app.globalData.isAuth = res.IsAuth;
-   		app.globalData.isBind = res.IsBind;
-   		if((!res.IsAuth) && (!res.IsBind)) { // 已授权已绑定
-   			uni.navigateTo({
-   				url:'/pages/reportDetail/reportDetail?idReport=' + item.ArticleId,
-   			});
-   		}else if(res.IsAuth) { //未授权
-   			uni.navigateTo({
-   				url:'/pages/authGuide/authGuide'
-   			})
-   		}else if(res.IsBind && !res.IsAuth){ //已授权未绑定
-   			uni.navigateTo({
-   				url:'/pages/login/login'
-   			})
-   		}
-   	})
-   	
-   },
-    },
-   
-    	/* 下拉刷新 */
-    	onPullDownRefresh: Throttle(function() {
-    		this.page_no = 1;
-    		this.refresh = true;
-    		this.getCollectList()
-    	}),
-    
-   
-	}
-</script>
-
-<style scoped lang="scss">
-.industrial-container {
-  background-color: #f6f6f6;
-  margin-top: 35rpx;
-  .collect-ul {
-    // margin-top: 10rpx;
-    // background-color: #f6f6f6;
-  	// padding-top: rpx;
-  	.collect-ltem {
-  		display: flex;
-  		padding: 30rpx 34rpx;
-  		background: #fff;
-  		margin-top: 10rpx;
-  		align-items: center;
-  		justify-content: space-between;
-  		.title {
-        position: relative;
-  			max-width: 625rpx;
-  			color: #333;
-  			font-size: 30rpx;
-        padding-left: 28rpx;
-        .reg-text {
-          position: absolute;
-          top: 50%;
-          left:0rpx;
-          width: 14rpx;
-          height: 14rpx;	  
-		 transform: translateY(-50%);
-          background-color: #FF0000;
-          border-radius: 50%;
-          z-index: 9;
-        }
-  		}
-  		.desc {
-  			margin-top: 17rpx;
-        padding-left: 28rpx;
-  			width: 625rpx;
-  			color: #999;
-  		}
-      .text_one {
-        max-width: 600rpx;
-        padding-left: 28rpx;
-        color: #666666;
-        font-size: 28rpx;
-        white-space:nowrap;
-        text-overflow:ellipsis;
-        overflow: hidden;
-      }
-      .text-threeFour {
-        max-width: 600rpx;
-        padding-left: 28rpx;
-        color: #666666;
-        font-size: 28rpx;
-         text-overflow: -o-ellipsis-lastline;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          display: -webkit-box;
-          -webkit-line-clamp: 2;
-          line-clamp: 2;
-          -webkit-box-orient: vertical;
-      }
-  	}
-  }
-}
+<template>
+	<!-- 季度策略 -->
+	<view class="industrial-container">
+		<!-- 季度策略 -->
+		<view class="collect-ul">
+			<view class="collect-ltem" v-for="(item,index) in collectList" :key="index" @click="goDetail(item,index)">
+				<view class="item-left">
+					<text class="title text_twoLine">{{item.Title}}
+						<text class="reg-text" v-if="item.IsRed"></text>
+					</text>
+					<text v-if="isText" :class="threeFour?'text-threeFour':'text_one'">
+						{{item.Abstract}}
+					</text>
+					<text class="text_twoLine desc">{{item.PublishDate}}</text>
+				</view>
+				<u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
+			</view>
+			<u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20" v-if="totalPage>1" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		Reports
+	} from '@/config/api.js'
+	import {
+		Throttle
+	} from '@/config/util.js'
+	let app = getApp()
+	export default {
+		props: {
+			strategyIndexTwo: {
+				type: Number
+			},
+			isNum: {
+				type: Number
+			},
+			tabAct_idTwo: {
+				type: Number
+			},
+			pageNumFather: {
+				type: Number,
+				default: null
+			},
+			matchTypeName: {
+				type: String
+			}
+		},
+		data() {
+			return {
+				refresh: false, //正在下拉
+				page_no: 1,
+				pageSize: 10,
+				collectList: [],
+				haveData: true,
+				status: 'loadmore',
+				loadText: {
+					loadmore: '上拉加载更多',
+					loading: '加载中',
+					nomore: '已经到底了'
+				},
+				totalPage: '',
+				isShow: false,
+				threeFour: false,
+				isText: true
+			};
+		},
+		watch: {
+			matchTypeName: {
+				handler() {
+					if (this.matchTypeName == "资金流向" || this.matchTypeName == "大类资产") {
+						this.threeFour = true
+					}
+					if (this.matchTypeName == "周度思考" || this.matchTypeName == "估值研究") {
+						this.isText = false
+					} else {
+						this.isText = true
+					}
+				},
+				immediate: true
+			},
+			isNum: {
+				handler() {
+					if (this.status === 'nomore') return;
+					this.status = 'loading';
+					this.page_no++;
+					this.getCollectList()
+				},
+			},
+			tabAct_idTwo: {
+				handler() {
+					this.page_no = 1,
+						this.pageSize = 10,
+						this.getCollectList()
+				},
+				// immediate:true
+			},
+			pageNumFather: {
+				handler() {
+					if (this.pageNumFather) {
+						this.page_no = 1
+						this.getCollectList()
+					}
+				}
+			}
+		},
+		mounted() {
+			if (this.tabAct_idTwo) {
+				this.getCollectList()
+			}
+		},
+		methods: {
+			/* 获取列表 */
+			getCollectList() {
+				Reports.getTacticsList({
+					PageSize: this.pageSize,
+					CurrentIndex: this.page_no,
+					CategoryId: this.tabAct_idTwo
+				}).then(res => {
+					if (res.Ret === 200) {
+						this.status = this.page_no < res.Data.Paging.Pages ? 'loadmore' : 'nomore';
+						this.totalPage = res.Data.Paging.Pages; //总页数
+						if (this.page_no === 1) {
+							this.collectList = res.Data.List || [];
+							this.haveData = this.collectList.length ? true : false
+							if (this.refresh) {
+								uni.stopPullDownRefresh();
+								this.refresh = false;
+							}
+						} else {
+							this.collectList = this.collectList.concat(res.Data.List)
+						}
+					}
+				})
+			},
+			goDetail(item, index) {
+				/* 无需授权且已绑定 检验是或否有权限 */
+				if (index == 0) {
+					this.$emit('hideIsred', this.isShow)
+				}
+				this.collectList[index].IsRed = false
+
+				// 	console.log(this.collectList[index])
+				this.$store.dispatch('checkHandle').then(res => {
+					app.globalData.isAuth = res.IsAuth;
+					app.globalData.isBind = res.IsBind;
+					if ((!res.IsAuth) && (!res.IsBind)) { // 已授权已绑定
+						uni.navigateTo({
+							url: '/pages/reportDetail/reportDetail?idReport=' + item.ArticleId,
+						});
+					} else if (res.IsAuth) { //未授权
+						uni.navigateTo({
+							url: '/pages/authGuide/authGuide'
+						})
+					} else if (res.IsBind && !res.IsAuth) { //已授权未绑定
+						uni.navigateTo({
+							url: '/pages/login/login'
+						})
+					}
+				})
+
+			},
+		},
+
+		/* 下拉刷新 */
+		onPullDownRefresh: Throttle(function() {
+			this.page_no = 1;
+			this.refresh = true;
+			this.getCollectList()
+		}),
+
+
+	}
+</script>
+
+<style scoped lang="scss">
+	.industrial-container {
+		background-color: #f6f6f6;
+		margin-top: 132rpx;
+
+		.collect-ul {
+
+			// margin-top: 10rpx;
+			// background-color: #f6f6f6;
+			// padding-top: rpx;
+			.collect-ltem {
+				display: flex;
+				padding: 30rpx 34rpx;
+				background: #fff;
+				margin-top: 10rpx;
+				align-items: center;
+				justify-content: space-between;
+
+				.title {
+					position: relative;
+					max-width: 625rpx;
+					color: #333;
+					font-size: 30rpx;
+					padding-left: 28rpx;
+
+					.reg-text {
+						position: absolute;
+						top: 50%;
+						left: 0rpx;
+						width: 14rpx;
+						height: 14rpx;
+						transform: translateY(-50%);
+						background-color: #FF0000;
+						border-radius: 50%;
+						z-index: 9;
+					}
+				}
+
+				.desc {
+					margin-top: 17rpx;
+					padding-left: 28rpx;
+					width: 625rpx;
+					color: #999;
+				}
+
+				.text_one {
+					max-width: 600rpx;
+					padding-left: 28rpx;
+					color: #666666;
+					font-size: 28rpx;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					overflow: hidden;
+				}
+
+				.text-threeFour {
+					max-width: 600rpx;
+					padding-left: 28rpx;
+					color: #666666;
+					font-size: 28rpx;
+					text-overflow: -o-ellipsis-lastline;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					line-clamp: 2;
+					-webkit-box-orient: vertical;
+				}
+			}
+		}
+	}
 </style>

pages/reportForm/reportForm.vue

@@ -1,847 +1,940 @@
-<template>
-	<view class="reportForm-container">
-		<!-- tabs -->
-		 <!-- tabs -->
-			<view class="index-fixed">
-						<view class="index-header">
-							<input type="text" 
-							placeholder="搜索您想要的纪要" 
-							placeholder-class="sea_ipt_placeholder" 
-							class="sea_ipt"
-							v-model="searchTxt"
-							disabled
-							@click="goSearch"/>
-							<icon type="search" size="15" class="search_ico"/>
-			</view>
-		     <view class="tab-cont">
-		     				<scroll-view 
-		     				scroll-x="true" 
-		     				scroll-with-animation 
-		     				class="scroll-tab" 
-		     				:scroll-into-view="'_'+tabIndex">
-		     					<block v-for="(item, index) in tabBars" :key="item.ChartPermissionId">
-		     						<view :id="'_'+index" class="scroll-tab-item" :class="{ active: tabAct_id === item.ChartPermissionId }" @click.stop="toggleTab(item,index)">
-		     						{{item.PermissionName}}
-		     						<image src="@/static/img/border_act.png" mode="" class="border_act" v-if="tabAct_id === item.ChartPermissionId"></image>
-		     						</view>
-		     					</block>
-		     				</scroll-view>
-		            
-		     			</view>
-		           <view class="lucency" v-if="tabBars.length>6"></view>
-		   </view>
-	  <!-- 内容 -->
-		<view class="strategy" v-if="strategyIndex==4">
-			<view class="tab-cont-two">
-				<scroll-view scroll-x="true" scroll-with-animation class="scroll-tab-tow">
-					<block v-for="(item, index) in tabBarsTow" :key="item.CategoryId">
-						<view :id="'_'+index" class="scroll-tab-item"
-							:class="{ active: tabAct_idTwo == item.CategoryId }" @click.stop="toggleTabTwo(item,index)">
-							{{item.MatchTypeName}}
-							<text class="reg-text" v-if="item.IsRed"></text>
-						</view>
-					</block>
-				</scroll-view>
-			</view>
-			<view class="row">
-
-			</view>
-			<!-- 子组件 -->
-			<strategy :strategyIndexTwo="strategyIndexTwo" :pageNumFather='pageNumFather' :matchTypeName="matchTypeName"
-				:tabAct_idTwo="tabAct_idTwo" :isNum="isNum" :isSwitchover="isSwitchover" @hideIsred="hideIsred" />
-		</view>
-		<!-- </view> -->
-		<view class="industrial_eport_one" v-else>
-			<!-- 行业报告 -->
-			<view class="industry" v-if="tradeList">
-				<view style="height: 12rpx;"></view>
-				<view class="industry-top">
-					<view class="img-top-box">
-						<image src="@/static/img/industry-ico.png"></image>
-						<text>行业综述</text>
-					</view>
-					<view>
-
-					</view>
-				</view>
-				<view class="industry-box" @click="isClickHandle(item.CategoryId)" v-for="item in tradeList"
-					:key="item.CategoryId">
-					<view class="box-left">
-						{{item.MatchTypeName}}
-						<text v-if="item.IsRed"></text>
-					</view>
-					<view class="box-right">
-						<text>{{item.UpdateTime}}更新</text>
-						<u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
-					</view>
-				</view>
-			</view>
-			<!-- 产业报告 -->
-			<view class="industry">
-				<view style="height: 12rpx;" v-if="!tradeList"></view>
-				<view class="industry-top industry-sticky">
-					<view class="img-top-box">
-						<image src="@/static/img/property_ico.png" style="height: 50rpx;"></image>
-						<text class="text-sub">细分产业报告</text>
-					</view>
-					<van-dropdown-menu active-color="#333333">
-						<van-dropdown-item id="menuItem"  @open="isscroll" :title="overallArrangementName">
-							<view class="menu-items">
-								<view class="menu-items-box" @click="overallBtn(index,item)" v-for="(item,index) in overallArrangement" :key="item.id">
-									<view class="items-box">
-										<u-icon v-show="overallArrangementId==item.id" name="checkbox-mark"  color="#2C83FF" size="24"></u-icon>
-									</view>
-									<text>{{item.name}}</text>
-								</view>
-							</view>
-							<view class="replacement">
-								<text @click="replacementBtn" class="replacement-box">重置</text>
-								<text @click="replacementConfirm">确定</text>
-							</view>
-						</van-dropdown-item>
-					<van-dropdown-item id="menuPitch" class="adasdasdas"  @open="isscroll" :title="pitchOnName">
-						<view class="menu-items-tow">
-							<view class="items-tow" @click="pitchClick(item,index)" v-for="(item,index) in pitchOn" :key="item.id">
-								<view>
-									<u-icon v-show="pitchOnId==item.id" name="checkbox-mark"  color="#2C83FF" size="24"></u-icon>
-								</view>
-								<text>{{item.name}}</text>
-							</view>
-						</view>
-					</van-dropdown-item>
-										  
-					</van-dropdown-menu>
-				</view>
-				<!-- 需要循环的地方 -->
-				<view class="forindustry" v-for="item in industryList" :key="item.IndustrialManagementId">
-					<!-- 火锅底料这个位置 -->
-					<view class="industry-box industry-content">
-						<view class="industry-box-left">
-							<image src="@/static/img/top_ico.png" v-if="item.IsTop"
-								@click="isOverhead(item.IndustrialManagementId)"></image>
-							<image src="@/static/img/top_no_ico.png" v-else
-								@click="isOverhead(item.IndustrialManagementId)"></image>
-						</view>
-						<view class="industry-box-right" @click="goIndustryReport(item.IndustrialManagementId)">
-							<view class="ndustry-box-read">
-								<text>{{item.IndustryName}}</text>
-								<text v-if="item.IsRed" class="read"></text>
-							</view>
-							<view class="ndustry-box-arrow">
-								<text class="ndustry-box-text">{{item.UpdateTime}}更新</text>
-								<u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
-							</view>
-						</view>
-					</view>
-					<view class="content-box" v-if="item.IndustrialSubjectList.length>6">
-						<u-read-more :toggle="true" :show-height="item.IndustrialSubjectList.length>6 ? 140 :150"
-							:shadow-style="shadowStyle" close-text="展开" color="#D1D1D1">
-							<view class="read-more">
-								<view v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId"
-									@click="goIndustryReport(item.IndustrialManagementId)" class="text-box">
-									{{val.SubjectName}}</view>
-							</view>
-						</u-read-more>
-					</view>
-					<view class="content-box" v-else @click="goIndustryReport(item.IndustrialManagementId)">
-						<view class="read-more">
-							<view v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId"
-								class="text-box">{{val.SubjectName}}</view>
-						</view>
-					</view>
-				</view>
-				<u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20"
-					v-if="totalPage>1" />
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import strategy from "./components/strategy.vue"
-	import {
-		Throttle
-	} from '@/config/util.js'
-	import {
-		Reports
-	} from '@/config/api.js'
-	 let app = getApp()
-	export default {
-		components: {
-			strategy
-		},
-		data() {
-			return {
-				tabAct_id: null,
-				tabAct_idTwo: null,
-				tabBars: [],
-				pageNumFather: null,
-				shadowStyle: {
-					backgroundImage: "none"
-				},
-				tabBarsTow: [],
-				pitchOn: [{
-					name: '按最近更新排序',
-					id: 'NewTime'
-				}, {
-					name: '按推荐关注排序',
-					id: 'Recommend',
-				}],
-				pitchOnId: 'NewTime',
-				pitchOnName: '按最近更新排序',
-				isNum: 1,
-				strategyIndex: null,
-				strategyIndexTwo: 0,
-				isSwitchover: 1,
-				tradeList: [],
-				OrderColumn: '',
-				industryList: [],
-				loadText: {
-					loadmore: '上拉加载更多',
-					loading: '加载中',
-					nomore: '已经到底了'
-				},
-				refresh: false, //正在下拉
-				page_no: 1,
-				pageSize: 10,
-				status: 'loadmore',
-				haveData: true,
-				totalPage: '',
-				matchTypeName: '',
-				overallArrangement:[
-					{name:'新布局产业',id:'1'},{name:'深度研究产业',id:'2'},
-					],
-				overallArrangementId:1,
-				overallArrangementName:'新布局产业',
-				isScrollShow:false
-			}
-		},
-		onLoad(option) {
-			this.tabAct_id = option.tab || null
-			if (option.tabs!=='null'&&option.tabs) {
-				this.strategyIndex = 4
-				this.tabAct_idTwo = option.tabs
-			}
-			this.getClassify()
-		},
-		computed: {},
-		watch: {
-			//监听tabs的变化
-			tabAct_id: {
-				handler() {
-					if (this.strategyIndex == 4) {
-						this.getstrategyAll()
-					}else {
-						this.tabAct_idTwo=null
-					}
-					if (this.tabAct_id) {
-						this.OrderColumn = 'NewTime'
-						this.pitchOnId = 'NewTime'
-						this.overallArrangementName='新布局产业'
-						this.overallArrangementId=1//待完善
-						this.pitchOnName = '按最近更新排序'
-						this.page_no = 1;
-						this.refresh = true;
-						this.getIndustryList()
-						this.getTradeList()
-					}
-					if(this.isScrollShow){
-						this.selectComponent('#menuItem').toggle(false);
-						this.selectComponent('#menuPitch').toggle(false);
-						this.isScrollShow=false
-					}
-				},
-				immediate: true
-			}
-		},
-		methods: {
-			//获取一级事件
-			getClassify() {
-				Reports.getClassify().then(res => {
-					this.tabBars = res.Data.List
-					if (!this.tabAct_id) {
-						this.tabAct_id = res.Data.List[0].ChartPermissionId
-					}
-
-				})
-			},
-			//获取二级事件
-			getstrategyAll() {
-				Reports.getstrategyAll().then(res => {
-					this.tabBarsTow = res.Data.List
-					if (!this.tabAct_idTwo) {
-						this.tabAct_idTwo = res.Data.List[0].CategoryId
-					}
-					this.matchTypeName = res.Data.List[0].MatchTypeName
-				})
-			},
-			//tabs切换事件
-			toggleTab(item, index) {
-				this.strategyIndex = index
-				if (this.tabAct_id !== item.ChartPermissionId) {
-					this.tabAct_id = item.ChartPermissionId;
-					this.pageNum = 1;
-					uni.pageScrollTo({
-						scrollTop: 0,
-						duration: 0,
-					});
-				}
-			},
-			//tabs切换二级事件
-			toggleTabTwo(item, index) {
-				this.matchTypeName = item.MatchTypeName
-				this.strategyIndexTwo = index
-				if (this.tabAct_idTwo !== item.CategoryId) {
-					this.tabAct_idTwo = item.CategoryId;
-					this.pageNum = 1;
-					uni.pageScrollTo({
-						scrollTop: 0,
-						duration: 0,
-					});
-				}
-			},
-			//点击产业报告的筛选条件
-			pitchClick(item) {
-				this.pitchOnName = item.name
-				this.OrderColumn = item.id
-				if (this.pitchOnId !== item.id) {
-					this.pitchOnId = item.id;
-				}
-				this.page_no = 1;
-				this.refresh = true;
-				this.getIndustryList()
-				this.selectComponent('#menuPitch').toggle();
-				// uni.pageScrollTo({
-				// 	scrollTop: 0,
-				// 	duration: 300
-				// });
-				// this.isPitchOnShow = false
-			},
-			//获取报告所有品种接口
-			getTradeList() {
-				Reports.getTradeList({
-					ChartPermissionId: this.tabAct_id
-				}).then(res => {
-					if (res.Ret == 200) {
-						if (res.Data.List) {
-							this.tradeList = res.Data.List
-						} else {
-							this.tradeList = null
-						}
-					}
-				})
-			},
-			//获取产业报告所有品种接口
-			getIndustryList() {
-				Reports.getIndustryList({
-					ChartPermissionId: this.tabAct_id,
-					OrderColumn: this.OrderColumn,
-					PageSize: this.pageSize,
-					CurrentIndex: this.page_no
-				}).then(res => {
-					// this.industryList=res.Data.List
-					this.status = this.page_no < res.Data.Paging.Pages ? 'loadmore' : 'nomore';
-					this.totalPage = res.Data.Paging.Pages; //总页数
-					if (this.page_no === 1) {
-						this.industryList = res.Data.List || [];
-						this.haveData = this.industryList.length ? true : false
-						if (this.refresh) {
-							uni.stopPullDownRefresh();
-							this.refresh = false;
-						}
-					} else {
-						this.industryList = this.industryList.concat(res.Data.List)
-					}
-
-				})
-			},
-			//跳转季度策略
-			isClickHandle(id) {
-				uni.navigateTo({
-					url: '/pages/industrialReport/industrialReport?id=' + id
-				});
-			},
-			//跳转产业报告
-			goIndustryReport(id) {
-				uni.navigateTo({
-					url: '/pages/IndustryReport/IndustryReport?id=' + id
-				});
-			},
-
-			//点击顶置的图标
-			isOverhead(id) {
-				Reports.postToptt({
-					IndustrialManagementId: id
-				}).then(res => {
-					if (res.Ret === 200) {
-						this.page_no = 1;
-						this.refresh = true;
-						this.industryList = []
-						this.getIndustryList()
-						uni.showToast({
-							title: res.Msg,
-							duration: 2000
-						});
-					}
-				})
-			},
-			hideIsred(is) {
-				this.tabBarsTow[this.strategyIndexTwo].IsRed = is
-			},
-			/* 新布局产业选项*/
-			overallBtn(index,item){
-				if(this.overallArrangementId!==item.id){
-					this.overallArrangementId=item.id
-				}
-				this.overallArrangementName=item.name
-			},
-			/* 新布局产业选项确定按钮 */
-			replacementConfirm(){
-				 this.selectComponent('#menuItem').toggle();
-			},
-			/* 新布局产业选项重置按钮 */
-			replacementBtn(){
-				this.overallArrangementId=1
-				this.overallArrangementName='新布局产业'
-			},
-			/* 判断页面滚动 */
-			isscroll(){
-				this.isScrollShow=true
-			},
-		 /* 搜索 */
-			goSearch() {
-			this.$store.dispatch('checkHandle').then(res => {
-				  		app.globalData.isAuth = res.IsAuth;
-				  		app.globalData.isBind = res.IsBind;
-				  		if((!res.IsAuth) && (!res.IsBind)) { //已授权已绑定
-				  			uni.navigateTo({
-				  				url:'/pages/reportSearch/reportSearch',
-				  			});
-				  		}else if(res.IsAuth) { //未授权
-				  			uni.navigateTo({
-				  				url:'/pages/authGuide/authGuide'
-				  			})
-				  		}else if(res.IsBind && !res.IsAuth){ //已授权未绑定
-				  			uni.navigateTo({
-				  				url:'/pages/login/login'
-				  			})
-				  		}
-				  	})
-			},
-		},
-		/* 触底 */
-		onReachBottom: Throttle(function() {
-			this.isNum++
-			if (this.status === 'nomore') return;
-			this.status = 'loading';
-			this.page_no++;
-			this.getIndustryList()
-		}),
-		/* 下拉刷新 */
-		onPullDownRefresh: Throttle(function() {
-			if (this.strategyIndex == 4) {
-				this.pageNumFather = 1
-			} else {
-				this.industryList = []
-				this.pageNumFather = null
-				this.page_no = 1;
-				this.refresh = true;
-				this.getIndustryList()
-				this.getTradeList()
-			}
-			wx.stopPullDownRefresh();
-		}),
-		onShow() {
-			if (this.tabAct_id) {
-				this.getTradeList()
-			}
-
-		},
-		/**
-		 * 用户点击分享
-		 */
-		onShareAppMessage: function(res) {
-			console.log(this.tabAct_id);
-			return {
-				title: "报告",
-				path: '/pages/reportForm/reportForm?tab=' + this.tabAct_id + '&tabs=' + this.tabAct_idTwo,
-				success: (res) => {},
-				fail: (err) => {}
-			}
-		},
-		/**
-		 *监听页面滚动
-		 */
-		onPageScroll(){
-				if(this.isScrollShow){
-					this.selectComponent('#menuItem').toggle(false);
-					this.selectComponent('#menuPitch').toggle(false);
-					this.isScrollShow=false
-				}
-				 
-			}
-	}
-</script>
-
-<style lang="scss">
-  .reportForm-container {
-       background-color: #f6f6f6;
-	   height: 100vh;
-	   .index-fixed {
-	   	width: 750rpx;
-	   	position: fixed;
-	   	left: 0;
-	   	top: 0;
-	   	z-index: 999;
-	   	.index-header {
-	   		background-color: #fff;
-	   		padding: 32rpx 34rpx;
-	   		position: relative;
-	   		.sea_ipt_placeholder {
-	   			color: #8D8D8D;
-	   			opacity: 0.7;
-	   		}
-	   		.sea_ipt {
-	   			width: 100%;
-	   			height: 70rpx;
-	   			font-size: 30rpx;
-	   			color: #707070;
-	   			background-color: #F6F6F6;
-	   			padding: 0 34rpx 0 70rpx;
-	   			border-radius: 70rpx;
-	   			border: 1rpx solid #E5E5E5;
-	   		}
-	   		.search_ico {
-	   			display: block;
-	   			position: absolute;
-	   			color: #8D8D8D;
-	   			left: 60rpx;
-	   			top: 50%;
-	   			z-index: 100;
-	   			transform: translateY(-50%);
-	   		}
-	   	}
-	   	.tab-cont {
-	   		padding: 0 26rpx;
-	   		background-color: #fff;
-	   		font-size: 32rpx;
-	   		box-shadow: 0 3rpx 6rpx rgba(187,216,255,0.2);
-	   		.scroll-tab {
-	   			width: 100%;
-	   			white-space: nowrap;
-	   		}
-	   		.scroll-tab-item {
-	   			// flex-grow: 1;
-	   			text-align: center;
-	   			display: inline-block;
-	   			padding: 0 8rpx 30rpx 8rpx;
-	   			margin-right: 60rpx;
-	   			border-bottom: 8rpx solid transparent;
-	   			position: relative;
-	   			&:last-child {
-	   				margin-right: 0;
-	   			}
-	   			&.active {
-	   				border-bottom: none;
-	   				color: #2C83FF;
-	   				font-weight: 700;
-	   			}
-	   			.border_act {
-	   				width: 100%;
-	   				height: 8rpx;
-	   				position: absolute;
-	   				bottom: 0;
-	   				left: 0;
-	   			}
-	   		}
-	   	}
-	   }
-  .forindustry {
-	  margin-bottom: 10rpx;
-  }
-  .industrial_eport_one {
-	 padding-top: 180rpx;
-	 background-color:  #f6f6f6;
-	 padding-bottom: 10rpx;
-  }
-  .strategy {
-    margin-top: 20rpx;
-    height: 65rpx;
-    line-height: 65rpx;
-    background-color: #fff;
-    .row {
-      width: 100%;
-      height: 170rpx;
-      background-color: #f6f6f6;
-    }
-    .tab-cont-two {
-		position: fixed;
-		top: 100rpx;
-		left: 0;
-		width: 100%;
-		z-index: 99;
-		height: 100rpx;
-		background-color: #fff;
-       padding: 0 30rpx;
-      .scroll-tab-tow {
-		padding-top: 20rpx;
-        width: 100%;
-        white-space: nowrap;
-        .scroll-tab-item {
-          position: relative;
-          display: inline-block;
-          height: 54rpx;
-          line-height: 54rpx;
-          padding: 0 23rpx;
-          background: #F7F7F7;
-          border-radius: 27px;
-          color: #999999;
-          margin-right: 46rpx;
-          .reg-text {
-            position: absolute;
-            top: -6rpx;
-            right: -8rpx;
-            width: 14rpx;
-            height: 14rpx;
-            background-color: #FF0000;
-            border-radius: 50%;
-          }
-        }
-        .active {
-          color: #FFFFFF !important;
-          background-color: #2C83FF!important;
-        }
-      }
-    }
-  }
-  .industry {
-    margin-top: 20rpx;
-	.industry-sticky{
-		position: sticky;
-		top:210rpx;
-		z-index:99;
-	}
-    .industry-top {
-      display: flex;
-      background-color: #fff;
-      height: 90rpx;
-      padding: 0 30rpx;
-      color: #333333;
-      font-weight: 700;
-      font-size: 32rpx;
-      line-height:90rpx ;
-	  overflow: hidden;
-	  .img-top-box{
-		  display: flex;
-		  align-items: center;
-		  image {
-			  width: 44rpx;
-			  height: 44rpx;
-			  margin-right: 16rpx;
-		  }
-	  }
-	  .menu-items {
-		  display: flex;
-		  padding: 30rpx 30rpx 20rpx;
-		  .menu-items-box {
-			  flex: 1;
-			  display: flex;
-			  font-size: 28rpx;
-			  font-weight: 400;
-			  .items-box {
-				  width: 40rpx;
-			  }
-		  }
-	  }
-	  .menu-items-tow {
-		   padding: 30rpx 30rpx 20rpx;
-		   .items-tow {
-			  display: flex;
-			  flex: 100%;
-			  view {
-			  	width: 40rpx;
-			  }
-		   }   
-	  }
-	 .replacement {
-	 	margin: 0rpx 30rpx 20rpx;
-		display: flex;
-		background-color: #2C83FF;
-		opacity: 1;
-		height: 60rpx;
-		line-height: 58rpx;
-		font-size: 28rpx;
-		font-weight: 400;
-		color: #FFFFFF;
-		border-radius: 30rpx;
-		text {
-			flex: 1;
-			text-align: center;
-			
-		}
-		.replacement-box {
-			border: 1rpx solid #2C83FF;
-			opacity: 1;
-			color: #2C83FF;
-			background: #FFFFFF;
-			border-radius: 28rpx 0rpx 28rpx 28rpx;
-		}
-	 }
-    }
-    .industry-box{
-      margin-top: 5rpx;
-      background-color: #fff;
-      height: 90rpx;
-      line-height: 90rpx;
-      padding: 0 30rpx;
-      display:flex;
-      justify-content: space-between; 
-      color: #000000;
-      font-size: 30rpx;
-      .box-left {
-        position: relative;
-        // width: 150rpx;
-		padding-right: 30rpx;
-        height: 90rpx;
-         text {
-           position: absolute;
-           top: 20rpx;
-           right: 5rpx;
-           width: 14rpx;
-           height: 14rpx;
-           background-color: #f00;
-           border-radius: 50%;
-         }
-         
-      }
-      .box-right { 
-        color: #999999;
-        font-size: 26rpx;
-		// width: 45%;
-        display: flex;
-		justify-content: flex-end;
-        // justify-content: space-between;
-		text-align: right;
-		align-items: right;
-        u-icon {
-          padding-left:15rpx;
-        }
-      }
-    }
-    .industry-content {
-      padding-left: 40rpx;
-      vertical-align:middle;
-	  display: flex;
-      margin-bottom: 3rpx;
-      image {
-      padding-right: 20rpx;
-        width: 24rpx;
-        height: 30rpx;
-      }
-      .industry-box-left {
-		  width: 48rpx;
-		image {
-			vertical-align: middle;
-			 margin-top: -8rpx; 
-			 padding:5rpx 20rpx 5rpx 0;
-		}
-      }
-	  .industry-box-right {
-		  width: 100%;
-		  display: flex;
-		  justify-content: space-between;
-		  .ndustry-box-read {
-			  position: relative;
-			  .read {
-				  position: absolute;
-				  top: 20rpx;
-				  right: -20rpx;
-				  width: 14rpx;
-				  height: 14rpx;
-				  background-color: #FF0000;
-				  border-radius: 50%;
-			  }
-		  }
-		  .ndustry-box-arrow {
-			  display: flex;
-			  .ndustry-box-text {
-				  font-size: 26rpx;
-				  color: #999999;
-				  padding-right: 20rpx;
-			  }
-		  }
-	  }
-    
-  }
-  .content-box {
-    background-color: #fff;
-    padding: 20rpx 25rpx 0;
-      .img-box {
-         display: flex;
-        height: 90rpx;
-        line-height: 90rpx;
-       box-sizing: border-box;
-        width: 100%;
-        vertical-align:middle !important;
-        image {
-          padding-top: 18rpx;
-         width: 44rpx;
-         height: 44rpx;
-         vertical-align:middle;
-        }
-        text {
-          display: inline-block;
-          padding-left: 16rpx;
-           vertical-align:middle !important;
-        }
-      }
-    }
-  }
-  .read-more {
-   margin-left:60rpx;
-   display: flex;
-   flex-wrap: wrap;
-   .text-box {
-     // display: inline-block;
-     margin-bottom: 27rpx;
-     margin-right:40rpx;
-     padding: 0;
-     font-size: 24rpx;
-     color: #408FFF;
-     width: 170rpx;
-     height: 46rpx;
-     line-height: 46rpx;
-     text-align: center !important;
-     background:url(../../static/img/report_bg.png) no-repeat;
-     background-size: 100% 100%;
-     text-indent:0em;
-   }
-  }
-  
-  }
-  .text-bottom-none {
-	  width: 100%;
-  	  text-align: center;
-  }
-  .van-dropdown-menu {
-	  background-color: #fff;
-	   box-shadow: none !important;
-	  // align-items: center;
-	  padding-top: 20rpx;
-  }
- 
-	.van-dropdown-menu__item{
-		width: 190rpx;
-		padding-right: 20rpx;
-		margin-left: 20rpx;
-		height: 51rpx;
-        border-radius: 26rpx;
-		background: #F8F8FA;
-	}
-	.adasdasdas {
-		height: 100%!important;
-	}
-.van-dropdown-item{
-	margin-top: -10rpx;
-}
+<template>
+	<view class="reportForm-container">
+		<!-- tabs -->
+		<!-- tabs -->
+		<view class="index-fixed">
+			<view class="index-header">
+				<input type="text" placeholder="搜索您想要的报告" placeholder-class="sea_ipt_placeholder" class="sea_ipt"
+					v-model="searchTxt" disabled @click="goSearch" />
+				<icon type="search" size="15" class="search_ico" />
+			</view>
+			<view class="tab-cont">
+				<scroll-view scroll-x="true" scroll-with-animation class="scroll-tab" :scroll-into-view="'_'+tabIndex">
+					<block v-for="(item, index) in tabBars" :key="item.ChartPermissionId">
+						<view :id="'_'+index" class="scroll-tab-item"
+							:class="{ active: tabAct_id === item.ChartPermissionId }"
+							@click.stop="toggleTab(item,index)">
+							{{item.PermissionName}}
+							<image src="@/static/img/border_act.png" mode="" class="border_act"
+								v-if="tabAct_id === item.ChartPermissionId"></image>
+						</view>
+					</block>
+				</scroll-view>
+
+			</view>
+			<view class="lucency" v-if="tabBars.length>6"></view>
+		</view>
+		<!-- 内容 -->
+		<view class="strategy" v-if="strategyIndex==4">
+			<view class="tab-cont-two">
+				<scroll-view scroll-x="true" scroll-with-animation class="scroll-tab-tow">
+					<block v-for="(item, index) in tabBarsTow" :key="item.CategoryId">
+						<view :id="'_'+index" class="scroll-tab-item"
+							:class="{ active: tabAct_idTwo == item.CategoryId }" @click.stop="toggleTabTwo(item,index)">
+							{{item.MatchTypeName}}
+							<text class="reg-text" v-if="item.IsRed"></text>
+						</view>
+					</block>
+				</scroll-view>
+			</view>
+			<view class="row">
+
+			</view>
+			<!-- 子组件 -->
+			<strategy :strategyIndexTwo="strategyIndexTwo" :pageNumFather='pageNumFather' :matchTypeName="matchTypeName"
+				:tabAct_idTwo="tabAct_idTwo" :isNum="isNum" :isSwitchover="isSwitchover" @hideIsred="hideIsred" />
+		</view>
+		<!-- </view> -->
+		<view class="industrial_eport_one" v-else>
+			<!-- 行业报告 -->
+			<view class="industry" v-if="tradeList">
+				<view style="height: 20rpx;"></view>
+				<view class="industry-top">
+					<view class="img-top-box">
+						<image src="@/static/img/industry-ico.png"></image>
+						<text>行业综述</text>
+					</view>
+					<view>
+
+					</view>
+				</view>
+				<view class="industry-box" @click="isClickHandle(item.CategoryId)" v-for="item in tradeList"
+					:key="item.CategoryId">
+					<view class="box-left">
+						{{item.MatchTypeName}}
+						<text v-if="item.IsRed"></text>
+					</view>
+					<view class="box-right">
+						<text>{{item.UpdateTime}}更新</text>
+						<u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
+					</view>
+				</view>
+			</view>
+			<!-- 产业报告 -->
+			<view class="industry">
+				<view style="height: 12rpx;" v-if="!tradeList"></view>
+				<view class="industry-top industry-sticky">
+					<view class="img-top-box">
+						<image src="@/static/img/property_ico.png" style="height: 50rpx;"></image>
+						<text class="text-sub">细分产业</text>
+					</view>
+					<van-dropdown-menu active-color="#333333">
+						<van-dropdown-item id="menuItem" @open="isscroll" :title="overallArrangementName">
+							<view class="menu-items-tow">
+								<view class="items-tow" @click="pitchClick(item,index)" v-for="(item,index) in pitchOn"
+									:key="item.id">
+									<view>
+										<u-icon v-show="pitchOnId==item.id" name="checkbox-mark" color="#2C83FF"
+											size="24"></u-icon>
+									</view>
+									<text :class="pitchOnId==item.id?'items-act':''">{{item.name}}</text>
+								</view>
+							</view>
+							<view class="menu-dashed">
+
+							</view>
+							<view class="menu-items">
+								<view class="menu-items-box" @click="overallBtn(index,item)"
+									v-for="(item,index) in overallArrangement" :key="item.id">
+									<view class="items-box">
+										<u-icon v-show="item.isShow" name="checkbox-mark" color="#2C83FF" size="24">
+										</u-icon>
+									</view>
+									<text>{{item.name}}</text>
+								</view>
+							</view>
+							<view class="replacement-box">
+								<view class="replacement">
+									<text @click="replacementBtn" class="replacement-box">重置</text>
+									<text @click="replacementConfirm">确定</text>
+								</view>
+							</view>
+						</van-dropdown-item>
+					</van-dropdown-menu>
+				</view>
+				<!-- 需要循环的地方 -->
+				<view class="forindustry" v-for="item in industryList" :key="item.IndustrialManagementId">
+					<!-- 火锅底料这个位置 -->
+					<view class="industry-box industry-content">
+						<view class="industry-box-left">
+							<image src="@/static/img/top_ico.png" v-if="item.IsTop"
+								@click="isOverhead(item.IndustrialManagementId)"></image>
+							<image src="@/static/img/top_no_ico.png" v-else
+								@click="isOverhead(item.IndustrialManagementId)"></image>
+						</view>
+						<view class="industry-box-right" @click="goIndustryReport(item.IndustrialManagementId)">
+							<view class="ndustry-box-read">
+								<text>{{item.IndustryName}}</text>
+								<text v-if="item.IsRed" class="read"></text>
+							</view>
+							<view class="ndustry-box-arrow">
+								<text class="ndustry-box-text">{{item.UpdateTime}}更新</text>
+								<u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
+							</view>
+						</view>
+					</view>
+					<view class="content-box" v-if="item.IndustrialSubjectList.length>6">
+						<u-read-more :toggle="true" :show-height="item.IndustrialSubjectList.length>6 ? 140 :150"
+							:shadow-style="shadowStyle" close-text="展开" color="#D1D1D1">
+							<view class="read-more">
+								<view v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId"
+									@click="goIndustryReport(item.IndustrialManagementId)" class="text-box">
+									{{val.SubjectName}}
+								</view>
+							</view>
+						</u-read-more>
+					</view>
+					<view class="content-box" v-else @click="goIndustryReport(item.IndustrialManagementId)">
+						<view class="read-more">
+							<view v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId"
+								class="text-box">{{val.SubjectName}}</view>
+						</view>
+					</view>
+				</view>
+				<u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20"
+					v-if="totalPage>1" />
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import strategy from "./components/strategy.vue"
+	import {
+		Throttle
+	} from '@/config/util.js'
+	import {
+		Reports
+	} from '@/config/api.js'
+	let app = getApp()
+	export default {
+		components: {
+			strategy
+		},
+		data() {
+			return {
+				tabAct_id: null,
+				tabAct_idTwo: null,
+				tabBars: [],
+				pageNumFather: null,
+				shadowStyle: {
+					backgroundImage: "none"
+				},
+				tabBarsTow: [],
+				pitchOn: [{
+					name: '按最近更新排序',
+					id: 'NewTime'
+				}, {
+					name: '按推荐关注排序',
+					id: 'Recommend',
+				}],
+				pitchOnId: 'NewTime',
+				//pitchOnName: '按最近更新排序',
+				isNum: 1,
+				strategyIndex: null,
+				strategyIndexTwo: 0,
+				isSwitchover: 1,
+				tradeList: [],
+				OrderColumn: '',
+				industryList: [],
+				loadText: {
+					loadmore: '上拉加载更多',
+					loading: '加载中',
+					nomore: '已经到底了'
+				},
+				refresh: false, //正在下拉
+				page_no: 1,
+				pageSize: 10,
+				status: 'loadmore',
+				haveData: true,
+				totalPage: '',
+				matchTypeName: '',
+				overallArrangement: [{
+					name: '新布局产业',
+					id: '1',
+					isShow: false
+				}, {
+					name: '深度研究产业',
+					id: '2',
+					isShow: false
+				}, ],
+				overallArrangementId: '',
+				overallArrangementName: '按最近更新排序',
+				isScrollShow: false
+			}
+		},
+		onLoad(option) {
+			this.tabAct_id = option.tab || null
+			if (option.tabs !== 'null' && option.tabs) {
+				this.strategyIndex = 4
+				this.tabAct_idTwo = option.tabs
+			}
+			this.getClassify()
+		},
+		computed: {},
+		watch: {
+			//监听tabs的变化
+			tabAct_id: {
+				handler() {
+					if (this.strategyIndex == 4) {
+						this.getstrategyAll()
+					} else {
+						this.tabAct_idTwo = null
+					}
+					if (this.tabAct_id) {
+						this.OrderColumn = 'NewTime'
+						this.pitchOnId = 'NewTime'
+						this.overallArrangementName = '按最近更新排序'
+						this.overallArrangementId = '' //待完善
+						//this.pitchOnName = '按最近更新排序'
+						this.page_no = 1;
+						this.refresh = true;
+						this.getIndustryList()
+						this.getTradeList()
+					}
+					if (this.isScrollShow) {
+						this.selectComponent('#menuItem').toggle(false);
+						//this.selectComponent('#menuPitch').toggle(false);
+						this.isScrollShow = false
+					}
+					this.overallArrangement.forEach(key => key.isShow = false)
+				},
+				immediate: true
+			}
+		},
+		methods: {
+			//获取一级事件
+			getClassify() {
+				Reports.getClassify().then(res => {
+					this.tabBars = res.Data.List
+					if (!this.tabAct_id) {
+						this.tabAct_id = res.Data.List[0].ChartPermissionId
+					}
+
+				})
+			},
+			//获取二级事件
+			getstrategyAll() {
+				Reports.getstrategyAll().then(res => {
+					this.tabBarsTow = res.Data.List
+					if (!this.tabAct_idTwo) {
+						this.tabAct_idTwo = res.Data.List[0].CategoryId
+					}
+					this.matchTypeName = res.Data.List[0].MatchTypeName
+				})
+			},
+			//tabs切换事件
+			toggleTab(item, index) {
+				this.strategyIndex = index
+				if (this.tabAct_id !== item.ChartPermissionId) {
+					this.tabAct_id = item.ChartPermissionId;
+					this.pageNum = 1;
+					uni.pageScrollTo({
+						scrollTop: 0,
+						duration: 0,
+					});
+				}
+			},
+			//tabs切换二级事件
+			toggleTabTwo(item, index) {
+				this.matchTypeName = item.MatchTypeName
+				this.strategyIndexTwo = index
+				if (this.tabAct_idTwo !== item.CategoryId) {
+					this.tabAct_idTwo = item.CategoryId;
+					this.pageNum = 1;
+					uni.pageScrollTo({
+						scrollTop: 0,
+						duration: 0,
+					});
+				}
+			},
+			//点击产业报告的筛选条件
+			pitchClick(item) {
+				this.pitchOnName = item.name
+				this.OrderColumn = item.id
+				if (this.pitchOnId !== item.id) {
+					this.pitchOnId = item.id;
+				}
+			},
+			//获取报告所有品种接口
+			getTradeList() {
+				Reports.getTradeList({
+					ChartPermissionId: this.tabAct_id
+				}).then(res => {
+					if (res.Ret == 200) {
+						if (res.Data.List) {
+							this.tradeList = res.Data.List
+						} else {
+							this.tradeList = null
+						}
+					}
+				})
+			},
+			//获取产业报告所有品种接口
+			getIndustryList() {
+				Reports.getIndustryList({
+					ChartPermissionId: this.tabAct_id,
+					OrderColumn: this.OrderColumn,
+					PageSize: this.pageSize,
+					CurrentIndex: this.page_no,
+					IsNewLabel: this.overallArrangementId.includes(1) ? '1' : '0',
+					IsDeepLabel: this.overallArrangementId.includes(2) ? '1' : '0'
+				}).then(res => {
+					// this.industryList=res.Data.List
+					this.status = this.page_no < res.Data.Paging.Pages ? 'loadmore' : 'nomore';
+					this.totalPage = res.Data.Paging.Pages; //总页数
+					if (this.page_no === 1) {
+						this.industryList = res.Data.List || [];
+						this.haveData = this.industryList.length ? true : false
+						if (this.refresh) {
+							uni.stopPullDownRefresh();
+							this.refresh = false;
+						}
+					} else {
+						this.industryList = this.industryList.concat(res.Data.List)
+					}
+
+				})
+			},
+			//跳转季度策略
+			isClickHandle(id) {
+				uni.navigateTo({
+					url: '/pages/industrialReport/industrialReport?id=' + id
+				});
+			},
+			//跳转产业报告
+			goIndustryReport(id) {
+				uni.navigateTo({
+					url: '/pages/IndustryReport/IndustryReport?id=' + id
+				});
+			},
+
+			//点击顶置的图标
+			isOverhead(id) {
+				Reports.postToptt({
+					IndustrialManagementId: id
+				}).then(res => {
+					if (res.Ret === 200) {
+						this.page_no = 1;
+						this.refresh = true;
+						this.industryList = []
+						this.getIndustryList()
+						uni.showToast({
+							title: res.Msg,
+							duration: 2000
+						});
+					}
+				})
+			},
+			hideIsred(is) {
+				this.tabBarsTow[this.strategyIndexTwo].IsRed = is
+			},
+			/* 新布局产业选项*/
+			overallBtn(index, item) {
+				this.overallArrangement.forEach(key => {
+					if (key.id == item.id) {
+						key.isShow = !key.isShow
+					}
+				})
+
+			},
+			/* 新布局产业选项确定按钮 */
+			replacementConfirm() {
+				const arr = []
+				this.overallArrangement.forEach(key => {
+					if (key.isShow) {
+						arr.push(key.id)
+					}
+				})
+				this.overallArrangementId = arr.join(',')
+				this.overallArrangementName = this.pitchOnName
+				this.page_no = 1;
+				this.status = 'loadmore'
+				this.getIndustryList()
+				this.selectComponent('#menuItem').toggle();
+			},
+			/* 新布局产业选项重置按钮 */
+			replacementBtn() {
+				this.overallArrangement.forEach(key => key.isShow = false)
+				this.overallArrangementName = '按最近排序更新'
+			},
+			/* 判断页面滚动 */
+			isscroll() {
+				this.isScrollShow = true
+			},
+			/* 搜索 */
+			goSearch() {
+				this.$store.dispatch('checkHandle').then(res => {
+					app.globalData.isAuth = res.IsAuth;
+					app.globalData.isBind = res.IsBind;
+					if ((!res.IsAuth) && (!res.IsBind)) { //已授权已绑定
+						uni.navigateTo({
+							url: '/pages/reportSearch/reportSearch',
+						});
+					} else if (res.IsAuth) { //未授权
+						uni.navigateTo({
+							url: '/pages/authGuide/authGuide'
+						})
+					} else if (res.IsBind && !res.IsAuth) { //已授权未绑定
+						uni.navigateTo({
+							url: '/pages/login/login'
+						})
+					}
+				})
+			},
+		},
+		/* 触底 */
+		onReachBottom: Throttle(function() {
+			this.isNum++
+			if (this.status === 'nomore') return;
+			this.status = 'loading';
+			this.page_no++;
+			this.getIndustryList()
+		}),
+		/* 下拉刷新 */
+		onPullDownRefresh: Throttle(function() {
+			if (this.strategyIndex == 4) {
+				this.pageNumFather = 1
+			} else {
+				this.industryList = []
+				this.pageNumFather = null
+				this.page_no = 1;
+				this.refresh = true;
+				this.getIndustryList()
+				this.getTradeList()
+			}
+			wx.stopPullDownRefresh();
+		}),
+		onShow() {
+			if (this.tabAct_id) {
+				this.getTradeList()
+			}
+
+		},
+		/**
+		 * 用户点击分享
+		 */
+		onShareAppMessage: function(res) {
+			console.log(this.tabAct_id);
+			return {
+				title: "报告",
+				path: '/pages/reportForm/reportForm?tab=' + this.tabAct_id + '&tabs=' + this.tabAct_idTwo,
+				success: (res) => {},
+				fail: (err) => {}
+			}
+		},
+		/**
+		 *监听页面滚动
+		 */
+		onPageScroll() {
+			if (this.isScrollShow) {
+				this.selectComponent('#menuItem').toggle(false);
+				//this.selectComponent('#menuPitch').toggle(false);
+				this.isScrollShow = false
+			}
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.reportForm-container {
+		background-color: #f6f6f6;
+		height: 100vh;
+
+		.index-fixed {
+			width: 750rpx;
+			position: fixed;
+			left: 0;
+			top: 0;
+			z-index: 999;
+
+			.index-header {
+				background-color: #fff;
+				padding: 32rpx 34rpx;
+				position: relative;
+
+				.sea_ipt_placeholder {
+					color: #8D8D8D;
+					opacity: 0.7;
+				}
+
+				.sea_ipt {
+					width: 100%;
+					height: 70rpx;
+					font-size: 30rpx;
+					color: #707070;
+					background-color: #F6F6F6;
+					padding: 0 34rpx 0 70rpx;
+					border-radius: 70rpx;
+					border: 1rpx solid #E5E5E5;
+				}
+
+				.search_ico {
+					display: block;
+					position: absolute;
+					color: #8D8D8D;
+					left: 60rpx;
+					top: 50%;
+					z-index: 100;
+					transform: translateY(-50%);
+				}
+			}
+
+			.tab-cont {
+				padding: 0 26rpx;
+				background-color: #fff;
+				font-size: 32rpx;
+
+				.scroll-tab {
+					width: 100%;
+					white-space: nowrap;
+				}
+
+				.scroll-tab-item {
+					// flex-grow: 1;
+					text-align: center;
+					display: inline-block;
+					padding: 0 8rpx 30rpx 8rpx;
+					margin-right: 70rpx;
+					border-bottom: 8rpx solid transparent;
+					position: relative;
+
+					&:last-child {
+						margin-right: 0;
+					}
+
+					&.active {
+						border-bottom: none;
+						color: #2C83FF;
+						font-weight: 700;
+					}
+
+					.border_act {
+						width: 100%;
+						height: 8rpx;
+						position: absolute;
+						bottom: 0;
+						left: 0;
+					}
+				}
+			}
+		}
+
+		.forindustry {
+			margin-bottom: 10rpx;
+		}
+
+		.industrial_eport_one {
+			padding-top: 180rpx;
+			background-color: #f6f6f6;
+			padding-bottom: 10rpx;
+		}
+
+		.strategy {
+			margin-top: 20rpx;
+			height: 65rpx;
+			line-height: 65rpx;
+			background-color: #fff;
+
+			.row {
+				width: 100%;
+				height: 170rpx;
+				background-color: #f6f6f6;
+			}
+
+			.tab-cont-two {
+				position: fixed;
+				top: 210rpx;
+				left: 0;
+				width: 100%;
+				z-index: 99;
+				height: 100rpx;
+				background-color: #fff;
+				padding: 0 30rpx;
+
+				.scroll-tab-tow {
+					padding-top: 20rpx;
+					width: 100%;
+					white-space: nowrap;
+
+					.scroll-tab-item {
+						position: relative;
+						display: inline-block;
+						height: 54rpx;
+						line-height: 54rpx;
+						padding: 0 23rpx;
+						background: #F7F7F7;
+						border-radius: 27px;
+						color: #999999;
+						margin-right: 46rpx;
+
+						.reg-text {
+							position: absolute;
+							top: -6rpx;
+							right: -8rpx;
+							width: 14rpx;
+							height: 14rpx;
+							background-color: #FF0000;
+							border-radius: 50%;
+						}
+					}
+
+					.active {
+						color: #FFFFFF !important;
+						background-color: #2C83FF !important;
+					}
+				}
+			}
+		}
+
+		.industry {
+			margin-top: 20rpx;
+
+			.industry-sticky {
+				position: sticky;
+				top: 210rpx;
+				z-index: 99;
+			}
+
+			.industry-top {
+				display: flex;
+				justify-content: space-between;
+				background-color: #fff;
+				height: 90rpx;
+				padding: 0 30rpx;
+				color: #333333;
+				font-weight: 700;
+				font-size: 32rpx;
+				line-height: 90rpx;
+				overflow: hidden;
+
+				.img-top-box {
+					display: flex;
+					align-items: center;
+
+					image {
+						width: 44rpx;
+						height: 44rpx;
+						margin-right: 16rpx;
+					}
+				}
+
+				.menu-items {
+					background-color: #F8F8FA;
+					display: flex;
+					padding: 0rpx 30rpx 20rpx;
+
+					.menu-items-box {
+						flex: 1;
+						display: flex;
+						font-size: 28rpx;
+						font-weight: 400;
+
+						.items-box {
+							width: 40rpx;
+						}
+					}
+				}
+
+				.menu-dashed {
+					margin: 0 auto;
+					width: 682rpx;
+					border-bottom: 3rpx dashed #999999;
+				}
+
+				.menu-items-tow {
+					display: flex;
+					padding: 30rpx 30rpx 20rpx;
+					font-size: 28rpx;
+					color: #333333;
+					font-weight: 400;
+					background-color: #F8F8FA;
+
+					.items-tow {
+						display: flex;
+						flex: 100%;
+
+						view {
+							width: 40rpx;
+						}
+					}
+
+					.items-act {
+						font-weight: bold;
+					}
+				}
+
+				.replacement-box {
+					background-color: #F8F8FA;
+				}
+
+				.replacement {
+					margin: 0rpx 30rpx 20rpx;
+					display: flex;
+					background-color: #2C83FF;
+					opacity: 1;
+					height: 60rpx;
+					line-height: 58rpx;
+					font-size: 28rpx;
+					font-weight: 400;
+					color: #FFFFFF;
+					border-radius: 30rpx;
+
+					text {
+						flex: 1;
+						text-align: center;
+
+					}
+
+					.replacement-box {
+						border: 1rpx solid #2C83FF;
+						opacity: 1;
+						color: #2C83FF;
+						background: #FFFFFF;
+						border-radius: 28rpx 0rpx 28rpx 28rpx;
+					}
+				}
+			}
+
+			.industry-box {
+				margin-top: 5rpx;
+				background-color: #fff;
+				height: 90rpx;
+				line-height: 90rpx;
+				padding: 0 30rpx;
+				display: flex;
+				justify-content: space-between;
+				color: #000000;
+				font-size: 30rpx;
+
+				.box-left {
+					position: relative;
+					// width: 150rpx;
+					padding-right: 30rpx;
+					height: 90rpx;
+
+					text {
+						position: absolute;
+						top: 20rpx;
+						right: 5rpx;
+						width: 14rpx;
+						height: 14rpx;
+						background-color: #f00;
+						border-radius: 50%;
+					}
+
+				}
+
+				.box-right {
+					color: #999999;
+					font-size: 26rpx;
+					// width: 45%;
+					display: flex;
+					justify-content: flex-end;
+					// justify-content: space-between;
+					text-align: right;
+					align-items: right;
+
+					u-icon {
+						padding-left: 15rpx;
+					}
+				}
+			}
+
+			.industry-content {
+				padding-left: 40rpx;
+				vertical-align: middle;
+				display: flex;
+				margin-bottom: 3rpx;
+
+				image {
+					padding-right: 20rpx;
+					width: 24rpx;
+					height: 30rpx;
+				}
+
+				.industry-box-left {
+					width: 48rpx;
+
+					image {
+						vertical-align: middle;
+						margin-top: -8rpx;
+						padding: 5rpx 20rpx 5rpx 0;
+					}
+				}
+
+				.industry-box-right {
+					width: 100%;
+					display: flex;
+					justify-content: space-between;
+
+					.ndustry-box-read {
+						position: relative;
+
+						.read {
+							position: absolute;
+							top: 20rpx;
+							right: -20rpx;
+							width: 14rpx;
+							height: 14rpx;
+							background-color: #FF0000;
+							border-radius: 50%;
+						}
+					}
+
+					.ndustry-box-arrow {
+						display: flex;
+
+						.ndustry-box-text {
+							font-size: 26rpx;
+							color: #999999;
+							padding-right: 20rpx;
+						}
+					}
+				}
+
+			}
+
+			.content-box {
+				background-color: #fff;
+				padding: 20rpx 25rpx 0;
+
+				.img-box {
+					display: flex;
+					height: 90rpx;
+					line-height: 90rpx;
+					box-sizing: border-box;
+					width: 100%;
+					vertical-align: middle !important;
+
+					image {
+						padding-top: 18rpx;
+						width: 44rpx;
+						height: 44rpx;
+						vertical-align: middle;
+					}
+
+					text {
+						display: inline-block;
+						padding-left: 16rpx;
+						vertical-align: middle !important;
+					}
+				}
+			}
+		}
+
+		.read-more {
+			margin-left: 60rpx;
+			display: flex;
+			flex-wrap: wrap;
+
+			.text-box {
+				// display: inline-block;
+				margin-bottom: 27rpx;
+				margin-right: 40rpx;
+				padding: 0;
+				font-size: 24rpx;
+				color: #408FFF;
+				width: 170rpx;
+				height: 46rpx;
+				line-height: 46rpx;
+				text-align: center !important;
+				background: url(../../static/img/report_bg.png) no-repeat;
+				background-size: 100% 100%;
+				text-indent: 0em;
+			}
+		}
+
+		/deep/ .van-dropdown-menu {
+			background-color: #fff;
+			box-shadow: none !important;
+			// align-items: center;
+			padding-top: 20rpx;
+		}
+
+		/deep/ .van-ellipsis {
+			color: #333333 !important;
+			font-size: 24rpx;
+			font-weight: 400;
+		}
+
+		/deep/ .van-dropdown-menu__item {
+			// width: 190rpx;
+			padding-right: 20rpx;
+			margin-left: 20rpx;
+			height: 51rpx;
+			border-radius: 26rpx;
+			background: #F8F8FA;
+		}
+
+		/deep/.van-dropdown-item {
+			margin-top: -10rpx;
+		}
+	}
+
+	.text-bottom-none {
+		width: 100%;
+		text-align: center;
+	}
 </style>

pages/reportSearch/reportSearch.vue

@@ -38,31 +38,35 @@
 			</template>
 			<template v-else>
 				<block v-if="haveResult">
-					<view class="result-data">
+					<view class="">
 						<view class="report-ul">
-							<view class="report-item" v-for="(report,index) in resultList" :key="index" v-if="index%2 === 0" @click="goDetail(report)">
-								<!-- <view class="item-content">{{report.content}}</view> -->
-								<view class="item-content"><u-parse :html="report.Body[0]+'...'"></u-parse></view>
-								<view class="line"></view>
-								<view class="item-title"><u-parse :html="report.Title"></u-parse></view>
-								<view class="item-abstract" v-if="report.abstract">
-									<image src="@/static/img/report_ico.png" class="report_ico"></image>
-									{{report.abstract}}
+							<view class="report-item" v-for="(item,index) in resultList" :key="index" >
+								<view class="box-text" @click="goDetail(item)">
+										<view class="" style="padding-left: 30rpx;">
+											{{item.IndustryName}}
+										</view>
+										<view class="text-time">
+											<text style="padding-right: 20rpx;">{{item.UpdateTime}}更新</text>
+											<u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
+										</view>
 								</view>
-								<text class="item-createtime">{{report.PublishDate}}</text>
-							</view>
-						</view>
-						<view class="report-ul">
-							<view class="report-item" v-for="(report,index) in resultList" :key="index"  v-if="index%2 !== 0" @click="goDetail(report)">
-								<!-- <view class="item-content">{{report.content}}</view> -->
-								<view class="item-content"><u-parse :html="report.Body[0]+'...'"></u-parse></view>
-								<view class="line"></view>
-								<view class="item-title"><u-parse :html="report.Title"></u-parse></view>
-								<view class="item-abstract" v-if="report.ExpertBackground">
-									<image src="@/static/img/report_ico.png" class="report_ico"></image>
-									{{report.ExpertBackground}}
+								<view class="" v-if="item.IndustrialSubjectList.length>6">
+									<u-read-more :shadow-style="shadowStyle" close-text="展开" color='#D1D1D1'  :show-height="item.IndustrialSubjectList.length>6 ? 170 :200" :toggle="true">
+											<view class="arrow-box">
+												<view  @click="goDetail(item)" class="box-subject"  v-for="key in item.IndustrialSubjectList" :key="key.RecommendedIndex">
+													{{key.SubjectName}}
+												</view>
+											</view>
+									</u-read-more>
 								</view>
-								<text class="item-createtime">{{report.PublishDate}}</text>
+								<view class="" v-else  @click="goDetail(item)">
+									<view class="arrow-box">
+										<view class="box-subject"  v-for="key in item.IndustrialSubjectList" :key="key.RecommendedIndex">
+											{{key.SubjectName}}
+										</view>
+									</view>
+								</view>
+							
 							</view>
 						</view>
 					</view>
@@ -79,7 +83,7 @@
 </template>
 
 <script>
-	import { Search } from '@/config/api.js';
+	import { Search ,Reports} from '@/config/api.js';
 	import { Debounce,Throttle } from '@/config/util.js'
 	export default {
 		data() {
@@ -97,51 +101,24 @@
 				page_no: 1,
 				pageSize: 10,
 				totalPage: 0,
-				orderColumn:'Matching',
 				loadText:{
 					loadmore: '上拉加载更多',
 					loading: '加载中',
-					nomore: '已经到底了'
+					nomore: ''
 				},
-				status:'loadmore',
-				tabAct_id: 1,
-				isTabAct:true,
-				tabBars: [ {
-        					PermissionName: '匹配度排序',
-							ChartPermissionId:1,
-							mode:'Matching'
-        				}, 
-						{
-									PermissionName: '综合排序',
-									ChartPermissionId:2,
-									mode:'Comprehensive'
-								},
-						{
-        					PermissionName: '发布时间排序',
-							ChartPermissionId:3,
-							mode:'PublishDate'
-        				}],
+				status:'loadmore',		
+				shadowStyle: {
+					backgroundImage: "none"
+				}
 			};
 
 		},
 		watch:{
 			searchTxt(newVal) {
 				if(newVal.length <= 0) {
-					this.tabAct_id=1
 					this.isResult = false;
 				}
 			},
-      //监听tabs的变化
-      tabAct_id: {
-      			handler() {
-					if(this.isTabAct){
-						// console.log(111)
-						// this.getDataList();
-					}
-      				
-      			},
-      			// immediate:true
-      		}
 		},
 		methods:{
 			/* 获取关键词 */
@@ -185,7 +162,7 @@
 					//添加搜索记录
 					if(!this.historySearchList.includes(this.searchTxt)) {
 						this.historySearchList.unshift(this.searchTxt);
-						this.$db.set('historySearchList',JSON.stringify(this.historySearchList))
+						this.$db.set('historySearchListReport',JSON.stringify(this.historySearchList))
 					}
 					this.resultList = [];
 					this.page_no = 1;
@@ -197,22 +174,21 @@
 			// 查找数据
 			getDataList() {
 				this.isResult = true;
-				Search.getResult({
+				Reports.getIndustryList({
 					KeyWord: this.searchTxt,
-					// PageSize: this.pageSize,
-					// CurrentIndex: this.page_no,
-					OrderColumn:this.orderColumn
+					PageSize: this.pageSize,
+					CurrentIndex: this.page_no,
 				}).then(res => {
 					if(res.Ret === 200) {
-						// this.status = this.page_no < res.Data.Paging.Pages ? 'loadmore' : 'nomore';
-						this.status = 'nomore';
-						this.totalPage = res.Data.Paging.Pages;//总页数
 						if(this.page_no === 1) {
 							this.resultList = res.Data.List || [];
 							this.haveResult = this.resultList.length ? true : false
 						}else {
 							this.resultList = this.resultList.concat(res.Data.List)
 						}
+						if(!this.haveResult) return
+						this.status = this.page_no < res.Data.Paging.Pages ? 'loadmore' : 'nomore'
+						this.totalPage = res.Data.Paging.Pages;//总页数
 					}
 				})
 			},
@@ -225,52 +201,48 @@
 			},
 			/* 表单清空 */
 			clearIpt() {
-				
 				this.searchTxt = '';
 				this.isTabAct=false
-				this.orderColumn='Matching'
-				// 
 			},
 			/* 历史搜索清空 */
 			clearHistory() {
 				this.historySearchList = [];
-				this.$db.del('historySearchList');
+				this.$db.del('historySearchListReport');
 			},
 			/* 进入详情 校验是否有该品种权限 */
 			goDetail(item) {
 				uni.navigateTo({
-					url:'/pages/reportDetail/reportDetail?id=' + item.ArticleId,
+					url:'/pages/reportDetail/reportDetail?id=' + item.IndustrialManagementId,
 				});
 				
 			},
 		},
 		/* 触底 */
 		onReachBottom: Throttle(function() {
-			// this.status = 'nomore';
 			if(this.isResult) {
-				// if(this.status === 'nomore') return ;
-				
-				// this.page_no++;
-				// this.getDataList();				
+				if(this.status === 'nomore') return ;
+				this.status = 'loading';
+				this.page_no++;
+				this.getDataList();				
 			}
 		}),
 		onLoad() {
 			// 获取历史搜索记录
-			if(this.$db.get('historySearchList')) {
-				let historyList = JSON.parse(this.$db.get('historySearchList'));
+			if(this.$db.get('historySearchListReport')) {
+				let historyList = JSON.parse(this.$db.get('historySearchListReport'));
 				this.historySearchList = historyList;
 			}
 		},
 		onShow() {
-			this.getKeyWord();
-			
+			this.getKeyWord()		
 		}
 	}
 </script>
 
 <style lang="scss">
 .searchTarget-container {
-	background-color: #fff;
+	background-color: #f6f6f6;
+	padding-bottom: 30rpx;
 	.searchTarget-header {
 		padding: 0 34rpx;
 		width: 100%;
@@ -320,6 +292,45 @@
 			}
 		}
 	}
+	.report-item {
+		margin-top: 10rpx;
+		width: 100%;
+		background-color: #fff;
+		.box-text {
+			display: flex;
+			justify-content: space-between;
+			background-color: #fff;
+			align-items: center;
+			padding: 0 30rpx;
+			height: 91rpx;
+			color: #333333;
+			font-size: 30rpx;
+			.text-time {
+				display: flex;
+				color: #999999;
+				font-size: 26rpx;
+			}
+		}
+		.arrow-box {
+			display: flex;
+			flex-wrap: wrap;
+			border-top:3rpx solid #f6f6f6;
+			padding: 30rpx 30rpx 0;
+			.box-subject {
+				margin-bottom: 30rpx;
+				margin-left: 40rpx;
+				background:url(../../static/img/report_bg.png) no-repeat;
+				background-size: 100% 100%;
+				width: 170rpx;
+				height: 46rpx;
+				color: #408FFF;
+				text-align: center !important;
+				font-size: 24rpx;
+				line-height: 46rpx;
+				text-indent:0em;
+			}
+		}
+	}
 	.search-cont {
 		padding-top: 130rpx;
 		.search-cont-top {
@@ -385,67 +396,8 @@
 			padding: 20rpx 34rpx 40rpx;
 			display: flex;
 			background-color: #F7F7F7;
-			.report-ul {
-				width: 50%;
-				&:first-child {
-					margin-right: 10rpx;
-				}
-				.report-item {
-					padding: 20rpx 20rpx 24rpx 20rpx;
-					margin-bottom: 20rpx;
-					border-radius: 8rpx;
-					box-shadow: 0 3rpx 6rpx rgba($color: #000000, $alpha: 0.16);
-					background: #fff;
-					.item-content {
-						// height: 273rpx;
-						font-size: 24rpx;
-						line-height: 40rpx;
-						color: #7F7F7F;
-						display: -webkit-box;
-						// text-overflow:ellipsis;
-						// overflow: hidden;
-						text {
-							display: inline;
-						}
-					}
-					.line {
-						margin: 18rpx 0;
-						content: '';
-						width: 100%;
-						height: 1px;
-						padding: 0 32rpx;
-						box-sizing: border-box;
-						background-color: #E5E5E5;
-						-webkit-transform: scale(1, 0.5);
-						transform: scale(1, 0.5);
-						-webkit-transform-origin: center bottom;
-						transform-origin: center bottom;
-					}
-					.item-title {
-						font-size: 28rpx;
-						color: #4A4A4A;
-						margin-bottom: 10rpx;
-						text {
-							display: inline;
-						}
-					}
-					.item-abstract {
-						font-size: 26rpx;
-						color: #6A6A6A;
-						margin-bottom: 10rpx;
-						.report_ico {
-							width: 32rpx;
-							height: 26rpx;
-							margin-right: 20rpx;
-							display: inline-block;
-						}
-					}
-					.item-createtime {
-						color: #ACACAC;
-						font-size: 24rpx;
-					}
-				}
-			}
+				
+			
 		}
 	}
   	.tab-cont {
@@ -486,5 +438,8 @@
   				}
   			}
   		}
+		.u-line {
+			display: none !important;
+		}
 }
 </style>