From 4e6c63341f86493444e17f4f2deab1ab4df95d4b Mon Sep 17 00:00:00 2001
From: zengBin <web260320689@163.com>
Date: Thu, 10 Oct 2024 16:44:19 +0800
Subject: [PATCH] update

---
 src/pages/home/information.wpy |  5 +++--
 src/pages/news/chitchat.wpy    | 40 ++++++++++++++++++++++++++++++++++
 src/pages/tabBar/dynamic.wpy   |  7 +++---
 3 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/src/pages/home/information.wpy b/src/pages/home/information.wpy
index a5d3a68..62843b1 100644
--- a/src/pages/home/information.wpy
+++ b/src/pages/home/information.wpy
@@ -20,6 +20,7 @@ page {
       border-radius: 24rpx;
     }
     .ui-mask{
+      padding: 0rpx 30rpx;
       position:absolute;
       left: 0;
       top: 0;
@@ -492,7 +493,7 @@ page {
     <block v-if="userInfo.other_info.is_banned == 1">
       <view class="ui-abnormal">
         <view class="ui-user-pic-box">
-          <image class="ui-user-pic" src="https://image.fulllinkai.com/202407/29/396698823907d0ff19b889cea3ac7e9f.jpeg" mode="aspectFill"></image>
+          <image class="ui-user-pic" :src="userInfo.base_profile.photo" mode="aspectFill"></image>
           <image src="https://image.fulllinkai.com/202204/11/a1825ca68374240d26a38c9b28cb4cbd.png" class="ui-mask"  mode="aspectFill"></image>
         </view>
         <view class="ui-skeleton-pic"></view>
@@ -667,7 +668,7 @@ page {
         <!--关闭资料的用户样式-->
         <view class="ui-abnormal" v-if="loading">
           <view class="ui-user-pic-box">
-            <image class="ui-user-pic" src="https://image.fulllinkai.com/202407/29/396698823907d0ff19b889cea3ac7e9f.jpeg" mode="aspectFill"></image>
+            <image class="ui-user-pic" :src="userInfo.base_profile.photo" mode="aspectFill"></image>
             <image v-if="userInfo.base_profile.hidden_profile_status != 1" src="https://image.fulllinkai.com/202203/22/0406319a6c0998836ca7391e588010b6.png" class="ui-mask"  mode="aspectFill"></image>
             <image v-else src="https://image.fulllinkai.com/202310/25/9643efd8588e76ddc045a2e2df757d30.png" class="ui-mask"  mode="aspectFill"></image>
           </view>
diff --git a/src/pages/news/chitchat.wpy b/src/pages/news/chitchat.wpy
index 6b295d5..8ba36a3 100644
--- a/src/pages/news/chitchat.wpy
+++ b/src/pages/news/chitchat.wpy
@@ -556,6 +556,28 @@ page {
     border-top: 8rpx solid #f5f5f5;
   }
 }
+
+.g_bt_tips_one,
+.g_bt_tips_two,
+.g_bt_tips_three {
+  position: fixed;
+  bottom: 0;
+  z-index: 999;
+  background-color: white;
+  width: 100vw;
+  padding: 30rpx 0 80rpx;
+  box-shadow: 0px -2rpx 8rpx 0rpx rgba(0, 0, 0, 0.03);
+  border-radius: 32rpx 32rpx 0rpx 0rpx;
+
+  .g_bt_tips_one_bu {
+    width: 300rpx;
+    height: 64rpx;
+    border-radius: 100rpx;
+    font-weight: 500;
+    margin-top: 40rpx;
+    background-image: linear-gradient(to right, #96CAFF, #63A5FF);
+  }
+}
 </style>
 <template>
   <view class="ui-chitchat">
@@ -681,6 +703,19 @@ page {
       <view class="f-fcc font_28 color999 ui-report-item-v2" @tap="reportShow = false">取消</view>
     </view>
   </view>
+  <view class="g_bt_tips_two" v-if="userInfo.is_real_approved == 2 && !hiddenHtml">
+    <view class="font_24 color333 text-center ui-pr-40 ui-pl-40">认证已提交审核，审核结果将在1～3个工作日内通知，请耐心等待；如有需要，请直接联系客服
+      <text class="color-theme">18922809346</text>
+    </view>
+  </view>
+  <view class="g_bt_tips_one f-fcc f-fdc" v-else-if="userInfo.is_real_approved != 1 && !hiddenHtml">
+    <view class="font_24 color333">
+      <view class="text-center">你还未真人认证，为了安全起见，</view>
+      <view class="text-center">需要双方认证后才能畅聊，赶快去认证吧！</view>
+    </view>
+    <view class="g_bt_tips_one_bu f-fcc colorF" @tap="jumpPath(`/pages/users/realName?chat_user_id=${otherUserId}`)">一键认证
+    </view>
+  </view>
 </template>
 
 <script>
@@ -699,6 +734,7 @@ wepy.page({
 
   data: {
     loading: false,
+    userInfo: {},
     myAvatar: '',
     myUserId: '',
     myName: '',
@@ -1499,11 +1535,15 @@ wepy.page({
       // 倒序处理阅览顺序不对的问题
       imageArr = imageArr.reverse()
       vm.$previewImages(imge, imageArr)
+    },
+    jumpPath(url) {
+      wx.navigateTo({url: url})
     }
   },
 
   onShow() {
     let vm = this
+    vm.userInfo = wx.getStorageSync('userInfo')
     vm.myUserId = wx.getStorageSync('user_id')
     vm.myType = wx.getStorageSync('userInfo').type
     vm.myName = wx.getStorageSync('userInfo').name
diff --git a/src/pages/tabBar/dynamic.wpy b/src/pages/tabBar/dynamic.wpy
index b2452d9..af5670f 100644
--- a/src/pages/tabBar/dynamic.wpy
+++ b/src/pages/tabBar/dynamic.wpy
@@ -171,7 +171,7 @@ page {
     <view :style="{height: windowHeight + 'px',backround: '#ffffff'}">
       <swiper :style="{height: tabBarIndex == 0 ? '100%' : '92%'}" current="{{tabBarIndex}}" duration="300" bindchange="switchTab">
         <swiper-item wx:key="id" style="-webkit-overflow-scrolling:touch">
-          <scroll-view scroll-top="{{scrollTopHandle}}" scroll-with-animation="true" scroll-anchoring="{{true}}" refresher-enabled="{{true}}" refresher-triggered="{{triggered}}" bindrefresherpulling="onPulling" bindrefresherrefresh="onRefresh" style="height:100%;-webkit-overflow-scrolling: touch" lower-threshold="300" bindscrolltolower="handleScroll" bindscroll="scrollToUpper" scroll-y>
+          <scroll-view :scroll-top="scrollTopHandle" scroll-with-animation="true" scroll-anchoring="{{true}}" refresher-enabled="{{true}}" refresher-triggered="{{triggered}}" bindrefresherpulling="onPulling" bindrefresherrefresh="onRefresh" style="height:100%;-webkit-overflow-scrolling: touch" lower-threshold="300" bindscrolltolower="handleScroll" bindscroll="scrollToUpper" scroll-y>
             <view class="ui-topicTitle">
               <view class="ui-hot">热门话题</view>
               <view class="ui-more" @tap.stop="jumpPath('/pages/dynamic/searchPopular')">更多话题
@@ -238,7 +238,7 @@ wepy.page({
     dynamicList: [],
     selectData: {},
     selectIndex: null,
-    scrollTopHandle: -1,
+    scrollTopHandle: 0,
     videoIndex: -1,
     showBackTopBtn: false,
     triggered: false,
@@ -372,13 +372,14 @@ wepy.page({
     // 动态滚动距离超出380，展示回到顶部按钮
     scrollToUpper(e) {
       let vm = this
+      vm.scrollTopHandle = 0
       let top = e.$wx.detail.scrollTop
       vm.showBackTopBtn = top > 380
     },
     // 动态回到顶部
     BackTop() {
       let vm = this
-      vm.scrollTopHandle = 0
+      vm.scrollTopHandle = -1
       vm.showBackTopBtn = false
     },
     jumpPath(url) {