From 8d5789caa4c97a667e03b213b94af733da6eb1a2 Mon Sep 17 00:00:00 2001
From: zengBin <web260320689@163.com>
Date: Sun, 29 Sep 2024 16:56:31 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=A6=96=E9=A1=B5=E4=B8=8A=E6=8E=A8?=
 =?UTF-8?q?=E8=8D=90=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home/information.wpy |  31 +++++----
 src/pages/tabBar/home.wpy      | 111 +++++++++++++++++++++++++++++++++
 src/utils/util.js              |   1 +
 3 files changed, 132 insertions(+), 11 deletions(-)

diff --git a/src/pages/home/information.wpy b/src/pages/home/information.wpy
index bdf8c86..9eb9075 100644
--- a/src/pages/home/information.wpy
+++ b/src/pages/home/information.wpy
@@ -709,7 +709,7 @@ page {
             <view class="u_apply_can f-fcc font_32 color999" @tap="modalName = ''">取消</view>
             <view class="font_30 u_apply_btn white f-fcc"  @tap="sendMsg">发送</view>
           </view>
-          <view class="font_28 color999 text-center ui-pt-40" v-if="!userData.rank_id">还剩{{userData.surplus_num}}次，<text class="color-theme" @tap="jumpPath('vip')">成为会员</text>将不限制打招呼</view>
+          <view class="font_28 color999 text-center ui-pt-40" v-if="!userData.rank_id">还剩{{userInfo.other_info.surplus_num}}次，<text class="color-theme" @tap="jumpPath('vip')">成为会员</text>将不限制打招呼</view>
         </view>
       </view>
     </view>
@@ -732,8 +732,8 @@ page {
         </button>
       </view>
     </view>
-    <loginDialog :loginShow="loginShow" @hiddenLogin="hiddenLogin"></loginDialog>
   </view>
+  <loginDialog :loginShow="loginShow" @hiddenLogin="hiddenLogin"></loginDialog>
 </template>
 
 <script>
@@ -1168,15 +1168,23 @@ wepy.page({
         vm.$showToast('打招呼消息不能为空')
         return
       }
-      vm.$post({url: `${service.host}/other/user/${vm.id}/friend`, data}).then(({code, data}) => {
-        if (code == 0) {
-          vm.modalName = ''
-          vm.$showToast('消息已发送')
-        }
-        wx.hideLoading()
-      }).catch(() => {
-        wx.hideLoading()
-      })
+      if (vm.throttle) {
+        vm.throttle = false
+        vm.$post({url: `${service.host}/other/user/${vm.id}/friend`, data}).then(({code, data}) => {
+          if (code == 0) {
+            vm.modalName = ''
+            vm.$showToast('消息已发送')
+            if (vm.userInfo.other_info.surplus_num) {
+              vm.userInfo.other_info.surplus_num--
+            }
+          }
+          vm.throttle = true
+          wx.hideLoading()
+        }).catch(() => {
+          vm.throttle = true
+          wx.hideLoading()
+        })
+      }
     },
     // 获取打招呼信息
     getGreet(state) {
@@ -1184,6 +1192,7 @@ wepy.page({
       vm.$get({url: `${service.host}/chat/greet/log?status=${state}`}).then(({code, data}) => {
         if (code == 0) {
           vm.message = data.name
+          vm.modalName = 'Modal'
         }
       }).catch(() => {
       })
diff --git a/src/pages/tabBar/home.wpy b/src/pages/tabBar/home.wpy
index 41a8203..15d1503 100644
--- a/src/pages/tabBar/home.wpy
+++ b/src/pages/tabBar/home.wpy
@@ -204,6 +204,81 @@ page {
     transform: rotateY(26deg);
   }
 }
+
+.perfect_data_box{
+  position: relative;
+  display: inline-block;
+  vertical-align: middle;
+  margin-left: auto;
+  margin-right: auto;
+  width: 600rpx;
+  max-width: 100%;
+  background-color: #ffffff;
+  border-radius: 24rpx;
+  overflow: hidden;
+  padding: 56rpx 0 40rpx;
+  .cancel_icon_box{
+    width: 60rpx;
+    height: 60rpx;
+    position: absolute;
+    right: 4rpx;
+    top: 4rpx;
+    .cancel_icon{
+      width: 26rpx;
+      height: 26rpx;
+      margin-top: 20rpx;
+    }
+  }
+  .perfect_head_box{
+    background: #f2f2f2;
+    .perfect_title{
+      padding: 60rpx 0 16rpx 0;
+      font-weight: bold;
+      color: #333333;
+    }
+  }
+  .perfect_end_box{
+    background: #ffffff;
+    padding: 0 0 50rpx 0;
+    .triangle_icon{
+      width: 28rpx;
+      height: 16rpx;
+      display: block;
+      margin: 0 auto 20rpx auto;
+    }
+    .perfect_list_box{
+      margin: 30rpx 30rpx 0 30rpx;
+      background: #f2f2f2;
+      border-radius: 16rpx;
+      .perfect_li{
+        font-size: 30rpx;
+        color: #333333;
+        padding: 0 30rpx;
+        height: 100rpx;
+        line-height: 100rpx;
+        overflow: hidden;
+      }
+      .line{
+        margin: 0 30rpx;
+        height: 4rpx;
+        background: #eeeeee;
+      }
+      .perfect_button{
+        padding: 0 24rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        background: #ff5380;
+        color: #fff;
+        font-size: 26rpx;
+        border-radius: 30rpx;
+      }
+
+      .ui-active-button{
+        background: #c2c2c2;
+      }
+    }
+  }
+}
 </style>
 <template>
   <view class="ui-home">
@@ -320,6 +395,35 @@ page {
         </view>
       </view>
     </block>
+    <view class="cu-modal {{perfectModal ? 'show' : ''}}">
+      <view class="perfect_data_box" style="padding: 0;">
+        <view class="cancel_icon_box" @tap="perfectModal = false">
+          <image src="https://images.ufutx.com/202012/21/7bc531d74f41cce95ede5582232fd2f3.png" mode="widthFix" class="cancel_icon"></image>
+        </view>
+        <view class="perfect_head_box">
+          <view class="perfect_title font_36">当前处于未完善资料状态</view>
+          <view class="font_30 color999 ui-pb-40">无法进行申请</view>
+          <view class="perfect_end_box">
+            <image class="triangle_icon" src="https://images.ufutx.com/202012/24/d59e22e4e2f713d943989faa60205e97.png" mode="widthFix"></image>
+            <view class="font_30 color333 bold text-black ui-pt-8">完善资料 获得推荐 更快交友</view>
+            <view class="perfect_list_box">
+              <view class="perfect_li f-fbc">
+                <view class="flo_l font_28">填写基础资料</view>
+                <view class="flo_r perfect_button font_28 ui-active-button" v-if="userInfo.is_compeleted_profile">已填写</view>
+                <view class="flo_r perfect_button font_28" v-else @tap="jumpPath('/pages/home/registration')">去填写</view>
+              </view>
+              <view class="line"></view>
+              <view class="perfect_li f-fbc">
+                <view class="flo_l font_28">完成真人认证</view>
+                <view class="flo_r perfect_button font_28 ui-active-button" v-if="userInfo.is_real_approved == 1">已认证</view>
+                <view class="flo_r perfect_button font_28" style="background: #FFBB00;" v-else-if="userInfo.is_real_approved == 2">审核中</view>
+                <view class="flo_r perfect_button font_28" v-else @tap="jumpPath('/pages/users/realName')">去认证</view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
     <loginDialog :loginShow="loginShow" @hiddenLogin="hiddenLogin"></loginDialog>
   </view>
 </template>
@@ -337,6 +441,8 @@ wepy.page({
 
   data: {
     loginShow: false,
+    perfectModal: false,
+    userInfo: {},
     throttle: true,
     topUpState: null,
     topList: [], // 置顶推荐
@@ -434,6 +540,10 @@ wepy.page({
         vm.loginShow = true
         return
       }
+      if (!vm.userInfo.is_compeleted_profile || !vm.userInfo.is_real_approved) {
+        vm.perfectModal = true
+        return
+      }
       if (vm.topUpState == 1) {
         vm.$showToast('你已申请，等待审核')
         return
@@ -521,6 +631,7 @@ wepy.page({
   },
   onLoad() {
     let vm = this
+    vm.userInfo = wx.getStorageSync('userInfo')
     vm.getTopUser()
     vm.getArea()
     vm.getEveryday()
diff --git a/src/utils/util.js b/src/utils/util.js
index 85e6570..646e06e 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -55,6 +55,7 @@ const wx_login = () => {
                 let userInfo = {
                   is_moment_admin: data.is_moment_admin,
                   is_base_profile: data.is_base_profile,
+                  is_compeleted_profile: data.is_compeleted_profile,
                   name: data.user.nickname,
                   avatar: data.user.photo || 'https://image.fulllinkai.com/202203/09/cc1c73eb1a4941fef25a15cd1ff2f9df.png',
                   showId: data.user.id,