用户详情期望对方展示，话题搜索功能

.idea/inspectionProfiles/Project_Default.xml

@@ -2,5 +2,15 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="HtmlUnknownAttribute" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="myValues">
+        <value>
+          <list size="1">
+            <item index="0" class="java.lang.String" itemvalue="v-if" />
+          </list>
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
+    </inspection_tool>
   </profile>
 </component>

src/app.wpy

@@ -35,7 +35,7 @@ wepy.app({
     }
   },
   globalData: {
-    versions: 'v5.5.94', // 版本号
+    versions: 'v5.5.98', // 版本号
     navBarHeight: 0, // 导航栏高度
     navRight: 0, // 胶囊距右方间距（方保持左、右间距一致）
     navTop: 0, // 胶囊距顶部间距
@@ -54,9 +54,9 @@ wepy.app({
     vm.appLogin()
     console.log(e, 'e=')
     console.log(decodeURIComponent(e.query.scene), 'e=')
-    if (e.path === 'pages/home/informationV2') {
+    // if (e.path === 'pages/home/informationV2') {
-      wx.redirectTo({ url: `/pages/home/information?${decodeURIComponent(e.query.scene)}` })
+    //   wx.redirectTo({ url: `/pages/home/information?${decodeURIComponent(e.query.scene)}` })
-    }
+    // }
     initEid()
     wx.getSystemInfo({
       success: res => {
@@ -92,6 +92,9 @@ wepy.app({
       if (options.path === 'pages/home/informationV2') {
           wx.redirectTo({ url: `/pages/home/information?${decodeURIComponent(options.query.scene)}` })
       }
+    if (options.path === 'pages/tabBar/home1') {
+      wx.switchTab({ url: `/pages/tabBar/home?${decodeURIComponent(options.query.scene)}` })
+    }
     if (options.query.scene) {
       let sceneList = decodeURIComponent(options.query.scene).split(/[= &]/)
       sceneList.forEach((item, index) => {
@@ -109,7 +112,12 @@ wepy.app({
       }
     }
   },
-
+  onPageNotFound(res) {
+    console.log(res, '错误res')
+    wx.switchTab({
+      url: '/pages/tabBar/home'
+    }) // 如果是 tabbar 页面，请使用 wx.switchTab
+  },
   onHide() {},
 
   methods: {
@@ -145,7 +153,6 @@ pages: [
 'pages/tabBar/home',
 'pages/tabBar/news',
 'pages/tabBar/user',
-'pages/login',
   'mp_ecard_sdk/index/index',
   'mp_ecard_sdk/protocol/service/index',
   'mp_ecard_sdk/protocol/privacy/index',
@@ -227,6 +234,8 @@ subPackages: [
   'ImageCropper',
   'myDynamicDetail',
   'groupMember',
+  'blacklistDefault',
+  'freeze',
   ]
   },
   {

src/mixins/https.js

@@ -1,5 +1,6 @@
 import utils from '../utils/util'
 import {service} from '../config'
+import { IM } from '../utils/im'
 
 export default {
   data: {
@@ -103,27 +104,8 @@ export default {
               wx.removeStorageSync('formId')
               resolve({statusCode, ...data})
             } else if (data.code == 1) {
-              // resolve({statusCode, ...data})
               reject(new Error(`error ${data.message}`))
-              if (this.$is == 'pages/service/GroupChatPage' && data.message.includes('已断开连接')) {
+
-                let vm = this
-                wx.showModal({ // 使用模态框提示用户进行操作
-                  title: `温馨提示`,
-                  content: `UpdatePromptText5`,
-                  showCancel: false,
-                  confirmText: `UpdatePromptText5`,
-                  success: function (res) {
-                    if (res.confirm) {
-                      wx.hideLoading()
-                      wx.navigateBack({
-                        delta: 1
-                      })
-                      // console.log('开始尝试连接WebSocket！readyState=' + vm.$app.$options.globalData.localSocket.readyState)
-                      vm.$app.initSocket('http')
-                    }
-                  }
-                })
-              } else {
                 vm.errorOne += 1
                 if (vm.errorOne <= 2) {
                   wx.showModal({ // 使用模态框提示用户进行操作
@@ -144,45 +126,70 @@ export default {
                 }
                 let errorMessage = {message: '错误,请寻找开发人员协助'}
                 throw errorMessage
-              }
               wx.hideLoading()
             } else if (data.code === 2) {
               console.error(data.message)
               vm.errorTwo += 1
               if (vm.errorTwo <= 2) {
-                utils.wx_login().then(({code, data}) => {
+                utils.wx_login().then((data) => {
-                  if (code === 0) {
+                  console.log(data, '444')
-                    vm.errorTwo = 1
+                  let route = `/${currentPage.route}?${url}`
-                    if (currentPage.route == 'pages/service/healthMGT') {
+                  if (!data.data.token) {
-                      wx.redirectTo({url: `/${currentPage.route}?${url}`})
+                    wx.removeStorageSync('information')
-                    } else if (data.mobile && data.is_complete_profile) {
+                    wx.switchTab({
-                      if (currentPage.route == 'pages/tabBar/home') {
+                      url: '/pages/tabBar/home'
-                        wx.reLaunch({url: '/pages/tabBar/home'})
+                    })
                   } else {
-                        wx.redirectTo({url: `/${currentPage.route}?${url}`})
+                    currentPage.onShow()
-                      }
+                    if (route.includes('tabBar')) {
-                    } else if (!data.mobile) {
+                      route = route.split('?')[0]
-                      wx.redirectTo({url: `/pages/login`})
+                      wx.switchTab({url: route})
-                    } else if (!data.is_complete_profile) {
+                    } else {
-                      wx.redirectTo({url: `/pages/user/registrationMaterial`})
+                      console.log('222')
+                      wx.redirectTo({url: route})
                     }
                   }
+                  let {accid, token} = data.data.im_user // wyy_user
+                  vm.$app.$options.globalData.nim = IM(accid, token)
+                  wx.hideLoading()
                 })
               }
               let errorMessage = {message: '错误,需要重新登录'}
               throw errorMessage
             } else if (code === 3) {
-              vm.errorThree += 1
+              utils.wx_login().then((data) => {
-              if (vm.errorThree <= 2) {
+                console.log(data, '444')
-                utils.wx_login().then(({code, data}) => {
+                let route = `/${currentPage.route}?${url}`
-                  if (code === 0) {
+                if (!data.data.token) {
-                    vm.errorThree = 1
+                  wx.removeStorageSync('information')
-                    currentPage.onLoad()
+                  wx.switchTab({
-                    currentPage.onShow()
+                    url: '/pages/tabBar/home'
-                  }
                   })
+                } else {
+                  currentPage.onShow()
+                  if (route.includes('tabBar')) {
+                    route = route.split('?')[0]
+                    wx.switchTab({url: route})
+                  } else {
+                    console.log('222')
+                    wx.redirectTo({url: route})
                   }
                 }
+                let {accid, token} = data.data.im_user // wyy_user
+                vm.$app.$options.globalData.nim = IM(accid, token)
+                wx.hideLoading()
+              })
+              // vm.errorThree += 1
+              // if (vm.errorThree <= 2) {
+              //   utils.wx_login().then(({code, data}) => {
+              //     if (code === 0) {
+              //       vm.errorThree = 1
+              //       currentPage.onLoad()
+              //       currentPage.onShow()
+              //     }
+              //   })
+              // }
+            }
           },
           fail: (err) => {
             // eslint-disable-next-line prefer-promise-reject-errors
@@ -191,7 +198,7 @@ export default {
           },
           complete: (res) => {
             setTimeout(() => {
-              wx.hideLoading() // loading只展示一会就被去除了
+              wx.hideLoading() // loading只展示一会就被去除了，加1s的时间延迟
             }, 1000)
             if (res.errMsg.indexOf('timeout') > -1) {
               vm.errorOne += 1

src/pages/dynamic/searchTopic.wpy

@@ -101,16 +101,19 @@ wepy.page({
     list: [], // 列表数据
     arr: [],
     loading: false,
-    show: false
+    show: false,
+    search: ''
   },
   methods: {
-    getList() {
+    getList(type) {
       let vm = this
       vm.$showLoading('加载中...')
-      vm.$get({url: `${service.host}/moment/topic/list`}).then(({code, data}) => {
+      vm.$get({url: `${service.host}/moment/topic/list?keyword=${vm.search}`}).then(({code, data}) => {
         if (code === 0) {
           vm.list = data.data
+          if (type == 'init') {
             vm.arr = data.data
+          }
           vm.loading = true
         }
         wx.hideLoading()
@@ -132,19 +135,21 @@ wepy.page({
     inputTyping(e) {
       let vm = this
       let key = e.$wx.detail.value
+      vm.search = key
       if (key == '') {
         vm.list = vm.arr
         vm.show = false
       } else {
         vm.list = []
-        vm.arr.forEach(ele => {
+        vm.getList()
-          if (ele.name.indexOf(key) >= 0) {
+        // vm.arr.forEach(ele => {
-            vm.list = vm.list.concat([ele])
+        //   if (ele.name.indexOf(key) >= 0) {
-          }
+        //     vm.list = vm.list.concat([ele])
-        })
+        //   }
-        if (vm.list && vm.list.length == 0) {
+        // })
-          vm.show = true
+        // if (vm.list && vm.list.length == 0) {
-        }
+        //   vm.show = true
+        // }
       }
     }
   },
@@ -152,7 +157,7 @@ wepy.page({
   },
   onLoad() {
     let vm = this
-    vm.getList()
+    vm.getList('init')
   }
 })
 </script>

src/pages/home/information.wpy

@@ -643,10 +643,24 @@ page {
                       <image src="https://images.ufutx.com/202011/26/7645858a1ae55dd7c3ef90ec7a42bfa3.png" mode="aspectFill" class="icon"></image>
                       <span class="font_30 bold color-333">期望对方</span>
                     </view>
-                    <view class="m_idCon f-fc" v-if="conditionArr && conditionArr.length > 0">
+                    <view class="m_idCon f-fc" >
+                      <block v-if="userInfo.other_profile">
+                        <block v-if="userInfo.other_profile.mate_conditon">
+                           <view class="u_idCon font_26 color333" v-if="userInfo.other_profile.mate_conditon.age">{{ userInfo.other_profile.mate_conditon.age }}</view>
+                           <view class="u_idCon font_26 color333" v-if="userInfo.other_profile.mate_conditon.belief">{{ userInfo.other_profile.mate_conditon.belief }}</view>
+                           <view class="u_idCon font_26 color333" v-if="userInfo.other_profile.mate_conditon.degree">{{ userInfo.other_profile.mate_conditon.degree }}</view>
+                           <view class="u_idCon font_26 color333" v-if="userInfo.other_profile.mate_conditon.income">{{ userInfo.other_profile.mate_conditon.income }}</view>
+                           <view class="u_idCon font_26 color333" v-if="userInfo.other_profile.mate_conditon.location">{{ userInfo.other_profile.mate_conditon.location }}</view>
+                           <view class="u_idCon font_26 color333" v-if="userInfo.other_profile.mate_conditon.state">{{ userInfo.other_profile.mate_conditon.state }}</view>
+                           <view class="u_idCon font_26 color333" v-if="userInfo.other_profile.mate_conditon.stature">{{ userInfo.other_profile.mate_conditon.stature }}</view>
+                        </block>
+                      </block>
+                      <block v-if="conditionArr && conditionArr.length > 0">
                         <block v-for="(item,index) in conditionArr" :key="index">
                           <view class="u_idCon font_26 color333" v-if="item">{{ item }}</view>
                         </block>
+                      </block>
+
                     </view>
                     <view class="font_26 color333 ui-ml-40 ui-mr-40 ui-mt-4">{{ userInfo.other_profile.ideal_mate || 'ta什么也没有留下' }}</view>
                   </view>

src/pages/home/personalDynamic.wpy

@@ -581,6 +581,7 @@ wepy.page({
   onShow() {
   },
   onLoad(e) {
+      console.log(e, 'e=')
     let vm = this
     let app = vm.$app.$options
     vm.id = e.id

src/pages/login.wpy

@@ -1,416 +0,0 @@
-<style lang="less" scoped>
-  @import url(../styles/theme.less);
-page {
-  background-color: #ffffff;
-}
-  .login-container{
-    height: 100vh;
-    width: 100vw;
-    background-color: #ffffff;
-    overflow: hidden;
-    .ui-tabBar-box{
-      width: 100vw;
-      .ui-tabBar-list{
-        padding: 100rpx 142rpx 80rpx 142rpx;
-        .ui-tabBar-line{
-          position: absolute;
-          bottom: 8rpx;
-          z-index: 2;
-          width: 100%;
-          height: 10rpx;
-          background: linear-gradient(90deg, rgba(95,226,175,0.1) 0%, #41D5A9 100%);
-          border-radius: 5rpx;
-        }
-      }
-    }
-    .ui-icon-box{
-      margin-left: 184rpx;
-      width: 100vw;
-      .ui-radio-icon{
-        height: 120rpx;
-        width: 120rpx;
-        background-repeat: no-repeat;
-        background-size: cover;
-      }
-      .ui-next-icon{
-        margin: 0 50rpx;
-        width: 56rpx;
-        height: 32rpx;
-        background-repeat: no-repeat;
-        background-size: cover;
-      }
-      .ui-next-img{
-        background-image: url("https://image.fulllinkai.com/202211/22/57641b9443b43fa228b393ba4c346897.png");
-      }
-      .ui-wx-img{
-        background-image: url("https://image.fulllinkai.com/202307/08/b8e7997ac2ff19757a56a72f282abc28.png");
-      }
-      .ui-wxapp-img{
-        background-image: url("https://image.fulllinkai.com/202211/22/28c5c5401a7b35da09ac5c079a861819.png");
-      }
-
-    }
-    .ui-btn{
-      margin: 150rpx 40rpx 0;
-      height: 100rpx;
-      line-height: 100rpx;
-      border: none;
-      color: #e3fbf3;
-      background-color: @theme_color;
-      border-radius: 50rpx;
-    }
-    .ui-btn-v2{
-      background-color: #c2c2c2;
-      color: #ffffff;
-    }
-    .m_inp {
-      margin: 0 40rpx 40rpx 40rpx;
-      padding: 0 20rpx;
-      height: 98rpx;
-      border: 2rpx solid #ededed;
-      border-radius: 16rpx;
-      position: relative;
-      input{
-        width: 284rpx;
-      }
-      .m_wo {
-        white-space: pre-wrap;
-        word-break: break-all;
-        .u_coll_img {
-          height: 12rpx;
-          width: 20rpx;
-          margin: 0rpx 20rpx 0 8rpx;
-        }
-      }
-      .m_woPho {
-        position: absolute;
-        left: 0;
-        top: 78rpx;
-        width: 210rpx;
-        padding-left: 10rpx;
-        //height: 416rpx;
-        background: #fff;
-        border: 2rpx solid #f5f5f5;
-        border-radius: 8rpx;
-        z-index: 222;
-        overflow-y: scroll;
-        display: inline-block;
-      }
-    }
-    .ui-input-box{
-      padding: 0 40rpx;
-      position: relative;
-      .ui-input-class{
-        padding: 0 246rpx 0 20rpx;
-        height: 98rpx;
-        border: 2rpx solid #ededed;
-        border-radius: 16rpx;
-      }
-      .ui-code-box{
-        position: absolute;
-        top: 24rpx;
-        right: 64rpx;
-        padding: 0 20rpx;
-        height: 52rpx;
-        border-radius: 26rpx;
-        border: 2rpx solid #B2E3D2;
-        z-index: 22;
-      }
-      .ui-code-border{
-        border: 2rpx solid #ececec;
-      }
-    }
-    .ui-code-btn-box{
-      width: 650rpx;
-      height: 100rpx;
-      border-radius: 50rpx;
-      background: #5AC7A0;
-      margin: 90rpx auto 0 auto;
-    }
-    .ui-agree-box{
-      margin: 50rpx auto;
-      padding: 0 90rpx;
-      display: flex;
-      justify-items: left;
-      white-space: pre-wrap;
-      word-break: break-all;
-      word-wrap: break-word;
-      .ui-agree-icon{
-        margin-right: 16rpx;
-        margin-top: 2rpx;
-        height: 32rpx;
-        width: 32rpx;
-        min-width: 32rpx;
-        background-image: url("https://image.fulllinkai.com/202211/24/6ecbd7d3cb7c8d5bfcea6546dc6d7af0.png");
-        background-size: 100% 100%;
-        background-repeat: no-repeat;
-      }
-      .ui-agree-icon-change{
-        background-image: url("https://image.fulllinkai.com/202211/24/1956379959ca1cc109880daaa97ce70a.png");
-      }
-      .ui-agree-text{
-        color: @theme_color;
-      }
-    }
-  }
-
-
-</style>
-<template>
-  <view class="login-container">
-    <view class="ui-tabBar-box">
-      <view class="ui-tabBar-list f-fbc">
-        <view class="font_30 ui-relative {{tabBarIndex == index ? 'color-theme bold' : 'color666'}}" v-for="(item,index) in tabBarList" :key="index" @tap="selectTabBar(index)">
-          {{item}}
-          <view class="ui-tabBar-line" v-if="tabBarIndex == index"></view>
-        </view>
-      </view>
-    </view>
-    <block v-if="tabBarIndex == 0">
-      <view class="ui-icon-box f-fc">
-        <view class="ui-radio-icon ui-wx-img"></view>
-        <view class="ui-next-icon ui-next-img"></view>
-        <view class="ui-radio-icon ui-wxapp-img"></view>
-      </view>
-      <button v-if="selectIcon" class="ui-btn font_32" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">
-        {{ i18nL.login.Ace2 }}
-      </button>
-      <view v-else class="ui-btn ui-btn-v2 text-c colorfff font_32" @tap="toSelect">{{ i18nL.login.Ace2 }}</view>
-    </block>
-    <block v-else>
-      <view class="m_inp f-fc">
-        <scroll-view scroll-into-view="{{toView}}" scroll-y class="m_woPho" v-if="!showChooseArea">
-          <block v-for="(item,index) in areaList" wx:key="index">
-            <view id="in_{{index}}" class="font_28 {{item.nation_code == AreaValue ? 'color-theme' : 'color333'}}" style="text-align: left;padding: 12rpx 10rpx;" @tap="selectedArea(item, index)">{{item.nation_code}} {{item.nation_name}}</view>
-          </block>
-        </scroll-view>
-        <view class="m_wo f-fcl" @tap.stop="showWorldPhone">
-          <view>{{AreaValue}}</view>
-          <image class="u_coll_img" v-if="showChooseArea" src="https://image.fulllinkai.com/202111/29/526faa3d99616f1faba1cde44c7ee204.png"  mode="aspectFill"></image>
-          <image class="u_coll_img" v-else src="https://image.fulllinkai.com/202111/29/f1e9aff7554cb0207f045b9d15388f61.png"  mode="aspectFill"></image>
-        </view>
-        <input class="font_30 ui-input-class color333 ui-letter-2" v-model="mobile" type="number" maxlength="16" :placeholder="i18nL.pages.service.detail.inputMobile" />
-      </view>
-      <view class="ui-input-box">
-        <input style="margin-left: 0;" :placeholder="i18nL.pages.user.bindMobile.Ace10" type="number" v-model="code" maxlength="6" class="font_30 ui-input-class color333 ui-letter-2"/>
-        <view class="font_24 ui-code-box f-fcc {{time == 0 ? 'color-theme' : 'color999 ui-code-border'}}" @tap="getCode">{{time == 0 ? i18nL.pages.user.bindMobile.Ace7 : btnText}}</view>
-      </view>
-      <view class="font_32 f-fcc ui-code-btn-box white" @tap="bindMobile">{{i18nL.pages.user.bindMobile.Ace16}}</view>
-    </block>
-    <view class="ui-agree-box">
-      <view class="ui-agree-icon {{selectIcon ? 'ui-agree-icon-change': ''}}" @tap="selectDegree"></view>
-      <view class="f-fc">
-        <view class="color999 font_26" @tap="selectDegree">{{ i18nL.login.Ace3 }}《<span class="ui-agree-text font_26" @tap.stop="gotoH5('https://love.ufutx.com/h5/#/healthAgreement')">{{ i18nL.login.Ace4 }}</span>》</view>
-      </view>
-    </view>
-  </view>
-</template>
-
-
-<script>
-import wepy from '@wepy/core'
-import https from '../mixins/https'
-import base from '../mixins/base'
-import {getPhoneNumber} from '../utils/util'
-import {service} from '../config'
-
-wepy.page({
-  config: {},
-  mixins: [https, base],
-
-  data: {
-    modalName: '',
-    fileList: [],
-    tabBarList: ['微信快捷登录', '手机号登录'],
-    tabBarIndex: 0,
-    showChooseArea: true,
-    AreaIndex: 0,
-    areaList: [
-      {nation_code: '86', nation_name: '中国大陆'},
-      {nation_code: '886', nation_name: '中国台湾'},
-      {nation_code: '852', nation_name: '中国香港'},
-      {nation_code: '853', nation_name: '中国澳门'},
-      {nation_code: '65', nation_name: '新加坡'},
-      {nation_code: '66', nation_name: '泰国'},
-      {nation_code: '61', nation_name: '澳大利亚'}
-    ],
-    toView: 'in_',
-    AreaValue: '中国大陆 86',
-    code: '',
-    time: 0,
-    timer: null,
-    loading: false,
-    btnText: '',
-    photo: '',
-    list: [],
-    mobile: '',
-    nickName: '',
-    phoneNumber: '',
-    user: {},
-    selectIcon: false
-  },
-
-  computed: {
-    btnText() {
-      if (this.i18nL) {
-        return +this.time > 0 ? `${this.time}s ${this.i18nL.pages.user.bindMobile.Ace6}` : `${this.i18nL.pages.user.bindMobile.Ace7}`
-      }
-    }
-  },
-
-  methods: {
-    getPhoneNumber({$wx: e}) { // 获取手机号
-      let vm = this
-      if (e.detail.iv) {
-        getPhoneNumber(e).then(({phone}) => {
-          console.log(phone, '11111')
-          if (phone) {
-            vm.mobile = phone
-            console.log(vm.mobile)
-            vm.bindMobile()
-          }
-        }).catch((Error) => {
-          wx.showModal({ // 使用模态框提示用户进行操作
-            title: `${this.i18nL.pages.user.user1ace13}`,
-            content: Error,
-            showCancel: false,
-            confirmText: `${this.i18nL.pages.user.user1ace15}`,
-            success: function (res) {
-              if (res.confirm) {
-                wx.navigateBack({
-                  delta: 1
-                })
-              }
-            }
-          })
-        })
-      }
-    },
-    bindMobile() {
-      let vm = this
-      let data = {
-        mobile: vm.mobile,
-        type: vm.tabBarIndex == 0 ? 'wechat' : 'code',
-        code: vm.tabBarIndex == 0 ? '' : vm.code
-      }
-      if (!vm.mobile) {
-        vm.$showToast(`${vm.i18nL.pages.user.bindMobile.Ace3}`)
-        return
-      }
-      if (vm.AreaIndex == 0 && (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(vm.mobile)))) {
-        this.$showToast(`${this.i18nL.pages.user.bindMobile.Ace8}`)
-        return
-      }
-      if (vm.tabBarIndex == 1 && !vm.code) {
-        vm.$showToast(`${vm.i18nL.pages.user.bindMobile.Ace10}`)
-        return
-      }
-      if (!vm.selectIcon) {
-        vm.$showToast(`${vm.i18nL.login.Ace6}`)
-        return
-      }
-      vm.$showLoading(`${vm.i18nL.pages.tabBar.home.Ace26}`)
-      vm.$post({url: service.bindMobile, data}).then(res => {
-        wx.hideLoading()
-        if (res.code === 1) {
-          return
-        }
-        wx.setStorageSync('mobile', vm.mobile)
-        vm.$showToast(`${vm.i18nL.login.Ace5}`)
-        setTimeout(() => {
-          vm.$redirectTo(`/pages/user/registrationMaterial`)
-        }, 1200)
-      })
-    },
-    selectTabBar(index) {
-      let vm = this
-      vm.tabBarIndex = index
-    },
-    // 获取验证码
-    getCode() {
-      let vm = this
-      if (!vm.mobile) {
-        vm.$showToast(`${vm.i18nL.pages.user.bindMobile.Ace3}`)
-        return
-      }
-      // 防抖
-      if (vm.loading || vm.time > 0) return
-      // 开防抖
-      vm.loading = true
-      // 根据业务接口处理:发送验证码
-      let data = {
-        mobile: vm.mobile,
-        area_code: vm.areaList[vm.AreaIndex].nation_code
-      }
-      vm.$showLoading(`${vm.i18nL.pages.tabBar.home.Ace26}`)
-      vm.$get({url: `${service.host}/mobile/code`, data}).then(res => {
-        wx.hideLoading()
-        if (res.code === 1) {
-          return
-        }
-        // 开倒计时
-        vm.timing(60)
-        vm.$showToast(`${vm.i18nL.pages.user.bindMobile.Ace9}`)
-      })
-    },
-    timing(time) {
-      this.time = time
-      this.timer = setTimeout(() => {
-        if (time > 0) {
-          this.timing(time - 1)
-        } else {
-          this.loading = false
-        }
-      }, 1000)
-    },
-    showWorldPhone() {
-      this.toView = `in_${this.AreaIndex}`
-      this.showChooseArea = !this.showChooseArea
-    },
-    selectedArea(e, index) {
-      this.AreaValue = `${e.nation_name} ${e.nation_code}`
-      this.AreaIndex = index
-      this.showChooseArea = !this.showChooseArea
-    },
-    selectDegree() {
-      this.selectIcon = !this.selectIcon
-    },
-    toSelect() {
-      this.$showToast(`${this.i18nL.login.Ace6}`)
-    },
-    gotoH5(item) {
-      wx.navigateTo({ url: '/pages/sub_page/bookDetail?url=' + encodeURIComponent(item) })
-    }
-  },
-  onPullDownRefresh() {  // 下拉刷新
-    // this.getUserInfo()
-  },
-  onShow() {
-    this.i18nL = this.$app.$options.globalData.i18nL  // 切换赋值- 娄底
-    this.$setNavigationBarTitleI18n(this.i18nL.login.title) // 设置顶部title
-    this.tabBarList[0] = this.i18nL.login.Ace7
-    this.tabBarList[1] = this.i18nL.login.Ace8
-    this.tabBarList = JSON.parse(JSON.stringify(this.tabBarList))
-    this.areaList[0].nation_name = this.i18nL.pages.user.bindMobile.Ace12
-    this.areaList[1].nation_name = this.i18nL.pages.user.bindMobile.Ace13
-    this.areaList[2].nation_name = this.i18nL.pages.user.bindMobile.Ace14
-    this.areaList[3].nation_name = this.i18nL.pages.user.bindMobile.Ace15
-    this.areaList[4].nation_name = this.i18nL.pages.user.bindMobile.Ace18
-    this.areaList[5].nation_name = this.i18nL.pages.user.bindMobile.Ace17
-    this.areaList[6].nation_name = this.i18nL.pages.user.bindMobile.Ace19
-    this.areaList = JSON.parse(JSON.stringify(this.areaList))
-    this.AreaValue = `${this.i18nL.pages.user.bindMobile.Ace12} 86`
-  },
-  created() {
-  }
-})
-</script>
-<config>
-{
-navigationBarTitleText: '友福DMA',
-<!--navigationStyle: 'custom',-->
-enablePullDownRefresh: false,
-backgroundColorTop: '#F4F7FC',
-  backgroundColorBottom: '#F4F7FC'
-}
-</config>

src/pages/tabBar/home.wpy

@@ -875,10 +875,23 @@ wepy.page({
     if (wx.getStorageSync('logoutCode')) {
       wx.redirectTo({url: '/pages/users/logoutDefault'})
     }
+    // if (vm.userInfo) {
+    //   console.log('444')
+    //   setTimeout(() => {
+    //     wx.switchTab({url: '/pages/tabBar/home'})
+    //   }, 3000)
+    // }
   },
   onLoad() {
     let vm = this
     vm.userInfo = wx.getStorageSync('userInfo')
+    console.log(vm.userInfo, 'vm.userInfo')
+    if (!vm.userInfo) {
+      console.log('444')
+      setTimeout(() => {
+        wx.switchTab({url: '/pages/tabBar/home'})
+      }, 3000)
+    } else {
       vm.getTopUser()
       vm.getArea()
       vm.getEveryday()
@@ -890,6 +903,7 @@ wepy.page({
         vm.modalName = 'showAdv'
       }
     }
+  }
 })
 </script>
 <config>

src/pages/users/blacklistDefault.wpy

@@ -0,0 +1,116 @@
+<template>
+    <view class="cu-custom">
+        <view class="cu-bar fixed" style="height:{{CustomBar}}px;padding-top:{{StatusBar}}px;z-index: 999">
+            <view class="font_30 color-333" style="position: fixed;left: 50%;transform: translateX(-50%)">福恋系统</view>
+        </view>
+    </view>
+    <view style="height: {{navHeight}}px"></view>
+    <view class="wrapper font_28">
+        <image class="defaultIcon" src="https://images.ufutx.com/202105/31/39b80c3ff8563b9dcf5e20c07473f52a.png" mode="widthFix"></image>
+        <view class="font_36 color-333 bold text-center">无法使用福恋平台！</view>
+        <view class="color-333 font_32 text-center" style="margin: 24rpx 50rpx 48rpx 50rpx">由于您的账号id:{{id}}涉及违规，暂无法使用福恋平台，如有需要，请联系客服<span class="color-theme font_28" @tap.stop="clickPhone">18922809346</span></view>
+        <view class="openButton font_32" @tap="clickPhone">联系客服</view>
+    </view>
+</template>
+
+<script>
+    import wepy from '@wepy/core'
+    import { service } from '../../config.js'
+    import http from '../../mixins/https'
+    import base from '../../mixins/base'
+
+    wepy.page({
+
+        // config = {
+        //     navigationBarTitleText: '福恋系统',
+        //     navigationStyle: 'custom',
+        //     enablePullDownRefresh: false
+        // }
+
+        data: {
+            StatusBar: 0,
+            CustomBar: 0,
+            Custom: 0,
+            navHeight: '',
+            windowHeight: '',
+            id: ''
+        },
+
+        async onLoad(e) {
+            this.id = wx.getStorageSync('user_id')
+            let menuButtonObject = wx.getMenuButtonBoundingClientRect()
+            wx.getSystemInfo({
+                success: res => {
+                    let statusBarHeight = res.statusBarHeight,
+                      navTop = menuButtonObject.top, // 胶囊按钮与顶部的距离
+                      navHeight = statusBarHeight + menuButtonObject.height + (menuButtonObject.top - statusBarHeight) * 2 // 导航高度
+                    this.navHeight = navHeight
+                    this.windowHeight = res.windowHeight - (navHeight + 4)
+                },
+                fail() {
+                }
+            })
+            console.log(this.id)
+        },
+        created() {
+            this.navHeight = this.$app.$options.globalData.navBarHeight
+            this.StatusBar = this.$app.$options.globalData.StatusBar
+            this.CustomBar = this.$app.$options.globalData.CustomBar
+            this.Custom = this.$app.$options.globalData.Custom
+        },
+        onShow() {
+            wx.setStorageSync('blacklistCode', 1)
+            // this.$parent.getTracker(this.$root.$name, this.config.navigationBarTitleText)
+        },
+
+        onPullDownRefresh() {
+        },
+
+        onReachBottom() {
+        },
+
+        methods: {
+            clickPhone() {
+                wx.makePhoneCall({
+                    phoneNumber: '18922809346'
+                })
+            }
+        }
+    })
+
+</script>
+
+<style lang="less">
+
+  page{
+    background: white;
+  }
+  .defaultIcon{
+    width: 440rpx;
+    height: 360rpx;
+    display: block;
+    margin: 10vh auto 0 auto;
+  }
+  .openButton{
+    width: 256rpx;
+    height: 72rpx;
+    background: #ff5380;
+    border-radius: 36rpx;
+    color: #ffffff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin: 0 auto;
+  }
+</style>
+<config>
+    {
+    navigationBarTitleText: '福恋系统',
+    navigationStyle: 'custom',
+    enablePullDownRefresh: false,
+    backgroundColorTop: '#ffffff',
+    backgroundColorBottom: '#ffffff',
+    usingComponents: {
+    }
+    }
+</config>

src/pages/users/degreeCertificate.wpy

@@ -130,7 +130,7 @@
                 <image class="successful_pic" src="https://images.ufutx.com/202012/28/2168fa80aa80eb0f76ba71ac0e449c7e.png" mode="widthFix" ></image>
             </view>
             <view class="font_36 color-333 bold">认证已提交，等待审核</view>
-            <view class="font_28 color-333 prompt_text">审核结果将在1～3个工作日内通知，请耐心等待；如有需要，请直接联系客服<span class="color-theme" @tap="callPhone('18922809346')">18194066804</span></view>
+            <view class="font_28 color-333 prompt_text">审核结果将在1～3个工作日内通知，请耐心等待；如有需要，请直接联系客服<span class="color-theme" @tap="callPhone('18922809346')">18922809346</span></view>
             <view class="Know font_32" @tap="goToBack">我知道了</view>
         </view>
     </view>

src/pages/users/freeze.wpy

@@ -0,0 +1,187 @@
+<template>
+    <view class="wrapper font_28">
+        <view class="m_fre f-fcc f-fdc">
+            <image class="defaultIcon" src="https://image.fulllinkai.com/202108/27/20047ad98fe3054f2ab6f1ba71633493.png" mode="aspectFit" v-if="frozen_state == 1"></image>
+            <image class="defaultIcon" src="https://image.fulllinkai.com/202108/30/4f5aaabe98d9132c6b3b41ff0cd92b98.png" mode="aspectFit" v-else></image>
+            <view class="font_36 color-333 bold text-center" style="padding: 20rpx 0 60rpx;">{{frozen_state == 1?'解锁登录状态':'解锁已过期'}}</view>
+            <view class="color-666 font_30" v-if="frozen_state == 1">
+                <view>Hi！{{nickName}}，好久不见～</view>
+                <view>你的账号目前为冻结状态，快来「立即解锁」</view>
+                <view>你的登录状态吧！</view>
+            </view>
+            <view class="color-666 font_30" v-else>可以联系客服，帮助你解锁喔</view>
+            <view class="openButton font_32 white" @tap="clickUnfrozen" v-if="frozen_state == 1">立即解锁</view>
+            <view class="openButton font_32 white" @tap="clickPhone" v-else>联系客服</view>
+        </view>
+        <view class="cu-modal {{modalName=='freezeModal'?'show':''}}" catchtap="modalTipsCts">
+            <view class="cu-dialog">
+                <image class="u_moImg" src="https://image.fulllinkai.com/202108/27/2174fe572025a3cedd6f5aeee116162a.png" mode="aspectFit"></image>
+                <view class="font_32 color-333" style="padding: 40rpx 0;">现在完善你的单身资料，立即帮你重新匹配的优质异性喔</view>
+                <view class="m_bu font_32 f-fcc">
+                    <view class="u_bu_ho color-999 f-fcc" @tap="goto('/pages/tabBar/home')">进入首页</view>
+                    <view class="u_bu_la f-fcc white" @tap="goto('/pages/users/unmarriV2')">完善资料</view>
+                </view>
+                <!-- <view class="actions bg-img" @tap.stop="hideModal" style="background-image: url({{'https://images.ufutx.com/202103/15/1033c7b52cacddcebe999cefc6ad2c9b.png'}})"></view> -->
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import wepy from '@wepy/core'
+    import { service } from '../../config.js'
+    import base from '../../mixins/base'
+    import https from '../../mixins/https'
+
+     wepy.page({
+         mixins: [https, base],
+        data: {
+            modalName: '',
+            user_id: '',
+            frozen_state: 1,
+            nickName: '',
+            userInfo: ''
+        },
+
+        async onLoad(e) {
+            this.user_id = wx.getStorageSync('user_id')
+            wx.hideLoading()
+            this.userInfo = wx.getStorageSync('userInfo')
+            this.frozen_state = this.$app.$options.globalData.frozen_state
+            console.log(this.userInfo, 'userInfo')
+            if (this.userInfo) {
+                this.nickName = this.userInfo.name
+            }
+        },
+
+        onShow() {
+
+        },
+
+        onPullDownRefresh() {
+
+        },
+
+        onReachBottom() {
+
+        },
+
+        methods: {
+            hideModal() {
+                this.modalName = ''
+            },
+            clickUnfrozen() {
+                this.unfrozen()
+            },
+            clickPhone() {
+                wx.makePhoneCall({
+                    phoneNumber: '18922809346'
+                })
+            },
+            goto(url) {
+                this.modalName = ''
+                if (url == '/pages/tabBar/home') {
+                    this.$gotoTab(url)
+                }
+                this.$redirectTo(url)
+            },
+            unfrozen() {
+            let data = {
+
+                }
+                this.$put({url: `${service.host}/unfrozen/user/${this.user_id}`, data}).then(({code, data}) => {
+                            if (code == 0) {
+                                vm.modalName = 'freezeModal'
+                            }
+                })
+                // that.$put({url: `${service.host}/unfrozen/user/${that.user_id}`}).then(({code, data}) => {
+                //         if (code == 0) {
+                //             that.modalName = 'freezeModal'
+                //         }
+                // })
+            }
+        }
+    })
+
+</script>
+
+<style lang="less">
+
+  page{
+    background: white;
+  }
+  .wrapper {
+    height: 100vh;
+    .m_fre {
+      position: relative;
+      top: 50%;
+      transform: translateY(-50%);
+      padding-bottom: 200rpx;
+      .defaultIcon{
+        width: 224rpx;
+        height: 236rpx;
+      }
+      .openButton{
+        width: 480rpx;
+        height: 80rpx;
+        background-image: linear-gradient(to left,#FF85A5,#FF5380);
+        border-radius: 100rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin: 80rpx auto 0;
+      }
+    }
+  }
+  .cu-modal {
+    .cu-dialog {
+      width: 600rpx;
+      // height: 500rpx;
+      background: #ffffff;
+      border-radius: 32rpx;
+      position: relative;
+      overflow: visible;
+      padding: 50rpx;
+
+    }
+    .actions {
+      position: absolute;
+      bottom: -100rpx;
+      left: 0;
+      right: 0;
+      margin: auto;
+      width: 48rpx;
+      height: 48rpx;
+    }
+    .u_moImg {
+      width: 364rpx;
+      height: 232rpx;
+    }
+    .m_bu {
+      .u_bu_la,
+      .u_bu_ho {
+        width: 200rpx;
+        height: 72rpx;
+        border-radius: 100rpx;
+      }
+      .u_bu_ho {
+        border: 2rpx solid #D8D8D8;
+      }
+      .u_bu_la {
+        background: #FF5380;
+        margin-left: 48rpx;
+      }
+    }
+  }
+</style>
+<config>
+    {
+    navigationBarTitleText: '福恋系统',
+    navigationStyle: 'custom',
+    enablePullDownRefresh: false,
+    backgroundColorTop: '#ffffff',
+    backgroundColorBottom: '#ffffff',
+    usingComponents: {
+    }
+    }
+</config>

src/pages/users/myCertification.wpy

@@ -89,7 +89,7 @@
           <image class="successful_pic" src="https://images.ufutx.com/202012/28/2168fa80aa80eb0f76ba71ac0e449c7e.png" mode="widthFix" ></image>
         </view>
         <view class="font_36 color-333 bold">资料正在审核中</view>
-        <view class="font_28 color-333 prompt_text">审核结果将在1～3个工作日内通知，请耐心等待；如有需要，请直接联系客服<span class="color-theme" @tap="callPhone('18922809346')">18194066804</span></view>
+        <view class="font_28 color-333 prompt_text">审核结果将在1～3个工作日内通知，请耐心等待；如有需要，请直接联系客服<span class="color-theme" @tap="callPhone('18922809346')">18922809346</span></view>
         <view class="Know font_32" @tap="vanish">我知道了</view>
       </view>
     </view>