From 01d69a9de3a49ae45decca4562b3ca56c1c8de85 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 1 Sep 2025 18:06:08 +0800
Subject: [PATCH] sc

---
 .env.development             |  4 +-
 .env.production              |  2 +-
 README.md                    |  2 +-
 src/App.vue                  | 18 -------
 src/jtools/api/exam.js       | 43 -----------------
 src/jtools/api/index.js      | 82 +++++--------------------------
 src/jtools/api/login.js      |  6 +--
 src/jtools/api/question.js   | 93 ------------------------------------
 src/jtools/api/station.js    | 51 --------------------
 src/jtools/api/user.js       | 28 ++++-------
 src/jtools/store/user.js     | 12 -----
 src/manifest.json            |  4 +-
 src/pages.json               |  2 +-
 src/pages/course/chapter.vue | 68 ++++++++++++++++----------
 src/pages/course/detail.vue  | 68 ++++++++++++++++++++++----
 src/pages/course/index.vue   | 36 +++++++-------
 src/pages/me/good.vue        | 77 +++++++++++++++++++++++++++--
 src/pages/me/index.vue       |  4 --
 src/pages/me/like.vue        | 81 +++++++++++++++++++++++++++++--
 19 files changed, 301 insertions(+), 380 deletions(-)
 delete mode 100644 src/jtools/api/exam.js
 delete mode 100644 src/jtools/api/question.js
 delete mode 100644 src/jtools/api/station.js

diff --git a/.env.development b/.env.development
index 7aa5aef..512b8b9 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
 # 页面标题
-VITE_APP_TITLE = 寻驾-无人机
+VITE_APP_TITLE = 耕读社
 
 # 开发环境配置
 VITE_APP_ENV = 'development'
 
-# 寻驾-无人机/开发环境
+# 耕读社/开发环境
 VITE_APP_BASE_API =  'https://cloud.ahfkbg.com/'
 # VITE_APP_BASE_API =  'https://xj.ahduima.com/'
 
diff --git a/.env.production b/.env.production
index bb417e0..d34ed99 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 寻驾-无人机
+VITE_APP_TITLE = 耕读社
 
 # 开发环境配置
 VITE_APP_ENV = 'production'
diff --git a/README.md b/README.md
index 308c0eb..c81010a 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 # xj-applet
 
-寻驾-无人机小程序
+耕读社小程序
diff --git a/src/App.vue b/src/App.vue
index c92a7aa..8b1acf8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,29 +1,11 @@
 <script>
 import useUserStore from '@/jtools/store/user'
-import { getSysConfig } from '@/jtools/api/index';
 
 export default {
   onLaunch: function (options) {
     if (useUserStore().isLogin) {
       useUserStore().getUserInfo()
     }
-    getSysConfig({ configKey: 'AppletShowAll', driverTypeId: -1 }).then(res => {
-      let arr = []
-      if(res?.data?.configValue == 1) {
-        arr = [
-          { text: '首页', icon: 'home', name: '/pages/index/index' },
-          { text: '题库', icon: 'grid', name: '/pages/questionBank/index' },
-          { text: '我', icon: 'account', name: '/pages/me/index' }
-
-        ]
-      } else {
-        arr = [
-          { text: '题库', icon: 'grid', name: '/pages/questionBank/index' },
-          { text: '我', icon: 'account', name: '/pages/me/index' }
-        ]
-      }
-      useUserStore().setTabbarList(arr)
-    });
   },
   onShow: function (options) {
     // 如果是二维码扫描过来的，需要保存公司id
diff --git a/src/jtools/api/exam.js b/src/jtools/api/exam.js
deleted file mode 100644
index cf08192..0000000
--- a/src/jtools/api/exam.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import request from '../request/index.js';
-
-export function getExamQuestion(data) {
-  return request({
-    url: 'wrj-api/wrjQuestionTest/test',
-    method: 'GET',
-    data
-  });
-}
-
-export function getCurrentTest(data) {
-  return request({
-    url: 'wrj-api/wrjQuestionTest/getCurrentTest',
-    method: 'GET',
-    data
-  });
-}
-
-export function getExamInfo(data) {
-  return request({
-    url: 'wrj-api/wrjQuestionTest/getQuestionTestMessageById',
-    method: 'GET',
-    data
-  });
-}
-
-// 交卷
-export function submitExam(data) {
-  return request({
-    url: 'wrj-api/wrjQuestionTest/testSubmit',
-    method: 'POST',
-    data
-  });
-}
-
-// 获取考试记录
-export function getExamRecord(data) {
-  return request({
-    url: 'wrj-api/wrjQuestionTest/getTestScore',
-    method: 'POST',
-    data
-  });
-}
diff --git a/src/jtools/api/index.js b/src/jtools/api/index.js
index b6ab7de..8e5c964 100644
--- a/src/jtools/api/index.js
+++ b/src/jtools/api/index.js
@@ -1,94 +1,36 @@
 import request from '../request/index.js';
 
-export function getCarTypeList(data) {
+export function getCourseList(data) {
   return request({
-    url: 'wrj-api/wrjModel/list',
-    method: 'GET',
-    data,
-    noToken: true
-  });
-}
-export function getDriverTypeList(data) {
-  return request({
-    url: 'wrj-api/wrjDriverType/list',
-    method: 'GET',
+    url: 'sinology-api/sinologyLesson/page',
+    method: 'POST',
     data,
     noToken: true
   });
 }
 
-// 获取章节列表
-export function getChapterOptions(data) {
+export function getCourseChapter(data) {
   return request({
-    url: 'wrj-api/wrjChapter/queryChapter',
+    url: 'sinology-api/sinologyChapter/queryChapter',
     method: 'POST',
-    data
-  });
-}
-
-export function getChapterInfo(data) {
-  return request({
-    url: 'wrj-api/wrjChapter/queryChapterInfo',
-    method: 'POST',
-    data
-  });
-}
-
-export function getChapterDoneList(data) {
-  return request({
-    url: 'wrj-api/wrjChapter/queryChapterQuestionNumWithUser',
-    method: 'GET',
-    data
-  });
-}
-
-export function uploadFile(data) {
-  return request({
-    url: 'wrj-api/system/file/upload',
-    method: 'POST',
-    data
-  });
-}
-
-// 查询考点列表
-export function queryExamPoint(data) {
-  return request({
-    url: 'wrj-api/wrjExamPlace/pageList',
-    method: 'POST',
-    data
-  });
-}
-
-// 查询考点时间
-export function queryExamPointTime(data) {
-  return request({
-    url: 'wrj-api/wrjExamPlace/queryDate',
-    method: 'POST',
-    data
+    data,
+    noToken: true
   });
 }
 
-// 根据时间查询考点
-export function queryExamPointByTime(data) {
+export function getChapterDetail(data) {
   return request({
-    url: 'wrj-api/wrjExamPlace/query',
+    url: 'sinology-api/sinologyChapter/getInfo',
     method: 'POST',
-    data
-  });
-}
-
-// 收藏考点
-export function collectExamPoint(placeId) {
-  return request({
-    url: 'wrj-api/wrjUserCollectPlace/update?placeId=' + placeId,
-    method: 'POST'
+    data,
+    noToken: true
   });
 }
 
 // 获取配置项
 export function getSysConfig(data) {
   return request({
-    url: 'wrj-api/wrjSysConfig/queryConfigByKey',
+    url: 'sinology-api/sysConfig/queryConfigByKey',
     method: 'GET',
     data,
     noToken: true
diff --git a/src/jtools/api/login.js b/src/jtools/api/login.js
index 75abb23..4e48215 100644
--- a/src/jtools/api/login.js
+++ b/src/jtools/api/login.js
@@ -2,7 +2,7 @@ import request from '../request/index.js';
 
 export function login(data) {
   return request({
-    url: 'wrj-api/sysUser/login',
+    url: 'sinology-api/sysUser/login',
     method: 'POST',
     data,
     noToken: true
@@ -11,14 +11,14 @@ export function login(data) {
 
 export function logout() {
   return request({
-    url: 'wrj-api/sysUser/loginOut',
+    url: 'sinology-api/sysUser/loginOut',
     method: 'get'
   });
 }
 
 export function getInfo() {
   return request({
-    url: 'wrj-api/sysUser/queryUserMessage',
+    url: 'sinology-api/sysUser/queryUserMessage',
     method: 'get'
   });
 }
diff --git a/src/jtools/api/question.js b/src/jtools/api/question.js
deleted file mode 100644
index 8e7918e..0000000
--- a/src/jtools/api/question.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import request from '../request/index.js';
-
-export function queryQuestion(data) {
-  return request({
-    url: 'wrj-api/wrjQuestion/queryQuestionWithUser',
-    method: 'POST',
-    data
-  });
-}
-
-export function queryQuestionEmpty(data) {
-  return request({
-    url: 'wrj-api/wrjQuestion/queryQuestion',
-    method: 'POST',
-    data
-  });
-}
-
-export function doExercise(data) {
-  return request({
-    url: 'wrj-api/wrjQuestionPractice/insert',
-    method: 'POST',
-    data
-  });
-}
-
-export function clearPractice(params) {
-  return request({
-    url: `wrj-api/wrjQuestionPractice/clear?practiceType=${params.practiceType}&businessCode=${params.businessCode}`,
-    method: 'POST'
-  });
-}
-
-// 收藏
-export function collectQuestion(questionId) {
-  return request({
-    url: `wrj-api/wrjUserCollectQuestion/update?questionId=${questionId}`,
-    method: 'POST'
-  });
-}
-
-// 获取收藏题目
-export function queryLikeQuestion(data) {
-  return request({
-    url: `wrj-api/wrjUserCollectQuestion/getUserCollectQuestion`,
-    method: 'GET',
-    data
-  });
-}
-
-// 获取错题
-export function queryErrorQuestion(data) {
-  return request({
-    url: `wrj-api/wrjUserErrorQuestion/getUserErrorQuestion`,
-    method: 'GET',
-    data
-  });
-}
-
-// 获取收藏的列表
-export function queryCollectList(driverTypeId) {
-  return request({
-    url: `wrj-api/wrjUserCollectQuestion/getUserCollectQuestionId?driverTypeId=${driverTypeId}`,
-    method: 'GET'
-  });
-}
-
-// 移除错题
-export function removeErrorQuestion(questionId) {
-  return request({
-    url: `wrj-api/wrjUserErrorQuestion/remove?questionId=${questionId}`,
-    method: 'POST'
-  });
-}
-
-// 获取首页信息
-export function queryIndexInfo(data) {
-  return request({
-    url: 'wrj-api/wrjQuestion/getIndexData',
-    method: 'GET',
-    data,
-    publicApi: true
-  });
-}
-
-// 获取考试信息
-export function queryIndexDetail(data) {
-  return request({
-    url: 'wrj-api/wrjDriverType/detail',
-    method: 'GET',
-    data
-  });
-}
diff --git a/src/jtools/api/station.js b/src/jtools/api/station.js
deleted file mode 100644
index d67f6aa..0000000
--- a/src/jtools/api/station.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import request from '../request/index.js';
-
-export function getStationList(data) {
-  return request({
-    url: 'wrj-api/wrjSchool/pageList',
-    method: 'POST',
-    data,
-    noToken: true
-  });
-}
-
-// 培训机构注册
-export function registerStation(data) {
-  return request({
-    url: 'wrj-api/wrjSchool/insert',
-    method: 'POST',
-    data,
-    noToken: true
-  });
-}
-
-export function getStationDetail(schoolId) {
-  return request({
-    url: 'wrj-api/wrjSchool/detail?schoolId=' + schoolId,
-    method: 'GET',
-    publicApi: true
-  });
-}
-
-// 收藏
-export function collectStation(schoolId) {
-  return request({
-    url: 'wrj-api/wrjUserCollectSchool/update?schoolId=' + schoolId,
-    method: 'POST',
-  });
-}
-
-// 获取驾培机型
-export function getCarTypeList() {
-  return request({
-    url: 'wrj-api/wrjSchoolDriverType/list',
-    method: 'GET',
-  });
-}
-// 查询收藏的机构
-export function queryCollectList() {
-  return request({
-    url: 'wrj-api/wrjUserCollectSchool/myList',
-    method: 'POST',
-  });
-}
\ No newline at end of file
diff --git a/src/jtools/api/user.js b/src/jtools/api/user.js
index da04a71..b1b4523 100644
--- a/src/jtools/api/user.js
+++ b/src/jtools/api/user.js
@@ -1,45 +1,33 @@
 import request from '../request/index.js';
 
-export function chooseType(data) {
+export function userGood(data) {
   return request({
-    url: 'wrj-api/sysUser/driverTypeChoose',
+    url: 'sinology-api/sinologyUserGood/click',
     method: 'POST',
     data
   });
 }
 
-// 修改用户资料
-export function updateUserInfo(data) {
+export function getUserGoodList(data) {
   return request({
-    url: 'wrj-api/sysUser/update',
+    url: 'sinology-api/sinologyUserGood/query',
     method: 'POST',
     data
   });
 }
 
-// 教员入驻
-export function teacherRegister(data) {
+export function userLike(data) {
   return request({
-    url: 'wrj-api/wrjTeacher/apply',
+    url: 'sinology-api/sinologyUserCollect/click',
     method: 'POST',
     data
   });
 }
 
-// 报名咨询
-export function applyConsult(data) {
+export function getUserLikeList(data) {
   return request({
-    url: 'wrj-api/wrjClue/consult',
+    url: 'sinology-api/sinologyUserCollect/query',
     method: 'POST',
     data
   });
 }
-
-
-// 获取收藏的考点
-export function getCollecRoomList() {
-  return request({
-    url: 'wrj-api/wrjUserCollectPlace/myList',
-    method: 'POST',
-  });
-}
\ No newline at end of file
diff --git a/src/jtools/store/user.js b/src/jtools/store/user.js
index 5a9b795..5b0b33b 100644
--- a/src/jtools/store/user.js
+++ b/src/jtools/store/user.js
@@ -9,11 +9,6 @@ const useUserStore = defineStore({
     isLogin: storage.get('isLogin'), // 是否登陆
     userInfo: {}, // 用户信息
     sellManId: '', // 分销人id
-    currentType: {
-      modelId: '10001',
-      typeId: '20021',
-      showName: '多旋翼 - 视距内驾驶员'
-    },
     tabbarList: []
   }),
 
@@ -87,13 +82,6 @@ const useUserStore = defineStore({
       storage.remove('token');
       storage.remove('userInfo');
     },
-    setType(modelId, typeId, showName) {
-      this.currentType = {
-        modelId,
-        typeId,
-        showName
-      };
-    },
     setTabbarList(list) {
       this.tabbarList = list;
     }
diff --git a/src/manifest.json b/src/manifest.json
index e2e7b64..93a0d13 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,5 +1,5 @@
 {
-  "name": "寻驾-无人机",
+  "name": "耕读社",
   "appid": "__UNI__59447F7",
   "description": "",
   "versionName": "1.0.2",
@@ -77,4 +77,4 @@
   "vueVersion": "3",
   "fallbackLocale": "zh-Hans",
   "locale": "zh-Hans"
-}
\ No newline at end of file
+}
diff --git a/src/pages.json b/src/pages.json
index ea41324..6e9c68c 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -72,7 +72,7 @@
   ],
   "globalStyle": {
     "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "寻驾-无人机",
+    "navigationBarTitleText": "耕读社",
     "navigationBarBackgroundColor": "#FFF",
     "backgroundColor": "#FFF"
   },
diff --git a/src/pages/course/chapter.vue b/src/pages/course/chapter.vue
index 4d5be85..6f27027 100644
--- a/src/pages/course/chapter.vue
+++ b/src/pages/course/chapter.vue
@@ -2,46 +2,70 @@
   <view class="p15">
     <view class="chapter_item" v-for="(item, index) of chapterList" :key="index" @tap="toDetail(item)">
       <view style="line-height: 20px;">
-        <text class="j-tag" style="background: #DDEEFF;color: #1A8CFE">第{{ String(index+1).padStart(2,'0') }}讲·庄子</text>
-        <text class="fs14 ml5 ">阴极阳转，阳转阴转，实现生命永恒的自然轮转</text>
+        <text class="j-tag" style="background: #DDEEFF;color: #1A8CFE">{{ item.chapterIndex }}</text>
+        <text class="fs14 ml5 ">{{ item.chapterName }}</text>
       </view>
       <view class="mt10 flex ai-c jc-sb fs12 mt8 cor-999">
-        <text>郭老师</text>
-        <text>2020-01-01 19:00</text>
         <view class="flex ai-c">
-          <u-icon name="eye" color="#999" size="14" :label="index*7" label-color="#999" label-size="12"></u-icon>
-          <u-icon class="ml20" name="thumb-up" color="#999" size="14" :label="index*3" label-color="#999" label-size="12"></u-icon>
+          <u-icon name="eye" color="#999" size="14" :label="item.browseCount" label-color="#999" label-size="12"></u-icon>
+          <u-icon class="ml20" name="thumb-up" color="#999" size="14" :label="item.goodCount" label-color="#999" label-size="12"></u-icon>
         </view>
+        <text>{{ item.author }}</text>
+        <text>{{ item.publicTime }}</text>
       </view>
     </view>
   </view>
 </template>
 
 <script>
-	// import { getChapterDoneList } from '@/jtools/api/index'
+	import { getCourseChapter } from '@/jtools/api/index'
+  import { mapState } from 'pinia'; //引入映射函数
+  import useUserStore from '@/jtools/store/user'; //引入store
 
 	export default {
+    computed: {
+      ...mapState(useUserStore, ['isLogin'])
+    },
 		data() {
 			return {
-				chapterList:[],
+				chapterList: [],
+        lessonId: undefined
 			}
 		},
-		onLoad(){
-			this.getChapterList()
+		onLoad(op){
+      this.lessonId = op.id
+			this.getChapterList(op.id)
 		},
+    onShow() {
+      if(this.lessonId) {
+        this.getChapterList(this.lessonId)
+      }
+    },
 		methods:{
-			getChapterList(){
-        this.chapterList = [1,2,3]
-				// getChapterDoneList({driverTypeId}).then(resp=>{
-				// 	if(resp.code==='0000'){
-				// 		this.chapterList=resp.data
-				// 	}
-				// })
+			getChapterList(lessonId){
+				getCourseChapter({lessonId}).then(resp=>{
+					if(resp.code==='0000'){
+						this.chapterList=resp.data
+					}
+				})
 			},
 			toDetail(chapter){
-        uni.navigateTo({
-          url: `/pages/course/detail?id=${chapter.id}`
-        });
+        if(!this.isLogin){
+          uni.showToast({
+            title: '请先登录',
+            icon: 'none'
+          });
+          setTimeout(() => {
+            uni.navigateTo({
+              url: '/pages/me/login'
+            });
+          }, 1500);
+          return
+        } else {
+          uni.navigateTo({
+            url: `/pages/course/detail?id=${chapter.chapterId}`
+          });
+        }
 			},
 		}
 	}
@@ -59,11 +83,7 @@
 }
 
 .j-tag {
-  // display: inline-flex;
-  // align-items: center;
-  // justify-content: center;
   padding: 1px 3px;
-  // height: 16px;
   border-radius: 3px;
   font-size: 12px;
   line-height: 14px;
diff --git a/src/pages/course/detail.vue b/src/pages/course/detail.vue
index 4a1e5fe..910049c 100644
--- a/src/pages/course/detail.vue
+++ b/src/pages/course/detail.vue
@@ -1,31 +1,81 @@
 <template>
   <view class="bc-fff p10 relative">
-    <u-parse :content="content"></u-parse>
+    <u-parse :content="chapterInfo.content"></u-parse>
     <!-- 右下角点赞收藏 -->
     <view class="btns">
       <view class="btn">
-        <u-icon name="thumb-up-fill" color="#999" size="28" label="26522" label-pos="bottom" label-size="12" @tap="like"></u-icon>
+        <u-icon name="thumb-up-fill" color="#999" size="28" :label="chapterInfo.goodCount" label-pos="bottom" label-size="12" @tap="good"></u-icon>
       </view>
       <view class="btn">
-        <u-icon name="heart-fill" color="#999" size="28" label="12" label-pos="bottom" label-size="12" @tap="collect"></u-icon>
+        <u-icon name="heart-fill" color="#999" size="28" :label="chapterInfo.collectCount" label-pos="bottom" label-size="12" @tap="like"></u-icon>
       </view>
     </view>
   </view>
 </template>
 
 <script>
+  import { getChapterDetail } from '@/jtools/api/index';
+  import { userGood, userLike } from '@/jtools/api/user';
+  import { mapState } from 'pinia'; //引入映射函数
+  import useUserStore from '@/jtools/store/user'; //引入store
   export default {
+    computed: {
+      ...mapState(useUserStore, ['userInfo'])
+    },
     data() {
       return {
-        content: "<h2 style=\"text-align: left;\"><span style=\"font-size: 16px; font-family: 黑体;\"><strong>第1讲 &nbsp;庄子：阴极阳转，阳转阴转，实现生命永恒的自然轮转</strong></span></h2><p><span style=\"font-size: 14px; font-family: 宋体;\">庄子的思想无所不包，有治身之道，解心之道，更有帝王之术、治国之道，用兵之道......包含着奇门遁甲、阴阳变化、河图洛书等等，“其余宗也，可调适而上遂”。</span></p><p><span style=\"font-size: 14px; font-family: 宋体;\">从今天开始，我带着大家逐字逐句来解读《庄子》，通读完庄子以后，一定可以参透世间一切法。我们来看庄子的内篇，第一篇《逍遥游》的第一段。</span></p><p style=\"text-indent: 28.1pt; text-align: justify;\"><span style=\"color: rgb(207, 19, 34); font-size: 14px;\"><strong>【北冥有鱼，其名为鲲。鲲之大，不知其几千里也。化而为鸟，其名为鹏。】</strong></span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">这句话重点的一个字在一个“化”字上面。北冥有鱼，其名为鲲。什么叫做鲲？鲲是大于一切种类的鱼，才能叫做鲲。所有的鱼在鲲面前都是极其渺小的，这是大鹏的第一次升华和蜕变。这个鲲有多大，不知其几千里也。化为鸟，其名为鹏。</span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">那什么叫做鹏？鹏是高于一切种类鸟的，鹏是大于所有种类的鸟。所以化为鸟又是一次蜕变，鸟化为鹏是第三次蜕变，总共完成了三次的升华蜕变。经历了三次的脱胎换骨，这是一种“化”，这个化的过程也在说明“天行健”之理。这个世界，这个宇宙总体它是在上升的，所以我们不要悲观，要有那种逍遥的心态。</span></p><p style=\"text-indent: 28.1pt; text-align: justify;\"><span style=\"color: rgb(207, 19, 34); font-size: 14px;\"><strong>【鹏之背，不知其几千里也。怒而飞，其翼若垂天之云。】</strong></span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">这一段话里面重点的一个字是“怒”字。鹏之背不知其几千里也，单单鹏的背就大过了鲲，怒而飞的“怒”字，表达了这种内心的冲动，来自内心的原生动力，它要拼命挣脱原生宿命。</span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">其翼若垂天之云。它的大翅膀有多大？像天边的云彩，像遮天蔽日的彩云一样。</span></p><p style=\"text-indent: 28.1pt; text-align: justify;\"><span style=\"color: rgb(207, 19, 34); font-size: 14px;\"><strong>【是鸟也，海运则将徙于南冥。南冥者，天池也。】</strong></span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">“是鸟也”三个字，就说明自己的大鹏还不是名副其实的鹏，它仍然还有那鸟类的共性。其翼若垂天之云，虽然它的翅膀大，（但是）还没有足够的力量，翅膀还没有真的硬起来。</span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">海运则将徙于南冥也。但是这时候它想乘6月海运旋起的台风，乘着海运之风飞到南冥去。</span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">它为什么要飞到南冥？南冥者，天池也。南冥是一方净土，那里有天池，它要到南冥去喝天池之水，要完成一次彻底的蜕变，究竟涅槃。</span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">喝到了天池之水，就可以重置生命系统。水是人体最重要的结构，最重要的部分，换水就是重置生命本身，所以它要到南冥去喝天池之水。</span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">那它怎么知道南冥有天池的？海运则将徙于南冥也。这个“将”就是“打算、梦想”，它有这个梦想，是它梦到的。可见人的原生梦想是多么重要，我们每一个人都是追梦人。</span></p><p style=\"text-indent: 28.1pt; text-align: justify;\"><span style=\"color: rgb(207, 19, 34); font-size: 14px;\"><strong>【《齐谐》者，志怪者也。《谐》之言曰：“鹏之徙于南冥也，水击三千里，抟扶摇而上者九万里，去以六月息者也。”】</strong></span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">《齐谐》是一本书名，《齐谐》这本书专门记载人们认为的奇谈怪事，这本书上记载了大鹏第二次起飞的历程。大鹏要迁徙到南冥的时候水击三千里，它强有力的翅膀拍打水面，激起的浪花就溅到了三千里之外。</span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">抟扶摇直上者九万里。所谓的“抟”就是旋转的意思，就像我们团面，是把面给它揉圆了的一个过程。这里的“抟”表示扭转身体，处于那种非常放松的状态，才能够舒展开自己的翅膀。扶摇直上，扶摇，指的是摇摇晃晃一直往上升，一直升到九万里的高空。</span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">去以六月息者也。什么叫做“息”？一呼一吸之间的那个停顿叫做“息”，一来一回之间的那个停顿。也就是说，大鹏第二次起飞没有到达南冥，没有成功，而且是飞了六个月以后又原路返回了，这就是一来一回的过程。同时这一句话里也包含了事物之理，包含了天地宇宙的运行之理。</span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">“水击三千里”和“去以六月息者也”，这是同一个层面或者同一个维度上的事情。3和6是一分为二的，是乘以二，倍增效应的。在同一维度，一定是遵循一分为二的变化之理的。而“水击三千里，抟扶摇直上九万里”，从3到9就是一个指数级别的增长，9是宇宙中最大数，代表的是九九归一。从3到9和从3到1是一样的，这叫做九九归一，这里面包含了一组数字，神秘的数字369。</span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">自古以来，很多人都沉迷于这种369神秘数字中，认为这暗合着宇宙法则，是通向宇宙的密码。但是庄子在这里表达了恰恰是要打碎这种密码认知，只是告诉我们能量级别提升是最快的，我们想做成一件事情，首先要提升我们的能量，那是最大的捷径。</span></p><p style=\"text-indent: 28.1pt; text-align: justify;\"><span style=\"color: rgb(207, 19, 34); font-size: 14px;\"><strong>【野马也，尘埃也，生物之以息相吹也。天之苍苍，其正色邪，其远而无所至极邪。其视下也，亦若是则已矣。】</strong></span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">大鹏第二次起飞虽然半途折返，但是它仍然有所得的，它以另一个视角看到了这个世界：天之苍苍，其正色邪？原来天地没有第二种颜色，只有一个颜色，这个颜色就是苍茫一色，连黑白之分都没有，这是天地的底色。</span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">其正色邪？但是它心中还是有所迟疑。其远而无所至极邪？它向远处看根本就看不到头，感觉到其路漫漫。其视下也，亦若是则已矣。它向下看也是看不到底的，深不可测的，看野马和尘埃也没有什么两样。野马也，尘埃也。野马也变成了尘埃，混同于这苍茫一色之中。然而不管它向远处看还是向下看，心中都是有所忐忑的，它自己（心里）根本就没有底，不能够确定能不能飞到南冥去，所以“六月息者也”，飞了六个月以后又折返回来了。</span></p><p style=\"text-indent: 28.1pt; text-align: justify;\"><span style=\"color: rgb(207, 19, 34); font-size: 14px;\"><strong>【且夫水之积也不厚，则其负大舟也无力；】</strong></span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">这是大鹏第二次起飞半途折返以后，进行了一个自我反思和总结：如果水不深，大船根本就没有办法在上面行驶，会搁浅的。</span></p><p style=\"text-indent: 28.1pt; text-align: justify;\"><span style=\"color: rgb(207, 19, 34); font-size: 14px;\"><strong>【覆杯水于坳堂之上，则芥为之舟；】</strong></span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">把一杯水倒在堂前的滴水沟里，那只能让一根极小的草芥在这一杯水里面也可以像船那样去飘荡。</span></p><p style=\"text-indent: 28.1pt; text-align: justify;\"><span style=\"color: rgb(207, 19, 34); font-size: 14px;\"><strong>【置杯焉则胶，水浅而舟大也。】</strong></span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">但是把杯子放下来的功夫，水就马上会渗露下去，草芥也不能飘荡，这就是水太浅了，船太大了。</span></p><p style=\"text-indent: 28.1pt; text-align: justify;\"><span style=\"color: rgb(207, 19, 34); font-size: 14px;\"><strong>【风之积也不厚，则其负大翼也无力。】</strong></span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">所以它把这次失败总结为：风的力量还不够。</span></p><p style=\"text-indent: 28.1pt; text-align: justify;\"><span style=\"color: rgb(207, 19, 34); font-size: 14px;\"><strong>【故九万里则风斯在下矣，而后乃今培风；】</strong></span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">所以它飞到九万里高空以后，他才感觉到风根本就没有用，所以接下来一定要培养自己的能量。风，在这里代表的是一种能量。</span></p><p style=\"text-indent: 28.1pt; text-align: justify;\"><span style=\"color: rgb(207, 19, 34); font-size: 14px;\"><strong>【背负青天而莫之夭阏者，而后乃今将图南。】</strong></span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">背负青天，就要选择一个天公作美的日子。莫之夭阏者，也是一个风平浪静的日子，不会逆风而行，不会有阻碍。</span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">而后乃今将图南。前面一个“而后乃今培风”和这个“而后乃今将图南”两个“而后乃今”，前面一个“而后乃今”表示从今天开始另作打算，另做计划；后面这个“而后乃今”指的是要待时而动，要满足我（今天）想要的条件以后，才可以去完成图南之志。这样的话就可以到达南冥了。</span></p><p style=\"text-indent: 28.1pt; text-align: justify;\"><span style=\"color: rgb(207, 19, 34); font-size: 14px;\"><strong>【“蜩与学鸠笑之曰：‘我决起而飞，抢榆枋而止，时则不至，而控于地而已矣，奚以之九万里而南为？’”】</strong></span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">蜩与学鸠，指的蝉和那种小鸟。这两个物种生命都极其短暂，春生夏死或者夏生秋死，就是生命尺度比较短的生物种类。</span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">蜩与学鸠就嘲笑大鹏，它说“你看看我，决起而飞”。我脚一蹬就能够飞起来，抢榆枋而不至，我往高大的树木上去飞，飞不上去我就下来趴在地上休息，不去浪费那个时间，因为生命太短暂了，时间太宝贵了。你这只大鹏为什么不知道珍惜时间？飞那么远干什么？往南冥去干什么？</span></p><p style=\"text-indent: 28.1pt; text-align: justify;\"><span style=\"color: rgb(207, 19, 34); font-size: 14px;\"><strong>【适莽苍者，三餐而反，腹犹果然；适百里者，宿舂粮；适千里者，三月聚粮。之二虫又何知？】</strong></span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">这一段是描写大鹏的心理活动，大鹏是这么认为的：一个人出门，只到离家很近的地方，或者到郊区这样的地方，三餐而返，他只要准备三餐的干粮，回到家肚子还是饱饱的，不会饿着，穷家富路嘛，你要保证路上不会饿着；出门到百里之外地方的人，他也一定会带上过夜的干粮，保证一天一夜的资粮才可以；那到千里之外的人，他要带上三个月的资粮，要根据自己的路途来带购足够的资粮。你这两个小虫子又怎么能够理解呢？</span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">大鹏的意思是，它追求的是生命永恒之道，只有喝上天池的水，才能够让自己的生命永恒流转，才能够阴极转阳，阳极转阴，实现周流不殆的运转。它的这种无限的生命尺度，又哪里是蜩与学鸠这两个小虫子能够理解的呢？</span></p><p style=\"text-indent: 28pt; text-align: justify;\"><span style=\"font-size: 14px; font-family: 宋体;\">这里面就交代了大鹏起飞的真正的目的：大鹏去喝天池之水，是为了获取真正的生命资粮，入于那种不死不生的循环之中。去找天池，就是在求道，只有“道”作为我们能量的时候才能够周流不殆，循环往复，才能够实现生命的永恒。</span></p><p><span style=\"font-size: 14px; font-family: 宋体;\">好，今天暂时给大家分享到这里，谢谢收看。</span></p>"
+        chapterInfo: {
+          content: "",
+          goodCount: 0,
+          collectCount: 0
+        },
       }
     },
-    onLoad() {
-      // 页面加载时的逻辑
-      uni.setNavigationBarTitle({
-        title: '第1讲·庄子'
-      });
+    onLoad(op) {
+      this.getInfo(op.id);
     },
+    methods: {
+      getInfo(chapterId) {
+        try {
+          const _this = this;
+          getChapterDetail({ chapterId }).then(res => {
+            if (res.code === '0000') {
+              _this.chapterInfo = res.data;
+              uni.setNavigationBarTitle({
+                title: res.data.chapterIndex
+              });
+            }
+          });
+        } catch (error) {
+          console.log(error);
+          
+        }
+      },
+      like() {
+        const _this = this;
+        userLike({ chapterId: this.chapterInfo.chapterId,userId:this.userInfo.userId }).then(res => {
+          if (res.code === '0000') {
+            _this.chapterInfo.collectCount += 1;
+            uni.showToast({
+              title: '收藏成功',
+              icon: 'none'
+            });
+          }
+        });
+      },
+      good() {
+        const _this = this;
+        userGood({ chapterId: this.chapterInfo.chapterId,userId: this.userInfo.userId }).then(res => {
+          if (res.code === '0000') {
+            _this.chapterInfo.goodCount += 1;
+            uni.showToast({
+              title: '点赞成功',
+              icon: 'none'
+            });
+          }
+        });
+      }
+    }
   }
 </script>
 
diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue
index c7ab902..c160f25 100644
--- a/src/pages/course/index.vue
+++ b/src/pages/course/index.vue
@@ -1,22 +1,22 @@
 <template>
   <view class="wp100 hp100">
     <view class="p5" style="background-color: #fff;">
-      <u-search v-model="queryParams.placeName" placeholder="搜索标题/作者" :showAction="false"
+      <u-search v-model="queryParams.searchValue" placeholder="搜索标题/作者" :showAction="false"
         @search="handleSearch">搜索</u-search>
     </view>
     <u-list v-if="pageList.length > 0" @scrolltolower="scrolltolower" class="course-list">
       <u-list-item v-for="(item, index) in pageList" :key="index">
         <view class="flex ai-c jc-sb p10lr p5tb bc-fff" @click="handleClick(item)">
           <view class="flex ai-c">
-            <image src="https://ss-cloud.ahduima.com/wrj/file/1949715991365947392.jpg" mode="aspectFill" style="width: 160px;height: 100px;border-radius: 6px;"  />
+            <image :src="item.image" mode="aspectFill" style="width: 160px;height: 100px;border-radius: 6px;"  />
           </view>
-          <view class="flex-1 ml10 overflow-h">
-            <view class="fs14">课程标题 {{ index + 1 }}</view>
-            <view class="fs13 mt8 cor-999 text-ellipsis">课程简介内容，简要描述课程内容和目标。</view>
+          <view class="fl1 ml10 overflow-h">
+            <view class="fs14">{{ item.lessonName }}</view>
+            <view class="fs13 mt8 cor-999 text-ellipsis">{{ item.introduction }}</view>
             <view class="flex ai-c jc-sb fs12 mt8 cor-999">
-              <u-icon name="eye" color="#999" size="14" :label="index*7" label-color="#999" label-size="12"></u-icon>
-              <u-icon name="thumb-up" color="#999" size="14" :label="index*3" label-color="#999" label-size="12"></u-icon>
-              <text>2020-01-01 19:00</text>
+              <u-icon name="eye" color="#999" size="14" :label="item.browseCount" label-color="#999" label-size="12"></u-icon>
+              <u-icon name="thumb-up" color="#999" size="14" :label="item.goodCount" label-color="#999" label-size="12"></u-icon>
+              <text>{{ item.author }}</text>
             </view>
           </view>
         </view>
@@ -27,13 +27,15 @@
 </template>
 
 <script>
+  import  { getCourseList } from '@/jtools/api/index'
+
   export default {
     data() {
       return {
         pageList: [],
         total: 0,
         queryParams: {
-          placeName: '',
+          searchValue: '',
           pageNo: 1,
           pageSize: 20
         }
@@ -55,18 +57,16 @@
         this.getPageList()
       },
       getPageList() {
-        this.pageList = [1,2,3]
-        this.total = 3
-        // const _this = this
-        // const params = { ...this.queryParams }
-        // queryExamPoint(params).then(res => {
-        //   _this.pageList = [..._this.pageList, ...res.data.records]
-        //   _this.total = res.data.total
-        // });
+        const _this = this
+        const params = { ...this.queryParams }
+        getCourseList(params).then(res => {
+          _this.pageList = [..._this.pageList, ...res.data.records]
+          _this.total = res.data.total
+        });
       },
       handleClick(item) {
         uni.navigateTo({
-          url: `/pages/course/chapter`
+          url: `/pages/course/chapter?id=${item.lessonId}`
         });
       }
     }
diff --git a/src/pages/me/good.vue b/src/pages/me/good.vue
index 80383ac..c209913 100644
--- a/src/pages/me/good.vue
+++ b/src/pages/me/good.vue
@@ -1,13 +1,82 @@
 <template>
-  <view>我的点赞</view>
+  <view>
+    <u-list v-if="pageList.length > 0" @scrolltolower="scrolltolower" class="course-list">
+      <u-list-item v-for="(item, index) in pageList" :key="index">
+        <view class="flex ai-c jc-sb p10lr p5tb bc-fff" @click="handleClick(item)">
+          <view class="flex ai-c">
+            <image :src="item.image" mode="aspectFill" style="width: 150px;height: 100px;border-radius: 6px;"  />
+          </view>
+          <view class="fl1 ml10">
+            <view class="fs14">{{ item.lessonName }}</view>
+            <view class="fs13 mt8 cor-999">
+              <text class="j-tag" style="background: #DDEEFF;color: #1A8CFE">{{ item.chapterIndex }}</text>
+              <text>{{ item.chapterName }}</text>
+            </view>
+          </view>
+        </view>
+      </u-list-item>
+    </u-list>
+    <u-empty v-else mode="list" text="暂无数据"></u-empty>
+  </view>
 </template>
 
 <script>
-  export default {
-    
+  import  { getUserGoodList } from '@/jtools/api/user'
+  import { mapState } from 'pinia'; //引入映射函数
+  import useUserStore from '@/jtools/store/user'; //引入store
+
+	export default {
+    computed: {
+      ...mapState(useUserStore, ['userInfo'])
+    },
+    data() {
+      return {
+        pageList: [],
+        total: 0,
+        queryParams: {
+          pageNo: 1,
+          pageSize: 20
+        }
+      }
+    },
+    mounted() {
+      this.handleSearch()
+    },
+    methods: {
+      scrolltolower() {
+        if (this.pageList.length < this.total) {
+          this.queryParams.pageNo++
+          this.getPageList()
+        }
+      },
+      handleSearch() {
+        this.pageList = []
+        this.queryParams.pageNo = 1
+        this.getPageList()
+      },
+      getPageList() {
+        const _this = this
+        const params = { ...this.queryParams, userId: this.userInfo.userId }
+        getUserGoodList(params).then(res => {
+          _this.pageList = [..._this.pageList, ...res.data.records]
+          _this.total = res.data.total
+        });
+      },
+      handleClick(item) {
+        uni.navigateTo({
+          url: `/pages/course/detail?id=${chapter.chapterId}`
+        });
+      }
+    }
   }
 </script>
 
 <style lang="scss" scoped>
-
+.j-tag {
+  padding: 1px 3px;
+  border-radius: 3px;
+  font-size: 12px;
+  line-height: 14px;
+  color: #fff;
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue
index 6e227b4..f2048b0 100644
--- a/src/pages/me/index.vue
+++ b/src/pages/me/index.vue
@@ -17,10 +17,6 @@
       <u-cell-group :customStyle="{ 'background-color': '#fff', 'margin-top': '10px', 'border-radius': '8px' }">
         <u-cell icon="thumb-up" size="large" title="我的点赞" isLink @tap="next('/pages/me/good')"></u-cell>
         <u-cell icon="heart" size="large" title="我的收藏" isLink @tap="next('/pages/me/like')"></u-cell>
-        <!-- <button open-type="share" class="share">
-          <u-cell icon="share" title="分享" size="large" isLink></u-cell>
-        </button> -->
-        <!-- <u-cell v-if="isLogin" icon="thumb-up" size="large" title="我的关注" isLink @tap="next('/pages/me/look')"></u-cell> -->
 
         <u-cell icon="level" size="large" title="当前版本" :value="version"></u-cell>
         <u-cell icon="phone" size="large" title="联系我们" :value="contactInfo.configDesc" isLink @tap="makePhone"></u-cell>
diff --git a/src/pages/me/like.vue b/src/pages/me/like.vue
index 14185c0..0112567 100644
--- a/src/pages/me/like.vue
+++ b/src/pages/me/like.vue
@@ -1,13 +1,86 @@
 <template>
-  <view>我的收藏</view>
+  <view>
+    <u-list v-if="pageList.length > 0" @scrolltolower="scrolltolower" class="course-list">
+      <u-list-item v-for="(item, index) in pageList" :key="index">
+        <view class="flex ai-c jc-sb p10lr p5tb bc-fff" @click="handleClick(item)">
+          <view class="flex ai-c">
+            <image :src="item.image" mode="aspectFill" style="width: 150px;height: 100px;border-radius: 6px;"  />
+          </view>
+          <view class="fl1 ml10">
+            <view class="fs14">{{ item.lessonName }}</view>
+            <view class="fs13 mt8 cor-999">
+              <text class="j-tag" style="background: #DDEEFF;color: #1A8CFE">{{ item.chapterIndex }}</text>
+              <text>{{ item.chapterName }}</text>
+            </view>
+            <view class="mt5 flex ai-c jc-sb fs13 cor-999">
+            <text>{{ item.author }}</text>
+            <text>{{ item.publicTime }}</text>
+          </view>
+          </view>
+        </view>
+      </u-list-item>
+    </u-list>
+    <u-empty v-else mode="list" text="暂无数据"></u-empty>
+  </view>
 </template>
 
 <script>
-  export default {
-    
+  import  { getUserLikeList } from '@/jtools/api/user'
+  import { mapState } from 'pinia'; //引入映射函数
+  import useUserStore from '@/jtools/store/user'; //引入store
+
+	export default {
+    computed: {
+      ...mapState(useUserStore, ['userInfo'])
+    },
+    data() {
+      return {
+        pageList: [],
+        total: 0,
+        queryParams: {
+          pageNo: 1,
+          pageSize: 20
+        }
+      }
+    },
+    mounted() {
+      this.handleSearch()
+    },
+    methods: {
+      scrolltolower() {
+        if (this.pageList.length < this.total) {
+          this.queryParams.pageNo++
+          this.getPageList()
+        }
+      },
+      handleSearch() {
+        this.pageList = []
+        this.queryParams.pageNo = 1
+        this.getPageList()
+      },
+      getPageList() {
+        const _this = this
+        const params = { ...this.queryParams, userId: this.userInfo.userId }
+        getUserLikeList(params).then(res => {
+          _this.pageList = [..._this.pageList, ...res.data.records]
+          _this.total = res.data.total
+        });
+      },
+      handleClick(chapter) {
+        uni.navigateTo({
+          url: `/pages/course/detail?id=${chapter.chapterId}`
+        });
+      }
+    }
   }
 </script>
 
 <style lang="scss" scoped>
-
+.j-tag {
+  padding: 1px 3px;
+  border-radius: 3px;
+  font-size: 12px;
+  line-height: 14px;
+  color: #fff;
+}
 </style>
\ No newline at end of file