wangguoyu 1 week ago
parent
commit
a53ee1a90c

+ 2 - 1
common/styles/global/components.scss

@@ -343,12 +343,13 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 		icon{width: 42rpx;height: 42rpx;@include ezy-no-repeat-cover;margin-right: 8rpx;}
 		.wx-icon{background-image: url("@/static/images/pay/svip-wx-icon.png");}
 		.zfb-icon{background-image: url("@/static/images/pay/svip-zfb-icon.png");}
-		.apple-icon{background-image: url("@/static/images/common/apple-icon.svg");}
+		.apple-icon{background-image: url("@/static/images/common/apple-icon.png");}
 	}
 	.pay-status-box::after{
 		content:'';width: 24rpx;height: 24rpx;margin-left: 4rpx;
 		@include ezy-no-repeat-cover;background-image: url("@/static/images/common/qiehuan-icon.svg");
 	}
+	.apple-status-box{align-items: center;justify-content: center;}
 	.apple-status-box::after{display: none;}
 	.pay-btn{
 		width: 200rpx;height: 80rpx;font-size: 28rpx;line-height: 80rpx;text-align: center;color: #fff;

+ 1 - 1
common/styles/global/pages.scss

@@ -1254,7 +1254,7 @@
 				icon{width: 42rpx;height: 42rpx;@include ezy-no-repeat-cover;margin-right: 8rpx;}
 				.wx-icon{background-image: url("@/static/images/pay/svip-wx-icon.png");}
 				.zfb-icon{background-image: url("@/static/images/pay/svip-zfb-icon.png");}
-				.apple-icon{background-image: url("@/static/images/common/apple-icon.svg");}
+				.apple-icon{background-image: url("@/static/images/common/apple-icon.png");}
 			}
 			.pay-status-box::after{
 				content:'';width: 24rpx;height: 24rpx;margin-left: 4rpx;

+ 1 - 1
components/payComponents/index.vue

@@ -17,7 +17,7 @@
 			<icon class="zfb-icon"></icon>支付宝
 		</view>
 		<view class="pay-status-box apple-status-box" v-if="currentPlatform =='ios'">
-			<icon class="apple-icon"></icon>apple
+			<icon class="apple-icon"></icon>
 		</view>
 		<slot></slot>
 	</view>

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "鹅状元",
     "appid" : "__UNI__CB9D85D",
     "description" : "",
-    "versionName" : "1.0.4",
-    "versionCode" : 20,
+    "versionName" : "1.0.6",
+    "versionCode" : 23,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 4 - 4
pages/mall/detailDialog.vue

@@ -48,8 +48,8 @@
 					@click="switchPayWay">
 					<icon class="zfb-icon"></icon>支付宝
 				</view>
-				<view class="pay-status-box apple-status-box" v-if="currentPlatform =='ios'">
-					<icon class="apple-icon"></icon>apple
+				<view class="pay-status-box apple-status-box"  v-if="currentPlatform =='ios'">
+					<icon class="apple-icon"></icon>
 				</view>
 
 				<view v-if="currentPlatform =='android'" class="pay-btn" @touchstart="creatOrder">立即支付</view>
@@ -115,7 +115,7 @@
 	})
 	const isIOSorAndroid = () => {
 		const systemInfo = uni.getSystemInfoSync();
-
+		
 		console.log('systemInfo', systemInfo);
 
 		if (systemInfo.platform == 'ios') {
@@ -303,7 +303,7 @@
 						// 获取 id 为 'appleiap' 的 channel  
 						console.info("支付通道", iapChannel)
 						if (iapChannel.id === 'appleiap') { //开通了app应用内支付,在manifest.josn中设置,开通后需打自定议基座
-							console.info("苹果支付通道", iapChannel)
+						
 							// ids 数组中的项为 App Store Connect 配置的内购买项目产品ID(productId)
 							var ids = [productId.value];
 							// iap 为应用内支付对象 

+ 2 - 2
pages/mall/mallPage.vue

@@ -94,12 +94,12 @@
 				<icon class="zfb-icon"></icon>支付宝
 			</view>
 			<view class="pay-status-box apple-status-box" v-if="currentPlatform =='ios'">
-				<icon class="apple-icon"></icon>apple
+				<icon class="apple-icon"></icon>
 			</view>
 
 			<view v-if="currentPlatform =='android'" class="pay-btn" @touchstart="creatOrder">立即支付
 			</view>
-			<view v-if="currentPlatform =='ios'" class="pay-btn" @touchstart="creatOrderIos">立即支付</view>
+			<view  class="pay-btn" v-if="currentPlatform =='ios'" @touchstart="creatOrderIos">立即支付</view>
 		</view>
 		<detail-dialog ref="mallDetailPopup" :selected-list="getSelectedProducts"></detail-dialog>
 

+ 4 - 4
pages/pay/order.vue

@@ -58,7 +58,7 @@
 											<icon class="zfb-icon"></icon>支付宝
 										</view>
 										<view class="pay-status-box apple-status-box" v-if="currentPlatform =='ios'">
-											<icon class="apple-icon"></icon>apple
+											<icon class="apple-icon"></icon>
 										</view>
 
 										<view v-if="currentPlatform =='android'" class="pay-btn"
@@ -125,7 +125,7 @@
 											<icon class="zfb-icon"></icon>支付宝
 										</view>
 										<view class="pay-status-box apple-status-box" v-if="currentPlatform =='ios'">
-											<icon class="apple-icon"></icon>apple
+											<icon class="apple-icon"></icon>
 										</view>
 
 										<view v-if="currentPlatform =='android'" class="pay-btn"
@@ -193,7 +193,7 @@
 											<icon class="zfb-icon"></icon>支付宝
 										</view>
 										<view class="pay-status-box apple-status-box" v-if="currentPlatform =='ios'">
-											<icon class="apple-icon"></icon>apple
+											<icon class="apple-icon"></icon>
 										</view>
 
 										<view v-if="currentPlatform =='android'" class="pay-btn"
@@ -478,7 +478,7 @@
 						// 获取 id 为 'appleiap' 的 channel  
 						console.info("支付通道", iapChannel)
 						if (iapChannel.id === 'appleiap') { //开通了app应用内支付,在manifest.josn中设置,开通后需打自定议基座
-							console.info("苹果支付通道", iapChannel)
+					
 							// ids 数组中的项为 App Store Connect 配置的内购买项目产品ID(productId)
 							var ids = [productId.value];
 							// iap 为应用内支付对象 

BIN
static/images/common/apple-icon.png


+ 0 - 0
static/images/common/apple-icon.svg → static/images/common/apple-icon1.svg