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-09-29 11:01:46 +08:00
commit fa9846c2cf
20 changed files with 258 additions and 1786 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/chooseImageTips.wpy
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="chooseImageTips"> <view class="chooseImageTips">
<view :class="{'~show':chooseShow}" class="~cu-modal ~bottom-modal" catchtap="hideModal"> <view :class="{'~show':chooseShow}" class="cu-modal ~cu-modal ~bottom-modal" catchtap="hideModal">
<view class="~cu-dialog cu-dialog "> <view class="~cu-dialog cu-dialog ">
<view class="g_ct"> <view class="g_ct">
<view class="u_tt ~font_26 ~color999"> <view class="u_tt ~font_26 ~color999">

2
src/components/uploadPic.wpy
View File

@ -97,7 +97,7 @@ wepy.component({
for (let item of res.tempFiles) { for (let item of res.tempFiles) {
console.log(item, '====') console.log(item, '====')
let type = item.fileType == 'video' ? 'video' : 'img' let type = item.fileType == 'video' ? 'video' : 'img'
vm.uploadFile(item.tempFilePath, type, item.tempFilePath, index++) vm.uploadFile(item.tempFilePath, type, res.tempFiles, index++)
} }
}, },
fail: () => { fail: () => {

7
src/components/userTitle.wpy
View File

@ -7,11 +7,12 @@
<view class="m_userAva" style="position: relative;display: inline-block;margin-right:20rpx;"> <view class="m_userAva" style="position: relative;display: inline-block;margin-right:20rpx;">
<image class="userinfo-avatar ff" src="{{Image}}" mode="aspectFill" /> <image class="userinfo-avatar ff" src="{{Image}}" mode="aspectFill" />
<block v-if="user.photo"> <block v-if="user.photo">
<view class="mask font_22 f-fcc" v-if="user.is_photo_audited==0">审核中</view> {{user.is_photo_audited}}
<view class="mask font_22 f-fcc" v-if="user.is_photo_audited==-1">未通过</view> <view class="mask ~font_22 ~f-fcc" v-if="user.is_photo_audited==2">审核中</view>
<view class="mask ~font_22 ~f-fcc" v-if="user.is_photo_audited==0">未通过</view>
</block> </block>
<block v-else> <block v-else>
<view class="mask font_22">上传头像</view> <view class="mask ~font_22">上传头像</view>
</block> </block>
</view> </view>
</view> </view>

4
src/components/wepy-image-cropper.wpy
View File

@ -333,7 +333,7 @@
methods: { methods: {
_draw(callback) { _draw(callback) {
console.log(this.imgSrc) console.log(this.imgSrc)
if (!this.imgSrc) return if (!this.imgSrc || !this.ctx) return
let draw = () => { let draw = () => {
// 图片实际大小 // 图片实际大小
let img_width = this.img_width * this.scale * this.export_scale let img_width = this.img_width * this.scale * this.export_scale
@ -350,7 +350,7 @@
}) })
} }
console.log(this.ctx, 'this.ctx=333') console.log(this.ctx, 'this.ctx=333')
if (this.ctx.width != this.width || this.ctx.height != this.height) { if (this.ctx && (this.ctx.width != this.width || this.ctx.height != this.height)) {
// 优化拖动裁剪框，所以必须把宽高设置放在离用户触发渲染最近的地方 // 优化拖动裁剪框，所以必须把宽高设置放在离用户触发渲染最近的地方
this._canvas_height = this.height this._canvas_height = this.height
this._canvas_width = this.width this._canvas_width = this.width

1320
src/components/wepy-image-cropperV2.wpy
View File

File diff suppressed because it is too large Load Diff

2
src/mixins/https.js
View File

@ -95,7 +95,7 @@ export default {
wx.removeStorageSync('formId') wx.removeStorageSync('formId')
resolve({statusCode, ...data}) resolve({statusCode, ...data})
} else if (data.code === 1) { } else if (data.code === 1) {
resolve({statusCode, ...data}) // resolve({statusCode, ...data})
console.error(data.message) console.error(data.message)
// console.log(this.$app.$options.globalData) // console.log(this.$app.$options.globalData)
if (this.$is == 'pages/service/GroupChatPage' && data.message.includes('已断开连接')) { if (this.$is == 'pages/service/GroupChatPage' && data.message.includes('已断开连接')) {

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

@ -244,6 +244,21 @@ wepy.page({
unionid: '', unionid: '',
enterprise: '' enterprise: ''
}, },
onShow(e) {
console.log(e, 'e===')
if (e && e.photo) {
this.photo = e.photo
}
console.log(this.photo, '===')
},
onLoad() {
let vm = this
let timestamp = Date.parse(new Date())
let date = new Date(timestamp)
let Y = date.getFullYear()
vm.endDate = `${Y - 12}-01-01`
vm.beginData = `${Y - 120}-01-01`
},
methods: { methods: {
hideCut(e) { hideCut(e) {
wx.showTabBar({ wx.showTabBar({
@ -253,7 +268,15 @@ wepy.page({
}, },
complete() { complete() {
let vm = this let vm = this
console.log(vm.photo, 'vm.photo==') console.log(this.photo, vm.photo, 'vm.photo==')
if (!vm.photo && wx.getStorageSync('baseImage')) {
vm.photo = wx.getStorageSync('baseImage')
wx.removeStorageSync('baseImage')
}
if (!vm.photo) {
return vm.$showToast('请上传你的头像')
}
console.log(vm.photo, 'vm.photo=')
if (!vm.name) { if (!vm.name) {
return vm.$showToast('请输入昵称') return vm.$showToast('请输入昵称')
} else if (vm.name.length < 2 || vm.name.length > 10) { } else if (vm.name.length < 2 || vm.name.length > 10) {
@ -262,15 +285,13 @@ wepy.page({
if (vm.name.includes('福恋')) { if (vm.name.includes('福恋')) {
return vm.$showToast('请勿输入带“福恋”关键字的昵称！') return vm.$showToast('请勿输入带“福恋”关键字的昵称！')
} }
if (vm.photo == '') {
return vm.$showToast('请上传你的头像')
}
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('请选择你的生日')
} }
@ -287,7 +308,7 @@ wepy.page({
let data = { let data = {
photo: vm.photo, photo: vm.photo,
nickname: vm.name, nickname: vm.name,
mobile: vm.mobile, mobile: vm.mobile || '15813393343',
sex: vm.sex === '男' ? 1 : 2, sex: vm.sex === '男' ? 1 : 2,
belief: vm.belief, belief: vm.belief,
state: vm.emotion, state: vm.emotion,
@ -345,15 +366,7 @@ wepy.page({
}) })
} }
}, },
// 选择的图片和取消功能
changeVal(data) {
console.log(data, 'data=2222')
let vm = this
if (data) {
vm.photo = data[0].filePath
}
vm.chooseShow = false
},
// 关闭上传头像弹窗 // 关闭上传头像弹窗
closeUploadPic() { closeUploadPic() {
let vm = this let vm = this
@ -369,20 +382,8 @@ wepy.page({
vm.displayCity = e.city.replace(/市/g, '') vm.displayCity = e.city.replace(/市/g, '')
vm.address = {country: e.country, province: e.province, city: e.city} vm.address = {country: e.country, province: e.province, city: e.city}
} }
},
onShow(e) {
if (e && e.photo) {
this.photo = e.photo
}
},
onLoad() {
let vm = this
let timestamp = Date.parse(new Date())
let date = new Date(timestamp)
let Y = date.getFullYear()
vm.endDate = `${Y - 12}-01-01`
vm.beginData = `${Y - 120}-01-01`
} }
}) })
</script> </script>
<config> <config>

199
src/pages/tabBar/user.wpy
View File

@ -114,7 +114,7 @@
<view :class="{'show':modalName=='auditModal'}" class="cu-modal"> <view :class="{'show':modalName=='auditModal'}" class="cu-modal">
<view class="audit_photo_box"> <view class="audit_photo_box">
<view class="cancel_icon_box" @tap="hideModal"> <view class="cancel_icon_box" @tap="hideModal">
<view class="font_family icon-off white font_48"></view> <view style="font-size: 24px" class="font_family cuIcon-roundclose white "></view>
</view> </view>
<view class="m_photo"> <view class="m_photo">
<view class="audit_avatar_box"> <view class="audit_avatar_box">
@ -138,7 +138,7 @@
src="https://image.fulllinkai.com/202204/14/2c8b0665f901bd2e3b1b7afafd0629c3.png" src="https://image.fulllinkai.com/202204/14/2c8b0665f901bd2e3b1b7afafd0629c3.png"
mode="widthFix"></image> mode="widthFix"></image>
<view class="cancel_icon_box" @tap="hideModal"> <view class="cancel_icon_box" @tap="hideModal">
<view class="font_family icon-off white font_48"></view> <view style="font-size: 24px" class="font_family cuIcon-roundclose white "></view>
</view> </view>
<view class="m_photo f-fcc"> <view class="m_photo f-fcc">
<view class="reason_prompt font_32 color333" style="width: 90%;font-weight: 400;">更换头像将重新审核，确定仍要更换成为未认证状态吗？ <view class="reason_prompt font_32 color333" style="width: 90%;font-weight: 400;">更换头像将重新审核，确定仍要更换成为未认证状态吗？
@ -151,13 +151,13 @@
</view> </view>
</view> </view>
<view :class="{'show':modalName=='isExclusiveService'}" class="cu-modal"> <view :class="{'show':modalName=='isExclusiveService'}" class="cu-modal">
<view class="audit_photo_box colorfff" 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> <view class="font_32 bold color-333" style="padding-top:38rpx;">联系专属客服</view>
<image style="width: 240rpx;height: 240rpx;margin: 40rpx;" <image style="width: 240rpx;height: 240rpx;margin: 40rpx;"
src="{{exclusiveService}}" show-menu-by-longpress="true" src="{{exclusiveService}}" show-menu-by-longpress="true"
mode="widthFix"></image> mode="widthFix"></image>
<view class="cancel_icon_box" @tap="hideModal"> <view class="cancel_icon_box" @tap="hideModal">
<view class="font_family icon-off white font_48"></view> <view style="font-size: 24px" class="font_family cuIcon-roundclose white "></view>
</view> </view>
<view class="m_photo f-fcc"> <view class="m_photo f-fcc">
<view class="reason_prompt font_32 color333" style="width: 90%;font-weight: 400;">长按识别二维码，联系客服 <view class="reason_prompt font_32 color333" style="width: 90%;font-weight: 400;">长按识别二维码，联系客服
@ -166,13 +166,12 @@
</view> </view>
</view> </view>
</view> </view>
<block v-show="posterConfig"> <block v-if="posterConfig">
<!-- 生成海报--> <!-- 生成海报-->
<poster type="2d" id="poster" ref="poster" hide-loading="{{false}}" preload="{{false}}" config="{{posterConfig}}" <poster type="2d" id="poster" hide-loading="{{false}}" preload="{{false}}" config="{{posterConfig}}" bind:success="onPosterSuccess" bind:fail="onPosterFail">
bind:success="onPosterSuccess">
</poster> </poster>
<!-- 分享微信卡片--> <!-- 分享微信卡片-->
<poster type="2d" id="posterV1" ref="posterV1" hide-loading="{{false}}" preload="{{false}}" config="{{posterConfig1}}" <poster type="2d" id="posterV1" hide-loading="{{false}}" preload="{{false}}" config="{{posterConfig1}}"
bind:success="onPosterSuccessWx" > bind:success="onPosterSuccessWx" >
</poster> </poster>
</block> </block>
@ -186,6 +185,7 @@
<loginTips :tokenShow.sync="tokenShow" @loginCut.user="loginCut"></loginTips> <loginTips :tokenShow.sync="tokenShow" @loginCut.user="loginCut"></loginTips>
<chooseImageTips :chooseShow.sync="chooseShow" :jumpString.sync="jumpString" :photo.sync="user.photo" @hideCut.user="hideCut"></chooseImageTips> <chooseImageTips :chooseShow.sync="chooseShow" :jumpString.sync="jumpString" :photo.sync="user.photo" @hideCut.user="hideCut"></chooseImageTips>
<loginDialog :loginShow="loginShow" @hiddenLogin="hiddenLogin"></loginDialog>
</template> </template>
<script> <script>
@ -195,7 +195,6 @@
import {service} from '../../config.js' import {service} from '../../config.js'
const app = getApp().$wepy.$options const app = getApp().$wepy.$options
// import shareComponent from '../../components/shareComponent'
import {getPhoneNumber} from '../../utils/util' import {getPhoneNumber} from '../../utils/util'
wepy.page({ wepy.page({
@ -418,26 +417,27 @@
let url = `/pages/home/information?id=${fromUserID}&from_openid=${openid}&share_user_id=${fromUserID}&from_user_id=${fromUserID}` let url = `/pages/home/information?id=${fromUserID}&from_openid=${openid}&share_user_id=${fromUserID}&from_user_id=${fromUserID}`
// let url = 'pages/tabBar/welcome?from_openid=' + openid + '&from_user_id=' + fromUserID // let url = 'pages/tabBar/welcome?from_openid=' + openid + '&from_user_id=' + fromUserID
console.log(url) console.log(url)
// console.log(that.shareCanvasImg, '分享海报') console.log(that.shareCanvasImg, '分享海报')
// return { console.log(that.title, 'title')
// title: that.title, return {
// path: url, title: `我是"${that.user.nickname}"，这是我的小程序卡片`,
// imageUrl: that.shareCanvasImg, path: url,
// success: function (res) { imageUrl: that.shareCanvasImg,
// wx.showToast({ success: function (res) {
// title: '转发成功', wx.showToast({
// icon: 'success', title: '转发成功',
// duration: 1500 icon: 'success',
// }) duration: 1500
// var shareTickets = res.shareTickets })
// if (shareTickets.length == 0) { var shareTickets = res.shareTickets
// return false if (shareTickets.length == 0) {
// } return false
// }, }
// fail: function (res) { },
// // 转发失败 fail: function (res) {
// } // 转发失败
// } }
}
}, },
onLoad(e) { onLoad(e) {
@ -456,27 +456,6 @@
} }
}, },
// getUid() {
// let that = this
// that.$get({
// url: service.account,
// data: {
// openid: wx.getStorageSync('openid')
// }
// }, {
// success: ({
// code,
// data
// }) => {
// // console.log(data)
// that.extraData = {
// 'uid': data.uid
// }
// that.$apply()
// }
// })
// }
methods: { methods: {
// getorderDetail() { // getorderDetail() {
// let that = this // let that = this
@ -545,7 +524,7 @@
if (!wx.getStorageSync('mobile')) { if (!wx.getStorageSync('mobile')) {
vm.isShowIphoneBtn = true vm.isShowIphoneBtn = true
} }
if (data.is_complete_profile != 1) { if (!data.is_complete_profile) {
this.modalName = 'ModalEdit' this.modalName = 'ModalEdit'
return return
} }
@ -576,54 +555,55 @@
// var recordTime = String(parseFloat(new Date(repTime).getTime()) / 1000) // var recordTime = String(parseFloat(new Date(repTime).getTime()) / 1000)
// self.UID = recordTime.substring(recordTime.length - 5) + String(data.id) // self.UID = recordTime.substring(recordTime.length - 5) + String(data.id)
wx.setStorageSync('UID', self.UID) wx.setStorageSync('UID', self.UID)
self.shareConfig.images[1].url = data.user_share_qrcode || 'https://local-pictures.oss-cn-shenzhen.aliyuncs.com/202409/12/1726111703932.img' self.shareConfig.images[1].url = data.share_qrcode
// self.posterConfig = self.shareConfig self.posterConfig = self.shareConfig
// console.log(self.posterConfig, '333===0999') console.log(self.posterConfig, '333===0999')
// // self.$nextTick(() => { self.$nextTick(() => {
// setTimeout(() => { setTimeout(() => {
// console.log(self.$wx.selectComponent('#poster'), self.$refs.poster, '---99') self.$wx.selectComponent('#poster').onCreate(true, self)
// self.$wx.selectComponent('#poster').onCreate(true) }, 100)
// console.log('9878733') })
// }, 500) // 小程序分享
// // }) self.title = `我是"${data.user.nickname}"，这是我的小程序卡片`
// // 小程序分享 console.log(self.title, 'title===')
// self.title = `我是"${data.user.nickname}"，这是我的小程序卡片` if (data.user.photo || data.user.avatar) {
// if (data.user.photo || data.user.avatar) { let year = '', city = '', degree = '', industry_sub = ''
// let year = '', city = '', degree = '', industry_sub = '' if (data.birthday) {
// if (data.profile_courtship.birthday) { year = data.birthday.slice(2, 4) + '年'
// year = data.profile_courtship.birthday.slice(2, 4) + '年' }
// } if (data.city) {
// if (data.profile_courtship.city) { city = data.city
// city = data.profile_courtship.city }
// } if (data.degree) {
// if (data.profile_courtship.degree) { degree = data.degree
// degree = data.profile_courtship.degree }
// } if (data.industry_sub) {
// if (data.industry_sub) { industry_sub = data.industry_sub
// industry_sub = data.industry_sub }
// } console.log(year, city, degree, industry_sub)
// console.log(year, city, degree, industry_sub) self.shareConfig1.texts[0].text = `${year} | ${city}`
// self.shareConfig1.texts[0].text = `${year} | ${city}` self.shareConfig1.texts[1].text = `${degree} | ${industry_sub}`
// self.shareConfig1.texts[1].text = `${degree} | ${industry_sub}` self.shareConfig1.images[0].url = data.user.photo || data.user.avatar
// self.shareConfig1.images[0].url = data.photo || data.avatar self.posterConfig1 = self.shareConfig1
// self.posterConfig1 = self.shareConfig1 self.$nextTick(() => {
// self.$nextTick(() => { setTimeout(() => {
// setTimeout(() => { console.log(self.posterConfig1, 'posterConfig1=')
// self.$wx.selectComponent('#posterV1').onCreate(true, self.$wx) self.$wx.selectComponent('#posterV1').onCreate(true, self)
// }, 100) }, 100)
// }) })
// } else { } else {
// // 重新获取分享码 // 重新获取分享码
// self.$showToast('分享图片获取失败') self.$showToast('分享图片获取失败')
// } }
console.log(self.posterConfig1, '7777') console.log(self.posterConfig1, '7777')
this.init = true this.init = true
this.user = data.user this.user = data.user
this.user.rank_id = data.rank_profile.rank_id this.user.rank_id = data.rank_profile.rank_id
this.user.deadline = data.rank_profile.deadline
// this.user.card_num = data.approve_profile.card_num // this.user.card_num = data.approve_profile.card_num
this.user.is_approved = data.approve_profile.is_approved this.user.is_approved = data.approve_profile.is_approved
this.user.is_real_approved = data.approve_profile.is_real_approved this.user.is_real_approved = data.approve_profile.is_real_approved
this.user.is_photo_audited = data.approve_profile.is_photo_audited this.user.is_photo_audited = data.is_photo_audited
// this.user.name = data.approve_profile.name // this.user.name = data.approve_profile.name
this.listCount = { this.listCount = {
friend_count: data.friend_count, friend_count: data.friend_count,
@ -631,6 +611,7 @@
follow_count: data.follow_count, follow_count: data.follow_count,
preview_count: data.preview_count preview_count: data.preview_count
} }
console.log(this.user, 'user===')
// this.is_profile = data.is_other_profile // this.is_profile = data.is_other_profile
this.is_photo_audited = data.approve_profile.is_photo_audited this.is_photo_audited = data.approve_profile.is_photo_audited
this.title = `我是"${data.nickname}"，这是我的小程序卡片` this.title = `我是"${data.nickname}"，这是我的小程序卡片`
@ -735,6 +716,11 @@
console.log(url, text) console.log(url, text)
let titles = ['好友', '关注', '粉丝', '访客'], {is_base_info} = app.globalData, let titles = ['好友', '关注', '粉丝', '访客'], {is_base_info} = app.globalData,
vm = this, {id} = wx.getStorageSync('userInfo') vm = this, {id} = wx.getStorageSync('userInfo')
// 校验是否完成注册资料
// if (!vm.$signInVerify()) {
// vm.loginShow = true
// return
// }
if (titles.includes(text) && !is_base_info) { if (titles.includes(text) && !is_base_info) {
vm.showVisitorModel = true vm.showVisitorModel = true
return return
@ -786,21 +772,25 @@
url: `/pages/party/SpellGroupOrder?order_id=${id}` url: `/pages/party/SpellGroupOrder?order_id=${id}`
}) })
}, },
loginDialogShow() { hiddenLogin() {
let vm = this let vm = this
wepy.$instance.pageLogin().then((data) => {
vm.token = data.token
vm.loginShow = false vm.loginShow = false
vm.page = 1
vm.onShow()
})
}
},
events: {
'modalValue': (value) => { // 搜索返回值
this.loginShow = true
} }
// loginDialogShow() {
// let vm = this
// wepy.$instance.pageLogin().then((data) => {
// vm.token = data.token
// vm.loginShow = false
// vm.page = 1
// vm.onShow()
// })
// }
} }
// events: {
// 'modalValue': (value) => { // 搜索返回值
// this.loginShow = true
// }
// }
}) })
</script> </script>
@ -1499,7 +1489,8 @@
loginTips: '~@/components/loginTips', loginTips: '~@/components/loginTips',
chooseImageTips: '~@/components/chooseImageTips', chooseImageTips: '~@/components/chooseImageTips',
shareComponent: '~@/components/shareComponent', shareComponent: '~@/components/shareComponent',
poster: "plugin://FL-plugin/poster" poster: "plugin://FL-plugin/poster",
loginDialog: '~@/components/loginDialog',
} }
} }
</config> </config>

10
src/pages/users/ImageCropper.wpy
View File

@ -96,8 +96,12 @@
prevPage = pages[pages.length - 2] prevPage = pages[pages.length - 2]
} }
if (prevPage) { if (prevPage) {
prevPage.setData({photo: photo}) let dataV1 = prevPage.data.photo
prevPage.onShow({photo: photo}) console.log(dataV1, '34===')
dataV1 = photo
prevPage.setData({photo: dataV1})
prevPage.onShow({photo: dataV1})
wx.setStorageSync('baseImage', dataV1)
} }
wx.navigateBack({ wx.navigateBack({
delta: 1 delta: 1
@ -156,7 +160,7 @@
let data = { let data = {
photo: path photo: path
} }
this.$put({url: `${service.user}/photo`, data}).then(({code, data}) => { this.$put({url: `${service.host}/user/register/profile`, data}).then(({code, data}) => {
this.$Toast_success('上传成功') this.$Toast_success('上传成功')
this.$gotoBack(1) this.$gotoBack(1)
}).finally(() => { }).finally(() => {

22
src/pages/users/artificial.wpy
View File

@ -14,7 +14,7 @@
</view> </view>
</view> </view>
<view style="height: {{navHeight}}px"></view> <view style="height: {{navHeight}}px"></view>
<view v-if="is_real_approved == -1" style="height: 112rpx"></view> <view v-if="is_real_approved == 0" style="height: 112rpx"></view>
<view class="artificialBox"> <view class="artificialBox">
<view class="shootingText font_30 bold">请拍摄上传手持身份证照</view> <view class="shootingText font_30 bold">请拍摄上传手持身份证照</view>
<view> <view>
@ -24,7 +24,7 @@
<view class="auditIconBox"> <view class="auditIconBox">
<image class="auditIcon" src="https://images.ufutx.com/202104/12/c8a405728facde60462c5530fc9813a9.png" mode="widthFix"></image> <image class="auditIcon" src="https://images.ufutx.com/202104/12/c8a405728facde60462c5530fc9813a9.png" mode="widthFix"></image>
<view class="font_30" v-if="is_real_approved == 2">正在审核中</view> <view class="font_30" v-if="is_real_approved == 2">正在审核中</view>
<view class="font_30" v-if="is_real_approved == -1">审核失败，请重新上传</view> <view class="font_30" v-if="is_real_approved == 0">审核失败，请重新上传</view>
</view> </view>
</block> </block>
</view> </view>
@ -38,7 +38,7 @@
<view class="auditIconBox"> <view class="auditIconBox">
<image class="auditIcon" src="https://images.ufutx.com/202104/12/c8a405728facde60462c5530fc9813a9.png" mode="widthFix"></image> <image class="auditIcon" src="https://images.ufutx.com/202104/12/c8a405728facde60462c5530fc9813a9.png" mode="widthFix"></image>
<view class="font_24" v-if="is_real_approved == 2">正在审核中</view> <view class="font_24" v-if="is_real_approved == 2">正在审核中</view>
<view class="font_24" v-if="is_real_approved == -1">审核失败，请重新上传</view> <view class="font_24" v-if="is_real_approved == 0">审核失败，请重新上传</view>
</view> </view>
</view> </view>
</view> </view>
@ -50,7 +50,7 @@
<view class="auditIconBox"> <view class="auditIconBox">
<image class="auditIcon" src="https://images.ufutx.com/202104/12/c8a405728facde60462c5530fc9813a9.png" mode="widthFix"></image> <image class="auditIcon" src="https://images.ufutx.com/202104/12/c8a405728facde60462c5530fc9813a9.png" mode="widthFix"></image>
<view class="font_24" v-if="is_real_approved == 2">正在审核中</view> <view class="font_24" v-if="is_real_approved == 2">正在审核中</view>
<view class="font_24" v-if="is_real_approved == -1">审核失败，请重新上传</view> <view class="font_24" v-if="is_real_approved == 0">审核失败，请重新上传</view>
</view> </view>
</view> </view>
</view> </view>
@ -68,7 +68,7 @@
</view> </view>
<view class="submitButton font_30 {{showSubmit?'actionSubmit':''}}" @tap="request" v-if="!audit">提交认证</view> <view class="submitButton font_30 {{showSubmit?'actionSubmit':''}}" @tap="request" v-if="!audit">提交认证</view>
<view class="submitButton font_30 {{againShow?'actionSubmit':''}}" @tap="request" v-if="audit && is_real_approved != 1">重新提交</view> <view class="submitButton font_30 {{againShow?'actionSubmit':''}}" @tap="request" v-if="audit && is_real_approved != 1">重新提交</view>
<view class="font_30 text-center" style="color: #f33b6c;padding-top: 30rpx;padding-bottom: 40rpx;" @tap="redirectTo('/pages/users/realName')" v-if="audit && is_real_approved == -1">人脸识别</view> <view class="font_30 text-center" style="color: #f33b6c;padding-top: 30rpx;padding-bottom: 40rpx;" @tap="redirectTo('/pages/users/realName')" v-if="audit && is_real_approved == 0">人脸识别</view>
<view :class="{'show':modalName=='showAudit' }" class="cu-modal "> <view :class="{'show':modalName=='showAudit' }" class="cu-modal ">
<view class="audit_box"> <view class="audit_box">
<image class="audit_icon" src="https://images.ufutx.com/202101/21/be17739e07f9bb0de1c629dc0b84a505.png" mode="widthFix"></image> <image class="audit_icon" src="https://images.ufutx.com/202101/21/be17739e07f9bb0de1c629dc0b84a505.png" mode="widthFix"></image>
@ -79,7 +79,7 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="is_real_approved == -1" class="m_top_tips" style="margin-top: {{navHeight}}px;">{{approve_history_body_reason}}</view> <view v-if="is_real_approved == 0" class="m_top_tips" style="margin-top: {{navHeight}}px;">{{approve_history_body_reason}}</view>
</template> </template>
<script> <script>
@ -262,9 +262,13 @@
request() { request() {
let that = this, let that = this,
data = { data = {
chat_user_id: that.chat_user_id, photos: that.photo
photos: JSON.stringify(that.photo), }
from_user_id: wx.getStorageSync('from_user_id') ? wx.getStorageSync('from_user_id') : '' if (wx.getStorageSync('from_user_id')) {
data.from_user_id = wx.getStorageSync('from_user_id')
}
if (that.chat_user_id) {
data.chat_user_id = that.chat_user_id
} }
if (that.showSubmit || that.againShow) { if (that.showSubmit || that.againShow) {
if (!that.nodata) { if (!that.nodata) {

1
src/pages/users/blacklist.wpy
View File

@ -25,6 +25,7 @@
</view> </view>
<view class="clearfloat"></view> <view class="clearfloat"></view>
</view> </view>
</view>
<pageScroll></pageScroll> <pageScroll></pageScroll>
<block v-if="loading"> <block v-if="loading">
<view class="weui-loadmore"> <view class="weui-loadmore">

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

@ -25,7 +25,7 @@
src="{{exclusiveService}}" show-menu-by-longpress="true" src="{{exclusiveService}}" show-menu-by-longpress="true"
mode="widthFix"></image> mode="widthFix"></image>
<view class="cancel_icon_box" @tap="hideModal"> <view class="cancel_icon_box" @tap="hideModal">
<view class="font_family icon-off white font_48"></view> <view style="font-size: 24px" class="font_family cuIcon-roundclose white"></view>
</view> </view>
<view class="m_photo f-fcc"> <view class="m_photo f-fcc">
<view class="reason_prompt font_32 color333" style="width: 90%;font-weight: 400;">长按识别二维码，联系客服 <view class="reason_prompt font_32 color333" style="width: 90%;font-weight: 400;">长按识别二维码，联系客服

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

@ -249,7 +249,7 @@ wepy.page({
content: '是否确认删除该好友', content: '是否确认删除该好友',
success: function (res) { success: function (res) {
if (res.confirm) { if (res.confirm) {
than.$delete({url: service.addFriend + '/' + id}).then(({code, data}) => { than.$delete({url: service.host + '/friend/user/' + id}).then(({code, data}) => {
than.$showToast('删除成功') than.$showToast('删除成功')
than.list.splice(index, 1) than.list.splice(index, 1)
if (than.list.length == 0) { if (than.list.length == 0) {

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

@ -26,7 +26,7 @@
<view class="audit_photo_box"> <view class="audit_photo_box">
<view class="cancel_icon_box" @tap="hideModal1"> <view class="cancel_icon_box" @tap="hideModal1">
<!-- <image src="https://images.ufutx.com/202012/21/7bc531d74f41cce95ede5582232fd2f3.png" mode="widthFix" class="cancel_icon"></image> --> <!-- <image src="https://images.ufutx.com/202012/21/7bc531d74f41cce95ede5582232fd2f3.png" mode="widthFix" class="cancel_icon"></image> -->
<view class="font_family icon-off white font_48"></view> <view style="font-size: 24px" class="font_family cuIcon-roundclose white"></view>
</view> </view>
<view style="text-align: center"> <view style="text-align: center">
<view class="_bgModal"> <view class="_bgModal">

8
src/pages/users/myCertification.wpy
View File

@ -24,8 +24,8 @@
</block> </block>
<block v-if="!state"> <block v-if="!state">
<view class="certification_button flo_r"> <view class="certification_button flo_r">
<view class="jump_button text-center font_28" v-if="is_real_approved==0">去认证</view> <view class="jump_button text-center font_28" v-if="is_real_approved==3">去认证</view>
<block v-if="is_real_approved==-1"> <block v-if="is_real_approved==0">
<view class="jump_button text-center font_28" style="width: 152rpx">重新认证</view> <view class="jump_button text-center font_28" style="width: 152rpx">重新认证</view>
<image class="failure_icon" src="https://images.ufutx.com/202101/20/a42a33b3d6c901685adc8c2b8bedf7b4.png" mode="widthFix"></image> <image class="failure_icon" src="https://images.ufutx.com/202101/20/a42a33b3d6c901685adc8c2b8bedf7b4.png" mode="widthFix"></image>
</block> </block>
@ -43,8 +43,8 @@
</block> </block>
<block v-else> <block v-else>
<view class="certification_button flo_r"> <view class="certification_button flo_r">
<view class="jump_button text-center font_28" v-if="stateV2 == 0">去认证</view> <view class="jump_button text-center font_28" v-if="stateV2 == 3">去认证</view>
<view class="audit_state_box" v-if="stateV2 != 0"> <view class="audit_state_box" v-if="stateV2 != 3">
<image class="audit_icon" src="https://images.ufutx.com/202101/20/3be02213104c9adba8ae30feb779d873.png" mode="widthFix"></image> <image class="audit_icon" src="https://images.ufutx.com/202101/20/3be02213104c9adba8ae30feb779d873.png" mode="widthFix"></image>
<span class="font_28 color-999">审核中</span> <span class="font_28 color-999">审核中</span>
</view> </view>

104
src/pages/users/myDynamic.wpy
View File

@ -1,7 +1,7 @@
<template> <template>
<view class="myDynamic" style="height: 100vh;"> <view class="myDynamic" style="height: 100vh;">
<scroll-view scroll-y refresher-enabled="{{true}}" style="height: 100vh;" refresher-triggered="{{triggered}}" bindrefresherpulling="onPulling" bindrefresherrefresh="onRefresh" bindscrolltolower="handleScroll" lower-threshold="50"> <scroll-view scroll-y refresher-enabled="{{true}}" style="height: 100vh;" refresher-triggered="{{triggered}}" bindrefresherpulling="onPulling" bindrefresherrefresh="onRefresh" bindscrolltolower="handleScroll" lower-threshold="50">
<!-- <dynamicList ref="dynamicList" :dataList.sync="list" :gifurl.sync="gifurl" :_index.sync="_index" :modalName.sync="modalName" :del.sync="del"></dynamicList>--> <dynamicList :dynamicList="dynamicList" @changeSelect="changeSelect" :from="'dynamic'"></dynamicList>
<view v-if="hideMessage" class="text-center"> <view v-if="hideMessage" class="text-center">
<view class="font_28 m_empty"> <view class="font_28 m_empty">
<image src="https://images.ufutx.com/202106/18/c0a2445b889165f29c14ff13a5eaa752.png" mode="aspectFit"></image> <image src="https://images.ufutx.com/202106/18/c0a2445b889165f29c14ff13a5eaa752.png" mode="aspectFit"></image>
@ -13,8 +13,8 @@
<view class="cu-modal bottom-modal {{modalName=='delete'?'show':''}}" @tap="hideModal"> <view class="cu-modal bottom-modal {{modalName=='delete'?'show':''}}" @tap="hideModal">
<view class="cu-dialog dialog" style="border-radius: 30rpx 30rpx 0rpx 0rpx;padding-bottom: 50rpx;"> <view class="cu-dialog dialog" style="border-radius: 30rpx 30rpx 0rpx 0rpx;padding-bottom: 50rpx;">
<view @tap="deleteV2">删除</view> <view @tap="deleteV2">删除</view>
<view @tap="conceal" v-if="admin == 1">隐藏动态</view> <!-- <view @tap="conceal" v-if="admin == 1">隐藏动态</view>-->
<view @tap="hotdt" v-if="admin == 1">设置为热门动态</view> <!-- <view @tap="hotdt" v-if="admin == 1">设置为热门动态</view>-->
<view @tap="hideModal">取消</view> <view @tap="hideModal">取消</view>
</view> </view>
</view> </view>
@ -27,11 +27,11 @@
import https from '../../mixins/https' import https from '../../mixins/https'
import base from '../../mixins/base' import base from '../../mixins/base'
import utils from '../../utils/util' import utils from '../../utils/util'
import {commentTimeHandle} from '../../mixins/plugins'
wepy.page({ wepy.page({
mixins: [base, https], mixins: [base, https],
data: { data: {
list: [], dynamicList: [],
user_id: '', user_id: '',
token: '', token: '',
gifurl: 'https://images.ufutx.com/202106/11/54f9a1a03d1575597c94de63caebde8c.gif', gifurl: 'https://images.ufutx.com/202106/11/54f9a1a03d1575597c94de63caebde8c.gif',
@ -42,8 +42,7 @@
collectionMessage: false, collectionMessage: false,
page: 1, page: 1,
modalName: '', modalName: '',
del: '', del: ''
dynamicList: null
}, },
computed: {}, computed: {},
@ -64,15 +63,21 @@
}, },
onPullDownRefresh() {
this.getPageData()
},
onReachBottom() {
},
methods: {
onPulling() { onPulling() {
this.triggered = true this.triggered = true
}, },
onRefresh() { onRefresh() {
this.collectionMessage = false this.collectionMessage = false
this.noMoreShow = false this.noMoreShow = false
this.hideMessage = false this.hideMessage = false
this.list = []
this.page = 1 this.page = 1
this.getPageData() this.getPageData()
}, },
@ -82,59 +87,58 @@
this.page += 1 this.page += 1
this.getPageData() this.getPageData()
}, },
onPullDownRefresh() {
this.getPageData()
},
onReachBottom() {
},
methods: {
// 初始化页面数据 // 初始化页面数据
getPageData() { getPageData() {
let _this = this let vm = this
_this.$get({ vm.$get({
url: `${service.moments}`, url: `${service.host}/moment/list/user`,
data: { data: {
page: _this.page, page: vm.page
user_id: _this.user_id
} }
}).then(({code, data}) => { }).then(({code, data}) => {
_this.triggered = false if (code === 0) {
if (data.data.length == 0 && _this.page == 1) { console.log(data, 'data===')
_this.hideMessage = true if (data.data && data.data.length > 0) {
return data.data.forEach((item, index) => {
} item.create_time = commentTimeHandle(item.create_time)
if (data.data.length == 0 && _this.page != 1) { let sty = typeof (item.photos)
_this.noMoreShow = true
_this.collectionMessage = true
return
}
if (_this.list.length != 0 && _this.page == 1) return
data.data.forEach((ele, index) => {
let phs = ele.photos
ele.created_at = utils.commentTimeHandle(ele.created_at)
let sty = typeof (ele.photos)
if (sty == 'string') { if (sty == 'string') {
ele.photos = JSON.parse(ele.photos) item.photos = JSON.parse(item.photos)
} }
if (ele.is_audited == 0 && ele.is_self == 0) { // if ((item.is_audited == 0 || item.is_audited == -1) && item.is_self == 0) {
data.data.splice(index--, 1) // data.data.splice(index--, 1)
} else if (ele.is_audited == -1 && ele.is_self == 0) { // }
data.data.splice(index--, 1) })
} }
for (var i = 0; i < ele.photos.length; i++) { if (vm.dynamicList.length === 0 || vm.page === 1) {
ele.photos[i] = ele.photos[i].replace(/\(/g, '%28').replace(/\)/g, '%29').replace(' ', '%20') vm.dynamicList = data.data
} else {
data.data.map(function (item) {
vm.dynamicList.push(item)
})
}
if (vm.dynamicList.length == 0) {
vm.hideMessage = true
}
if (vm.dynamicList.length < 15 || data.data.length < 15) {
vm.noMoreShow = true
}
console.log(vm.dynamicList, 'dynamicList=')
setTimeout(() => {
vm.loading = true
vm.triggered = false
}, 500)
} }
}) })
_this.list = [..._this.list, ...data.data] },
// this.$refs.dynamicList.textAll changeSelect(e, index) {
}) console.log(e, index, '333===')
this.del = e.id
this.modalName = 'delete'
}, },
deleteV2() { deleteV2() {
let vm = this let vm = this
let url = `${service.moments}` + '/' + this.del let url = `${service.host}` + '/moment/' + this.del + '/delete'
vm.$showLoading('加载中') vm.$showLoading('加载中')
vm.$delete({ vm.$delete({
url: url, url: url,
@ -211,7 +215,7 @@ page {
backgroundColorTop: '#f2f2f2', backgroundColorTop: '#f2f2f2',
backgroundColorBottom: '#f2f2f2', backgroundColorBottom: '#f2f2f2',
usingComponents: { usingComponents: {
<!-- dynamicList: '~@/components/dynamicList',--> dynamicList: '~@/components/dynamicList',
} }
} }
</config> </config>

227
src/pages/users/setTing.wpy
View File

@ -52,19 +52,6 @@
</block> </block>
</block> </block>
</view> </view>
<block v-if="posterConfig">
<!-- 生成海报-->
<poster type="2d" id="poster" hide-loading="{{false}}" preload="{{false}}" config="{{posterConfig}}"
bind:success="onPosterSuccess">
</poster>
<!-- 分享微信卡片-->
<poster ref="poster1" type="2d" id="poster1" hide-loading="{{false}}" preload="{{false}}" config="{{posterConfig1}}"
bind:success="onPosterSuccessWx" >
</poster>
</block>
<block v-if="!hide && posterConfig">
<shareComponent :hide.sync="hide" :shareImage.sync="invite_pic"></shareComponent>
</block>
</view> </view>
<UnlockingDialog :modalName="unlockIngModalName" @unlockingCut="unlockingCut"></UnlockingDialog> <UnlockingDialog :modalName="unlockIngModalName" @unlockingCut="unlockingCut"></UnlockingDialog>
</template> </template>
@ -87,81 +74,6 @@
rankData: { rankData: {
rank_id: 0 rank_id: 0
}, },
posterConfig: {},
shareConfig: {
width: 750,
height: 1334,
backgroundColor: '#fff',
debug: false,
texts: [],
images: [
{
url: 'https://image.fulllinkai.com/202206/20/57903775df70bd3f6ebde1b7ad00d159.png',
width: 750,
height: 1334,
y: 0,
x: 0
},
{
url: '',
width: 176,
height: 176,
y: 1102,
x: 84
}
]
},
posterConfig1: null,
shareConfig1: {
width: 420,
height: 336,
backgroundColor: '#fff',
debug: false,
texts: [
{
x: 20,
y: 248 + 26,
lineHeight: 22,
width: 200,
text: '',
fontSize: 26,
color: '#fff',
zIndex: 99
}, {
x: 20,
y: 288 + 26,
width: 200,
lineHeight: 22,
text: '',
fontSize: 26,
color: '#fff',
zIndex: 99
}
],
images: [
{
url: '',
width: 420,
height: 336,
y: 0,
x: 0
},
{
url: 'https://image.fulllinkai.com/202206/20/be5b39dde1ad4720893b2e3c52b4480d.png',
width: 420,
height: 100,
y: 236,
x: 0
},
{
url: 'https://image.fulllinkai.com/202206/20/bd732960011f55fed0e5e7d623118494.png',
width: 136,
height: 40,
y: 276,
x: 264
}
]
},
deadline: '', deadline: '',
title: '', title: '',
phoneNumber: '', phoneNumber: '',
@ -197,11 +109,6 @@
type: 'navigateTo', type: 'navigateTo',
path: '/pages/users/groupList' path: '/pages/users/groupList'
}, },
// {
// title: '分享我的卡片',
// type: 'modal',
// path: ''
// },
{ {
title: '授权设置', title: '授权设置',
type: 'navigateTo', type: 'navigateTo',
@ -224,11 +131,7 @@
} }
], ],
[ [
// {
// title: '每日推荐提醒',
// type: 'navigateTo',
// path: ''
// },
{ {
title: '聊天消息提醒', title: '聊天消息提醒',
type: 'navigateTo', type: 'navigateTo',
@ -239,11 +142,7 @@
type: 'navigateTo', type: 'navigateTo',
path: '' path: ''
} }
// {
// title: '夸夸我',
// type: 'navigateTo',
// path: ''
// }
], ],
[ [
{ {
@ -267,67 +166,7 @@
] ]
}, },
watch: { watch: {
// user() {
// console.log(this.user.type)
// for (let item of this.StateList) {
// if (item.type == this.user.type) {
// item.active = true
// this.StateText = item.title
// } else {
// item.active = false
// }
// }
// this.user.deadline = this.user.deadline ? this.user.deadline.split(' ')[0] : ''
// console.log(this.user.deadline)
// this.Image = this.user.avatar
// if (this.user.deadline != null) {
// this.deadline = this.user.deadline
// } else {
// this.deadline = ''
// }
// },
// pic() {
// console.log(this.pic)
// },
// phoneNumber(mebile) {
// console.log(mebile)
// let reg = /^(\d{3})\d*(\d{4})$/
// this.phoneNumber = mebile.replace(reg, '$1****$2')
// }
},
onShareAppMessage(res) {
let that = this
let openid = wx.getStorageSync('openid')
let fromUserID = wx.getStorageSync('user_id')
let type = wx.getStorageSync('type')
let url = ''
if (type === 'marriage') {
url = `/pages/home/informationV2?id=${fromUserID}&from_openid=${openid}&share_user_id=${fromUserID}&from_user_id=${fromUserID}`
} else {
url = `/pages/home/information?id=${fromUserID}&from_openid=${openid}&share_user_id=${fromUserID}&from_user_id=${fromUserID}`
}
console.log(url)
console.log(that.shareCanvasImg, '分享海报')
return {
title: that.title,
path: url,
imageUrl: that.shareCanvasImg,
success: function (res) {
wx.showToast({
title: '转发成功',
icon: 'success',
duration: 1500
})
var shareTickets = res.shareTickets
if (shareTickets.length == 0) {
return false
}
},
fail: function (res) {
// 转发失败
}
}
}, },
onShow() { onShow() {
this.versions = app.globalData.versions this.versions = app.globalData.versions
@ -336,7 +175,6 @@
onLoad() { onLoad() {
this.system = app.globalData.systemInfo.system.split(' ')[0] this.system = app.globalData.systemInfo.system.split(' ')[0]
}, },
methods: { methods: {
vipData() { vipData() {
this.$get({url: service.host + '/user/center'}).then(({code, data}) => { this.$get({url: service.host + '/user/center'}).then(({code, data}) => {
@ -349,58 +187,7 @@
this.init = true this.init = true
this.user = data this.user = data
this.phoneNumber = wx.getStorageSync('mobile') this.phoneNumber = wx.getStorageSync('mobile')
let vm = this, let vm = this
my_qrcode = wx.getStorageSync('my_qrcode')
// if (my_qrcode) {
// vm.shareConfig.images[1].url = my_qrcode
// setTimeout(() => {
// vm.posterConfig = vm.shareConfig
// vm.$wxpage.selectComponent('#poster').onCreate(true)
// }, 500)
// }
// this.title = `我是"${data.nickname}"，这是我的小程序卡片`
// if (data.photo || data.avatar) {
// let year = '', city = '', degree = '', industry_sub = ''
// if (data.profile_courtship.birthday) {
// year = data.profile_courtship.birthday.slice(2, 4) + '年'
// }
// if (data.profile_courtship.city) {
// city = data.profile_courtship.city
// }
// if (data.profile_courtship.degree) {
// degree = data.profile_courtship.degree
// }
// if (data.industry_sub) {
// industry_sub = data.industry_sub
// }
// console.log(year, city, degree, industry_sub)
// vm.shareConfig1.texts[0].text = `${year} | ${city}`
// vm.shareConfig1.texts[1].text = `${degree} | ${industry_sub}`
// vm.shareConfig1.images[0].url = data.photo || data.avatar
// setTimeout(() => {
// vm.posterConfig1 = vm.shareConfig1
// // vm.$refs.poster1.onCreate(true)
// }, 500)
// }
// if (data.type == 'marriage') {
// this.list.splice(4)
// this.listV2 = [
// {
// icon: 'http://images.ufutx.com/201906/06/d9c45bb3869b616189ac0723887928ad.png',
// title: '分享给好友',
// type: 'navigateTo',
// subhead: '获得更多的祝福',
// path: '/pages/users/myShare'
// },
// {
// icon: 'http://images.ufutx.com/201906/06/0059f55a19360df71f84b8d90d265f54.png',
// title: '使用反馈',
// type: 'navigateTo',
// subhead: '共同维护福恋',
// path: '/pages/users/feedback'
// }
// ]
// }
vm.vipData() vm.vipData()
wx.setStorageSync('type', data.type) wx.setStorageSync('type', data.type)
}) })
@ -503,10 +290,10 @@
goto(url, title) { goto(url, title) {
console.log(this.hide, 'url====') console.log(this.hide, 'url====')
if (title == '分享我的卡片') { // if (title == '分享我的卡片') {
this.hide = false // this.hide = false
return // return
} // }
if (title == '授权设置') { if (title == '授权设置') {
wx.openSetting({ wx.openSetting({
success(res) { success(res) {

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

@ -889,7 +889,7 @@
<view class="audit_photo_box bg_f" style="border-radius: 32rpx;padding: 22rpx;"> <view class="audit_photo_box bg_f" style="border-radius: 32rpx;padding: 22rpx;">
<image style="width: 380rpx;height: auto;margin: 22rpx;" src="https://image.fulllinkai.com/202204/14/2c8b0665f901bd2e3b1b7afafd0629c3.png" mode="widthFix"></image> <image style="width: 380rpx;height: auto;margin: 22rpx;" src="https://image.fulllinkai.com/202204/14/2c8b0665f901bd2e3b1b7afafd0629c3.png" mode="widthFix"></image>
<view class="cancel_icon_box" @tap="hideModalV2"> <view class="cancel_icon_box" @tap="hideModalV2">
<view class="font_family icon-off white font_48" style="font-size: 52rpx;"></view> <view class="font_family cuIcon-roundclose white" style="font-size: 52rpx;"></view>
</view> </view>
<view class="m_photo f-fcc"> <view class="m_photo f-fcc">
<view class="reason_prompt font_32 color333" style="width: 90%;font-weight: 400;">更换头像将重新审核，确定仍要更换成为未认证状态吗？</view> <view class="reason_prompt font_32 color333" style="width: 90%;font-weight: 400;">更换头像将重新审核，确定仍要更换成为未认证状态吗？</view>
@ -1198,7 +1198,6 @@
let vm = this let vm = this
if (!vm.mylibs.can_get_daily_rank) { if (!vm.mylibs.can_get_daily_rank) {
vm.modalName = 'prompt' vm.modalName = 'prompt'
return return
} }
vm.$showLoading('领取中...') vm.$showLoading('领取中...')

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

@ -17,7 +17,7 @@
</block> </block>
</view> </view>
<view class="font_24 white flo_l" style="color: #f7e4ad;width: 70%; "> <view class="font_24 white flo_l" style="color: #f7e4ad;width: 70%; ">
{{user.rank_deadline?user.rank_deadline+'到期':'未激活'}} {{user.deadline?user.deadline+'到期':'未激活'}}
</view> </view>
<swiper class="card-swiper" circular="true" bindchange="cardSwiper"> <swiper class="card-swiper" circular="true" bindchange="cardSwiper">
<swiper-item v-for="(item,index) in rankList" :key="index" class="{{cardCur==index?'cur':''}}" @tap="showFn(index)"> <swiper-item v-for="(item,index) in rankList" :key="index" class="{{cardCur==index?'cur':''}}" @tap="showFn(index)">
@ -351,8 +351,8 @@
let data = {} let data = {}
data = { data = {
sub_rank_id: this.payData.payId, sub_rank_id: this.payData.payId,
chat_user_id: this.chat_user_id, // chat_user_id: this.chat_user_id,
share_type: this.share_type, // share_type: this.share_type,
pay_type: this.wxPayShow pay_type: this.wxPayShow
} }
that.$post({url: url, data}).then(({code, data}) => { that.$post({url: url, data}).then(({code, data}) => {

28
src/pages/users/upgradeVIP2.wpy
View File

@ -17,7 +17,7 @@
</block> </block>
</view> </view>
<view class="font_24 white flo_l" style="color: #f7e4ad;width: 70%; "> <view class="font_24 white flo_l" style="color: #f7e4ad;width: 70%; ">
{{user.rank_deadline?user.rank_deadline+'到期':'未开通'}} {{user.deadline?user.deadline+'到期':'未开通'}}
</view> </view>
<swiper class="card-swiper" circular="true" previous-margin="1px" bindchange="cardSwiper" current="{{cardCur}}"> <swiper class="card-swiper" circular="true" previous-margin="1px" bindchange="cardSwiper" current="{{cardCur}}">
<swiper-item v-for="(item,index) in rankList" :key="index" class="{{cardCur==index?'cur':''}}" @tap="showFn(index)"> <swiper-item v-for="(item,index) in rankList" :key="index" class="{{cardCur==index?'cur':''}}" @tap="showFn(index)">
@ -333,10 +333,10 @@
this.cardCur = e.$wx.detail.current this.cardCur = e.$wx.detail.current
this.shareText = this.rankList[e.$wx.detail.current].title this.shareText = this.rankList[e.$wx.detail.current].title
this.sharePic = this.rankList[e.$wx.detail.current].pic this.sharePic = this.rankList[e.$wx.detail.current].pic
if (this.active == 1) { // if (this.active == 1) {
console.log(this.cardCur) console.log(this.cardCur)
this.specialVIP = this.rankList[this.cardCur] this.specialVIP = this.rankList[this.cardCur]
} // }
clearTimeout(this.timeID) clearTimeout(this.timeID)
this.timeID = setTimeout(() => { this.timeID = setTimeout(() => {
this.shareId = this.rankList[this.cardCur].id this.shareId = this.rankList[this.cardCur].id
@ -396,20 +396,20 @@
that.modalName = '' that.modalName = ''
that.$showLoading('支付中...') that.$showLoading('支付中...')
let data = {} let data = {}
if (that.active == 1) { // if (that.active == 1) {
data = { data = {
chat_user_id: this.chat_user_id, // chat_user_id: this.chat_user_id,
other_user_id: this.other_user_id, // other_user_id: this.other_user_id,
pay_type: this.wxPayShow pay_type: this.wxPayShow
} }
} else { // } else {
data = { // data = {
sub_rank_id: this.payData.payId, // sub_rank_id: this.payData.payId,
chat_user_id: this.chat_user_id, // chat_user_id: this.chat_user_id,
other_user_id: this.other_user_id, // other_user_id: this.other_user_id,
pay_type: this.wxPayShow // pay_type: this.wxPayShow
} // }
} // }
that.$post({url: url, data}).then(({code, data}) => { that.$post({url: url, data}).then(({code, data}) => {
that.trade_no = data.trade_no that.trade_no = data.trade_no
if (data.wx_pay.length == 0) { if (data.wx_pay.length == 0) {