Browse Source

init 12.1.1

bding 1 year ago
parent
commit
c09802f08b

+ 4 - 6
activityPages/activityDetail/activityDetail.vue

@@ -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>
@@ -769,10 +769,8 @@ export default {
     // 详情页面不写路径
   },
   onShow() {
-    if (!this.$store.state.isAuth && !this.$store.state.isBind) {
-      //已授权已绑定
-      this.getActivityDetail();
-    }
+    this.getActivityDetail();
+
     this.$store.commit("setRouterReport", "活动详情");
   },
   /**
@@ -839,7 +837,7 @@ export default {
         height: 30rpx;
         vertical-align: middle;
         margin-right: 5rpx;
-				margin-bottom: 5rpx;
+        margin-bottom: 5rpx;
       }
     }
     .brackets-title {

+ 3 - 3
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>
@@ -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>

+ 1 - 1
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)">{{

+ 17 - 0
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: {

+ 81 - 45
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);
         }
@@ -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>

+ 69 - 90
pageMy/reportDetail/reportDetail.vue

@@ -3,7 +3,7 @@
     <view class="container reportDetail-container" v-if="isUserBindingPhoneNumber">
       <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%;

+ 134 - 83
pageMy/reportPage/reportPage.vue

@@ -1,6 +1,6 @@
 <template>
   <block>
-    <view class="container reportDetail-container" v-if="isUserBindingPhoneNumber">
+    <view class="container reportDetail-container" v-if="!isUserBindingPhoneNumber">
       <block v-if="haveAuth === 1">
         <web-view :src="strategyUrl + '?url=' + linkurl" v-if="linkurl">
           <cover-view class="search-view">
@@ -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,26 @@
         </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="content">
+          <view class="content-line"></view>
+          <view class="content-abstract">
+            <view class="abstract">
+              <text class="content-text">摘要:</text>
+              {{ 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 +162,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() {
@@ -184,7 +183,6 @@ export default {
   },
   components: {
     freeCharge,
-    NotHaveLogin,
   },
   computed: {
     shareTitle() {
@@ -591,86 +589,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 +723,58 @@ export default {
   //   }
   // }
 }
+.no-binding {
+  padding: 30rpx;
+  background-color: #f0f1f5;
+
+  .no-binding-content {
+    width: 100%;
+    background-color: #fff;
+    height: 100vh;
+    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 {
+    position: fixed;
+    bottom: 300rpx;
+    left: 50%;
+    transform: translateX(-50%);
+    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>

+ 3 - 3
pages/activity/activity.vue

@@ -2,9 +2,9 @@
   <view class="container activity-content">
     <view class="top-content-box">
       <search-bar @goSearch="goSearch" :searchTitle="searchPlaceholderList.SummarySearch" :width="46">
-        <template slot="content-left">
+        <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">

+ 2 - 2
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">

+ 3 - 5
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({

+ 3 - 3
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>
@@ -96,7 +96,7 @@
         <view class="nodata-tip">正在努力编辑中,请耐心等待...</view>
       </view>
     </block>
-    <not-have-login v-else />
+    <!-- <not-have-login v-else /> -->
     <Loading />
   </block>
 </template>
@@ -278,7 +278,7 @@ export default {
     },
   },
   onLoad(option) {
-    if (!this.$store.state.isAuth && !this.$store.state.isBind) this.reportSelectionDetail(option);
+    this.reportSelectionDetail(option);
   },
   onShow() {
     this.readTiem = 0;

+ 2 - 2
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>

+ 6 - 19
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;
   },