Commit 6429b08f by 肖康

Merge branch 'XK_order_ship20210120'

# Conflicts:
#	view/0.js
#	view/1.js
#	view/10.js
#	view/11.js
#	view/12.js
#	view/13.js
#	view/14.js
#	view/15.js
#	view/16.js
#	view/17.js
#	view/18.js
#	view/19.js
#	view/2.js
#	view/20.js
#	view/21.js
#	view/22.js
#	view/23.js
#	view/24.js
#	view/25.js
#	view/26.js
#	view/27.js
#	view/28.js
#	view/29.js
#	view/3.js
#	view/30.js
#	view/31.js
#	view/32.js
#	view/33.js
#	view/34.js
#	view/35.js
#	view/36.js
#	view/37.js
#	view/38.js
#	view/39.js
#	view/4.js
#	view/40.js
#	view/41.js
#	view/42.js
#	view/43.js
#	view/44.js
#	view/45.js
#	view/46.js
#	view/47.js
#	view/48.js
#	view/49.js
#	view/5.js
#	view/50.js
#	view/51.js
#	view/52.js
#	view/53.js
#	view/54.js
#	view/55.js
#	view/56.js
#	view/57.js
#	view/58.js
#	view/59.js
#	view/6.js
#	view/60.js
#	view/61.js
#	view/62.js
#	view/63.js
#	view/64.js
#	view/7.js
#	view/8.js
#	view/9.js
#	view/app.js
#	view/index.html
parents b10a4c03 131d332b
Showing with 96 additions and 29 deletions
...@@ -37,7 +37,25 @@ ...@@ -37,7 +37,25 @@
white-space: nowrap; white-space: nowrap;
} }
i{font-size: 12px;color:#000!important;position: absolute;right:0;} i{font-size: 12px;color:#000!important;position: absolute;right:0;}
.fhxh{
width: 1.52rem;
height: 0.53rem;
line-height: 0.53rem;
text-align: center;
color:#6f6f6f;
background: #FFFFFF;
border-radius: 0.3rem;
border: 0.01rem solid #D2D2D2;
float: right;
margin-top: 0.12rem;
position: relative;
left:0.5rem;
}
}
&.wlnobt{
padding-bottom: 0.1rem;
padding-top: 0.1rem;
} }
} }
.t2-box{ .t2-box{
......
.order-detail{padding-top:.28rem;padding-bottom:1.32rem}.order-detail .order-top{width:9.6rem;background:#FFFFFF;box-shadow:0 0 .09rem 0 rgba(180,202,211,0.38);border-radius:.08rem;margin:0 auto;padding:.28rem;padding-bottom:.51rem;box-sizing:border-box}.order-detail .order-top .t1-box{display:flex;font-size:12px;padding-bottom:.36rem;border-bottom:1px solid #e5e5e5;line-height:.83rem}.order-detail .order-top .t1-box img{height:.83rem;width:.83rem;margin-right:.4rem}.order-detail .order-top .t1-box .ordersta{height:.83rem;color:#333}.order-detail .order-top .t1-box .ordersta .van-count-down{font-size:12px;color:#FF693D;display:inline}.order-detail .order-top .t1-box.wl{position:relative;cursor:pointer}.order-detail .order-top .t1-box.wl .ordersta{width:6.4rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.order-detail .order-top .t1-box.wl i{font-size:12px;color:#000 !important;position:absolute;right:0}.order-detail .order-top .t2-box{padding-top:.4rem;line-height:.6rem;color:#6F6F6F;font-size:12px;margin-bottom:.1rem}.order-detail .order-top .t2-box font{display:inline-block;cursor:pointer;width:1.12rem;height:.45rem;background:#F9F9F9;border-radius:.03rem;border:.01rem solid #E5E5E5;color:#333;text-align:center;line-height:.45rem;margin-right:.2rem}.order-detail .order-top .t3-box{padding-top:.2rem}.order-detail .order-top .t3-box .t2-gro{height:.6rem;line-height:.6rem;color:#333}.order-detail .order-top .t3-box .cp-t{display:flex;border-top:1px solid #e5e5e5;padding-top:.32rem;margin-top:.71rem;margin-bottom:.71rem}.order-detail .order-top .t3-box .cp-t img{width:1.07rem;height:1.07rem;border-radius:100%;margin-right:.3rem}.order-detail .order-top .t3-box .cp-t .ri-text{color:#6F6F6F;position:relative}.order-detail .order-top .t3-box .cp-t .ri-text p{line-height:.6rem}.order-detail .order-top .show-detail-btn{width:2.53rem;height:.61rem;background:#FFFFFF;border-radius:.3rem;border:1px solid #D2D2D2;text-align:center;line-height:.61rem;color:#6f6f6f;font-size:12px;margin:0 auto}.order-detail .order-top .show-detail-btn i{font-size:12px;margin-left:.12rem}.order-detail .zpbox{width:9.6rem;background:#FFFFFF;box-shadow:0 0 .09rem 0 rgba(180,202,211,0.38);border-radius:.08rem;border:1px solid #7D1BF0;margin:0 auto;margin-top:.25rem;box-sizing:border-box;padding-left:.27rem;padding-bottom:.25rem}.order-detail .zpbox .zptitle{width:96px;height:.65rem;background:url(../../images/user/zp.png) no-repeat;background-size:100% 100%;color:#fff;font-size:14px;line-height:.65rem;padding-left:30px;box-sizing:border-box;margin-bottom:10px}.order-detail .zpbox .zp-group{font-size:12px}.order-detail .zpbox .zp-group div{color:#333;height:.8rem;line-height:.8rem}.order-detail .zpbox .zp-group div span{width:70%}.order-detail .zpbox .zp-group div font{width:30%;box-sizing:border-box;padding-left:10px}.order-detail .zpbox .zp-group p{color:#6f6f6f}.order-detail .order-sec{width:94%;margin:0 auto;margin-top:.25rem}.order-detail .order-sec .oda-group{display:block;padding:.47rem .28rem;background:#FFFFFF;box-shadow:0 0 .09rem 0 rgba(180,202,211,0.38);border-radius:.08rem;margin-bottom:.35rem}.order-detail .order-sec .oda-group .title-goods{color:#333;font-size:15px;margin-bottom:.33rem}.order-detail .order-sec .oda-group .title-goods span{max-width:8rem;display:inline-block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;vertical-align:middle}.order-detail .order-sec .oda-group .title-goods i{color:#000;font-size:12px;margin-left:.33rem;position:relative;top:.02rem}.order-detail .order-sec .oda-group .attrs{color:#6F6F6F;font-size:12px}.order-detail .order-sec .oda-group .attrs .f-333{color:#333}.order-detail .order-sec .oda-group .attrs .group-trr{line-height:.66rem}.order-detail .order-sec .oda-group .attrs .group-trr div{width:50%}.order-detail .order-footer{width:9.4rem;height:1.32rem;line-height:1.32rem;background:#FFFFFF;border:.01rem solid #D6D6D6;position:fixed;bottom:0px;padding-left:.6rem;left:0px;color:#666;font-size:12px}.order-detail .order-footer font{color:#F3632C}.order-detail .order-footer span{color:#F3632C;font-weight:bold;font-size:21px}.order-detail .order-footer .fl{width:6.32rem;height:1.32rem;overflow:hidden;white-space:nowrap}.order-detail .order-footer .fr{width:3.08rem;height:1.32rem;text-align:center;color:#fff;background:#F3632C;font-size:18px} .order-detail{padding-top:.28rem;padding-bottom:1.32rem}.order-detail .order-top{width:9.6rem;background:#FFFFFF;box-shadow:0 0 .09rem 0 rgba(180,202,211,0.38);border-radius:.08rem;margin:0 auto;padding:.28rem;padding-bottom:.51rem;box-sizing:border-box}.order-detail .order-top .t1-box{display:flex;font-size:12px;padding-bottom:.36rem;border-bottom:1px solid #e5e5e5;line-height:.83rem}.order-detail .order-top .t1-box img{height:.83rem;width:.83rem;margin-right:.4rem}.order-detail .order-top .t1-box .ordersta{height:.83rem;color:#333}.order-detail .order-top .t1-box .ordersta .van-count-down{font-size:12px;color:#FF693D;display:inline}.order-detail .order-top .t1-box.wl{position:relative;cursor:pointer}.order-detail .order-top .t1-box.wl .ordersta{width:6.4rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.order-detail .order-top .t1-box.wl i{font-size:12px;color:#000 !important;position:absolute;right:0}.order-detail .order-top .t1-box.wl .fhxh{width:1.52rem;height:.53rem;line-height:.53rem;text-align:center;color:#6f6f6f;background:#FFFFFF;border-radius:.3rem;border:.01rem solid #D2D2D2;float:right;margin-top:.12rem;position:relative;left:.5rem}.order-detail .order-top .t1-box.wlnobt{padding-bottom:.1rem;padding-top:.1rem}.order-detail .order-top .t2-box{padding-top:.4rem;line-height:.6rem;color:#6F6F6F;font-size:12px;margin-bottom:.1rem}.order-detail .order-top .t2-box font{display:inline-block;cursor:pointer;width:1.12rem;height:.45rem;background:#F9F9F9;border-radius:.03rem;border:.01rem solid #E5E5E5;color:#333;text-align:center;line-height:.45rem;margin-right:.2rem}.order-detail .order-top .t3-box{padding-top:.2rem}.order-detail .order-top .t3-box .t2-gro{height:.6rem;line-height:.6rem;color:#333}.order-detail .order-top .t3-box .cp-t{display:flex;border-top:1px solid #e5e5e5;padding-top:.32rem;margin-top:.71rem;margin-bottom:.71rem}.order-detail .order-top .t3-box .cp-t img{width:1.07rem;height:1.07rem;border-radius:100%;margin-right:.3rem}.order-detail .order-top .t3-box .cp-t .ri-text{color:#6F6F6F;position:relative}.order-detail .order-top .t3-box .cp-t .ri-text p{line-height:.6rem}.order-detail .order-top .show-detail-btn{width:2.53rem;height:.61rem;background:#FFFFFF;border-radius:.3rem;border:1px solid #D2D2D2;text-align:center;line-height:.61rem;color:#6f6f6f;font-size:12px;margin:0 auto}.order-detail .order-top .show-detail-btn i{font-size:12px;margin-left:.12rem}.order-detail .zpbox{width:9.6rem;background:#FFFFFF;box-shadow:0 0 .09rem 0 rgba(180,202,211,0.38);border-radius:.08rem;border:1px solid #7D1BF0;margin:0 auto;margin-top:.25rem;box-sizing:border-box;padding-left:.27rem;padding-bottom:.25rem}.order-detail .zpbox .zptitle{width:96px;height:.65rem;background:url(../../images/user/zp.png) no-repeat;background-size:100% 100%;color:#fff;font-size:14px;line-height:.65rem;padding-left:30px;box-sizing:border-box;margin-bottom:10px}.order-detail .zpbox .zp-group{font-size:12px}.order-detail .zpbox .zp-group div{color:#333;height:.8rem;line-height:.8rem}.order-detail .zpbox .zp-group div span{width:70%}.order-detail .zpbox .zp-group div font{width:30%;box-sizing:border-box;padding-left:10px}.order-detail .zpbox .zp-group p{color:#6f6f6f}.order-detail .order-sec{width:94%;margin:0 auto;margin-top:.25rem}.order-detail .order-sec .oda-group{display:block;padding:.47rem .28rem;background:#FFFFFF;box-shadow:0 0 .09rem 0 rgba(180,202,211,0.38);border-radius:.08rem;margin-bottom:.35rem}.order-detail .order-sec .oda-group .title-goods{color:#333;font-size:15px;margin-bottom:.33rem}.order-detail .order-sec .oda-group .title-goods span{max-width:8rem;display:inline-block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;vertical-align:middle}.order-detail .order-sec .oda-group .title-goods i{color:#000;font-size:12px;margin-left:.33rem;position:relative;top:.02rem}.order-detail .order-sec .oda-group .attrs{color:#6F6F6F;font-size:12px}.order-detail .order-sec .oda-group .attrs .f-333{color:#333}.order-detail .order-sec .oda-group .attrs .group-trr{line-height:.66rem}.order-detail .order-sec .oda-group .attrs .group-trr div{width:50%}.order-detail .order-footer{width:9.4rem;height:1.32rem;line-height:1.32rem;background:#FFFFFF;border:.01rem solid #D6D6D6;position:fixed;bottom:0px;padding-left:.6rem;left:0px;color:#666;font-size:12px}.order-detail .order-footer font{color:#F3632C}.order-detail .order-footer span{color:#F3632C;font-weight:bold;font-size:21px}.order-detail .order-footer .fl{width:6.32rem;height:1.32rem;overflow:hidden;white-space:nowrap}.order-detail .order-footer .fr{width:3.08rem;height:1.32rem;text-align:center;color:#fff;background:#F3632C;font-size:18px}
\ No newline at end of file \ No newline at end of file
...@@ -7,6 +7,7 @@ var qs = require('qs'); ...@@ -7,6 +7,7 @@ var qs = require('qs');
const state = { const state = {
loading: false, loading: false,
wlInfo:"", wlInfo:"",
wlInfoAll:"",
userInfo:{user_info:{user_head:""},company_info:{com_addres:""}}, userInfo:{user_info:{user_head:""},company_info:{com_addres:""}},
} }
...@@ -26,6 +27,7 @@ const actions = { ...@@ -26,6 +27,7 @@ const actions = {
state.loading = false; state.loading = false;
if (res.data.err_code == 0) { if (res.data.err_code == 0) {
state.wlInfo=res.data.data[0] state.wlInfo=res.data.data[0]
state.wlInfoAll=res.data.data
}else{ }else{
Toast(res.data.err_msg) Toast(res.data.err_msg)
} }
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<div class="btn fr" v-if="item.status==4" @click.stop="sendTip(item.order_sn,item.user_id)">提醒发货</div> <div class="btn fr" v-if="item.status==4" @click.stop="sendTip(item.order_sn,item.user_id)">提醒发货</div>
<div class="btn btn-lk fr" @click.stop="downpd(item.order_id)" v-if="item.status!=1">下载合同</div> <div class="btn btn-lk fr" @click.stop="downpd(item.order_id)" v-if="item.status!=1">下载合同</div>
<div class="btn fr btn-default" v-if="item.status==7||item.status==8||item.status==10" <div class="btn fr btn-default" v-if="item.status==7||item.status==8||item.status==10"
@click.stop="ship(item.order_id,item.order_sn)">查看物流</div> @click.stop="ship(item.order_id,item.order_sn,item.zy_delivery_type,item.status)">查看物流</div>
<div class="btn fr btn-default" v-if="item.status==2||item.status==1" <div class="btn fr btn-default" v-if="item.status==2||item.status==1"
@click.stop="cancelOrder(item.order_id)">取消订单</div> @click.stop="cancelOrder(item.order_id)">取消订单</div>
<div class="btn fr" v-if="item.status==8" @click.stop="sureSend(item.order_id)">确认收货</div> <div class="btn fr" v-if="item.status==8" @click.stop="sureSend(item.order_id)">确认收货</div>
...@@ -375,14 +375,26 @@ ...@@ -375,14 +375,26 @@
this.$store.dispatch(datap) this.$store.dispatch(datap)
}, },
//查看物流 //查看物流
ship(order_id,order_sn) { //查看物流
this.$router.push({ ship(order_id,order_sn,zy_delivery_type,status) {
path: '/userShipping', if(zy_delivery_type==1){
query: { this.$router.push({
order_id: order_id, path: '/orderDetail',
order_sn:order_sn query: {
} order_id: order_id,
}) status:status
}
})
}else{
this.$router.push({
path: '/userShipping',
query: {
order_id: order_id,
order_sn:order_sn
}
})
}
}, },
//确认收货 //确认收货
sureSend(order_id) { sureSend(order_id) {
......
...@@ -8,13 +8,18 @@ ...@@ -8,13 +8,18 @@
<van-count-down :time="orderDetailInfo.self_rest_time" format="还剩DD天HH时" /> <van-count-down :time="orderDetailInfo.self_rest_time" format="还剩DD天HH时" />
</div> </div>
</div> </div>
<a class="t1-box wl" <template v-else-if="orderDetailInfo.status==7||orderDetailInfo.status==8||orderDetailInfo.status==10" >
:href="'/h5/view/#/userShipping?order_id='+orderDetailInfo.order_id+'&order_sn='+orderDetailInfo.order_sn" <div v-if="wlInfoAll&&wlInfoAll.length>0">
v-else-if="orderDetailInfo.status==7||orderDetailInfo.status==8||orderDetailInfo.status==10"> <a v-for="item in wlInfoAll" class="t1-box wl wlnobt" @click="toUrl('/h5/view/#/userShipping?order_id='+orderDetailInfo.order_id+'&order_sn='+orderDetailInfo.order_sn)" >
<img src="../../assets/images/user/wuliud.png" alt="猎芯网"> <div class="ordersta" >{{item.shipping_name}}&nbsp;单号:{{item.shipping_no}}</div>
<div class="ordersta" v-if="wlInfo">{{wlInfo.info[0].AcceptStation}}</div> <span class="fhxh" @click.stop="fhxhfunc(item.goods_items)">发货型号</span>
<i class="icon iconfont">&#xe67c;</i> <i class="icon iconfont">&#xe67c;</i>
</a> </a>
</div>
</template>
<div class="t1-box" v-else> <div class="t1-box" v-else>
<img src="../../assets/images/user/orders.png" alt="猎芯网"> <img src="../../assets/images/user/orders.png" alt="猎芯网">
<div class="ordersta">订单状态:{{orderDetailInfo.status_val}}</div> <div class="ordersta">订单状态:{{orderDetailInfo.status_val}}</div>
...@@ -163,7 +168,7 @@ ...@@ -163,7 +168,7 @@
loading: state => state.orderDetail.loading, loading: state => state.orderDetail.loading,
userInfo: state => state.shipping.userInfo, userInfo: state => state.shipping.userInfo,
orderDetailInfo: state => state.orderDetail.orderDetailInfo, orderDetailInfo: state => state.orderDetail.orderDetailInfo,
wlInfo: state => state.shipping.wlInfo, wlInfoAll: state => state.shipping.wlInfoAll,
}), }),
}, },
...@@ -203,6 +208,9 @@ ...@@ -203,6 +208,9 @@
window.location.href = window.location.origin + "/v3/pay/online?id=" + order_id window.location.href = window.location.origin + "/v3/pay/online?id=" + order_id
}, },
fhxhfunc(xh){
Dialog({ message: xh});
},
toUrl(url,goods_id){ toUrl(url,goods_id){
if(goods_id!=0){ if(goods_id!=0){
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<div class="btn btn-lk fr" @click.stop="downpd(item.order_id)" v-if="item.status!=1">下载合同</div> <div class="btn btn-lk fr" @click.stop="downpd(item.order_id)" v-if="item.status!=1">下载合同</div>
<div class="btn fr btn-default" v-if="item.status==7||item.status==8||item.status==10" <div class="btn fr btn-default" v-if="item.status==7||item.status==8||item.status==10"
@click.stop="ship(item.order_id,item.order_sn)">查看物流</div> @click.stop="ship(item.order_id,item.order_sn,item.zy_delivery_type,item.status)">查看物流</div>
<div class="btn fr" v-if="item.status==8" @click.stop="sureSend(item.order_id)">确认收货</div> <div class="btn fr" v-if="item.status==8" @click.stop="sureSend(item.order_id)">确认收货</div>
</div> </div>
</div> </div>
...@@ -208,14 +208,25 @@ ...@@ -208,14 +208,25 @@
}, },
//查看物流 //查看物流
ship(order_id,order_sn) { ship(order_id,order_sn,zy_delivery_type,status) {
this.$router.push({ if(zy_delivery_type==1){
path: '/userShipping', this.$router.push({
query: { path: '/orderDetail',
order_id: order_id, query: {
order_sn:order_sn order_id: order_id,
} status:status
}) }
})
}else{
this.$router.push({
path: '/userShipping',
query: {
order_id: order_id,
order_sn:order_sn
}
})
}
}, },
//确认收货 //确认收货
sureSend(order_id) { sureSend(order_id) {
......
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
{"h":"4b351f9533cb8b8cff9a","c":{"47":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
{"h":"9b842821bebe2a6459ac","c":{"22":true}}
\ No newline at end of file
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
{"h":"894981c2c0874ef09098","c":{"app":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
{"h":"7038c3a62ca76e386788","c":{"22":true}}
\ No newline at end of file
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
{"h":"1bce48c996abf7116b90","c":{"22":true}}
\ No newline at end of file
{"h":"39eb1d2ddf9b1c8302ee","c":{"22":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
{"h":"b858e639d92c3670b8d5","c":{"app":true}}
\ No newline at end of file
{"h":"7496f5f6ff70cb2c6e11","c":{"22":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment