diff --git a/package1/campus/campusRelease.vue b/package1/campus/campusRelease.vue index 8c6d2f2..b3b4095 100644 --- a/package1/campus/campusRelease.vue +++ b/package1/campus/campusRelease.vue @@ -461,7 +461,7 @@ .form-audit { position: relative; z-index: 1; margin: 18rpx 30rpx 0; } .mini-spinner { width: 26rpx; height: 26rpx; flex: 0 0 26rpx; border-radius: 50%; border: 4rpx solid #c9f2e8; border-top-color: #2fc49f; animation: spin .8s linear infinite; } .safe-tip { position: relative; z-index: 1; margin: 24rpx 30rpx; padding: 18rpx 22rpx; border-radius: 22rpx; background: rgba(235, 250, 246, .86); color: #6f837d; font-size: 23rpx; line-height: 1.6; } - .bottom-space { height: 240rpx; } + .bottom-space { height: 160rpx; } .submit-bar { position: fixed; left: 0; right: 0; bottom: 0; z-index: 30; padding: 20rpx 28rpx 34rpx; background: rgba(255,255,255,.98); box-shadow: 0 -8rpx 28rpx rgba(31, 67, 59, .08); } .submit-btn { height: 92rpx; line-height: 92rpx; text-align: center; border-radius: 999rpx; background: linear-gradient(135deg, #34d8ad, #25c6c5); color: #fff; font-size: 30rpx; font-weight: 900; box-shadow: 0 14rpx 30rpx rgba(38, 196, 169, .28); } .submit-btn.disabled { opacity: .65; } diff --git a/package1/campus/myCampusPosts.vue b/package1/campus/myCampusPosts.vue new file mode 100644 index 0000000..f8dfcd6 --- /dev/null +++ b/package1/campus/myCampusPosts.vue @@ -0,0 +1,457 @@ + + + + + diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue index 39b613d..ea041ec 100644 --- a/package1/order/orderDetail.vue +++ b/package1/order/orderDetail.vue @@ -718,7 +718,7 @@ - 请确认责任方,取消订单需要责任方同意!{{orderDetail.orderType == 3 ? '团员订单会一并退款!' : ''}} + 请确认责任方,取消订单需要责任方同意!{{(orderDetail.orderType == 3 && orderDetail.deliveryType == 1) ? '团员订单会一并退款!' : ''}} 请选择退款原因 @@ -813,7 +813,7 @@ 确认取消订单吗 符合无责取消条件,订单金额将按平台退款处理 - 团员订单会一并退款! + 团员订单会一并退款! diff --git a/package1/order/returnOrder.vue b/package1/order/returnOrder.vue index 329fdee..c5a91b2 100644 --- a/package1/order/returnOrder.vue +++ b/package1/order/returnOrder.vue @@ -213,11 +213,8 @@ - + - - - 选择售后原因 @@ -271,7 +268,10 @@ - 确认 + + 取消售后 + 确认 + @@ -401,6 +401,12 @@ openReasonPopup() { this.$refs.carPopup.open('bottom'); }, + cancelAfterSale() { + this.$refs.carPopup.close() + uni.redirectTo({ + url: '/package1/order/orderDetail?id=' + this.orderDetail.id + }) + }, chooseReturnType() { if(this.sellTime == 100){ this.tui.toast("请选择售后责任方"); @@ -1228,6 +1234,37 @@ overflow: hidden; } + .reason-popup-actions { + display: flex; + align-items: center; + gap: 20rpx; + padding: 24rpx 20rpx calc(24rpx + env(safe-area-inset-bottom)); + background: #fff; + box-sizing: border-box; + } + + .reason-popup-btn { + flex: 1; + height: 88rpx; + line-height: 88rpx; + border-radius: 100rpx; + text-align: center; + font-size: 28rpx; + font-weight: 700; + box-sizing: border-box; + } + + .reason-popup-cancel { + background: #fff; + border: 2rpx solid rgba(0, 35, 28, 0.12); + color: #243f38; + } + + .reason-popup-confirm { + background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1)); + color: #00231C; + } + .btn { width: 95%; height: 100rpx; diff --git a/package1/post/postDetail.vue b/package1/post/postDetail.vue index 4590844..aac9fee 100644 --- a/package1/post/postDetail.vue +++ b/package1/post/postDetail.vue @@ -61,9 +61,9 @@ {{item.createTime || ''}} - 回复 - 举报 - 删除 + 回复 + 举报 + 删除 @@ -143,7 +143,7 @@ commentHasMore() { return this.commentPageNum < this.commentTotalPages }, hasContact() { return !!(this.post && (this.post.contactWechat || this.post.contactPhone)) }, canUsePartnerChat() { - return !!(this.post && this.post.postType === 'partner' && this.post.partnerType !== 'game' && !this.post.mine) + return false } }, onLoad(options = {}) { @@ -406,10 +406,11 @@ .reply-list { margin-top: 12rpx; padding: 14rpx; background: #f7faf9; border-radius: 18rpx; color: #4d625d; font-size: 24rpx; } .reply-item { margin-bottom: 8rpx; } .reply-item text { color: #1b9278; } - .comment-actions { display: flex; gap: 24rpx; margin-top: 12rpx; color: #8a9994; font-size: 22rpx; } + .comment-actions { display: flex; align-items: center; gap: 24rpx; margin-top: 12rpx; color: #8a9994; font-size: 22rpx; } + .comment-action-text { color: #263d38; font-size: 26rpx; font-weight: 900; } .empty, .load-state { text-align: center; color: #8a9692; padding: 26rpx 0; font-size: 24rpx; } .bottom-space { height: 160rpx; } - .bottom-bar { position: fixed; left: 0; right: 0; bottom: 0; padding: 16rpx 24rpx 32rpx; display: flex; align-items: center; gap: 16rpx; background: rgba(255,255,255,.96); box-shadow: 0 -8rpx 28rpx rgba(31, 67, 59, .08); } + .bottom-bar { position: fixed; left: 0; right: 0; bottom: 0; padding: 16rpx 24rpx 32rpx; display: flex; align-items: center; justify-content: flex-end; gap: 16rpx; background: rgba(255,255,255,.96); box-shadow: 0 -8rpx 28rpx rgba(31, 67, 59, .08); } .bar-action { width: 96rpx; display: flex; flex-direction: column; align-items: center; color: #59706a; font-size: 21rpx; } .chat-btn { flex: 1; height: 82rpx; line-height: 82rpx; text-align: center; border-radius: 999rpx; background: #34c7a2; color: #fff; font-weight: 800; } .comment-popup { width: 620rpx; padding: 30rpx; border-radius: 30rpx; background: #fff; }