vip功能

2025-02-19 11:50:43 +08:00
parent 0b975c2418
commit 3afba2870e
34 changed files with 793 additions and 2303 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
--- a/.idea/dictionaries
+++ b/.idea/dictionaries
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectDictionaryState">
+    <dictionary name="liuyuan" />
+  </component>
+</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/sociology_app.iml" filepath="$PROJECT_DIR$/.idea/sociology_app.iml" />
+    </modules>
+  </component>
+</project>
--- a/.idea/sociology_app.iml
+++ b/.idea/sociology_app.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
--- a/.idea/vagrant.xml
+++ b/.idea/vagrant.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VagrantProjectSettings">
+    <option name="instanceFolder" value="" />
+    <option name="provider" value="" />
+  </component>
+</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="dfe45a93-1e39-4dfb-998a-b7e9e7e56d8f" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/pages/component/input/input.nvue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/tabBar/extUI/extUI.nvue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/tabBar/template/template.nvue" beforeDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectId" id="2oVBuLEFt2modl2kF1Af1nW7QEi" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="nodejs.protractor.protractor_package" value="" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="settings.editor.selected.configurable" value="com.github.masahirosuzuka.PhoneGapIntelliJPlugin.PhoneGapConfigurationProvider" />
+    <property name="vue.rearranger.settings.migration" value="true" />
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="SvnConfiguration">
+    <configuration>$USER_HOME$/.subversion</configuration>
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="dfe45a93-1e39-4dfb-998a-b7e9e7e56d8f" name="Default Changelist" comment="" />
+      <created>1730945085136</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1730945085136</updated>
+      <workItem from="1730945086809" duration="384000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+</project>
--- a/bkhumor-emojiplus/.DS_Store
+++ b/bkhumor-emojiplus/.DS_Store
--- a/components/.DS_Store
+++ b/components/.DS_Store
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -2,42 +2,12 @@ let baseUrl = "";
 let socketUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
-	// baseUrl = "http://localhost:7001/";
-	// socketUrl = "ws://localhost:6001/";
-	// baseUrl = "https://twin-ui.com/demo/";
-	// baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
-	// baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
-
-
-
-
-	baseUrl = "https://api.nuttyreading.com/"; // 线上正式
-
-
-	// baseUrl = "http://101.201.146.165:8088/App-EH/";   // 一路健康APP线上正式
-
-
-	// baseUrl = "http://192.168.110.100:9200/pb/";    //  开发用电脑
-	// baseUrl = "http://59.110.212.44:9200/pb/";
-	// baseUrl = "http://192.168.110.100:9100/pb/";    //  开发用电脑
-
-
-	// baseUrl = "http://192.168.110.110:9200/pb/"; //磊哥
-
-
-
-	// baseUrl = "http://192.168.110.38:9200/pb/";        // 吴春磊笔记本1
-	// socketUrl = "ws://8.129.186.35:6001/";
+	baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
+	//baseUrl = "https://api.nuttyreading.com/"; // 线上正式
 } else if (process.env.NODE_ENV === 'production') {
-	// baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
+	baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
 	// 生产环境11	
-
-	// baseUrl = "http://192.168.110.110:9200/pb/"; //磊哥
-	// baseUrl = "http://59.110.212.44:9100/pb/";
-	// baseUrl = "https://testapi.nuttyreading.com/";
-	baseUrl = "https://api.nuttyreading.com/"; //1
-	// baseUrl = "ws://twin-ui.com:6001/";
-	// socketUrl = "ws://twin-ui.com:6001/";
+	//baseUrl = "https://api.nuttyreading.com/"; //1
 }
 const courtConfig = {
 	//微信公众号APPID
--- a/config/requestConfig.js
+++ b/config/requestConfig.js
@@ -39,7 +39,8 @@ let $http = new request({
 		// 'Content-Type': 'application/json;charset=UTF-8',
 		'Content-Type': 'application/x-www-form-urlencoded',
 		// 'project_token': base.projectToken, //项目token（可删除）
-	}
+	},
+	timeout: '15000' // 15秒
 });
 // 添加获取七牛云token的方法
 $http.getQnToken = function (callback) {
--- a/js_sdk/.DS_Store
+++ b/js_sdk/.DS_Store
--- a/node_modules/.DS_Store
+++ b/node_modules/.DS_Store
--- a/pages/.DS_Store
+++ b/pages/.DS_Store
--- a/pages/bookShop/orderList.vue
+++ b/pages/bookShop/orderList.vue
@@ -1421,6 +1421,7 @@

 	.commonDetailPage {
 		background-color: $themeBgColor;
+		height: calc(100vh);
 	}

 	.order_box {
--- a/pages/component/input/input.nvue
+++ b/pages/component/input/input.nvue
--- a/pages/curriculum/order/curriculum/detail.vue
+++ b/pages/curriculum/order/curriculum/detail.vue
@@ -1,10 +1,5 @@
-<template><page-meta
-  :page-font-size="$baseFontSize() + 'px'"
-  :root-font-size="$baseFontSize() + 'px'"
-></page-meta>
+<template>
  <view class="container commonPageBox commonDetailPage">
-    <!-- 公共组件-每个页面必须引入 -->
-    <public-module></public-module>
    <template v-show="!screenLoading">
      <z-nav-bar bgColor="#333" fontColor="#fff" title="教学内容"></z-nav-bar>

--- a/pages/curriculum/order/curriculum/index.vue
+++ b/pages/curriculum/order/curriculum/index.vue
@@ -65,8 +65,6 @@
 								<text class="courseTitle title">{{
                  curriculumData.title
                }}</text>
-
-								<!-- <view class="start_learn_btn PM_font">进入学习</view> -->
 							</view>
 							<view style="color: #b0b0b0; padding: 0 20rpx">
 								{{
@@ -159,17 +157,11 @@
                          slotProps.row.viewFlg == 1 ? 'aui-text-success' : ''
                        }`">{{ slotProps.row.title }}</text>
 										</view>
-
-										<!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
 									</template>

 									<template slot="leftSlot" slot-scope="slotProps">
-										<!-- {{ slotProps.row.bxType }} -->
-										<!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
 									</template>
 									<template slot="rightSlot" slot-scope="slotProps">
-										<!-- {{ slotProps.row.bxType }} -->
-
 										<text class="fdButtonBox aui-text-success" style="background: none"
 											v-if="slotProps.row.isAudition == 1">试听</text>

@@ -178,26 +170,7 @@
 								</courseDescription>
 							</view>
 							<view class="small_class_teaching_box">
-								<!-- <view class="small_class_teaching_top">
-                    <view class="small_class_teaching_top_left">
-                        <image src="@/static/icon/course_ic.png" mode="aspectFil" class="icon1"></image>
-                        <text>小班教学</text>
-                    </view>
-                    <text>{{ curriculumInfo.remainingDays }}</text>
-
-
-                </view> -->
 								<view class="small_class_teaching_content">
-									<!-- <view class="top">
-                        <view class="top_item" v-for="(v, i) in teachingList">
-                            {{ v.title }}
-
-
-                        </view>
-
-
-                    </view> -->
-
 									<view class="schedule">
 										<view class="icon_box">
 											<image src="@/static/icon/course_07.png" mode="aspectFil" class="icon1">学习进度
@@ -224,15 +197,6 @@
 				</view>
 			</template>
 		</common-anchor-link>
-
-		<!-- <u-modal
-      :show="show"
-      :title="modalInfo.title"
-      :content="modalInfo.content"
-      showCancelButton
-      @confirm="hancleModalConfirm"
-      @cancel="hancleModalCancel"
-    ></u-modal> -->
 		<common-select-goods ref="commonSelectGoods" :selectGoodsData="selectGoodsData" :goodsList="goodsList"
 			:buyOptions="buyOptions" :customButtonGroup1="customButtonGroup1" @selectGoods="handleClickSelectGoods"
 			@onHandleClickBuy="
@@ -297,24 +261,7 @@
 				options: {},
 				percentage: 0,
 				selectGoodsData: {},
-				buyOptions: [
-					// {
-					// 		icon: 'chat',
-					// 		text: '客服'
-					// 	},
-					// {
-					//     icon: 'shop',
-					//     text: '店铺',
-					//     // info: 2,
-					//     infoBackgroundColor: '#007aff',
-					//     infoColor: "#f5f5f5"
-					// },
-					//  {
-					// 	icon: 'cart',
-					// 	text: '购物车',
-					// 	info: 2
-					// }
-				],
+				buyOptions: [],
 				customButtonGroup1: [{
 					with: 200,
 					text: "立即购买",
@@ -391,24 +338,17 @@
 		},
 		onLoad(options) {
 			this.options = options;
-
-			// this.getUserInfo()
-			// this.getCateList()
 		},
 		onHide() {
 			this.selectGoodsData = {};
 			this.protocolShow = false;
 			this.handleClickClose();
 			this.$refs.commonSelectGoods.close();
-			// this.showSearchList = false
-			// this.searchList = []
 		},
 		onUnload() {
 			this.selectGoodsData = {};
 			this.protocolShow = false;
 			this.$refs.commonSelectGoods.close();
-			// this.showSearchList = false
-			// this.searchList = []
 		},
 		computed: {
 			...mapState(["userInfo"]),
@@ -420,11 +360,6 @@
 			this.$nextTick(() => {
 				this.getCourseDescriptionData();
 			});
-
-			// 也可以通过主题形式调用，如：
-			// this.$refs.uNotify.primary('Primary主题')
-			// 关闭 notify
-			// this.$refs.uNotify.close()
 		},
 		methods: {
 			handleClickGetVip() {
@@ -432,10 +367,9 @@
 					url: "/pages/mine/vip/index",
 				});
 			},
+			//获取vip信息数据
 			getUserInfo() {
-				console.log("111111111111111111111111111");
 				this.$http.post("common/user/getUserInfo").then((res) => {
-					console.log(res, "111111111111111111111111111");
 					if (res.result.userVip) {
 						this.vip = res.result.userVip;
 					} else {
@@ -502,11 +436,6 @@
 				this.$forceUpdate();
 			},
 			onHandleClickBuy(e) {
-				console.log("e at line 387:", e);
-				// if (e.index == 0) {
-				//   this.handleClickClose();
-				// }
-				// if (e.index == 0) {
 				var mynavData = JSON.stringify({
 					goods: [this.selectGoodsData],
 					typeId: 0,
@@ -517,7 +446,6 @@
 				uni.navigateTo({
 					url: `/pages/goods/order/index?data=${mynavData}`,
 				});
-				// }
 			},
 			handleClickGoBuy() {},
 			handleClickClose() {
@@ -528,11 +456,8 @@
 			//获取相关关联课程商品
 			//获取相关关联课程商品
 			handleClickGetGoodsList(v) {
-				// console.log("data at line 313:", data);
-
 				if (v.type == 0) {
 					//免费
-
 					this.$http
 						.request({
 							url: this.urlList.startStudyForMF,
@@ -541,25 +466,13 @@
 								catalogueId: v.id,
 							},
 							header: {
-								//默认 无 说明：请求头
 								"Content-Type": "application/json",
 							},
 						})
 						.then(async (res) => {
-							console.log("res at line 493:", res);
 							if (res.code == 0) {
 								this.getCourseDescriptionData();
-								// this.$commonJS.showToast("");
 							}
-							// if (res.productList.length > 0) {
-							//   this.goodsList = res.productList;
-							//   this.selectGoodsData = this.goodsList[0];
-							//   this.$refs.commonSelectGoods.open();
-							//   this.show = true;
-							// } else {
-							//   this.$commonJS.showToast("此课程暂无购买方式");
-							// }
-
 							this.$forceUpdate();
 						});
 				} else {
@@ -585,7 +498,6 @@
 									id: v.id,
 								},
 								header: {
-									//默认 无 说明：请求头
 									"Content-Type": "application/json",
 								},
 							})
@@ -613,12 +525,6 @@
 						...this.taiHuClassInfo,
 					},
 				};
-				// $mars.progressBegin('申请中...');
-				// $mars.post(customerType, 'applyRelearn', data, function (ret) {
-				//     api.hideProgress();
-
-				//     fnLoadDataGrid();
-				// });
 			},
 			fnRelearn(oid, days, courseFee) {
 				//99和199课程复读一个月60三个月120; 299和399课程复读一个月80三个月180
@@ -654,33 +560,9 @@
 					fee: fee,
 				};
 				this.show = true;
-				// $aui.alert({
-				//     title: ,
-				//     content: '用户您好，该课程已到期，通过支付' + fee + '元，本门课程可获得' + days + '天延期学习时间，点击确认即完成自动扣费，感谢配合！',
-				//     buttons: ['取消', '确认'],
-				//     radius: 6,
-				//     titleColor: '#ff3300',
-				//     contColor: '#333',
-				//     btnColor: ''
 			},
 			//课程详情
 			async gotoDetail(v, index) {
-			console.log('v at line 664:', v)
-				console.log(
-					this.cateList[this.currentCateIndex],
-					8888888888888888888888888
-				);
-
-				// var result = await this.$commonJS.getCheckCourseStatus({
-				//   oid: v.courseOid,
-				// });
-				// console.log("result at line 364:", result);
-
-				// if (result.buyFlg == 0 && v.conditions != "01") {
-				//   this.$commonJS.showToast("请先购买课程");
-				//   return;
-				// }
-
 				if (
 					this.cateList[this.currentCateIndex].isBuy == 1 ||
 					v.isAudition == 1 ||
@@ -688,7 +570,6 @@
 					this.vip.type == "3"
 				) {
 					uni.navigateTo({
-						// url: '../bookShop/commodityDetail?id=' + item.id
 						url: `/pages/curriculum/order/curriculum/detail?navTitle=${this.options.navTitle}&title=${v.title}&id=${v.id}&conditions=${v.conditions}&detailOid=${v.detailOid}&curriculumImgUrl=${this.curriculumData.image}`,
 					});
 				} else {
@@ -697,9 +578,7 @@
 			},
 			//相关课程
 			goCourseDescription(v) {
-				console.log(v);
 				uni.navigateTo({
-					// url: '../bookShop/commodityDetail?id=' + item.id
 					url: `/pages/curriculum/order/curriculum/index?navTitle=${v.title}&title=${v.title}&oid=${v.oid}`,
 				});
 			},
@@ -710,25 +589,17 @@
 				await $http
 					.request({
 						url: this.urlList.curriculumInfo,
-						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						method: "POST",
 						data: {
 							id: v.id,
 						},
 						header: {
-							//默认 无 说明：请求头
 							"Content-Type": "application/json",
 						},
 					})
 					.then(async (res) => {
 						if (res.code == 0 && res.chapterList.length > 0) {
-							// res.chapterList.map((item) => {
-							//   item.tryListen = [];
-							// });
-
 							list = JSON.parse(JSON.stringify(res.chapterList));
-
-							console.log("at line 1343:", list);
-							// console.log('status', res)
 						} else {
 							list = [];
 						}
@@ -741,8 +612,6 @@
 			getCourseDescriptionData() {
 				var data = {};
 				var that = this;
-				console.log(this.$store.state, "11111111111");
-
 				this.$http
 					.request({
 						url: this.urlList.list,
@@ -751,17 +620,12 @@
 							id: this.options.id,
 						},
 						header: {
-							//默认 无 说明：请求头
 							"Content-Type": "application/json",
 						},
 					})
 					.then(async (res) => {
 						that.curriculumData = res.data.course;
 						that.cateList = [...res.data.catalogues];
-
-						console.log("that.allDataList at line 1068:", that.allDataList);
-						// this..getPercentage();
-
 						for (let i = 0; i < that.cateList.length; i++) {
 							var list = await that.getChapterList(that.cateList[i]);

@@ -769,18 +633,12 @@
 								...that.cateList[i],
 								courseList: [...list],
 							};
-							// that.allDataList[i].courseList = [];
 						}

 						setTimeout(() => {
 							that.$refs.commonAnchorLink.getDistanceArr();
 						}, 200);
-						console.log("that.courseList at line 1238:", that.allDataList);
-						this.$forceUpdate(); // that.relatedCoursesList = res.data.correlatedList
-						//   ? res.data.correlatedList
-						//   : [];
-						// await that.handleselectCate(this.cateList[0], 0);
-						// socket.init();
+						this.$forceUpdate();
 					});
 			},
 			getPriceData() {
@@ -795,115 +653,12 @@
 			checkDisable() {
 				console.log("点击了");
 			},
-			// 显示无权限弹窗
-			// showNoRights() {
-			// 	let that = this
-			// 	uni.showModal({
-			// 		content: "",
-			// 		confirmText: '好的',
-			// 		showCancel: false,
-			// 		success: function(res) {
-			// 			if (res.confirm) {
-			// 				// console.log('用户点击确定');
-			// 				that.clear()
-			// 			}
-			// 		}
-			// 	})
-			// },
-			// // 获取用户详情
-			// getUserInfo() {
-			//   // 用户详情
-			//   if (this.userInfo.id != undefined) {
-			//     this.$http.post("book/user/info/" + this.userInfo.id).then((res) => {
-			//       this.userMes = res.user;
-			//       this.getCateList();
-			//       console.log(this.userMes, "呼呼");
-			//     });
-			//   }
-			// },
 			
-			async handleselectCate(item, index) {
-				console.log("item at line 662:", item);
-				console.log("index at line 637:", index);
-				// this.description=`您还未购买当前【${item.title}】课程，`
-				var title1 = "";
-				this.currentCateIndex = index;
-				switch (this.vip.type) {
-					case 0:
-						this.goBuyTitle = "购买VIP,即可免费观看吴门医述所有课程";
-						this.goBuyType = 0;
-						break;
-					case 1 || 2:
-						var vipName = "";
-						if (this.vip.type == 1) {
-							vipName = "超级VIP";
-						}
-						if (this.vip.type == 2) {
-							vipName = "吴门医述VIP";
-						}
-						//超级VIP
-						this.goBuyTitle = `尊贵的${vipName},您的有效期到 ${
-            this.vip.endTime && this.vip.endTime.split(" ")[0]
-          }`;
-						this.goBuyType = 1;
-						break;
-
-					case 3:
-						//众妙之门
-						this.goBuyTitle =
-							"尊贵的众妙之门VIP,升级至超级VIP,即可免费观看吴门医述所有课程";
-
-						this.goBuyType = 2;
-						break;
-				}
-
-				//   this.currentCateIndex = index;
-				this.dataList = [];
-				var data = [];
-				console.log(item, index, 99999);
-				var that = this;
-
-				// curriculumInfo
-				this.$http
-					.request({
-						url: this.urlList.curriculumInfo,
-						method: "POST",
-						data: {
-							id: item.id,
-						},
-						header: {
-							//默认 无 说明：请求头
-							"Content-Type": "application/json",
-						},
-					})
-
-					.then(async (res) => {
-						//   that.curriculumInfo = res.obj;
-						//   that.currentCateIndex = index;
-						that.percentage = item.completion;
-						that.dataList = res.chapterList;
-						// that.getPercentage();
-						that.$forceUpdate();
-
-						// socket.init();
-					});
-
-				console.log(this.allDataList, this.dataList, "1688");
-
-				this.searchValue = "";
-				this.searchList = [];
-				this.showSearchList = false;
-
-				return data;
-			},
 			async setOneCateIndex(item, index) {
 				this.allDataList = [];
-				console.log(index, 99999);
 				var that = this;

 				this.currentStatusIndex = index;
-				// this.currentCateIndex = 0
-
 				this.searchValue = "";
 				this.searchList = [];
 				this.showSearchList = false;
@@ -912,19 +667,6 @@

 					this.$forceUpdate();
 				});
-
-				// this.handleselectCate(this.cateList[this.currentCateIndex])
-				// if (index != 2) {
-
-				// uni.createSelectorQuery().select('.statusList').boundingClientRect(function (rect) {
-				// 	var height = rect.height
-				// 	console.log('元素高度：',);
-
-				// }).exec();
-
-				// } else {
-				// 	this.getJFList(dictType)
-				// }
 			},

 			transformData(inputData) {
@@ -938,23 +680,8 @@
 					}
 					result[letter].push(item);
 				});
-				// const finalResult = Object.keys(result).map(key => ({ [key]: result[key] }));
 				return result;
 			},
-
-			// 放大图片
-			previewImage(url) {
-				console.log(url);
-				uni.previewImage({
-					urls: [url],
-					longPressActions: {
-						itemList: ["很抱歉，暂不支持保存图片到本地"],
-						success: function(res) {
-							// console.log(res,'+++++')
-						},
-					},
-				});
-			},
 		},
 		onBackPress() {
 			// #ifdef APP-PLUS
@@ -966,11 +693,6 @@

 <style lang="scss" scoped>
 	@import "@/style/mixin.scss";
-
-	.u-grid-list {
-		// height: 40rpx;
-	}
-
 	.searchList {
 		.item {
 			font-size: 28rpx;
--- a/pages/curriculum/order/curriculum/mp3Detail.vue
+++ b/pages/curriculum/order/curriculum/mp3Detail.vue
@@ -1,27 +1,9 @@
-<template><page-meta
-  :page-font-size="$baseFontSize() + 'px'"
-  :root-font-size="$baseFontSize() + 'px'"
-></page-meta>
+<template>
  <view
    class="container commonPageBox commonDetailPage"
    style="position: relative; height: auto"
  >
-    <!-- <cover-view class="image_box">

-
-      <image
-     
-        src="http://101.201.146.165:8088/curriculum/detailImg/curriculum_20170411123240222.png"
-        mode="aspectFit"
-        class="headImage"
-        style="background-color: #f5f5f5"
-       
-      >
-      </image>
-
-
-
-    </cover-view> -->
    <video
      @timeupdate="videoTimeUpdateEvent($event)"
      ref="videos"
--- a/pages/curriculum/order/curriculum/operationsList.vue
+++ b/pages/curriculum/order/curriculum/operationsList.vue
@@ -10,7 +10,6 @@
 </template>

 <script>
-// importScripts('@/static/aliplayer/aliplayer-min.js')
 export default {
  data() {
    return {
--- a/pages/curriculum/order/curriculum/videoDetail.vue
+++ b/pages/curriculum/order/curriculum/videoDetail.vue
@@ -1,24 +1,5 @@
-<template><page-meta
-  :page-font-size="$baseFontSize() + 'px'"
-  :root-font-size="$baseFontSize() + 'px'"
-></page-meta>
+<template>
  <view class="container commonPageBox commonDetailPage" style="position: relative;">
-     <!-- <cover-view class="image_box">
-
-
-      <image
-     
-        src="http://101.201.146.165:8088/curriculum/detailImg/curriculum_20170411123240222.png"
-        mode="aspectFit"
-        class="headImage"
-        style="background-color: #f5f5f5"
-       
-      >
-      </image>
-
-
-
-    </cover-view> -->
    <video
      @fullscreenchange="fullscreenchange"
      @timeupdate="videoTimeUpdateEvent($event)"
@@ -33,9 +14,6 @@
      :poster="`${videoUrl}?x-oss-process=video/snapshot,t_${1},f_jpg`"
      @play="playVideo"
    >
-    <!-- <cover-image class="controls-play img"  src="http://101.201.146.165:8088/curriculum/detailImg/curriculum_20170411123240222.png"></cover-image>
-      
-    -->
  </video>
  
  </view>
@@ -43,14 +21,11 @@

 <script>
 import courseDescription from "@/pages/component/commonComponents/list";
-import price from "../price/index.vue";
-
 import $http from "@/config/requestConfig.js";
 import { mapState } from "vuex";
 export default {
  components: {
    courseDescription, //课程说明
-    price, //课程价格
  },
  data() {
    return {
--- a/pages/curriculum/order/curriculum/videoDetailOss.vue
+++ b/pages/curriculum/order/curriculum/videoDetailOss.vue
@@ -1,7 +1,4 @@
-<template><page-meta
-  :page-font-size="$baseFontSize() + 'px'"
-  :root-font-size="$baseFontSize() + 'px'"
-></page-meta>
+<template>
  <view class="container" style="background-color: #000; position: relative">
    <u-icon
      @click="goBack"
--- a/pages/mine/.DS_Store
+++ b/pages/mine/.DS_Store
--- a/pages/mine/mine/index.vue
+++ b/pages/mine/mine/index.vue
@@ -17,183 +17,63 @@

 		<view class="mine_box" :style="`top:${(45 + statusBarHeight) * 2}rpx`">
 			<view class="per_mes">
+				<view :style="hasVipType2?'width: 170rpx;':''">
 					<view style="display: flex; align-items: center; flex-direction: column">
-					<image @click="goUserInfo" :src="userMes.avatar" v-if="userMes.avatar != null"
+						<image @click="goUserInfo" :src="userMes.avatar" v-if="userMes.avatar"
+							class="per_mes_img color_shandow"></image>
+						<image src="@/static/icon/ic_login_health.png" v-else
 							class="per_mes_img color_shandow"></image>
 					</view>
 					
-				<image src="@/static/icon/home_icon_logo.png" v-if="userMes.avatar == null"
-					class="per_mes_img color_shandow"></image>
+					<view class="user_vip_box" v-if="isAndorid&&hasVipType1 || isAndorid&&hasVipType2">
+						<view class="user_vip super" :style="hasVipType2?'width: 170rpx;':''">
+							<view class="user_vip_item" v-if="hasVipType1"><text>医学</text><image src="@/static/icon/chao_svip.png"></image></view>
+							<view class="user_vip_item" v-if="hasVipType2"><text>国学心理学</text><image src="@/static/icon/chao_svip.png"></image></view>
+						</view>
+					</view>
+				</view>
 				
-				<view class="userInfoBox" style="width: calc(100% - 120rpx)">
+				<view class="userInfoBox" style="margin-left: 30rpx;">
 					<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>
 					
-					<view class="name" v-if="!userMes.userVip" style="
-              font-size: 28rpx;
-              font-weight: 500;
-              color: #606266 !important;
-            ">普通用户</view>
-
-					<view style="display: flex; align-items: center" v-else-if="userMes.userVip&&$platform=='ios'">
-						<view class="user_vip_box1">
-							<view v-if="userMes.vip == 1" class="user_vip super user_vip_super">超级VIP</view>
-							<view v-if="userMes.vip == 3" class="user_vip user_vip_zmzm">众妙之门VIP</view>
-							<view v-if="userMes.vip == 2" class="user_vip user_vip_wumen">吴门医述VIP</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">
+								{{item}}<image src="@/static/icon/chao_vip.png"></image>
+							</view>
+						</view>
+					</template>
 				</view>
-						<view class="viptime" v-if="userMes.vip != 0">会员时长：{{
-                userMes.userVip.endTime.split(" ")[0]
-              }}&nbsp;到期</view>
 			</view>

-					<!--  -->
-
-					<!-- <view class="phone" v-if="userMes.tel">手机号：({{ userMes.tel }})</view>
-         
-        
-            <view class="phone email" v-if="userMes.email">邮箱({{ userMes.email }})</view>
-        -->
-
-					<!-- <text class="tong">累计读书5本
-					<span style="margin: 0 20upx;">|</span> 今日读50分钟
-				</text> -->
-				</view>
-				<br clear="both" />
-			</view>
-			<!-- <view class="now_vip" v-if="userMes.vip==0">
-			<text>
-				<image src="../../static/icon/mine_p.png" style="height: 44rpx;"></image>
-				开通会员畅享海量内容
-			</text>
-			<b class="kt_btn" @click="onPageJump('./opeVip')">开通VIP</b>
-		</view> -->
-
-			<!-- <view class="now_vip" v-if="userMes.vip==1">
-			<text>
-				<image src="../../static/icon/mine_v.png"></image>
-				尊贵的VIP会员
-				<font style="font-size: 14rpx;margin-left: 20rpx;">{{userMes.vipValidtime}}到期</font>
-			</text>
-			<b class="kt_btn" @click="onPageJump('./opeVip')">立即续费</b>
-		</view> -->
-
-			<view v-if="$platform=='android'" style="
+			<view v-if="isAndorid" style="
 				  padding: 20rpx 20rpx 0;
+				  margin-top: 50rpx;
 				  height: auto;
 				  display: flex;
 				  align-items: center;
 				  justify-content: space-between;
 				">
-
 				<template>
-					<view v-if="!userMes.userVip" :class="`chong_zhi boxShadow box_fillet vip_box`"
+					<view class="chong_zhi boxShadow box_fillet vip_box"
 						@click="onPageJump('/pages/mine/vip/index')">
 						<view class="noVip">
-							<view class="zhanghu PM_font" style="text-align: center">
-								<image class="vip_image" src="@/static/icon/mine_p.png" mode="aspectFit">
-								</image>
-
-								<text style="color: #452808; letter-spacing: 2rpx">超级VIP</text>
+							<view style="display: flex; align-items: center;">
+								<view class="zhanghu PM_font" style="text-align: left; margin-left: 15rpx;">
+									<image class="vip_image" src="@/static/icon/mine_p.png" mode="aspectFit"></image>
+									<text style="color: #fff; font-size: 60rpx;" v-if="vipList.length==0">VIP</text>
 								</view>
-							<view style="margin-left: 20rpx">加入会员，畅享更多专属权益</view>
-							<view class="right_arrow" style="color: #fff">
-								<!-- <image src="@/static/icon/mine_p.png" mode="aspectFit"> </image> -->
-								>
-							</view>
-
-							<!-- <swiper
-              :autoplay="true"
-              :interval="3000"
-              :duration="1000"
-              style="width: 100%; height: 60rpx"
-            >
-              <swiper-item
-                v-for="(item, index) in swiperList"
-                style="width: 100%; height: 100%"
-              >
-                <view
-                  style="
-                    background: linear-gradient(
-                        130deg,
-                        rgb(46, 103, 106) 0%,
-                        rgb(114, 173, 146) 100%
-                      )
-                      text;
-                    text-align: center;
-                  "
-                  :style="item.style"
-                  v-html="item.name"
-                ></view>
-                 </swiper-item>
-            </swiper> -->
+								<view class="vip_infor" v-if="vipList&&vipList.length>0">
+									<view class="vip_infor_item" v-for="(item, index) in vipList" :key="index" :class="{expired: isExpired(item.endTime.split(' ')[0])}">
+										<text>{{item.text}}VIP</text>
+										<text v-if="isExpired(item.endTime.split(' ')[0])">（{{item.endTime.split(' ')[0]}} 已到期）</text>
+										<text v-else>（有效期到 {{item.endTime.split(' ')[0]}})</text>
 									</view>
 								</view>
-					<view v-else :class="`chong_zhi boxShadow box_fillet vip_box hasVipBox ${
-            userMes.vip == 1
-              ? 'hasVipSuper'
-              : userMes.vip == 2
-              ? 'hasVipWumen'
-              : userMes.vip == 3
-              ? 'hasVipZmZm'
-              : ''
-          }`" @click="onPageJump('/pages/mine/vip/index')">
-						<view class="current_identity">当前身份</view>
-						<view class="hasVip" style="position: relative">
-							<view class="zhanghu" style="text-align: center">
-								<view class="vbg" v-if="userMes.vip == 2 || userMes.vip == 3">V</view>
-								<image v-if="userMes.vip == 1" class="vip_image" src="@/static/icon/quanyi.png"
-									mode="aspectFit">
-								</image>
-								<!-- <image
-                v-if="userMes.vip == 3"
-                class="vip_image"
-                src="@/static/icon/quanyiZM.png"
-                mode="aspectFit"
-              >
-              </image>
-              <image
-                v-if="userMes.vip == 2"
-                class="vip_image"
-                src="@/static/icon/quanyi.png"
-                mode="aspectFit"
-              >
-              </image> -->
-
-								<view v-if="userMes.vip == 1" class="vip_info">
-									<view class="PM_font vip_name">超级VIP</view>
-								</view>
-								<view v-if="userMes.vip == 3" class="vip_info">
-									<view class="PM_font vip_name">众妙之门VIP</view>
-								</view>
-								<view v-if="userMes.vip == 2" class="vip_info">
-									<view class="PM_font vip_name">吴门医述VIP</view>
-								</view>
-								<view class="viptime">会员时长：{{
-                  userMes.userVip.endTime.split(" ")[0]
-                }}&nbsp;到期</view>
-							</view>
-							<view class="zhanghu quanyi" style="text-align: center">
-								<!-- <image
-                class="vip_image"
-                src="@/static/icon/quanyi.png"
-                mode="aspectFit"
-              >
-              </image> -->
-
-								<view v-if="userMes.vip == 1" class="vip_info vip_info_bottom">
-									<view style="color: #d33b1b">尊享 5 项专属特权</view>
-									<view class="xufei">立即续费</view>
-								</view>
-								<view v-if="userMes.vip == 2" class="vip_info vip_info_bottom">
-									<view style="">尊享 4 项专属特权,</view>
-									<view class="xufei">立即续费</view>
-								</view>
-								<view v-if="userMes.vip == 3" class="vip_info vip_info_bottom">
-									<view style="">尊享 4 项专属特权</view>
-									<view class="xufei">立即续费</view>
-								</view>
+								<view v-else class="vip_null" style=" padding-left: 30rpx;">办理VIP，畅享更多专属权益</view>
 							</view>
+							<view class="vip_btn"><button v-if="vipList.length==0">办理</button><button v-else>续费</button></view>
 						</view>
 					</view>
 				</template>
@@ -207,13 +87,6 @@
          justify-content: space-between;
        ">
 				<view class="chong_zhi boxShadow box_fillet chongzhi_box">
-					<!-- <view
-          class="zhanghu"
-          @click="onPageJump('/pages/mine/wallet/index/index')"
-        >
-          我的账户
-          <image src="@/static/icon/icon_right.png" class="rightArrow"></image>
-        </view> -->
 					<view class="chong_list">
 						<view class="left">
 							<view class="chong_list_item" style="
@@ -225,12 +98,6 @@
 								<view class="pay_item_img">
 									天医币<u-icon @click.native.stop="openInfo()" name="question-circle"
 										style="float: right; margin: 0 6rpx"></u-icon>
-									<!-- <image
-                  style="width: 100%; height: 100%"
-                  src="@/static/icon/pay_3.png"
-                  mode="aspectFil"
-                >
-                </image> -->
 								</view>

 								<view class="text" style="line-height: 40rpx; display: flex">{{
@@ -246,12 +113,6 @@
                " @click="onPageJump('/pages/mine/wallet/jf/index')">
 								<view class="pay_item_img">
 									积分
-									<!-- <image
-                  style="width: 100%; height: 100%"
-                  src="@/static/icon/jifen2.png"
-                  mode="aspectFil"
-                >
-                </image> -->
 								</view>

 								<view class="text" style="line-height: 40rpx">{{
@@ -259,13 +120,6 @@
                }}</view>
 							</view>
 						</view>
-						<!-- v-if="iosHide" -->
-
-						<!-- <view v-if="iosHide" class="chong_list_item">
-            <b>{{ userMes.conponsCount }}</b>
-            优惠券
-          </view> -->
-						<!-- <b class="chong_btn" @click="onPageJump('../sdkDemo/pay')">充 值</b> -->
 						<view class="chong_list_item" style="
                display: flex;
                align-items: center;
@@ -278,24 +132,6 @@
 					</view>
 				</view>
 			</view>
-
-			<!-- <view class="list_box order_box">
-				<view class="xiugai boxShadow box_fillet">
-					<view class="title">我的订单</view>
-					<view class="cate_box">
-						
-						<view class="cate_item_box" v-for="(v, i) in orderList"
-							@click="goOrderList(`/pages/bookShop/orderList`, 'mine', i)">
-							<view class="cate_item_border">
-								<image :src="v.imgUrl" mode="aspectFill" style="width: 58rpx; height: 58rpx"></image>
-								<u-badge type="error" max="99" :value="v.badge.value"
-									style="position: absolute; top: -10rpx; right: -10rpx"></u-badge>
-							</view>
-							<view class="cate_item_name">{{ v.title }}</view>
-						</view>
-					</view>
-				</view>
-			</view> -->
 			<view class="list_box">
 				<view class="xiugai boxShadow box_fillet">
 					<common-list :dataList="pageList" @hancleClick="handleClickTab" label="name">
@@ -306,34 +142,6 @@
 							<view> </view>
 						</template>
 					</common-list>
-
-					<!-- <view class="nav_list" @click="onPageJump('../clock/clockList')">
-				<text>我的打卡</text>
-			</view> -->
-					<!-- <view class="nav_list" @click="onPageJump('../listen/home')" v-if="iosHide">
-				<text>我的听书</text>
-			</view> -->
-					<!-- 暂时去掉 -->
-					<!-- <view class="nav_list" @click="onPageJump('../listen/setListen')" v-if="iosHide">
-				<text>听书设置</text>
-			</view> -->
-					<!-- <view class="nav_list" @click="onPageJump('../peanut/myComments')">
-				<text>我的评价</text>
-			</view> -->
-
-					<!-- 暂时去掉 -->
-
-					<!-- <view v-if="showEbook" class="nav_list" @click="onPageJump('../eBook/bookBuy')">
-				<text>电子书购买记录</text>
-			</view> -->
-					<!-- <view v-if="showEbook" class="nav_list" @click="onPageJump('../eBook/bookRecord')">
-				<text>阅读记录</text>
-			</view> -->
-
-					<!-- <view class="nav_list" @click="onGoing()">
-				<text>帮助与反馈11111</text>
-			</view> -->
-					<!-- <view class="nav_list" @click="newOnShare" v-if="isAndorid"> -->
 				</view>
 			</view>
 		</view>
@@ -363,11 +171,6 @@

                justify-content: center;
              ">
-							<!-- <u-button
-               size="small"
-               text="不同意"
-               @click="protocolShow=false"
-             ></u-button> -->
 			  <u-button style="width: 200rpx; float: center" :plain="true" text="知道啦" color="#9b9b9b"
 								size="small" @click="infoShow = false"></u-button>
 						</view>
@@ -376,7 +179,6 @@
 			</view>
 		</u-popup>
 		
-		<!-- <u-modal :show="infoShow" title="提示信息" :content=""></u-modal> -->
 		<music-play :playData="playData"></music-play>
 		<z-navigation></z-navigation>
 	</view>
@@ -385,7 +187,6 @@
 <script>
 	import musicPlay from "@/components/music.vue";
 	import $http from "@/config/requestConfig.js";
-	// import appShare, { closeShare } from '@/uni_modules/zhouWei-APPshare/js_sdk/appShare';
 	import {
 		mapState,
 		mapMutations
@@ -460,11 +261,6 @@

 					  type: "switchTab",
 					},
-					// {
-					//   name: "购物车",
-					//   url: "../peanut/shopping",
-					//   type: "pageJump",
-					// },
 					{
 						name: "个人资料",
 						url: "/pages/mine/userInfo/persData",
@@ -491,22 +287,19 @@
 						name: "问题反馈/申诉",
 						url: "/pages/homePage/index/workOrder",
 						type: "workOrder"
-					},
-
-					//{ name: "设置", url: "/pages/mine/set/index", type: "pageJump" },
-					// { name: "退出登录", type: "quitLogin" },
-					// { name: "注销帐号", type: "loginOut" },
+					}
 				],
+				hasVipType1: false,
+				hasVipType2: false,
+				vipList: [],
+				textList: [],  //普通vip文字
 			};
 		},
 		//第一次加载
 		onLoad(e) {
-			// 隐藏原生的tabbar
-			// uni.hideTabBar();
 			// #ifdef APP-PLUS
 			this.getOS();
 			this.platform = uni.getSystemInfoSync().platform;
-			// console.log('操纵系统',this.platform)
 			// #endif
 		},
 		computed: {
@@ -514,11 +307,11 @@
 		},
 		//页面显示
 		onShow() {
-			console.log(this.userInfo, "11111111111111");
-			// 隐藏原生的tabbar
-			// uni.hideTabBar();
 			this.getBookList();
 			this.getData();
+			//获取vip身份
+			this.textList = [];
+			this.getUserVipType();
 		},
 		async onTabItemTap() {
 			this.getBookList();
@@ -533,11 +326,6 @@
 			getBookList(flag, refreshflag) {
 				this.isLoadingHide = false;
 				var that = this;
-				// 根据tab不同，获取最新书评、最热书评、书集列表
-				// uni.showLoading({
-				// 	title: '加载中'
-				// });
-
 				// 顶部红点数量
 				$http
 					.request({
@@ -594,7 +382,6 @@
 				this.onPageJump("/pages/mine/userInfo/persData");
 			},
 			handleClickTab(v) {
-				console.log("v at line 259:", v);
 				switch (v.type) {
 					case "pageJump":
 						this.onPageJump(v.url);
@@ -618,7 +405,6 @@
 						uni.navigateTo({
 							url: `${v.url}?name=userPage`
 						})
-						// this.onPageJump(v.url);
 						break;
 				}
 			},
@@ -626,7 +412,6 @@
 			getOS() {
 				let oprateOs = "";
 				oprateOs = uni.getSystemInfoSync().platform;
-				// console.log(oprateOs)
 				if (oprateOs == "android") {
 					this.isAndorid = true;
 				} else {
@@ -691,14 +476,7 @@
 					this.$http.post("common/user/getUserInfo").then((res) => {
 						this.userMes = res.result;
 						if (this.userMes.userVip) {
-							// console.log(
-							//   "this.userMes.vipValidtime at line 510:",
-							//   this.userMes.vipValidtime
-							// );
-							// this.userMes.vipValidtime = this.userMes.vipValidtime.substring(
-							//   0,
-							//   this.userMes.vipValidtime.indexOf(" ")
-							// );
+							
 						}
 					});
 				}
@@ -757,6 +535,73 @@
 					url: "/pages/user/login/login",
 				});
 			},
+			//获取vip身份
+			getUserVipType() {
+				this.$http.request({
+					url: "common/userVip/getUserVipType",
+					method: "POST",
+					data: {},
+					header: {
+						"Content-Type": "application/json",
+					},
+				})
+				.then((res) => {
+					if (res.code == 0) {
+						this.vipList = res.list;
+						this.hasVipType1 = this.vipList.some(item => item.type === 1);
+						this.hasVipType2 = this.vipList.some(item => item.type === 2);
+						//筛选出来已过期的
+						let listAll = this.vipList;
+						let list = this.vipList.filter(item => !this.isExpired(item.endTime.split(' ')[0]));
+						
+						//全部的 vip模块展示
+						if(listAll.length>0){
+							listAll = this.showDataList(listAll);
+						}
+						
+						console.log('-------listAll',listAll)
+						//筛选过期以后的 昵称模块展示需要
+						if(list.length>0){
+							list = this.showDataList(list);
+						}
+						console.log('-------list',list)
+					}
+				});
+			},
+			//分情况展示逻辑
+			showDataList(list){
+				this.textList = [];
+				list.forEach((item, index) => {
+					if(item.type=='4'){
+						item.text = '中医学';
+						this.textList.push(item.text);
+					}else if(item.type=='5'){
+						item.text = '针灸学';
+						this.textList.push(item.text);
+					}else if(item.type=='6'){
+						item.text = '肿瘤学';
+						this.textList.push(item.text);
+					}else if(item.type=='7'){
+						item.text = '国学';
+						this.textList.push(item.text);
+					}else if(item.type=='8'){
+						item.text = '心理学';
+						this.textList.push(item.text);
+					}else if(item.type=='1'){
+						item.text = '医学S';
+					}else if(item.type=='2'){
+						item.text = '国学心理学S';
+					}
+				});
+				
+				return this.textList;
+			},
+			//判断过期的vip
+			isExpired(dateString){
+				const date = new Date(dateString);
+				const now = new Date();
+				return date < now;
+			},
 		},
 	};
 </script>
@@ -764,34 +609,25 @@
 	@import "@/style/mixin.scss";

 	.per_mes {
-		// height: 200rpx;
 		position: relative;
 		margin: 0rpx 20rpx 0rpx 20rpx;
 		align-items: center;
 		display: flex;
 		align-items: center;
-		justify-content: space-between;

 		.per_mes_img {
-			// @include themeBorder(10rpx,10rpx,#4E79A3, #A6D8DC);
-			width: 90rpx;
-			height: 90rpx;
-			// background-color: #fff;
+			width: 120rpx;
+			height: 120rpx;
 			border-radius: 90rpx;
 			margin: 0 0 0 0;
 			float: left;
 		}

 		view {
-			float: left;
-			// margin-top: 20rpx;
-
 			.name {
 				width: 100%;
-				// display: inline-block;
 				font-weight: bold;
-				font-size: 30rpx;
-				margin-bottom: 10rpx;
+				font-size: 32rpx;
 				color: #333 !important;
 			}

@@ -860,18 +696,11 @@

 	.chong_zhi {
 		box-shadow: none;
-		// border-bottom-left-radius: 0rpx !important;
-		// border-bottom-right-radius: 0rpx !important;
-		// background-color: #d8f8e4;
-		// margin: 0 0 30upx 0;
 		padding: 0 30upx;
 		height: auto;

 		.zhanghu {
-			width: 100%;
 			margin-bottom: 10rpx;
-			font-size: 44rpx;
-			// line-height: 80rpx;
 			font-weight: bold;
 			display: flex;
 			align-items: center;
@@ -885,25 +714,17 @@
 			height: 100%;
 			display: flex;
 			align-items: center;
-			padding: 0 20rpx;
+			justify-content: space-between;
 			
-			// justify-content: space-between;
-			// flex-direction: column;
 			.zhanghu {
-				font-size: 42rpx;
-				width: auto;
-				display: inline-block;
-				// margin-top: 20rpx;
+				font-size: 40rpx;
 				margin-bottom: 0rpx;
 				text-align: center;
 				display: flex;
 				align-items: center;
-
-				// justify-content: space-around;
 				image {
-					width: 40rpx;
-					height: 40rpx;
-					margin-right: 10rpx;
+					width: 50rpx;
+					height: 50rpx;
 				}
 			}
 		}
@@ -1027,27 +848,12 @@
 		width: 100%;
 		height: auto;
 		border-radius: 10rx !important;
-		// background: rgba(255, 255, 255, 0.85);
-
-		// padding: 30rpx 20rpx 10rpx;
-		// background-color: $themeBgColor;
-		// @include themeBorder(6rpx, 20rpx, #3ab3ae, #a6d8dc);
-		// #FFE9BB
-		background-image: linear-gradient(80deg, #eaeff2 0%, #c2d0db 100%);
+		background-image: linear-gradient(90deg, #3ab3ae 0%, #d5ecdd 120%);

 		.PM_font {
 			color: #476379;
 		}

-		// @include themeBorder(
-		//   10rpx,
-		//   20rpx,
-		//   (
-		//     linear-gradient(#edf6f5ad, #edf6f5ad),
-		//     linear-gradient(to bottom left, #bed1b1, #a6d8dc)
-		//   )
-		// );
-
 		.zhanghu {
 			font-size: 80rpx;
 			text-align: center;
@@ -1065,25 +871,23 @@
 	}

 	.bg_top {
-		// background-position: center center;
 		padding: 0 30rpx;
-
 		height: 30vh;
 		position: relative;
+		margin-top: 30rpx;

 		.setIcon {
 			position: absolute;
 			right: 30rpx;
-			// top: 30rpx;
 		}
 	}

 	.mine_box {
 		width: 100%;
 		position: absolute;
-		// top: 90rpx;
 		left: 0;
 		padding: 0 0rpx;
+		margin-top: 30rpx;
 	}

 	.list_box {
@@ -1169,64 +973,13 @@
 			}
 		}
 	}
-
-	.user_vip_box {
-		z-index: 10;
-		// min-width: 130rpx;
-		// margin-top: -20rpx;
-		// position: absolute;
-		// bottom: -20rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.user_vip {
-		font-size: 24rpx;
-		width: auto;
-		padding: 1rpx 20rpx;
-		font-weight: 800;
-		border-radius: 40rpx;
-		// background: linear-gradient(
-		//   to right,
-		//   rgb(204, 229, 244) 0%,
-		//   rgb(197, 227, 215) 100%
-		// );
-	}
-
-	.user_vip_box1 {
-		.user_vip {
-
-			// padding: 0;
-			font-size: 20rpx;
-			margin-right: 10rpx;
-		}
-
-		.user_vip_super {
-			background-image: linear-gradient(90deg, #fff0dc 0%, #f8e483 100%);
-
-		}
-
-		.user_vip_wumen {
-			background-image: linear-gradient(90deg, #c4e8fe 0%, #60bcff 100%);
-
-		}
-
-		.user_vip_zmzm {
-			background-image: linear-gradient(90deg, #aff7d6 0%, #edf5f1 100%);
-
-		}
-	}
-
 	.super {
-		// background: linear-gradient(to right, #fff0dc 0%, #f8e483 100%);
 		color: #f4a04c;
 	}

 	.cate_box {
 		width: 100%;
 		height: auto;
-		// background: $themeColor;
 		background-repeat: no-repeat;
 		display: flex;
 		justify-content: center;
@@ -1251,30 +1004,18 @@

 			.cate_item_border {
 				position: relative;
-				// width: 75rpx;
-				// height: 98rpx;
-				// background-size: 100% 100%;
-				// background-image: url("@/static/icon/homePage/cate_bg.png");
-				// border-radius: 4rpx;
 				display: flex;
 				align-items: center;
 				justify-content: center;
 				
-				image {
-					// height: 56rpx;
-				}
 			}

 			.cate_item_name {
 				margin-top: 6rpx;
-				// font-family: PangMenZhengDaoBiaoTiTiMianFeiBan;
-
 				font-weight: normal;
 				font-size: 28rpx;
 				color: #000000;
-				// line-height: 46rpx;
 				text-align: center;
-				// color: #fff;
 			}
 		}
 	}
@@ -1513,4 +1254,91 @@
 	.vip_info_bottom {
 		height: 64rpx;
 	}
+	.user_vip_box{
+		width: 125rpx;
+		position: absolute;
+		margin-top: - 40rpx;
+		z-index: 99;
+	}
+	.user_vip_item{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	
+	.user_vip_item {
+		border-radius: 20rpx;
+		background: linear-gradient(90deg, #ff1f00 0%, #fa9f93 100%);
+		color: #fff;
+		font-size: 20rpx;
+		line-height: 40rpx;
+		height: 40rpx;
+		font-weight: bold;
+		margin-bottom: 5rpx;
+	}
+	.user_vip_item image{
+		width: 49rpx;
+		height: 16rpx;
+	}
+	.vip_type{
+		display: flex;
+		align-items: center;
+	}
+	.vip_type_item{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 0 10rpx;
+		background: linear-gradient(90deg, #258feb 0%, #00e1ec 100%);
+		border-radius: 20rpx;
+		font-size: 20rpx;
+		line-height: 40rpx;
+		height: 40rpx;
+		font-weight: bold;
+		color: #fff;
+		margin-right: 10rpx;
+	}
+	.vip_type_item:last-child{
+		margin-right: 0;
+	}
+	.vip_type_item image{
+		width: 34rpx;
+		height: 24rpx;
+	}
+	.vip_infor{
+		padding-left: 15rpx;
+	}
+	.vip_infor_item{
+		display: block;
+		color: #fff;
+		font-size: 26rpx;
+		line-height: 36rpx;
+		font-family: PangMenZhengDaoBiaoTiTiMianFeiBan;
+		font-weight: normal;
+	}
+	.vip_infor_item text{
+		color: #fff;
+	}
+	.vip_btn{
+		margin-right: 15rpx;
+		height: 50rpx;
+	}
+	.vip_btn button{
+		background: none;
+		border: 2rpx solid #3ab3ae;
+		border-radius: 40rpx;
+		font-size: 24rpx;
+		width: 82rpx;
+		line-height: 42rpx;
+		color: #3ab3ae;
+		font-weight: bold;
+	}
+	.vip_null{
+		color: #fff;
+		font-size: 26rpx;
+		line-height: 34rpx;
+	}
+	.expired{
+		opacity: 0.55;
+	}
 </style>
--- a/pages/mine/vip/index.vue
+++ b/pages/mine/vip/index.vue
--- a/pages/mine/vip/order.vue
+++ b/pages/mine/vip/order.vue
@@ -1,7 +1,4 @@
-<template><page-meta
-    :page-font-size="$baseFontSize() + 'px'"
-    :root-font-size="$baseFontSize() + 'px'"
-  ></page-meta>
+<template>
 	<view class="container commonDetailPage" style="background-color: #fff !important">
 		<!-- 公共组件-每个页面必须引入 -->

@@ -9,10 +6,19 @@
 			<view class="order_top goods_box pay_box">
 				<view class="pay_title">支付方式</view>

-				<view style="margin-bottom: 20rpx">
-					<u-tag :text="`已选：${dataInfo.title}`" bgColor="rgba(188, 231, 223, 0.3)"
-						borderColor="rgb(197, 227, 215)" color="#2e676a" plain></u-tag>
+				<view style="margin-bottom: 20rpx" v-if="!dataInfo.list">
+					<u-tag :text="`已选：${dataInfo.title}`" bgColor="#EDFCF7" borderColor="#EDFCF7" color="#018F89"
+						plain></u-tag>
 				</view>
+				<view v-if="dataInfo.list&&dataInfo.list.length>0" style="margin: 20rpx 0 40rpx;">
+					{{dataInfo.list[0].title}}价格：<text v-if="dataInfo.title.includes('国学与心理学')"><br/></text>
+					<text v-for="(item,index) in dataInfo.list" :key="index" 
+					class="list_choose" 
+					:class="activeIndex==index?'list_choose_active':''"
+					@click="chooseYear(item, index)">{{item.year}}年</text>
+				</view>
+				
+				
 				<view class="curriulum_title_box goods_item pay_item" v-for="(v, i) in payList">
 					<view :class="isDefaultCurrency && i != 2 ? 'bgGrey top' : 'top'">
 						<view class="left">
@@ -20,7 +26,7 @@
 							</image>
 							<template v-if="v.type == 4">
 								<text> {{ v.text }}</text>
-								<text style="color: #3ab3ae; font-weight: 600; margin-left: 10rpx">
+								<text style="color: #018F89; font-weight: 600; margin-left: 10rpx">
 									(余额：{{
                    initData && initData.user ? initData.user.peanutCoin : 0
                  }})</text>
@@ -29,11 +35,11 @@
 							<text v-else> {{ v.text }}</text>
 						</view>
 						<template v-if="isDefaultCurrency">
-							<radio v-if="i == 2" :value="v.value" color="#3ab3ae"
+							<radio v-if="i == 2" :value="v.value" color="#018F89"
 								:checked="selectPayIndex == i ? true : false" @click="radioChange(i)" size="10" />
 						</template>
 						<template v-else>
-							<radio :value="v.value" color="#3ab3ae" :checked="selectPayIndex == i ? true : false"
+							<radio :value="v.value" color="#018F89" :checked="selectPayIndex == i ? true : false"
 								@click="radioChange(i)" size="10" />
 						</template>
 					</view>
@@ -51,9 +57,8 @@
 								确保您的天医币足够支付
 							</view>

-							<text class="fdButtonBox aui-text-danger fdButtonBoxRed" style="float: right" @click="
-                  onPageJump('/pages/mine/wallet/recharge/index?source=order')
-                ">立即充值</text>
+							<text class="fdButtonBox aui-text-danger fdButtonBoxRed" style="float: right"
+								@click="onPageJump('/pages/mine/wallet/recharge/index?source=order')">立即充值</text>
 						</view>

 						<view class="other_info" style="margin-top: 12rpx">
@@ -64,23 +69,15 @@
 								<span style="font-size: 15px"><u @click="gotoPhone">022-24142321</u></span>
 							</view>
 							<view class="explain">
-								<!-- 3.非中国大陆用户可通过paypal账户支付
-              <br> &nbsp;&nbsp;&nbsp;&nbsp;
-              <account class="aui-text-success" style="text-decoration: underline;" tapmode onclick="fnCopyAccount()">
-                  户名：tmrpublishgroup@sina.com
-              </account>
-              （点击复制）
-              <br> &nbsp;&nbsp;&nbsp;&nbsp;请务必备注本软件的用户姓名及电话以便核对信息，我们将于24小时内为您完成充值及升级。 -->
-
 								3.非中国大陆用户可以信用卡支付。简单快捷，推荐使用！
 								支付时使用的信用卡需要带有Visa或MasterCard的标识。请向邮箱
 								<text @click="fnCopy('publisher@tmrjournals.com', '邮箱')" class="aui-text-success"
-									style="text-decoration: underline; color: #3ab3ae">
+									style="text-decoration: underline; color: #018F89">
 									publisher@tmrjournals.com
 								</text>
 								（点击复制）发送支付请求，内容需包含：拟购买的课程名称、支付金额、APP注册姓名及手机号码，或者加一路健康客服微信（
 								<text class="aui-text-success" @click="fnCopy('yilujiankangkefu', '微信名')"
-									style="text-decoration: underline; color: #3ab3ae">
+									style="text-decoration: underline; color: #018F89">
 									yilujiankangkefu </text>）（点击复制）联系我们，我们将在24小时内向您的邮箱或者微信发送支付链接，根据提示即可完成信用卡支付，无需兑换外币。
 							</view>
 						</view>
@@ -101,36 +98,20 @@
 				<!-- leftSlot -->
 				<template slot="leftSlot" slot-scope="slotProps">
 					<view class="price_box order_bottom_box">
-						<text class="price">合计:
-
+						<text class="price">合计：
 							<text class="total">￥{{ dataInfo.lastFee }}</text>
 						</text>
-						<!-- <text style="color: #333; margin-left: 10rpx"
-              >原价{{ dataInfo.fee }}</text
-            > -->
 					</view>
 				</template>
-				<template slot="bottomSlot" slot-scope="slotProps"> </template>
 			</common-goods-nav>
 			<view class="agree_wo" style="width: 100%; text-align: right">
-				<!-- <radio-group class="agree">
-					<view v-for="(item, index) in argee" :key="index">
-						<radio class="agreeRadio" :value="item.id" :checked="item.id == radioValue" color="#3AB3AE" size="12px"
-							@click="radioCheck(index)"></radio>
-					</view>
-				</radio-group> -->
 				<view>支付即同意众妙之门<span class="highlight" @click="showXieyi">《会员服务协议》</span></view>
 			</view>
 		</view>
-
-		<!-- @close="closeOrderModalShow" -->
-
-		<!-- <z-navigation></z-navigation> -->
 	</view>
 </template>

 <script>
-	import debounce from "@/common/debounce.js";
 	import courseDescription from "@/pages/component/commonComponents/list";
 	import {
 		setPay,
@@ -170,15 +151,17 @@
 					this.$forceUpdate();
 				},
 			},
+			lastFee:{
+				immediate: true,
+				handler(newRoute) {
+					if(this.dataInfo.list&&this.dataInfo.list.length>0){
+						this.dataInfo.lastFee = this.dataInfo.list[0].rebateFee
+					}
+				}
+			}
 		},
 		data() {
 			return {
-				radioValue: "",
-				argee: [{
-					value: false,
-					id: "1",
-				}, ], // 同意权限
-				xyText: "",
 				isDefaultCurrency: false,
 				isShowAddress: false,
 				jfNumber: 0,
@@ -218,14 +201,6 @@
 					},
 				],
 				priceBreakdownList: [],
-				// orderInfoList: [
-				//   {
-				//     text: "订单备注",
-				//     placeholder: "点击填写订单备注",
-				//     imgUrl: "",
-				//     type: "remark",
-				//   },
-				// ],
 				number: 1,
 				detailInfo: {},
 				content: "",
@@ -240,8 +215,8 @@
 				detailInfo: {},
 				fdButtonStyle: {
 					width: "90rpx",
-					"border-color": "#3AB3AE",
-					color: "#3AB3AE",
+					"border-color": "#258feb",
+					color: "#258feb",
 					float: "right",
 					"margin-right": "20rpx",
 					"margin-left": "30rpx",
@@ -274,7 +249,6 @@
 				urlList: {
 					list: "app/phone.do?getCourseDetail_new",
 					initPrepareOrder: "/common/buyOrder/initPrepareOrder",
-					// buyOrder: "book/buyOrder/placeOrder",
 					buyOrder: "common/userVip/placeVipOrder",
 					curriculumInfo: "app/phone.do?getCourseInfo",
 					detailInfo: "app/phoneDoctor.do?getTaiHuClassInfo_new",
@@ -293,46 +267,21 @@
 					backgroundColor: "linear-gradient(90deg, #3AB3AE 0%, #117e4c 100%)",
 					color: "#fff",
 				}, ],
+				activeIndex: 0,  //选择付款 下标
 			};
 		},
 		async onLoad(options) {
-			console.log("调用了onLoad方法");
 			var that = this;
-			console.log("options at line 387:", options);
 			this.options = JSON.parse(options.data);
-			// if (this.options.goods.findIndex((e) => e.goodsType == "05") >= 0) {
-			//   this.isShowAddress = false;
-			// } else {
-			//   this.isShowAddress = true;
-			// }
 			this.goodsDataList = this.options.goods;
-			// if (this.options.sourceType == "curriculum") {
-			//   this.goToInfo = {
-			//     url: "/pages/curriculum/order/index/index",
-			//     type: 2,
-			//   };
-			// } else {
 			this.goToInfo = {
 				url: "/pages/bookShop/orderList",
 				type: 1,
 			};
-			// }
-			// that.initPrepareOrder();
-			console.log("this.options at line 375:", this.options, this.goToInfo);
-
-			// this.getUserInfo()
-			// this.getCateList()
-		},
-
-		onHide() {
-			// this.showSearchList = false
-			// this.searchList = []
 		},
 		async onShow() {
-			console.log("调用了onShow方法");
 			var that = this;
 			await uni.$on("returnData", function(data) {
-				console.log("data at line 415:", data);
 				if (data) {
 					that.addressData = {
 						...data,
@@ -347,23 +296,11 @@
 					console.log("没有接受到数据");
 				}
 			});
-			// this.selectPayIndex = 0;
-
-			console.log("this.addressData at line 416:", this.addressData);
 		},
 		computed: {
 			...mapState(["userInfo"]),
 		},
 		methods: {
-			showXieyi() {
-
-
-
-				uni.navigateTo({
-					url: "/pages/mine/aboutUs/agreement?id=105",
-				});
-			},
-
 			onHandleClickBuy() {
 				this.orderModalShow = false;
 				this.remark = this.content;
@@ -375,7 +312,6 @@
 				this.orderModalShow = false;
 			},
 			onPageJump(url) {
-				console.log(url, "url");
 				uni.navigateTo({
 					url: url,
 				});
@@ -393,9 +329,6 @@
 						type: 2,
 					},
 				];
-				// this.goodsDataList
-				console.log("this.goodsDataList at line 595:", this.goodsDataList);
-
 				var data = {
 					uid: this.userInfo.id,
 					productList: [],
@@ -405,12 +338,10 @@

 				this.$http
 					.request({
-						// url: "book/buyOrder/buySave",
 						url: `${this.urlList.initPrepareOrder}`,
-						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						method: "POST",
 						data,
 						header: {
-							//默认 无 说明：请求头
 							"Content-Type": "application/json",
 						},
 					})
@@ -422,8 +353,6 @@
 						}

 						this.$forceUpdate();
-
-						// await that.getDetailInfo();
 					});
 			},
 			// 获取订单初始话
@@ -473,10 +402,6 @@
 				uni.navigateTo({
 					url: "/pages/component/commonComponents/address/index?type=order",
 				});
-				// this.show = true;
-				// this.$nextTick(() => {
-				//   this.$refs.commonAddress.open();
-				// });
 			},
 			fnCopy(value, title) {
 				this.$commonJS.handleMakingPhoneCalls(value, title);
@@ -487,33 +412,26 @@
 			},
 			openOrderModal(v) {
 				this.orderModalShowInfo = v;
-				console.log(
-					"this.orderModalShowInfo at line 727:",
-					this.orderModalShowInfo
-				);
 				this.orderModalShow = true;
 				if (this.orderModalShowInfo.type == "remark") {
 					this.content = this.remark;
 				}
 			},
+			//支付请求
 			async goBuyJie() {
-				debounce(async () => {
-					// if (this.radioValue != 1) {
-					//   uni.showToast({
-					//     title: "请勾选 已阅读会员服务协议",
-					//     icon: "none",
-					//   });
-					//   return false;
-					// }
 				var that = this;
-
 				this.nowClick = false;
 				setTimeout(() => {
 					this.nowClick = true;
 				}, 5000);
-
 				let xiaBiao = [];
-
+				if (this.payType == 4 && this.initData.user.peanutCoin < this.dataInfo.lastFee) {
+					uni.showToast({
+						title: '天医币余额不足',
+						icon: 'none'
+					})
+					return
+				}
 				let data = {
 					paymentMethod: this.payType, //1微信2支付宝3苹果支付4虚拟币
 					orderMoney: this.dataInfo.lastFee, //订单金额
@@ -522,22 +440,17 @@
 					jfDeduction: 0, //积分抵扣
 					vipBuyConfigId: this.dataInfo.id,
 					come: 1, //订单来源，0疯子读书1国学众妙之门2医学吴门医述
-						// appName: "zmzm",
 				};
-					console.log("data at line 477:", data);
 				await $http
 					.request({
-							// url: "book/buyOrder/buySave",
 						url: that.urlList.buyOrder,
-							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						method: "POST",
 						data,
 						header: {
-								//默认 无 说明：请求头
 							"Content-Type": "application/json",
 						},
 					})
 					.then(async (res) => {
-							console.log("res at line 598111111111111:", res);
 						if (res.code == 0) {
 							if (res.orderSn == null) {
 								uni.showToast({
@@ -546,7 +459,6 @@
 									image: "../../../static/icon/ic_close.png",
 								});
 							} else {
-									console.log("that.payType at line 607:", that.payType);
 								if (that.payType == 2) {
 									// 常规支付
 									uni.showToast({
@@ -571,23 +483,15 @@
 													title: "支付成功",
 												});
 												setTimeout(() => {
-														uni.setStorageSync(
-															"orderStatus", 0);
 													uni.switchTab({
 														url: "/pages/bookShop/orderList?type=order",
-															success: function(
-																res) {},
 													});
 												}, 1000);
 											} else {
-													console.log("失败失败失败");
-
-													// that.$commonJS.showToast('支付是失败')
 												setTimeout(() => {
 													console.log("延迟调用 失败提示");
 													uni.showToast({
 														title: "支付失败",
-
 														image: "../../../static/icon/ic_close.png",
 													});
 												}, 0);
@@ -607,18 +511,12 @@
 												title: "支付成功",
 											});
 											setTimeout(() => {
-													uni.setStorageSync(
-														"orderStatus", 0);
 												uni.switchTab({
 													url: "/pages/bookShop/orderList?type=order",
-														success: function(
-															res) {},
 												});
 											}, 1000);
 										} else {
-												console.log(res, "微信支付111111111111111");
-												if (res.data.errMsg.indexOf(
-														"User canceled") != -1) {
+											if (res.data.errMsg.indexOf("User canceled") != -1) {
 												uni.showToast({
 													title: "用户取消支付",
 													icon: "none",
@@ -640,23 +538,26 @@
 										icon: "success",
 									});
 									setTimeout(() => {
-											uni.setStorageSync("orderStatus", 0);
 										uni.switchTab({
 											url: "/pages/bookShop/orderList?type=order",
-												success: function(res) {},
 										});
 									}, 1000);
 								}
 							}
 						}
 					});
-				}, 200);
 			},
+			//切换年份选项
+			chooseYear(item,index){
+				this.activeIndex = index;
+				this.dataInfo.lastFee = item.rebateFee;
 				
+				
+				console.log('----this.dataInfo',this.dataInfo);
+			},
 			radioChange(index) {
 				this.selectPayIndex = index;
 				this.payType = this.payList[this.selectPayIndex].type;
-				console.log("this.selectPayIndex at line 315:", this.selectPayIndex);
 				this.$forceUpdate();
 			},
 			handleValChange(e) {
@@ -676,12 +577,6 @@
 						...this.taiHuClassInfo,
 					},
 				};
-				// $mars.progressBegin('申请中...');
-				// $mars.post(customerType, 'applyRelearn', data, function (ret) {
-				//     api.hideProgress();
-
-				//     fnLoadDataGrid();
-				// });
 			},
 			fnRelearn(oid, days, courseFee) {
 				//99和199课程复读一个月60三个月120; 299和399课程复读一个月80三个月180
@@ -717,14 +612,6 @@
 					fee: fee,
 				};
 				this.show = true;
-				// $aui.alert({
-				//     title: ,
-				//     content: '用户您好，该课程已到期，通过支付' + fee + '元，本门课程可获得' + days + '天延期学习时间，点击确认即完成自动扣费，感谢配合！',
-				//     buttons: ['取消', '确认'],
-				//     radius: 6,
-				//     titleColor: '#ff3300',
-				//     contColor: '#333',
-				//     btnColor: ''
 			},
 			//课程详情
 			async gotoDetail(v) {
@@ -741,7 +628,6 @@
 				}

 				uni.navigateTo({
-					// url: '../bookShop/commodityDetail?id=' + item.id
 					url: `/pages/curriculum/order/curriculum/detail?navTitle=${v.title}&title=${v.title}&oid=${v.courseOid}&conditions=${v.conditions}&detailOid=${v.detailOid}`,
 				});
 			},
@@ -749,14 +635,12 @@
 			goCourseDescription(v) {
 				console.log(v);
 				uni.navigateTo({
-					// url: '../bookShop/commodityDetail?id=' + item.id
 					url: `/pages/curriculum/order/curriculum/index?navTitle=${v.title}&title=${v.title}&oid=${v.oid}`,
 				});
 			},
 			async getCourseDescriptionData() {
 				var data = {};
 				var that = this;
-				console.log(this.$store.state, "11111111111");
 				this.$http
 					.post(this.urlList.list, {
 						customerType: "D",
@@ -774,16 +658,10 @@
 							this.swiperList.push(that.curriculumData.explainsImg);
 						} else {
 							that.swiperList = that.curriculumData.productImageList.split(",");
-							// for (var i = 0; i < imgList.length; i++) {
-							// 	this.swiperList.push(imgList[i])
-							// }
 						}

 						that.dataList = res.obj.correlatedList;
 						await that.getDetailInfo();
-						// that.relatedCoursesList = res.obj.correlatedList
-						// await that.handleselectCate({ ...this.cateList[0], index: 0 })
-						// socket.init();
 					});
 			},
 			getPriceData() {
@@ -798,21 +676,6 @@
 			checkDisable() {
 				console.log("点击了");
 			},
-			// 显示无权限弹窗
-			// showNoRights() {
-			// 	let that = this
-			// 	uni.showModal({
-			// 		content: "",
-			// 		confirmText: '好的',
-			// 		showCancel: false,
-			// 		success: function(res) {
-			// 			if (res.confirm) {
-			// 				// console.log('用户点击确定');
-			// 				that.clear()
-			// 			}
-			// 		}
-			// 	})
-			// },
 			// 获取用户详情
 			getUserInfo() {
 				// 用户详情
@@ -830,9 +693,6 @@
 				var data = [];
 				console.log(item, index, 99999);
 				var that = this;
-
-				// curriculumInfo
-
 				this.$http
 					.post(this.urlList.curriculumInfo, {
 						customerType: "D",
@@ -843,141 +703,27 @@
 					.then(async (res) => {
 						that.curriculumInfo = res.obj;
 						that.dataList = res.obj.courseList;
-
-						// socket.init();
 					});
-
 				this.searchValue = "";
 				this.searchList = [];
 				this.showSearchList = false;
-
 				return data;
 			},
 			async getDetailInfo() {
 				var that = this;
-
-				// curriculumInfo
-
 				this.detailInfo = {
 					content: "<img src='http://oss.taihumed.com/other/null_20210528102528870.jpg' ></img> <img src='http://101.201.146.165:8088/curriculum/detailImg/curriculum_20170420143333621.png'  ></img><p><p>没有中医基础想学中医难不难？中医学者治疗出现瓶颈怎么办？中西医究竟有什么不同呢？吴雄志教授将以全新的视角，完美整合中药学和西医学知识，让你领略当代中医生理学魅力。</p><p><br/><p></p><p><br/></p><p>【思考题】</p><p>1、简述中医的发展这些年出现了哪些变化？</p><p>2、简述中西医学科的异同？</p>",
 				};
-
-				// this.$http
-				//     .post(this.urlList.detailInfo, {
-				//         customerType
-				//             :
-				//             "D",
-				//         token
-				//             : uni.getStorageSync("token")
-				//         ,
-				//         customerOid
-				//             : uni.getStorageSync("customerOid"),
-				//         classOid: 'f81b558ca4ee406e97c4045c87c2539c'
-
-				//     })
-				//     .then(async res => {
-				//         that.detailInfo = res.obj
-				//         // that.dataList = res.obj.courseList
-
-				//         // socket.init();
-
-				//     });
-
-				// this.$nextTick(() => {
-				//     switch (item.type) {
-				//         case 1:
-				//             // allDataList
-				//             this.dataList = that.allDataList.result1Lst
-				//             break;
-				//         case 2:
-				//             this.dataList = that.allDataList.result2Lst
-				//             break;
-				//         case 3:
-				//             this.dataList = that.allDataList.result3Lst
-				//             break;
-				//         case 4:
-				//             this.dataList = that.allDataList.result4Lst.filter(e =>
-				//                 e.oid != '5fcf991c027b11e7ae62008cfae40c18' && e.oid != 'b3d8a938b8e147bc877613bb712a9cb3' && e.oid != '4d4730163135420ea962bfac4805e026' && e.oid != '49fb76ca3d6b43718d78c6aa9a3003c2' && e.oid != 'c7b047ed9246469b9ae2b1013fc3df9c'
-
-				//             )
-
-				//             console.log(this.dataList.length, 6666666)
-				//             break;
-
-				//     }
-
-				//     this.currentCateIndex = item.index
-				// })
-				console.log(this.allDataList, this.dataList, "1688");
-				// if(this.userMes.tgdzPower == 0){
-				// 	let that = this
-				// 	uni.showModal({
-				// 		content: "购买 针灸六经法要上册和下册 后方可使用此功能",
-				// 		confirmText: '好的',
-				// 		showCancel: false,
-				// 		success: function(res) {
-				// 			if (res.confirm) {
-				// 				// console.log('用户点击确定');
-				// 			}
-				// 		}
-				// 	})
-				// 	return
-				// }
-				// if(item.title == "时辰取穴"){
-				// 	uni.navigateTo({
-				// 		url: "../timeAcupoint/timeAcupoint"
-				// 	})
-				// 	return
-				// }
-
-				// this.currentStatusIndex = index
-
 				this.searchValue = "";
 				this.searchList = [];
 				this.showSearchList = false;
-				// if (index != 2) {
-
-				// uni.createSelectorQuery().select('.statusList').boundingClientRect(function (rect) {
-				// 	var height = rect.height
-				// 	console.log('元素高度：',);
-
-				// }).exec();
-
-				// } else {
-				// 	this.getJFList(dictType)
-				// }
-
 				return data;
 			},
 			async setOneCateIndex(item, index) {
 				this.allDataList = [];
 				console.log(index, 99999);
 				var that = this;
-
-				// if(this.userMes.tgdzPower == 0){
-				// 	let that = this
-				// 	uni.showModal({
-				// 		content: "购买 针灸六经法要上册和下册 后方可使用此功能",
-				// 		confirmText: '好的',
-				// 		showCancel: false,
-				// 		success: function(res) {
-				// 			if (res.confirm) {
-				// 				// console.log('用户点击确定');
-				// 			}
-				// 		}
-				// 	})
-				// 	return
-				// }
-				// if(item.title == "时辰取穴"){
-				// 	uni.navigateTo({
-				// 		url: "../timeAcupoint/timeAcupoint"
-				// 	})
-				// 	return
-				// }
-
 				this.currentStatusIndex = index;
-				// this.currentCateIndex = 0
-
 				this.searchValue = "";
 				this.searchList = [];
 				this.showSearchList = false;
@@ -986,19 +732,6 @@

 					this.$forceUpdate();
 				});
-
-				// this.handleselectCate(this.cateList[this.currentCateIndex])
-				// if (index != 2) {
-
-				// uni.createSelectorQuery().select('.statusList').boundingClientRect(function (rect) {
-				// 	var height = rect.height
-				// 	console.log('元素高度：',);
-
-				// }).exec();
-
-				// } else {
-				// 	this.getJFList(dictType)
-				// }
 			},

 			transformData(inputData) {
@@ -1012,159 +745,13 @@
 					}
 					result[letter].push(item);
 				});
-				// const finalResult = Object.keys(result).map(key => ({ [key]: result[key] }));
 				return result;
 			},
-			// getJFList(id) {
-			// 	$http.request({
-			// 		url: "book/prescript/prescriptListForJF",
-			// 		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-			// 		data: {
-			// 			loadAnimate: 'none', // 请求加载动画
-			// 			'categoryId': id
-			// 		},
-			// 		header: { //默认 无 说明：请求头
-			// 			'Content-Type': 'application/json'
-			// 		},
-			// 	}).then(res => {
-			// 		if (res.code == 0 && res.list.length > 0) {
-			// 			this.twoCateList = []
-			// 			this.dataList = this.transformData(res.list)
-			// 			console.log('JF经方', this.dataList)
-			// 		} else {
-			// 			this.twoCateList = []
-			// 			this.dataList = []
-			// 		}
-			// 	}).catch(e => {
-			// 		this.twoCateList = []
-			// 		this.dataList = []
-			// 		console.log(e)
-			// 	})
-			// },
 			getCateList(id) {
 				id ? "" : (id = 0);
 				this.twoCateList = [];
 				this.curTwoCateIndex = 0;
-				// 0为获取顶级分类，其他为搜索下级分类，目前的逻辑，顶级是写死的，所以可能只会涉及到搜索第二级
-				// $http.request({
-				// 	url: "book/prescript/prescriptCategoryList",
-				// 	method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-				// 	data: {
-				// 		loadAnimate: 'none', // 请求加载动画
-				// 		'categoryId': id
-				// 	},
-				// 	header: { //默认 无 说明：请求头
-				// 		'Content-Type': 'application/json'
-				// 	},
-				// }).then(res => {
-				// console.log(res, '脉穴分类获取成功')
-				// if (res.code == 0 && res.list.length > 0) {
-				// this.statusList = res.list
-				// this.getTowCateList(this.statusList[0].type)
-				// } else {
-				// 	this.statusList = []
-				// }
-				// }).catch(e => {
-				// 	this.statusList = []
-				// 	console.log(e)
-				// })
 			},
-
-			// 放大图片
-			previewImage(url) {
-				console.log(url);
-				uni.previewImage({
-					urls: [url],
-					longPressActions: {
-						itemList: ["很抱歉，暂不支持保存图片到本地"],
-						success: function(res) {
-							// console.log(res,'+++++')
-						},
-					},
-				});
-			},
-			// getSearch() {
-			// 	$http.request({
-			// 		url: "book/prescript/searchPrescript",
-			// 		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-			// 		data: {
-			// 			loadAnimate: 'none', // 请求加载动画
-			// 			'keywords': this.searchValue,
-			// 			type: this.currentStatusIndex + 1
-			// 		},
-			// 		header: { //默认 无 说明：请求头
-			// 			'Content-Type': 'application/json'
-			// 		},
-			// 	}).then(res => {
-			// 		console.log(res, '搜索结果')
-			// 		if (res.code == 0 && res.list.length >= 0) {
-			// 			this.showSearchList = true
-			// 			this.searchList = res.list
-			// 		} else {
-			// 			this.searchList = []
-			// 		}
-			// 	}).catch(e => {
-			// 		// this.dataList = []
-			// 		this.searchList = []
-			// 		console.log(e)
-			// 	})
-			// },
-			// search(res) {
-			// 	console.log(res, 'res')
-			// 	// uni.showToast({
-			// 	// 	title: '搜索：' + res,
-			// 	// 	icon: 'none'
-			// 	// })
-			// 	if (res == '') {
-			// 		this.showSearchList = false
-			// 		this.searchList = []
-			// 	} else {
-			// 		this.getSearch()
-			// 	}
-
-			// },
-			// input(res) {
-			// 	console.log('----input:', res)
-			// 	if (res == '') {
-			// 		this.searchList = []
-			// 	} else {
-			// 		this.getSearch()
-			// 	}
-			// },
-			// clear(res) {
-			// 	console.log('----clear:', res)
-			// 	// uni.showToast({
-			// 	// 	title: 'clear事件，清除值为：',
-			// 	// 	icon: 'none'
-			// 	// })
-			// 	this.searchValue = ''
-			// 	this.showSearchList = false
-			// },
-			// blur(res) {
-			// 	// console.log('----blur:', res)
-			// 	// if (res == '') {
-			// 	// 	this.showSearchList = false
-			// 	// 	this.searchList = []
-			// 	// } else {
-			// 	// 	this.getSearch()
-			// 	// }
-			// },
-			// focus(e) {
-			// 	console.log('----focus:')
-			// 	// uni.showToast({
-			// 	// 	title: 'focus事件，输出值为：' + e.value,
-			// 	// 	icon: 'none'
-			// 	// })
-			// 	// 等于1 就是有权限
-			// 	// this.showSearchList = true
-
-			// },
-			// cancel(res) {
-			// 	uni.showToast({
-			// 		title: '点击取消，输入值为：' + res.value,
-			// 		icon: 'none'
-			// 	})
-			// }
 		},
 		onBackPress() {
 			// #ifdef APP-PLUS
@@ -1505,7 +1092,7 @@
 		border-color: #e6e6e6;
 		border-left-color: transparent;
 		border-style: solid;
-		// background-color: #3AB3AE;
+		// background-color: #258feb;

 		border-top-right-radius: 10rpx;
 		border-bottom-right-radius: 10rpx;
@@ -1719,6 +1306,24 @@
 		justify-content: space-between;
 	}

+	/deep/.commonDetailPage {
+		height: 100vh !important;
+	}
+	
+	.list_choose{
+		display: inline-block;
+		border:1rpx solid #999;
+		color: #999;
+		border-radius: 10rpx;
+		margin: 20rpx 30rpx 20rpx 0;
+		padding: 0 30rpx;
+		font-size: 28rpx;
+		line-height: 50rpx;
+	}
+	.list_choose_active{
+		border:1rpx solid #ff1f00;
+		color: #ff1f00;
+	}
 	.agree_wo {
 			float: right;
 			width: 100%;
--- a/pages/tabBar/extUI/extUI.nvue
+++ b/pages/tabBar/extUI/extUI.nvue
--- a/pages/tabBar/template/template.nvue
+++ b/pages/tabBar/template/template.nvue
--- a/static/.DS_Store
+++ b/static/.DS_Store
--- a/static/icon/chao_svip.png
+++ b/static/icon/chao_svip.png
--- a/static/icon/chao_vip.png
+++ b/static/icon/chao_vip.png
--- a/uni_modules/.DS_Store
+++ b/uni_modules/.DS_Store
--- a/unpackage/.DS_Store
+++ b/unpackage/.DS_Store