Merge branch 'master' of repo.ufutx.net:ufutx.love.mp.v2

src/pages/home/registration.wpy

@@ -238,7 +238,7 @@ wepy.page({
 
     belief: '',
     beliefList: ['基督教', '佛教', '伊斯兰教', '其他'],
-    beliefIndex: 3,
+    beliefIndex: 0,
     jumpString: 'basicData',
     throttle: true,
     unionid: '',
@@ -323,6 +323,10 @@ wepy.page({
       }
       vm.$put({url: `${service.host}/user/register/profile`, data}).then(({code, data}) => {
         if (code == 0) {
+          let userInfo = wx.getStorageSync('userInfo')
+          console.log(userInfo, '===')
+          userInfo.is_base_profile = true
+          wx.setStorageSync('userInfo', userInfo)
           wx.switchTab({url: '/pages/tabBar/home'})
         }
         wx.hideLoading()

src/pages/users/selfTextarea.wpy

@@ -335,12 +335,27 @@ import base from '../../mixins/base'
                         show: data.interest_label.includes(item.title)
                       }
                     })
+                    let objectValue = that.hobbiesList.map(item => { return item.title })
+                    let newHobbies = data.interest_label.filter(item => {
+                      console.log(objectValue.includes(item), 'obj===')
+                      return !objectValue.includes(item)
+                    })
+                    console.log(objectValue, newHobbies, 'newHobbies===')
                     that.customHobbiesList = that.customHobbiesList.map(item => {
                       return {
                         title: item,
                         show: data.interest_label.includes(item)
                       }
                     })
+                    if (newHobbies && newHobbies.length > 0) {
+                      newHobbies = newHobbies.map(item => {
+                        return {
+                          title: item,
+                          show: true
+                        }
+                      })
+                      that.customHobbiesList = [...new Set([...that.customHobbiesList, ...newHobbies])]
+                    }
                   } else {
                     that.customHobbiesList = that.customHobbiesList.map(item => {
                       return {

src/pages/users/unmarriV2.wpy

@@ -823,7 +823,7 @@
                         </view>
                         <view  class="u_bas">
                             <view class="m_basLst f-fbc">
-                                <span class="font_28 color-333 bold">期望对方</span>
+                                <span class="font_28 color-333 bold">期望结婚</span>
                                 <span style="margin-right: 12rpx;">{{mylibs.marry_by_time || '--'}}</span>
                             </view>
                         </view>