vip功能发布

config/baseUrl.js

@@ -2,12 +2,12 @@ let baseUrl = "";
 let socketUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
-	baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
+	//baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
-	//baseUrl = "https://api.nuttyreading.com/"; // 线上正式
+	baseUrl = "https://api.nuttyreading.com/"; // 线上正式
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境11	
-	baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
+	//baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
-	//baseUrl = "https://api.nuttyreading.com/"; //1
+	baseUrl = "https://api.nuttyreading.com/"; //1
 }
 const courtConfig = {
 	//微信公众号APPID

manifest.json

@@ -6,12 +6,14 @@
         "request" : 3000
     },
     "transformPx" : false,
-	"icons": [{
+    "icons" : [
+        {
             "sizes" : "分辨率，192x192",
             "src" : "图片路径"
-	}],
+        }
-	"versionName": "1.0.22",
+    ],
-	"versionCode": 1022,
+    "versionName" : "1.0.23",
+    "versionCode" : 1023,
     "app-plus" : {
         "nvueCompiler" : "weex",
         "compatible" : {
@@ -268,3 +270,4 @@
     }
 }
 // 小程序特有相关
+

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>
+								<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 v-if="userVip!=null">有效期至{{ userVip.endTime }}</text>
-								</text>
+								</view>
 							</view>
 
 							<view class="right">
@@ -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;