Merge branch 'Branch_1' of https://git.u8t.cn/tangxinyue/alipay-emulator into Branch_1

# Conflicts:
#	main.js
This commit is contained in:
tangxinyue 2026-03-28 15:44:32 +08:00
commit 755aff7422
3 changed files with 18 additions and 13 deletions

View File

@ -27,9 +27,8 @@ export function createApp() {
const systemInfo = uni.getStorageSync('systemInfo') || {} const systemInfo = uni.getStorageSync('systemInfo') || {}
app.config.globalProperties.$system = systemInfo.platform == 'ios' ? 'iOS' : 'Android' app.config.globalProperties.$system = systemInfo.platform == 'ios' ? 'iOS' : 'Android'
app.config.globalProperties.$systemInfo = systemInfo app.config.globalProperties.$systemInfo = systemInfo
uni.setStorageSync('version', '1.0.3.sp14') uni.setStorageSync('version', '1.0.3.sp16')
app.config.globalProperties.$version = uni.getStorageSync('version') app.config.globalProperties.$version = uni.getStorageSync('version')
app.use(globalMethods); app.use(globalMethods);
return { return {
app app

View File

@ -35,7 +35,7 @@
</view> </view>
<view class="vipList"> <view class="vipList">
<template v-for="(item, index) in data.benefitList" :key="index"> <template v-for="(item, index) in data.benefitList" :key="index">
<view class="item" v-if="data.goods.features=='common'||(data.goods.features!='common'&&index<8)"> <view class="item" v-if="data.goods.features=='common'||(data.goods.features!='common'&&index<10)">
<image :src="item.url"></image> <image :src="item.url"></image>
<text>{{ item.name }}</text> <text>{{ item.name }}</text>
</view> </view>
@ -495,7 +495,7 @@ onLoad(async () => {
}else if (themeConfig?.theme == '0405') { }else if (themeConfig?.theme == '0405') {
data.banner = '/static/image/recharge/qmj/bannar.png' data.banner = '/static/image/recharge/qmj/bannar.png'
data.benefitList.forEach(item=>{ data.benefitList.forEach(item=>{
item.url=item.url.replace('/static/image/recharge/','/static/image/recharge/qmj') item.url=item.url.replace('/static/image/recharge/','/static/image/recharge/qmj/')
}) })
}else if (themeConfig?.theme == '0401') { }else if (themeConfig?.theme == '0401') {
data.banner = '/static/image/recharge/yrj/bannar.png' data.banner = '/static/image/recharge/yrj/bannar.png'
@ -1673,17 +1673,17 @@ function shouldBeTrue(obj) {
padding-bottom: calc(240rpx + env(safe-area-inset-bottom)) !important; padding-bottom: calc(240rpx + env(safe-area-inset-bottom)) !important;
.package-items-box { .package-items-box {
position: relative; position: relative;
background-color: #F7F7F7; background-color: #F7F7F7;
border-radius: 16px 16px 0 0; border-radius: 16px 16px 0 0;
width: 100vw; width: 100vw;
margin-top:-90px; margin-top:-70px;
// background: linear-gradient(to bottom, #FFFFFF, #F7F7F7); // background: linear-gradient(to bottom, #FFFFFF, #F7F7F7);
} }
.package-items-container { .package-items-container {
display: flex; display: flex;
padding: 40rpx 32rpx 20rpx 32rpx; padding: 40rpx 32rpx 40rpx 32rpx;
.active-package-item-tips { .active-package-item-tips {
position: absolute; position: absolute;
content: '限时优惠'; content: '限时优惠';
@ -2199,7 +2199,7 @@ function shouldBeTrue(obj) {
} }
.question { .question {
margin: 24rpx 32rpx; margin: 20rpx 32rpx;
padding: 17px 13px; padding: 17px 13px;
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 10px 10px 10px 10px; border-radius: 10px 10px 10px 10px;
@ -2238,8 +2238,7 @@ function shouldBeTrue(obj) {
} }
.myCouponList { .myCouponList {
margin:20rpx 32rpx;
margin: 24rpx 32rpx;
padding: 17px 13px; padding: 17px 13px;
height: 18px; height: 18px;
background-color: #FFFFFF; background-color: #FFFFFF;
@ -2489,7 +2488,7 @@ function shouldBeTrue(obj) {
margin-left: 16px; margin-left: 16px;
width: calc(100% - 32px); width: calc(100% - 32px);
border-radius: 16px; border-radius: 16px;
margin-bottom: 20px; margin-bottom: 20rpx;
.top { .top {
image { image {
@ -2500,7 +2499,7 @@ function shouldBeTrue(obj) {
.vipList { .vipList {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
padding: 10px; padding:0 10px 10px 10px;
.item { .item {
width: 20%; width: 20%;
@ -2525,4 +2524,11 @@ function shouldBeTrue(obj) {
} }
} }
} }
@font-face {
font-family: 'AlipayNumber'; //
src: url('/static/font/AlipayNumber.ttf');
}
.wx-font-regular {
font-family: 'AlipayNumber' !important;
}
</style> </style>