|
|
|
@ -635,50 +635,60 @@ |
|
|
|
</view> |
|
|
|
<!-- 评价弹出层 --> |
|
|
|
<uni-popup ref="evaluatePopup" background-color="#fff"> |
|
|
|
<view class="evaluate-content" @tap="$refs.evaluatePopup.close()"> |
|
|
|
<view class="evaluate-list" v-for="(item,index) in orderDetail.comments" :key="index"> |
|
|
|
<view class="eval-title"> |
|
|
|
<view class="eval-icon"> |
|
|
|
<img :src="item.createByIcon" alt="" /> |
|
|
|
</view> |
|
|
|
<view class="eval-name"> |
|
|
|
<view class="name1"> |
|
|
|
{{item.createByName}} |
|
|
|
</view> |
|
|
|
<view class="eval-time"> |
|
|
|
{{item.createTime}} |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="evaluate-content" @tap.stop> |
|
|
|
<view class="evaluate-popup-header"> |
|
|
|
<view> |
|
|
|
<view class="evaluate-popup-title">我的评价</view> |
|
|
|
<view class="evaluate-popup-subtitle">共 {{orderDetail.comments ? orderDetail.comments.length : 0}} 条评价</view> |
|
|
|
</view> |
|
|
|
<view class="eval-content"> |
|
|
|
<view style="display: flex;height: 50rpx;line-height: 50rpx;font-size: 24rpx;"> |
|
|
|
商品 |
|
|
|
<view style="padding: 12rpx 0 0 10rpx;"> |
|
|
|
<uni-rate v-model="item.score" size="12" /> |
|
|
|
<view class="evaluate-popup-close" @tap="$refs.evaluatePopup.close()">关闭</view> |
|
|
|
</view> |
|
|
|
<scroll-view scroll-y class="evaluate-scroll" @touchmove.stop> |
|
|
|
<view class="evaluate-list" v-for="(item,index) in orderDetail.comments" :key="index"> |
|
|
|
<view class="eval-title"> |
|
|
|
<view class="eval-icon"> |
|
|
|
<img :src="item.createByIcon" alt="" /> |
|
|
|
</view> |
|
|
|
<view class="eval-name"> |
|
|
|
<view class="name1"> |
|
|
|
{{item.createByName || '微信用户'}} |
|
|
|
</view> |
|
|
|
<view class="eval-time"> |
|
|
|
{{formatTimeText(item.createTime)}} |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="eval-target-tag" :class="{'worker': isWorkerEvaluate(item)}"> |
|
|
|
{{getEvaluateTargetText(item)}} |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="eval-text"> |
|
|
|
{{item.remark}} |
|
|
|
</view> |
|
|
|
<view class="eval-img"> |
|
|
|
<img @tap="largeImg" :src="item.picture" alt=""> |
|
|
|
</view> |
|
|
|
<view class="reply-card" :class="{'expanded': isExpanded}" |
|
|
|
v-for="(item1,index1) in item.comments" :key="index1"> |
|
|
|
<!-- 标题行：商家回复 + 展开/收起按钮 --> |
|
|
|
<view class="reply-header"> |
|
|
|
<!-- 回复内容区域（动态类控制展开/折叠） --> |
|
|
|
<view class="reply-content" :class="{ collapsed: !isExpanded, expanded: isExpanded }"> |
|
|
|
<text>{{item1.createByName}} : {{ item1.remark }}</text> |
|
|
|
<view class="eval-content"> |
|
|
|
<view class="eval-rate-row"> |
|
|
|
<text>{{getEvaluateTargetText(item)}}</text> |
|
|
|
<view class="eval-rate"> |
|
|
|
<uni-rate :value="Number(item.score || 0)" size="14" readonly /> |
|
|
|
</view> |
|
|
|
<view class="reply-expand-btn" @click="toggleReply"> |
|
|
|
<text v-if="!isExpanded">展开</text> |
|
|
|
<text v-else>收起</text> |
|
|
|
</view> |
|
|
|
<view class="eval-text"> |
|
|
|
{{item.remark || '暂无文字评价'}} |
|
|
|
</view> |
|
|
|
<view class="eval-img" v-if="item.picture"> |
|
|
|
<img @tap.stop="previewImage(item.picture)" :src="item.picture" alt=""> |
|
|
|
</view> |
|
|
|
<view class="reply-card" :class="{'expanded': isExpanded}" |
|
|
|
v-for="(item1,index1) in item.comments" :key="index1"> |
|
|
|
<view class="reply-header"> |
|
|
|
<view class="reply-content" :class="{ collapsed: !isExpanded, expanded: isExpanded }"> |
|
|
|
<text>{{item1.createByName}} : {{ item1.remark }}</text> |
|
|
|
</view> |
|
|
|
<view class="reply-expand-btn" @tap.stop="toggleReply"> |
|
|
|
<text v-if="!isExpanded">展开</text> |
|
|
|
<text v-else>收起</text> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</scroll-view> |
|
|
|
</view> |
|
|
|
</uni-popup> |
|
|
|
<!-- 核销二维码弹出层 --> |
|
|
|
@ -969,7 +979,8 @@ |
|
|
|
assignWorkerSelectionKey: '', |
|
|
|
payCountdownText: '60:00', |
|
|
|
payCountdownSeconds: 0, |
|
|
|
payCountdownTimer: null |
|
|
|
payCountdownTimer: null, |
|
|
|
isExpanded: false |
|
|
|
} |
|
|
|
}, |
|
|
|
computed: { |
|
|
|
@ -1175,6 +1186,13 @@ |
|
|
|
const second = String(date.getSeconds()).padStart(2, '0'); |
|
|
|
return `${year}-${month}-${day} ${hour}:${minute}:${second}`; |
|
|
|
}, |
|
|
|
isWorkerEvaluate(item) { |
|
|
|
const shopId = item && item.shopId ? String(item.shopId) : ''; |
|
|
|
return shopId.charAt(0).toUpperCase() == 'W'; |
|
|
|
}, |
|
|
|
getEvaluateTargetText(item) { |
|
|
|
return this.isWorkerEvaluate(item) ? '配送员评价' : '商家评价'; |
|
|
|
}, |
|
|
|
previewImage(url) { |
|
|
|
if (!url) return; |
|
|
|
uni.previewImage({ |
|
|
|
@ -1361,6 +1379,9 @@ |
|
|
|
this.tui.toast("暂无评价"); |
|
|
|
} |
|
|
|
}, |
|
|
|
toggleReply() { |
|
|
|
this.isExpanded = !this.isExpanded; |
|
|
|
}, |
|
|
|
orderStatus(item) { |
|
|
|
if (item.status == 0 || item.status == 10 || item.status == 2 || (item.status == 3 && item.deliveryType == |
|
|
|
1) || (item.status == 3 && item.deliveryType == 2) || item.status == 4) { |
|
|
|
@ -2231,7 +2252,13 @@ |
|
|
|
top: 0; |
|
|
|
left: 0; |
|
|
|
right: 0; |
|
|
|
z-index: 50; |
|
|
|
height: 430rpx; |
|
|
|
z-index: 999; |
|
|
|
background: |
|
|
|
radial-gradient(circle at 12% 8%, rgba(166, 255, 234, 0.48) 0, rgba(166, 255, 234, 0) 260rpx), |
|
|
|
radial-gradient(circle at 92% 18%, rgba(255, 221, 176, 0.26) 0, rgba(255, 221, 176, 0) 300rpx), |
|
|
|
linear-gradient(180deg, #ecfff7 0%, #f7fbf6 100%); |
|
|
|
overflow: visible; |
|
|
|
} |
|
|
|
|
|
|
|
.order-detail-header-content { |
|
|
|
@ -2239,6 +2266,7 @@ |
|
|
|
top: 190rpx; |
|
|
|
left: 0; |
|
|
|
width: 100%; |
|
|
|
z-index: 2; |
|
|
|
} |
|
|
|
|
|
|
|
.content { |
|
|
|
@ -2248,12 +2276,13 @@ |
|
|
|
} |
|
|
|
|
|
|
|
.order-detail-content { |
|
|
|
padding-top: 396rpx; |
|
|
|
padding-top: 430rpx; |
|
|
|
box-sizing: border-box; |
|
|
|
z-index: 1; |
|
|
|
} |
|
|
|
|
|
|
|
.order-detail-content-address-long { |
|
|
|
padding-top: 456rpx; |
|
|
|
padding-top: 490rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.title-sreach { |
|
|
|
@ -2425,8 +2454,10 @@ |
|
|
|
.order-status-card { |
|
|
|
background: |
|
|
|
radial-gradient(circle at 94% 4%, rgba(255, 221, 176, 0.2) 0, rgba(255, 221, 176, 0) 170rpx), |
|
|
|
linear-gradient(135deg, rgba(255, 255, 255, 0.98) 0%, rgba(244, 255, 251, 0.96) 100%); |
|
|
|
linear-gradient(135deg, #ffffff 0%, #f4fffb 100%); |
|
|
|
border-radius: 36rpx; |
|
|
|
position: relative; |
|
|
|
z-index: 3; |
|
|
|
} |
|
|
|
|
|
|
|
.goods-img { |
|
|
|
@ -2886,6 +2917,48 @@ |
|
|
|
|
|
|
|
.evaluate-content { |
|
|
|
background: linear-gradient(180deg, #ffffff 0%, #f7fffb 100%); |
|
|
|
width: 100vw; |
|
|
|
max-height: 78vh; |
|
|
|
padding: 34rpx 28rpx calc(28rpx + env(safe-area-inset-bottom)); |
|
|
|
box-sizing: border-box; |
|
|
|
overflow: hidden; |
|
|
|
} |
|
|
|
|
|
|
|
.evaluate-popup-header { |
|
|
|
display: flex; |
|
|
|
align-items: center; |
|
|
|
justify-content: space-between; |
|
|
|
padding: 0 8rpx 24rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.evaluate-popup-title { |
|
|
|
color: #243f38; |
|
|
|
font-size: 34rpx; |
|
|
|
font-weight: 900; |
|
|
|
line-height: 48rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.evaluate-popup-subtitle { |
|
|
|
margin-top: 6rpx; |
|
|
|
color: #7b8883; |
|
|
|
font-size: 24rpx; |
|
|
|
line-height: 34rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.evaluate-popup-close { |
|
|
|
height: 56rpx; |
|
|
|
padding: 0 24rpx; |
|
|
|
border-radius: 999rpx; |
|
|
|
background: rgba(0, 35, 28, 0.06); |
|
|
|
color: #243f38; |
|
|
|
font-size: 24rpx; |
|
|
|
font-weight: 700; |
|
|
|
line-height: 56rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.evaluate-scroll { |
|
|
|
max-height: 62vh; |
|
|
|
overflow: hidden; |
|
|
|
} |
|
|
|
|
|
|
|
.evaluate-list { |
|
|
|
@ -3353,15 +3426,23 @@ |
|
|
|
margin-top: 40rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.evaluate-list:first-child { |
|
|
|
margin-top: 0; |
|
|
|
} |
|
|
|
|
|
|
|
.eval-title { |
|
|
|
width: 100%; |
|
|
|
height: 80rpx; |
|
|
|
min-height: 80rpx; |
|
|
|
display: flex; |
|
|
|
align-items: center; |
|
|
|
} |
|
|
|
|
|
|
|
.eval-icon { |
|
|
|
height: 80rpx; |
|
|
|
width: 80rpx; |
|
|
|
flex-shrink: 0; |
|
|
|
border-radius: 50%; |
|
|
|
overflow: hidden; |
|
|
|
|
|
|
|
img { |
|
|
|
width: 100%; |
|
|
|
@ -3372,28 +3453,71 @@ |
|
|
|
|
|
|
|
.eval-name { |
|
|
|
margin-left: 20rpx; |
|
|
|
flex: 1; |
|
|
|
min-width: 0; |
|
|
|
} |
|
|
|
|
|
|
|
.name1 { |
|
|
|
font-size: 28rpx; |
|
|
|
line-height: 50rpx; |
|
|
|
font-weight: 700; |
|
|
|
color: #243f38; |
|
|
|
} |
|
|
|
|
|
|
|
.eval-time { |
|
|
|
color: #9aa6a2; |
|
|
|
font-size: 22rpx; |
|
|
|
line-height: 32rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.eval-target-tag { |
|
|
|
flex-shrink: 0; |
|
|
|
height: 44rpx; |
|
|
|
padding: 0 18rpx; |
|
|
|
border-radius: 999rpx; |
|
|
|
background: #f0fffa; |
|
|
|
color: #0f806d; |
|
|
|
font-size: 22rpx; |
|
|
|
font-weight: 700; |
|
|
|
line-height: 44rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.eval-target-tag.worker { |
|
|
|
background: #fff7e8; |
|
|
|
color: #d87800; |
|
|
|
} |
|
|
|
|
|
|
|
.eval-rate { |
|
|
|
display: flex; |
|
|
|
margin: 20rpx 0 0 100rpx; |
|
|
|
height: 48rpx; |
|
|
|
line-height: 40rpx; |
|
|
|
margin-left: 14rpx; |
|
|
|
padding-top: 4rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.eval-content { |
|
|
|
margin-left: 100rpx; |
|
|
|
margin: 22rpx 0 0 100rpx; |
|
|
|
font-size: 28rpx; |
|
|
|
color: #777; |
|
|
|
line-height: 48rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.eval-rate-row { |
|
|
|
display: flex; |
|
|
|
align-items: center; |
|
|
|
min-height: 50rpx; |
|
|
|
color: #243f38; |
|
|
|
font-size: 24rpx; |
|
|
|
font-weight: 700; |
|
|
|
line-height: 50rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.eval-text { |
|
|
|
margin-top: 10rpx; |
|
|
|
color: #4f5e59; |
|
|
|
font-size: 26rpx; |
|
|
|
line-height: 40rpx; |
|
|
|
word-break: break-all; |
|
|
|
} |
|
|
|
|
|
|
|
.eval-img { |
|
|
|
display: flex; |
|
|
|
width: 100%; |
|
|
|
@ -3401,13 +3525,54 @@ |
|
|
|
margin-top: 20rpx; |
|
|
|
|
|
|
|
img { |
|
|
|
width: 100rpx; |
|
|
|
height: 100rpx; |
|
|
|
width: 132rpx; |
|
|
|
height: 132rpx; |
|
|
|
background-size: 100%; |
|
|
|
margin-right: 20rpx; |
|
|
|
border-radius: 18rpx; |
|
|
|
object-fit: cover; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
.reply-card { |
|
|
|
margin-top: 18rpx; |
|
|
|
padding: 18rpx 20rpx; |
|
|
|
border-radius: 18rpx; |
|
|
|
background: rgba(255, 255, 255, 0.78); |
|
|
|
border: 1rpx solid rgba(0, 35, 28, 0.06); |
|
|
|
} |
|
|
|
|
|
|
|
.reply-header { |
|
|
|
display: flex; |
|
|
|
align-items: flex-start; |
|
|
|
} |
|
|
|
|
|
|
|
.reply-content { |
|
|
|
flex: 1; |
|
|
|
min-width: 0; |
|
|
|
color: #65736f; |
|
|
|
font-size: 24rpx; |
|
|
|
line-height: 36rpx; |
|
|
|
word-break: break-all; |
|
|
|
} |
|
|
|
|
|
|
|
.reply-content.collapsed { |
|
|
|
display: -webkit-box; |
|
|
|
overflow: hidden; |
|
|
|
text-overflow: ellipsis; |
|
|
|
-webkit-line-clamp: 2; |
|
|
|
-webkit-box-orient: vertical; |
|
|
|
} |
|
|
|
|
|
|
|
.reply-expand-btn { |
|
|
|
flex-shrink: 0; |
|
|
|
margin-left: 18rpx; |
|
|
|
color: #0f806d; |
|
|
|
font-size: 24rpx; |
|
|
|
font-weight: 700; |
|
|
|
line-height: 36rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.car-close { |
|
|
|
width: 60rpx; |
|
|
|
height: 60rpx; |
|
|
|
|
wangfukang
3 weeks ago