chore: 添加记录观看时长；个人资料添加身份项；

- 将应用版本从1.0.57更新至1.0.58
- 将edu-core依赖从本地路径更新至git仓库地址
- 调整baseUrl配置以使用线上正式环境
- 在用户信息页面中新增用户观看时间标签

config/baseUrl.js

@@ -2,8 +2,8 @@ let baseUrl = "";
 let socketUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
-	baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
+	// baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
-	// baseUrl = "https://api.nuttyreading.com/"; // 线上正式
+	baseUrl = "https://api.nuttyreading.com/"; // 线上正式
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境11	
 	//baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川

config/requestConfig.js

@@ -84,11 +84,12 @@ $http.getAliToken = function(callback) {
 //请求开始拦截器
 $http.requestStart = function(options) {
 	// console.log("请求开始", options);
-	if (options.load && options.data.loadAnimate != 'none') {
+	const resData = options.data || {}
+	if (options.load && resData.loadAnimate != 'none') {
 		//打开加载动画
 		store.commit("setLoadingShow", true);
 	}
-	if (options.data.loadAnimate == 'none') {
+	if (resData.loadAnimate == 'none') {
 		delete options.data.loadAnimate
 	}
 	// 图片、视频上传大小限制

manifest.json

@@ -13,8 +13,8 @@
             "src" : "图片路径"
         }
     ],
-    "versionName" : "1.0.57",
+    "versionName" : "1.0.58",
-    "versionCode" : 1057,
+    "versionCode" : 1058,
     "app-plus" : {
         "nvueCompiler" : "weex",
         "compatible" : {

package-lock.json

@@ -9,7 +9,7 @@
 			"version": "3.4.5",
 			"license": "MIT",
 			"dependencies": {
-				"edu-core": "file:../edu-core",
+				"edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.9",
 				"jquery": "^3.7.1",
 				"tcplayer.js": "^5.1.0"
 			},
@@ -19,6 +19,7 @@
 		},
 		"../edu-core": {
 			"version": "1.0.8",
+			"extraneous": true,
 			"license": "ISC",
 			"devDependencies": {}
 		},
@@ -73,8 +74,9 @@
 			"integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
 		},
 		"node_modules/edu-core": {
-			"resolved": "../edu-core",
+			"version": "1.0.8",
-			"link": true
+			"resolved": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#f815e7660e0645ca4393205b30986c4bc7aa4d9f",
+			"license": "ISC"
 		},
 		"node_modules/es5-shim": {
 			"version": "4.6.7",
@@ -397,7 +399,8 @@
 			"integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
 		},
 		"edu-core": {
-			"version": "file:../edu-core"
+			"version": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#f815e7660e0645ca4393205b30986c4bc7aa4d9f",
+			"from": "edu-core@git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.9"
 		},
 		"es5-shim": {
 			"version": "4.6.7",

package.json

@@ -21,7 +21,7 @@
 	},
 	"homepage": "https://github.com/dcloudio/hello-uniapp#readme",
 	"dependencies": {
-		"edu-core": "file:../edu-core",
+		"edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.9",
 		"jquery": "^3.7.1",
 		"tcplayer.js": "^5.1.0"
 	},

pages/curriculum/order/curriculum/detail.vue

@@ -12,7 +12,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/mine/mine/index.vue

@@ -65,9 +65,10 @@
         </view>
 
         <view class="userInfoBox" style="margin-left: 20rpx">
-          <view class="name"
+          <view class="name">
-            >昵称：{{ userMes.nickname ? userMes.nickname : "未设置" }}</view
+            {{ userMes.nickname ? userMes.nickname : "未设置" }}
-          >
+            <text v-if="userMes.profile" class="user-profile">({{userMes.profile}})</text>
+          </view>
           <view
             class="name"
             style="
@@ -91,13 +92,18 @@
               </view>
             </view>
           </template>
+
+          <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>
       </view>
 
       <view
         style="
           padding: 20rpx 20rpx 0;
-          margin-top: 50rpx;
+          margin-top: 25rpx;
           height: auto;
           display: flex;
           align-items: center;
@@ -637,6 +643,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 || '';
           if (this.userMes.userVip) {
           }
         });
@@ -792,30 +801,39 @@ export default {
 
   view {
     .name {
-      width: 100%;
+			width: 100%;
-      font-weight: bold;
+			font-weight: bold;
-      font-size: 32rpx;
+			font-size: 32rpx;
-      color: #333 !important;
+			color: #6990c7 !important;
-    }
+			line-height: 1.2;
+      margin-bottom: 6rpx;
+		}
 		
-    .phone {
+		.user-profile{
-      font-weight: bold;
+			font-size: 28rpx;
-      font-size: 28rpx;
+			font-weight: normal;
-      color: #333;
+			display: inline-block;
-    }
+		}
 
-    .tong {
+		.phone {
-      color: #999;
+			font-size: 26rpx;
-      font-size: 25upx;
+			color: #6990c7 !important;
-    }
+			margin: 6rpx 0;
+		}
 
-    .per_user_img {
+		.per_user_img {
-      display: inline-block;
+			display: inline-block;
-      width: 40upx;
+			width: 40upx;
-      height: 40upx;
+			height: 40upx;
-      margin-left: 10rpx;
+			margin-left: 10rpx;
-      vertical-align: super;
+			vertical-align: super;
-    }
+		}
+
+		.watch-time {
+			margin-top: 10rpx;
+			display: inline-block;
+			margin-right: 10rpx;
+		}
   }
 }
 
@@ -1033,9 +1051,9 @@ export default {
   background-color: transparent !important;
 }
 
-uni-page-body {
+// uni-page-body {
-  // background: #d8f8e4 !important;
+//   // background: #d8f8e4 !important;
-}
+// }
 
 .bg_top {
   padding: 0 30rpx;
@@ -1406,8 +1424,8 @@ uni-page-body {
     // margin-right: 10rpx;
   }
 
-  .zhanghu {
+  // .zhanghu {
-  }
+  // }
 
   .quanyi {
     border-top: 1rpx solid #f2d494;