diff --git a/src/pages/news/chitchat.wpy b/src/pages/news/chitchat.wpy
index dbe91b7..322e927 100644
--- a/src/pages/news/chitchat.wpy
+++ b/src/pages/news/chitchat.wpy
@@ -1104,6 +1104,7 @@ wepy.page({
if (data && data.length > 0) {
data.forEach((item, index) => {
item.time = new Date(item.create_time.replace(/[-]/g, '/').replace(/[-]/, '')).getTime()
+ console.log(item.time, '77')
item.attach = item.attach ? JSON.parse(item.attach) : ''
item.showTime = timeContrast(format(item.time), vm.lastTime)
item.timing = getTime(format(item.time))
diff --git a/src/pages/users/myOrderList.wpy b/src/pages/users/myOrderList.wpy
index 4455eaf..92b311b 100644
--- a/src/pages/users/myOrderList.wpy
+++ b/src/pages/users/myOrderList.wpy
@@ -183,12 +183,7 @@ wepy.page({
this.vipTatus = false
},
toRet () {
- console.log('2222222222222')
- if (this.system == 'iOS') {
- this.$redirectTo(`/pages/users/upgradeVIP2`)
- } else {
- this.$redirectTo(`/pages/users/upgradeVIP`)
- }
+ this.$redirectTo(`/pages/users/upgradeVIP`)
}
}
})
diff --git a/src/pages/users/upgradeVIP.wpy b/src/pages/users/upgradeVIP.wpy
index e9f44df..9fc6843 100644
--- a/src/pages/users/upgradeVIP.wpy
+++ b/src/pages/users/upgradeVIP.wpy
@@ -51,7 +51,7 @@
-
+
¥{{payData.discount_price}}
@@ -102,7 +102,6 @@
微信支付
-
@@ -110,6 +109,17 @@
+
+
+ iOS暂不支持该功能
+
+
+
+ 长按识别二维码
+ 前往公众号获取帮助
+
+
+
@@ -179,15 +189,7 @@
}
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
- }
- // share_type
- console.log(this.system)
this.getPageData()
- // this.getUserData()
},
onPullDownRefresh() {},
@@ -253,18 +255,9 @@
console.log(data, 'aaaaaaaa')
vm.rankList = []
data.ranks.sub_ranks.forEach((item, index) => {
- // if (index <= 2) {
- vm.rankList.push(item)
- // }
+ vm.rankList.push(item)
})
console.log(vm.rankList, 'rankList-====')
- if (vm.system == 'iOS') {
- vm.rankList = [
- {pic: 'https://images.ufutx.com/202004/11/3ccfd5478ea792e8793c7eebbf152511.png'},
- {pic: 'https://images.ufutx.com/202004/11/cbc6bdbbbee7881f9c6e97f36aad4639.png'},
- {pic: 'https://images.ufutx.com/202004/11/684d70c9b43dab6e9c83e0a53bf8029f.png'}
- ]
- }
vm.payData.title = `超级会员(${vm.rankList[0].name})`
vm.payData.price = `${vm.rankList[0].price}`
vm.payData.discount_price = `${vm.rankList[0].discount_price}`
@@ -273,10 +266,9 @@
console.log(vm.payData, 'payData')
vm.shareId = vm.rankList[vm.cardCur].id
if (wx.getStorageSync('from_user_id')) {
- vm.worthShare()
+ vm.worthShare()
}
wx.hideLoading()
- console.log('eeee---')
}).finally(() => {
this.loaded = false
this.init = true
@@ -305,6 +297,10 @@
}, 800)
},
showFn (index) { // 弹框支付
+ if (this.system == 'iOS') {
+ this.modalName = 'showTips'
+ return
+ }
this.wxPayShow = 'cash'
this.coinMoney = (this.payData.coin / 10).toFixed(2)
this.deductionPrice = this.payData.coin >= this.specialVIP.can_coin_amount ? (this.payData.discount_price - this.specialVIP.can_cash_amount).toFixed(2) : (this.payData.discount_price - this.coinMoney).toFixed(2)
@@ -571,6 +567,43 @@
background-image: linear-gradient(to left,#FF85A5,#FF5380);
}
}
+
+ .tips_box{
+ position: relative;
+ display: inline-block;
+ vertical-align: middle;
+ margin-left: auto;
+ margin-right: auto;
+ width: 520rpx;
+ padding: 40rpx 0;
+ max-width: 100%;
+ background-color: #ffffff;
+ border-radius: 24rpx;
+ overflow: hidden;
+
+ .qrcode_icon-box{
+ width: 320rpx;
+ height: 320rpx;
+ border: 10rpx solid #F4F5FF;
+ border-radius: 12rpx;
+ margin: 40rpx auto 26rpx auto;
+
+ .qrcode_icon{
+ width: 320rpx;
+ height: 320rpx;
+ display: block;
+ }
+ }
+
+ .cancelIcon{
+ width: 48rpx;
+ height: 48rpx;
+ position: fixed;
+ margin-top: 80rpx;
+ margin-left: -24rpx;
+ z-index: 99;
+ }
+ }
{