4.0提测

App.vue

@@ -219,4 +219,19 @@
 		background-color: #F2F2F2 !important;
 		color: #07C160 !important;
 	}
+	
+	.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>

activityPages/activityDetail/activityDetail.vue

@@ -15,6 +15,10 @@
 						<text style="color: #333;">{{detailData.ActivityTypeName}}</text>
 						<image v-if="detailData.City" style="margin-left: 15rpx" src="../../static/img/location.png" mode=""></image>
 						<text v-if="detailData.City">{{detailData.City}}</text>
+					</view>
+					<view class="choose-limit" @click="strictSelection" v-if="detailData.IsShowSustainable">
+						<image src="../../static/img/choose_icon.png" mode=""></image>
+						<image class="limit-img" src="../../static/img/limit_icon.png" mode=""></image>
 					</view>
 				</view>
 				<view v-if="detailData.ChartPermissionName" class="network">
@@ -122,6 +126,9 @@
 						<view @click="meetingReminderAdd" class="make-conference" v-else>
 							会议提醒
 							<text>(会前15分钟推送微信消息提醒)</text>
+						</view>
+						<view v-if="detailData.ActivityTypeId==1" class="make-generation make-conference" @click="askingGo">
+							帮我代问
 						</view>
 					</view>
 				</view>
@@ -321,8 +328,13 @@
 			},
 			goDetail() {
 				uni.navigateTo({
-					url: '/pages/reportDetail/reportDetail?idReport=' + this.detailData.ArticleId,
+					url: '/pages/reportDetail/reportDetail?id=' + this.detailData.ArticleId,
 				})
+			},
+			askingGo(){
+				uni.navigateTo({
+					url: '/activityPages/generationAsk/generationAsk?id='+this.id
+				})
 			},
 			meetingReminderAdd() {
 				activity.meetingReminderAdd({
@@ -370,7 +382,22 @@
 				} else {
 					this.signupAdd(3)
 				}
-			},
+			},
+			//点击了严选
+			strictSelection(){
+				activity.descriptionOfResearch().then(res=>{
+					if(res.Ret==200){
+						uni.showModal({
+						    content:res.Data.Item.ConfigValue,
+							confirmText:'知道了',
+							showCancel:false,
+							confirmColor:'#3385FF',
+						    success: function (res) {
+						    }
+						});
+					}
+				})
+			}
 		},
 		onLoad(option) {
 			this.id = option.id
@@ -403,7 +430,23 @@
 			height: 60rpx;
 			width: 100%;
 		}
-
+		.choose-limit {
+			position: relative;
+			display: flex;
+			align-items: center;
+			// margin-left: 20rpx;
+			image {
+				width: 93rpx;
+				height: 38rpx;
+			}
+			.limit-img {
+				position: absolute;
+				top: -13rpx;
+				right: -30rpx;
+				width: 46rpx;
+				height: 26rpx;
+			}
+		}
 		.content {
 			padding: 34rpx 34rpx 0rpx;
 			margin-bottom: -20rpx;
@@ -490,7 +533,10 @@
 				line-height: 80rpx;
 				text-align: center;
 			}
-
+			.make-generation {
+				padding-top: 0rpx !important;
+				line-height: 76rpx;
+			}
 			.make-conference {
 				margin: 30rpx auto;
 				width: 368rpx;
@@ -498,10 +544,10 @@
 				border: 2px solid #2C83FF;
 				opacity: 1;
 				border-radius: 4rpx;
-				padding-top: 10rpx;
+				padding-top: 5rpx;
 				text-align: center;
 				color: #2C83FF;
-
+				font-size:30rpx;
 				text {
 					font-size: 16rpx;
 				}

activityPages/activitySearch/activitySearch.vue

@@ -132,12 +132,16 @@
 		<!-- 内容列表部分 -->
 		<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">
 					<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 class="choose-limit" @click="strictSelection"  v-if="item.IsShowSustainable">
+							<image src="../../static/img/choose_icon.png" mode=""></image>
+							<image class="limit-img" src="../../static/img/limit_icon.png" mode=""></image>
 						</view>
 					</view>
 					<text style="color: #2ACDD9; font-size: 26rpx;" v-if="item.ActiveState==1">未开始</text>

activityPages/generationAsk/generationAsk.vue

@@ -0,0 +1,110 @@
+<template>
+	<view class="container ask-container">
+		<view class="advice-ipt-cont">
+			<u-input 
+			v-model="advice_content" 
+			type="textarea"
+			maxlength="100"
+			:clearable="false"
+			:placeholder="titlePlaceholder"
+			height="300"
+			class="ipt"/>
+			<text class="num-tag">{{advice_content.length}}/100</text>
+		</view>
+		<view class="btn-cont" @click="submitHandle">
+		提交
+		</view>
+	</view>
+</template>
+
+<script>
+	import { activity,Report } from "@/config/api.js"
+	export default {
+		data() {
+			return {
+				advice_content:'',
+				id:'',
+				type:''
+			};
+		},
+		computed:{
+			titlePlaceholder(){
+				return this.type=='文章'?'请描述您的问题，销售会跟进问题，后期在线下为您解答':'请描述您的问题，分析师会代您向专家提问。'
+			}
+		},
+		methods:{
+			submitHandle(){
+				if(this.type=='文章') {
+					Report.articleAskAdd({
+						ArticleId:Number(this.id),
+						Content:this.advice_content
+					}).then(res=>{
+						if(res.Ret === 200) {
+							this.$util.toast('提交成功')
+							this.advice_content=''
+							setTimeout(()=>{
+								uni.navigateBack()
+							},500)	
+						}
+						
+					})
+				}else {
+					activity.activityAskAdd({
+						ActivityId:Number(this.id),
+						Content:this.advice_content
+					}).then(res=>{
+						if(res.Ret === 200) {
+							this.$util.toast('提交成功')
+							this.advice_content=''
+							setTimeout(()=>{
+								uni.navigateBack()
+							},500)	
+						}
+						
+					})
+				}
+				
+			}
+		},
+		onLoad(option){
+			this.id=option.id
+			this.type=option.type ||''
+			uni.setNavigationBarTitle({
+				 title: this.type=='文章'?'提问':'帮我代问'
+			})
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+.ask-container{
+	 background-color: #fff;
+	 padding: 30rpx 34rpx;
+	 .advice-ipt-cont {
+	 	height: 420rpx;
+	 	border: 1rpx solid #D0CFD5;
+	 	border-radius: 8rpx;
+	 	padding: 30rpx;
+	 	position: relative;
+	 	font-size: 28rpx;
+	 	color: #D0CFD5;
+	 	.num-tag {
+	 		position: absolute;
+	 		bottom: 30rpx;
+	 		right: 30rpx;
+	 	}
+	 }
+	 .btn-cont {
+		 margin: 80rpx auto;
+		 width: 368rpx;
+		 height: 80rpx;
+		 font-size: 34rpx;
+		 line-height: 80rpx;
+		 text-align: center;
+		 color: #FFFFFF;
+		 background: linear-gradient(268deg, #2DDBFF 0%, #1599FF 49%, #005EFF 100%);
+		 opacity: 1;
+		 border-radius: 4rpx;
+	 }
+ }
+</style>

activityPages/index.js

@@ -404,6 +404,21 @@ export default {
 					key.IsChoose = !key.IsChoose
 				}
 			})
+		},
+		strictSelection(){
+			activity.descriptionOfResearch().then(res=>{
+				if(res.Ret==200){
+					uni.showModal({
+					    content:res.Data.Item.ConfigValue,
+						confirmText:'知道了',
+						showCancel:false,
+						confirmColor:'#3385FF',
+					    success: function (res) {
+					    }
+					});
+				}
+			})
+			
 		}
 	},
 }

activityPages/index.scss

@@ -1,7 +1,7 @@
 .activity-content {
 		background-color: #F7F7F7;
 		.dynamic-content {
-			padding: 100rpx 20rpx 10rpx;
+			padding: 100rpx 0rpx 10rpx 20rpx;
 			width: 100%;
 			background-color: #fff;
 			border-bottom: 3px solid #F7F7F7;
@@ -22,7 +22,7 @@
 				}
 			}
 			.foreshow {
-				font-size: 32rpx;
+				font-size: 30rpx;
 				color: #333;		
 				font-weight: bold;
 			}
@@ -30,29 +30,41 @@
 		.target-item {
 				width: 100%;
 				padding-bottom: 20rpx;
-				padding-right: 20rpx;
 				display: flex;
-				font-size: 32rpx;
+				font-size: 30rpx;
 				font-weight: 400;
 				color: #2C83FF;
 				.target-ul {
+					position: relative;
 					width: 50%;					
 				}
+				.lucency {
+					position: absolute;
+					top: 0;
+					right: 0rpx;
+					width: 80rpx;
+					height: 100%;
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
 				.target-left {
-					padding-right: 50rpx;
+					// padding-right: 50rpx;
 					border-right: 2rpx solid #E5E5E5;
 				}
 				.target-right {
-					padding-left: 33rpx;	
+					padding-left: 30rpx;	
 				}
 				.target-text {
 					margin-top: 10rpx;
+					overflow:hidden;
 					text {
 						line-height: 37rpx;
 						display: inline-block;
-						max-width: 305rpx;
-						overflow:hidden;
-						text-overflow:ellipsis;
+						// max-width: 305rpx;
+						
+						// text-overflow:ellipsis;
 						white-space:nowrap;
 						padding: 4rpx 14rpx;						
 					}
@@ -272,7 +284,8 @@
 					color: #333333;
 					font-size: 32rpx;
 					.list-top-box {
-						display: flex;
+						display: flex;
+
 						.title {
 							color: #333333;
 							font-size: 30rpx;
@@ -291,6 +304,23 @@
 							height: 32rpx;
 							margin-right: 12rpx;
 						}
+					}
+					.choose-limit {
+						position: relative;
+						display: flex;
+						align-items: center;
+						margin-left: 20rpx;
+						image {
+							width: 93rpx;
+							height: 38rpx;
+						}
+						.limit-img {
+							position: absolute;
+							top: 8rpx;
+							right: -30rpx;
+							width: 46rpx;
+							height: 26rpx;
+						}
 					}
 				}
 				.list-center {

config/api.js

@@ -24,6 +24,10 @@ export const Report = {
 	/* 申请访谈 ArticleId*/
 	applyRpt: params => {
 		return postHttp('/article/interview/apply',params,0)
+	},
+	/* 新增文章带问接口 ArticleId*/
+	articleAskAdd: params => {
+		return postHttp('/article/askAdd',params,0)
 	}
 }
 
@@ -148,7 +152,7 @@ export const Search = {
 export const Reports = {
 	/* 获取报告一级分类 */
 	getClassify: params => {
-		return getHttp('/permission/reportall',params)
+		return getHttp('/permission/reportall',params,0)
 	},
 	/* 获取策略的分类 */
 	getstrategyAll: params => {
@@ -160,7 +164,7 @@ export const Reports = {
 	},
 	/* 获取产业报告分类列表接口*/
 	getTradeList: params => {
-		return getHttp('/report/home/tradeList',params)
+		return getHttp('/report/home/tradeList',params,0)
 	},
 	/* 获取产业报告分类列表接口*/
 	getIndustryList: params => {
@@ -170,6 +174,22 @@ export const Reports = {
 	postToptt: params => {
 		return postHttp('/report/top',params,0)
 	},
+	/* 是否置顶*/
+	reportFllow: params => {
+		return postHttp('/report/fllow',params,0)
+	},
+	/* 是否置顶*/
+	industryListByDepartment: params => {
+		return getHttp('/report/industryListByDepartment',params,0)
+	},
+	/* 获取产业文章列表接口*/
+	industryReportList: params => {
+		return getHttp('/report/industry/reportList',params)
+	},
+	/* 关注作者/取消关注作者 接口*/
+	reportFllowDepartment: params => {
+		return postHttp('/report/fllowDepartment',params)
+	},
 	/* 获取策略列表接口*/
 	getTactics: params => {
 		return getHttp('/tactics/list',params)
@@ -228,4 +248,12 @@ export const activity ={
 	addOutboundMobile: params => {
 		return postHttp('/user/countryCcode/addOutboundMobile',params)
 	},
+	/*新增活动带问接口*/
+	activityAskAdd: params => {
+		return postHttp('/activity/askAdd',params)
+	},
+	/*获取研选说明接口*/
+	descriptionOfResearch: params => {
+		return getHttp('/config/descriptionOfResearch',params)
+	},
 }

config/config.js

@@ -1,6 +1,6 @@
 
-//export const baseUrl = 'http://8.136.199.33:8500/api';//小程序开发接口地址
-export const baseUrl = 'https://cygx.hzinsights.com/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
 // #endif

pages.json

@@ -150,6 +150,15 @@
 					 "navigationStyle": "custom"
                 }
                 
+                }
+                ,{
+                    "path" : "generationAsk/generationAsk",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
                 }
             ]
 	},{

pages/activity/activity.vue

@@ -18,7 +18,7 @@
 			<view class="target-title">
 							<view class="foreshow box">
 								<image src="../../static/img/foreshow_icon.png"></image>
-								<text style="margin-left: 10rpx;">活动预告</text>
+								<text style="margin-left: 10rpx;">活动速览</text>
 							</view>
 							<view class="even-more box" @click="goSearch">
 								<image src="../../static/img/search_iocn.png"></image>
@@ -32,6 +32,9 @@
 							{{item.KeyWord}}
 						</text>
 					</view>
+					<view class="lucency">
+						<image src="../../static/img/broadside-ico.png" mode=""></image>
+					</view>
 				</view>
 				<view class="target-ul target-right">
 					<view class="target-text" v-for="(item,index) in dynamicList" :key="index" v-if="index%2 !== 0">
@@ -39,6 +42,9 @@
 							{{item.KeyWord}}
 						</text>
 					</view>
+					<view class="lucency">
+						<image src="../../static/img/broadside-ico.png" mode=""></image>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -126,12 +132,16 @@
 		<!-- 活动的列表 -->
 		<view class="box-content" id="contentList" :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">
 					<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 class="choose-limit" @click="strictSelection" v-if="item.IsShowSustainable">
+							<image src="../../static/img/choose_icon.png" mode=""></image>
+							<image class="limit-img" src="../../static/img/limit_icon.png" mode=""></image>
 						</view>
 					</view>
 					<text style="color: #2acdd9; font-size: 26rpx" v-if="item.ActiveState == 1">未开始</text>
@@ -266,6 +276,15 @@
 		components: {
 			modalDialog,
 			areaCode,
+		},
+		computed:{
+			messageTitle(){
+				if(this.activeStateName=='未开始'&&this.chartPermissionName=='所有行业'&&this.activityTypeName=="所有类型") {
+				return  '近期所有行业活动预告'	
+				}else {
+					return  this.activeStateName+','+this.chartPermissionName+','+this.activityTypeName
+				}
+			}
 		},
 		methods: {
 			//页面滑动了
@@ -701,7 +720,7 @@
 		/** 用户点击分享 */
 		onShareAppMessage: function(res) {
 			return {
-				title: this.keyWord? this.keyWord:this.activeStateName+','+this.chartPermissionName+','+this.activityTypeName,
+				title: this.keyWord? this.keyWord:this.messageTitle,
 				path: "/pages/activity/activity?statesId=" +
 					this.activeState +
 					"&typeIds=" +

pages/advice/advice.vue

@@ -72,7 +72,7 @@
 					sourceType: ['album', 'camera'],
 					success: (res) => {
 						this.uploadIndex = 0;
-					   let tempFilePaths = res.tempFilePaths;
+						let tempFilePaths = res.tempFilePaths;
 						this.upload(tempFilePaths,tempFilePaths.length)
 					}
 				})

pages/index/index.vue

@@ -24,6 +24,9 @@
 						<image src="@/static/img/border_act.png" mode="" class="border_act" v-if="tabAct_id == item.ChartPermissionId"></image>
 						</view>
 					</block>
+					<view class="limit-box" v-if="limitIsShow">
+						<image class="limit-img" src="../../static/img/limit_icon.png" mode=""></image>
+					</view>
 				</scroll-view>
 				
 			</view>
@@ -40,7 +43,13 @@
 							<image src="@/static/img/report_ico.png" class="report_ico"></image>
 							{{report.ExpertBackground}}
 						</view>
-						<text class="item-createtime">{{report.PublishDate}}</text>
+						<view class="item-createtime">
+							<text>{{report.PublishDate}}</text>
+							<view class="item-examine">
+								<image src="../../static/img/examine_icon.png" v-if="report.IsResearch"></image>
+								<text v-if="report.IsResearch">{{report.Pv}}</text>
+							</view>
+						</view>
 					</view>
 				</view>
 				<view class="report-ul">
@@ -53,7 +62,13 @@
 							<image src="@/static/img/report_ico.png" class="report_ico"></image>
 							{{report.ExpertBackground}}
 						</view>
-						<text class="item-createtime">{{report.PublishDate}}</text>
+						<view class="item-createtime">
+							<text>{{report.PublishDate}}</text>
+							<view class="item-examine">
+								<image src="../../static/img/examine_icon.png" v-if="report.IsResearch"></image>
+								<text v-if="report.IsResearch">{{report.Pv}}</text>
+							</view>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -90,7 +105,8 @@ export default {
 				loading: '加载中',
 				nomore: '已经到底了'
 			},
-			totalPage:''
+			totalPage:'',
+			limitIsShow:false,//限免的隐现
 		}
 	},
 	watch: {
@@ -161,6 +177,7 @@ export default {
 						PermissionName: "最新"
 					})
 					this.tabBars = arr;
+					this.limitIsShow=this.tabBars.some(item=>item.IsShowSustainable)
 				}
 			})
 		},
@@ -306,15 +323,29 @@ export default {
 			font-size: 32rpx;
 			box-shadow: 0 3rpx 6rpx rgba(187,216,255,0.2);
 			.scroll-tab {
+				position: relative;
 				width: 100%;
 				white-space: nowrap;
 			}
+			.limit-box {
+				position: absolute;
+				text-align: center;
+				display: inline-block;
+				padding-right: 50rpx;
+				top: -8rpx;
+				margin-left: -50rpx;
+				image {
+					width: 46rpx;
+					height: 26rpx;
+				}
+				
+			}
 			.scroll-tab-item {
 				// flex-grow: 1;
 				text-align: center;
 				display: inline-block;
 				padding: 10rpx 8rpx 20rpx 8rpx;
-				margin-right: 40rpx;
+				margin-right: 51rpx;
 				border-bottom: 8rpx solid transparent;
 				position: relative;
 				&:last-child {
@@ -390,8 +421,21 @@ export default {
 					}
 				}
 				.item-createtime {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
 					color: #ACACAC;
 					font-size: 24rpx;
+					.item-examine {
+						display: flex;
+						align-items: center;
+						image {
+							width: 30rpx;
+							height: 24rpx;
+							margin: 0 10rpx 0 15rpx;
+						}
+					}
+					
 				}
 			}
 		}

pages/login/login.vue

@@ -7,7 +7,7 @@
 		<view class="bind-cont">
 			<view class="tel-bind" v-if="bind_type === 1">
 				<view class="ipt-item">
-					<label class="item-label item-iphone">手机号</label>
+					<label class="item-label item-iphone" @click="isAreaCode=true">{{showCountryCode}}   <u-icon :name="isAreaCode?'arrow-up':'arrow-down'" color="#B2B2B2" size="28"></u-icon></label>
 					<input type="text" v-model="phoneIpt" class="ipt" placeholder="请输入手机号" style="width: 300rpx;">
           <button open-type="getPhoneNumber" value="用户授权" @getphonenumber="getPhoneNumber" class='code-btn'>微信手机号绑定</button> 
 				</view>
@@ -45,6 +45,17 @@
 				<button @click="bindHandle" class='infobutton bind-btn'>提交</button>
 			</view>
 		</view>
+		<view class="select-box">
+			<u-popup v-model="isAreaCode" mode="bottom"  @close="cancel">
+				<view class="box" style="color: #333333;font-size: 28rpxrpx;">请选择您的国际区号</view>
+				<view class="box" style="color: #2C83FF;" @click="areacode('86')">大陆+86</view>
+				<view class="box" style="color: #2C83FF;" @click="areacode('852')">香港+852</view>
+				<view class="box" style="color: #2C83FF;" @click="areacode('886')">台湾+886</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>
 	</view>
 </template>
 
@@ -63,12 +74,10 @@
 				codeNum:'',//验证码
 				phoneIpt:'',
 				phone_code:'',
-				countryCode:'',//区号
+				showCountryCode:'+86',
+				countryCode:'86',//区号
 				isAreaCode: false,
-				areaCode: {
-					id: '',
-					type: ''
-				},
+				
 			};
 		},
 		methods:{
@@ -176,7 +185,8 @@
 					let params = {
 						Mobile: this.phoneIpt,
 						LoginType: 3,
-						VCode: this.phone_code
+						VCode: this.phone_code,
+						CountryCode:this.countryCode
 					}
 					User.Bind(params).then(res => {
 						if(res.Ret === 200) {
@@ -191,6 +201,14 @@
 					this.$util.toast(!this.checked?'请先勾选用户服务协议':!this.phoneIpt?'请输入手机号':'请输入验证码')
 				}
 			},
+			areacode(num){
+				this.showCountryCode= '+' + num
+				this.countryCode=num
+				this.isAreaCode=false
+			},
+			cancel(){
+				this.isAreaCode=false
+			}
 		},
 	 onLoad() {
 			/* 校验session */
@@ -309,10 +327,13 @@
 			}
 		}
 	}
-	// .item-iphone {
-	// 	display: flex;
-	// 	justify-content: space-between;
-	// 	align-items: center;
-	// }
+	.item-iphone {
+		display: flex !important;
+		justify-content: space-between !important;
+		align-items: center !important;
+		width: 118rpx !important;
+		margin-right: 26rpx !important;
+	}
+
 }
 </style>

pages/reportDetail/reportDetail.vue

@@ -59,8 +59,8 @@
 				access_token:'',//用户标识
 				isIphoneX:false,//判断机型
 				reportInfo:'',
-				linkurl:'https://details.hzinsights.com/raiReportDtl',//线上链接地址
-				//linkurl:'http://192.168.1.25:2000/raiReportDtl',//链接地址
+				//linkurl:'https://details.hzinsights.com/raiReportDtl',//线上链接地址
+				linkurl:'http://192.168.1.25:2000/raiReportDtl',//链接地址
 				showNav:false,
 				id:'',
 				idReport:null,

pages/reportForm/components/coverGuide.vue

@@ -0,0 +1,77 @@
+<template>
+	<u-mask :show="show" >
+			<view class="warp">
+				<view class="top-bg">
+					<image style="width: 80rpx;height: 80rpx;" src="../../../static/img/guide-1.png" mode=""></image>
+					<view class="guide-tow">
+						<image style="width: 181rpx;height: 239rpx;" src="../../../static/img/guide-2.png" mode=""></image>
+					</view>
+					<view class="content-text">
+						<text>新增产业关注功能</text>
+						<text>点击关注后可获取产业内容更新提醒</text>
+						<image @click="isShow" style="width: 237rpx;height: 104rpx;" src="../../../static/img/guide-3.png" mode=""></image>
+					</view>
+				</view>
+				
+			</view>
+	</u-mask>
+</template>
+
+<script>
+	export default {
+		props:{
+			isGuideShow:{
+				type:Boolean,
+				default:false,
+				required:true
+			}
+		},
+		data() {
+			return {
+				show: true
+			}
+		},
+		watch:{
+			isGuideShow:{
+				handler(){
+					this.show=this.isGuideShow
+				},
+				immediate:true
+			}
+		},
+		methods: {
+			isShow(){
+				 this.$parent.isGuideShow=false
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.warp {
+		display: flex;
+		height: 100%;
+		.top-bg {
+			margin-top: 80%;
+			.guide-tow {
+				padding-left: 100rpx;
+				margin-top: -60rpx;
+			}
+		}
+		.content-text {
+			width: 750rpx;
+			font-size: 28rpx;
+			color: #fff;
+			text {
+				text-align: center;
+			}
+			image {
+				margin-top: 50rpx;
+				padding-left: 100%;
+				transform: translateX(-50%);
+			}
+		}
+	}
+
+	
+</style>

pages/reportForm/components/researchChoose.vue

@@ -0,0 +1,219 @@
+<template>
+	<view class="resear-container">
+		<view class="theme">
+			<view class="theme-title">最新主题</view>
+			<view class="theme-item">
+					<text @click="goDetail(item.IndustrialManagementId)" v-for="item in listNew" :key="item.IndustrialManagementId">{{item.IndustryName}}</text>
+			</view>
+		</view>
+		<view class="author-list" v-for="item in dataList" :key="item.DepartmentId">
+			<view class="author-item">
+				<image :src="item.ImgUrl" @click="goDetail(item.DepartmentId,'作者')"></image>
+				<text style="font-size: 28rpx;" @click="goDetail(item.DepartmentId,'作者')">{{item.NickName}}</text>
+				<text class="attention  attention-cancel"  @click="reportFllowDepartment(item.DepartmentId)" v-if="item.IsMyFollow">取消关注</text>
+				<text class="attention" @click="reportFllowDepartment(item.DepartmentId)" v-else>+关注</text>
+				
+			</view>
+			<view class="label-item">
+				<text v-for="key in item.List" :key="key.IndustrialManagementId" @click="goDetail(key.IndustrialManagementId)">{{key.IndustryName}}</text>
+			</view>
+		</view>
+		<u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20" v-if="totalPage>1"/>
+		<view class="bottom-env">
+			【研选系列】是机构投资者分享研究内容和原创观点的平台，试行阶段，限时免费，欢迎有内容贡献意愿的客户联系18621268829了解参与方式
+		</view>
+	</view>
+</template>
+
+<script>
+	import { Reports } from '@/config/api.js'
+	import { Throttle } from '@/config/util.js'
+	export default {
+		props:{
+			strategyIndex:{
+				type:Number,
+				required:true
+			},
+			tabAct:{
+				type:Number,
+				required:true
+			},
+			isNum:{
+				type:Number,
+				required:true
+			},
+			pageNumFather:{
+				type:Number,
+				default:'',
+				required:true
+			}
+		},
+		data() {
+			return {
+				dataList:[],
+				pageSize:10,
+				currentIndex:1,
+				listNew:[],
+				haveData:true,
+				status:'loadmore',
+				loadText: {
+					loadmore: '上拉加载更多',
+					loading: '加载中',
+					nomore: '已经到底了'
+				},
+				totalPage:''
+			};
+		},
+		watch:{
+			strategyIndex:{
+				handler(val){
+					if(val==5){
+						this.industryListByDepartment()
+					}
+				},
+				immediate:true
+			},
+			isNum:{
+				handler(val){
+					if(val > 1 && this.strategyIndex){
+						if(this.status === 'nomore') return ;
+						this.status = 'loading';
+						this.page_no++;
+						this.industryListByDepartment()
+					}
+				}
+			},
+			pageNumFather:{
+				handler(val){
+					if(val==1){
+						this.page_no=1;
+						this.dataList=[],
+						this.listNew=[]
+						this.industryListByDepartment()
+					}
+				}
+			}
+		},
+		methods:{
+			reportFllowDepartment(id){
+				Reports.reportFllowDepartment({
+					DepartmentId:id
+				}).then(res=>{
+					if(res.Ret == 200){
+						this.dataList.forEach(item=>{
+							if(item.DepartmentId==id){
+								item.IsMyFollow=!item.IsMyFollow
+							}
+						})
+						uni.showToast({
+							title: res.Msg,
+							duration: 2000
+						});
+					}
+				})
+			},
+			industryListByDepartment(){
+				Reports.industryListByDepartment({
+					PageSize:this.pageSize,
+					CurrentIndex:this.currentIndex,
+					ChartPermissionId:this.tabAct
+				}).then(res=>{
+					if(res.Ret===200){
+						this.status = this.page_no < res.Data.Paging.Pages ? 'loadmore' : 'nomore';
+						this.totalPage = res.Data.Paging.Pages;//总页数
+						this.listNew=res.Data.ListnNew ||[]
+						if(this.page_no === 1) {
+							this.dataList = res.Data.List || [];
+							this.haveData = this.dataList.length ? true : false
+							if(this.refresh) {
+								uni.stopPullDownRefresh();
+								this.refresh = false;
+							} 
+						}else {
+							this.dataList = this.dataList.concat(res.Data.List)
+						}
+					}
+				})
+			},
+			goDetail(id,genre=''){
+				uni.navigateTo({
+					url:'/reportPages/industrialReport/industrialReport?id=' + id +'&type=研选'+'&isGenre='+genre,
+				});
+			}
+		}	
+	}
+</script>
+
+<style lang="scss" scoped>
+	.resear-container {
+		padding: 220rpx 0 140rpx;
+		background-color: #F7F7F7;
+		.theme {
+			padding: 30rpx 34rpx;
+			background: #FFFFFF;
+			.theme-title {
+				font-size: 32rpx;
+				font-weight: bold;
+				margin-bottom: 30rpx;
+				color: #333333;
+			}
+			.theme-item {
+				display: flex;
+				flex-wrap: wrap;
+				text {
+					padding: 13rpx 45rpx;
+					color: #2C83FF;
+					font-size: 32rpx;
+					background: #EBF4FF;
+					border-radius: 35rpx;
+					margin: 0 30rpx 30rpx 0;
+				}
+			}
+		}
+		.author-list {
+			margin: 20rpx 0;
+			padding: 20rpx  30rpx 20rpx 55rpx;
+			background: #FFFFFF;
+			display: flex;
+			.author-item {
+				height: 300rpx;
+				padding: 20rpx 78rpx 20rpx 0;
+				border-right: 2rpx solid #E5E5E5;
+				text-align: center;
+				image {
+					width: 140rpx;
+					height: 140rpx;
+				}
+				.attention {
+					margin-top: 30rpx;
+					padding: 4rpx 20rpx;
+					font-size: 24rpx;
+					border-radius: 30rpx;
+					color: #FFFFFF ;
+					background: #2C83FF;
+				}
+				.attention-cancel {
+					color: #666666 !important;
+					background: #F8F8FA !important;
+				}
+			}
+			.label-item {
+				padding: 26rpx 0 0 34rpx; 
+				text {
+					color: #2C83FF;
+					font-size: 28rpx;
+					margin-bottom: 30rpx;
+				}
+			}
+		}
+		.bottom-env {
+			background: #F7F7F7;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			padding: 20rpx 50rpx;
+			color: #999999;
+			font-size: 26rpx;
+		}
+	}
+</style>

pages/reportForm/components/strategy.vue

@@ -147,7 +147,7 @@
 					app.globalData.isBind = res.IsBind;
 					if ((!res.IsAuth) && (!res.IsBind)) { // 已授权已绑定
 						uni.navigateTo({
-							url: '/pages/reportDetail/reportDetail?idReport=' + item.ArticleId,
+							url: '/pages/reportDetail/reportDetail?id=' + item.ArticleId,
 						});
 					} else if (res.IsAuth) { //未授权
 						uni.navigateTo({

pages/reportForm/reportForm.vue

@@ -1,15 +1,14 @@
 <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"
+				<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">
+				<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 }"
@@ -18,7 +17,10 @@
 							<image src="@/static/img/border_act.png" mode="" class="border_act"
 								v-if="tabAct_id == item.ChartPermissionId"></image>
 						</view>
-					</block>
+					</block>
+					<view class="limit-box" v-if="limitIsShow">
+						<image class="limit-img" src="../../static/img/limit_icon.png" mode=""></image>
+					</view>
 				</scroll-view>
 
 			</view>
@@ -43,6 +45,9 @@
 			<!-- 子组件 -->
 			<strategy :strategyIndexTwo="strategyIndexTwo" :pageNumFather='pageNumFather' :matchTypeName="matchTypeName"
 				:tabAct_idTwo="tabAct_idTwo" :isNum="isNum" :isSwitchover="isSwitchover" @hideIsred="hideIsred" />
+		</view>
+		<view class="" v-else-if="strategyIndex==5">
+			<researchChoose :strategyIndex="strategyIndex" :tabAct="tabAct_id" :pageNumFather="pageNumFather" :isNum="isNum"/>
 		</view>
 		<!-- </view> -->
 		<view class="industrial_eport_one" v-else>
@@ -116,19 +121,18 @@
 				<!-- 需要循环的地方 -->
 				<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 class="industry-content">
+						<view class="industry-box-left" @click="reportFllow(item.IndustrialManagementId)">
+							<image src="@/static/img/top_ico.png" v-if="item.IsFollow"></image>
+							<image src="@/static/img/top_no_ico.png" v-else></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>
+								<text>{{item.IndustryName}}</text>
+								<image v-if="item.IsHot" src="../../static/img/ammunition_ico.png" mode=""></image>
 							</view>
-							<view class="ndustry-box-arrow">
+							<view class="ndustry-box-arrow">
+								<text v-if="item.IsRed" class="read"></text>
 								<text class="ndustry-box-text">{{item.UpdateTime}}更新</text>
 								<u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
 							</view>
@@ -155,29 +159,30 @@
 				<u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20"
 					v-if="totalPage>1" />
 			</view>
-		</view>
+		</view>
+		<coverGuide :isGuideShow="isGuideShow"/>
 	</view>
 </template>
 
 <script>
-	import strategy from "./components/strategy.vue"
-	import {
-		Throttle,Debounce
-	} from '@/config/util.js'
-	import {
-		Reports
-	} from '@/config/api.js'
+	import strategy from "./components/strategy.vue"
+	import researchChoose from "./components/researchChoose.vue"
+	import coverGuide from "./components/coverGuide.vue"
+	import {Throttle,Debounce } from '@/config/util.js'
+	import { Reports } from '@/config/api.js'
 	let app = getApp()
 	export default {
 		components: {
-			strategy
+			strategy,
+			researchChoose,
+			coverGuide
 		},
 		data() {
 			return {
-				tabAct_id: null,
-				tabAct_idTwo: null,
+				tabAct_id: '',
+				tabAct_idTwo: '',
 				tabBars: [],
-				pageNumFather: null,
+				pageNumFather: '',
 				shadowStyle: {
 					backgroundImage: "none"
 				},
@@ -192,7 +197,7 @@
 				pitchOnId: 'NewTime',
 				//pitchOnName: '按最近更新排序',
 				isNum: 1,
-				strategyIndex: null,
+				strategyIndex: '',
 				strategyIndexTwo: 0,
 				isSwitchover: 1,
 				tradeList: [],
@@ -221,50 +226,53 @@
 				}, ],
 				overallArrangementId: '',
 				overallArrangementName: '按最近更新排序',
-				isScrollShow: false
+				isScrollShow: false,
+				isGuideShow:false,
+				limitIsShow:false,//限免显示隐藏
 			}
 		},
 		 onLoad(option) {
+			if(!this.$db.get('guideSole')) { //新手指引
+				this.isGuideShow=true
+			}
+			 
 			 this.$store.dispatch("checkHandle",{type:'load',val:option}).then(res=>{
 				 app.globalData.isAuth = res.IsAuth;
 				 app.globalData.isBind = res.IsBind;
 				app.globalData.isSx=true
-			 	this.tabAct_id = option.tab || null
-			 	if (option.tabs !== 'null' && option.tabs) {
+			 	this.tabAct_id = option.tab || ''
+			 	if (option.tabs !== '' && option.tabs) {
 			 		this.strategyIndex = 4
 			 		this.tabAct_idTwo = option.tabs
 			 	}
+				if(this.tabAct_id==31){
+					this.strategyIndex = 5
+				}
 			 	this.getClassify()
 			 })
-			
+			this.$db.set('guideSole',1)//新手指引
 		},
 		computed: {},
 		watch: {
 			//监听tabs的变化
 			tabAct_id: {
 				handler() {
-					if (this.strategyIndex == 4) {
-						this.getstrategyAll()
-					} else {
-						this.tabAct_idTwo = null
-					}
-					if (this.tabAct_id) {
+					if (this.tabAct_id && (this.strategyIndex !== 4 && this.strategyIndex !== 5)) {
 						this.OrderColumn = 'NewTime'
 						this.pitchOnId = 'NewTime'
 						this.overallArrangementName = '按最近更新排序'
-						this.overallArrangementId = '' //待完善
-						//this.pitchOnName = '按最近更新排序'
+						this.overallArrangementId = '' 
 						this.page_no = 1;
 						this.refresh = true;
 						this.getIndustryList()
-						this.getTradeList()
-					}
+						this.getTradeList()
+						this.overallArrangement.forEach(key => key.isShow = false)
+					}
+					this.strategyIndex == 4 ? this.getstrategyAll() : this.tabAct_idTwo = ''
 					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
 			}
@@ -272,13 +280,14 @@
 		methods: {
 			//获取一级事件
 			getClassify() {
-				Reports.getClassify().then(res => {
-					this.tabBars = res.Data.List
+				Reports.getClassify().then(res => {
+					if(res.Ret!==200) return
+					this.tabBars = res.Data.List ||[]
 					if (!this.tabAct_id) {
 						this.tabAct_id = res.Data.List[0].ChartPermissionId
 						this.$store.dispatch("statistics",{PageType:'Report',ChartPermissionId:this.tabAct_id})
 					}
-
+					this.limitIsShow=this.tabBars.some(item=> item.IsShowSustainable)
 				})
 			},
 			//获取二级事件
@@ -331,11 +340,7 @@
 					ChartPermissionId: this.tabAct_id
 				}).then(res => {
 					if (res.Ret == 200) {
-						if (res.Data.List) {
-							this.tradeList = res.Data.List
-						} else {
-							this.tradeList = null
-						}
+						this.tradeList = res.Data.List || []
 					}
 				})
 			},
@@ -368,51 +373,32 @@
 			//跳转季度策略
 			isClickHandle(id) {
 				this.public({type:'show'},true,'/reportPages/industrialReport/industrialReport?id=',id)
-				// uni.navigateTo({
-				// 	url: '/reportPages/industrialReport/industrialReport?id=' + id
-				// });
 			},
 			//跳转产业报告
 			goIndustryReport(id) {
 				this.public({type:'show'},true,'/reportPages/IndustryReport/IndustryReport?id=',id)
-				// uni.navigateTo({
-				// 	url: '' + id
-				// });
 			},
 			//点击顶置的图标
-			isOverhead(id) {
-				this.$store.dispatch('checkHandle').then(res => {
-					app.globalData.isAuth = res.IsAuth;
-					app.globalData.isBind = res.IsBind;
-					if ((!res.IsAuth) && (!res.IsBind)) { //已授权已绑定
-						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
-								});
-							}
-						})
-					} else if (res.IsAuth) { //未授权
-						this.tabsActive = 0
-						uni.navigateTo({
-							url: '/pages/authGuide/authGuide'
-						})
-					} else if (res.IsBind && !res.IsAuth) { //已授权未绑定
-						this.tabsActive = 0
-						uni.navigateTo({
-							url: '/pages/login/login'
-						})
+			reportFllow(id) {
+				Reports.reportFllow({
+					IndustrialManagementId: id
+				}).then(res => {
+					if (res.Ret === 200) {
+					 this.industryList.forEach(key => {
+						 if(key.IndustrialManagementId == id){
+							 if(key.IsFollow==1){
+								key.IsFollow=0 
+							 }else{
+								 key.IsFollow=1
+							 }
+						 }
+					 })
+						uni.showToast({
+							title: res.Msg,
+							duration: 2000
+						});
 					}
-				})
-				
-					
+				})
 			},
 			hideIsred(is) {
 				this.tabBarsTow[this.strategyIndexTwo].IsRed = is
@@ -492,7 +478,7 @@
 		}),
 		/* 下拉刷新 */
 		onPullDownRefresh: Throttle(function() {
-			if (this.strategyIndex == 4) {
+			if (this.strategyIndex == 4 || this.strategyIndex == 5) {
 				this.pageNumFather = 1
 			} else {
 				this.industryList = []
@@ -511,7 +497,6 @@
 			if (this.tabAct_id && app.globalData.isSx) {
 				this.getTradeList()
 			}
-
 		},
 		/**
 		 * 用户点击分享
@@ -530,7 +515,6 @@
 		onPageScroll() {
 			if (this.isScrollShow) {
 				this.selectComponent('#menuItem').toggle(false);
-				//this.selectComponent('#menuPitch').toggle(false);
 				this.isScrollShow = false
 			}
 
@@ -546,24 +530,20 @@
 	.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;
+				padding: 32rpx 34rpx 0;
 				position: relative;
-
 				.sea_ipt_placeholder {
 					color: #8D8D8D;
 					opacity: 0.7;
 				}
-
 				.sea_ipt {
 					width: 100%;
 					height: 70rpx;
@@ -582,39 +562,46 @@
 					left: 60rpx;
 					top: 50%;
 					z-index: 100;
-					transform: translateY(-50%);
+					// transform: translateY(-50%);
 				}
 			}
-
 			.tab-cont {
-				padding: 0 26rpx;
+				padding: 0 26rpx ;
+				height: 115rpx;
 				background-color: #fff;
 				font-size: 32rpx;
-
-				.scroll-tab {
+				.scroll-tab {
+					position: relative;
 					width: 100%;
 					white-space: nowrap;
 				}
-
-				.scroll-tab-item {
-					// flex-grow: 1;
+				.limit-box {
+					position: absolute;
+					text-align: center;
+					display: inline-block;
+					padding-right: 50rpx;
+					top: 6rpx;
+					margin-left: -50rpx;
+					image {
+						width: 46rpx;
+						height: 26rpx;
+					}				
+				}
+				.scroll-tab-item {				
 					text-align: center;
 					display: inline-block;
-					padding: 0 8rpx 30rpx 8rpx;
-					margin-right: 50rpx;
+					padding: 32rpx 8rpx 30rpx 8rpx;
+					margin-right: 51rpx;
 					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;
@@ -735,7 +722,6 @@
 						display: flex;
 						font-size: 28rpx;
 						font-weight: 400;
-
 						.items-box {
 							width: 40rpx;
 						}
@@ -748,7 +734,6 @@
 					color: #333333;
 					font-weight: 400;
 					background-color: #F8F8FA;
-
 					.items-tow {
 						display: flex;
 						flex: 100%;
@@ -840,58 +825,54 @@
 				}
 			}
 
-			.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;
-						}
-					}
-				}
-
+			.industry-content {
+				background-color: #fff;
+				padding: 0 30rpx;
+				display: flex;
+				height: 90rpx;
+				margin: 3rpx 0;
+				.industry-box-left {
+					width: 50rpx;
+					display: flex;
+					align-items: center;
+					image {
+						width: 38rpx;
+						height: 34rpx;
+					}
+				}
+				.industry-box-right {
+					width: 100%;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					.ndustry-box-read {
+						display: flex;
+						color: #333;
+						font-size: 30rpx;
+						padding-left: 10rpx;
+						image {
+							margin-left: 10rpx;
+							width: 28rpx;
+							height: 36rpx;
+						}
+					}
+					.ndustry-box-arrow {
+						display: flex;
+						align-items: center;
+						.read {
+							width: 14rpx;
+							height: 14rpx;
+							background-color: #FF0000;
+							border-radius: 50%;
+							margin-right:10rpx;
+						}
+						.ndustry-box-text {
+							padding-right:20rpx;
+							color: #999999;
+							font-size: 26rpx;
+						}
+					}
+				}
 			}
 
 			.content-box {

reportPages/IndustryReport/IndustryReport.vue

@@ -55,14 +55,14 @@
 	export default {
 		data() {
 			return {
-          tabAct_id:null,
+          tabAct_id:'',
 		  tabBars: [],
-		  industrialManagementId:null,
+		  industrialManagementId:'',
 		  layoutTime:'',
           refresh: false,//正在下拉
           page_no:1,
           pageSize:10,
-		  categoryId:null,
+		  categoryId:'',
           collectList:[],
 		  isShow:false,
           haveDatas:true,
@@ -169,8 +169,7 @@
    		app.globalData.isBind = res.IsBind;
    		if((!res.IsAuth) && (!res.IsBind)) { // 已授权已绑定
    			uni.navigateTo({
-   				url:'/pages/reportDetail/reportDetail?idReport=' + item.ArticleId,
-   				// url:'/pages/landscape/landscape?id=' + item.ArticleId,
+   				url:'/pages/reportDetail/reportDetail?id=' + item.ArticleId,
    			});
    		}else if(res.IsAuth) { //未授权
    			uni.navigateTo({

reportPages/industrialReport/industrialReport.vue

@@ -39,13 +39,17 @@
           	loading: '加载中',
           	nomore: '已经到底了'
           },
+		  typeIsPost:'',//
+		  genreIs:'',//作者还是文章
           totalPage:'',
-		  titleReport:''
+		  titleReport:'',
 			};
 		},
     onLoad(option) {
 		 this.$store.dispatch("checkHandle",{type:'load',val:option}).then(res=>{
 			 this.categoryId= option.id-0
+			 this.typeIsPost=option.type || ''
+			 this.genreIs=option.isGenre || ''
 			 this.getCollectList()
 		 })
 		
@@ -55,6 +59,35 @@
     methods:{
     /* 获取列表 */
     getCollectList() {
+		if(this.typeIsPost =='研选') {
+			Reports.industryReportList({
+				PageSize: this.pageSize,
+				CurrentIndex: this.page_no,
+				DepartmentId:this.genreIs=='作者'?this.categoryId:'',
+				IndustrialManagementId:this.genreIs=='作者'?'':this.categoryId,
+			}).then(res => {
+    		if(res.Ret === 200) {
+				uni.setNavigationBarTitle({
+				    title: this.genreIs=='作者' ? res.Data.NickName :res.Data.IndustryName
+				});
+				this.titleReport = this.genreIs=='作者' ? res.Data.NickName :res.Data.IndustryName
+    			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)
+    			}
+    		}
+    	})	
+			return
+		}
+	
     	Reports.getTactics({
     		PageSize: this.pageSize,
     		CurrentIndex: this.page_no,
@@ -88,7 +121,7 @@
    		app.globalData.isBind = res.IsBind;
    		if((!res.IsAuth) && (!res.IsBind)) { // 已授权已绑定
    			uni.navigateTo({
-   				url:'/pages/reportDetail/reportDetail?idReport=' + item.ArticleId,
+   				url:'/pages/reportDetail/reportDetail?id=' + item.ArticleId,
    			});
    		}else if(res.IsAuth) { //未授权
    			uni.navigateTo({
@@ -123,7 +156,7 @@
    onShareAppMessage: function (res) {
    	return {
    		title: this.titleReport,
-   		path: '/reportPages/industrialReport/industrialReport?id='+this.categoryId,
+   		path: '/reportPages/industrialReport/industrialReport?id='+this.categoryId+'&type='+this.typeIsPost+'&isGenre='+this.genreIs,
    		success: (res)=> {
    		},
    		fail: (err)=> {

reportPages/reportSearch/reportSearch.vue

@@ -2,7 +2,7 @@
 	<view class="searchTarget-container container">
 		<view class="searchTarget-header">
 			<input type="text" 
-			placeholder="请输入关键字" 
+			placeholder="请输入产业名称或标的名称" 
 			placeholder-class="sea_ipt_placeholder" 
 			class="sea_ipt" 
 			v-model="searchTxt"