From de92a851b71a15d7d5a6d55d0a0e47ed26a89c80 Mon Sep 17 00:00:00 2001 From: chenghuan Date: Sat, 9 May 2026 11:13:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=E5=8F=8A=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在订单详情页新增退款状态显示，包括"已退款"和"退款中" - 新增退款目的地页面，用户可查看退款信息 - 更新应用版本号至1.0.58 - 更新依赖edu-core至v1.0.13 - 修改部分组件样式和逻辑，优化用户体验 --- config/baseUrl.js | 5 +- main.js | 3 + manifest.json | 4 +- package-lock.json | 12 +- package.json | 2 +- pages.json | 12 ++ .../commonComponents/selectGoods.vue | 8 +- pages/component/commonComponents/sticky.vue | 2 +- pages/detail/orderLCont.vue | 51 +++++++-- pages/detail/refundDestination.vue | 27 +++++ pages/goods/index.vue | 7 +- pages/order/index.vue | 104 ++++++++++++++++-- pages/wallet/account.vue | 22 +++- static/common.scss | 4 + 14 files changed, 223 insertions(+), 40 deletions(-) create mode 100644 pages/detail/refundDestination.vue diff --git a/config/baseUrl.js b/config/baseUrl.js index f725c58..36898be 100644 --- a/config/baseUrl.js +++ b/config/baseUrl.js @@ -2,8 +2,9 @@ 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/"; //线上正式 + // baseUrl = "http://192.168.110.131:9200/pb/"; // 王亚男 } 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 807deb7..c24fcf7 100644 --- a/main.js +++ b/main.js @@ -61,6 +61,9 @@ Vue.component('common-video', commonVideo); import CommonCourseVideo from 'edu-core/components/course-video' Vue.component('CommonCourseVideo', CommonCourseVideo); +import CommonRefundDestination from 'edu-core/components/order/refund-destination.vue' +Vue.component('common-refund-destination', CommonRefundDestination); + import commonGoodsList from '@/pages/component/commonComponents/goodsList.vue' Vue.component('common-goods-list', commonGoodsList); import commonCurriculumList from '@/pages/component/commonComponents/curriculum.vue' diff --git a/manifest.json b/manifest.json index 4ed35c9..83cce9f 100644 --- a/manifest.json +++ b/manifest.json @@ -2,9 +2,9 @@ "name" : "心灵空间", "appid" : "__UNI__BBBDFD2", "description" : "心灵空间", - "versionName" : "1.0.55", + "versionName" : "1.0.58", "sassImplementationName" : "node-sass", - "versionCode" : 1055, + "versionCode" : 1058, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/package-lock.json b/package-lock.json index 7305228..e650896 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.12", + "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.13", "jquery": "^3.7.1", "tcplayer.js": "^5.1.0" }, @@ -17,12 +17,6 @@ "postcss-px-to-viewport": "^1.1.1" } }, - "../edu-core": { - "version": "1.0.11", - "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", @@ -74,8 +68,8 @@ "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==" }, "node_modules/edu-core": { - "version": "1.0.12", - "resolved": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#ea1dca213de69ac5a01a44a352ab33024edd2577", + "version": "1.0.13", + "resolved": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#b5ece8b8abfeba98428f6e2191efae3312b5036f", "license": "ISC" }, "node_modules/es5-shim": { diff --git a/package.json b/package.json index a53c4da..04b78f2 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.12", + "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.13", "jquery": "^3.7.1", "tcplayer.js": "^5.1.0" }, diff --git a/pages.json b/pages.json index b74b9e4..1d2aed8 100644 --- a/pages.json +++ b/pages.json @@ -194,6 +194,18 @@ } } }, + { + "path": "pages/detail/refundDestination", + "style": { + "navigationBarTitleText": "钱款去向", + "enablePullDownRefresh": false, + "app-plus": { + "bounce": "none", + "titleNView": false, + "popGesture": "none" + } + } + }, { "path": "pages/my/index", "style": { diff --git a/pages/component/commonComponents/selectGoods.vue b/pages/component/commonComponents/selectGoods.vue index 6b10a57..93a3868 100644 --- a/pages/component/commonComponents/selectGoods.vue +++ b/pages/component/commonComponents/selectGoods.vue @@ -180,9 +180,9 @@ export default { gotoDetail(v) { this.$emit("hancleClick", v); }, - onHandleClickBuy() { + onHandleClickBuy(e) { this.$emit("selectGoodsData", this.selectGoodsData); - this.$emit("onHandleClickBuy"); + this.$emit("onHandleClickBuy", e); }, }, onBackPress() { @@ -362,4 +362,8 @@ export default { color: #ff1f00; font-weight: bold; } + +.title_list { + margin-bottom: 20rpx; +} diff --git a/pages/component/commonComponents/sticky.vue b/pages/component/commonComponents/sticky.vue index b8be7d8..70c1652 100644 --- a/pages/component/commonComponents/sticky.vue +++ b/pages/component/commonComponents/sticky.vue @@ -1,5 +1,5 @@