From 99c292820b389e83da694c715362434fd564f44e Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Thu, 27 Jun 2024 11:15:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/guide-pages/guide-pages.vue |  4 ++--
 pages/course/courseDetail.vue          |  9 ++++-----
 pages/course/coursePrice.vue           |  4 ++--
 pages/course/myCourseLearn.vue         | 14 +++++++-------
 pages/mine/mine/index.vue              |  8 ++++----
 pages/mine/vip/index.vue               |  2 ++
 pages/user/login.vue                   |  4 ++--
 7 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/components/guide-pages/guide-pages.vue b/components/guide-pages/guide-pages.vue
index 3c66da0..d228785 100644
--- a/components/guide-pages/guide-pages.vue
+++ b/components/guide-pages/guide-pages.vue
@@ -127,7 +127,7 @@
 
 		.close_btj {
 			position: absolute;
-			top: 50%;
+			top: 60%;
 			left: 50%;
 			width: 290rpx;
 			height: 68rpx;
@@ -137,7 +137,7 @@
 
 		.close_1624 {
 			position: absolute;
-			top: 50%;
+			top: 60%;
 			left: 50%;
 			width: 290rpx;
 			height: 68rpx;
diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue
index 450525a..ab841fc 100644
--- a/pages/course/courseDetail.vue
+++ b/pages/course/courseDetail.vue
@@ -7,9 +7,9 @@
     <public-module></public-module>
     <!-- <z-nav-bar :title="pageTitle ? pageTitle : '课程详情'"> -->
 	<z-nav-bar title="课程介绍">
-		<view class="curseSet" slot="right" @click="newOnShare">
-			<uni-icons type="redo" size="26"></uni-icons><text style="font-size: 26rpx;"></text> 分享课程</view>
-	
+		<!-- <view class="curseSet" slot="right" @click="newOnShare">
+			<uni-icons type="redo" size="26"></uni-icons><text style="font-size: 26rpx;"></text> 分享课程
+		</view> -->	
 	</z-nav-bar>
 
     <view class="contentBox commonPageContentBox">
@@ -42,8 +42,7 @@
         </template>
       </u-alert>
 
-      <scroll-view
-        
+      <scroll-view        
         scroll-y="true"
         class="scroll-Y"
       >
diff --git a/pages/course/coursePrice.vue b/pages/course/coursePrice.vue
index 9e95901..8da110b 100644
--- a/pages/course/coursePrice.vue
+++ b/pages/course/coursePrice.vue
@@ -299,8 +299,8 @@
 						price: val.activityPrice && val.activityPrice != 0 ? val.activityPrice : val.price,
 						goodsType: val.goodsType,
 					}, ],
-					navTitle: this.options.navTitle,
-					title: this.options.title,
+					navTitle: val.productName,
+					title: val.productName,
 					typeId: 0,
 				}); // 这里转换成 字符串
 
diff --git a/pages/course/myCourseLearn.vue b/pages/course/myCourseLearn.vue
index cd8d11f..a9d3d11 100644
--- a/pages/course/myCourseLearn.vue
+++ b/pages/course/myCourseLearn.vue
@@ -28,12 +28,12 @@
 			<view :class="['coursePart','flexbox',fixed ? 'fixed' : '']" v-if="librayList.length > 1">
 				<view :class="['item','flexbox',curId == item.id? 'active': '' ]" v-for="(item, index) in librayList"
 					:key="index" @click="clicklib(item,index)">
-					<u-icon v-if="item.isBuy == 0 && curId == item.id" name="lock" color="#258feb" size="28"></u-icon>
-					<u-icon v-if="item.isBuy == 0 && curId != item.id" name="lock" color="#fff" size="28"></u-icon>
+					<u-icon v-if="item.isBuy == 0 && userMsg.vip == 0" name="lock" color="#258feb" size="28"></u-icon>
+					<u-icon v-if="item.isBuy == 0 && userMsg.vip == 0" name="lock" color="#fff" size="28"></u-icon>
 					<view class="">{{item.title}}</view>
 				</view>
 			</view>
-			<view :class="['courseList',fold ? 'fold' : '', librayList[curIndex].isBuy == 1 || userMsg.vip != 0 ? '' : 'lock']" v-if="courseList.length > 0">
+			<view :class="['courseList',fold ? 'fold' : '', librayList[curIndex].isBuy == 0 && userMsg.vip == 0 ? 'lock' : '']" v-if="courseList.length > 0">
 			<!-- 目录是否已经购买 -->
 			<!-- 0:普通 1超级 2医学 3国学 -->
 			<view class="endBox" v-if="librayList[curIndex].isBuy == 1 && userMsg.vip == '0'">
@@ -65,7 +65,7 @@
 							color="#258feb" size="28"></u-icon></view>
 					<text>收 起</text>
 				</view> -->								
-				<view class="buyBox flexbox" v-if="librayList[curIndex].isBuy == 0">
+				<view class="buyBox flexbox" v-if="librayList[curIndex].isBuy == 0 && userMsg.vip == 0">
 					<!-- 普通未购买 -->
 					<view class="item">
 						<text>您未购买此目录课程或已到期，购买后或开通 <text style="font-weight: bold;">超级VIP</text> 即可学习本目录课程</text> <view class="tag-view">
@@ -795,8 +795,8 @@
 						price: val.activityPrice && val.activityPrice != 0 ? val.activityPrice : val.price,
 						goodsType: val.goodsType,
 					}, ],
-					navTitle: this.options.navTitle,
-					title: this.options.title,
+					navTitle: val.productName,
+					title: val.productName,
 					typeId: 0,
 				}); // 这里转换成 字符串
 			
@@ -1460,7 +1460,7 @@
 			}
 		}
 	}
-	.courseList.lock{height: 800rpx; overflow: hidden; position: relative;}
+	.courseList.lock{height: 800rpx; overflow: hidden !important; position: relative;}
 
 	.containerBg1 {
 		// border-top: 1px solid #fff;
diff --git a/pages/mine/mine/index.vue b/pages/mine/mine/index.vue
index 64dea9c..674cdd6 100644
--- a/pages/mine/mine/index.vue
+++ b/pages/mine/mine/index.vue
@@ -370,10 +370,10 @@ export default {
           type: "pageJump",
         },
 
-        {
-          name: "分享APP",
-          type: "share",
-        },
+        // {
+        //   name: "分享APP",
+        //   type: "share",
+        // },
 
         {
           name: "关于我们",
diff --git a/pages/mine/vip/index.vue b/pages/mine/vip/index.vue
index a187c41..766f919 100644
--- a/pages/mine/vip/index.vue
+++ b/pages/mine/vip/index.vue
@@ -286,6 +286,7 @@ export default {
                     quanyi: this.superQuanyi,
                   });
                 } else if (i == "sociology" || i == "sociology_hd") {
+					console.log('i+++++++++++++++++',i)
                   this.dataList.push({
                     title: "吴门医述VIP",
                     key: "sociology",
@@ -303,6 +304,7 @@ export default {
                 }
               }
             }
+			console.log(' this.dataList++++++++', this.dataList)
           }
         });
     },
diff --git a/pages/user/login.vue b/pages/user/login.vue
index 3d37b5d..138871c 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -118,9 +118,9 @@
 				</view>
 			</view>
 
-			<view class="youKeL" style="margin-bottom: 80rpx;">
+			<!-- <view class="youKeL" style="margin-bottom: 80rpx;">
 				<view @click="onPageJump('/pages/user/visitor')">免登陆体验</view>
-			</view>
+			</view> -->
 
 
 			<z-popup v-model="HealthOpen" type="center" :hideOnBlur="false">