|
|
@@ -165,25 +165,55 @@
|
|
|
</view>
|
|
|
<image src="../merchant/static/images/dzbg.png" class="dzbg" />
|
|
|
</view>
|
|
|
+ <!-- &&state!=7订单未完成 -->
|
|
|
+ <view class="psfs dflex" v-if="deliverState" @tap="goUrl" :data-url="url">
|
|
|
+ <image src="/static/pages/images/psico.png" class="psico"></image>
|
|
|
+ <view class="flex">
|
|
|
+ <view v-if="deliverExtend == 1">{{ deliverState }}</view>
|
|
|
+ <view v-else>查看快递</view>
|
|
|
+ <text v-if="deliverExtend == 1">{{ deliverTime }}</text>
|
|
|
+ </view>
|
|
|
+ <image src="/static/pages/images/more.png" class="rico1"></image>
|
|
|
+ </view>
|
|
|
<!-- 物流配送 -->
|
|
|
<view class="lists ddlist">
|
|
|
<ul class="list bgfff" v-for="(items, index) in order.deliverList" :key="index">
|
|
|
- <view class="lis" v-for="(pro, index1) in items.extendDTOList" :key="index1">
|
|
|
- <view class="cimgs"><image :src="pro.pic" class="cimg" /></view>
|
|
|
- <view class="zhinfo">
|
|
|
- <view class="zhtit" v-text="pro.productName"></view>
|
|
|
- <view v-if="pro.specsList&&pro.specsList.length>0" class="guige">规格：
|
|
|
- <text v-for="(itemGuige, index) in pro.specsList" :key="index" class="guige" decode="true">{{itemGuige.value}}
|
|
|
- </text>
|
|
|
+ <view class="lis" style="display: block;" v-for="(pro, index1) in items.extendDTOList" :key="index1">
|
|
|
+ <view class="ddflex">
|
|
|
+ <view class="cimgs">
|
|
|
+ <image :src="pro.pic" class="cimg" />
|
|
|
</view>
|
|
|
- <view class="jiage">
|
|
|
- <view class="price">
|
|
|
- <span>￥</span>
|
|
|
- {{ pro.money }}
|
|
|
+ <view class="zhinfo">
|
|
|
+ <view class="zhtit" v-text="pro.productName"></view>
|
|
|
+ <view v-if="pro.specsList && pro.specsList.length > 0" class="guige">
|
|
|
+ <text v-for="(itemGuige, index) in pro.specsList" :key="index" class="guige"
|
|
|
+ decode="true">{{ itemGuige.value }} </text>
|
|
|
+ </view>
|
|
|
+ <view class="jiage">
|
|
|
+ <view class="price">
|
|
|
+ <span>￥</span>
|
|
|
+ {{ pro.money }}
|
|
|
+ </view>
|
|
|
+ <view class="num">×{{ pro.deliverQuantity }}</view>
|
|
|
+ </view>
|
|
|
+ <view class="pro-tui" v-if="pro.refundOrderList && pro.refundOrderList.length > 0">
|
|
|
+ <text>售后</text>
|
|
|
+ {{ pro.refundOrderList.length }}
|
|
|
</view>
|
|
|
- <view class="num">×{{ pro.deliverQuantity }}</view>
|
|
|
</view>
|
|
|
- <view class="pro-tui" v-if="pro.refundOrderList&&pro.refundOrderList.length>0"><text>售后</text>{{pro.refundOrderList.length}}</view>
|
|
|
+ </view>
|
|
|
+ <view
|
|
|
+ class="lis zhuang dflex"
|
|
|
+ v-if="pro.refundOrderList && pro.refundOrderList.length > 0"
|
|
|
+ v-for="(its, idx) in pro.refundOrderList"
|
|
|
+ @click="gorefundDet(its)"
|
|
|
+ :data-its="its"
|
|
|
+ :key="idx"
|
|
|
+ style="margin: 20rpx 0;"
|
|
|
+ >
|
|
|
+ <image src="/merchant/static/images/tuikuan.png" class="lis-img"></image>
|
|
|
+ <view class="flex r-txt">{{ refundHintText(its) }}</view>
|
|
|
+ <image src="/static/images/rico2.png" class="rico"></image>
|
|
|
</view>
|
|
|
</view>
|
|
|
</ul>
|
|
|
@@ -223,11 +253,8 @@
|
|
|
</ul>
|
|
|
<view class="bot">
|
|
|
<!-- <a href="javascript:;" class="sta-btn">取消</a> -->
|
|
|
- <view class="sta-btn" v-if="merchant.printer != 0 && (state == 3 || state == 4)" color="#FE0419" @click="orderPrinting(id, index)">打印小票</view>
|
|
|
<!-- <view class="sta-btn" @click="jumpUrl('refund?id=' + id)" v-if="state > 29 && state < 41 && state != 32">审核</view> -->
|
|
|
<view class="sta-btn" v-if="state == 3" @click="deliverGoods(id, merchantId, orderType)">确认发货</view>
|
|
|
- <view class="sta-btn" @click="send(id)" color="#FE0419" v-if="state === 4">通知取件</view>
|
|
|
- <view class="sta-btn" @click="deliver(id, index)" color="#FE0419" v-if="state === 4">已提货</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -285,7 +312,11 @@ export default {
|
|
|
}
|
|
|
],
|
|
|
refundTypenum: '',
|
|
|
- merchantId: ''
|
|
|
+ merchantId: '',
|
|
|
+ deliverId:'',
|
|
|
+ deliverState:'',
|
|
|
+ deliverExtend: 0,
|
|
|
+ url: '',
|
|
|
};
|
|
|
},
|
|
|
onLoad(opt) {
|
|
|
@@ -300,7 +331,16 @@ export default {
|
|
|
url: url
|
|
|
});
|
|
|
},
|
|
|
-
|
|
|
+ goUrl(e) {
|
|
|
+ // var dataset = e.currentTarget.dataset;
|
|
|
+ let url = e.currentTarget.dataset.url;
|
|
|
+ if (this.deliverState == '完成') {
|
|
|
+ url = url + '&isReceived=true';
|
|
|
+ }
|
|
|
+ uni.navigateTo({
|
|
|
+ url: url
|
|
|
+ });
|
|
|
+ },
|
|
|
deliverGoods() {
|
|
|
uni.navigateTo({
|
|
|
url: 'express?orderId=' + this.orderId + '&id=' + this.deliverId + '&supplierId=' + this.supplierId
|
|
|
@@ -309,7 +349,7 @@ export default {
|
|
|
// 确认发货
|
|
|
deliverGoods(id, merchantId, orderType) {
|
|
|
req.postRequest(
|
|
|
- '/api/order/deliverExtend',
|
|
|
+ '/admin/v1/orderMall/deliverExtend',
|
|
|
{
|
|
|
id: id
|
|
|
},
|
|
|
@@ -372,7 +412,7 @@ export default {
|
|
|
id: this.id
|
|
|
};
|
|
|
req.getRequest(
|
|
|
- '/api/order/detail',
|
|
|
+ '/admin/v1/orderMall/detail',
|
|
|
from,
|
|
|
data => {
|
|
|
this.order = data;
|
|
|
@@ -383,6 +423,9 @@ export default {
|
|
|
this.refundDetail();
|
|
|
// this.refundExpress();
|
|
|
}
|
|
|
+ if (data.mode != 1 && data.state >= 5 && data.state <= 7) {
|
|
|
+ this.deliverExtendFun();
|
|
|
+ }
|
|
|
this.isShowView = true;
|
|
|
},
|
|
|
true
|
|
|
@@ -392,7 +435,7 @@ export default {
|
|
|
//获取退货详情
|
|
|
refundDetail() {
|
|
|
req.getRequest(
|
|
|
- '/api/orderRefund/queryRefund',
|
|
|
+ '/admin/v1/orderRefund/queryRefund',
|
|
|
{
|
|
|
orderId: this.id
|
|
|
},
|
|
|
@@ -413,7 +456,33 @@ export default {
|
|
|
},
|
|
|
true
|
|
|
);
|
|
|
- }
|
|
|
+ },
|
|
|
+ // 获取分单发货的
|
|
|
+ deliverExtendFun() {
|
|
|
+ req.postRequest(
|
|
|
+ '/admin/v1/orderMall/deliverExtend',
|
|
|
+ {
|
|
|
+ id: this.id
|
|
|
+ },
|
|
|
+ res => {
|
|
|
+ let url;
|
|
|
+
|
|
|
+ if (res && res.length >= 2) {
|
|
|
+ url = '/merchant/deliverExtend/deliverExtend?orderId=' + this.id;
|
|
|
+ this.setData({
|
|
|
+ deliverExtend: 2,
|
|
|
+ url: url
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ url = '/merchant/logistics/logistics?id=' + this.deliverId + '&orderId=' + this.id;
|
|
|
+ this.setData({
|
|
|
+ deliverExtend: 1,
|
|
|
+ url: url
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+ );
|
|
|
+ },
|
|
|
}
|
|
|
};
|
|
|
</script>
|
xhj
