diff --git a/src/components/shareComponent.wpy b/src/components/shareComponent.wpy index 2769cab..8f3ee44 100644 --- a/src/components/shareComponent.wpy +++ b/src/components/shareComponent.wpy @@ -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) diff --git a/src/pages/news/friendRequest.wpy b/src/pages/news/friendRequest.wpy index bbd449a..300c29c 100644 --- a/src/pages/news/friendRequest.wpy +++ b/src/pages/news/friendRequest.wpy @@ -379,7 +379,7 @@ page { - {{ item.update_time }} + {{ item.create_time }} diff --git a/src/pages/users/ImageCropper.wpy b/src/pages/users/ImageCropper.wpy index fa75be8..04c7e86 100644 --- a/src/pages/users/ImageCropper.wpy +++ b/src/pages/users/ImageCropper.wpy @@ -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 diff --git a/src/pages/users/friendlist.wpy b/src/pages/users/friendlist.wpy index 5ccfce9..2f378b7 100644 --- a/src/pages/users/friendlist.wpy +++ b/src/pages/users/friendlist.wpy @@ -14,8 +14,8 @@ {{item.nickname}} - - + + 资料已关闭 diff --git a/src/pages/users/myOrderList.wpy b/src/pages/users/myOrderList.wpy index a89d325..d15fc08 100644 --- a/src/pages/users/myOrderList.wpy +++ b/src/pages/users/myOrderList.wpy @@ -17,11 +17,11 @@ {{ item.goods }} - 规格：{{item.rank_name}} + 规格：{{item.name}} ¥{{item.price}} - 查看订单 + 查看订单 diff --git a/src/pages/users/orderDetails.wpy b/src/pages/users/orderDetails.wpy index 2aa40fc..69651c0 100644 --- a/src/pages/users/orderDetails.wpy +++ b/src/pages/users/orderDetails.wpy @@ -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() diff --git a/src/pages/users/schools.wpy b/src/pages/users/schools.wpy index 65e7536..978101f 100644 --- a/src/pages/users/schools.wpy +++ b/src/pages/users/schools.wpy @@ -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 }) diff --git a/src/pages/users/unmarriV2.wpy b/src/pages/users/unmarriV2.wpy index d65e99d..3c0b330 100644 --- a/src/pages/users/unmarriV2.wpy +++ b/src/pages/users/unmarriV2.wpy @@ -797,6 +797,12 @@ {{mylibs.city || '--'}} + + + 籍贯 + {{mylibs.resident_city || '--'}} + + 职业 @@ -809,6 +815,18 @@ {{mylibs.income || '--'}} + + + 信仰 + {{mylibs.belief || '--'}} + + + + + 期望对方 + {{mylibs.marry_by_time || '--'}} + + diff --git a/src/pages/users/upgradeVIP.wpy b/src/pages/users/upgradeVIP.wpy index e30c2d7..8d233e1 100644 --- a/src/pages/users/upgradeVIP.wpy +++ b/src/pages/users/upgradeVIP.wpy @@ -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()