zhanghua/wx-guyantv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hot-fix

Browse Source
This commit is contained in:
张华 2025-01-15 15:51:20 +08:00
parent e99dec9214
commit 6e7fde9ff6
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/charge-dialog/index.js
View File

@ -60,6 +60,7 @@ Component({
countdownInterval: null, countdownInterval: null,
payShow: false, payShow: false,
backInfo: null, backInfo: null,
platform: null,
}, },
lifetimes: { lifetimes: {
attached() { attached() {
@ -185,14 +186,17 @@ Component({
const res = await bs({ const res = await bs({
showLoading: false, showLoading: false,
}); });
const platform = wx.getDeviceInfo().system;
this.setData({ this.setData({
list, list,
backInfo, backInfo,
userInfo, userInfo,
platform: wx.getSystemInfoSync().platform, platform,
iosStatus: res.status, iosStatus: res.status,
payShow: true, payShow: res.status === 1 && platform == "ios" ? false : true,
}); });
console.log(platform);
if (res.status === 1 && platform === "ios") this.closePay();
}, },
openAgreement() { openAgreement() {
@ -210,10 +214,9 @@ Component({
// 支付功能 // 支付功能
async pay(event) { async pay(event) {
console.log(1);
const item = event.currentTarget.dataset.item; const item = event.currentTarget.dataset.item;
const bsPayItem = await iosPayment(); const bsPayItem = await iosPayment();
const platform = wx.getSystemInfoSync().platform; const platform = this.platform;
if (platform === "ios" && bsPayItem.status === 1) { if (platform === "ios" && bsPayItem.status === 1) {
wx.showToast({ wx.showToast({
title: "暂不支持IOS支付", title: "暂不支持IOS支付",
@ -267,7 +270,7 @@ Component({
}); });
return; return;
} else if (payResult.Paymentplan === 3) { } else if (payResult.Paymentplan === 3) {
const SDKVersion = wx.getSystemInfoSync().SDKVersion; const SDKVersion = wx.getAppBaseInfo().SDKVersion;
if ( if (
this.compareVersion(SDKVersion, "2.19.2") >= 0 || this.compareVersion(SDKVersion, "2.19.2") >= 0 ||
wx.canIUse("requestVirtualPayment") wx.canIUse("requestVirtualPayment")

22
components/charge-dialog/index.wxml
View File

@ -8,7 +8,8 @@
</view> </view>
<view class="mt-20" wx:if="{{countdown}}">{{countdown}}s后自动广告解锁</view> <view class="mt-20" wx:if="{{countdown}}">{{countdown}}s后自动广告解锁</view>
</view> </view>
<i class="iconfont icon-a-Frame5029 text-40 p-14 mt-main leading-1 bg-fff-25 rounded-full text-fff" bind:tap="cloneAD" /> <i class="iconfont icon-a-Frame5029 text-40 p-14 mt-main leading-1 bg-fff-25 rounded-full text-fff"
bind:tap="cloneAD" />
</view> </view>
<view class="charge-dialog-desc" bind:tap="closePay" wx:if="{{payShow}}"> <view class="charge-dialog-desc" bind:tap="closePay" wx:if="{{payShow}}">
<view class="w-full rounded-t-24 relative" catch:tap="catchTap"> <view class="w-full rounded-t-24 relative" catch:tap="catchTap">
@ -30,7 +31,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="bg-gradient-to-b from-[#FFFBF3] to-[#fff] mt-150 py-34 px-main max-h-[75vh] overflow-auto"> <view class="bg-gradient-to-b from-[#FFFBF3] to-[#fff] mt-150 pt-34 pb-64 px-main max-h-[75vh] overflow-auto">
<view class="border-0 border-b-2 border-solid border-pay-line w-full py-24"> <view class="border-0 border-b-2 border-solid border-pay-line w-full py-24">
<view class=""> <view class="">
我的K币： 我的K币：
@ -66,8 +67,12 @@
</view> </view>
</view> --> </view> -->
<view class="w-full flex flex-wrap items-center justify-between mt-main"> <view class="w-full flex flex-wrap items-center justify-between mt-main">
<view class="w-330 h-200 rounded-16 flex flex-col mb-main relative border-2 border-solid border-[#FDBAC5] overflow-hidden {{item.type===1?'bg-fff':item.type===2?'bg-[#FDBAC5]':'bg-gradient-to-r from-[#DE7DEF] to-[#EE9376] text-fff'}}" wx:for="{{list}}" wx:key="*this" bind:tap="pay" data-item="{{item}}"> <view
<view class="absolute top-0 right-0 bg-gradient-to-r from-[#F3583D] to-[#FA5EAE] rounded-bl-16 px-16 h-36 leading-[36rpx] text-24 text-fff font-400" hidden="{{!item.poster}}"> class="w-330 h-200 rounded-16 flex flex-col mb-main relative border-2 border-solid border-[#FDBAC5] overflow-hidden {{item.type===1?'bg-fff':item.type===2?'bg-[#FDBAC5]':'bg-gradient-to-r from-[#DE7DEF] to-[#EE9376] text-fff'}}"
wx:for="{{list}}" wx:key="*this" bind:tap="pay" data-item="{{item}}">
<view
class="absolute top-0 right-0 bg-gradient-to-r from-[#F3583D] to-[#FA5EAE] rounded-bl-16 px-16 h-36 leading-[36rpx] text-24 text-fff font-400"
hidden="{{!item.poster}}">
{{item.poster}} {{item.poster}}
</view> </view>
<view class="px-32 h-124 mt-12 flex flex-col justify-center items-start"> <view class="px-32 h-124 mt-12 flex flex-col justify-center items-start">
@ -79,10 +84,13 @@
</view> </view>
</view> </view>
</view> </view>
<view class="absolute left-0 bottom-0 h-64 w-full flex items-center justify-center text-28 {{item.type===1?'text-[#F9637B] bg-[#FDBAC5]':item.type===2?'bg-[#F9637B] text-fff':item.type===4?'bg-gradient-to-r from-[#F76D67] to-[#FB5196] text-fff':'bg-[#FDBAC5] text-[#F9637B]'}}"> <view
<image class="w-32 h-32 mr-10" mode="widthFix" src="/static/images/{{item.type===1?'gift':item.type===2?'diamond':'suo'}}.png" /> class="absolute left-0 bottom-0 h-64 w-full flex items-center justify-center text-28 {{item.type===1?'text-[#F9637B] bg-[#FDBAC5]':item.type===2?'bg-[#F9637B] text-fff':item.type===4?'bg-gradient-to-r from-[#F76D67] to-[#FB5196] text-fff':'bg-[#FDBAC5] text-[#F9637B]'}}">
<image class="w-32 h-32 mr-10" mode="widthFix"
src="/static/images/{{item.type===1?'gift':item.type===2?'diamond':'suo'}}.png" />
<view class="leading-1.4"> <view class="leading-1.4">
{{item.type===1?(item.giveegold?(item.egold+'+'+item.giveegold + 'K币'):item.egold + 'K币'):item.type===2?item.title:item.description}} {{item.type===1?(item.giveegold?(item.egold+'+'+item.giveegold + 'K币'):item.egold +
'K币'):item.type===2?item.title:item.description}}
</view> </view>
</view> </view>
</view> </view>