|
|
@@ -80,14 +80,43 @@
|
|
|
<view class="order-info-row">订单编号：{{orderData.orderCode}}</view>
|
|
|
<view class="order-info-row">创建时间：{{orderData.addOrderTime}}</view>
|
|
|
<view class="order-info-row" v-if="orderData.orderStatus > 1 && orderData.orderStatus != 6">支付时间：{{orderData.payTime ? orderData.payTime : orderData.addOrderTime}}</view>
|
|
|
- <view class="order-info-row" v-if="orderData.orderStatus > 2 && orderData.orderStatus != 6">发货时间：{{orderData.sendTime}}</view>
|
|
|
- <view class="order-info-row" v-if="orderData.orderStatus > 3 && orderData.orderStatus != 6">收货时间：{{orderData.confirmTime}}</view>
|
|
|
+ <view class="order-info-row" v-if="orderData.orderStatus > 2 && orderData.orderStatus != 6 && orderData.orderStatus != 4">发货时间：{{orderData.sendTime}}</view>
|
|
|
+ <view class="order-info-row" v-if="orderData.orderStatus > 3 && orderData.orderStatus != 6 && orderData.orderStatus != 4">收货时间：{{orderData.confirmTime}}</view>
|
|
|
<view class="order-info-row" v-if="orderData.orderStatus == 6">取消时间：{{orderData.cancelTime}}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <uni-goods-nav :fill="true" :options="[]" @click="" @buttonClick="orderHandle" class="order-handle" :buttonGroup="buttonGroup" />
|
|
|
- <u-modal v-model="modalShow" :content="modalContent" @confirm="submitHandle" :async-close="true" :show-cancel-button="true"></u-modal>
|
|
|
- <u-top-tips ref="uTips"></u-top-tips>
|
|
|
+ <view class="order-info-box">
|
|
|
+ <view class="info-title-box">
|
|
|
+ <view class="info-title">评价信息</view>
|
|
|
+ </view>
|
|
|
+ <view class="info-content-box">
|
|
|
+ <view class="assess-row">
|
|
|
+ <image class="assess-head" :src="orderData.merchantInfoResVO.headImg"></image>
|
|
|
+ <view class="assess-info">
|
|
|
+ <view class="assess-name">{{orderData.nickname}}</view>
|
|
|
+ <view class="assess-date">{{orderData.evaluateResVO.evaluateTime ? orderData.evaluateResVO.evaluateTime : ''}}</view>
|
|
|
+ <view class="assess-sore-box">
|
|
|
+ <u-rate v-model="orderData.evaluateResVO.score" active-color="#FFAE21" disabled></u-rate>
|
|
|
+ </view>
|
|
|
+ <view class="assess-text">{{orderData.evaluateResVO.evaluateContent ? orderData.evaluateResVO.evaluateContent : '暂无评价'}}</view>
|
|
|
+ <view class="assess-img-box">
|
|
|
+ <image class="img-col" :src="item.imgUrl" v-for="(item,i) in orderData.evaluateResVO.evaluateImgs" :key="i"></image>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="shop-reply-box" v-if="orderData.evaluateResVO.replyContent">
|
|
|
+ <view class="shop-head">
|
|
|
+ <view class="iconfont icondianpu"></view>
|
|
|
+ <view class="shop-name">店家回复</view>
|
|
|
+ </view>
|
|
|
+ <view class="shop-reply">{{orderData.evaluateResVO.replyContent}}</view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <!-- </view> -->
|
|
|
+ <uni-goods-nav :fill="true" :options="[]" @click="" @buttonClick="orderHandle" class="order-handle" :buttonGroup="buttonGroup" />
|
|
|
+ <u-modal v-model="modalShow" :content="modalContent" @confirm="submitHandle" :async-close="true" :show-cancel-button="true"></u-modal>
|
|
|
+ <u-top-tips ref="uTips"></u-top-tips>
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
|
@@ -159,20 +188,20 @@
|
|
|
}]
|
|
|
break;
|
|
|
case '2':
|
|
|
- var someVaule = this.orderData.merchantInfoResVO.products.some(v => {
|
|
|
+ var someVaule = this.orderData.merchantInfoResVO.products.some(v => {
|
|
|
Number(v.productType)
|
|
|
return v.productType == 1
|
|
|
})
|
|
|
- if (!someVaule) {
|
|
|
- this.buttonGroup = [{
|
|
|
- text: '申请售后',
|
|
|
- backgroundColor: '#75BD60',
|
|
|
- color: '#fff'
|
|
|
- }, {
|
|
|
- text: '自助采摘',
|
|
|
- backgroundColor: '#52A63A',
|
|
|
- color: '#fff'
|
|
|
- }]
|
|
|
+ if (!someVaule) {
|
|
|
+ this.buttonGroup = [{
|
|
|
+ text: '申请售后',
|
|
|
+ backgroundColor: '#75BD60',
|
|
|
+ color: '#fff'
|
|
|
+ }, {
|
|
|
+ text: '自助采摘',
|
|
|
+ backgroundColor: '#52A63A',
|
|
|
+ color: '#fff'
|
|
|
+ }]
|
|
|
} else {
|
|
|
this.buttonGroup = [{
|
|
|
text: '申请售后',
|
|
|
@@ -217,7 +246,7 @@
|
|
|
color: '#fff'
|
|
|
})
|
|
|
}
|
|
|
- this.getOrderType()
|
|
|
+ this.getOrderType()
|
|
|
}).catch(error => {
|
|
|
this.$refs.uTips.show({
|
|
|
title: error.data.msg,
|
|
|
@@ -230,7 +259,7 @@
|
|
|
methods: {
|
|
|
// 获取订单类型
|
|
|
getOrderType() {
|
|
|
- switch (this.orderData.orderStatus) {
|
|
|
+ switch (this.orderData.orderStatus) {
|
|
|
case 1:
|
|
|
this.orderType = {
|
|
|
title: '等待买家付款',
|
|
|
@@ -794,7 +823,129 @@
|
|
|
font-family: PingFang SC;
|
|
|
color: #333333;
|
|
|
line-height: 26px;
|
|
|
- word-break:break-all;
|
|
|
+ word-break: break-all;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ .assess-row {
|
|
|
+ width: calc(100% - 30px);
|
|
|
+ margin: 0 15px;
|
|
|
+ float: left;
|
|
|
+ // border-top: 1px solid #F6F6F6;
|
|
|
+ padding: 12px 0;
|
|
|
+
|
|
|
+ .assess-head {
|
|
|
+ width: 50px;
|
|
|
+ height: 50px;
|
|
|
+ float: left;
|
|
|
+ object-fit: cover;
|
|
|
+ border-radius: 50%;
|
|
|
+ }
|
|
|
+
|
|
|
+ .assess-info {
|
|
|
+ width: calc(100% - 62px);
|
|
|
+ margin-left: 12px;
|
|
|
+ float: left;
|
|
|
+ .assess-name {
|
|
|
+ height: 18px;
|
|
|
+ float: left;
|
|
|
+ line-height: 18px;
|
|
|
+ font-size: 15px;
|
|
|
+ font-family: PingFang SC;
|
|
|
+ font-weight: bold;
|
|
|
+ color: #343434;
|
|
|
+ }
|
|
|
+
|
|
|
+ .assess-date {
|
|
|
+ height: 18px;
|
|
|
+ float: right;
|
|
|
+ line-height: 18px;
|
|
|
+ font-size: 12px;
|
|
|
+ font-family: PingFang SC;
|
|
|
+ font-weight: bold;
|
|
|
+ color: #666666;
|
|
|
+ }
|
|
|
+
|
|
|
+ .assess-sore-box {
|
|
|
+ width: 100%;
|
|
|
+ height: 16px;
|
|
|
+ float: left;
|
|
|
+ margin: 6px 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ .assess-text {
|
|
|
+ width: 100%;
|
|
|
+ float: left;
|
|
|
+ font-size: 12px;
|
|
|
+ font-family: PingFang SC;
|
|
|
+ font-weight: bold;
|
|
|
+ color: #666666;
|
|
|
+ line-height: 16px;
|
|
|
+ margin: 8px 0 10px 0;
|
|
|
+ overflow: hidden;
|
|
|
+ text-overflow: ellipsis;
|
|
|
+ display: -webkit-box;
|
|
|
+ -webkit-line-clamp: 2;
|
|
|
+ -webkit-box-orient: vertical;
|
|
|
+ word-wrap: break-word;
|
|
|
+ }
|
|
|
+
|
|
|
+ .assess-img-box {
|
|
|
+ width: 100%;
|
|
|
+ float: left;
|
|
|
+ display: flex;
|
|
|
+
|
|
|
+ .img-col {
|
|
|
+ height: 60px;
|
|
|
+ width: 60px;
|
|
|
+ object-fit: cover;
|
|
|
+ margin: 0 10px 10px 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .shop-reply-box {
|
|
|
+ width: 100%;
|
|
|
+ float: left;
|
|
|
+ background: #F5F5F5;
|
|
|
+ border-radius: 5px;
|
|
|
+ margin-top: 10px;
|
|
|
+
|
|
|
+ .shop-head {
|
|
|
+ width: 100%;
|
|
|
+ height: 36px;
|
|
|
+ float: left;
|
|
|
+ box-sizing: border-box;
|
|
|
+ padding: 10px 12px;
|
|
|
+
|
|
|
+ .icondianpu {
|
|
|
+ width: 16px;
|
|
|
+ height: 16px;
|
|
|
+ float: left;
|
|
|
+ color: #52A63A;
|
|
|
+ font-size: 20px;
|
|
|
+ margin-right: 8px;
|
|
|
+ }
|
|
|
+
|
|
|
+ .shop-name {
|
|
|
+ height: 16px;
|
|
|
+ float: left;
|
|
|
+ font-size: 15px;
|
|
|
+ font-family: PingFang SC;
|
|
|
+ color: #52A63A;
|
|
|
+ line-height: 16px;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ .shop-reply {
|
|
|
+ width: 100%;
|
|
|
+ float: left;
|
|
|
+ box-sizing: border-box;
|
|
|
+ padding: 0 12px 12px 12px;
|
|
|
+ font-size: 12px;
|
|
|
+ font-family: PingFang SC;
|
|
|
+ color: #666666;
|
|
|
+ line-height: 16px;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
zhaoxw