From b262de009e0e92210b6a2d6d44d880a0de21583f Mon Sep 17 00:00:00 2001
From: liuyuan <liuyuan@artspring.com.cn>
Date: Wed, 19 Feb 2025 16:11:29 +0800
Subject: [PATCH] =?UTF-8?q?vip=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/bookShop/orderList.vue  | 56 ++---------------------------------
 pages/course/courseDetail.vue | 10 +++----
 pages/goods/order/index.vue   |  2 +-
 pages/mine/vip/index.vue      |  4 +++
 4 files changed, 12 insertions(+), 60 deletions(-)

diff --git a/pages/bookShop/orderList.vue b/pages/bookShop/orderList.vue
index 49f8a5a..8b5fc5c 100644
--- a/pages/bookShop/orderList.vue
+++ b/pages/bookShop/orderList.vue
@@ -3,20 +3,7 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<z-nav-bar title="我的订单" bgColor="#258feb" fontColor="#fff" :backState="2000">
-			<!-- <template slot="left">
-        <u-icon 
-          @click="goHome"
-          name="home"
-          color="#fff"
-          size="22"
-          style="display: inline-block; margin-left: 30rpx"
-        ></u-icon>
-      </template> -->
 		</z-nav-bar>
-
-		<!-- 顶部导航栏 -->
-		<!-- <z-nav-bar backState="2000" title="我的订单"></z-nav-bar> -->
-
 		<view class="cateList flexbox">
 			<common-sticky itemStyle="width:20%; height: 68rpx;font-size:24rpx;" :list="ordersTabs" label="name"
 				:currentCateIndex="currentCateIndex" @handleselectCate="ordersTabCLi"></common-sticky>
@@ -333,22 +320,6 @@
 				</view>
 			</common-list>
 		</view>
-		<!-- <view v-if="status == 0" style="text-align: center">
-      <u-loading-icon style="display: inline-block"></u-loading-icon>
-      <font
-        style="
-          vertical-align: super;
-          margin-left: 10px;
-          font-size: 26rpx;
-          color: #909399;
-        "
-        >努力加载中</font
-      >
-    </view>
-    <view v-if="status == 1" style="padding-bottom: 20rpx">
-      <u-divider v-if="newList.length > 0" text="全部加载完成"></u-divider>
-      <u-divider v-else text="暂无订单"></u-divider>
-    </view> -->
 
 		<!-- 对话框 -->
 		<u-popup :show="pingjiaShow" :round="10" @close="closePingjia">
@@ -409,7 +380,6 @@
 		<z-navigation></z-navigation>
 		<u-action-sheet :closeOnClickAction="true" :closeOnClickOverlay="true" :actions="moreList" :show="isShowMore"
 			cancelText="关闭" @close="isShowMore = false" @select="selectClick"></u-action-sheet>
-		<!-- <music-play :playData="playData"></music-play> -->
 	</view>
 </template>
 
@@ -511,41 +481,23 @@
 			};
 		},
 		onPullDownRefresh() {
-			console.log("下拉刷新了");
 			uni.stopPullDownRefresh();
 
 			this.newestpage = 1;
-			// this.hotestpage = 1
-			// this.booksetpage = 1
 			this.newList = [];
-			// this.hotList = []
-			// this.bookList = []
 			this.getBookList(this.ordersListTab, false);
 		},
 		onReachBottom() {
 			this.newestpage++;
-			// this.hotestpage++
-			// this.booksetpage++
 			this.getBookList(this.ordersListTab, false);
 		},
 		onLoad(e) {
 			this.windowWidth = uni.getSystemInfoSync().windowWidth;
-			console.log(e, "onload111");
-			// this.bookid = e.bookid
 			this.options = e;
-			// this.newList = [];
-			// this.pagination = {
-			//   page: 1, //页码
-			//   limit: 20, //每页显示
-			//   total: 0, //总条数
-			// };
-			// this.$nextTick(() => {
-			//   this.ordersTabCLi(this.ordersTabs[0],0);
-			//   // this.getBookList(null, false);
-			// });
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
 		},
 		async onShow() {
-			uni.hideTabBar();
 			this.newList = [];
 			this.pagination = {
 				page: 1, //页码
@@ -563,9 +515,6 @@
 				limit: 20, //每页显示
 				total: 0, //总条数
 			};
-			// this.$nextTick(async () => {
-			//   await this.ordersTabCLi(this.ordersTabs[0], 0);
-			// });
 		},
 		onReady() {},
 		computed: {
@@ -1434,6 +1383,7 @@
 
 	.commonDetailPage {
 		background-color: $themeBgColor;
+		height: calc(100vh);
 	}
 
 	.order_box {
diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue
index cf6b90a..cc11a0b 100644
--- a/pages/course/courseDetail.vue
+++ b/pages/course/courseDetail.vue
@@ -17,6 +17,7 @@
 				<image v-if="!course.image" src="/static/nobg.jpg" mode="widthFix"></image>
 				<image v-else :src="course.image" mode="widthFix"></image>
 			</view>
+			
 			<view class="containerBg1">
 				<view class="course_info_box">
 					<view class="course_info">
@@ -248,7 +249,7 @@
 									<view class="shitingTag">
 										<u-icon
 											v-if="librayList[curIndex].isBuy == 0 && userVip==null && item.isAudition == 0"
-											name="lock" color="#258feb" size="28"></u-icon>
+											name="lock" color="#258feb" size="26"></u-icon>
 									</view>
 
 								</view>
@@ -564,15 +565,13 @@
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
 			this.windowWidth = uni.getSystemInfoSync().windowWidth;
-			// this.pageTitle = e.title
-			console.log(e, "传入分类id");
 			this.getUserInfo();
 			
 			this.courseId = e.id;
 			//是否是vip
 			this.getCourseByVip();
 			this.getSayList();
-			this.getOS()
+			this.getOS();
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
@@ -1099,7 +1098,6 @@
 							},
 						})
 						.then(async (res) => {
-							console.log("res at line 493:", res);
 							if (res.code == 0) {
 								this.getCourseDescriptionData(v);
 							}
@@ -3071,7 +3069,7 @@
 	.describe_block button{
 		display: inline-block;
 		text-align: center;
-		width: 150rpx;
+		width: 125rpx;
 		font-size: 24rpx;
 		color: #fff;
 		border-radius: 10rpx;
diff --git a/pages/goods/order/index.vue b/pages/goods/order/index.vue
index 56c3caf..492b190 100644
--- a/pages/goods/order/index.vue
+++ b/pages/goods/order/index.vue
@@ -1330,7 +1330,7 @@ export default {
         that.submitorder(data);
       }
     },
-
+	//支付操作
     async submitorder(data) {
       uni.showLoading({
         title: "正在请求订单",
diff --git a/pages/mine/vip/index.vue b/pages/mine/vip/index.vue
index aaa88e5..169209b 100644
--- a/pages/mine/vip/index.vue
+++ b/pages/mine/vip/index.vue
@@ -93,6 +93,9 @@ export default{
 	methods: {
 		//获取数据
 		getData(){
+			uni.showLoading({
+				title: '加载中'
+			})
 			$http.request({
 				url: "common/userVip/getVipBuyConfigList",
 				method: "POST",
@@ -102,6 +105,7 @@ export default{
 				},
 			})
 			.then(res => {
+				uni.hideLoading();
 				if (res.code == 0) {
 					this.list = res.res;
 				}