Merge branch 'yh238'

src/views/hzyb/report/ChapterDetail.vue

@@ -89,18 +89,25 @@
 
 
       <!-- 无权限 -->
-      <div class="no-auth-wrap" v-if="!info.auth_ok">
-        <div class="apply-box" v-if="info.permission_check.type=='apply'">
-          <div>您暂无权限查看报告，若想查看请申请开通</div>
-          <div class="btn" @click="handleGoApply">立即申请</div>
-        </div>
-        <div class="apply-box" v-else>
-          <div>您暂无权限查看报告 </div>
-          <div>若想查看请联系对口销售：{{info.permission_check.name}}</div>
-          <a class="btn" :href="'tel:'+info.permission_check.mobile" tag="div">立即联系</a>
+      <div class="no-auth-wrap" v-if="userInfo?.is_bind==0">
+        <div class="apply-box">
+          <div>您尚未登录，请登录后查看更多信息</div>
+          <div class="btn" @click="handleGoLogin">立即登录</div>
         </div>
       </div>
-      
+      <template v-else>
+        <div class="no-auth-wrap" v-if="!info.auth_ok">
+          <div class="apply-box" v-if="info.permission_check.type=='apply'">
+            <div>您暂无权限查看报告，若想查看请申请开通</div>
+            <div class="btn" @click="handleGoApply">立即申请</div>
+          </div>
+          <div class="apply-box" v-else>
+            <div>您暂无权限查看报告 </div>
+            <div>若想查看请联系对口销售：{{info.permission_check.name}}</div>
+            <a class="btn" :href="'tel:'+info.permission_check.mobile" tag="div">立即联系</a>
+          </div>
+        </div>
+      </template>
     </div>
     <!-- 章节详情底部快速切换 -->
     <div class="chapter-list-wrap" v-if="fromPage=='reportdetail'">
@@ -337,17 +344,6 @@ export default {
       const res=await apiUserInfo()
       if(res.code===200){
         this.userInfo=res.data
-        if(this.userInfo.is_bind===0){
-            Dialog.confirm({
-                title:'温馨提示',
-                message:'为了优化您的用户体验，\n 请登录后查看更多信息！',
-                confirmButtonText:'去登录',
-                confirmButtonColor:'#E6B77D',
-                cancelButtonColor:'#666'
-            }).then(res=>{
-                wx.miniProgram.reLaunch({url:'/pages/login'})
-            })
-        }
         if(!iswatermark) return
         this.$nextTick(()=>{
           this.waterMark(res.data.mobile,this.$refs.richConBox)
@@ -628,6 +624,11 @@ export default {
     //   });
     // },
 
+    //登录
+    handleGoLogin(){
+      wx.miniProgram.navigateTo({url:'/pages/login?from=tologin'})
+    },
+
     //点击申请
     async handleGoApply(){
       if(this.userInfo.is_bind===0){

src/views/hzyb/report/Detail.vue

@@ -50,18 +50,27 @@
                 </div>
             </div>
             <!-- 无权限 -->
-            <div class="no-auth-box" v-if="!info.auth_ok">
+            <div class="no-auth-box" v-if="userInfo?.is_bind==0">
                 <img class="img" src="https://hzstatic.hzinsights.com/static/icon/hzyb/activity_no_auth.png" mode="widthFix" />
-                <div class="apply-box" v-if="info.permission_check.type=='apply'">
-                    <div>您暂无权限查看报告，若想查看请申请开通</div>
-                    <div class="btn" @click="handleGoApply">立即申请</div>
-                </div>
-                <div class="apply-box" v-else>
-                    <div>您暂无权限查看报告 </div>
-                    <div>若想查看请联系对口销售：{{info.permission_check.name}}</div>
-                    <a class="btn" :href="'tel:'+info.permission_check.mobile" tag="div">立即联系</a>
+                <div class="apply-box">
+                    <div>您尚未登录，请登录后查看更多信息</div>
+                    <div class="btn" @click="handleGoLogin">立即登录</div>
                 </div>
             </div>
+            <template v-else>
+                <div class="no-auth-box" v-if="!info.auth_ok">
+                    <img class="img" src="https://hzstatic.hzinsights.com/static/icon/hzyb/activity_no_auth.png" mode="widthFix" />
+                    <div class="apply-box" v-if="info.permission_check.type=='apply'">
+                        <div>您暂无权限查看报告，若想查看请申请开通</div>
+                        <div class="btn" @click="handleGoApply">立即申请</div>
+                    </div>
+                    <div class="apply-box" v-else>
+                        <div>您暂无权限查看报告 </div>
+                        <div>若想查看请联系对口销售：{{info.permission_check.name}}</div>
+                        <a class="btn" :href="'tel:'+info.permission_check.mobile" tag="div">立即联系</a>
+                    </div>
+                </div>
+            </template>
         </div>
 
         <!-- 报告详情 -->
@@ -149,17 +158,25 @@
             </div>
 
             <!-- 无权限 -->
-            <div class="no-auth-wrap" v-if="!info.auth_ok">
-                <div class="apply-box" v-if="info.permission_check.type=='apply'">
-                    <div>您暂无权限查看报告，若想查看请申请开通</div>
-                    <div class="btn" @click="handleGoApply">立即申请</div>
-                </div>
-                <div class="apply-box" v-else>
-                    <div>您暂无权限查看报告 </div>
-                    <div>若想查看请联系对口销售：{{info.permission_check.name}}</div>
-                    <a class="btn" :href="'tel:'+info.permission_check.mobile" tag="div">立即联系</a>
+            <div class="no-auth-wrap" v-if="userInfo?.is_bind==0">
+                <div class="apply-box">
+                    <div>您尚未登录，请登录后查看更多信息</div>
+                    <div class="btn" @click="handleGoLogin">立即登录</div>
                 </div>
             </div>
+            <template v-else>
+                <div class="no-auth-wrap" v-if="!info.auth_ok">
+                    <div class="apply-box" v-if="info.permission_check.type=='apply'">
+                        <div>您暂无权限查看报告，若想查看请申请开通</div>
+                        <div class="btn" @click="handleGoApply">立即申请</div>
+                    </div>
+                    <div class="apply-box" v-else>
+                        <div>您暂无权限查看报告 </div>
+                        <div>若想查看请联系对口销售：{{info.permission_check.name}}</div>
+                        <a class="btn" :href="'tel:'+info.permission_check.mobile" tag="div">立即联系</a>
+                    </div>
+                </div>
+            </template>
 
             <!-- 右侧悬浮操作栏 -->
             <div class="right-fix-box">
@@ -417,17 +434,6 @@ export default {
             const res=await apiUserInfo()
             if(res.code===200){
                 this.userInfo=res.data
-                if(this.userInfo.is_bind===0){
-                    Dialog.confirm({
-                        title:'温馨提示',
-                        message:'为了优化您的用户体验，\n 请登录后查看更多信息！',
-                        confirmButtonText:'去登录',
-                        confirmButtonColor:'#E6B77D',
-                        cancelButtonColor:'#666'
-                    }).then(res=>{
-                        wx.miniProgram.reLaunch({url:'/pages/login'})
-                    })
-                }
             }
         },
 
@@ -712,6 +718,11 @@ export default {
         //     });
         // },
 
+        //登录
+        handleGoLogin(){
+            wx.miniProgram.navigateTo({url:'/pages/login?from=tologin'})
+        },
+
         //点击申请
         async handleGoApply(){
             if(this.userInfo.is_bind===0){