feat: 添加记录观看时长;个人资料增加身份项;
- 将应用版本号更新至1.0.50 - 修改edu-core依赖为git引用,版本更新至1.0.9 - 优化用户资料页面,增加用户信息展示和编辑功能 - 更新请求配置,改善加载动画逻辑 - 添加新权限请求以支持外部存储访问
This commit is contained in:
@@ -82,11 +82,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
|
||||
}
|
||||
// 图片、视频上传大小限制
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
"name" : "心灵空间",
|
||||
"appid" : "__UNI__BBBDFD2",
|
||||
"description" : "心灵空间",
|
||||
"versionName" : "1.0.49",
|
||||
"versionName" : "1.0.50",
|
||||
"sassImplementationName" : "node-sass",
|
||||
"versionCode" : 1049,
|
||||
"versionCode" : 1050,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关 */
|
||||
"app-plus" : {
|
||||
@@ -61,12 +61,16 @@
|
||||
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
|
||||
"<uses-permission android:name=\"android.permission.INTERNET\"/>",
|
||||
"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
|
||||
"<uses-permission android:name=\"android.permission.WAKE_LOCK\" />"
|
||||
"<uses-permission android:name=\"android.permission.WAKE_LOCK\" />",
|
||||
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.READ_MEDIA_IMAGES\"/>"
|
||||
],
|
||||
"minSdkVersion" : 23,
|
||||
"targetSdkVersion" : 35,
|
||||
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
|
||||
"schemes" : "soulspace"
|
||||
"schemes" : "soulspace",
|
||||
"excludePermissions" : []
|
||||
},
|
||||
/* ios打包配置 */
|
||||
"ios" : {
|
||||
|
||||
10
package-lock.json
generated
10
package-lock.json
generated
@@ -9,7 +9,7 @@
|
||||
"version": "1.0.0",
|
||||
"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"
|
||||
},
|
||||
@@ -18,7 +18,8 @@
|
||||
}
|
||||
},
|
||||
"../edu-core": {
|
||||
"version": "1.0.6",
|
||||
"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",
|
||||
"link": true
|
||||
"version": "1.0.8",
|
||||
"resolved": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#f815e7660e0645ca4393205b30986c4bc7aa4d9f",
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/es5-shim": {
|
||||
"version": "4.6.7",
|
||||
|
||||
@@ -14,7 +14,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"
|
||||
},
|
||||
|
||||
@@ -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"
|
||||
/>
|
||||
|
||||
@@ -22,13 +22,20 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="userInfoBox">
|
||||
<view class="name">{{ userMes.nickname ? userMes.nickname : "未设置" }}</view>
|
||||
<view class="name">
|
||||
{{ userMes.nickname ? userMes.nickname : "未设置" }}
|
||||
<text v-if="userMes.profile" class="user-profile">({{userMes.profile}})</text>
|
||||
</view>
|
||||
<view class="phone" v-if="userMes.tel">手机号:({{ userMes.tel }})</view>
|
||||
<view class="vip_type" v-if="textList.length>0">
|
||||
<view class="vip_type_item" v-for="(item,index) in textList" :key="index">
|
||||
{{item}}<image src="@/static/icon/chao_vip.png"></image>
|
||||
</view>
|
||||
</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>
|
||||
@@ -318,6 +325,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 || '';
|
||||
});
|
||||
}
|
||||
},
|
||||
@@ -432,18 +442,25 @@ export default {
|
||||
view {
|
||||
|
||||
.name {
|
||||
font-weight: bold;
|
||||
width: 100%;
|
||||
font-size: 30rpx;
|
||||
line-height: 40rpx;
|
||||
font-weight: bold;
|
||||
font-size: 32rpx;
|
||||
color: #6990c7 !important;
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
||||
.user-profile{
|
||||
font-size: 28rpx;
|
||||
font-weight: normal;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.phone {
|
||||
font-size: 26rpx;
|
||||
line-height: 40rpx;
|
||||
color: #6990c7;
|
||||
color: #6990c7 !important;
|
||||
margin: 6rpx 0;
|
||||
}
|
||||
|
||||
.per_user_img {
|
||||
display: inline-block;
|
||||
width: 40upx;
|
||||
@@ -451,6 +468,12 @@ export default {
|
||||
margin-left: 10rpx;
|
||||
vertical-align: super;
|
||||
}
|
||||
|
||||
.watch-time {
|
||||
margin-top: 10rpx;
|
||||
display: inline-block;
|
||||
margin-right: 10rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -732,7 +755,7 @@ export default {
|
||||
}
|
||||
|
||||
.modal_vip{
|
||||
margin-top: 50rpx;
|
||||
margin-top: 25rpx;
|
||||
padding: 20rpx 20rpx 0;
|
||||
height: auto;
|
||||
display: flex;
|
||||
@@ -1044,9 +1067,9 @@ export default {
|
||||
width: 34rpx;
|
||||
height: 24rpx;
|
||||
}
|
||||
.vip_infor{
|
||||
// .vip_infor{
|
||||
|
||||
}
|
||||
// }
|
||||
.vip_infor_item{
|
||||
display: block;
|
||||
color: #fff;
|
||||
@@ -1058,9 +1081,9 @@ export default {
|
||||
.vip_infor_item text{
|
||||
color: #fff;
|
||||
}
|
||||
.vip_btn{
|
||||
// .vip_btn{
|
||||
|
||||
}
|
||||
// }
|
||||
.vip_btn button{
|
||||
background: none;
|
||||
border: 2rpx solid #294a97;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -828,8 +828,6 @@ export default {
|
||||
color: $themeColor;
|
||||
}
|
||||
|
||||
.emaPho {}
|
||||
|
||||
.emaPho>view {
|
||||
display: inline-block;
|
||||
padding: 10rpx 0;
|
||||
@@ -904,7 +902,8 @@ export default {
|
||||
border-radius: 50rpx;
|
||||
|
||||
&.active {
|
||||
@include theme("btn_bg") color: #fff;
|
||||
@include theme("btn_bg");
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
3
style/mixin.scss
Normal file
3
style/mixin.scss
Normal file
@@ -0,0 +1,3 @@
|
||||
@charset "utf-8";
|
||||
//主题色
|
||||
$themeColor: #7dc1f0;
|
||||
Reference in New Issue
Block a user