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

App.vue

@@ -193,5 +193,7 @@ export default {
 </script>
 
 <style>
+	/* #ifndef APP-NVUE */
 	@import "./common/color.css";
+	/* #endif */
 </style>

package-lock.json

@@ -15,8 +15,9 @@
         },
         "node_modules/crypto-js": {
             "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
-            "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+            "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
+            "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==",
+            "license": "MIT"
         },
         "node_modules/lottie-web": {
             "version": "5.13.0",

pages/common/recharge/index.vue

@@ -7,17 +7,6 @@
 		<!-- <view style="margin-top:-90px;position: relative;">
 			<customTab :isHuise="shouldBeTrue(data.goods)" />
 		</view> -->
-		<view class="vipContent" style="margin-top:-90px;position: relative;">
-			<view class="top">
-				<image src="/static/image/recharge/vipContentTopBgImg.png" mode="widthFix"></image>
-			</view>
-			<view class="vipList">
-				<view class="item" v-for="(item, index) in data.benefitList" :key="index">
-					<image :src="item.url"></image>
-					<text>{{ item.name }}</text>
-				</view>
-			</view>
-		</view>
 		<scroll-view class="package-items-box" scroll-x="true" v-if="data.goodsList.length">
 			<view class="package-items-container">
 				<view class="package-item" :class="{ 'active-package-item': selected == (index + 1) }"
@@ -40,6 +29,21 @@
 				</view>
 			</view>
 		</scroll-view>
+		<view class="vipContent" style="position: relative;">
+			<view class="top">
+				<image src="/static/image/recharge/vipContentTopBgImg.png" mode="widthFix"></image>
+			</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)">
+						<image :src="item.url"></image>
+						<text>{{ item.name }}</text>
+					</view>
+				</template>
+				
+			</view>
+		</view>
+
 		<view class="myCouponList" @click="data.myActivity.length > 0 ? myCoupon.open() : ''">
 			<view class="left">
 				<image src="/static/image/recharge/couponMin.png" mode=""></image>
@@ -476,6 +480,13 @@ onLoad(async () => {
 			// })
 		} else if (themeConfig?.theme == '0217') {
 			data.banner = '/static/image/recharge/chunjie/bannar.png'
+		}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')
+			})
+		}else if (themeConfig?.theme == '0401') {
+			data.banner = '/static/image/recharge/yrj/bannar.png'
 		}
 	}
 	let pages = getCurrentPages();
@@ -502,6 +513,9 @@ onLoad(async () => {
 	})
 	console.log(goods)
 	if (goods.code == 0) {
+		data.goodsList.forEach(item=>{
+			item['features']=item['features']||''
+		})
 		data.goodsList = goods.data
 
 		let zsItem = goods.data[0]
@@ -1647,14 +1661,17 @@ function shouldBeTrue(obj) {
 	padding-bottom: calc(240rpx + env(safe-area-inset-bottom)) !important;
 
 	.package-items-box {
+	position: relative;
+		background-color: #F7F7F7;
+		border-radius: 16px 16px 0 0;
 		width: 100vw;
+		margin-top:-90px;
 		// background: linear-gradient(to bottom, #FFFFFF, #F7F7F7);
 	}
 
 	.package-items-container {
 		display: flex;
 		padding: 20rpx 32rpx;
-
 		.active-package-item-tips {
 			position: absolute;
 			content: '限时优惠';