feat: 1. 增加学习累计时长显示；2. 修改学术传承分类；

- 将应用版本号更新至1.0.11 (versionCode 1011)
- 修改edu-core依赖为git仓库引用 (v1.0.11)
- 在课程详情页中添加catalogueId和courseId到课程信息
- 更新“我的”页面，增加用户资料展示，包括今日观看和总观看次数
- 新增样式文件mixin.scss，定义主题色
- 添加搜索图标

manifest.json

@@ -2,8 +2,8 @@
     "name" : "太湖云医",
     "appid" : "__UNI__1B1584A",
     "description" : "太湖云医",
-    "versionName" : "1.0.10",
+    "versionName" : "1.0.11",
-    "versionCode" : 1010,
+    "versionCode" : 1011,
     "transformPx" : false,
     "sassImplementationName" : "node-sass",
     /* 5+App特有相关 */

package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "edu-core": "file:../edu-core",
+    "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.11",
     "jquery": "^3.7.1",
     "lodash": "^4.17.21",
     "qs": "^6.14.0",

pages/curriculum/detail.vue

@@ -6,7 +6,7 @@
 			<CommonCourseVideo
         :video-list="videoArray"
         :current-index="currentVideoIndex !== null ? currentVideoIndex : 0"
-        :course="{courseTitle:options.navTitle, chapterTitle: curriculumData.title}"
+        :course="{courseTitle:options.navTitle, chapterTitle: curriculumData.title, catalogueId: curriculumData.catalogueId || '', courseId: curriculumData.courseId || ''}"
         :cover="options.curriculumImgUrl"
         :http="$http"
       />

pages/curriculum/index3.vue

@@ -422,7 +422,7 @@
 						});
 						
 						const joinedText = this.textList.join('/');
-						this.goBuyTitle = '购买'+joinedText+'VIP，即可畅享更多专属权益';
+						this.goBuyTitle = '购买'+joinedText+'VIP，即可畅享更多专属权益(不包含论坛)';
 					}
 				})
 			},

pages/my/index.vue

@@ -34,12 +34,17 @@
           </view>
         </view>
         <view class="userInfoBox">
-          <view class="name">{{
+          <view class="name">
-            userMes.nickname ? userMes.nickname : "未设置"
+						{{ userMes.nickname ? userMes.nickname : "未设置" }}
-          }}</view>
+						<text v-if="userMes.profile" class="user-profile">({{userMes.profile}})</text>
+					</view>
           <view class="phone" v-if="userMes.tel"
             >手机号：({{ userMes.tel }})</view
           >
+					<view>
+						<u-tag v-if="userMes.todayWatch" :text="userMes.todayWatch" size="mini" plain plainFill type="success" class="watch-time"></u-tag>
+						<u-tag v-if="userMes.totalWatch" :text="userMes.totalWatch" size="mini" plain plainFill class="watch-time"></u-tag>
+					</view>
         </view>
         <br clear="both" />
       </view>
@@ -256,6 +261,9 @@ export default {
       if (this.userInfo.id != undefined) {
         this.$http.post("common/user/getUserInfo").then((res) => {
           this.userMes = res.result;
+					this.userMes.profile = res.des || '';
+					this.userMes.todayWatch = res.todayWatch || '';
+					this.userMes.totalWatch = res.totalWatch || '';
         });
       }
     },
@@ -429,6 +437,12 @@ export default {
       line-height: 40rpx;
       color: #333;
     }
+		
+		.user-profile{
+			font-size: 28rpx;
+			font-weight: normal;
+			display: inline-block;
+		}
 
     .phone {
       font-size: 26rpx;
@@ -442,6 +456,11 @@ export default {
       margin-left: 10rpx;
       vertical-align: super;
     }
+		.watch-time {
+			margin-top: 10rpx;
+			display: inline-block;
+			margin-right: 10rpx;
+		}
   }
 }
 

style/mixin.scss

@@ -0,0 +1,3 @@
+@charset "utf-8";
+//主题色
+$themeColor: #5188e5;