diff --git a/config/baseUrl.js b/config/baseUrl.js index 6c26018..fbab762 100644 --- a/config/baseUrl.js +++ b/config/baseUrl.js @@ -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/"; //线上正式 diff --git a/config/requestConfig.js b/config/requestConfig.js index b2eaa93..df2684d 100644 --- a/config/requestConfig.js +++ b/config/requestConfig.js @@ -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 }); } diff --git a/manifest.json b/manifest.json index 8bb9f92..584d555 100644 --- a/manifest.json +++ b/manifest.json @@ -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", diff --git a/package-lock.json b/package-lock.json index 8edabee..7d5d469 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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", diff --git a/package.json b/package.json index 2c1085f..9f87094 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/pages.json b/pages.json index 30ff843..6043397 100644 --- a/pages.json +++ b/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 } }, { diff --git a/pages/bookShop/orderList.vue b/pages/bookShop/orderList.vue index e1a2c62..4db1740 100644 --- a/pages/bookShop/orderList.vue +++ b/pages/bookShop/orderList.vue @@ -1,6 +1,6 @@