样式修改

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,