diff --git a/config/baseUrl.js b/config/baseUrl.js index 3cb7ad14..7736c025 100644 --- a/config/baseUrl.js +++ b/config/baseUrl.js @@ -4,6 +4,7 @@ let socketUrl = ""; if (process.env.NODE_ENV === 'development') { // 开发环境 // baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川 + // baseUrl = "http://192.168.110.131:9200/pb/"; // 王亚男 baseUrl = "https://api.nuttyreading.com/"; // 线上正式 } else if (process.env.NODE_ENV === 'production') { // baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川 diff --git a/main.js b/main.js index 463559eb..bf174a7b 100644 --- a/main.js +++ b/main.js @@ -64,6 +64,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 commonCurriculumVideo from '@/pages/component/commonComponents/curriculumVideo.vue' Vue.component('common-curriculum-video', commonCurriculumVideo); import commonRichDetail from '@/pages/component/commonComponents/richDetail.vue' diff --git a/manifest.json b/manifest.json index 3cf647ec..89d102a2 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "太湖云医", "appid" : "__UNI__1B1584A", "description" : "太湖云医", - "versionName" : "1.0.12", - "versionCode" : 1012, + "versionName" : "1.0.14", + "versionCode" : 1014, "transformPx" : false, "sassImplementationName" : "node-sass", /* 5+App特有相关 */ diff --git a/package.json b/package.json index 1fa74347..cdc0c37a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "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", "lodash": "^4.17.21", "qs": "^6.14.0", diff --git a/pages.json b/pages.json index a032c2e9..5693af8c 100644 --- a/pages.json +++ b/pages.json @@ -373,6 +373,18 @@ } } }, + { + "path": "pages/order/refundDestination", + "style": { + "navigationBarTitleText": "钱款去向", + "enablePullDownRefresh": false, + "app-plus": { + "bounce": "none", + "titleNView": false, + "popGesture": "none" + } + } + }, { "path": "pages/goods/order", "style": { diff --git a/pages/component/commonComponents/selectGoods.vue b/pages/component/commonComponents/selectGoods.vue index 87efbd8d..2e2d8250 100644 --- a/pages/component/commonComponents/selectGoods.vue +++ b/pages/component/commonComponents/selectGoods.vue @@ -365,4 +365,8 @@ export default { /deep/.titleItem .related_courses_name{ width: calc(100%) !important; } + +.title_list { + margin-bottom: 20rpx; +} diff --git a/pages/order/index.vue b/pages/order/index.vue index 276164bc..26581066 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -11,11 +11,13 @@ 未付款 - 待发货 - 已发货 + 待发出 + 已发出 交易成功 交易失败 已过期 + 已退款 + 退款中 @@ -117,12 +119,24 @@ {{ item.jfDeduction }} 积分 - 下单时间：{{item.createTime}} - - 继续付款 - - - 申请售后 + 下单时间：{{ item.createTime }} + + + 继续付款 + + + 申请售后 + + + 钱款去向 + + + 申请退款 + @@ -157,6 +171,15 @@ export default { ...mapState(["userInfo"]), }, methods: { + noop() {}, + orderItemHasActions(item) { + if (!item) return false; + if (item.orderStatus == 0 && this.$platform == "android") return true; + if (item.orderStatus == 3) return true; + if (item.orderStatus == 6 || item.orderStatus == 7) return true; + if (item.refundableStatus === true) return true; + return false; + }, //获取数据 getData() { uni.showLoading({ @@ -277,6 +300,45 @@ export default { } } }, + goRefundDestination(row) { + uni.navigateTo({ + url: `/pages/order/refundDestination?orderId=${row.orderId}`, + }); + }, + confirmApplyRefund(row) { + uni.showModal({ + title: "申请退款", + content: "请确认是否提交退款申请？", + confirmText: "确认提交", + cancelText: "取消", + success: (res) => { + if (res.confirm) { + this.submitOrderRefund(row); + } + }, + }); + }, + submitOrderRefund(orderRow) { + this.$http.request({ + url: "book/buyOrder/refundOrder", + method: "POST", + data: { + orderId: orderRow.orderId, + }, + header: { + "Content-Type": "application/json", + }, + }).then((res)=> { + if (res.code === 0) { + this.$commonJS.showToast("申请退款成功"); + this.getData(); + return; + } + this.$commonJS.showToast(res.errMsg || "申请退款失败"); + }).catch(()=> { + this.$commonJS.showToast("申请退款失败"); + }); + }, }, } @@ -301,7 +363,7 @@ export default { .order_item{ display: block; width: 100%; - padding: 20rpx 30rpx; + padding: 20rpx 30rpx 88rpx; box-shadow: 0px 0px 10px 0px #a7bbe4; border-radius: 10rpx; margin-bottom: 20rpx; @@ -319,7 +381,7 @@ export default { } } -.item_top{ +.item_top { position: absolute; top: 70rpx; right: 30rpx; @@ -327,7 +389,7 @@ export default { font-weight: normal; color: red; } -.order_infor{ +.order_infor { margin-top: 40rpx; display: flex; align-items: center; @@ -355,7 +417,7 @@ export default { } } } -.order_time{ +.order_time { display: block; margin-top: 20rpx; font-size: 26rpx; @@ -377,10 +439,19 @@ export default { font-weight: bold; } } -.order_statusbtn{ +.order_actions_row { position: absolute; bottom: 20rpx; + left: 30rpx; right: 30rpx; + display: flex; + flex-wrap: wrap; + justify-content: flex-end; + align-items: center; + gap: 16rpx; +} +.order_statusbtn{ + flex-shrink: 0; padding: 0 15rpx; line-height: 45rpx; font-size: 24rpx; diff --git a/pages/order/infor.vue b/pages/order/infor.vue index 08581880..4fec3447 100644 --- a/pages/order/infor.vue +++ b/pages/order/infor.vue @@ -10,16 +10,22 @@ v-if="orderContet.orderStatus == 0">待支付 待发货 + v-if="orderContet.orderStatus == 1">待发出 待收货 + v-if="orderContet.orderStatus == 2">待收到 已完成 已超时 + 已退款 + 退款中 = 2 && @@ -551,6 +562,12 @@ view,uni-view { .orderState5 { background-color: #787878; } +.orderState6 { + background-color: #f56c6c; +} +.orderState7 { + background-color: #f56c6c; +} .guoqi { font-size: 28rpx; align-items: center; diff --git a/pages/order/refundDestination.vue b/pages/order/refundDestination.vue new file mode 100644 index 00000000..fa7232c4 --- /dev/null +++ b/pages/order/refundDestination.vue @@ -0,0 +1,26 @@ + + + + + diff --git a/pages/wallet/account.vue b/pages/wallet/account.vue index 5f20e60f..03978834 100644 --- a/pages/wallet/account.vue +++ b/pages/wallet/account.vue @@ -36,8 +36,7 @@ - {{ slotProps.row.orderType }}
{{ slotProps.row.productName }} - {{ slotProps.row.orderType }} + {{ slotProps.row.productName || slotProps.row.orderType}} + @@ -215,6 +214,12 @@ export default { .AC_List { overflow: hidden; + .title, + .AC_note, + .AC_mark { + word-break: break-word; + overflow-wrap: break-word; + } .left { width: calc(100% - 140rpx) !important; font-weight: 700; @@ -234,6 +239,19 @@ export default { font-weight: 700; color: #333; } + > view:first-child { + .left { + flex: 1; + min-width: 0; + width: auto !important; + float: none; + } + .right { + flex-shrink: 0; + float: none; + width: auto !important; + } + } .AC_title { font-size: 32rpx; diff --git a/static/common.scss b/static/common.scss index a6d14435..6af75c88 100644 --- a/static/common.scss +++ b/static/common.scss @@ -350,4 +350,8 @@ button::after { // border-bottom: 0.5px solid #dadbde; } } +} + +uni-text { + white-space: normal; } \ No newline at end of file diff --git a/unpackage/debug/iOS_debug.ipa b/unpackage/debug/iOS_debug.ipa index 22c0ff29..14925d68 100644 Binary files a/unpackage/debug/iOS_debug.ipa and b/unpackage/debug/iOS_debug.ipa differ