merge master

activityPages/activityDetail/activityDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <block>
-    <view class="container activity-detail" v-if="isUserBindingPhoneNumber">
+    <view class="container activity-detail">
       <is-track-follow :isShowFollowButton.sync="detailData.IsShowFollowButton" source="activity" :sourceId="detailData.ActivityId" :isFollowData.sync="detailData.IsFollowButton" />
       <view class="" v-if="haveAuth == 1">
         <block v-if="detailData.YidongActivityUrl">
@@ -15,7 +15,7 @@
           <view class="content">
             <view v-if="detailData.ActivityName" class="dialog-title brackets-title">
               <image v-if="detailData.IsResearchPoints" src="https://hzstatic.hzinsights.com/cygx/icon/Research_Points.png"></image>
-							<image v-else-if="detailData.IsResearch" src="https://hzstatic.hzinsights.com/cygx/icon/Research_normal.png"></image>
+              <image v-else-if="detailData.IsResearch" src="https://hzstatic.hzinsights.com/cygx/icon/Research_normal.png"></image>
               <image v-else-if="!detailData.IsResearchPoints && detailData.IsExternalLabel" src="https://hzstatic.hzinsights.com/cygx/icon/activity_external.png"></image>
               {{ detailData.ActivityName }}
             </view>
@@ -167,11 +167,11 @@
               <view class="network-left">美国拨入：</view>
               <view class="network-right" style="color: #2c83ff" @click="phonebtn(detailData.AmericaTell)">{{ detailData.AmericaTell }}</view>
             </view>
-            <view v-if="detailData.ParticipationCode" class="network">
+            <view v-if="detailData.ParticipationCode && isUserBindingPhoneNumber" class="network">
               <view class="network-left">拨入密码：</view>
               <view class="network-right">{{ [1, 2, 3].includes(detailData.ActivityTypeId) && detailData.IsLimitPeople && !detailData.IsSignup ? "请报名获取" : detailData.ParticipationCode }}</view>
             </view>
-            <view class="network" v-if="detailData.OnlineParticipation">
+            <view class="network" v-if="detailData.OnlineParticipation && isUserBindingPhoneNumber">
               <view class="network-left">网络参会：</view>
               <view class="network-right network-link" v-if="[1, 2].includes(detailData.ActivityTypeId) && detailData.IsLimitPeople && !detailData.IsSignup"> 请报名获取 </view>
               <view class="network-right network-link" style="color: #2c83ff" v-else>
@@ -181,7 +181,7 @@
                 </view>
               </view>
             </view>
-            <view class="network" v-if="detailData.LinkParticipants">
+            <view class="network" v-if="detailData.LinkParticipants && isUserBindingPhoneNumber">
               <view class="network-left">链接参会：</view>
               <view class="network-right network-zoom" style="color: #2c83ff">
                 <view>
@@ -199,13 +199,13 @@
                 <rich-text :nodes="detailData.AppAttendance"></rich-text>
               </view>
             </view>
-            <view v-if="detailData.ConferencePassword" class="network">
+            <view v-if="detailData.ConferencePassword && isUserBindingPhoneNumber" class="network">
               <view class="network-left">拨入密码：</view>
               <view class="network-right">{{
                 detailData.ActivityTypeName == "公司调研电话会" && detailData.IsLimitPeople && !detailData.IsSignup ? "请报名获取" : detailData.ConferencePassword
               }}</view>
             </view>
-            <view v-if="detailData.Address" class="network">
+            <view v-if="detailData.Address && isUserBindingPhoneNumber" class="network">
               <view class="network-left">活动地址：</view>
               <view class="network-right" v-if="!detailData.IsSignup && detailData.ActivityTypeName == '公司线下调研' && detailData.IsLimitPeople">请报名获取 </view>
               <text class="network-right text-copy" user-select v-else>{{ detailData.Address }}</text>
@@ -245,7 +245,7 @@
           </view>
           <view class="" style="height: 50rpx"></view>
           <!-- 操作按钮部分 -->
-          <view class="content-bottom">
+          <view class="content-bottom" v-if="isUserBindingPhoneNumber">
             <block v-if="detailData.ActiveState == 1">
               <view class="make-outbound" @click="signupIsAddOfCancel(1)" v-if="detailData.IsShowOutboundCall">
                 {{ detailData.LimitPeopleNum > 0 ? `${showOutboundCall}(${detailData.SignupNum}/${detailData.LimitPeopleNum})` : showOutboundCall }}
@@ -270,6 +270,9 @@
               </view>
             </view>
           </view>
+          <view class="content-bottom" v-else>
+            <view class="make-outbound" @click="pleaseGoLogin"> 请登录后报名 </view>
+          </view>
         </block>
         <!-- 参会方式的弹出层 -->
         <SelectPopup :selectShow.sync="selectShow" @signupIsAddOfCancel="signupIsAddOfCancel" :selectYdong="selectYdong" />
@@ -325,7 +328,6 @@
       <!-- 各种弹框部分 -->
       <ShowResearchDlg :isResearchModalShow.sync="isResearchModalShow" :jurisdictionList="jurisdictionList" :checkResearchList.sync="checkResearchList" />
     </view>
-    <not-have-login v-else />
     <Loading />
   </block>
 </template>
@@ -769,10 +771,8 @@ export default {
     // 详情页面不写路径
   },
   onShow() {
-    if (!this.$store.state.isAuth && !this.$store.state.isBind) {
-      //已授权已绑定
-      this.getActivityDetail();
-    }
+    this.getActivityDetail();
+
     this.$store.commit("setRouterReport", "活动详情");
   },
   /**
@@ -839,7 +839,7 @@ export default {
         height: 30rpx;
         vertical-align: middle;
         margin-right: 5rpx;
-				margin-bottom: 5rpx;
+        margin-bottom: 5rpx;
       }
     }
     .brackets-title {

activityPages/themeActivity/themeActivity.vue

@@ -3,7 +3,7 @@
     <view class="container theme-container">
       <!-- 筛选部分 -->
       <view class="select-content-activity">
-        <view class="top-title" v-if="!type">
+        <view class="top-title" v-if="!type && isUserBindingPhoneNumber">
           <view :class="['content-title', !contentDetail.IsJump && 'jump-title']" @click="jumpHandler">
             <text class="jump-label">{{ contentDetail.Label }}</text>
             <text v-if="contentDetail.IsJump" class="jump-text"> 查看资源包>></text>
@@ -12,7 +12,7 @@
         </view>
         <view :class="['screen-item', (isEndActivity || !type) && 'end-select-item']">
           <block v-if="!isEndActivity && type">
-            <text :class="[isShowJurisdiction ? 'active' : '', 'text-item']" @click="permissioActivity">有权限行业</text>
+            <text :class="[isShowJurisdiction ? 'active' : '', 'text-item']" @click="permissioActivity" v-if="isUserBindingPhoneNumber">有权限行业</text>
             <!-- 各种状态选择 -->
             <view class="select-conyent" ref="select-conyent">
               <van-dropdown-menu active-color="#333333">
@@ -100,7 +100,7 @@
                     <text> {{ item.ActivityTimeText }}</text>
                   </view>
                 </view>
-                <block v-if="item.SourceType == 1">
+                <block v-if="item.SourceType == 1 && isUserBindingPhoneNumber">
                   <block v-if="item.ActiveState == 1">
                     <view :class="['bottom-box', isEndBtn(item) > 3 && 'expert-item', item.City && 'city']">
                       <view class="city-img" v-if="item.City">
@@ -153,7 +153,7 @@
                     </view>
                   </block>
                 </block>
-                <block v-if="item.SourceType == 2">
+                <block v-if="item.SourceType == 2 && isUserBindingPhoneNumber">
                   <view class="bottom-box">
                     <view class="" style="width: 130rpx"> </view>
                     <text @click="lookImg(item)">行程安排</text>

components/ItemComponent/activityItem.vue

@@ -29,7 +29,7 @@
       <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png"></image>
       {{ list.City }}
     </view>
-    <view :class="['content-btn', isEndBtnSlide(list) > 2 && 'content-btn-end']">
+    <view :class="['content-btn', isEndBtnSlide(list) > 2 && 'content-btn-end']" v-if="isUserBindingPhoneNumber ">
       <block v-if="list.SourceType === 1">
         <block v-if="list.ActiveState == 1">
           <text class="item-btn btn-solid" v-if="list.IsShowOutboundCall && list.ActivityTypeId == 1" @click.stop="signupIsAddOfCancel(list, 1)">{{

components/activity/indexActivity.js

@@ -371,7 +371,6 @@ export default {
 			this.wanttosignup(item)
 		},
 		async goDetailCheck(item){
-			await this.$store.dispatch("showLoginModal")
 			this.goDetail(item)
 		}
   },

components/activity/purchaserActivityList.vue

@@ -26,7 +26,7 @@
 						{{ item.City }}
 					</view>
 				</view>
-				<view class="activity-buttons-row">
+				<view class="activity-buttons-row" v-if="isUserBindingPhoneNumber">
 					<block v-if="item.ActiveState == 1">
 						<text v-if="item.IsShowOutboundCall && item.ActivityTypeId == 1"
 						class="main-button" @click="signupCheck(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>

mixin/index.js

@@ -70,6 +70,23 @@ export default {
         .replace(/font-size:\w+;?/g, "");
       return `<div style="font-size:16px;line-height: 1.6">${font}</div>`;
     },
+    pleaseGoLogin() {
+      uni.showModal({
+        title: "即将前往登录页面，请确认是否继续",
+        confirmColor: "#3385FF",
+        cancelColor: "#606266",
+        success: function (res) {
+          if (res.confirm) {
+            //已授权未绑定
+            uni.navigateTo({
+              url: "/pageMy/login/login",
+            });
+          } else if (res.cancel) {
+            console.log("用户点击取消");
+          }
+        },
+      });
+    },
   },
   computed: {
     isUserBindingPhoneNumber: {

pageMy/followUs/followUs.vue

@@ -1,5 +1,5 @@
 <template>
-  <block v-if="isUserBindingPhoneNumber">
+  <block>
     <view class="container container-follow-us">
       <view class="content">
         <video
@@ -17,7 +17,6 @@
       </view>
     </view>
   </block>
-  <not-have-login v-else />
 </template>
 
 <script>

pageMy/myPage/myPage.vue

@@ -11,52 +11,62 @@
         <van-icon @click="myNotice = false" class="my-icon" name="cross" />
       </view>
     </view>
-    <view class="my-info" v-if="isUserBindingPhoneNumber">
+    <view class="my-info">
       <view class="my-top-info">
-        <view class="info">
-          <view class="info-img">
-            <button class="avatar-wrapper" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
-              <image class="avatar" v-if="headimgurl" :src="headimgurl"></image>
-              <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/logo.png" class="avatar" v-else></image>
-            </button>
+        <block v-if="isUserBindingPhoneNumber">
+          <view class="info">
+            <view class="info-img">
+              <button class="avatar-wrapper" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
+                <image class="avatar" v-if="headimgurl" :src="headimgurl"></image>
+                <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/logo.png" class="avatar" v-else></image>
+              </button>
+            </view>
+            <view class="info-list">
+              <block v-if="isLogin">
+                <text class="name">{{ userInfo.RealName || "--" }}</text>
+                <text class="mobile">{{ userInfo.Mobile || userInfo.Email }}</text>
+                <text class="company-name">{{ userInfo.CompanyName || "--" }}</text>
+              </block>
+              <block v-else>
+                <text class="name">Hi，请绑定联系方式～</text>
+                <text class="bind-btn" @click="loginHandle">绑定联系方式</text>
+              </block>
+            </view>
           </view>
-          <view class="info-list">
-            <block v-if="isLogin">
-              <text class="name">{{ userInfo.RealName || "--" }}</text>
-              <text class="mobile">{{ userInfo.Mobile || userInfo.Email }}</text>
-              <text class="company-name">{{ userInfo.CompanyName || "--" }}</text>
-            </block>
-            <block v-else>
-              <text class="name">Hi，请绑定联系方式～</text>
-              <text class="bind-btn" @click="loginHandle">绑定联系方式</text>
-            </block>
-          </view>
-        </view>
-        <view class="auth-info">
-          <template v-if="isLogin">
-            <scroll-view scroll-x="true" scroll-with-animation class="auth-ul" v-if="userInfo.HasPermission === 0">
-              <text class="auth-li" v-for="item in authList" :key="item">{{ item }}</text>
-            </scroll-view>
-            <block v-else>
-              <button class="auth-btn" @click="applyAuth" v-if="userInfo.HasPermission != 3">申请开通权限</button>
-            </block>
-          </template>
-          <text v-else class="no-auth">暂无品种权限信息</text>
-        </view>
-        <view class="info-item">
-          <view class="item" @click="itemClickHandle('活动日程')">
-            <text class="item-number">{{ userInfo.ScheduleNum }}</text>
-            <text class="item-text">活动日程</text>
+          <view class="auth-info">
+            <template v-if="isLogin">
+              <scroll-view scroll-x="true" scroll-with-animation class="auth-ul" v-if="userInfo.HasPermission === 0">
+                <text class="auth-li" v-for="item in authList" :key="item">{{ item }}</text>
+              </scroll-view>
+              <block v-else>
+                <button class="auth-btn" @click="applyAuth" v-if="userInfo.HasPermission != 3">申请开通权限</button>
+              </block>
+            </template>
+            <text v-else class="no-auth">暂无品种权限信息</text>
           </view>
-          <view class="item item-label" @click="itemClickHandle('我的收藏')">
-            <text class="item-number">{{ userInfo.ConNum }}</text>
-            <text class="item-text">收藏</text>
+          <view class="info-item">
+            <view class="item" @click="itemClickHandle('活动日程')">
+              <text class="item-number">{{ userInfo.ScheduleNum }}</text>
+              <text class="item-text">活动日程</text>
+            </view>
+            <view class="item item-label" @click="itemClickHandle('我的收藏')">
+              <text class="item-number">{{ userInfo.ConNum }}</text>
+              <text class="item-text">收藏</text>
+            </view>
+            <view class="item" @click="itemClickHandle('我的足迹')">
+              <text class="item-number">{{ userInfo.HistoryNum }}</text>
+              <text class="item-text">足迹</text>
+            </view>
           </view>
-          <view class="item" @click="itemClickHandle('我的足迹')">
-            <text class="item-number">{{ userInfo.HistoryNum }}</text>
-            <text class="item-text">足迹</text>
+        </block>
+        <block v-else>
+          <view class="btn-login">
+            <image src="https://hzstatic.hzinsights.com/cygx/icon/activity-no-data.png"></image>
+            <view>暂无您的登录信息</view>
+            <view>请登陆后再查看此页面内容</view>
+            <view class="login-button" @click="pleaseGoLogin">立即登陆</view>
           </view>
-        </view>
+        </block>
       </view>
       <view class="info-bot">
         <view class="list-item border_bottom" v-for="type in typeArr" :key="type" @click="itemClickHandle(type)">
@@ -78,10 +88,10 @@
       </view>
       <view class="bottom-text">您手边的研究素材库</view>
     </view>
-    <view v-else class="not-bind-login">
+    <!-- <view v-else class="not-bind-login">
       <not-have-login />
       <view class="bottom-text">您手边的研究素材库</view>
-    </view>
+    </view> -->
 
     <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
     <Loading />
@@ -134,7 +144,7 @@ export default {
   watch: {
     "wholeShowListData.IsBelongRai": {
       handler(newVal) {
-        this.typeArr = ["外呼号码", "活动提问", "我的留言", "优化建议", "关于我们", "产品内测", "关注公众号", "PC网页版"];
+        this.typeArr = this.isUserBindingPhoneNumber ? ["外呼号码", "活动提问", "我的留言", "优化建议", "关于我们", "产品内测", "关注公众号", "PC网页版"] : ["关于我们", "关注公众号", "PC网页版"];
         if (!newVal) {
           this.typeArr.splice(5, 1);
         }
@@ -235,7 +245,7 @@ export default {
       let istype = type === "关注公众号" || type === "优化建议" || type === "外呼号码" ? type : "";
       istype && this.getRecordTracking("istype");
       /* 是否登录 */
-      if (this.isLogin) {
+      if (this.isLogin || type === "关注公众号" || type == "关于我们" || type === "PC网页版") {
         switch (type) {
           case "外呼号码":
             uni.navigateTo({
@@ -506,7 +516,7 @@ export default {
     z-index: 9;
     font-size: 20rpx;
     color: #999999;
-    width:100%;
+    width: 100%;
     text-align: center;
   }
   .not-bind-login {
@@ -524,5 +534,31 @@ export default {
       bottom: -50rpx;
     }
   }
+  .btn-login {
+    padding-top: 60rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    color: #999999;
+    font-size: 24rpx;
+    line-height: 36rpx;
+    image {
+      width: 261rpx;
+      height: 201rpx;
+    }
+    .login-button {
+      margin-top: 20rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 156rpx;
+      height: 52rpx;
+      border-radius: 9rpx;
+      color: #fff;
+      font-weight: 600;
+      background-color: #376cbb;
+    }
+  }
 }
 </style>

pageMy/reportDetail/reportDetail.vue

@@ -1,9 +1,9 @@
 <template>
   <block>
-    <view class="container reportDetail-container" v-if="isUserBindingPhoneNumber">
+    <view class="container reportDetail-container">
       <block v-if="haveAuth === 1">
         <!-- 链接地址 -->
-        <web-view :src="linkurl + '?id=' + id + '&fromType=mpwechat&token=' + access_token + '&IsSendWx=' + isSendWx"></web-view>
+        <web-view :src="linkurl + '?id=' + id + '&fromType=mpwechat&token=' + access_token + '&IsSendWx=' + isSendWx + '&isBinding=' + isUserBindingPhoneNumber"></web-view>
       </block>
       <view class="noauth-cont" v-else-if="haveAuth === 2 || haveAuth === 3 || haveAuth === 4 || haveAuth === 5">
         <block v-if="isSpecialArticle_report">
@@ -43,7 +43,7 @@
             <view v-if="haveAuth === 3" class="btn-cont" @click="sellerApplyAuth"> {{ isShowText ? "提交申请" : "立即申请" }}</view>
             <view class="btn-cont back-btn" @click="backIndex"> 返回 </view>
             <view class="product-introduction-box" v-if="reportInfo.IsResearch">
-<!--              <view class="research-btn" @click="goRouterResearch('介绍')">
+              <!--              <view class="research-btn" @click="goRouterResearch('介绍')">
                 <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/report_Yx.png"></image>
                 点击查看买方研选产品介绍
               </view>
@@ -51,31 +51,23 @@
                 <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/quotation_icon.png"></image>
                 点击查看买方研选服务报价单
               </view> -->
-							<view class="product-introduction">
-								<view class="introduction-header">
-									<view class="introduction-header-left"></view>
-									<view class="introduction-header-right">
-										<view class="introduction-title-CN">
-											产品介绍
-										</view>
-										<view class="introduction-title-US">
-											Product Introduction
-										</view>
-									</view>
-								</view>
-								<view class="introduction-body">
+              <view class="product-introduction">
+                <view class="introduction-header">
+                  <view class="introduction-header-left"></view>
+                  <view class="introduction-header-right">
+                    <view class="introduction-title-CN"> 产品介绍 </view>
+                    <view class="introduction-title-US"> Product Introduction </view>
+                  </view>
+                </view>
+                <view class="introduction-body">
                   <view class="introduction-body-box">
-                    <view class="body-box-title">
-                      独家亮点
-                    </view>
+                    <view class="body-box-title"> 独家亮点 </view>
                     <view class="introduction-body-row"><span class="highHight-text">低至1000元</span>起访谈优质专家</view>
                     <view class="introduction-body-row">重点公司小范围交流<span class="highHight-text">破圈</span>参加</view>
                     <view class="introduction-body-row"><span class="highHight-text">海量</span>调研过程及纪要共享</view>
                   </view>
                   <view class="introduction-body-box">
-                    <view class="body-box-title">
-                      优质资源
-                    </view>
+                    <view class="body-box-title"> 优质资源 </view>
                     <view class="introduction-body-row"><span class="highHight-text">500+</span>篇/年调研纪要更新，</view>
                     <view class="introduction-body-row"><span class="highHight-text">300+</span>场/年海内外重点公司小范围交流，</view>
                     <view class="introduction-body-row"><span class="highHight-text">100+</span>场/年热点线下调研，</view>
@@ -83,39 +75,28 @@
                     <view class="introduction-body-row"><span class="highHight-text">1000+</span>名优秀买方汇集，</view>
                   </view>
                   <view class="introduction-body-box">
-                    <view class="body-box-title" style="margin-bottom: 18rpx;">
-                      服务报价
-                    </view>
+                    <view class="body-box-title" style="margin-bottom: 18rpx"> 服务报价 </view>
                     <view class="body-row-content">
-                      <view class="body-row-title">
-                        3万/年
-                      </view>
+                      <view class="body-row-title"> 3万/年 </view>
                       <view class="introduction-body-row">含无限量调研纪要查阅</view>
                       <view class="introduction-body-row"><span class="highHight-text">以及3次</span>公开专家访谈；</view>
                     </view>
                     <view class="body-row-content">
-                      <view class="body-row-title">
-                        5万/年
-                      </view>
+                      <view class="body-row-title"> 5万/年 </view>
                       <view class="introduction-body-row">含无限量调研纪要查阅</view>
-                      <view class="introduction-body-row">
-                        <span class="highHight-text">以及15次</span>公开专家访谈<span class="highHight-text">或30次</span>重点公司、专家小范围交流；
-                      </view>
+                      <view class="introduction-body-row"> <span class="highHight-text">以及15次</span>公开专家访谈<span class="highHight-text">或30次</span>重点公司、专家小范围交流； </view>
                     </view>
-                    <view class="body-row-content" style="margin-bottom: 0;">
-                      <view class="body-row-title">
-                        10万/年
-                      </view>
+                    <view class="body-row-content" style="margin-bottom: 0">
+                      <view class="body-row-title"> 10万/年 </view>
                       <view class="introduction-body-row">含无限量调研纪要查阅</view>
                       <view class="introduction-body-row">
-                        <span class="highHight-text">以及40次</span>公开专家访谈
-                        <span class="highHight-text">或80次</span>重点公司、专家小范围交流
+                        <span class="highHight-text">以及40次</span>公开专家访谈 <span class="highHight-text">或80次</span>重点公司、专家小范围交流
                         <span class="highHight-text">或20次</span>私享专家一对一。
                       </view>
                     </view>
                   </view>
-								</view>
-							</view>
+                </view>
+              </view>
             </view>
           </block>
           <block v-else>
@@ -127,7 +108,6 @@
         </block>
       </view>
     </view>
-    <not-have-login v-else />
     <Loading />
   </block>
 </template>
@@ -521,86 +501,85 @@ export default {
         z-index: 1;
       }
     }
-    .product-introduction-box{
-			background-color: #F7F7F7;
-			padding-top: 10rpx;
-			margin-top: 60rpx;
-			.product-introduction{
-				padding: 60rpx 60rpx 0;
-				background-color: white;
-				.introduction-header{
-					margin-bottom: 40rpx;
-					display: flex;
-					.introduction-header-left{
-						background-color: #CAAF8B;
-						height: 90rpx;
-						width: 14rpx;
-						margin-right: 20rpx;
-					}
-					.introduction-header-right{
-						text-align: left;
-						.introduction-title-CN{
-							font-weight: 500;
-							font-size: 34rpx;
-							color: #333333;
-							line-height: 42rpx;
-							margin-bottom: 8rpx;
-						}
-						.introduction-title-US{
-							font-weight: 400;
-							font-size: 28rpx;
-							color: #C0C4CC;
-							line-height: 42rpx;
-						}
-					}
-				}
-				.introduction-body{
-          .introduction-body-box{
+    .product-introduction-box {
+      background-color: #f7f7f7;
+      padding-top: 10rpx;
+      margin-top: 60rpx;
+      .product-introduction {
+        padding: 60rpx 60rpx 0;
+        background-color: white;
+        .introduction-header {
+          margin-bottom: 40rpx;
+          display: flex;
+          .introduction-header-left {
+            background-color: #caaf8b;
+            height: 90rpx;
+            width: 14rpx;
+            margin-right: 20rpx;
+          }
+          .introduction-header-right {
+            text-align: left;
+            .introduction-title-CN {
+              font-weight: 500;
+              font-size: 34rpx;
+              color: #333333;
+              line-height: 42rpx;
+              margin-bottom: 8rpx;
+            }
+            .introduction-title-US {
+              font-weight: 400;
+              font-size: 28rpx;
+              color: #c0c4cc;
+              line-height: 42rpx;
+            }
+          }
+        }
+        .introduction-body {
+          .introduction-body-box {
             text-align: left;
             margin-bottom: 40rpx;
-            .body-row-content{
+            .body-row-content {
               margin-bottom: 40rpx;
               font-size: 34rpx;
               line-height: 48rpx;
               font-weight: 600;
-              color: #CAAF8B;
-              .body-row-title{
+              color: #caaf8b;
+              .body-row-title {
                 margin-left: 40rpx;
               }
             }
-            .body-box-title{
+            .body-box-title {
               font-weight: 600;
               font-size: 34rpx;
               line-height: 48rpx;
               padding-left: 40rpx;
               position: relative;
               margin-bottom: 22rpx;
-              &::before{
+              &::before {
                 content: "";
                 height: 20rpx;
                 width: 20rpx;
-                background-color: #CAAF8B;
+                background-color: #caaf8b;
                 border-radius: 20rpx;
                 position: absolute;
                 left: 0;
                 top: 16rpx;
               }
             }
-            .introduction-body-row{
+            .introduction-body-row {
               margin-left: 40rpx;
               font-weight: 400;
               font-size: 26rpx;
               color: #333333;
               line-height: 36rpx;
             }
-            .highHight-text{
-              color: #CAAF8B;
+            .highHight-text {
+              color: #caaf8b;
             }
           }
-
-				}
-			}
-		}
+        }
+      }
+    }
   }
   .month_card {
     width: 100%;

pageMy/reportPage/reportPage.vue

@@ -70,7 +70,7 @@
           <view v-if="haveAuth === 3" class="btn-cont" @click="sellerApplyAuth"> {{ isShowText ? "提交申请" : "立即申请" }}</view>
           <view class="btn-cont back-btn" @click="backIndex"> 返回 </view>
           <view class="product-introduction-box" v-if="reportInfo.IsResearch">
-  <!--      <view class="research-btn" @click="goRouterResearch('介绍')">
+            <!--      <view class="research-btn" @click="goRouterResearch('介绍')">
               <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/report_Yx.png"></image>
               点击查看买方研选产品介绍
             </view>
@@ -82,27 +82,19 @@
               <view class="introduction-header">
                 <view class="introduction-header-left"></view>
                 <view class="introduction-header-right">
-                  <view class="introduction-title-CN">
-                    产品介绍
-                  </view>
-                  <view class="introduction-title-US">
-                    Product Introduction
-                  </view>
+                  <view class="introduction-title-CN"> 产品介绍 </view>
+                  <view class="introduction-title-US"> Product Introduction </view>
                 </view>
               </view>
               <view class="introduction-body">
                 <view class="introduction-body-box">
-                  <view class="body-box-title">
-                    独家亮点
-                  </view>
+                  <view class="body-box-title"> 独家亮点 </view>
                   <view class="introduction-body-row"><span class="highHight-text">低至1000元</span>起访谈优质专家</view>
                   <view class="introduction-body-row">重点公司小范围交流<span class="highHight-text">破圈</span>参加</view>
                   <view class="introduction-body-row"><span class="highHight-text">海量</span>调研过程及纪要共享</view>
                 </view>
                 <view class="introduction-body-box">
-                  <view class="body-box-title">
-                    优质资源
-                  </view>
+                  <view class="body-box-title"> 优质资源 </view>
                   <view class="introduction-body-row"><span class="highHight-text">500+</span>篇/年调研纪要更新，</view>
                   <view class="introduction-body-row"><span class="highHight-text">300+</span>场/年海内外重点公司小范围交流，</view>
                   <view class="introduction-body-row"><span class="highHight-text">100+</span>场/年热点线下调研，</view>
@@ -110,33 +102,22 @@
                   <view class="introduction-body-row"><span class="highHight-text">1000+</span>名优秀买方汇集，</view>
                 </view>
                 <view class="introduction-body-box">
-                  <view class="body-box-title" style="margin-bottom: 18rpx;">
-                    服务报价
-                  </view>
+                  <view class="body-box-title" style="margin-bottom: 18rpx"> 服务报价 </view>
                   <view class="body-row-content">
-                    <view class="body-row-title">
-                      3万/年
-                    </view>
+                    <view class="body-row-title"> 3万/年 </view>
                     <view class="introduction-body-row">含无限量调研纪要查阅</view>
                     <view class="introduction-body-row"><span class="highHight-text">以及3次</span>公开专家访谈；</view>
                   </view>
                   <view class="body-row-content">
-                    <view class="body-row-title">
-                      5万/年
-                    </view>
+                    <view class="body-row-title"> 5万/年 </view>
                     <view class="introduction-body-row">含无限量调研纪要查阅</view>
-                    <view class="introduction-body-row">
-                      <span class="highHight-text">以及15次</span>公开专家访谈<span class="highHight-text">或30次</span>重点公司、专家小范围交流；
-                    </view>
+                    <view class="introduction-body-row"> <span class="highHight-text">以及15次</span>公开专家访谈<span class="highHight-text">或30次</span>重点公司、专家小范围交流； </view>
                   </view>
-                  <view class="body-row-content" style="margin-bottom: 0;">
-                    <view class="body-row-title">
-                      10万/年
-                    </view>
+                  <view class="body-row-content" style="margin-bottom: 0">
+                    <view class="body-row-title"> 10万/年 </view>
                     <view class="introduction-body-row">含无限量调研纪要查阅</view>
                     <view class="introduction-body-row">
-                      <span class="highHight-text">以及40次</span>公开专家访谈
-                      <span class="highHight-text">或80次</span>重点公司、专家小范围交流
+                      <span class="highHight-text">以及40次</span>公开专家访谈 <span class="highHight-text">或80次</span>重点公司、专家小范围交流
                       <span class="highHight-text">或20次</span>私享专家一对一。
                     </view>
                   </view>
@@ -153,7 +134,40 @@
         </block>
       </view>
     </view>
-    <not-have-login v-else />
+    <view v-else-if="Object.keys(reportInfo).length > 0" class="no-binding">
+      <view class="no-binding-content">
+        <view class="title">{{ reportInfo.Title }}</view>
+        <view class="tiem">{{ reportInfo.PublishDate }}</view>
+        <view class="lable-content">
+          <view
+            class="item"
+            v-for="(value, key) in lableListForm"
+            :key="key"
+            :style="{
+              color: colors[key].color,
+              backgroundColor: colors[key].background,
+              borderColor: colors[key]['border-color'],
+            }"
+          >
+            {{ value }}
+          </view>
+        </view>
+        <view class="content">
+          <view class="content-line"></view>
+          <view class="content-abstract">
+            <view class="abstract">
+              <text class="content-text">摘要:</text>
+              <mp-html :content="reportInfo.Abstract" />
+            </view>
+            <view class="describe">
+              <text class="content-text">核心观点:</text>
+              <mp-html :content="reportInfo.Annotation" />
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="please-login" @click="pleaseGoLogin">请登录后查看更多内容</view>
+    </view>
     <Loading />
   </block>
 </template>
@@ -162,7 +176,6 @@
 import { Report, User, Reports, FreeButton } from "@/config/api.js";
 import freeCharge from "@/components/freeCharge";
 import { reportStrategyUrl } from "@/config/config";
-import NotHaveLogin from "@/components/notHaveLogin.vue";
 let app = getApp({ allowDefault: true });
 export default {
   data() {
@@ -180,11 +193,38 @@ export default {
       showNav: false,
       haveAuth: false,
       isSendWx: "",
+      lableListForm: {
+        CategoryName: "",
+        FieldName: "",
+        Frequency: "月度",
+        SubCategoryName: "渠道新声",
+      },
+      colors: {
+        CategoryName: {
+          color: "#0958d9",
+          background: "#e6f4ff",
+          "border-color": "#91caff",
+        },
+        FieldName: {
+          color: "#cf1322",
+          background: "#fff1f0",
+          "border-color": "#ffa39e",
+        },
+        Frequency: {
+          color: "#531dab",
+          background: "#f9f0ff",
+          "border-color": "#d3adf7",
+        },
+        SubCategoryName: {
+          color: "#d4380d",
+          background: "#fff2e8",
+          "border-color": "#ffbb96",
+        },
+      },
     };
   },
   components: {
     freeCharge,
-    NotHaveLogin,
   },
   computed: {
     shareTitle() {
@@ -228,6 +268,15 @@ export default {
           this.haveAuth = res.Data.HasPermission;
           this.isShowWriter = res.Data.IsShow;
           this.reportInfo = res.Data.Detail;
+          console.log(this.reportInfo);
+          if (!this.isUserBindingPhoneNumber) {
+            this.lableListForm = {
+              CategoryName: this.reportInfo.CategoryName,
+              FieldName: this.reportInfo.FieldName,
+              Frequency: this.reportInfo.Frequency,
+              SubCategoryName: this.reportInfo.SubCategoryName,
+            };
+          }
           if (res.Data.HasPermission === 1) {
             //有访问权限
             this.isCollection = this.reportInfo.IsCollect;
@@ -418,7 +467,7 @@ export default {
     }, 1000);
     let page = getCurrentPages(); //查看路径
     if (page.length === 1) {
-      if (!this.$store.state.isAuth && !this.$store.state.isBind && this.id > 0) this.getDetail();
+      this.getDetail();
     } else {
       // 跳转入口
       this.id > 0 && this.getDetail();
@@ -591,86 +640,85 @@ export default {
         z-index: 1;
       }
     }
-    .product-introduction-box{
-			background-color: #F7F7F7;
-			padding-top: 10rpx;
-			margin-top: 60rpx;
-			.product-introduction{
-				padding: 60rpx 60rpx 0;
-				background-color: white;
-				.introduction-header{
-					margin-bottom: 40rpx;
-					display: flex;
-					.introduction-header-left{
-						background-color: #CAAF8B;
-						height: 90rpx;
-						width: 14rpx;
-						margin-right: 20rpx;
-					}
-					.introduction-header-right{
-						text-align: left;
-						.introduction-title-CN{
-							font-weight: 500;
-							font-size: 34rpx;
-							color: #333333;
-							line-height: 42rpx;
-							margin-bottom: 8rpx;
-						}
-						.introduction-title-US{
-							font-weight: 400;
-							font-size: 28rpx;
-							color: #C0C4CC;
-							line-height: 42rpx;
-						}
-					}
-				}
-				.introduction-body{
-          .introduction-body-box{
+    .product-introduction-box {
+      background-color: #f7f7f7;
+      padding-top: 10rpx;
+      margin-top: 60rpx;
+      .product-introduction {
+        padding: 60rpx 60rpx 0;
+        background-color: white;
+        .introduction-header {
+          margin-bottom: 40rpx;
+          display: flex;
+          .introduction-header-left {
+            background-color: #caaf8b;
+            height: 90rpx;
+            width: 14rpx;
+            margin-right: 20rpx;
+          }
+          .introduction-header-right {
+            text-align: left;
+            .introduction-title-CN {
+              font-weight: 500;
+              font-size: 34rpx;
+              color: #333333;
+              line-height: 42rpx;
+              margin-bottom: 8rpx;
+            }
+            .introduction-title-US {
+              font-weight: 400;
+              font-size: 28rpx;
+              color: #c0c4cc;
+              line-height: 42rpx;
+            }
+          }
+        }
+        .introduction-body {
+          .introduction-body-box {
             text-align: left;
             margin-bottom: 40rpx;
-            .body-row-content{
+            .body-row-content {
               margin-bottom: 40rpx;
               font-size: 34rpx;
               line-height: 48rpx;
               font-weight: 600;
-              color: #CAAF8B;
-              .body-row-title{
+              color: #caaf8b;
+              .body-row-title {
                 margin-left: 40rpx;
               }
             }
-            .body-box-title{
+            .body-box-title {
               font-weight: 600;
               font-size: 34rpx;
               line-height: 48rpx;
               padding-left: 40rpx;
               position: relative;
               margin-bottom: 22rpx;
-              &::before{
+              &::before {
                 content: "";
                 height: 20rpx;
                 width: 20rpx;
-                background-color: #CAAF8B;
+                background-color: #caaf8b;
                 border-radius: 20rpx;
                 position: absolute;
                 left: 0;
                 top: 16rpx;
               }
             }
-            .introduction-body-row{
+            .introduction-body-row {
               margin-left: 40rpx;
               font-weight: 400;
               font-size: 26rpx;
               color: #333333;
               line-height: 36rpx;
             }
-            .highHight-text{
-              color: #CAAF8B;
+            .highHight-text {
+              color: #caaf8b;
             }
           }
-
-				}
-			}
-		}
+        }
+      }
+    }
   }
   .month_card {
     width: 100%;
@@ -726,4 +774,68 @@ export default {
   //   }
   // }
 }
+.no-binding {
+  padding: 30rpx;
+  background-color: #f0f1f5;
+  .lable-content {
+    display: flex;
+    flex-wrap: wrap;
+    .item {
+      font-size: 24rpx;
+      height: 34rpx;
+      padding: 0 16rpx;
+      display: flex;
+      align-items: center;
+      border: 1rpx solid #ccc;
+      border-radius: 2rpx;
+      margin-right: 20rpx;
+      margin-bottom: 20rpx;
+    }
+  }
+  .no-binding-content {
+    width: 100%;
+    background-color: #fff;
+    padding: 40rpx 20rpx;
+    .title {
+      font-size: 34rpx;
+      font-weight: 500;
+      line-height: 48rpx;
+      color: #333;
+    }
+    .tiem {
+      font-size: 24rpx;
+      color: #999999;
+      margin: 20rpx 0;
+    }
+    .content {
+      display: flex;
+      .content-line {
+        width: 4rpx;
+        background-color: #333;
+        margin-right: 20rpx;
+      }
+      .content-text {
+        font-size: 34rpx;
+        font-weight: 500;
+        color: #333;
+      }
+      .describe {
+        margin-top: 20rpx;
+      }
+    }
+  }
+  .please-login {
+    margin: 50rpx auto 150rpx;
+    width: 556rpx;
+    height: 64rpx;
+    color: #fff;
+    font-size: 24rpx;
+    font-weight: 600;
+    background-color: #376cbb;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 9rpx;
+  }
+}
 </style>

pages-search/indedxSearch/indedxSearch.vue

@@ -1,6 +1,6 @@
 <template>
   <block>
-    <view class="container search-container" v-if="isUserBindingPhoneNumber">
+    <view class="container search-container">
       <view class="sticky-content">
         <view class="searchTarget-header">
           <input
@@ -77,7 +77,6 @@
         </view>
       </view>
     </view>
-    <not-have-login v-else />
     <Loading />
   </block>
 </template>

pages/activity/activity.vue

@@ -4,7 +4,7 @@
       <search-bar @goSearch="goSearch" :searchTitle="searchPlaceholderList.SummarySearch" :width="46">
         <template slot="content-left">
           <view class="content">
-            <view class="activity-back" @click="activityPlayBack">
+            <view class="activity-back" @click="activityPlayBack" v-if="isUserBindingPhoneNumber">
               <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/at_back.png"></image>
               活动回放
             </view>
@@ -12,7 +12,7 @@
         </template>
       </search-bar>
       <view class="screen-item">
-        <text :class="isShowJurisdiction ? 'active' : ''" @click="permissioActivity">有权限行业</text>
+        <text v-if="isUserBindingPhoneNumber" :class="isShowJurisdiction ? 'active' : ''" @click="permissioActivity">有权限行业</text>
         <!-- 各种状态选择 -->
         <view class="select-conyent" ref="select-conyent">
           <van-dropdown-menu active-color="#333333">
@@ -41,8 +41,13 @@
     <!-- 活动列表 -->
     <block>
       <view class="collect-activity" v-if="haveData">
-				<activityTypeList :dataList="collectTypeList" :chartPermissionIds="chartPermissionIds"
-				 :isShowJurisdiction="isShowJurisdiction" :whichDay="whichDay" containerStyle="padding: 34rpx;display: flex;"/>
+        <activityTypeList
+          :dataList="collectTypeList"
+          :chartPermissionIds="chartPermissionIds"
+          :isShowJurisdiction="isShowJurisdiction"
+          :whichDay="whichDay"
+          containerStyle="padding: 34rpx;display: flex;"
+        />
         <view class="end-activity-text" v-if="collectTypeList.length" @click="endActivity">已结束活动 >></view>
       </view>
       <view class="nodata" v-if="!haveData">
@@ -60,7 +65,7 @@
 import { activity } from "@/config/api.js";
 import { Throttle } from "@/config/util.js";
 import SearchBar from "@/components/search-bar/searchBar.vue";
-import activityTypeList from "./components/activityTypeList.vue"
+import activityTypeList from "./components/activityTypeList.vue";
 import freeCharge from "@/components/freeCharge";
 import NotHaveLogin from "../../components/notHaveLogin.vue";
 let app = getApp();
@@ -69,7 +74,7 @@ export default {
     freeCharge,
     SearchBar,
     NotHaveLogin,
-		activityTypeList
+    activityTypeList,
   },
   data() {
     return {
@@ -105,7 +110,7 @@ export default {
       // IsHideResearch 行业列表是否隐藏 买方研选
       const res = await activity.getUserSearchContent({
         IsShowJurisdiction: this.isGetJurisdiction,
-        IsHideResearch:false
+        IsHideResearch: false,
       });
       if (res.Ret === 200) {
         this.isShowJurisdiction = res.Data.IsShowJurisdiction;
@@ -185,7 +190,7 @@ export default {
             str.push(key.PermissionName);
           }
         });
-      if ((str.length ==  this.listChartPermission.length) || str.length <= 0) {
+      if (str.length == this.listChartPermission.length || str.length <= 0) {
         this.chartPermissionName = "所有行业";
       } else {
         this.chartPermissionName = str.join(",");
@@ -257,7 +262,7 @@ export default {
     },
     //去往搜索事件
     goSearch() {
-      this.$store.dispatch("checkHandle", "/pages-search/indedxSearch/indedxSearch?source=活动页面");
+      uni.navigateTo({ url: "/pages-search/indedxSearch/indedxSearch?source=活动页面" });
     },
     //去往 活动回放activityPlayBack
     async activityPlayBack() {

pages/index/index.vue

@@ -89,9 +89,9 @@
         <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/act_search.png" mode="" class="nodata_ico"></image>
         <text style="">暂无数据</text>
       </view>
-      <view v-if="newDataList.length === 4" class="bind-btn">
+      <!-- <view v-if="newDataList.length === 4" class="bind-btn">
         <view @click="goLogin"> 为了给您提供更好的使用体验，<br />请 <text class="login-text">登录</text>后再查看此页面内容</view>
-      </view>
+      </view> -->
       <morning-dlg v-if="isMorningShow" :isMorningShow.sync="isMorningShow" :morningItem.sync="morningItem" />
     </view>
     <suspenButton :show.sync="wholeShowListData.IsShow" v-if="wholeShowListData.IsShow" ref="suspenButton">
@@ -260,7 +260,7 @@ export default {
     },
     /* 搜索 */
     goSearch() {
-      this.$store.dispatch("checkHandle", "/pages-search/indedxSearch/indedxSearch?isType=" + this.topTabsActive + "&source=首页页面");
+      uni.navigateTo({ url: "/pages-search/indedxSearch/indedxSearch?isType=" + this.topTabsActive + "&source=首页页面" });
     },
     async getUserInfo() {
       const res = await Mine.getInfo();

pages/material/material.vue

@@ -420,7 +420,7 @@ export default {
     },
     /* 搜索 */
     goSearch() {
-      this.$store.dispatch("checkHandle", "/pages-search/indedxSearch/indedxSearch?isType=" + this.topTabsActive + "&source=纪要库页面");
+      uni.navigateTo({ url: "/pages-search/indedxSearch/indedxSearch?isType=" + this.topTabsActive + "&source=纪要库页面" });
     },
     /* 绑定联系方式 */
     bindingMobile() {

pages/purchaser/purchaser.vue

@@ -165,7 +165,7 @@ export default {
     },
     /* 搜索 */
     async goSearch() {
-      await this.$store.dispatch("checkHandle", "/pages-search/indedxSearch/indedxSearch?id=研选" + "&source=买方研选页面");
+      uni.navigateTo({ url: "/pages-search/indedxSearch/indedxSearch?id=研选" + "&source=买方研选页面" });
     },
   },
   onLoad() {

pages/reportForm/reportForm.vue

@@ -469,7 +469,7 @@ export default {
     },
     /* 搜索 */
     async goSearch() {
-      await this.$store.dispatch("checkHandle", "/pages-search/indedxSearch/indedxSearch?id=报告" + "&source=深度研究页面");
+      uni.navigateTo({ url: "/pages-search/indedxSearch/indedxSearch?id=报告" + "&source=深度研究页面" });
     },
     /* 初始 */
     initList() {

reportPages/internalDetials/internalDetials.vue

@@ -1,8 +1,8 @@
 <template>
-  <block v-if="isUserBindingPhoneNumber">
+  <block>
     <block v-if="hasPermission === 1">
       <view class="container internal-detials" v-if="haveData">
-        <web-view :src="linkurl + '?id=' + reportId + '&token=' + access_token"></web-view>
+        <web-view :src="linkurl + '?id=' + reportId + '&token=' + access_token + '&isBinding=' + isUserBindingPhoneNumber"></web-view>
       </view>
       <view class="nodata" v-else>
         <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/report_loading_icon.png" class="nodata_img"></image>
@@ -27,13 +27,11 @@
     </view>
     <Loading />
   </block>
-  <not-have-login v-else />
 </template>
 
 <script>
 import { Reports } from "@/config/api.js";
 import statement from "@/reportPages/components/statement.vue";
-import NotHaveLogin from "@/components/notHaveLogin.vue";
 import { intemalLinkUrl } from "@/config/config.js";
 export default {
   data() {
@@ -52,7 +50,7 @@ export default {
       return intemalLinkUrl;
     },
   },
-  components: { statement, NotHaveLogin },
+  components: { statement },
   methods: {
     async reportSelectionDetail() {
       const res = await Reports.getProductInteriorDetail({

reportPages/keyCompany/keyCompany.vue

@@ -1,6 +1,6 @@
 <template>
   <block>
-    <block v-if="isUserBindingPhoneNumber">
+    <block>
       <view id="keyconmpany" class="container content-conmpany" v-if="haveData">
         <block v-if="Object.keys(reportDetail).length > 0">
           <view class="report-content-title">{{ reportDetail.Title }}</view>
@@ -8,10 +8,6 @@
             <text>{{ reportDetail.Department }}</text>
             <text>{{ reportDetail.PublishDate }}</text>
           </view>
-          <!-- <view class="content-statement">
-            <text>注：请务必阅读</text>
-            <text class="statement" @click="isShowStatement = true">免责声明 </text>
-          </view> -->
           <view class="content-statement">
             <view style="display: flex"> <text>注：请务必阅读</text> <text class="statement" @click="isShowStatement = true">免责声明 </text>   </view>
             <text class="statement" @click="goSecret">往期汇总>> </text>
@@ -31,63 +27,68 @@
               <text @click="reportDetailLink">点击查看</text>
             </view>
           </view>
-          <view class="industry-ul">
-            <view class="industry-li" v-for="(item, index) in dataListSubject" :key="index">
-              <view class="industry-name">{{ item.PermissionName }}</view>
-              <view :class="['industry-subject', item.ListSubject.length < 3 && 'industry-top-border']">
-                <view
-                  :class="['subject-item', 'text_oneLine', item.ListSubject.length < 3 && 'subject-item-top-border']"
-                  @click="positionSubject(key)"
-                  v-for="key in item.ListSubject"
-                  :key="key.IndustrialSubjectId"
-                >
-                  {{ key.SubjectName }}
-                  <image v-if="key.IsNew" class="icon_subject" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_subject.png"></image>
+          <block v-if="isUserBindingPhoneNumber">
+            <view class="industry-ul">
+              <view class="industry-li" v-for="(item, index) in dataListSubject" :key="index">
+                <view class="industry-name">{{ item.PermissionName }}</view>
+                <view :class="['industry-subject', item.ListSubject.length < 3 && 'industry-top-border']">
+                  <view
+                    :class="['subject-item', 'text_oneLine', item.ListSubject.length < 3 && 'subject-item-top-border']"
+                    @click="positionSubject(key)"
+                    v-for="key in item.ListSubject"
+                    :key="key.IndustrialSubjectId"
+                  >
+                    {{ key.SubjectName }}
+                    <image v-if="key.IsNew" class="icon_subject" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_subject.png"></image>
+                  </view>
                 </view>
               </view>
             </view>
-          </view>
-          <view class="content-ul">
-            <view class="content-li" v-for="item in dataList" :key="item.PermissionName">
-              <view class="content-title">
-                <image :src="item.IcoLink"></image>
-                {{ item.PermissionName }}
-              </view>
-              <mp-html :content="strFontSize(item.BodyChartSummary)" />
-              <view class="li-list">
-                <view class="li-item" v-for="key in item.List" :key="key.IndustrialSubjectId">
-                  <view :id="'subject' + key.IndustrialSubjectId" class="li-subject">
-                    <view class="item-name">
-                      <text style="display: inline-block; vertical-align: middle; font-weight: 600">{{ key.SubjectName }}</text>
-                      <image v-if="key.IsNew" src="https://hzstatic.hzinsights.com/cygx/icon/new_report.png"></image>
-                    </view>
-                    <text class="itel-label" v-for="val in key.CompanyLabel" :key="val"># {{ val }}</text>
-                  </view>
-                  <mp-html :content="strFontSize(key.Body)" />
-                  <view :style="{ 'margin-bottom': key.IsShowApplyButton ? '50rpx' : '120rpx' }" v-if="key.OverviewArticleId > 0 || key.List">
-                    <view class="subject-detali" v-if="key.OverviewArticleId > 0">
-                      <text style="display: inline-block">公司综述报告请</text>
-                      <text style="color: #3385ff; margin-left: 10rpx; display: inline-block" @click="goArticle(key.OverviewArticleId)">点击查看</text>
+            <view class="content-ul">
+              <view class="content-li" v-for="item in dataList" :key="item.PermissionName">
+                <view class="content-title">
+                  <image :src="item.IcoLink"></image>
+                  {{ item.PermissionName }}
+                </view>
+                <mp-html :content="strFontSize(item.BodyChartSummary)" />
+                <view class="li-list">
+                  <view class="li-item" v-for="key in item.List" :key="key.IndustrialSubjectId">
+                    <view :id="'subject' + key.IndustrialSubjectId" class="li-subject">
+                      <view class="item-name">
+                        <text style="display: inline-block; vertical-align: middle; font-weight: 600">{{ key.SubjectName }}</text>
+                        <image v-if="key.IsNew" src="https://hzstatic.hzinsights.com/cygx/icon/new_report.png"></image>
+                      </view>
+                      <text class="itel-label" v-for="val in key.CompanyLabel" :key="val"># {{ val }}</text>
                     </view>
-                    <view class="subject-detali" v-if="key.List">
-                      <text style="display: inline-block">相关调研纪要、深度报告请</text>
-                      <text style="color: #3385ff; margin-left: 10rpx; display: inline-block" @click="industry(key.List)">点击查看</text>
+                    <mp-html :content="strFontSize(key.Body)" />
+                    <view :style="{ 'margin-bottom': key.IsShowApplyButton ? '50rpx' : '120rpx' }" v-if="key.OverviewArticleId > 0 || key.List">
+                      <view class="subject-detali" v-if="key.OverviewArticleId > 0">
+                        <text style="display: inline-block">公司综述报告请</text>
+                        <text style="color: #3385ff; margin-left: 10rpx; display: inline-block" @click="goArticle(key.OverviewArticleId)">点击查看</text>
+                      </view>
+                      <view class="subject-detali" v-if="key.List">
+                        <text style="display: inline-block">相关调研纪要、深度报告请</text>
+                        <text style="color: #3385ff; margin-left: 10rpx; display: inline-block" @click="industry(key.List)">点击查看</text>
+                      </view>
                     </view>
+                    <view v-if="key.IsShowApplyButton" class="item-application" @click="applicationHandel(key)"> 申请路演</view>
                   </view>
-                  <view v-if="key.IsShowApplyButton" class="item-application" @click="applicationHandel(key)"> 申请路演</view>
                 </view>
               </view>
             </view>
-          </view>
-          <view class="back-top" v-if="isShowBackTop" @click="goBackTop">
-            <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/back_top.png"></image>
-          </view>
-          <statement :show="isShowStatement" />
-          <view class="select-box">
-            <u-popup v-model="areacodeShow" mode="bottom" @close="cancel">
-              <view class="box" style="color: #2c83ff" v-for="item in list" :key="item.IndustrialManagementId" @click="industryDetitle(item)"> {{ item.IndustryName }}</view>
-              <view class="box box-bottom" style="color: #a9afb8" @click="cancel">取消</view>
-            </u-popup>
+            <view class="back-top" v-if="isShowBackTop" @click="goBackTop">
+              <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/back_top.png"></image>
+            </view>
+            <statement :show="isShowStatement" />
+            <view class="select-box">
+              <u-popup v-model="areacodeShow" mode="bottom" @close="cancel">
+                <view class="box" style="color: #2c83ff" v-for="item in list" :key="item.IndustrialManagementId" @click="industryDetitle(item)"> {{ item.IndustryName }}</view>
+                <view class="box box-bottom" style="color: #a9afb8" @click="cancel">取消</view>
+              </u-popup>
+            </view>
+          </block>
+          <view class="content-bottom" v-else>
+            <view class="make-outbound" @click="pleaseGoLogin"> 请登录后报名 </view>
           </view>
         </block>
       </view>
@@ -96,7 +97,7 @@
         <view class="nodata-tip">正在努力编辑中，请耐心等待...</view>
       </view>
     </block>
-    <not-have-login v-else />
+    <!-- <not-have-login v-else /> -->
     <Loading />
   </block>
 </template>
@@ -278,7 +279,7 @@ export default {
     },
   },
   onLoad(option) {
-    if (!this.$store.state.isAuth && !this.$store.state.isBind) this.reportSelectionDetail(option);
+    this.reportSelectionDetail(option);
   },
   onShow() {
     this.readTiem = 0;
@@ -493,6 +494,41 @@ export default {
     color: #999;
     font-size: 30rpx;
   }
+  .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-generation {
+      padding-top: 0rpx !important;
+      line-height: 76rpx;
+    }
+    .make-conference {
+      margin: 30rpx auto;
+      width: 368rpx;
+      height: 80rpx;
+      border: 2px solid #2c83ff;
+      opacity: 1;
+      border-radius: 4rpx;
+      padding-top: 5rpx;
+      text-align: center;
+      color: #2c83ff;
+      font-size: 30rpx;
+      text {
+        font-size: 16rpx;
+      }
+    }
+  }
 }
 .noauth-cont {
   padding-top: 150rpx;

reportPages/morningDetails/morningDetails.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="container morning-details-content" v-if="isUserBindingPhoneNumber">
+  <view class="container morning-details-content" >
     <block v-if="hasPermission == 1">
       <view class="report-content-title">{{ reportDetails.Title }} </view>
       <view class="content-time">
@@ -33,7 +33,7 @@
     </view>
     <Loading />
   </view>
-  <not-have-login v-else />
+  <!-- <not-have-login v-else /> -->
 </template>
 
 <script>

reportPages/reportSecretDetail/reportSecretDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <block>
-    <view class="container content-secret forbid-copy" v-if="isUserBindingPhoneNumber">
-      <block v-if="hasPermission == 1">
+    <view class="container content-secret forbid-copy">
+      <block v-if="hasPermission == 1 || !isUserBindingPhoneNumber">
         <block v-if="detali">
           <view class="container-top">
             <view class="report-content-title">
@@ -13,9 +13,7 @@
             </view>
              
             <view class="content-statement">
-              <view style="display: flex">
-                <text>注：请务必阅读</text> <text class="statement" @click="isShowStatement = true">免责声明 </text>          
-              </view>
+              <view style="display: flex"> <text>注：请务必阅读</text> <text class="statement" @click="isShowStatement = true">免责声明 </text>           </view>
               <text class="statement" @click="goSecret">往期汇总>> </text>        
             </view>
             <view class="audio-card">
@@ -51,21 +49,13 @@
                 </view>
               </view>
               <view class="fast-reverse">
-                <image
-                  @click="speedReverseHandler('reverse')"
-                  class="speed-img"
-                  src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/fastReverse_icon.png"
-                ></image>
+                <image @click="speedReverseHandler('reverse')" class="speed-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/fastReverse_icon.png"></image>
                 <block v-for="(item, index) in timesTheSpeed" :key="item.value">
                   <view class="speed-button" v-if="isTimes == item.value" @click="isTimesHandler(index)">
                     {{ item.name }}
                   </view>
                 </block>
-                <image
-                  @click="speedReverseHandler('speed')"
-                  class="speed-img"
-                  src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/speed_icon.png"
-                ></image>
+                <image @click="speedReverseHandler('speed')" class="speed-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/speed_icon.png"></image>
               </view>
             </view>
             <view v-if="detali.Abstract" class="content-abstract">
@@ -123,7 +113,6 @@
         <audioModule :showAudioPop="showAudioPop" />
       </view>
     </view>
-    <not-have-login v-else />
     <Loading />
   </block>
 </template>
@@ -355,9 +344,7 @@ export default {
     this.setIntervalTiem = setInterval(() => {
       this.readTiem++;
     }, 1000);
-    if (!this.$store.state.isAuth && !this.$store.state.isBind) {
-      this.getDetilaiList();
-    }
+    this.getDetilaiList();
     this.$store.commit("setRouterReport", this.titleTxT);
     this.showAudioBox = true;
   },