From b8bd350f4e1fb61a53e6d8140a05b07222ca9be3 Mon Sep 17 00:00:00 2001
From: wangdong <1551135706@qq.com>
Date: Mon, 11 Mar 2024 09:50:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                              |  42 +++-
 pages/forgotPwd/index.vue               |   6 +-
 pages/index/index.vue                   |   6 +-
 pages/learningCenter/recite.vue         | 136 ++++++++++++
 pages/learningCenter/reciteContent.vue  | 185 ++++++++++++++++
 pages/learningCenter/reciteDetail.vue   | 238 ++++++++++++++++++++
 pages/mine/index.vue                    |   6 +-
 pages/my/about_us.vue                   |  10 +-
 pages/my/feedback.vue                   |  60 +++++
 pages/my/helpCenter.vue                 | 115 ++++++++++
 pages/my/orgCooperation.vue             | 283 ++++++++++++++++++++++++
 pages/my/sign_in.vue                    |   2 +-
 pages/my/user_info.vue                  | 116 +++++-----
 pages/special/details.vue               |   2 +
 pages/special/grade_list.vue            | 178 ++++++++++-----
 pages/special/offline_apply.vue         |  57 +++++
 static/images/learning/audio.png        | Bin 0 -> 1122 bytes
 static/images/learning/audio_active.png | Bin 0 -> 1155 bytes
 static/images/learning/icon.png         | Bin 0 -> 641 bytes
 static/images/learning/lock.png         | Bin 0 -> 1066 bytes
 static/images/learning/nolock.png       | Bin 0 -> 1056 bytes
 static/images/my/feedback.png           | Bin 0 -> 2150 bytes
 22 files changed, 1329 insertions(+), 113 deletions(-)
 create mode 100644 pages/learningCenter/recite.vue
 create mode 100644 pages/learningCenter/reciteContent.vue
 create mode 100644 pages/learningCenter/reciteDetail.vue
 create mode 100644 pages/my/feedback.vue
 create mode 100644 pages/my/helpCenter.vue
 create mode 100644 pages/my/orgCooperation.vue
 create mode 100644 static/images/learning/audio.png
 create mode 100644 static/images/learning/audio_active.png
 create mode 100644 static/images/learning/icon.png
 create mode 100644 static/images/learning/lock.png
 create mode 100644 static/images/learning/nolock.png
 create mode 100644 static/images/my/feedback.png

diff --git a/pages.json b/pages.json
index ee4d933..53fab35 100644
--- a/pages.json
+++ b/pages.json
@@ -392,12 +392,29 @@
 						"navigationBarTitleText": "我的关注"
 					}
 				},
-				
 				{
 					"path": "invoiceList",
 					"style": {
 						"navigationBarTitleText": "开票申请"
 					}
+				},
+				{
+					"path": "orgCooperation",
+					"style": {
+						"navigationBarTitleText": "出国留学"
+					}
+				},
+				{
+					"path": "helpCenter",
+					"style": {
+						"navigationBarTitleText": "帮助与反馈"
+					}
+				},
+				{
+					"path": "feedback",
+					"style": {
+						"navigationBarTitleText": "帮助与反馈"
+					}
 				}
 			]
 		},
@@ -429,6 +446,29 @@
 				}
 			]
 		},
+		{
+			"root": "pages/learningCenter",
+			"pages": [
+				{
+					"path": "recite",
+					"style": {
+						"navigationBarTitleText": "背诵过关"
+					}
+				},
+				{
+					"path": "reciteContent",
+					"style": {
+						"navigationBarTitleText": "内容列表"
+					}
+				},
+				{
+					"path": "reciteDetail",
+					"style": {
+						"navigationBarTitleText": "详情"
+					}
+				}
+			]
+		},
 		{
 			"root": "pages/live",
 			"pages": [
diff --git a/pages/forgotPwd/index.vue b/pages/forgotPwd/index.vue
index ce1bdd1..dedc9b6 100644
--- a/pages/forgotPwd/index.vue
+++ b/pages/forgotPwd/index.vue
@@ -69,7 +69,11 @@ export default {
 			commitPwdShow: false, // 密码显示隐藏
     };
   },
-  onLoad() {},
+  onLoad(options) {
+		if (options.phone) {
+			this.phone = options.phone;
+		}
+	},
   methods: {
     // 获取验证码
     async getCode() {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c0cba15..88a8458 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -985,9 +985,9 @@ page {
 }
 
 .goodsList .image {
-	width: 156rpx;
-	height: 184rpx;
-	margin-right: 52rpx;
+	width: 270rpx;
+	height: 160rpx;
+	margin-right: 24rpx;
 	flex-shrink: 0;;
 }
 
diff --git a/pages/learningCenter/recite.vue b/pages/learningCenter/recite.vue
new file mode 100644
index 0000000..31221f3
--- /dev/null
+++ b/pages/learningCenter/recite.vue
@@ -0,0 +1,136 @@
+<template>
+	<BaseContainer class="recite">
+		<NavBar title="背诵过关" />
+		<view class="list">
+			<template v-if="list.length > 0">
+				<view v-for="(item, index) in list" class="list-item flex flex-center-x" @click="toContent">
+					<view class="item-left">
+						<view class="title">
+							<image src="@/static/images/learning/icon.png" mode="aspectFill"></image>
+							{{ item.name }}
+						</view>
+						<view class="content">
+							<view :style="{ borderColor: item.todayRecite ? '' : '#FFC067', color: item.todayRecite ? '': '#FFBF66' }">今日{{ item.todayRecite ? '已' : '未' }}背诵</view>
+							<view>词汇量：{{ item.count }}</view>
+						</view>
+					</view>
+					<view class="item-right">
+						<view
+							v-if="item.type < 2"
+							class="status"
+							:style="{ background: item.type === 0 ? '#FFEDE9' : '#EFF8FE', color: item.type === 0 ? '#FF4B33': '#0F74BB' }">{{ item.type === 0 ? '免费' : '试看' }}</view>
+						<image v-if="item.type === 2" src="@/static/images/learning/nolock.png" mode="aspectFill"></image>
+						<image v-if="item.type === 3" src="@/static/images/learning/lock.png" mode="aspectFill"></image>
+						<view class="list-more"></view>
+					</view>
+				</view>
+			</template>
+		</view>
+	</BaseContainer>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [ // 0：免费 1：试看 2：解锁 3：锁住
+					{ name: '大学英语四级词汇背诵', count: '1000', todayRecite: true, type: 0 },
+					{ name: '大学英语四级词汇背诵', count: '1000', todayRecite: false, type: 0 },
+					{ name: '大学英语四级词汇背诵', count: '1000', todayRecite: false, type: 1 },
+					{ name: '大学英语四级词汇背诵', count: '1000', todayRecite: false, type: 1 },
+					{ name: '大学英语四级词汇背诵', count: '1000', todayRecite: false, type: 2 },
+					{ name: '大学英语四级词汇背诵', count: '1000', todayRecite: false, type: 3 }
+				],
+			};
+		},
+		methods: {
+			toContent() {
+				uni.navigateTo({
+					url: '/pages/learningCenter/reciteContent',
+				});
+			},
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	.recite {
+		background: #f6f6f6;
+		.list {
+			width: 690rpx;
+			margin: 20rpx 30rpx 0;
+			.list-item {
+				width: 100%;
+				height: 158rpx;
+				background: #fff;
+				border-radius: 8rpx;
+				box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(68,68,68,0.04);
+				align-items: center;
+				padding: 0 30rpx;
+				margin-bottom: 20rpx;
+				.item-left {
+					flex: 1;
+					.title {
+						color: #333;
+						font-size: 30rpx;
+						display: flex;
+						align-items: center;
+						image {
+							width: 44rpx;
+							height: 44rpx;
+							margin-right: 15rpx;
+						}
+					}
+					.content {
+						display: flex;
+						align-items: center;
+						margin-top: 20rpx;
+						>view {
+							font-size: 20rpx;
+							color: #666666;
+							&:first-child {
+								width: 112rpx;
+								height: 33rpx;
+								border-radius: 5rpx;
+								border: 1px solid #2DD092;
+								font-size: 20rpx;
+								color: #2DD092;
+								text-align: center;
+								line-height: 33rpx;
+								margin-right: 24rpx;
+							}
+						}
+					}
+				}
+				.item-right {
+					display: flex;
+					align-items: center;
+					.status {
+						width: 76rpx;
+						height: 39rpx;
+						background: #FFEDE9;
+						border-radius: 6rpx 0rpx 6rpx 0rpx;
+						text-align: center;
+						line-height: 39rpx;
+						font-size: 22rpx;
+					}
+					image {
+						width: 44rpx;
+						height: 44rpx;
+					}
+					.list-more {
+						width: 14rpx;
+						height: 14rpx;
+						border-width: 2px 2px 0 0;
+						border-color: #ccc;
+						border-style: solid;
+						-webkit-transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+						transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+						vertical-align: top;
+						margin-left: 13rpx;
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/learningCenter/reciteContent.vue b/pages/learningCenter/reciteContent.vue
new file mode 100644
index 0000000..cc0624d
--- /dev/null
+++ b/pages/learningCenter/reciteContent.vue
@@ -0,0 +1,185 @@
+<template>
+	<BaseContainer class="recite-content flex">
+		<NavBar title="内容列表" />
+		<view class="content-box">
+			<view class="content-info">
+				<view class="info-top flex">
+					<image src="@/static/images/learning/icon.png" mode="aspectFill"></image>
+					{{ info.name }}
+					<view class="change">修改</view>
+				</view>
+				<view class="info-center">
+					<view class="center-percent" :style="{ width: `${ info.hasRecite / info.count * 100 }%`}"></view>
+				</view>
+				<view class="info-bottom flex flex-center-x">
+					<view>已练习：{{ info.hasRecite }}/{{ info.count }}</view>
+					<view>试看剩余：{{ info.surplus }}</view>
+				</view>
+			</view>
+			<view class="list-content">
+				<template v-if="info.contentList.length > 0">
+					<view v-for="(item, index) in info.contentList" :key="index" class="list-box">
+						<view class="title flex flex-center-x">
+							{{ item.title }}
+							<image v-if="item.isLock" src="@/static/images/learning/lock.png" mode="aspectFill"></image>
+							<image v-else src="@/static/images/learning/nolock.png" mode="aspectFill"></image>
+						</view>
+						<view class="list">
+							<view v-for="(con, k) in item.list" class="list-item flex flex-center-x" @click="toDetail(con, item.isLock)">
+								<view class="item-name">{{ k + 1 < 10 ? `0${k+1}` : k }}.{{ con }}</view>
+								<view class="list-more"></view>
+							</view>
+						</view>
+					</view>
+				</template>
+			</view>
+		</view>
+	</BaseContainer>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				info: {
+					name: '大学英语四级词汇背诵',
+					count: 1000,
+					hasRecite: 120,
+					surplus: '00:12:12',
+					contentList: [
+						{
+							title: '第一章节',
+							isLock: false,
+							list: ['goods', 'administration', 'goods', 'administration', 'goods', 'administration']
+						},
+						{
+							title: '第二章节',
+							isLock: true,
+							list: ['goods', 'administration', 'goods', 'administration', 'goods', 'administration']
+						}
+					]
+				},
+				list: [],
+			};
+		},
+		methods: {
+			toDetail(con, isLock) {
+				console.log(isLock);
+				if (isLock) {
+					this.$util.showMsg('还未解锁');
+				} else {
+					uni.navigateTo({
+						url: '/pages/learningCenter/reciteDetail',
+					});
+				}
+			},
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	.recite-content {
+		background: #f6f6f6;
+		flex-direction: column;
+		.content-box {
+			width: 690rpx;
+			margin: 20rpx 30rpx 0;
+			flex: 1;
+			.content-info {
+				height: 178rpx;
+				background: #FFFFFF;
+				box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(68,68,68,0.04);
+				border-radius: 8rpx;
+				padding: 27rpx 30rpx 0;
+				.info-top {
+					color: #333;
+					font-size: 30rpx;
+					display: flex;
+					align-items: center;
+					image {
+						width: 44rpx;
+						height: 44rpx;
+						margin-right: 14rpx;
+					}
+					.change {
+						width: 100rpx;
+						height: 36rpx;
+						background: #0F74BB;
+						border-radius: 18rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						color: #FFFFFF;
+						font-size: 20rpx;
+						margin-left: auto;
+						line-height: 36rpx;
+					}
+				}
+				.info-center {
+					margin: 13rpx 0 18rpx;
+					height: 20rpx;
+					background: rgba(255, 149, 0, 0.1);
+					border-radius: 10rpx;
+					position: relative;
+					.center-percent {
+						background: #FF9500;
+						border-radius: 10rpx;
+						height: 100%;
+						position: absolute;
+						top: 0;
+						left: 0;
+					}
+				}
+				.info-bottom {
+					justify-content: space-between;
+					color: #666;
+					font-size: 20rpx;
+				}
+			}
+		}
+		.list-content {
+			.list-box {
+				margin-top: 50rpx;
+				.title {
+					color: #333;
+					font-size: 30rpx;
+					justify-content: center;
+					margin-bottom: 25rpx;
+					image {
+						width: 44rpx;
+						height: 44rpx;
+						margin-left: 14rpx;
+					}
+				}
+				.list {
+					background: #FFFFFF;
+					box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(68,68,68,0.04);
+					border-radius: 8rpx;
+					padding: 0 30rpx;
+					.list-item {
+						height: 100rpx;
+						border-bottom: 2rpx solid #F6F6F6;
+						padding-left: 15rpx;
+						.list-more {
+							width: 14rpx;
+							height: 14rpx;
+							border-width: 2px 2px 0 0;
+							border-color: #ccc;
+							border-style: solid;
+							-webkit-transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+							transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+							vertical-align: top;
+							margin-left: 13rpx;
+						}
+						.item-name {
+							flex: 1;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/learningCenter/reciteDetail.vue b/pages/learningCenter/reciteDetail.vue
new file mode 100644
index 0000000..15ef46f
--- /dev/null
+++ b/pages/learningCenter/reciteDetail.vue
@@ -0,0 +1,238 @@
+<template>
+	<BaseContainer class="recite-detail flex">
+		<NavBar title="详情" />
+		<view class="detail-box">
+			<view class="detail-info">
+				<view class="info-name flex">
+					{{ detailInfo.name }}
+					<view :class="[
+					  'iconfont',
+					  detailInfo.collect ? 'iconshoucang2' : 'iconshoucang11',
+					]" @click="detailInfo.collect = !detailInfo.collect"></view>
+				</view>
+				<view class="audio-box">
+					<view class="audio" :class="{ audioActive: activeAudio === 1 }" @click="activeAudio = 1;">
+						英 <text>{{ detailInfo.enAudio }}</text>
+						<image v-if="activeAudio !== 1" src="@/static/images/learning/audio.png" mode="aspectFill" @click="openAudio"></image>
+						<image v-else src="@/static/images/learning/audio_active.png" mode="aspectFill" @click="openAudio"></image>
+					</view>
+					<view class="audio" :class="{ audioActive: activeAudio === 2 }" @click="activeAudio = 2;">
+						美 <text>{{ detailInfo.uaAudio }}</text>
+						<image v-if="activeAudio !== 2" src="@/static/images/learning/audio.png" mode="aspectFill"  @click="openAudio"></image>
+						<image v-else src="@/static/images/learning/audio_active.png" mode="aspectFill"  @click="openAudio"></image>
+					</view>
+				</view>
+				<view class="info-remark flex flex-center-x">
+					<view>{{ detailInfo.remark }}</view>
+					<view>单词报错</view>
+				</view>
+				<view class="info-adverb">
+					副词 <text>{{ detailInfo.adverb }}</text>
+				</view>
+			</view>
+			<view class="example">
+				<view class="title">例句</view>
+				<view v-for="(item, index) in detailInfo.example" :key="index" class="example-item">
+					<view class="item-content">
+						<view v-html="item.content"></view>
+						<image src="@/static/images/learning/audio.png" mode="aspectFill"></image>
+					</view>
+					<view class="item-translate">{{ item.translate }}</view>
+				</view>
+			</view>
+			<view class="analysis">
+				<view class="title">词根词缀句</view>
+				<view class="analysis-content">{{ detailInfo.analysis }}</view>
+			</view>
+		</view>
+		<view class="detail-footer flex flex-center-x">
+			<view class="btn cut">砍掉</view>
+			<view class="btn next">下一题</view>
+		</view>
+	</BaseContainer>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				detailInfo: {
+					collect: false,
+					name: 'outdoor',
+					enAudio: '/’aʊtdɔ:(r)/',
+					uaAudio: '/’aʊtdɔ:r/ ',
+					remark: 'adj.户外的;室外的',
+					adverb: 'outdoors',
+					example: [
+						{ content: 'If you enjoy <text style="color: #0F74BB;">outdoor</text> activities, this is the trip for you.', translate: '如果你喜欢户外运动，这一旅行很适合你。' },
+						{ content: 'If you enjoy <text style="color: #0F74BB;">outdoor</text> activities, this is the trip for you.', translate: '如果你喜欢户外运动，这一旅行很适合你。' },
+						{ content: 'If you enjoy <text style="color: #0F74BB;">outdoor</text> activities, this is the trip for you.', translate: '如果你喜欢户外运动，这一旅行很适合你。' },
+						{ content: 'If you enjoy <text style="color: #0F74BB;">outdoor</text> activities, this is the trip for you.', translate: '如果你喜欢户外运动，这一旅行很适合你。' },
+					],
+					analysis: 'out- 在外面 + door n.门'
+				},
+				activeAudio: 1,
+			};
+		},
+		methods: {
+			openAudio() {
+				
+			},
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	.recite-detail {
+		background: #f6f6f6;
+		flex-direction: column;
+		.detail-box {
+			width: 690rpx;
+			margin: 20rpx auto;
+			flex: 1;
+			overflow-y: auto;
+			.detail-info {
+				padding: 36rpx 20rpx 36rpx 32rpx;
+				background: #FFFFFF;
+				box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(68,68,68,0.04);
+				border-radius: 8rpx;
+				.info-name {
+					color: #333333;
+					font-size: 62rpx;
+					line-height: 62rpx;
+					align-items: baseline;
+					font-weight: bold;
+					.iconfont {
+					  font-size: 40rpx;
+						margin-left: auto;
+						font-weight: normal;
+						&.iconshoucang2 {
+							color: #ff6b00 !important;
+						}
+					}
+				}
+				.audio-box {
+					display: flex;
+					flex-wrap: wrap;
+					margin-top: 40rpx;
+					.audio {
+						height: 48rpx;
+						background: #F7F7F7;
+						border-radius: 24rpx;
+						display: flex;
+						align-items: center;
+						padding: 0 26rpx;
+						&:first-child {
+							margin-right: 16rpx;
+						}
+						&.audioActive {
+							background: rgba(15, 116, 187, 0.1);
+						}
+						text {
+							margin-left: 10rpx;
+						}
+						image {
+							width: 28rpx;
+							height: 28rpx;
+							margin-left: 27rpx;
+						}
+					}
+				}
+				.info-remark {
+					color: #333;
+					font-size: 26rpx;
+					margin: 16rpx 0 24rpx;
+					view:last-child {
+						width: 93rpx;
+						height: 39rpx;
+						background: #EEEEEE;
+						border-radius: 10rpx;
+						color: #666666;
+						font-size: 20rpx;
+						text-align: center;
+						line-height: 39rpx;
+						margin-left: auto;
+					}
+				}
+				.info-adverb {
+					color: #999999;
+					font-size: 26rpx;
+					text {
+						color: #333;
+						margin-left: 22rpx;
+					}
+				}
+			}
+			.example {
+				background: #FFFFFF;
+				box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(68,68,68,0.04);
+				border-radius: 8rpx;
+				padding: 30rpx;
+				margin-top: 20rpx;
+				.title {
+					color: #999999;
+					font-size: 26rpx;
+				}
+				.example-item {
+					margin-top: 30rpx;
+					.item-content {
+						display: flex;
+						margin-bottom: 24rpx;
+						>view {
+							width: 520rpx;
+						}
+						image {
+							width: 28rpx;
+							height: 28rpx;
+							margin-left: auto;
+							margin-top: 10rpx;
+						}
+					}
+					.item-translate {
+						color: #999999;
+						font-size:24rpx;
+					}
+				}
+			}
+			.analysis {
+				background: #FFFFFF;
+				box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(68,68,68,0.04);
+				border-radius: 8rpx;
+				padding: 30rpx 32rpx;
+				margin-top: 20rpx;
+				.title {
+					color: #999999;
+					font-size: 26rpx;
+					margin-bottom: 24rpx;
+				}
+				.analysis-content {
+					color: #333333;
+					font-size: 30rpx;
+				}
+			}
+		}
+		.detail-footer {
+			width: 100%;
+			height: 130rpx;
+			justify-content: center;
+			padding-left: 30rpx;
+			background: #fff;
+			box-shadow: 0rpx -19rpx 54rpx 0rpx rgba(34,34,34,0.05);
+			flex-shrink: 0;
+			.btn {
+				color: #666;
+				font-size: 30rpx;
+				&.next {
+					width: 550rpx;
+					height: 88rpx;
+					background: linear-gradient(0deg, #0F74BB 0%, #3293FF 100%);
+					border-radius: 44rpx;
+					color: #fff;
+					line-height: 88rpx;
+					text-align: center;
+					margin-left: 44rpx;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 27544c8..f616a8d 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -87,9 +87,9 @@
 					</button> -->
 
 
-						<view  v-if="!TOUTIAO_STATUS" class="section-link" v-for="item in menuList.slice(0, 6)" :key="item.id" @click="goUrl(item, 2)" >
-							<image mode="aspectFill" :src="item.icon" />
-							{{ item.title }}
+					<view  v-if="!TOUTIAO_STATUS" class="section-link" v-for="item in menuList.slice(0, 6)" :key="item.id" @click="goUrl(item, 2)" >
+						<image mode="aspectFill" :src="item.icon" />
+						{{ item.title }}
 						<view class="menu-more"></view>
 					</view>
 				</view>
diff --git a/pages/my/about_us.vue b/pages/my/about_us.vue
index 47f2f6b..a62c291 100644
--- a/pages/my/about_us.vue
+++ b/pages/my/about_us.vue
@@ -37,4 +37,12 @@ export default {
 };
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+	::v-deep {
+		._root {
+			width: 690rpx;
+			margin: 20rpx auto 0;
+			padding: 60rpx 40rpx!important;
+		}
+	}
+</style>
diff --git a/pages/my/feedback.vue b/pages/my/feedback.vue
new file mode 100644
index 0000000..ac47c36
--- /dev/null
+++ b/pages/my/feedback.vue
@@ -0,0 +1,60 @@
+<template>
+	<BaseContainer class="feedback">
+		<NavBar title="帮助与反馈" />
+		<view class="feedback-form">
+			<textarea v-model="suggest" placeholder="请填写具体内容帮助我们了解您的意见和建议。" placeholder-class="input-placeholder" />
+			<view class="btn" @click="submitFeedback">提交</view>
+		</view>
+	</BaseContainer>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				suggest: '',
+			};
+		},
+		methods: {
+			submitFeedback() {
+				if (!this.suggest) {
+					return this.$util.showMsg("请输入您的意见和建议");
+				}
+			},
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	.feedback {
+		background: linear-gradient(to top, #f6f6f6 0%, #f6f6f6 60%, #F6F8FA 70%, #A1BFFD 100%);
+		.feedback-form {
+			padding: 60rpx 30rpx 0;
+			.input-placeholder {
+				font-size: 28rpx;
+				color: #ABABAB;
+				font-weight: bold;
+			}
+			textarea {
+				width: 100%;
+				height: 420rpx;
+				padding: 30rpx;
+				font-size: 28rpx;
+				color: #333;
+				background: #fff;
+				border-radius: 10rpx;
+			}
+			.btn {
+				width: 100%;
+				height: 80rpx;
+				background: linear-gradient(0deg, #0F74BB 0%, #3293FF 100%);
+				border-radius: 40rpx;
+				color: #fff;
+				font-size: 32rpx;
+				text-align: center;
+				line-height: 80rpx;
+				margin-top: 100rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/my/helpCenter.vue b/pages/my/helpCenter.vue
new file mode 100644
index 0000000..c143f93
--- /dev/null
+++ b/pages/my/helpCenter.vue
@@ -0,0 +1,115 @@
+<template>
+	<BaseContainer class="help-center">
+		<NavBar title="帮助与反馈" />
+		<view class="help-box flex flex-center-x">
+			<view class="help-left">
+				<view class="title">常见问题解答</view>
+				<view class="cont">如您问题未得到解决可咨询我们客服哦 ~</view>
+			</view>
+			<view class="help-right flex flex-center-y" @click="toFeedback">
+				<image src="@/static/images/my/feedback.png" mode="aspectFill"></image>
+				<view class="name">意见反馈</view>
+			</view>
+		</view>
+		<view class="section-list">
+			<view  class="section-link" v-for="(item, index) in menuList" :key="index" @click="goUrl(item.url)" >
+				{{ item.title }}
+				<view class="menu-more"></view>
+			</view>
+		</view>
+	</BaseContainer>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				menuList: [
+					{ title: '怎么申请发票' , url: '' },
+					{ title: '如何联系人工客服' , url: '' },
+					{ title: '怎么绑定手机号' , url: '' },
+					{ title: '忘记密码找回' , url: '' },
+				],
+			};
+		},
+		methods: {
+			goUrl(url) {
+				if (url) {
+					uni.navigateTo({
+						url,
+					});
+				}
+			},
+			toFeedback() {
+				
+			},
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	.help-center {
+		background: linear-gradient(to top, #f6f6f6 0%, #f6f6f6 60%, #F6F8FA 70%, #A1BFFD 100%);
+		.help-box {
+			padding: 30rpx 32rpx 0;
+			height: 193rpx;
+			.help-left {
+				flex: 1;
+				color: #333333;
+				font-size: 26rpx;
+				line-height: 26rpx;
+				.title {
+					font-size: 36rpx;
+					line-height: 36rpx;
+					font-weight: bold;
+					margin-bottom: 26rpx;
+				}
+			}
+			.help-right {
+				width: 99rpx;
+				height: 99rpx;
+				background: #fff;
+				border-radius: 20rpx;
+				color: #333333;
+				font-size: 22rpx;
+				line-height: 22rpx;
+				flex-direction: column;
+				align-items: center;
+				>image {
+					width: 51rpx;
+					height: 44rpx;
+					margin-bottom: 6rpx;
+				}
+			}
+		}
+		.section-list {
+			width: 690rpx;
+			margin: 0 auto;
+			font-size: 30rpx;
+			color: #282828;
+			background-color: #ffffff;
+			border-radius: 10rpx;
+			margin-top: 20rpx;
+			.section-link {
+				display: flex;
+				align-items: center;
+		    font-size: 28rpx;
+		    color: #333;
+				height: 96rpx;
+				padding-left: 36rpx;
+				padding-right: 26rpx;
+				.menu-more {
+					width: 14rpx;
+					height: 14rpx;
+					border-width: 2px 2px 0 0;
+					border-color: #ccc;
+					border-style: solid;
+					-webkit-transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+					transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+					vertical-align: top;
+					margin-left: auto;
+				}
+		  }
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/my/orgCooperation.vue b/pages/my/orgCooperation.vue
new file mode 100644
index 0000000..1fcea46
--- /dev/null
+++ b/pages/my/orgCooperation.vue
@@ -0,0 +1,283 @@
+<template>
+	<BaseContainer class="cooperation-apply">
+		  <NavBar title="出国留学" />
+			<view class="cooperation-form">
+				<view class="form-item">
+					<view class="item-label"><text>姓名</text>：</view>
+					<view class="item-content">
+						<input type="text" v-model="applyForm.real_name" placeholder="请输入姓名" placeholder-class="input-placeholder"/>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label"><text>电话</text>：</view>
+					<view class="item-content">
+						<input type="text" v-model="applyForm.mobile" placeholder="请输入电话" placeholder-class="input-placeholder"/>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label"><text>推荐人</text>：</view>
+					<view class="item-content">
+						<input type="text" v-model="applyForm.recommend_user" placeholder="请输入推荐人" placeholder-class="input-placeholder"/>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label"><text>详细地址</text>：</view>
+					<view class="item-content">
+						<input type="text" v-model="applyForm.address" placeholder="请输入详细地址" placeholder-class="input-placeholder"/>
+					</view>
+				</view>
+			</view>
+			<view class="gold-box flex">
+				<label class="radio">
+					<radio value="意向金" :checked="true" color="#FF9500" /><text>意向金：</text>
+				</label>
+				<view class="gold">￥{{ 200 }}</view>
+			</view>
+			<view class="apply-btn" @click="apply">立即报名</view>
+			<PayDialog v-if="initDataLoading" :open.sync="payDialogOpen" :money="Number(money)" :now_money="now_money"
+				:pay_type_num="pay_type_num" :special_id="Number(special_id)" :is-wechat="isWechat" :is-alipay="is_alipay" :is-balance="is_yue"
+				:template-id="templateId" :wxpay-h5="wxpayH5" @change="changeVal" />
+	</BaseContainer>
+</template>
+
+<script>
+	import PayDialog from "@/components/PayDialog/index.vue";
+	import {
+		applycooperation,
+    delSpecialOrder,
+		getInitData
+	} from "@/api/special";
+	
+	
+	export default {
+		components: {
+			PayDialog,
+		},
+		data() {
+			return {
+				special_id: '',
+				specialInfo: {},
+				applyForm: {
+					real_name: '',
+					mobile: '',
+					recommend_user: '',
+					address: '',
+				},
+				payDialogOpen: false,
+				payDialogOpen: false, // 是否显示支付弹窗
+				money: 200.0,
+				pay_type_num: 20,
+				is_alipay: false, //支付宝是否开启
+				is_yue: false, //余额是否开启
+				now_money: 0, //余额
+				templateId: "",
+				wxpayH5: false,
+				initDataLoading: false,
+			};
+		},
+		
+		onLoad(options) {
+		  this.special_id = options.id;
+			this.getInitData();
+		},
+		methods: {
+			getInitData() {
+			  getInitData().then(({ data }) => {
+			    const { isWechat, is_alipay, is_yue, now_money, wxpayH5 } = data;
+			    Object.assign(this, {
+			      isWechat,
+			      url: isWechat ? "/pages/index/login" : "/pages/login/phone_check",
+			      is_alipay: is_alipay == 1,
+			      is_yue: is_yue == 1,
+			      now_money: Number(now_money),
+			      wxpayH5,
+			      initDataLoading: true,
+			    });
+			  });
+			},
+			apply() {
+				if (!this.applyForm.real_name) {
+				  return this.$util.showMsg("请输入姓名");
+				}
+				if (!this.applyForm.mobile) {
+				  return this.$util.showMsg("请输入电话");
+				}
+				if (!/^1[3456789]\d{9}$/.test(this.applyForm.mobile)) {
+				  return this.$util.showMsg("电话错误");
+				}
+				if (!this.applyForm.recommend_user) {
+				  return this.$util.showMsg("请输入推荐人");
+				}
+				if (!this.applyForm.address) {
+				  return this.$util.showMsg("请输入详细地址");
+				}
+				this.payDialogOpen = true;
+				// } else {
+				// 	this.submitApply();
+				// }
+			},
+			async submitApply() {
+				uni.showLoading({ mask: true });
+				try {
+				  const { data, msg } = await applycooperation({
+				    oc_id: this.special_id,
+				    ...this.applyForm
+				  });
+				  uni.hideLoading();
+				  this.$util.showMsg('报名成功');
+					uni.navigateBack();
+				} catch (err) {
+				  uni.hideLoading();
+				  this.$util.showMsg(err.msg);
+				}
+			},
+			changeVal(opt) {
+				if (typeof opt !== "object") {
+				  opt = {};
+				}
+				console.log(opt);
+				var action = opt.action || "";
+				var value = opt.value || "";
+				this[action] && this[action](value);
+			},
+			// 支付完成后回调事件
+			pay_order: function (data) {
+			  this.orderId = data.data.result.orderId || "";
+			  switch (data.data.status) {
+			    case "PAY_ERROR":
+			    case "ORDER_EXIST":
+			    case "ORDER_ERROR":
+			      this.extendOrder(data.msg);
+			      break;
+			    case "WECHAT_PAY":
+			      this.wechatPay(data.data.result.jsConfig);
+			      break;
+			    case "WECHAT_H5_PAY":
+			      this.payDialogOpen = false;
+			      this.$util.wechatH5Pay(data.data.result.jsConfig, this);
+			      break;
+			    case "WECHAT_ROUTINE_PAY":
+			      this.$util.wechatRoutinePay(data.data.result.jsConfig, this);
+			      break;
+			    case "SUCCESS":
+			      this.successOrder(data.msg);
+			      break;
+			    case "ZHIFUBAO_PAY":
+			      this.aliPay(data.data.result, "datadownload");
+			      break;
+			    case 'TOUTIAO_PAY':
+			      this.$util.toutiaoPay(data.data.result.jsConfig, this);
+			      break;
+			    case 'KUAISHOU_PAY':
+			      this.$util.kuaishouPay(data.data.result.jsConfig, this);
+			      break
+			  }
+			},
+			extendOrder(msg) {
+			  if (typeof msg === "object" && msg.errMsg === "chooseWXPay:cancel") {
+			    msg = "微信支付取消";
+			  } else {
+			    msg = "支付失败";
+			  }
+			  this.$util.showMsg(msg);
+			  this.payDialogOpen = false;
+			  if (this.orderId) {
+			    delSpecialOrder(this.orderId);
+			  }
+			},
+			wechatPay(config) {
+			  this.$util.weixinpay(config, this);
+			},
+			successOrder(msg) {
+			  this.$util.showMsg(msg ? msg : "支付成功");
+			  this.payDialogOpen = false;
+				this.submitApply();
+			},
+      aliPay(msn, type) {
+        this.$util.aliPay(msn, type, this);
+      },
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+.cooperation-apply {
+	background: linear-gradient(to top, #f6f6f6 0%, #f6f6f6 60%, #F6F8FA 70%, #A1BFFD 100%);
+}
+.input-placeholder {
+	color: #999;
+	font-size: 24rpx;
+}
+.cooperation-form {
+	width: 690rpx;
+	background: #fff;
+	margin: 20rpx auto 0;
+	box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(68,68,68,0.04);
+	border-radius: 10rpx;
+	padding: 25rpx 30rpx 60rpx 30rpx;
+	.form-item {
+		display: flex;
+		align-items: center;
+		margin-bottom: 26rpx;
+		padding: 0 10rpx;
+		&:last-child {
+			margin-bottom: 0;
+		}
+		.item-label {
+			width: 140rpx;
+			display: flex;
+			color: #333;
+			font-size: 28rpx;
+			margin-right: 16rpx;
+			text {
+				flex: 1;
+				text-align-last: justify;
+			}
+		}
+		.item-content {
+			flex: 1;
+			input {
+				width: 100%;
+				height: 71rpx;
+				background: #f7f7f7;
+				border-radius: 10rpx;
+				font-size: 24rpx;
+				color: #333;
+				padding: 0 20rpx;
+			}
+		}
+	}
+}
+
+::v-deep .gold-box {
+	width: 690rpx;
+	height: 98rpx;
+	background: #fff;
+	margin: 20rpx auto 0;
+	box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(68,68,68,0.04);
+	border-radius: 10rpx;
+	align-items: center;
+	padding-left: 36rpx;
+	color: #333;
+	font-size: 28rpx;
+	line-height: 98rpx;
+	.uni-radio-input {
+		width: 34rpx;
+		height: 34rpx;
+	}
+	.gold {
+		color: #FF9500;
+	}
+}
+.apply-btn {
+	width: 600rpx;
+	height: 88rpx;
+	background: linear-gradient(0deg, #0F74BB 0%, #3293FF 100%);
+	border-radius: 44rpx;
+	margin: 90rpx auto 0;
+	color: #fff;
+	font-size: 30rpx;
+	text-align: center;
+	line-height: 88rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pages/my/sign_in.vue b/pages/my/sign_in.vue
index 41c2757..5e41a47 100644
--- a/pages/my/sign_in.vue
+++ b/pages/my/sign_in.vue
@@ -78,7 +78,7 @@
       </view>
     </view>
 
-    <view style="height: 100vh;"></view>
+    <!-- <view style="height: 100vh;"></view> -->
 
     <TkiQrcode
       loadMake
diff --git a/pages/my/user_info.vue b/pages/my/user_info.vue
index 5fdec57..54c4491 100644
--- a/pages/my/user_info.vue
+++ b/pages/my/user_info.vue
@@ -3,46 +3,43 @@
   <BaseContainer>
     <NavBar title="个人资料" />
     <view class="user-info">
-      <view class="avatar" @click="handlePickAvatar">
-        <view class="name">头像</view>
-        <image :src="xUserInfo.avatar" class="image" mode="aspectFill" />
-        <view class="iconfont iconxiangyou"></view>
-      </view>
-      <view class="list">
-        <view class="item">
-          <span class="name">ID</span>
-          <input :value="xUserInfo.uid" class="value input" type="text" disabled />
-        </view>
-        <view class="item">
-          <span class="name">昵称</span>
-          <input v-model="xUserInfo.nickname" class="value input" type="text" />
-        </view>
-        <navigator v-if="xUserInfo.phone" class="item" url="/pages/my/save_phone">
-          <span class="name">手机号</span>
-          <span class="value">{{ xUserInfo.phone }}</span>
-          <span class="iconfont iconxiangyou"></span>
-        </navigator>
-        <view v-if="xUserInfo.phone" class="item password" @click="popupShow = true">
-          <view>密码</view>
-          <view>******</view>
-        </view>
-        <navigator class="item" url="/pages/index/agree?type=user_agreement">
-          <span class="name">用户协议</span>
-          <span class="value">用户协议</span>
-          <span class="iconfont iconxiangyou"></span>
-        </navigator>
-        <navigator class="item" url="/pages/index/agree?type=user_privacy">
-          <span class="name">隐私政策</span>
-          <span class="value">隐私政策</span>
-          <span class="iconfont iconxiangyou"></span>
-        </navigator>
+			<view class="info-box">
+				<view class="avatar" @click="handlePickAvatar">
+					<view class="name">头像</view>
+					<image :src="xUserInfo.avatar" class="image" mode="aspectFill" />
+					<view class="iconfont iconxiangyou"></view>
+				</view>
+				<view class="list">
+					<view class="item">
+						<span class="name">昵称</span>
+						<input v-model="xUserInfo.nickname" class="value input" type="text" />
+					</view>
+					<navigator v-if="xUserInfo.phone" class="item" url="/pages/my/save_phone">
+						<span class="name">手机号</span>
+						<span class="value">{{ xUserInfo.phone }}</span>
+						<span class="iconfont iconxiangyou"></span>
+					</navigator>
+				</view>
+			</view>
+			<view class="info-box">
+				<view class="list">
+					<view class="item">
+						<span class="name">收货邮箱</span>
+						<input v-model="xUserInfo.email" class="value input" type="text" />
+					</view>
+					<navigator class="item" :url="`/pages/forgotPwd/index?phone=${xUserInfo.phone}`">
+						<span class="name">修改密码</span>
+						<span class="value"></span>
+						<span class="iconfont iconxiangyou"></span>
+					</navigator>
+				</view>
       </view>
       <view class="btn-group">
         <button class="btn flex flex-center" type="button" @click="save_user_info">
-          保存修改
+          提交
         </button>
         <button class="btn flex flex-center out-btn" type="button" @click="logout">
-          退出登录
+          退出
         </button>
       </view>
     </view>
@@ -142,10 +139,14 @@ export default {
       }
     },
     async save_user_info() {
-      let { nickname, avatar } = this.xUserInfo;
+      let { nickname, avatar, email } = this.xUserInfo;
       nickname = nickname.trim();
-      if (nickname == "" || nickname.length > 15)
+      if (nickname == "" || nickname.length > 15) {
         return this.$util.showMsg("昵称长度必须在1-15个字符之间！");
+			}
+			if (email === '' || !(/\w+[@]{1}\w+[.]\w+/.test(email))) {
+        return this.$util.showMsg("邮箱格式错误！");
+			}
       uni.showLoading({
         mask: true,
       });
@@ -154,6 +155,7 @@ export default {
         const result = await saveUserInfo({
           nickname,
           avatar,
+					email,
         });
         this.$util.showMsg(result.msg);
 
@@ -244,6 +246,15 @@ export default {
 input {
   height: 98rpx;
 }
+.user-info {
+	padding-top: 10rpx;
+	background: #f6f6f6;
+	.info-box {
+		background: #fff;
+		padding: 0 30rpx;
+		margin-bottom: 20rpx;
+	}
+}
 
 .user-info .avatar {
 
@@ -252,8 +263,8 @@ input {
 
 
   align-items: center;
-  padding: 30rpx;
   background-color: #ffffff;
+  border-bottom: 1px solid #f5f5f5;
 }
 
 .user-info .avatar .name {
@@ -288,12 +299,10 @@ input {
   display: flex;
   align-items: center;
   height: 98rpx;
-  padding-right: 30rpx;
-  padding-left: 30rpx;
-}
-
-.user-info .list .item~.item {
-  border-top: 1px solid #f5f5f5;
+  border-bottom: 1px solid #e6e6e6;
+	&:last-child {
+		border-bottom: none;
+	}
 }
 
 .user-info .list .item .name {
@@ -304,7 +313,7 @@ input {
 }
 
 .user-info .list .item .value {
-  font-size: 30rpx;
+  font-size: 28rpx;
   color: #666;
 }
 
@@ -321,17 +330,21 @@ input {
 }
 
 .user-info .btn-group {
-  padding: 80rpx 30rpx 0;
+  padding: 176rpx 30rpx 0;
 }
 
 .user-info .btn-group .btn {
   width: 100%;
-  height: 90rpx;
-  border-radius: 45rpx;
+  height: 88rpx;
+  border-radius: 44rpx;
   margin-bottom: 30rpx;
-  background-color: #2c8eff;
+  background: linear-gradient(0deg, #0F74BB 0%, #3293FF 100%);;
   font-size: 32rpx;
   color: #ffffff;
+	border: none;
+	&:after {
+		display: none;
+	}
 }
 
 .user-info .btn-group .btn:last-child {
@@ -339,9 +352,8 @@ input {
 }
 
 .user-info .btn-group .out-btn {
-  border: 1px solid #2c8eff;
-  background-color: #ffffff;
-  color: #2c8eff;
+  background: #E5E5E5;
+  color: #A2A2A2;
 }
 
 .user-info .group .link {
diff --git a/pages/special/details.vue b/pages/special/details.vue
index e0660c1..ebe3f6b 100644
--- a/pages/special/details.vue
+++ b/pages/special/details.vue
@@ -1469,6 +1469,7 @@
         getTopicSpecialTestPaper(this.special_id, 2).then(
           ({ data: questions }) => {
             if (questions.length) {
+							console.log(this.special.type, 1472);
               if (this.special.type === 5) {
                 this.cloumnNavlist.splice(this.cloumnNavlist.length - 1, 0, {
                   title: "考试",
@@ -1479,6 +1480,7 @@
                   title: "考试",
                   value: 4,
                 });
+								console.log(this.otherNavlist);
               }
             }
             this.questionList = questions;
diff --git a/pages/special/grade_list.vue b/pages/special/grade_list.vue
index 19fd434..e4bea74 100644
--- a/pages/special/grade_list.vue
+++ b/pages/special/grade_list.vue
@@ -1,47 +1,63 @@
 <template>
   
   <BaseContainer class="favorite" :fixedNav="false">
-    <NavBarTitle title="我的收藏"   :height="300"/>
+    <NavBarTitle title="我的收藏"   :height="88"/>
     <view v-if="type" ref="tabbar" class="tabbar">
       <view :class="{ on: active === 1 }" @click="tab(1)">资料</view>
+      <view :class="{ on: active === 2 }" @click="tab(2)">老师</view>
       <view :class="{ on: active === 0 }" @click="tab(0)">课程</view>
     </view>
     <view v-if="makeGradeList.length" :class="{ material: active }" class="list">
-      <navigator v-for="item in makeGradeList" :key="item.id" :url="item.path">
-        <view>
-          <image mode="aspectFill" :src="item.image" alt="" />
-          <view v-if="!active">{{ type == 1 ? item.types : item.type }}</view>
-        </view>
-        <view>
-          <view>{{ item.title }}</view>
-          <template v-if="active">
-            <view :class="{ money: item.pay_type }" style="color:#23272E;">
-              <template v-if="item.pay_type"> ￥<text >{{item.money}}</text> </template>
-              <template v-else> 免费 </template>
-            </view>
-            <view>
-              <view>{{ item.ficti + item.sales }}人已下载</view>
-              <view class="button">去下载</view>
-            </view>
-          </template>
-          <template v-else>
-            <view v-if="item.label.length">
-              <template v-for="(label, index) in item.label">
-                <view v-if="index < 2" :key="index">{{ label }}</view>
-              </template>
-            </view>
-            <view>
-              <view :class="{ money: item.pay_type }">
-                <template v-if="item.pay_type">
-                  ￥<text>{{ item.is_pink ? item.pink_money : item.money }}</text>
-                </template>
-                <template v-else> 免费 </template>
-              </view>
-              <view v-if="!item.is_light && item.types !== 4">共{{ item.count }}节</view>
-            </view>
-          </template>
-        </view>
-      </navigator>
+			<template v-if="Number(active) === 0">
+				<navigator
+					v-for="(item, index) in makeGradeList"
+					:key="item.id"
+					:url="item.path"
+					ref="box_center"
+					class="list-item"
+					@touchstart="drawStart"
+					@touchmove="drawMove(index,$event)"
+					@touchend="drawEnd(index,$event)"
+				>
+					<view>
+						<image mode="aspectFill" :src="item.image" alt="" />
+						<!-- <view v-if="!active">{{ type == 1 ? item.types : item.type }}</view> -->
+					</view>
+					<view class="function">
+						<view class="btn">取消收藏</view>
+					</view>
+					<view>
+						<view>{{ item.title }}</view>
+						<template v-if="active">
+							<view :class="{ money: item.pay_type }" style="color:#23272E;">
+								<template v-if="item.pay_type"> ￥<text >{{item.money}}</text> </template>
+								<template v-else> 免费 </template>
+							</view>
+							<view>
+								<view>{{ item.ficti + item.sales }}人已下载</view>
+								<view class="button">去下载</view>
+							</view>
+						</template>
+						<template v-else>
+							<view v-if="item.label.length">
+								<template v-for="(label, index) in item.label">
+									<view v-if="index < 2" :key="index">{{ label }}</view>
+								</template>
+							</view>
+							<view>
+								<view :class="{ money: item.pay_type }">
+									<template v-if="item.pay_type">
+										￥<text>{{ item.is_pink ? item.pink_money : item.money }}</text>
+									</template>
+									<template v-else> 免费 </template>
+								</view>
+								<view v-if="!item.is_light && item.types !== 4">共{{ item.count }}节</view>
+							</view>
+						</template>
+					</view>
+					
+				</navigator>
+			</template>
     </view>
     <view v-show="loading" class="loading">
       <text class="fa fa-spinner"></text>
@@ -69,7 +85,6 @@ import specialType from "@/constants/special-type";
 export default {
   data() {
     return {
-      navlist: [{ title: "我的课程" }, { title: "我的收藏" }],
       loadend: false,
       loading: false,
       active: 0,
@@ -146,6 +161,44 @@ export default {
       this.loadend = false;
       this.getGradeList();
     },
+		// 开始触摸
+		drawStart(e) {
+			console.log('触摸',e);
+			this.clientX = e.changedTouches[0].clientX
+		},
+		// 触摸过程
+		drawMove(id, e) {
+			console.log('过程',e.changedTouches[0]);
+			var endX = e.changedTouches[0].clientX;
+			let diff = endX - this.clientX;
+			console.log(diff);
+
+			if (Math.abs(diff) <= 60 && diff < 0) {
+				let box_center = this.$refs.box_center[id]
+				// console.log(diff);
+				box_center.$el.style.left = diff + 'px'
+			}
+
+		},
+		// 结束触摸
+		drawEnd(id, e) {
+			// console.log('结束',e.changedTouches[0]);
+			var endX = e.changedTouches[0].clientX;
+			let diff = endX - this.clientX;
+			let box_center = this.$refs.box_center[id]
+			if (Math.abs(diff) > 20) {
+				// console.log('移动',diff,id,e);
+				if (diff < 0) {
+					box_center.$el.style.left = '-60px'
+				} else {
+					box_center.$el.style.left = '0'
+				}
+
+			}else{
+				box_center.$el.style.left = '0'
+			}
+
+		},
   },
 };
 </script>
@@ -160,30 +213,53 @@ page{
 </style>
 
 <style scoped lang="scss">
-.favorite .tabbar {
-    position: absolute;
-    left: 0;
-    right: 0;
-    width: 686rpx;
-    margin: 0 auto;
-    margin-top: calc(100rpx + var(--safe-top));
+.favorite {
+	::v-deep .nav-box {
+		background: #fff;
+	}
+	.tabbar {
+		position: relative;
+    width: 100%;
+    margin-top: calc(88rpx + var(--safe-top));
     border-radius: 24rpx;
     z-index: 999;
-    background: none;
+    background: #fff;
     border-bottom:none;
+	}
 }
 
 .list {
   // padding-top: calc(88rpx + var(--safe-top) + 90rpx) !important;
-    position: absolute;
-    left: 0;
-    right: 0;
-    width: 686rpx;
+    width: 690rpx;
     margin: 0 auto;
-    margin-top: calc(230rpx + var(--safe-top));
+    margin-top: 20rpx;
     border-radius: 24rpx;
     z-index: 999;
-    background: #ffffff;
+		overflow-x: hidden;
+		.list-item {
+			position: relative;
+			background: #ffffff;
+			.function {
+				width: 120rpx;
+				height: 100%;
+				background: #F8473E;
+				border-radius: 0rpx 10rpx 10rpx 0rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: absolute;
+				top: 0;
+				right: -120rpx;
+				.btn {
+					width: 30rpx;
+					white-space: pre-wrap;
+					overflow: auto;
+					font-size: 28rpx;
+					color: #fff;
+					line-height: 36rpx;
+				}
+			}
+		}
 }
 .money{
   width: 134rpx;
diff --git a/pages/special/offline_apply.vue b/pages/special/offline_apply.vue
index bc996d5..0ba6491 100644
--- a/pages/special/offline_apply.vue
+++ b/pages/special/offline_apply.vue
@@ -63,6 +63,7 @@
 	import {
 	  getOfflineSpecialInfo,
 		applyOffline,
+		delSpecialOrder,
 		getInitData
 	} from "@/api/special";
 	
@@ -160,6 +161,62 @@
 				  this.$util.showMsg(err.msg);
 				}
 			},
+			// 支付完成后回调事件
+			pay_order: function (data) {
+			  this.orderId = data.data.result.orderId || "";
+			  switch (data.data.status) {
+			    case "PAY_ERROR":
+			    case "ORDER_EXIST":
+			    case "ORDER_ERROR":
+			      this.extendOrder(data.msg);
+			      break;
+			    case "WECHAT_PAY":
+			      this.wechatPay(data.data.result.jsConfig);
+			      break;
+			    case "WECHAT_H5_PAY":
+			      this.payDialogOpen = false;
+			      this.$util.wechatH5Pay(data.data.result.jsConfig, this);
+			      break;
+			    case "WECHAT_ROUTINE_PAY":
+			      this.$util.wechatRoutinePay(data.data.result.jsConfig, this);
+			      break;
+			    case "SUCCESS":
+			      this.successOrder(data.msg);
+			      break;
+			    case "ZHIFUBAO_PAY":
+			      this.aliPay(data.data.result, "datadownload");
+			      break;
+			    case 'TOUTIAO_PAY':
+			      this.$util.toutiaoPay(data.data.result.jsConfig, this);
+			      break;
+			    case 'KUAISHOU_PAY':
+			      this.$util.kuaishouPay(data.data.result.jsConfig, this);
+			      break
+			  }
+			},
+			extendOrder(msg) {
+			  if (typeof msg === "object" && msg.errMsg === "chooseWXPay:cancel") {
+			    msg = "微信支付取消";
+			  } else {
+			    msg = "支付失败";
+			  }
+			  this.$util.showMsg(msg);
+			  this.payDialogOpen = false;
+			  if (this.orderId) {
+			    delSpecialOrder(this.orderId);
+			  }
+			},
+			wechatPay(config) {
+			  this.$util.weixinpay(config, this);
+			},
+			successOrder(msg) {
+			  this.$util.showMsg(msg ? msg : "支付成功");
+			  this.payDialogOpen = false;
+				this.submitApply();
+			},
+      aliPay(msn, type) {
+        this.$util.aliPay(msn, type, this);
+      },
 		},
 	}
 </script>
diff --git a/static/images/learning/audio.png b/static/images/learning/audio.png
new file mode 100644
index 0000000000000000000000000000000000000000..d85b8217a578e3ca9d46ca3d85a5008ae8621432
GIT binary patch
literal 1122
zcmV-o1fBbdP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px(97#k$R7gv;mTPESMHI*X=ib|_jfe*FB^JdG;=7<Iw5SzdRPsTgl~NzIHZ^<C
zWQ~fUso466Qj4NZBzkx6>=ILJTQvx=LZK9eQb81|_(W7F`lYR=ni!0dWOt4`ac{Y~
zUE8c1@2B0FGxM8s&VSAs!hiU}FkDMS8;NL>@B8o7vIW&*+~41yN~KaS0qCr(dySbN
zsAZ2i1A`zq&-1)t09OO}1HeKe+V1;)dmN~>UJPLM^z?LJXJ_ZH$-~SEn9Jo>IF6GC
z&<x-Z5v4`sGXR505A*r_1`&A?z!4F-TPbxg4m~BXudnZ%#>U3206Hp*wly_1Z5kOF
zIp6cV9{^MhX)c$u`F)OvOsP~_mC0mI<e9SB?5&RDTr}$xL;~P!01pFb0dN$+I%eK)
z?Sde<umZFmuCJEEFbr=YqG1v7j4?|ynar2gj>0gUCL-@&5<e{>g<`SzR6HNmfW5uF
z3%k0y{)+Dt1i^C8^Y#HaJTWn`*v^yI+8P}*#ypYm(imet$z(EzlZT0bBC=g6)t1ZU
z7CDadm53bhJg>dIz5TanO&Eq-iRf_=c~&X)bOb!W%&l{kcM>=>G}JIUI{Gev*0NB(
zOQljv+uGX3?0%KGAIm~Ivs5ZAngJ5ghraJGuN4U3b!J`{^X6qDdPGFtQA(|fjXy?2
z&l_Xb%q!3W!Z18YM9YZiD&O}%w_{rCOUifiTL8Q30*c5ErPTfL$mH|++eBoah`ged
zvMQeur`GzYh>X<*B%&R@@6Q4b4i26%H8nMA3j{MSiw>i;{s_RubpZjq!OUxuxz}1B
z0WikQm&JhZi^#R}4y+XTQ4u+$l)7QQJ>1F6_r*QTX0vy=uDb`oHfG)s1KMg;Uk(AB
z1k_r83}A`lIM<}p=}+S-C8Aw*g;Yd#DW%rLym%GBgCa7llv<g*heWixu1aI?6*J#E
zFfeddu~@WWya~WJ0Ip-^-{X}AKx%Sw^4tjcvoU6KQf)+JtI!A0;%Giryk~%gLg7+l
z%ohOmH#9V?iOO1~5X{ul^6wsIe&%%D!mc?kB9AJib|!%$@}^Sio=TpYnfZ7^K&`Ip
z?iG=ri0E=={<CU7tSmABt{@@>z_s0de0=<&?(Xi1$U`C;NIo$lV4+aB(HLVJ?*hkh
zu8#zC+9!tAdI^BH09*jzYh%pq<!-)!h`tw*0j1QeH;o0_j_)|m763&NS*et=J@KC!
zm&{wW|61#25qX=4ZZ4~E#2B;QahyFOGMEHvt*sWeh{!S5byuX*X?smhd~*U?>z<w-
zr=_K(-^xA;c{N}V1XsGQdzXmxc64<7a*`0|;$hrIYrV1jM0}w#_W!+0<IsFQf2W8%
o31Blb@2%y~a}H@Oo1V({Z}f^oS-4QU^8f$<07*qoM6N<$g8K>?w*UYD

literal 0
HcmV?d00001

diff --git a/static/images/learning/audio_active.png b/static/images/learning/audio_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..aef8da08a6d2afb6f56f7469e5911101e82b8333
GIT binary patch
literal 1155
zcmV-}1bq96P)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px(JxN4CR7gv;mRoETWfaH%|JiM8Q+BoweNm$E!FVUpXaYenB0F39P!lkSmx={3
z(O{A74mE<8YLG~Frc1oM)Sy)gC^4zUK-!%W2pWTl8gIm?3DFmdinKG^x{~hBk-c_z
zU7>61yv@va&hPu5bG~yv;y*lUr?nQ8E)i^v_XH1C<AT*JM#tegwXVh>@MOkL@Rn_A
zk5=Pj#=!c{;VWwu4gkCjz=Qzx1p90wu%Q^(5V96{JXj+MM&oY;{wUwfjDS8pwvu2k
zfhGW-CzJA+*TXLXyj`x)x5d&GK}3Mlt|$*on9GkBLoW(!+&s|edgtvR@I*F*G;QCx
zt*WhFMUUsFe+#KE9P1+aG5}XxSzVlG`t^~32(ATEg^f^A1TOpn*+lYk5gDb6b~_r3
zr5CB8p=&b0v_eB$Unz(F&e(EfQUGrfTr_C}zDcj6U$>^xA1fINI0cb6<u5*8oR5mY
z(1ChH?@JW>@rPnTC>#QD%1$*bKy-0}s%|AHJR`uf#VVoDWm5Ufjs{MZZzc~Ekv_)^
zuB#6nnP2OXZvpq1q}&Zobj7*6jbD%L0QiiMFFBFG3mG7QV~(M<%(T3xf$Ve4z&doF
ztW_sQKP03@fFG2kchUH+W#but-3Mybc;n9m8|;L4epVs*u^kBns|G^eag1Pl-cAjV
z>>}kUh<sq1!PP}7p9c7fh}$-&z)V5u)^P$$layO0Bf+oI-+bZW>lG^B3$SmNK)mZ1
z+9So0QNva<i6IfZ=9t>1>_4Fz9vKBOKIcHRAH7U%N{*!)gkxw+3*pwSPYGN%JD^~X
zV`^*vQN_A-8o;<?Xg3z}7`8@0ES?<@*y9*wz>dRp{<_*Rfut4QIkyTS{f-fQxLBdD
zGj@-na1a#Jjs*20;AmR)EETffF#;t(RkuzMSO{@%x6S4+N~)CDJ3An;*NJFt)8{bu
zI?0Uy2W%s-s{9-RSTnm$1MG7Q?ICo1;`65xgCLfP$VrcvcZ}`S?2=AH*4gK$uE_OL
z{3>v_l~<brCBZn3jP>S>a|;TsEeD*}W!<2p@b!f%j44TPTcNE1DD+aG+cC5kFFGwU
zM;15>NXRjQ{e{rw$CF^cZE6o@^Yl?u+-yBt+60DM2;~qUzu58fH=(!n&x-RfZA8!&
z;AVi2lkj9_AKVTY&6CsPiMz|M7<pi$ZrvroK>=zg?vi`~UGj>d>ca~up7%hx8o+l<
zCR^PaPYs1X0<zmSf+csFtlG@P-%cPYOs#SvD~9qLxg;>_;AoS=srLciEx_;Ma=oIs
zgV~8+3cN7T)3vZ&fHQEh(&^Do6o+|6z-+a3D{6entE6nqHDtFEuyJ$j7V#?gr;zHI
zFq(fWFT|MxbC&*atPAAM>=5`L@1?~%^>4B6h449nY;z3lP`QeWy;rTU8t0YP{tb{B
VH#%(38G--+002ovPDHLkV1iaiAA<k@

literal 0
HcmV?d00001

diff --git a/static/images/learning/icon.png b/static/images/learning/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..65a52d56f251b8382e69feae117dd9dd45c874d8
GIT binary patch
literal 641
zcmV-{0)G98P)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px%J4r-AR9Hvtnays~KoG}g*0GYPQY(Sf1L_T0r1A`0d4WVLBSngG0WQ2xxREFl
z>rL_kJO>>3JQWT|T#&E{_Il7(O;oi>ypA_r0`|p{J)ZsTe`mZOgJBrHM#MW{@yfCc
z7-KNMYu8twEqk}hPCwWF0N@KsDc=y$1B<*{bA^a+E8wlk3jnJWRscXmbRIOWE=0^U
zBLH}FhE>2RBHoST_@^sa-EOnl+#{k-08m>COhnmiHaqNgyWd>`4+ewV^?LmqA}&UH
zslpZThQm}!VJT%ZNs=Sq_sOLFEXybeg3mg6hr{7vqtV!3_g#`C===T|=RBU<l>(kj
zCdW#t_a?9xHov1NI_UL!zrrx=1HjX~Z#~aDX}8-StN=?X?-9|$SzhA+5JypTO9Klb
z`iPhdjEKja^N$s<fx6mcrxkt<0FTynlre^$=RIq+T4&Bf!f-^cnU(rWlu5b@`04_F
z+0^`BDLfvJA1b9z^Fkv{(^s8N=ZEv86GFT|#3y;cM07t0g2im=Ea|G5&LruC5GRQE
zE^k;by-yJFK(D@>gv4kx+OO4Wk4=FYV<`Z<<eV!fNoNXb)2>v~*#t55RRNnSwW(bx
zg{RZ$ky5I!_iCF0{O!xj!u@i+MXG?c0>&pl8*K9nD{On4U+5sED6RE_l%fDO>`VRD
zYycGX@$Uiyz-}FA1HjIe42p)^joDXauWd_xuJF8cd%3i#8@?!&E*RF8W3|z$QmoBR
b5Yg8^)j2gu(1XRE00000NkvXXu0mjfP_!dc

literal 0
HcmV?d00001

diff --git a/static/images/learning/lock.png b/static/images/learning/lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..89d9b26fcc8f3e6539184b6a1e2ce7ac953e968d
GIT binary patch
literal 1066
zcmV+_1l9YAP)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px&<Vi$9R9Hvtm``XNRUF5EzuD||Ma4<QqK38yT`5)zUbGk6P(66CpogJ|kZ#zS
zHv!E-QN(z*B1$jO!~7<jtVL8h2L*fZU}@S@Metx%iqS)(Hj2=VsF?1~&d)sADbwKY
zo41n;2J?>dzQ6bTyx;rH@BKm8WDPeNFZ@4&tJP|yR4N@s#7Cki+JlHUGxP6;VO(V9
z)2&wPokpXvupX<KDZ<ri)hrf^Zz5t901AD8I?UW?x7#l?8ja;F-~$8KYPGuyg~BHQ
zaF+(a_nl7Xv3kA!orcYI(t&^{CMI@7QS><g?21QY=1Yip0szj0VR*$bj2(tyJj~2v
zh`2l9buo&f2WMtxei;OMAYjLFK1RgH6R^k2<?__@^z_xW5R;RW+g4Uqjv?anaUUX{
z@;vWwF2J^JA6kvv=>+U+zVA<|oI8#qp<hnu4iV8AmEGEY?Fb7YJ^+9t-GMGNo6QG;
zAn2$ZTb5NYP4f#x+$Xh&c+&H{cpR1awSHY-6hd4908@^@%)<A5Kdm>%aU4XXuD(e`
zx5{DC+W#|A9r4)M*hslt{xOk@_jsO{y1u%uTVdvJWBV`+M`mYdFY7R90lThyFEf7~
zJ7~39!#Z_U*6mWM)J#lxujhH+Y#6W*;(h@5GU31^qTkXw6hhnr0LhJG9}!(hYp<OW
zTfhKY5xy?HEX%sdG|m0-$AyK3`T6<zFl`Qwj*bphDwWY#zr4JBJ_v$8(%Pra;aaV>
zeQ0RtcAbHBv|$+jT(8$<eOI==WzDjz8-|C6WubpcaeP!dQV8Tu`F^w66hRRD)lb_O
zSP1bJ06deGM#KJXB6>Cpu&kM~cIMUOcD+3du+~1m9<w5%zN@ZE2`yk|{u2PsBI0Fc
zzH{|3e-IIG)R{<bz|4FiilXO|f4i(Mg+k#t031yVofq(XMD%noDA#r0W#*p!NxM9N
zuSQX{yWbsce0==2VzKxG0Blo5IuGD;t5=<aDi9&WSpYbo(&YjC5fMG90ue%d2mnv0
zbQ=yV5A?q8-=_j`9Oo-U+^f=UIB*wWKM{S_3q}a>5CEK4!OH%;fG@V&?E`ajbHA>I
z>i%%&0ASC530Sf$u5KJJ`o4cM2D5GZh+!CS0Km>Puz5x}=2;}7YtK?bh)c=mtTfPh
zrNkC+uhm%B!;j44&6W~Ni1=t69cKO%0PaYWyIl<vk&)#*yaWInc9;7Xuq7gr$I_my
zZ%Wv<J!Kfis~Qo?Dt(2BjtvYf9}9&LFUflyGmjvm)>~W}dS+%s{0RW$eeQMDYv#HG
kq=C$$*#gcIy)?Fe19?=kJVu_oFaQ7m07*qoM6N<$f(t(O)c^nh

literal 0
HcmV?d00001

diff --git a/static/images/learning/nolock.png b/static/images/learning/nolock.png
new file mode 100644
index 0000000000000000000000000000000000000000..94a1166871dcae784641028772255788dee5402b
GIT binary patch
literal 1056
zcmV+*1mF9KP)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px&+DSw~R9Hvtm|bWbRTRhn=g#gXt!2SNT0aO1MI+gJcW8;A=|f4YLi<(<eG*it
zQ0a?;l+uTGt5_+5R-yGl!TM;(gKvUZ^VHafkg~HgQ)wPVqEZ{bSlVXVI`^2n?8s)D
z&CblaOCq_i^FQbO?wND%J@*pU*q}AWi~k?6@B5F1VfYGw7l`O7X3i5)m6^W>@U>-G
zpA8QW|JbWP)iT3VQ&SuA`TS`BM*w730J;a@T(w#~J~}$O&~5N#fy?Fc79qq}M6@F=
z05i{Mt@qlteIu?-8r^-sb8~YWs@3WxX5Jn-B%+_S)}IR@E;94)%)AxAE+NEA%=~DB
z?n*wN-#Iuq*tJaG2kg4;2LN7gnEizy2#$=5jNER{$n^B|#{T~Pa{yj$_;yxG`9_-T
z#j#leY!;Z-dbXivFGwlPf?IL8uKNjqLv_(TA;c5iT8K-4E0s!#h)$ZorVJJq7M@%#
zv&&_=udnYK5!K3rnNKODO6?|^=KB(0*L5!~ZdIdo;8LMbI2G4v<7AonJEc_3&wo9d
zf&T#Tpa~L&;U3$zzl|HPTrTgnEbC%j|EH94b6ndbx@O=IfG`fU*2QA6Sc&V*aU3Ot
zaO!$3rL^MOCebwmb7b5hFr<`SIri6qqd&Bs;d&;Pl!W6r&qW!sEbDTiP`DX)L3p0G
zDGbABB7Lz~{3fn#5?$(rF+M(SDW$e)tusji#?@vrnHxhxL%%iaQvv(FzfWszj^jt-
z0;JGsW**mCAF^%xR%D+TxZZF005+z8NMmwdN@;rX+DHuSx~}QO-cJ)bjSVyZrIf0j
zzNvsc&pXM?U1@AuO{j5;Oq}5qz#711BD!ksgUq~(h_)ojcF%x`sG_xgQ7IMm7?_=%
z?F)k7O(J?L>RZ~u_XL=kf6C=@+n3v#44~sU$Al2?wu3d_djbsLRVn4Ct$-#cCo=;B
z1Lk(~csuBx05kJLN~vF0f~iz0=ZWaGRRKIdKc5{N8~eKr@H<3wd{qE1o>Id~sjF>(
zzaXN6s|ENyrPR?@Ff%hV1KDi$2O@f4RR9CH8;0RN+qR>7-oIR)=jE9BO8|S@!S-^O
zFtP3cI1>cHndrH|ahzv`5FY|~Iu2~Ffon{S_e0lpCjcCX3%d>+CsXSgj+3QGlcHNQ
zHN4-ltZQ{2XPNo=1Tk4kS$o_uBTajGc=3Js;{*Xam0p)pKHLfLW@a`gSfZY`1L_lt
z&t7k*1~!Ji?@O)qM*wyL$aMhI(v*mPF@JJmV&ZhER5F)<bS2RZxFkLk*KiW&-O#Q%
a;C}$Meho|e><*0p0000<MNUMnLSTY$nfI~)

literal 0
HcmV?d00001

diff --git a/static/images/my/feedback.png b/static/images/my/feedback.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f2ae64511c19183b265d24b4a9c6b7e7afe0fc7
GIT binary patch
literal 2150
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

literal 0
HcmV?d00001