dengzhifeng/ufutx_love_mp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zengBin 2024-10-08 09:19:10 +08:00
commit 37b64095f6
6 changed files with 46 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pages/home/registration.wpy
View File

@ -289,9 +289,9 @@ wepy.page({
if (!vm.sex) { if (!vm.sex) {
return vm.$showToast('请选择你的性别') return vm.$showToast('请选择你的性别')
} }
// if (!vm.mobile) { if (!vm.mobile) {
// return vm.$showToast('请选择绑定手机号') return vm.$showToast('请选择绑定手机号')
// } }
if (!vm.birthday) { if (!vm.birthday) {
return vm.$showToast('请选择你的生日') return vm.$showToast('请选择你的生日')
} }
@ -308,7 +308,7 @@ wepy.page({
let data = { let data = {
photo: vm.photo, photo: vm.photo,
nickname: vm.name, nickname: vm.name,
mobile: vm.mobile || '15813393343', mobile: vm.mobile,
sex: vm.sex === '男' ? 1 : 2, sex: vm.sex === '男' ? 1 : 2,
belief: vm.belief, belief: vm.belief,
state: vm.emotion, state: vm.emotion,

2
src/pages/users/degreeCertificate.wpy
View File

@ -165,7 +165,7 @@
manner: ['毕业证/学位证书照片', '国内学信网在线认证'], manner: ['毕业证/学位证书照片', '国内学信网在线认证'],
degreeIndex: '', degreeIndex: '',
mannerIndex: 0, mannerIndex: 0,
school: '999', school: '',
attestation: '', attestation: '',
ShowDegree: false, ShowDegree: false,
init: false, init: false,

2
src/pages/users/selfTextarea.wpy
View File

@ -338,7 +338,7 @@ import base from '../../mixins/base'
that.customHobbiesList = that.customHobbiesList.map(item => { that.customHobbiesList = that.customHobbiesList.map(item => {
return { return {
title: item, title: item,
show: data.interest_label.includes(item.title) show: data.interest_label.includes(item)
} }
}) })
} else { } else {

50
src/pages/users/unmarri.wpy
View File

@ -27,7 +27,7 @@
<view class="m_basLst f-fbc"> <view class="m_basLst f-fbc">
<span class="font_28 color-333 bold">性别</span> <span class="font_28 color-333 bold">性别</span>
<view class="text"> <view class="text">
<span v-if="sexIndex>-1">{{sex[sexIndex]}}</span> <span v-if="sexIndexSelect">{{sex[sexIndex]}}</span>
<span v-else class="color-999">请选择</span> <span v-else class="color-999">请选择</span>
<text class="cuIcon-right lg text-gray"></text> <text class="cuIcon-right lg text-gray"></text>
</view> </view>
@ -40,7 +40,7 @@
<view class="m_basLst f-fbc"> <view class="m_basLst f-fbc">
<span class="font_28 color-333 bold">身高</span> <span class="font_28 color-333 bold">身高</span>
<view class="font_28 f-fc"> <view class="font_28 f-fc">
<span class="color333" v-if="statureIndex>-1">{{statureList[statureIndex]}}</span> <span class="color333" v-if="statureIndexSelect">{{statureList[statureIndex]}}</span>
<span v-else class="color-999">请选择</span> <span v-else class="color-999">请选择</span>
<text class="cuIcon-right lg text-gray"></text> <text class="cuIcon-right lg text-gray"></text>
</view> </view>
@ -52,7 +52,7 @@
<view class="m_basLst f-fbc"> <view class="m_basLst f-fbc">
<span class="font_28 color-333 bold">体重</span> <span class="font_28 color-333 bold">体重</span>
<view class="font_28 f-fc"> <view class="font_28 f-fc">
<span class="color333" v-if="weightIndex>-1">{{weightList[weightIndex]}}</span> <span class="color333" v-if="weightIndexSelect">{{weightList[weightIndex]}}</span>
<span v-else class="color-999">请选择</span> <span v-else class="color-999">请选择</span>
<text class="cuIcon-right lg text-gray"></text> <text class="cuIcon-right lg text-gray"></text>
</view> </view>
@ -136,7 +136,7 @@
<view class="m_secLst f-fbc"> <view class="m_secLst f-fbc">
<span class="font_28 color-333 bold">年收入</span> <span class="font_28 color-333 bold">年收入</span>
<view class="font_28 f-fc"> <view class="font_28 f-fc">
<span class="color333" v-if="incomeIndex>-1">{{incomeList[incomeIndex]}}</span> <span class="color333" v-if="incomeIndexSelect">{{incomeList[incomeIndex]}}</span>
<span v-else class="color-999">请选择</span> <span v-else class="color-999">请选择</span>
<text class="cuIcon-right lg text-gray"></text> <text class="cuIcon-right lg text-gray"></text>
</view> </view>
@ -148,7 +148,7 @@
<view class="m_secLst f-fbc"> <view class="m_secLst f-fbc">
<span class="font_28 color-333 bold">信仰</span> <span class="font_28 color-333 bold">信仰</span>
<view class="font_28 f-fc"> <view class="font_28 f-fc">
<span class="color333" v-if="beliefIndex>-1">{{belief[beliefIndex]}}</span> <span class="color333" v-if="beliefIndexSelect">{{belief[beliefIndex]}}</span>
<span v-else class="color-999">请选择</span> <span v-else class="color-999">请选择</span>
<text class="cuIcon-right lg text-gray"></text> <text class="cuIcon-right lg text-gray"></text>
</view> </view>
@ -160,7 +160,7 @@
<view class="m_secLst f-fbc"> <view class="m_secLst f-fbc">
<span class="font_28 color-333 bold">期望结婚</span> <span class="font_28 color-333 bold">期望结婚</span>
<view class="font_28 f-fc"> <view class="font_28 f-fc">
<span class="color333" v-if="marriageIndex>-1">{{marriage[marriageIndex]}}</span> <span class="color333" v-if="marriageIndexSelect">{{marriage[marriageIndex]}}</span>
<span v-else class="color-999">请选择</span> <span v-else class="color-999">请选择</span>
<text class="cuIcon-right lg text-gray"></text> <text class="cuIcon-right lg text-gray"></text>
</view> </view>
@ -195,23 +195,31 @@
mixins: [base, https], mixins: [base, https],
data: { data: {
sex: ['男', '女'], sex: ['男', '女'],
sexIndex: -1, sexIndex: 0,
sexIndexSelect: false,
selectSex: false, selectSex: false,
state: '', state: '',
statureList: [], // 身高list statureList: [], // 身高list
statureIndex: -1, // 默认160cm statureIndex: 0, // 默认160cm
statureIndexSelect: false,
weightList: [], // 体重list weightList: [], // 体重list
weightIndex: -1, // 默认160cm weightIndex: 0, // 默认160cm
stateIndex: -1, weightIndexSelect: false,
stateIndex: 0,
stateIndexSelect: false,
residentIndex: 0, residentIndex: 0,
degree: ['小学', '初中', '高中', '中专', '大专', '本科', '硕士', '博士', '其他'], degree: ['小学', '初中', '高中', '中专', '大专', '本科', '硕士', '博士', '其他'],
degreeIndex: -1, degreeIndex: 0,
degreeIndexSelect: false,
incomeList: ['5w以下', '5~10w', '10~15w', '15~30w', '30~50w', '50~100w', '100~500w', '500w以上'], incomeList: ['5w以下', '5~10w', '10~15w', '15~30w', '30~50w', '50~100w', '100~500w', '500w以上'],
incomeIndex: -1, incomeIndex: 0,
incomeIndexSelect: false,
belief: ['基督教', '佛教', '伊斯兰教', '其他'], belief: ['基督教', '佛教', '伊斯兰教', '其他'],
beliefIndex: -1, beliefIndex: 0,
beliefIndexSelect: false,
marriage: ['半年内', '一年内', '两年内', '两年后'], marriage: ['半年内', '一年内', '两年内', '两年后'],
marriageIndex: -1, marriageIndex: 0,
marriageIndexSelect: false,
salary: [], salary: [],
salaryIndex: 0, salaryIndex: 0,
region: ['', '', ''], region: ['', '', ''],
@ -354,20 +362,24 @@
}, 800) }, 800)
if (data.sex == 1) { if (data.sex == 1) {
that.sexIndex = 0 that.sexIndex = 0
that.sexIndexSelect = true
} else if (data.sex == 2) { } else if (data.sex == 2) {
that.sexIndex = 1 that.sexIndex = 1
that.sexIndexSelect = true
} else { } else {
} }
that.statureList.map((item, index) => { that.statureList.map((item, index) => {
// console.log(item) // console.log(item)
if (parseInt(item) == result.stature) { if (parseInt(item) == result.stature) {
that.statureIndex = index that.statureIndex = index
that.statureIndexSelect = true
} }
}) })
that.weightList.map((item, index) => { that.weightList.map((item, index) => {
// console.log(parseInt(item)) // console.log(parseInt(item))
if (parseInt(item) == result.weight) { if (parseInt(item) == result.weight) {
that.weightIndex = index that.weightIndex = index
that.weightIndexSelect = true
} }
}) })
if (result.birthday) { if (result.birthday) {
@ -382,21 +394,25 @@
that.degree.forEach((item, index, arr) => { that.degree.forEach((item, index, arr) => {
if (result.degree == arr[index]) { if (result.degree == arr[index]) {
that.degreeIndex = index that.degreeIndex = index
that.degreeIndexSelect = true
} }
}) })
that.belief.forEach((item, index, arr) => { that.belief.forEach((item, index, arr) => {
if (result.belief == arr[index]) { if (result.belief == arr[index]) {
that.beliefIndex = index that.beliefIndex = index
that.beliefIndexSelect = true
} }
}) })
that.marriage.forEach((item, index, arr) => { that.marriage.forEach((item, index, arr) => {
if (result.marry_by_time == arr[index]) { if (result.marry_by_time == arr[index]) {
that.marriageIndex = index that.marriageIndex = index
that.marriageIndexSelect = true
} }
}) })
that.incomeList.forEach((item, index, arr) => { that.incomeList.forEach((item, index, arr) => {
if (result.income == arr[index]) { if (result.income == arr[index]) {
that.incomeIndex = index that.incomeIndex = index
that.incomeIndexSelect = true
} }
}) })
that.industry = data.industry that.industry = data.industry
@ -575,26 +591,32 @@
}, },
sexChange(e) { // 性别 sexChange(e) { // 性别
this.sexIndex = e.$wx.detail.value this.sexIndex = e.$wx.detail.value
this.sexIndexSelect = true
console.log(this.sexIndex) console.log(this.sexIndex)
}, },
statureChange(e) { // 身高 statureChange(e) { // 身高
this.statureIndex = e.$wx.detail.value this.statureIndex = e.$wx.detail.value
this.statureIndexSelect = true
this.stature = this.statureList[this.statureIndex].split('cm')[0] this.stature = this.statureList[this.statureIndex].split('cm')[0]
console.log(this.stature) console.log(this.stature)
}, },
weightChange(e) { // 体重 weightChange(e) { // 体重
this.weightIndex = e.$wx.detail.value this.weightIndex = e.$wx.detail.value
this.weightIndexSelect = true
this.weight = this.weightList[this.weightIndex].split('kg')[0] this.weight = this.weightList[this.weightIndex].split('kg')[0]
console.log(this.weight) console.log(this.weight)
}, },
beliefChange(e) { beliefChange(e) {
this.beliefIndex = e.$wx.detail.value this.beliefIndex = e.$wx.detail.value
this.beliefIndexSelect = true
}, },
marriageChange(e) { marriageChange(e) {
this.marriageIndex = e.$wx.detail.value this.marriageIndex = e.$wx.detail.value
this.marriageIndexSelect = true
}, },
incomeChange(e) { // 年收入 incomeChange(e) { // 年收入
this.incomeIndex = e.$wx.detail.value this.incomeIndex = e.$wx.detail.value
this.incomeIndexSelect = true
}, },
bindTips(text) { bindTips(text) {
this.$showToast(text) this.$showToast(text)

6
src/pages/users/unmarriV2.wpy
View File

@ -722,7 +722,7 @@
<image src="https://images.ufutx.com/202012/25/7645858a1ae55dd7c3ef90ec7a42bfa3.png" mode="aspectFit" class="circle_icon"></image> <image src="https://images.ufutx.com/202012/25/7645858a1ae55dd7c3ef90ec7a42bfa3.png" mode="aspectFit" class="circle_icon"></image>
认证中心 认证中心
</view> </view>
<image src="https://images.ufutx.com/202004/13/c9505127b21e909aae5a609987f5ac66.png" class="icon flo_r" mode="widthFix" @tap="goto('/pages/users/myCertification')"/> <image src="https://images.ufutx.com/202004/13/c9505127b21e909aae5a609987f5ac66.png" class="icon flo_r" mode="widthFix" />
</view> </view>
<block v-for="(item,index) in _approveList" v-key="this"> <block v-for="(item,index) in _approveList" v-key="this">
<view class="_item text-center flo_l"> <view class="_item text-center flo_l">
@ -739,7 +739,7 @@
<image src="https://images.ufutx.com/202012/25/7645858a1ae55dd7c3ef90ec7a42bfa3.png" mode="aspectFit" class="circle_icon"></image> <image src="https://images.ufutx.com/202012/25/7645858a1ae55dd7c3ef90ec7a42bfa3.png" mode="aspectFit" class="circle_icon"></image>
基本资料 基本资料
</view> </view>
<image src="https://images.ufutx.com/202004/13/c9505127b21e909aae5a609987f5ac66.png" class="icon flo_r" mode="widthFix" @tap="goto('/pages/users/unmarri')"/> <image src="https://images.ufutx.com/202004/13/c9505127b21e909aae5a609987f5ac66.png" class="icon flo_r" mode="widthFix" />
</view> </view>
<view class="m_bas"> <view class="m_bas">
<view class="u_bas"> <view class="u_bas">
@ -877,7 +877,7 @@
<view class="mainBtn text-center"> <view class="mainBtn text-center">
<view class="blurBox"></view> <view class="blurBox"></view>
<view class="shareBox text-center inline-block"> <view class="shareBox text-center inline-block">
<button class="btn text-center font_30 shareImage" @tap="goto(`/pages/home/information?id=${mylibs.user_id}`)"></button> <button class="btn text-center font_30 shareImage" @tap="goto(`/pages/home/information?id=${mylibs.id}`)"></button>
</view> </view>
</view> </view>
<view style="height: 12vh"></view> <view style="height: 12vh"></view>

2
src/utils/util.js
View File

@ -52,7 +52,7 @@ const wx_login = () => {
wx.setStorageSync('openid', (data.openid)) wx.setStorageSync('openid', (data.openid))
wx.setStorageSync('user_id', data.user.id) // 用户id wx.setStorageSync('user_id', data.user.id) // 用户id
wx.setStorageSync('mobile', data.user.mobile) // 用户手机号 wx.setStorageSync('mobile', data.user.mobile) // 用户手机号
if (data.user.hidden_profile !== 'NONE') { // 资料是否关闭 if (data.user.hidden_profile == 'ALLSEX') { // 资料是否关闭
wx.setStorageSync('logoutCode', 1) wx.setStorageSync('logoutCode', 1)
wx.redirectTo({url: '/pages/users/logoutDefault'}) wx.redirectTo({url: '/pages/users/logoutDefault'})
} }