diff --git a/src/pages/news/visitor.wpy b/src/pages/news/visitor.wpy
index 4c37a6c..198d280 100644
--- a/src/pages/news/visitor.wpy
+++ b/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 {
- {{item.nickname}}
+ {{item.nickname}}
diff --git a/src/pages/tabBar/home.wpy b/src/pages/tabBar/home.wpy
index c8ab24b..158500f 100644
--- a/src/pages/tabBar/home.wpy
+++ b/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
diff --git a/src/pages/tabBar/user.wpy b/src/pages/tabBar/user.wpy
index c29c3e2..d3031e8 100644
--- a/src/pages/tabBar/user.wpy
+++ b/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,59 +454,32 @@
},
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({
- url: `${service.host}/new/message/count`
- }).then(({
- code,
- 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) {
- for (let i = 0; i < groupCountList.length; i++) {
- groupCount += groupCountList[i].unread
+ let vm = this
+ vm.$get({url: `${service.host}/notice/count`}).then(({code, data}) => {
+ if (code === 0) {
+ let {notice_count} = data
+ let groupCountList = wx.getStorageSync('teamsSessionsCount') || []
+ let groupCount = 0
+ if (groupCountList.length > 0) {
+ for (let i = 0; i < groupCountList.length; i++) {
+ groupCount += groupCountList[i].unread
+ }
+ }
+ if ((notice_count + groupCount) > 0) {
+ wx.setTabBarBadge({
+ index: 2,
+ text: `${notice_count + groupCount}`
+ })
+ } else {
+ wx.removeTabBarBadge({
+ index: 2
+ })
}
}
- if ((new_count + groupCount) > 0) {
- wx.setTabBarBadge({
- index: 3,
- text: `${new_count + groupCount}`
- })
- } else {
- wx.removeTabBarBadge({
- index: 3
- })
- }
- 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'
diff --git a/src/pages/tabBar/welcome.wpy b/src/pages/tabBar/welcome.wpy
index e86a42c..8d6239a 100644
--- a/src/pages/tabBar/welcome.wpy
+++ b/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`})
diff --git a/src/pages/users/exclusiveService.wpy b/src/pages/users/exclusiveService.wpy
index 799cd42..ac60825 100644
--- a/src/pages/users/exclusiveService.wpy
+++ b/src/pages/users/exclusiveService.wpy
@@ -19,7 +19,7 @@
-
+
联系专属客服
-
+
{{content.length}}/50
关闭资料
@@ -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 {
- wx.redirectTo({url: '/pages/marriedPage/home'})
- }
+ // } else {
+ // wx.redirectTo({url: '/pages/marriedPage/home'})
+ // }
},
hideModal () {
this.modalName = ''
diff --git a/src/pages/users/selfTextarea.wpy b/src/pages/users/selfTextarea.wpy
index 4ae67f9..59cf613 100644
--- a/src/pages/users/selfTextarea.wpy
+++ b/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()
diff --git a/src/pages/users/unmarriV2.wpy b/src/pages/users/unmarriV2.wpy
index eed19ab..257315d 100644
--- a/src/pages/users/unmarriV2.wpy
+++ b/src/pages/users/unmarriV2.wpy
@@ -854,7 +854,7 @@
-
+
{{item}}
@@ -1237,18 +1237,11 @@
return
}
vm.$showLoading('领取中...')
- this.$post({url: `${service.host}/rank/daily/complete/profile`}, {
- success: ({code, data}) => {
+ this.$post({url: `${service.host}/rank/daily/complete/profile`}).then(res => {
console.log('领取成功')
vm.modalName = 'successful'
vm.mylibs.has_get_daily_rank = true
-
wx.hideLoading()
- },
- fail: ({code, data}) => {
- },
- complete: () => {
- }
})
},
previewImage(imge, list) {