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 14:14:59 +08:00
commit a67f082939
9 changed files with 45 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/shareComponent.wpy
View File

@ -98,7 +98,7 @@ wepy.component({
methods: {
saveImageToPhotosAlbum(img) {
let vm = this
wepy.saveImageToPhotosAlbum({
wx.saveImageToPhotosAlbum({
filePath: img,
success: (res) => {
console.log(res, '成功')
@ -178,10 +178,10 @@ wepy.component({
vm.$emit('hideShare', vm.hide)
if (vm.shareImage.includes('com')) {
console.log('带com的网络路径')
wepy.downloadFile({
wx.downloadFile({
url: vm.shareImage,
success: (res) => {
wepy.saveImageToPhotosAlbum({
wx.saveImageToPhotosAlbum({
filePath: res.tempFilePath,
success: (res) => {
wx.hideLoading()
@ -199,7 +199,7 @@ wepy.component({
})
} else {
console.log('不带com的本地路径')
wepy.saveImageToPhotosAlbum({
wx.saveImageToPhotosAlbum({
filePath: vm.shareImage,
success: (res) => {
wx.hideLoading()
@ -224,7 +224,7 @@ wepy.component({
})
if (vm.shareImage.includes('com')) {
console.log('带com的网络路径')
wepy.downloadFile({
wx.downloadFile({
url: vm.shareImage,
success: (res) => {
vm.saveImageToPhotosAlbum(res.tempFilePath)

2
src/pages/news/friendRequest.wpy
View File

@ -379,7 +379,7 @@ page {
<!-- <block v-if="item.user.type !== 'single'">-->
<!-- <image class="referencesIcon" src="https://image.fulllinkai.com/202207/15/7e78a1dd367f1250d4cba4e85bfd60f1.png" mode="widthFix"></image>-->
<!-- </block>-->
<view class="font_24 time">{{ item.update_time }}</view>
<view class="font_24 time">{{ item.create_time }}</view>
<block v-if="item.user.type == 'single'">
<image v-if="item.user.rank_id == 0" class="Vip flo_l bg-img" src="https://images.ufutx.com/202102/04/bfad7e2a8e86cf7912ff280234a35606.png"></image>
<image v-else class="Vip flo_l bg-img" src="https://images.ufutx.com/202102/04/d0913df8b234057229ab3dd102497a50.png"></image>

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

@ -95,13 +95,12 @@
if (pages.length >= 2) {
prevPage = pages[pages.length - 2]
}
if (prevPage) {
let dataV1 = prevPage.data.photo
console.log(dataV1, '34===')
dataV1 = photo
prevPage.setData({photo: dataV1})
prevPage.onShow({photo: dataV1})
wx.setStorageSync('baseImage', dataV1)
prevPage.$wepy.photo = photo
// prevPage.onShow({photo: photo})
} else {
wx.setStorageSync('baseImage', photo)
}
wx.navigateBack({
delta: 1

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

@ -14,8 +14,8 @@
{{item.nickname}}
</view>
<view class="f-fbc font_28 flo_l ellipsis_1 {{item.sex == 1?'sel':''}}" style="margin-left: 6rpx;margin-top: 2rpx;">
<image src="https://image.fulllinkai.com/202203/31/16b4d694cff517e9b19de2049f5d9014.png" mode="aspectFit" v-if="item.sex == 1" style="width: 38rpx;height: 38rpx;" class="flo_l"></image>
<image src="https://image.fulllinkai.com/202203/31/9651c04ff1b8aac351e71a7014fbf3aa.png" mode="aspectFit" v-else style="width: 38rpx;height: 38rpx;" class="flo_l"></image>
<image src="https://images.ufutx.com/202103/23/3e7ac93e7bff26a9b62fe3232c776a96.png" mode="aspectFit" v-if="item.sex == 1" style="width: 38rpx;height: 38rpx;" class="flo_l"></image>
<image src="https://images.ufutx.com/202103/23/4fd7a85e7073152fde91190b8957910e.png" mode="aspectFit" v-else style="width: 38rpx;height: 38rpx;" class="flo_l"></image>
</view>
<view class="inline-block initStyle font_20" v-if="item.hidden_profile !== 'NONE'">资料已关闭</view>
</view>

4
src/pages/users/myOrderList.wpy
View File

@ -17,11 +17,11 @@
<view class="f-fdc f-fbc" style="flex: 1;align-items: flex-start;height: 100%;">
<view>
<view class="font_28 flo_l color-333 ellipsis_2 bold" style="width: 326rpx;word-break: break-all;line-height: 38rpx">{{ item.goods }}</view>
<view class="font_24 color-666 ellipsis_1" style="width: 326rpx;padding-top: 4rpx">规格：{{item.rank_name}}</view>
<view class="font_24 color-666 ellipsis_1" style="width: 326rpx;padding-top: 4rpx">规格：{{item.name}}</view>
</view>
<view class="fong_28 color-theme bold">¥{{item.price}}</view>
</view>
<view class="viewOrderBtn f-fcc font_26" @tap="goto('/pages/users/orderDetails?trade_no={{item.trade_no}}')">查看订单</view>
<view class="viewOrderBtn f-fcc font_26" @tap="goto(`/pages/users/orderDetails?id=${item.id}`)">查看订单</view>
</view>
</view>
<view v-if="hideMessage" class="text-center">

12
src/pages/users/orderDetails.wpy
View File

@ -47,14 +47,15 @@
wepy.page({
mixins: [base, https],
data: {
trade_no: '',
id: '',
order_type: '',
orderData: {},
modalName: ''
},
async onLoad(e) {
this.trade_no = e.trade_no
console.log(e, 'e===')
this.id = e.id
this.order_type = e.order_type
this.getTradeNo()
},
@ -64,11 +65,10 @@
methods: {
getTradeNo() {
var data = {
order_type: this.order_type
}
let that = this
console.log(that.id, 'id===')
this.$showLoading('加载中')
this.$get({url: `${service.host}/activity/order/by/no/${this.trade_no}`, data}).then(({code, data}) => {
this.$get({url: `${service.host}/order/rank/${that.id}/detail`}).then(({code, data}) => {
console.log(data)
this.orderData = data
wx.hideLoading()

4
src/pages/users/schools.wpy
View File

@ -52,8 +52,8 @@
let data = prevPage.data.school
console.log(prevPage, 'prevPage---')
data = e.$wx.currentTarget.dataset.title
prevPage.setData({school: data})
prevPage.onShow({school: data})
prevPage.$wepy.school = data
// prevPage.onShow({school: data})
wx.navigateBack({
delta: 1
})

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

@ -797,6 +797,12 @@
<span style="margin-right: 12rpx;">{{mylibs.city || '--'}}</span>
</view>
</view>
<view class="u_bas">
<view class="m_basLst f-fbc">
<span class="font_28 color-333 bold">籍贯</span>
<span style="margin-right: 12rpx;">{{mylibs.resident_city || '--'}}</span>
</view>
</view>
<view class="u_bas">
<view class="m_basLst f-fbc">
<span class="font_28 color-333 bold">职业</span>
@ -809,6 +815,18 @@
<span style="margin-right: 12rpx;">{{mylibs.income || '--'}}</span>
</view>
</view>
<view class="u_bas">
<view class="m_basLst f-fbc">
<span class="font_28 color-333 bold">信仰</span>
<span style="margin-right: 12rpx;">{{mylibs.belief || '--'}}</span>
</view>
</view>
<view class="u_bas">
<view class="m_basLst f-fbc">
<span class="font_28 color-333 bold">期望对方</span>
<span style="margin-right: 12rpx;">{{mylibs.marry_by_time || '--'}}</span>
</view>
</view>
</view>
</view>
</view>

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

@ -180,10 +180,10 @@
this.rankList = []
this.system = app.globalData.systemInfo.system.split(' ')[0]
console.log(this.system, '2224')
// if (this.system == 'iOS') {
// this.$redirectTo(`/pages/users/upgradeVIP2?chat_user_id=${this.chat_user_id}`)
// return
// }
if (this.system == 'iOS') {
this.$redirectTo(`/pages/users/upgradeVIP2?chat_user_id=${this.chat_user_id}`)
return
}
// share_type
console.log(this.system)
this.getPageData()