1.14 概念中心模块调整，战略分析模块界面完善

pages/concept/concept.vue

@@ -14,7 +14,7 @@
 				<view class="flex1">最新数据: {{newestPriceDate}}</view>
 				<view class="sortTypeC flex" @click="clickSortType()">
 					<image class="icon" src="/static/icon/home/conceptCenter/sortType.png" mode="widthFix"></image>
-					<view>涨跌幅</view>
+					<view>{{sortTypeStr}}</view>
 					<image class="arrow" src="/static/icon/home/conceptCenter/conceptScreenArrow.png" mode="widthFix"></image>
 				</view>
 				<view class="line"></view>
@@ -29,21 +29,21 @@
 			<view class="list">
 				<view class="item" v-for="(item,index) in conceptList" :key="index">
 					<view class="titleChgStockNumC flex">
-						<view class="title">{{item.concept}}</view> 
+						<view class="title" @click.stop="clickConceptItem(item.concept)">{{item.concept}}</view> 
 						<view v-if="item.price_info" :class="'chg '+(getRateUpOrDown(item.price_info.avg_change_pct)?'down':'up')">{{getChgRateStr(item.price_info.avg_change_pct)}}%</view>
 						<view v-if="item.price_info" :class="'stockNum '+(getRateUpOrDown(item.price_info.avg_change_pct)?'down':'up')">{{item.stock_count}} 只股票</view>
 					</view>
-					<view class="content">{{item.description}}</view>
+					<view class="content" @click.stop="clickConceptItem(item.concept)">{{item.description}}</view>
 					<view class="hotStockC flex">
 						<view class="title">热门个股</view>
-						<view v-if="memberInfo&&memberInfo.is_member&&memberInfo.subscription_type=='pro'" class="stockList flex">
-							<view class="stockItem" v-for="(sitem,sindex) in item.stocks.slice(0,3)" :key="sindex">{{sitem.stock_name}}</view>
+						<view class="stockList flex">
+							<view class="stockItem" v-for="(sitem,sindex) in item.stocks.slice(0,3)" :key="sindex">{{sitem.name}}</view>
 							<view class="more" @click.stop="clickStockMore(item)">+{{item.stock_count-3}}更多</view>
 						</view>
-						<view v-else class="notVipC flex" @click.stop="clickNotVip()">
+						<!-- <view v-else class="notVipC flex" @click.stop="clickNotVip()">
 							<image class="icon" src="/static/icon/home/conceptCenter/lock.png" mode="widthFix"></image>
 							<view>需升级Pro会员查看{{item.stock_count}}只个股</view>
-						</view>
+						</view> -->
 					</view>
 					<view class="transactionDateHistoryTimeC flex">
 						<view class="transactionDate flex1">交易时间：{{item.price_info?item.price_info.trade_date:''}}</view>
@@ -98,7 +98,7 @@
 						<image v-if="index==2" class="rankIcon" src="/static/icon/home/conceptCenter/rank3.png" mode="widthFix"></image>
 						<view v-if="index>2" class="rankIndex">{{index+1}}</view>
 						<view class="flex1">
-							<view class="title">{{item.name}}</view>
+							<view class="title" @click.stop="clickConceptItem(item.name)">{{item.name}}</view>
 							<block v-if="selectTab==3||selectTab==4">
 								<view v-if="selectTab==3" class="calendarBrowseC">均幅 {{item.avg_change}}%</view>
 								<view v-if="selectTab==4" class="calendarBrowseC">累计 +{{item.total_change}}%</view>
@@ -250,6 +250,7 @@
 	import { inject } from 'vue';
 	import { conceptRankList, eventRelatedConcept, newestPriceDate, membershipStatus } from '@/request/api';
 	import { getChgRateStr, getRateUpOrDown } from '@/utils/util';
+	import CryptoJS from 'crypto-js'
 	
 	export default {
 		data() {
@@ -318,6 +319,7 @@
 					key:'concept_name'
 				}],
 				sortType:'change_pct',	//选择的排序方式
+				sortTypeStr:'涨跌幅',	//选择的排序方式
 				weekList:['一','二','三','四','五','六','日'],
 				monthDateList:[],
 				selectMonthIndex:0,			//选中月份下标
@@ -578,6 +580,7 @@
 			clickSortListItem(item)
 			{
 				this.sortType = item.key
+				this.sortTypeStr = item.name
 				this.clickSearch()
 				this.$refs["sortTypePopup"].close()
 			},
@@ -759,6 +762,16 @@
 			{
 				this.clickLater()
 			},
+			/**
+			 * 点击查看相关概念
+			 */
+			clickConceptItem(name)
+			{
+				let md5 = CryptoJS.MD5(name).toString()
+				uni.navigateTo({
+					url:'/pages/index/conceptDetails/conceptDetails?name='+md5
+				})
+			},
 			/**
 			 * 点击查看更多个股
 			 */
@@ -1380,7 +1393,7 @@ page
 .transactionDatePopup 
 {
 	background-color: white;
-	padding-bottom: env(safe-area-inset-bottom);
+	padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
 	border-radius: 20rpx 20rpx 0 0;
 	.btnTitleC 
 	{