update

src/pages/news/visitor.wpy

@@ -86,6 +86,7 @@ page {
         margin-left: 16rpx;
 
         .u_vclst_name {
+          max-width:200rpx;
           font-size: 32rpx;
           font-weight: bold;
           color: #333333;
@@ -294,7 +295,7 @@ page {
                     <image class="u_vclst_img" :src="item.photo" mode="aspectFill" @tap.stop="gotofriends(item, index)"></image>
                     <view class="u_vclst_t_box">
                       <view class="f-fc">
-                        <view class="u_vclst_name">{{item.nickname}}</view>
+                        <view class="u_vclst_name ellipsis_1">{{item.nickname}}</view>
                         <view class="u_vclst_a_box f-fc  {{ item.sex == 2 ? 'age_g' : 'age_b'}} font_22" v-if="item.sex == 2">
                           <image v-if="item.sex == 2" class="a_sex_img" src="https://image.fulllinkai.com/202208/09/dfed05b3e1e1880a3a6f81806d99e9de.png" mode="widthFix"></image>
                           <image v-else class="a_sex_img" src="https://image.fulllinkai.com/202208/09/dfed05b3e1e1880a3a6f81806d99e9de.png" mode="widthFix"></image>

src/pages/tabBar/home.wpy

@@ -642,7 +642,11 @@ wepy.page({
   },
   onShow() {
     let vm = this
+    console.log('222')
     vm.getTimeFn()
+    if (wx.getStorageSync('logoutCode')) {
+      wx.redirectTo({url: '/pages/users/logoutDefault'})
+    }
   },
   onLoad() {
     let vm = this

src/pages/tabBar/user.wpy

@@ -401,7 +401,7 @@
       // }
 
       async function timi(res) {
-        // await vm.getNewCount()
+        await vm.getNewCount()
         await vm.initPageData()
         await vm.getIsBaseInfo()
       }
@@ -441,10 +441,7 @@
     },
 
     onLoad(e) {
-      // this.realityState = wx.getStorageSync('realityState') || 0
+
-      // if (this.realityState == 99) {
-      //     // this.taskList[1].title = '完成实名认证'
-      // }
     },
 
     onPullDownRefresh() {
@@ -457,32 +454,12 @@
     },
 
     methods: {
-      // getorderDetail() {
-      //     let that = this
-      //     that.spellGroupList = []
-      //     that.$get({url: `${service.host}/groups`}).then(({code, data}) => {
-      //         data.forEach((item) => {
-      //             that.spellGroupList.push({
-      //                 pic: item.pic,
-      //                 id: item.m_order_id,
-      //                 need_count: item.need_count,
-      //                 time: item.deadline.split(' ')[1]
-      //             })
-      //         })
-      //     })
-      // },
 
       getNewCount() {
-        this.$get({
+        let vm = this
-          url: `${service.host}/new/message/count`
+        vm.$get({url: `${service.host}/notice/count`}).then(({code, data}) => {
-        }).then(({
+          if (code === 0) {
-          code,
+            let {notice_count} = data
-          data
-        }) => {
-          let {
-            new_count, order_count
-          } = data
-          this.spriteList[1].count = data.order_count
             let groupCountList = wx.getStorageSync('teamsSessionsCount') || []
             let groupCount = 0
             if (groupCountList.length > 0) {
@@ -490,26 +467,19 @@
                 groupCount += groupCountList[i].unread
               }
             }
-          if ((new_count + groupCount) > 0) {
+            if ((notice_count + groupCount) > 0) {
               wx.setTabBarBadge({
-              index: 3,
+                index: 2,
-              text: `${new_count + groupCount}`
+                text: `${notice_count + groupCount}`
               })
             } else {
               wx.removeTabBarBadge({
-              index: 3
+                index: 2
               })
             }
-          if (order_count > 0) {
-            wx.setTabBarBadge({
-              index: 4,
-              text: `${order_count}`
-            })
-          } else {
-            wx.removeTabBarBadge({
-              index: 4
-            })
           }
+        }).catch(err => {
+          console.log(err)
         })
       },
 
@@ -523,6 +493,10 @@
           getApp().$wepy.$options.globalData.is_base_info = is_base_profile
           if (!wx.getStorageSync('mobile')) {
             vm.isShowIphoneBtn = true
+          }
+          if (!is_base_profile) {
+            vm.loginShow = true
+            return
           }
             if (!data.is_complete_profile) {
                 this.modalName = 'ModalEdit'

src/pages/tabBar/welcome.wpy

@@ -43,6 +43,7 @@ wepy.page({
   onShow() {
     setTimeout(() => {
         if (wx.getStorageSync('logoutCode')) {
+          wx.redirectTo({url: '/pages/users/logoutDefault'})
             return
         }
       wx.switchTab({url: `/pages/tabBar/home`})

src/pages/users/exclusiveService.wpy

@@ -19,7 +19,7 @@
     </view>
   </block>
   <view class="cu-modal" :class="{'show':modalName=='isExclusiveService'}">
-    <view class="audit_photo_box ff" style="border-radius: 32rpx;padding: 22rpx;">
+    <view class="audit_photo_box bg_f" style="border-radius: 32rpx;padding: 22rpx;">
       <view class="font_32 bold color-333" style="padding-top:38rpx;">联系专属客服</view>
       <image style="width: 240rpx;height: 240rpx;margin: 40rpx;"
              src="{{exclusiveService}}" show-menu-by-longpress="true"

src/pages/users/logout.wpy

@@ -12,7 +12,7 @@
       </radio-group>
     </view>
     <view class="themes" v-if="selectId==6">
-      <textarea class="textarea font_28 color-666 text-left" maxlength="50"  placeholder="请告诉福恋，你关闭资料的其他原因吧" @input="typing('content')" @blur="typing('content')"  adjust-position="true"  value="{{content}}" />
+      <textarea class="textarea font_28 color-666 text-left" maxlength="50"  placeholder="请告诉福恋，你关闭资料的其他原因吧" @input="typing('content',$event)" @blur="typing('content',$event)"  adjust-position="true"  value="{{content}}" />
       <view class="font_24 text-right" style="color: #c2c2c2">{{content.length}}/50</view>
     </view>
     <view class="font_32 sendButton" @tap="ShutDown">关闭资料</view>
@@ -118,7 +118,8 @@
         })
         },
       typing(type, e) {
-        this[type] = e.detail.value
+          console.log(e, 'e')
+        this[type] = e.$wx.detail.value
         console.log(this[type])
       },
       callPhone (phone) {
@@ -141,11 +142,11 @@
       hideModal1 () {
         this.modalName = ''
         console.log(this.showSecondType, '77777777777')
-        if (!this.showSecondType) {
+        // if (!this.showSecondType) {
           wx.redirectTo({url: '/pages/users/logoutDefault'})
-        } else {
+        // } else {
-          wx.redirectTo({url: '/pages/marriedPage/home'})
+        //   wx.redirectTo({url: '/pages/marriedPage/home'})
-        }
+        // }
       },
       hideModal () {
         this.modalName = ''

src/pages/users/selfTextarea.wpy

@@ -455,7 +455,7 @@ import base from '../../mixins/base'
       let that = this
       if (this.throttleShow) {
         // this.throttleShow = false
-        if (!this.value && that.text != '兴趣爱好') {
+        if (!this.value && that.text != '兴趣标签') {
           this.$showToast('请输入内容')
           return
         }
@@ -464,7 +464,6 @@ import base from '../../mixins/base'
           this.$showToast('你输入的信息可能含有联系方式，请重新填写！')
           return
         }
-        this.$showLoading('提交中..')
         let data = {}
         if (that.text == '自我描述') {
           data.introduction = that.value
@@ -477,6 +476,11 @@ import base from '../../mixins/base'
             }).map(item => { return item.title })
             console.log(defaultHob, customHob, '----999-----')
           data.interest_label = [...defaultHob, ...customHob]
+          console.log(data.interest_label, 'data.interest_label')
+          if (data.interest_label.length == 0) {
+            this.$showToast('请至少选择一个标签')
+            return
+          }
         } else if (that.text == '兴趣爱好') {
           data.interest_hobby = that.value
         } else if (that.text == '期望对方') {
@@ -535,6 +539,7 @@ import base from '../../mixins/base'
           }
           wx.setStorageSync('colorData', colorData)
         }
+        this.$showLoading('提交中..')
         this.$put({url: `${service.host}/user/other/profie`, data}).then(({code, data}) => {
             this.throttleShow = true
             wx.hideLoading()

src/pages/users/unmarriV2.wpy

@@ -854,7 +854,7 @@
                         </view>
                         <image  src="https://images.ufutx.com/202004/13/c9505127b21e909aae5a609987f5ac66.png" class="icon flo_r" mode="widthFix" @tap="showModal('interest_label','兴趣标签','日常生活你有什么爱好？可以写一下')"/>
                     </view>
-                    <view class="mainPhoto" @tap="showModal('interest_label','兴趣标签','日常生活你有什么爱好？可以写一下')">
+                    <view class="mainPhoto" @tap="showModal('interest_label','兴趣标签','添加兴趣标签，遇见合适的Ta')">
                       <view class="f-fc ui-wrap ui-hobbies-big-box" v-if="mylibs.interest_label">
                         <view class="hobbies-box " v-for="(item,index) in mylibs.interest_label" :key="index">
                           {{item}}
@@ -1237,18 +1237,11 @@
                     return
                 }
                 vm.$showLoading('领取中...')
-                this.$post({url: `${service.host}/rank/daily/complete/profile`}, {
+                this.$post({url: `${service.host}/rank/daily/complete/profile`}).then(res => {
-                    success: ({code, data}) => {
                         console.log('领取成功')
                         vm.modalName = 'successful'
                         vm.mylibs.has_get_daily_rank = true
-
                         wx.hideLoading()
-                    },
-                    fail: ({code, data}) => {
-                    },
-                    complete: () => {
-                    }
                 })
             },
             previewImage(imge, list) {