From a64d538cd37a729a9f83a57145d39a603b09ba7e Mon Sep 17 00:00:00 2001 From: chenghuan Date: Sat, 28 Feb 2026 16:32:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=BF=83=E7=90=86?= =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3=E6=96=87=E6=A1=88=EF=BC=9B?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=9F=B3=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=89=88=E6=9C=AC=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增心理论坛页面及文章详情页 - 更新订单状态文案："待发货"改为"待发出"，"待收货"改为"待收到" - 统一修改"收货地址"相关文案为"收件地址" - 添加安卓应用包下载地址配置 - 更新依赖edu-core至v1.0.6版本 - 优化首页课程列表布局和样式 - 新增分享功能到我的页面 --- config/baseUrl.js | 4 +- main.js | 3 + manifest.json | 14 +- package-lock.json | 12 +- package.json | 2 +- pages.json | 28 +- .../commonComponents/address/edit.vue | 4 +- .../commonComponents/address/index.vue | 6 +- .../commonComponents/orderSubmit.vue | 8 +- pages/detail/orderLCont.vue | 20 +- pages/forum/details.vue | 71 + pages/forum/list.vue | 216 ++ pages/home/index.vue | 11 +- pages/my/index.vue | 52 +- pages/order/deliverDetail.vue | 4 +- pages/order/index.vue | 24 +- pages/wallet/recharge.vue | 2 +- static/icon/home_bg4.png | Bin 0 -> 21686 bytes uni_modules/cx-audio-play111.rar | Bin 99336 -> 0 bytes .../uview-ui/components/u-empty/u-empty.vue | 2 +- uni_modules/yingbing-video/changelog.md | 262 ++ .../components/modules/iframe.vue | 498 +++ .../components/modules/video.vue | 649 ++++ .../components/yb-video/yb-video.vue | 839 +++++ .../yingbing-video/yingbing-video.vue | 8 + uni_modules/yingbing-video/package.json | 78 + uni_modules/yingbing-video/readme.md | 1311 +++++++ .../static/html/css/yb-player-plugin.css | 102 + .../static/html/css/yb-player.css | 823 +++++ .../static/html/dist/yb-player-danmu.js | 671 ++++ .../static/html/dist/yb-player-gesture.js | 454 +++ .../static/html/dist/yb-player-mpeg.js | 406 +++ .../static/html/dist/yb-player-pano.js | 225 ++ .../static/html/dist/yb-player-subtitle.js | 440 +++ .../static/html/dist/yb-player.js | 3227 +++++++++++++++++ .../html/js/DeviceOrientationControls.js | 134 + .../static/html/js/OrbitControls.js | 1079 ++++++ .../yingbing-video/static/html/js/flv.min.js | 7 + .../yingbing-video/static/html/js/hls.min.js | 8 + .../static/html/js/jsmpeg.min.js | 1 + .../static/html/js/three.min.js | 6 + .../static/html/js/uni-webview-js@1.5.4.js | 1 + .../yingbing-video/static/html/video.html | 285 ++ uni_modules/z-paging/changelog.md | 74 +- .../z-paging-cell/z-paging-cell.vue | 47 + .../z-paging-empty-view.vue | 173 +- .../z-paging-swiper-item.vue | 106 +- .../z-paging-swiper/z-paging-swiper.vue | 132 +- .../components/z-paging-load-more.vue | 199 +- .../z-paging/components/z-paging-refresh.vue | 301 +- .../components/z-paging/config/index.js | 3 + .../components/z-paging/css/z-paging-main.css | 145 +- .../z-paging/css/z-paging-static.css | 42 +- .../z-paging/components/z-paging/i18n/en.json | 23 + .../components/z-paging/i18n/index.js | 8 + .../components/z-paging/i18n/zh-Hans.json | 23 + .../components/z-paging/i18n/zh-Hant.json | 23 + .../z-paging/js/hooks/useZPaging.js | 25 + .../z-paging/js/hooks/useZPagingComp.js | 25 + .../z-paging/js/modules/back-to-top.js | 125 + .../z-paging/js/modules/chat-record-mode.js | 153 + .../z-paging/js/modules/common-layout.js | 152 + .../z-paging/js/modules/data-handle.js | 746 ++++ .../components/z-paging/js/modules/empty.js | 144 + .../components/z-paging/js/modules/i18n.js | 113 + .../z-paging/js/modules/load-more.js | 374 ++ .../components/z-paging/js/modules/loading.js | 95 + .../components/z-paging/js/modules/nvue.js | 299 ++ .../z-paging/js/modules/refresher.js | 835 +++++ .../z-paging/js/modules/scroller.js | 616 ++++ .../z-paging/js/modules/virtual-list.js | 539 +++ .../components/z-paging/js/z-paging-config.js | 32 - .../z-paging/js/z-paging-constant.js | 19 + .../components/z-paging/js/z-paging-enum.js | 45 + .../components/z-paging/js/z-paging-i18n.js | 150 - .../z-paging/js/z-paging-interceptor.js | 97 + .../components/z-paging/js/z-paging-main.js | 2943 ++------------- .../components/z-paging/js/z-paging-mixin.js | 32 +- .../components/z-paging/js/z-paging-static.js | 34 +- .../components/z-paging/js/z-paging-utils.js | 331 +- .../z-paging/wxs/z-paging-refresh.wxs | 205 -- .../z-paging/wxs/z-paging-renderjs.js | 77 +- .../components/z-paging/wxs/z-paging-wxs.wxs | 402 +- .../z-paging/z-paging-load-more.vue | 156 - .../components/z-paging/z-paging-mixin.js | 35 - .../components/z-paging/z-paging-refresh.vue | 173 - .../components/z-paging/z-paging-refresh.wxs | 205 -- .../components/z-paging/z-paging-static.css | 28 - .../components/z-paging/z-paging-static.js | 18 - .../z-paging/components/z-paging/z-paging.vue | 1032 +++--- uni_modules/z-paging/package.json | 85 +- uni_modules/z-paging/readme.md | 250 +- uni_modules/z-paging/types/comps.d.ts | 11 + uni_modules/z-paging/types/comps/_common.d.ts | 9 + .../z-paging/types/comps/z-paging-cell.d.ts | 29 + .../types/comps/z-paging-empty-view.d.ts | 95 + .../types/comps/z-paging-swiper-item.d.ts | 95 + .../z-paging/types/comps/z-paging-swiper.d.ts | 89 + .../z-paging/types/comps/z-paging.d.ts | 2139 +++++++++++ uni_modules/z-paging/types/index.d.ts | 24 + 100 files changed, 21283 insertions(+), 5094 deletions(-) create mode 100644 pages/forum/details.vue create mode 100644 pages/forum/list.vue create mode 100644 static/icon/home_bg4.png delete mode 100644 uni_modules/cx-audio-play111.rar create mode 100644 uni_modules/yingbing-video/changelog.md create mode 100644 uni_modules/yingbing-video/components/modules/iframe.vue create mode 100644 uni_modules/yingbing-video/components/modules/video.vue create mode 100644 uni_modules/yingbing-video/components/yb-video/yb-video.vue create mode 100644 uni_modules/yingbing-video/components/yingbing-video/yingbing-video.vue create mode 100644 uni_modules/yingbing-video/package.json create mode 100644 uni_modules/yingbing-video/readme.md create mode 100644 uni_modules/yingbing-video/static/html/css/yb-player-plugin.css create mode 100644 uni_modules/yingbing-video/static/html/css/yb-player.css create mode 100644 uni_modules/yingbing-video/static/html/dist/yb-player-danmu.js create mode 100644 uni_modules/yingbing-video/static/html/dist/yb-player-gesture.js create mode 100644 uni_modules/yingbing-video/static/html/dist/yb-player-mpeg.js create mode 100644 uni_modules/yingbing-video/static/html/dist/yb-player-pano.js create mode 100644 uni_modules/yingbing-video/static/html/dist/yb-player-subtitle.js create mode 100644 uni_modules/yingbing-video/static/html/dist/yb-player.js create mode 100644 uni_modules/yingbing-video/static/html/js/DeviceOrientationControls.js create mode 100644 uni_modules/yingbing-video/static/html/js/OrbitControls.js create mode 100644 uni_modules/yingbing-video/static/html/js/flv.min.js create mode 100644 uni_modules/yingbing-video/static/html/js/hls.min.js create mode 100644 uni_modules/yingbing-video/static/html/js/jsmpeg.min.js create mode 100644 uni_modules/yingbing-video/static/html/js/three.min.js create mode 100644 uni_modules/yingbing-video/static/html/js/uni-webview-js@1.5.4.js create mode 100644 uni_modules/yingbing-video/static/html/video.html create mode 100644 uni_modules/z-paging/components/z-paging-cell/z-paging-cell.vue create mode 100644 uni_modules/z-paging/components/z-paging/config/index.js create mode 100644 uni_modules/z-paging/components/z-paging/i18n/en.json create mode 100644 uni_modules/z-paging/components/z-paging/i18n/index.js create mode 100644 uni_modules/z-paging/components/z-paging/i18n/zh-Hans.json create mode 100644 uni_modules/z-paging/components/z-paging/i18n/zh-Hant.json create mode 100644 uni_modules/z-paging/components/z-paging/js/hooks/useZPaging.js create mode 100644 uni_modules/z-paging/components/z-paging/js/hooks/useZPagingComp.js create mode 100644 uni_modules/z-paging/components/z-paging/js/modules/back-to-top.js create mode 100644 uni_modules/z-paging/components/z-paging/js/modules/chat-record-mode.js create mode 100644 uni_modules/z-paging/components/z-paging/js/modules/common-layout.js create mode 100644 uni_modules/z-paging/components/z-paging/js/modules/data-handle.js create mode 100644 uni_modules/z-paging/components/z-paging/js/modules/empty.js create mode 100644 uni_modules/z-paging/components/z-paging/js/modules/i18n.js create mode 100644 uni_modules/z-paging/components/z-paging/js/modules/load-more.js create mode 100644 uni_modules/z-paging/components/z-paging/js/modules/loading.js create mode 100644 uni_modules/z-paging/components/z-paging/js/modules/nvue.js create mode 100644 uni_modules/z-paging/components/z-paging/js/modules/refresher.js create mode 100644 uni_modules/z-paging/components/z-paging/js/modules/scroller.js create mode 100644 uni_modules/z-paging/components/z-paging/js/modules/virtual-list.js delete mode 100644 uni_modules/z-paging/components/z-paging/js/z-paging-config.js create mode 100644 uni_modules/z-paging/components/z-paging/js/z-paging-constant.js create mode 100644 uni_modules/z-paging/components/z-paging/js/z-paging-enum.js delete mode 100644 uni_modules/z-paging/components/z-paging/js/z-paging-i18n.js create mode 100644 uni_modules/z-paging/components/z-paging/js/z-paging-interceptor.js delete mode 100644 uni_modules/z-paging/components/z-paging/wxs/z-paging-refresh.wxs delete mode 100644 uni_modules/z-paging/components/z-paging/z-paging-load-more.vue delete mode 100644 uni_modules/z-paging/components/z-paging/z-paging-mixin.js delete mode 100644 uni_modules/z-paging/components/z-paging/z-paging-refresh.vue delete mode 100644 uni_modules/z-paging/components/z-paging/z-paging-refresh.wxs delete mode 100644 uni_modules/z-paging/components/z-paging/z-paging-static.css delete mode 100644 uni_modules/z-paging/components/z-paging/z-paging-static.js create mode 100644 uni_modules/z-paging/types/comps.d.ts create mode 100644 uni_modules/z-paging/types/comps/_common.d.ts create mode 100644 uni_modules/z-paging/types/comps/z-paging-cell.d.ts create mode 100644 uni_modules/z-paging/types/comps/z-paging-empty-view.d.ts create mode 100644 uni_modules/z-paging/types/comps/z-paging-swiper-item.d.ts create mode 100644 uni_modules/z-paging/types/comps/z-paging-swiper.d.ts create mode 100644 uni_modules/z-paging/types/comps/z-paging.d.ts create mode 100644 uni_modules/z-paging/types/index.d.ts diff --git a/config/baseUrl.js b/config/baseUrl.js index f725c58..46bddf3 100644 --- a/config/baseUrl.js +++ b/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 = "https://api.nuttyreading.com/"; //线上正式 + // baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川 + baseUrl = "https://api.nuttyreading.com/"; //线上正式 } else if (process.env.NODE_ENV === 'production') { // baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川 baseUrl = "https://api.nuttyreading.com/"; //线上正式 diff --git a/main.js b/main.js index 4f80067..807deb7 100644 --- a/main.js +++ b/main.js @@ -28,6 +28,9 @@ Vue.prototype.isShowHtml = store.state.loadingShow; Vue.prototype.$baseUrl = "https://api.nuttyreading.com/" //Vue.prototype.$baseUrl = 'http://192.168.110.100:9200/pb/' +// 安卓安卓包下载地址 +Vue.prototype.$apkUrl = "https://a.app.qq.com/o/simple.jsp?pkgname=com.nuttyreading.soul" // 应用宝 + //判断手机型号 uni.getSystemInfo({ success: function (res) { diff --git a/manifest.json b/manifest.json index fb11b2a..05381bd 100644 --- a/manifest.json +++ b/manifest.json @@ -2,18 +2,25 @@ "name" : "心灵空间", "appid" : "__UNI__BBBDFD2", "description" : "心灵空间", - "versionName" : "1.0.47", + "versionName" : "1.0.48", "sassImplementationName" : "node-sass", - "versionCode" : 1047, + "versionCode" : 1048, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { "usingComponents" : true, + "keepScreenOn" : true, "compatible" : { "ignoreVersion" : true }, "nvueStyleCompiler" : "uni-app", "compilerVersion" : 3, + "screenOrientation" : [ + "portrait-primary", + "portrait-secondary", + "landscape-primary", + "landscape-secondary" + ], "splashscreen" : { "alwaysShowBeforeRender" : true, "waiting" : true, @@ -53,7 +60,8 @@ "", "", "", - "" + "", + "" ], "minSdkVersion" : 23, "targetSdkVersion" : 35, diff --git a/package-lock.json b/package-lock.json index 08a38f6..ec9f34e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "MIT", "dependencies": { - "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.5", + "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.6", "jquery": "^3.7.1", "tcplayer.js": "^5.1.0" }, @@ -17,6 +17,12 @@ "postcss-px-to-viewport": "^1.1.1" } }, + "../edu-core": { + "version": "1.0.6", + "extraneous": true, + "license": "ISC", + "devDependencies": {} + }, "node_modules/babel-runtime": { "version": "6.26.0", "resolved": "https://registry.npmmirror.com/babel-runtime/-/babel-runtime-6.26.0.tgz", @@ -68,8 +74,8 @@ "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==" }, "node_modules/edu-core": { - "version": "1.0.5", - "resolved": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#4afd7e952360cf9d401a813fed9ce9e011e8fa76", + "version": "1.0.6", + "resolved": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#c1e7c25988e1b1ca91e8fd7a679df70339ef0fc3", "license": "ISC" }, "node_modules/es5-shim": { diff --git a/package.json b/package.json index c270bf5..14a646d 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ }, "homepage": "https://github.com/dcloudio/hello-uniapp#readme", "dependencies": { - "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.5", + "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.6", "jquery": "^3.7.1", "tcplayer.js": "^5.1.0" }, diff --git a/pages.json b/pages.json index 8d4d499..b74b9e4 100644 --- a/pages.json +++ b/pages.json @@ -461,7 +461,7 @@ { "path": "pages/component/commonComponents/address/index", "style": { - "navigationBarTitleText": "收货地址", + "navigationBarTitleText": "收件地址", "enablePullDownRefresh": false, "app-plus": { "bounce": "none", @@ -473,7 +473,7 @@ { "path": "pages/component/commonComponents/address/edit", "style": { - "navigationBarTitleText": "收货地址详情", + "navigationBarTitleText": "收件地址详情", "enablePullDownRefresh": false, "app-plus": { "bounce": "none", @@ -496,6 +496,30 @@ }, "disableScroll": true } + }, + { + "path": "pages/forum/list", + "style": { + "navigationBarTitleText": "心理论坛", + "enablePullDownRefresh": false, + "app-plus": { + "bounce": "none", + "titleNView": false, + "popGesture": "none" + } + } + }, + { + "path": "pages/forum/details", + "style": { + "navigationBarTitleText": "文章详情", + "enablePullDownRefresh": false, + "app-plus": { + "bounce": "none", + "titleNView": false, + "popGesture": "none" + } + } } ], "tabBar": { diff --git a/pages/component/commonComponents/address/edit.vue b/pages/component/commonComponents/address/edit.vue index 54c81b4..2f70721 100644 --- a/pages/component/commonComponents/address/edit.vue +++ b/pages/component/commonComponents/address/edit.vue @@ -1,7 +1,7 @@