Merge branch 'Branch_1' of https://git.u8t.cn/tangxinyue/alipay-emulator into Branch_1
# Conflicts: # main.js
This commit is contained in:
commit
755aff7422
3
main.js
3
main.js
|
|
@ -27,9 +27,8 @@ export function createApp() {
|
|||
const systemInfo = uni.getStorageSync('systemInfo') || {}
|
||||
app.config.globalProperties.$system = systemInfo.platform == 'ios' ? 'iOS' : 'Android'
|
||||
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.use(globalMethods);
|
||||
return {
|
||||
app
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
</view>
|
||||
<view class="vipList">
|
||||
<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>
|
||||
<text>{{ item.name }}</text>
|
||||
</view>
|
||||
|
|
@ -495,7 +495,7 @@ onLoad(async () => {
|
|||
}else if (themeConfig?.theme == '0405') {
|
||||
data.banner = '/static/image/recharge/qmj/bannar.png'
|
||||
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') {
|
||||
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;
|
||||
|
||||
.package-items-box {
|
||||
position: relative;
|
||||
position: relative;
|
||||
background-color: #F7F7F7;
|
||||
border-radius: 16px 16px 0 0;
|
||||
width: 100vw;
|
||||
margin-top:-90px;
|
||||
margin-top:-70px;
|
||||
// background: linear-gradient(to bottom, #FFFFFF, #F7F7F7);
|
||||
}
|
||||
|
||||
.package-items-container {
|
||||
display: flex;
|
||||
padding: 40rpx 32rpx 20rpx 32rpx;
|
||||
padding: 40rpx 32rpx 40rpx 32rpx;
|
||||
.active-package-item-tips {
|
||||
position: absolute;
|
||||
content: '限时优惠';
|
||||
|
|
@ -2199,7 +2199,7 @@ function shouldBeTrue(obj) {
|
|||
}
|
||||
|
||||
.question {
|
||||
margin: 24rpx 32rpx;
|
||||
margin: 20rpx 32rpx;
|
||||
padding: 17px 13px;
|
||||
background-color: #FFFFFF;
|
||||
border-radius: 10px 10px 10px 10px;
|
||||
|
|
@ -2238,8 +2238,7 @@ function shouldBeTrue(obj) {
|
|||
}
|
||||
|
||||
.myCouponList {
|
||||
|
||||
margin: 24rpx 32rpx;
|
||||
margin:20rpx 32rpx;
|
||||
padding: 17px 13px;
|
||||
height: 18px;
|
||||
background-color: #FFFFFF;
|
||||
|
|
@ -2489,7 +2488,7 @@ function shouldBeTrue(obj) {
|
|||
margin-left: 16px;
|
||||
width: calc(100% - 32px);
|
||||
border-radius: 16px;
|
||||
margin-bottom: 20px;
|
||||
margin-bottom: 20rpx;
|
||||
|
||||
.top {
|
||||
image {
|
||||
|
|
@ -2500,7 +2499,7 @@ function shouldBeTrue(obj) {
|
|||
.vipList {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
padding: 10px;
|
||||
padding:0 10px 10px 10px;
|
||||
|
||||
.item {
|
||||
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>
|
||||
Loading…
Reference in New Issue