Merge remote-tracking branch 'origin/2024鹅状元' into 2024鹅状元

common/styles/global/components.scss

@@ -404,7 +404,7 @@ position: absolute;left: 0;top: -4rpx;opacity: 0.4;}
 			.name-text{@include single-line-ellipsis;max-width: 320rpx;margin-right: 10rpx;}
 			icon{width:70rpx;height:32rpx;@include ezy-no-repeat-cover;background-image: url("@/static/images/mall/new-icon.png");}
 		}
-		.content-text{font-size: 24rpx;color: #666;@include multi-line-ellipsis(3);line-height: 1.6;}
+		.content-text{font-size: 24rpx;color: #666;@include multi-line-ellipsis(3);line-height: 1.5;}
 	}
 	.detail-bottom-box{
 		width: 100%;display: flex;justify-content: space-between;color: #666;padding: 10rpx 0;

common/styles/global/pages.scss

@@ -1115,7 +1115,7 @@
 	.order-scroll-view{margin-top: 10rpx;overflow-y: auto;height: calc(100vh - 380rpx - var(--status-bar-height));}
 	.order-list-item{
 		width: 94%;background-color: rgba(255, 255, 255, 0.6)!important;
-		margin: 0 3% 10rpx;border-radius: 8rpx;
+		margin: 0 3% 12rpx;border-radius: 8rpx;
 		.order-item-head{
 			display: flex;justify-content: space-between;align-items: center;font-size: 24rpx;color: #333;
 			.order-name-box{
@@ -1129,41 +1129,49 @@
 		}
 		
 		.order-content-box{
-			display: flex;margin-top: 10rpx;border-bottom: 1px dashed #fff;
-			box-sizing: border-box;padding-bottom: 32rpx;margin-bottom: 24rpx;
-			icon{width: 212rpx;height: 202rpx;margin-right: 20rpx;@include ezy-no-repeat-cover;flex-shrink: 0;}
-			.content-img1{background-image: url("@/static/images/pay/svip1.png");}
-			.content-img2{background-image: url("@/static/images/pay/svip2.png");}
+			display: flex;margin-top: 10rpx;box-sizing: border-box;margin-bottom: 24rpx;
+			.content-img{width: 230rpx;height: 230rpx;margin-right: 20rpx;@include ezy-no-repeat-cover;flex-shrink: 0;}
 			.content-body-box{display: flex;flex-direction: column;}
-			.content-name{
-				font-size: 36rpx;color: #000;margin-bottom: 12rpx;@include single-line-ellipsis;max-width: 320rpx;
-			}
-			.content-text{font-size: 24rpx;color: #666;@include multi-line-ellipsis(3);line-height: 1.4;}
+			.content-name{font-size: 36rpx;color: #000;margin-bottom: 8rpx;@include single-line-ellipsis;max-width: 320rpx;}
+			.content-text{font-size: 24rpx;color: #666;@include multi-line-ellipsis(3);line-height: 1.5;}
 			.content-tag{
 				width: 160rpx;height: 40rpx;line-height: 40rpx;
 				font-size: 24rpx;color: #01c6fe;background-color: rgba(255, 255, 255, 0.6);
 				border-radius: 4rpx;text-align: center;
 			}
-			.content-yuanjia{font-size: 42rpx;color: #ff0101;margin-top: auto;}
+			.content-yuanjia{font-size: 42rpx;color: #ff0101;margin-top: auto;margin-left:auto;}
+			.content-money-box{
+				 display: flex;justify-content: space-between;align-items: center;margin-top: 8rpx;
+				.bottom-data{font-size: 24rpx;color: #999;}
+				.bottom-money{color: #333;}
+				.order-kcb-btn{
+					width: 180rpx;height: 56rpx;line-height: 56rpx;text-align: center;font-size: 24rpx;color: #fff;
+					@include ezy-no-repeat-cover;background-image: url("@/static/images/common/jf-bj.png");
+					icon{width: 18rpx;height: 18rpx;@include ezy-no-repeat-cover;margin-left: 4rpx;
+				background-image: url("@/static/images/common/jt-up-white-icon.svg");transform: scale(180deg);}
+				}
+			}
 		}
 		
 		.order-bottom-box{
-			box-sizing: border-box;padding-bottom: 24rpx;
-			.order-kcb-btn{
-				width: 180rpx;height: 56rpx;line-height: 56rpx;text-align: center;font-size: 24rpx;color: #fff;
-				@include ezy-no-repeat-cover;background-image: url("@/static/images/common/jf-bj.png");
-				icon{width: 18rpx;height: 18rpx;@include ezy-no-repeat-cover;margin-left: 4rpx;
-			background-image: url("@/static/images/common/jt-up-white-icon.svg");transform: scale(180deg);}
+			box-sizing: border-box;padding: 16rpx 0 10rpx;border-top: 1px dashed #fff;
+			display: flex;justify-content: space-between;
+			.pay-status-box{
+				width: 200rpx;display: flex;align-items: center;
+				padding:2rpx 0 2rpx 16rpx;color: #666;margin-left: 4rpx;
+				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");}
 			}
-			.bottom-money-box{
-				 display: flex;justify-content: space-between;align-items: center;
-				.bottom-data{font-size: 24rpx;color: #999;}
-				.bottom-money{color: #333;}
+			.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");
 			}
-			.bottom-btn{
-				width: 167rpx;height: 52rpx;line-height: 52rpx;text-align: center;color: #FFF;font-size: 28rpx;margin-left: auto;
-				@include ezy-no-repeat-cover;background-image: url("@/static/images/pay/order-btn-bj.png");margin-top: 24rpx;
-
+			.apple-status-box::after{display: none;}
+			.pay-btn{
+				width: 180rpx;height: 70rpx;font-size: 28rpx;line-height: 70rpx;text-align: center;color: #fff;
+				@include ezy-no-repeat-cover;background-image: url("@/static/images/mall/mall-btn.png");
 			}
 		}
 	}
@@ -1600,7 +1608,7 @@
 				icon{width: 18rpx;height: 18rpx;@include ezy-no-repeat-cover;margin-left: 4rpx;
 			background-image: url("@/static/images/common/jt-up-white-icon.svg");transform: scale(180deg);}
 			}
-			.hdj-text{font-size: 32rpx;color: #333;}
+			.hdj-text{font-size: 32rpx;color: #333;margin-left: auto;}
 		}
 	}
 }

pages/pay/order.vue

@@ -29,20 +29,32 @@
 										</view>
 									</view>
 									<view class="order-content-box">
-										<icon :class="'content-img'+item.cardId"></icon>
+										<!-- 需要改成从接口获取的 wgy-->
+										<img class="content-img" src="https://ezy-app.oss-cn-beijing.aliyuncs.com/test/resource/uploadFile02dcefaa15894a99afa5cb95a1f02e89.png">
 										<view class="content-body-box">
-											<view class="content-name">SVIP终身卡</view>
-											<view class="content-tag">终身有效</view>
-											<view class="content-yuanjia">¥{{item.cardYuanjia}}</view>
+											<view class="content-name">数学暑假进阶L1</view>
+											<view class="content-text">适用于L1和学前，介绍介绍，适用于L1和学前，介绍介绍适用于L1和学前，介绍介绍</view>
+											<!-- 未付款数据对一下  是否有课程包明细 wgy-->
+											<view class="content-money-box" v-if="item.status ==1">
+												<view class="order-kcb-btn" @click="detailBtn">课程包明细<icon></icon></view>
+												<text class="content-yuanjia">¥{{item.money}}</text>
+											</view>
+											<!-- 已付款数据对一下  是否有课程包明细 wgy-->
+											<view class="content-money-box" v-if="item.status ==2">
+												<view class="order-kcb-btn" @click="detailBtn">课程包明细<icon></icon></view>
+												<text class="content-yuanjia">¥{{item.money}}</text>
+											</view>
 										</view>
 									</view>
-									<view class="order-bottom-box">
-										<view class="bottom-money-box">
-											<text class="bottom-data">{{item.ctime}}</text>
-											<text class="bottom-money">实付款：¥{{item.money}}</text>
-										</view>
-										<!--  v-if="item.status ==1" -->
-										<view class="bottom-btn" v-if="item.status ==1" @click="handlePay(item)">去支付</view>
+									<!-- 未付款显示付款按钮 wgy-->
+									<view class="order-bottom-box" v-if="item.status ==1">
+										<!-- 微信 -->
+										<view class="pay-status-box" v-if="showPayWay" @click="switchPayWay"><icon class="wx-icon"></icon>微信</view>
+										<!-- 支付宝 -->
+										<view class="pay-status-box" v-if="!showPayWay" @click="switchPayWay"><icon class="zfb-icon"></icon>支付宝</view>
+										<!-- 苹果 -->
+										<view class="pay-status-box apple-status-box" v-if="false"><icon class="apple-icon"></icon>apple</view>
+										<view class="pay-btn" @click="handlePay(item)">立即支付</view>
 									</view>
 								</template>
 							</uni-list-item>
@@ -71,20 +83,25 @@
 											</view>
 										</view>
 										<view class="order-content-box">
-											<icon :class="'content-img'+item.cardId"></icon>
+											<!-- 需要改成从接口获取的 -->
+											<img class="content-img" src="https://ezy-app.oss-cn-beijing.aliyuncs.com/test/resource/uploadFile02dcefaa15894a99afa5cb95a1f02e89.png">
 											<view class="content-body-box">
-												<view class="content-name">SVIP终身卡</view>
-												<view class="content-tag">终身有效</view>
-												<view class="content-yuanjia">¥{{item.cardYuanjia}}</view>
+												<view class="content-name">数学暑假进阶L1</view>
+												<view class="content-text">适用于L1和学前，介绍介绍，适用于L1和学前，介绍介绍适用于L1和学前，介绍介绍</view>
+												<view class="content-money-box">
+													<view class="order-kcb-btn">课程包明细<icon></icon></view>
+													<text class="content-yuanjia">¥{{item.money}}</text>
+												</view>
 											</view>
 										</view>
-										<view class="order-bottom-box">
-											<view class="bottom-money-box">
-												<text class="bottom-data">{{item.ctime}}</text>
-												<text class="bottom-money">实付款：¥{{item.money}}</text>
-											</view>
-											<!--  v-if="item.status ==1" -->
-											<view class="bottom-btn" v-if="item.status ==1" @click="handlePay(item)">去支付</view>
+										<view class="order-bottom-box" v-if="item.status ==1">
+											<!-- 微信 -->
+											<view class="pay-status-box" v-if="showPayWay" @click="switchPayWay"><icon class="wx-icon"></icon>微信</view>
+											<!-- 支付宝 -->
+											<view class="pay-status-box" v-if="!showPayWay" @click="switchPayWay"><icon class="zfb-icon"></icon>支付宝</view>
+											<!-- 苹果 -->
+											<view class="pay-status-box apple-status-box" v-if="false"><icon class="apple-icon"></icon>apple</view>
+											<view class="pay-btn" @click="handlePay(item)">立即支付</view>
 										</view>
 									</template>
 								</uni-list-item>
@@ -113,17 +130,15 @@
 											</view>
 										</view>
 										<view class="order-content-box">
-											<icon :class="'content-img'+item.cardId"></icon>
+											<!-- 需要改成从接口获取的 -->
+											<img class="content-img" src="https://ezy-app.oss-cn-beijing.aliyuncs.com/test/resource/uploadFile02dcefaa15894a99afa5cb95a1f02e89.png">
 											<view class="content-body-box">
-												<view class="content-name">SVIP终身卡</view>
-												<view class="content-tag">终身有效</view>
-												<view class="content-yuanjia">¥{{item.cardYuanjia}}</view>
-											</view>
-										</view>
-										<view class="order-bottom-box">
-											<view class="bottom-money-box">
-												<text class="bottom-data">{{item.ctime}}</text>
-												<text class="bottom-money">实付款：¥{{item.money}}</text>
+												<view class="content-name">数学暑假进阶L1</view>
+												<view class="content-text">适用于L1和学前，介绍介绍，适用于L1和学前，介绍介绍适用于L1和学前，介绍介绍</view>
+												<view class="content-money-box">
+													<text class="content-yuanjia">¥{{item.money}}</text>
+													<view class="order-kcb-btn">课程包明细<icon></icon></view>
+												</view>
 											</view>
 										</view>
 									</template>
@@ -137,6 +152,7 @@
 				</view>
 			</view>
 		</view>
+		<product-dialog ref="mallProductPopup" @payBtn="payBtn"></product-dialog>
 		<CustomTabBar></CustomTabBar>
 	</view>
 </template>
@@ -159,6 +175,15 @@
 	} from "@/utils/common";
 	import cacheManager from '@/utils/cacheManager.js';
 	import CustomTabBar from '@/components/custom-tabbar/custom-tabbar.vue';
+	import productDialog from '../mall/productDialog.vue'
+	const mallProductPopup = ref(null);
+	const showPayWay = ref(true)
+	function switchPayWay(){
+		showPayWay.value = !showPayWay.value
+	}
+	function detailBtn(){
+		mallProductPopup.value.detailShow();
+	}
 	const dingdanData = reactive({
 		items: ['全部', '待付款', '已付款'],
 		current: 0,