vip功能发布

pages/component/commonComponents/anchorLink.vue

@@ -330,7 +330,7 @@
 		background: white;
 		position: absolute;
 
-		min-height: 60vh;
+		min-height: 100vh;
 
 		.header {
 			height: 100rpx;

pages/curriculum/order/curriculum/index.vue

@@ -74,10 +74,15 @@
 							</view>
 							<view class="not_purchased">
 								<view class="spot"></view>
-								<text v-if="userVip==null&&slotProps.data.isBuy!=1">未购买</text>
-
-								<text v-if="userVip!=null">有效期至{{ userVip.endTime }}
-								</text>
+								<view v-if="slotProps.data.type!=0">
+									<text v-if="userVip==null&&slotProps.data.isBuy!=1">未购买</text>
+									<view v-if="userVip==null&&slotProps.data.isBuy==1">
+										<text v-if="slotProps.data.endTime">课程有效期截止到：{{slotProps.data.endTime}} </text>
+										<text v-else>已购买</text>
+									</view>
+									
+									<text v-if="userVip!=null">有效期至{{ userVip.endTime }}</text>
+								</view>
 							</view>
 
 							<view class="right">
@@ -93,7 +98,7 @@
 					</view>
 				</view>
 			</template>
-
+			
 			<template slot="contentList" slot-scope="slotProps">
 				<view class="containerBg2">
 					<view class="shiting_content">
@@ -121,7 +126,7 @@
 
 										<view class="shitingTag">
 											<u-icon
-												v-if="cateList[0].isBuy == 0 && userVip==null && slotProps.row.isAudition == 0"
+												v-if="cateList[0].type!=0 && cateList[0].isBuy == 0 && userVip==null && slotProps.row.isAudition == 0"
 												name="lock" color="#258feb" size="26"></u-icon>
 										</view>
 									</template>
@@ -577,7 +582,7 @@
 			async gotoDetail(v, index) {
 				if (
 					this.cateList[this.currentCateIndex].isBuy == 1 ||
-					v.isAudition == 1 ||
+					v.isAudition == 1 || this.cateList[this.currentCateIndex].type==0 ||
 					this.userVip!=null
 				) {
 					uni.navigateTo({

pages/curriculum/order/index/index.vue

@@ -155,34 +155,21 @@ export default {
       searchValue: "",
       // 一级分类标题1
       cateList: [
+		{
+			title: "我的课程",
+			type: 1,
+			apiUrl: "sociology/course/getUserCourseBuy",
+		},
         {
           title: "正在学习",
           type: 0,
           apiUrl: "sociology/course/getUserCourseStudying",
         },
-        {
-          title: "我的课程",
-          type: 1,
-          // apiUrl: "sociology/course/getUserCourseBuy",
-          apiUrl: "sociology/course/getUserCourseBuy",
-        },
-
         {
           title: "过期课程",
           type: 2,
           apiUrl: "sociology/course/getCourseExpire",
-        },
-        // {
-        //   title: "未开始",
-        //   type: 2,
-        // },
-
-        // {
-        //     title: "其他",
-        //     type: 4,
-        //     oid: 'd0f47071c2194e94845fbb373d06f59d',
-
-        // }
+        }
       ], // 一级分类标题1
       twoCateList: [], // 二级分类标题
 

pages/curriculum/order/index/mao.vue

@@ -239,7 +239,7 @@
 <style lang="scss">
 .wrapper{
 	background: white;
-	min-height: 60vh;
+	min-height: 100vh;
 	.header{
 		height: 100rpx;
 		background: orange;