修改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

pages/curriculum/order/curriculum/index.vue

@@ -38,16 +38,12 @@
 					<view class="course_info_box">
 						<view class="course_info">
 							<view class="flexbox course_title" v-if="curriculumData.id">
-								<text class="courseTitle title">{{
+								<text class="courseTitle title">{{curriculumData.title}}</text>
-                  curriculumData.title
-                }}</text>
 							</view>
 							<view style="color: #b0b0b0; padding: 0 20rpx">
 								{{
                   cateList && cateList.length > 0
-                    ? `共${cateList.length}个目录`
+                    ? `共${cateList.length}个目录`}}
-                    : ""
-                }}
 							</view>
 							<view class="containerBg" v-if="curriculumData.content && curriculumData.content != ''">
 								<view class="prof">
@@ -68,9 +64,7 @@
 						<view class="top">
 							<view class="line"></view>
 							<view class="left">
-								<text style="font-weight: blod" class="catalogue_title">{{
+								<text style="font-weight: blod" class="catalogue_title">{{slotProps.data.title}}</text>
-                  slotProps.data.title
-                }}</text>
 							</view>
 							<view class="not_purchased">
 								<view class="spot"></view>
@@ -384,7 +378,9 @@
 									role = '国学';
 								}else if(type==8){
 									role = '心理学';
-								}
+								}else if(type==9){
+									role = '中西汇通学';
+							}
 								this.goBuyTitle = '尊贵的'+role+'VIP，您的有效期到'+res.userVip.endTime;
 								this.goBuyType = 1;
 							}else{  //否则没有开通vip
@@ -422,6 +418,8 @@
 								text = '国学';
 							}else if(item=='8'){
 								text = '心理学';
+							}else if(item=='9'){
+								text = '中西汇通学';
 							}
 							this.textList.push(text);
 						});

pages/mine/mine/index.vue

@@ -30,13 +30,13 @@
 					</view>
 				</view>
 				
-				<view class="userInfoBox" style="margin-left: 30rpx;">
+				<view class="userInfoBox" style="margin-left: 20rpx;">
 					<view class="name">昵称：{{ userMes.nickname ? userMes.nickname : "未设置" }}</view>
 					<view class="name" style="color: #606266 !important;font-weight: normal;font-size: 28rpx;" v-if="userMes.tel">手机号：({{ userMes.tel }})</view>
 					
 					<template v-if="isAndorid&&textList.length>0">
 						<view class="vip_type">
-							<view class="vip_type_item" v-for="(item,index) in textList" :key="index">
+							<view class="vip_type_item" :class="textList.length>4?'vip_type_item_len':''" v-for="(item,index) in textList" :key="index">
 								{{item}}<image src="@/static/icon/chao_vip.png"></image>
 							</view>
 						</view>
@@ -97,9 +97,7 @@
 										style="float: right; margin: 0 6rpx"></u-icon>
 								</view>
 
-								<view class="text" style="line-height: 40rpx; display: flex">{{
+								<view class="text" style="line-height: 40rpx; display: flex">{{userMes.peanutCoin ? userMes.peanutCoin : 0}}</view>
-                  userMes.peanutCoin ? userMes.peanutCoin : 0
-                }}</view>
 							</view>
 
 							<view class="chong_list_item" style="
@@ -112,9 +110,7 @@
 									积分
 								</view>
 
-								<view class="text" style="line-height: 40rpx">{{
+								<view class="text" style="line-height: 40rpx">{{userMes.jf ? userMes.jf : 0}}</view>
-                  userMes.jf ? userMes.jf : 0
-                }}</view>
 
 
 							</view>
@@ -130,9 +126,7 @@
               >
                 <view class="pay_item_img"> 优惠券 </view>
 
-                <view class="text" style="line-height: 40rpx">{{
+                <view class="text" style="line-height: 40rpx">{{userCouponNum}}</view>
-                  userCouponNum
-                }}</view>
               </view>
 						</view>
 						<view class="chong_list_item" style="
@@ -629,6 +623,9 @@
 					}else if(item.type=='8'){
 						item.text = '心理学';
 						this.textList.push(item.text);
+					}else if(item.type=='9'){
+						item.text = '中西汇通学';
+						this.textList.push(item.text);
 					}else if(item.type=='1'){
 						item.text = '医学S';
 					}else if(item.type=='2'){
@@ -652,7 +649,7 @@
 
 	.per_mes {
 		position: relative;
-		margin: 0rpx 20rpx 0rpx 20rpx;
+		margin: 0rpx 0rpx 0rpx 20rpx;
 		align-items: center;
 		display: flex;
 		align-items: center;
@@ -1333,12 +1330,19 @@
 		padding: 0 10rpx;
 		background: linear-gradient(90deg, #258feb 0%, #00e1ec 100%);
 		border-radius: 20rpx;
-		font-size: 20rpx;
+		font-size: 18rpx;
 		line-height: 40rpx;
 		height: 40rpx;
 		font-weight: bold;
 		color: #fff;
-		margin-right: 10rpx;
+		margin-right: 8rpx;
+	}
+	.vip_type_item_len{
+		padding: 0 7rpx;
+		font-size: 13rpx;
+		line-height: 34rpx;
+		height: 34rpx;
+		margin-right: 4rpx;
 	}
 	.vip_type_item:last-child{
 		margin-right: 0;

pages/mine/vip/index.vue

@@ -39,7 +39,7 @@
 				</view>
 				<view class="vip_qx">
 					<text class="font_bold" style=" display: block;">VIP权限：</text>
-					<view class="vip_qx_v" v-if="item.type==1">无限制观看吴门医述APP中医学、针灸学、肿瘤学三个板块任意课程；</view>
+					<view class="vip_qx_v" v-if="item.type==1">无限制观看吴门医述APP中医学、中西汇通学、针灸学、肿瘤学四个板块任意课程；</view>
 					<view class="vip_qx_v" v-else-if="item.type==2">无限制观看众妙之门APP与吴门医述APP心理学板块任意课程；</view>
 					<view class="vip_qx_v" v-else-if="item.type==7">无限制观看众妙之门APP任意课程；</view>
 					<view class="vip_qx_v" v-else>无限制观看吴门医述APP{{item.title.replace(/VIP/g, '')}}板块任意课程；</view>