chore: 更新应用版本至2.0.51并调整依赖配置
- 将应用版本从2.0.49提升至2.0.51 - 修改edu-core依赖为本地文件引用 - 更新多个页面的下拉刷新和底部加载逻辑 - 优化VIP权限描述,明确不包含论坛权益 - 调整部分页面样式以提升用户体验
This commit is contained in:
@@ -3,9 +3,9 @@ let socketUrl = "";
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
// 开发环境
|
||||
// baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试
|
||||
baseUrl = "https://api.nuttyreading.com/"; //线上正式'
|
||||
// baseUrl = "https://api.nuttyreading.com/"; //线上正式'
|
||||
// baseUrl = "http://192.168.110.100:9200/pb/"; //张川川
|
||||
// baseUrl = "http://192.168.110.131:9200/pb/"; // 王亚男
|
||||
baseUrl = "http://192.168.110.131:9200/pb/"; // 王亚男
|
||||
} else if (process.env.NODE_ENV === 'production') {
|
||||
// 生产环境11
|
||||
baseUrl = "https://api.nuttyreading.com/"; //线上正式
|
||||
|
||||
@@ -312,7 +312,8 @@ $http.dataFactory = async function(res) {
|
||||
// 返回错误的结果(catch接受数据)
|
||||
return Promise.reject({
|
||||
statusCode: 0,
|
||||
errMsg: "【request】" + (httpData.info || httpData.msg),
|
||||
// errMsg: "【request】" + (httpData.info || httpData.msg),
|
||||
errMsg: (httpData.info || httpData.msg),
|
||||
data: res.data
|
||||
});
|
||||
}
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
"src" : "图片路径"
|
||||
}
|
||||
],
|
||||
"versionName" : "2.0.49",
|
||||
"versionCode" : 2049,
|
||||
"versionName" : "2.0.51",
|
||||
"versionCode" : 2051,
|
||||
"sassImplementationName" : "node-sass",
|
||||
"app-plus" : {
|
||||
"nvueCompiler" : "uni-app",
|
||||
|
||||
20
package-lock.json
generated
20
package-lock.json
generated
@@ -11,7 +11,7 @@
|
||||
"dependencies": {
|
||||
"animate.css": "^4.1.1",
|
||||
"e-peanut": "file:",
|
||||
"edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.13",
|
||||
"edu-core": "file:../edu-core",
|
||||
"element-plus": "^2.9.6",
|
||||
"epubjs": "^0.3.93",
|
||||
"jquery": "^2.2.4",
|
||||
@@ -23,6 +23,11 @@
|
||||
" ../edu-core": {
|
||||
"extraneous": true
|
||||
},
|
||||
"../edu-core": {
|
||||
"version": "1.0.13",
|
||||
"license": "ISC",
|
||||
"devDependencies": {}
|
||||
},
|
||||
"node_modules/@babel/helper-string-parser": {
|
||||
"version": "7.27.1",
|
||||
"resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
|
||||
@@ -435,9 +440,8 @@
|
||||
"link": true
|
||||
},
|
||||
"node_modules/edu-core": {
|
||||
"version": "1.0.13",
|
||||
"resolved": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#b5ece8b8abfeba98428f6e2191efae3312b5036f",
|
||||
"license": "ISC"
|
||||
"resolved": "../edu-core",
|
||||
"link": true
|
||||
},
|
||||
"node_modules/element-plus": {
|
||||
"version": "2.11.5",
|
||||
@@ -4173,7 +4177,7 @@
|
||||
"requires": {
|
||||
"animate.css": "^4.1.1",
|
||||
"e-peanut": "file:",
|
||||
"edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.13",
|
||||
"edu-core": "file:../edu-core",
|
||||
"element-plus": "^2.9.6",
|
||||
"epubjs": "^0.3.93",
|
||||
"jquery": "^2.2.4",
|
||||
@@ -4494,8 +4498,7 @@
|
||||
}
|
||||
},
|
||||
"edu-core": {
|
||||
"version": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#b5ece8b8abfeba98428f6e2191efae3312b5036f",
|
||||
"from": "edu-core@git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.13"
|
||||
"version": "file:../edu-core"
|
||||
},
|
||||
"element-plus": {
|
||||
"version": "2.11.5",
|
||||
@@ -7256,8 +7259,7 @@
|
||||
}
|
||||
},
|
||||
"edu-core": {
|
||||
"version": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#b5ece8b8abfeba98428f6e2191efae3312b5036f",
|
||||
"from": "edu-core@git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.13"
|
||||
"version": "file:../edu-core"
|
||||
},
|
||||
"element-plus": {
|
||||
"version": "2.11.5",
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
"dependencies": {
|
||||
"animate.css": "^4.1.1",
|
||||
"e-peanut": "file:",
|
||||
"edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.13",
|
||||
"edu-core": "file:../edu-core",
|
||||
"element-plus": "^2.9.6",
|
||||
"epubjs": "^0.3.93",
|
||||
"jquery": "^2.2.4",
|
||||
|
||||
15
pages.json
15
pages.json
@@ -26,13 +26,7 @@
|
||||
"path": "pages/mine/vip/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "VIP",
|
||||
"enablePullDownRefresh": true,
|
||||
"onReachBottomDistance": 100,
|
||||
"app-plus": {
|
||||
"bounce": "none",
|
||||
"titleNView": false,
|
||||
"popGesture": "none"
|
||||
}
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -163,6 +157,7 @@
|
||||
"style": {
|
||||
"navigationBarTitleText": "我的订单",
|
||||
"enablePullDownRefresh": false,
|
||||
"onReachBottomDistance": 120,
|
||||
"app-plus": {
|
||||
"bounce": "none",
|
||||
"titleNView": false,
|
||||
@@ -391,7 +386,8 @@
|
||||
{
|
||||
"path": "pages/course/superVip",
|
||||
"style": {
|
||||
"navigationBarTitleText": "超V介绍"
|
||||
"navigationBarTitleText": "超V介绍",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -433,7 +429,8 @@
|
||||
{
|
||||
"path": "pages/course/outline",
|
||||
"style": {
|
||||
"navigationBarTitleText": "课程大纲"
|
||||
"navigationBarTitleText": "课程大纲",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<view
|
||||
class="container commonPageBox commonDetailPage"
|
||||
class="container commonPageBox commonDetailPage order-list-page"
|
||||
style="background-color: #f6f7fb"
|
||||
>
|
||||
<!-- 公共组件-每个页面必须引入 -->
|
||||
@@ -25,7 +25,6 @@
|
||||
<!-- <view v-if="ordersListTab == 1"> -->
|
||||
<view
|
||||
class="order_box"
|
||||
:style="`height: calc(100% - ${(80 + statusBarHeight) * 2}rpx);`"
|
||||
style="background-color: #f2f2f2"
|
||||
>
|
||||
<common-list
|
||||
@@ -721,14 +720,14 @@ export default {
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
uni.stopPullDownRefresh();
|
||||
|
||||
this.pagination.page = 1;
|
||||
this.newestpage = 1;
|
||||
this.newList = [];
|
||||
this.getBookList(this.ordersListTab, false);
|
||||
},
|
||||
onReachBottom() {
|
||||
this.newestpage++;
|
||||
this.getBookList(this.ordersListTab, false);
|
||||
// App 端由页面滚动触底加载;与 scroll-view 的 @lower 共用同一套分页逻辑
|
||||
this.onReachBottom1();
|
||||
},
|
||||
onLoad(e) {
|
||||
this.windowWidth = uni.getSystemInfoSync().windowWidth;
|
||||
@@ -791,8 +790,7 @@ export default {
|
||||
this.$commonJS.handleCopy(value, title);
|
||||
},
|
||||
onReachBottom1() {
|
||||
// 上拉加载
|
||||
// 当列表数量不大于或等于总数量,则再次调用接口请求数据
|
||||
// 上拉加载(H5 走 scroll-view @lower,App 走页面 onReachBottom)
|
||||
if (this.newList.length >= this.pagination.total) return;
|
||||
this.pagination.page++;
|
||||
this.getBookList(this.ordersListTab, false);
|
||||
@@ -1706,13 +1704,16 @@ export default {
|
||||
// padding: 0 !important;
|
||||
}
|
||||
|
||||
.commonDetailPage {
|
||||
.order-list-page.commonDetailPage {
|
||||
background-color: $themeBgColor;
|
||||
height: calc(100vh);
|
||||
height: auto !important;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
.order_box {
|
||||
height: auto;
|
||||
padding: 20rpx;
|
||||
padding-bottom: 40rpx;
|
||||
}
|
||||
|
||||
/deep/.order_box .list_item {
|
||||
|
||||
@@ -412,7 +412,7 @@
|
||||
},
|
||||
getMyQuestAnswer(chapterId) {
|
||||
$http.request({
|
||||
url: "/common/class/getQuesReplyInfo",
|
||||
url: "common/class/getQuesReplyInfo",
|
||||
method: "POST",
|
||||
data: {
|
||||
"relationId": chapterId,
|
||||
|
||||
@@ -1263,8 +1263,10 @@
|
||||
role = '心理学';
|
||||
}else if(type==9){
|
||||
role = '中西汇通学';
|
||||
}else if(type==10){
|
||||
role = '妇幼生殖';
|
||||
}
|
||||
this.goBuyTitle = '尊贵的'+role+'VIP,您的有效期到'+res.userVip.endTime;
|
||||
this.goBuyTitle = '尊贵的'+role+'VIP,您的有效期到'+res.userVip.endTime+'(不包含论坛)';
|
||||
this.goBuyType = 1;
|
||||
}else{ //否则没有开通vip
|
||||
this.goBuyTitle = '';
|
||||
@@ -1303,7 +1305,10 @@
|
||||
text = '心理学';
|
||||
}else if(item=='9'){
|
||||
text = '中西汇通学';
|
||||
}else if(item=='10'){
|
||||
text = '妇幼生殖';
|
||||
}
|
||||
|
||||
this.textList.push(text);
|
||||
});
|
||||
|
||||
|
||||
@@ -91,10 +91,7 @@
|
||||
// 隐藏原生的tabbar
|
||||
uni.hideTabBar();
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
uni.stopPullDownRefresh()
|
||||
},
|
||||
components: {
|
||||
components: {
|
||||
// musicPlay
|
||||
},
|
||||
//方法
|
||||
|
||||
@@ -35,13 +35,13 @@
|
||||
<view class="vip_qx">
|
||||
<text class="font_bold" style=" display: block;" v-if="item.type==1||item.type==2">超级VIP权限:</text>
|
||||
<text class="font_bold" style=" display: block;" v-else>VIP权限:</text>
|
||||
<view class="vip_qx_v" v-if="item.type==1">无限制观看吴门医述APP中医学、中西汇通学、针灸学、肿瘤学四个板块任意课程;</view>
|
||||
<view class="vip_qx_v" v-else-if="item.type==2">无限制观看众妙之门APP与心灵空间APP任意课程;</view>
|
||||
<view class="vip_qx_v" v-else-if="item.type==7">无限制观看众妙之门APP任意课程;</view>
|
||||
<view class="vip_qx_v" v-if="item.type==1">无限制观看吴门医述APP中医学、中西汇通学、针灸学、肿瘤学、妇幼生殖五个板块任意课程(不包含论坛);</view>
|
||||
<view class="vip_qx_v" v-else-if="item.type==2">无限制观看众妙之门APP与心灵空间APP任意课程(不包含论坛);</view>
|
||||
<view class="vip_qx_v" v-else-if="item.type==7">无限制观看众妙之门APP任意课程(不包含论坛);</view>
|
||||
<view class="vip_qx_v" v-else-if="item.type == 8"
|
||||
>无限制观看心灵空间APP任意课程;</view
|
||||
>无限制观看心灵空间APP任意课程(不包含论坛);</view
|
||||
>
|
||||
<view class="vip_qx_v" v-else>无限制观看吴门医述APP{{item.title.replace(/VIP/g, '')}}板块任意课程;</view>
|
||||
<view class="vip_qx_v" v-else>无限制观看吴门医述APP{{item.title.replace(/VIP/g, '')}}板块任意课程(不包含论坛);</view>
|
||||
|
||||
<view class="vip_qx_v">
|
||||
<text v-if="item.type==1||item.type==2">{{item.title.replace(/超级VIP/g, '')}}</text>
|
||||
|
||||
@@ -614,9 +614,12 @@
|
||||
}else if(item.type=='9'){
|
||||
item.text = '中西汇通学';
|
||||
this.textList.push(item.text);
|
||||
}else if(item.type=='1'){
|
||||
} else if (item.type == "10") {
|
||||
item.text = "妇幼生殖";
|
||||
this.textList.push(item.text);
|
||||
} else if(item.type=='1'){
|
||||
item.text = '医学S';
|
||||
}else if(item.type=='2'){
|
||||
} else if(item.type=='2'){
|
||||
item.text = '国学心理学S';
|
||||
}
|
||||
});
|
||||
|
||||
@@ -88,21 +88,21 @@
|
||||
>
|
||||
<text class="font_bold" style="display: block" v-else>VIP权限:</text>
|
||||
<view class="vip_qx_v" v-if="item.type == 1"
|
||||
>无限制观看吴门医述APP中医学、中西汇通学、针灸学、肿瘤学四个板块任意课程;</view
|
||||
>无限制观看吴门医述APP中医学、中西汇通学、针灸学、肿瘤学、妇幼生殖五个板块任意课程(不包含论坛);</view
|
||||
>
|
||||
<view class="vip_qx_v" v-else-if="item.type == 2"
|
||||
>无限制观看众妙之门APP与心灵空间APP任意课程;</view
|
||||
>无限制观看众妙之门APP与心灵空间APP任意课程(不包含论坛);</view
|
||||
>
|
||||
<view class="vip_qx_v" v-else-if="item.type == 7"
|
||||
>无限制观看众妙之门APP任意课程;</view
|
||||
>无限制观看众妙之门APP任意课程(不包含论坛);</view
|
||||
>
|
||||
<view class="vip_qx_v" v-else-if="item.type == 8"
|
||||
>无限制观看心灵空间APP任意课程;</view
|
||||
>无限制观看心灵空间APP任意课程(不包含论坛);</view
|
||||
>
|
||||
<view class="vip_qx_v" v-else
|
||||
>无限制观看吴门医述APP{{
|
||||
item.title.replace(/VIP/g, "")
|
||||
}}板块任意课程;</view
|
||||
}}板块任意课程(不包含论坛);</view
|
||||
>
|
||||
|
||||
<view class="vip_qx_v">
|
||||
|
||||
Reference in New Issue
Block a user