wangguoyu 1 month ago
parent
commit
9401ac84b9
2 changed files with 42 additions and 24 deletions
  1. 1 4
      pages.json
  2. 41 20
      pages/chanpinShop/cp1/dingdan.vue

+ 1 - 4
pages.json

@@ -36,10 +36,7 @@
 		{
 			"path": "pages/chanpinZiliao/index",
 			"style": {
-				"navigationStyle": "custom",
-				"app-plus": {
-					"animationType": "none"
-				}
+				"navigationStyle": "custom"
 			}
 		},
       {

+ 41 - 20
pages/chanpinShop/cp1/dingdan.vue

@@ -7,30 +7,30 @@
 		<view class="qrdd-body-box">
 			<!-- 卡片 -->
 			<view class="dd-item-box">
-			  <!-- 封面 -->
-			  <image class="item-img-box" :src="data.cover" mode=""></image>
-			  <view class="item-content-box">
-				<!-- 名称 -->
-				<view class="item-name">{{data.name}}</view>
-				<!-- 简介 -->
-				<view class="item-intro">{{data.intro}}</view>
-				<!-- 价格 -->
-				<view class="item-xianjia">¥{{xianjia}}</view>
-			  </view>
-			  <view class="item-play-btn"></view>
+				<!-- 封面 -->
+				<image class="item-img-box" :src="data.cover" mode=""></image>
+				<view class="item-content-box">
+					<!-- 名称 -->
+					<view class="item-name">{{data.name}}</view>
+					<!-- 简介 -->
+					<view class="item-intro">{{data.intro}}</view>
+					<!-- 价格 -->
+					<view class="item-xianjia">¥{{xianjia}}</view>
+				</view>
+				<view class="item-play-btn"></view>
 			</view>
 			<!-- 等级 -->
 			<view class="qrdd-border-box">
 				<view class="kcxxdj-title">课程学习等级</view>
 				<view class="kcxxdj-tc-box">
 					<!-- 套餐 -->
-					<ezyActiveVue class="ezy-btn-active tc-item" v-for="item in data.taocanList" @click="handleSelectTaoCan(item)"
-						:class="{active: item.taocanId == activeTaocan.taocanId}">
+					<ezyActiveVue class="ezy-btn-active tc-item" v-for="item in data.taocanList"
+						@click="handleSelectTaoCan(item)" :class="{active: item.taocanId == activeTaocan.taocanId}">
 						{{item.name}}
 					</ezyActiveVue>
 				</view>
 			</view>
-			
+
 			<!-- 商品总价 -->
 			<view class="qrdd-border-box">
 				<view class="border-row">
@@ -57,12 +57,12 @@
 							}"></icon>
 							<text>{{item.name}}</text>
 						</view>
-						<radio :value="item.value" :checked="index === current" style="transform:scale(0.7)"/>
+						<radio :value="item.value" :checked="index === current" style="transform:scale(0.7)" />
 					</label>
 				</radio-group>
 			</template>
 		</view>
-		
+
 		<!-- 支付区 -->
 		<view class="qrdd-footer-box">
 			<view class="jg-box">
@@ -100,7 +100,7 @@
 	import {
 		getUserIsYouke
 	} from "@/utils/common.js"
-		import cacheManager from "@/utils/cacheManager.js";
+	import cacheManager from "@/utils/cacheManager.js";
 	const currentPlatform = ref(null);
 
 	function isIOSorAndroid() {
@@ -169,9 +169,30 @@
 			// 支付成功删除contentInfo 缓存
 			cacheManager.remove("contentInfo");
 			// zhifu='success' 用于判断在订单页 游客模式ios支付成功情况,要去弹出弹窗
-			uni.navigateTo({
-				url: "/pages/chanpinMy/order?zhifu=success"	
-			})
+			// uni.navigateTo({
+			// 	url: "/pages/chanpinMy/order?zhifu=success"
+			// })
+			uni.showLoading({
+				title: '跳转中...',
+				mask: true
+			});
+			uni.switchTab({
+				url: "/pages/chanpinMy/my" // 你的F页面实际路径(不变)
+			});
+			setTimeout(() => {
+				uni.navigateTo({
+					url: "/pages/chanpinMy/order?zhifu=success", // 你的D页面路径+保留zhifu=success传参
+					success: () => {
+						uni.hideLoading();
+					},
+					fail: () => {
+						uni.hideLoading();
+						toast("跳转失败,请重试");
+					}
+				});
+			}, 300);
+
+
 
 		}, //支付成功
 		applePayError: () => {}, // 苹果内购失败