theluyuan/demingshangjia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'gyh' (#92) from gyh into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/92
This commit is contained in:
gyh 2020-09-10 09:58:33 +08:00
commit 1309fec9c3
4 changed files with 169 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/http.api.js
View File

@ -113,16 +113,16 @@ const install = (Vue, vm) => {
return vm.$u.post("/order/goodsTryOrderInfo",{goods_try_id}) return vm.$u.post("/order/goodsTryOrderInfo",{goods_try_id})
}, },
// 绑定物流订单 // 绑定物流订单
bindpushid({order_id,shipping_code,shipping_express_id}){ bindpushid({store_deliver_type,order_id,shipping_code,shipping_express_id}){
return vm.$u.post("/order/send",{order_id,shipping_code,shipping_express_id}) return vm.$u.post("/order/send",{store_deliver_type,order_id,shipping_code,shipping_express_id})
}, },
// 绑定骑手 // 绑定骑手
bindcarer({order_id,takeawayer_id}){ bindcarer({store_deliver_type,order_id,takeawayer_id}){
return vm.$u.post("/order/orderRider",{order_id,takeawayer_id}) return vm.$u.post("/order/send",{store_deliver_type,order_id,takeawayer_id})
}, },
// 自提 // 自提
bindmention({shipping_express_id,deliver_explain,order_id,sendimg}) { bindmention({store_deliver_type,shipping_express_id,deliver_explain,order_id,sendimg}) {
return vm.$u.post("/order/send",{shipping_express_id,deliver_explain,order_id,sendimg}) return vm.$u.post("/order/send",{store_deliver_type,shipping_express_id,deliver_explain,order_id,sendimg})
}, },
// 发货物流公司 // 发货物流公司
pushcompany(){ pushcompany(){

205
pages/index/details.vue
View File

@ -51,7 +51,7 @@
</view> </view>
<view> <view>
<view class="title">派送方式</view> <view class="title">派送方式</view>
<view class="value u-line-1">{{ cur == 0 ? "快递" : cur == 1 ? "骑手" : "自提" }}</view> <view class="value u-line-1">{{ users_type == 0 ? "-" : users_type == 1 ? "快递" : users_type == 2 ? "骑手" : "自提" }}</view>
</view> </view>
<view @click="showInvoice"> <view @click="showInvoice">
<view class="title">开具发票</view> <view class="title">开具发票</view>
@ -95,12 +95,42 @@
</view> </view>
<!-- 已发货 --> <!-- 已发货 -->
<view class="pushtimeline" v-if="type == 2"> <view class="pushtimeline" v-if="type == 2">
<view class="timelinetitle">物流信息</view> <view v-if="ordered_type == 1">
<view class="timelineid">订单单号:&nbsp;&nbsp;&nbsp;{{ info.order_sn }}</view> <view class="timelinetitle">物流信息</view>
<view class="timelinebox" v-for="(list,index) in info.express_list" :key="index"> <view class="timelineid">订单单号:&nbsp;&nbsp;&nbsp;{{ info.order_sn }}</view>
<view class="timelinecontent">{{list.content}}</view> <view class="timelinebox" v-for="(list,index) in info.express_list" :key="index">
<view class="timelinetime">{{list.kd_time}}</view> <view class="timelinecontent">{{list.content}}</view>
</view> <view class="timelinetime">{{list.kd_time}}</view>
</view>
</view>
<view v-else-if="ordered_type == 2">
<view class="timelinetitle">骑手信息</view>
<view class="refunds-user-two">
<view>
<image src="/static/image/home/2.png"></image>
<view>{{ takeawayer_info.takeawayer_name }}</view>
</view>
<view>
<image src="/static/image/home/3.png"></image>
<view>{{ takeawayer_info.takeawayer_mobile }}</view>
</view>
<view>
<image src="/static/image/home/4.png"></image>
<view class="address u-line-1">{{ takeawayer_info.company_name }}</view>
</view>
</view>
</view>
<view v-else style="padding-bottom: 20rpx;">
<view class="timelinetitle">自提信息</view>
<view>
<view class="ziti-title">凭证图片</view>
<image class="certificate-img" :src="mineBy_img" @tap="viewImage" mode="aspectFill"></image>
</view>
<view>
<view class="ziti-title">备注:</view>
<view class="u-line-5">{{ mineBy_text }}</view>
</view>
</view>
</view> </view>
<!-- 已完成 --> <!-- 已完成 -->
<!-- 退款处理 --> <!-- 退款处理 -->
@ -200,7 +230,7 @@ export default {
return { return {
status: 1, // 订单状态 status: 1, // 订单状态
cur: null, cur: null,
show_invoice: false, // 发票 show_invoice: false, // 发票
showDelivery: false, // 填写骑手信息 showDelivery: false, // 填写骑手信息
showExpress: false, // 填写快递单号 showExpress: false, // 填写快递单号
showRefunds: false, // 平台退货处理 showRefunds: false, // 平台退货处理
@ -231,9 +261,14 @@ export default {
companyidB: null, //骑手派送公司id companyidB: null, //骑手派送公司id
value:"", value:"",
refundid:null, refundid:null,
is_invoice: 0, // 判断发票 is_invoice: 0, // 判断发票
invoice_type: null, invoice_type: null,
invoiceList: {}, // 发票数据 invoiceList: {}, // 发票数据
users_type: "", // 用户选择发货type
ordered_type: 0, // 发货方式的状态
takeawayer_info: {}, // 骑手信息
mineBy_img: "", // 自提图片
mineBy_text: "", // 自提备注
}; };
}, },
onLoad(option) { onLoad(option) {
@ -247,7 +282,7 @@ export default {
} }
if (this.type == 2) { if (this.type == 2) {
// 获取物流信息 // 获取物流信息
this.getcarinfo(); // this.getcarinfo();
} }
// 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货 // 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
}, },
@ -369,10 +404,10 @@ export default {
title: res.message, title: res.message,
type: 'success' type: 'success'
}); });
let pages = getCurrentPages(); let pages = getCurrentPages();
let prePage = pages[pages.length - 2]; let prePage = pages[pages.length - 2];
console.log(prePage.$vm); console.log(prePage.$vm);
prePage.$vm.del_id = this.orderid; prePage.$vm.del_id = this.orderid;
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
}); });
@ -421,24 +456,25 @@ export default {
}, },
// 绑定配送方式 // 绑定配送方式
confirmpushstyle() { confirmpushstyle() {
// console.log(this.cur); // console.log(this.cur);
if (this.cur < 0) { if (this.cur < 0) {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: '请选择派送方式！', title: '请选择派送方式！',
type: 'warning ', type: 'warning ',
}) })
return; return;
} }
if (this.cur == 0) { if (this.cur == 0) {
if (!this.companyidA) { if (!this.companyidA) {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: '请选择派送方式！', title: '请选择派送方式！',
type: 'warning ', type: 'warning ',
}) })
return; return;
} }
// console.log(this.pushid); // console.log(this.pushid);
this.$u.api.bindpushid({ this.$u.api.bindpushid({
store_deliver_type: 1,
order_id: this.orderid, order_id: this.orderid,
shipping_code: this.pushid, shipping_code: this.pushid,
shipping_express_id: this.companyidA.express_id shipping_express_id: this.companyidA.express_id
@ -459,14 +495,15 @@ export default {
} }
}); });
} else if (this.cur == 1) { } else if (this.cur == 1) {
if (!this.selctcar) { if (!this.selctcar) {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: '请选择派送方式！', title: '请选择派送方式！',
type: 'warning ', type: 'warning ',
}) })
return; return;
} }
this.$u.api.bindcarer({ this.$u.api.bindcarer({
store_deliver_type: 2,
order_id: this.orderid, order_id: this.orderid,
takeawayer_id: this.selctcar.takeawayer_id takeawayer_id: this.selctcar.takeawayer_id
}).then(res => { }).then(res => {
@ -487,17 +524,17 @@ export default {
} }
}); });
} else { } else {
uni.navigateTo({ uni.navigateTo({
url: "mention?id=" + this.orderid url: "mention?id=" + this.orderid
}) })
} }
},
// 显示发票
showInvoice() {
if (this.is_invoice) {
this.show_invoice = true;
}
}, },
// 显示发票
showInvoice() {
if (this.is_invoice) {
this.show_invoice = true;
}
},
// 选择骑手 // 选择骑手
getselect(e) { getselect(e) {
this.selctcar = this.list[e[0].value]; this.selctcar = this.list[e[0].value];
@ -515,11 +552,18 @@ export default {
}); });
} else { } else {
this.info = res.data; this.info = res.data;
this.cur = res.data.is_selfraising; this.cur = res.data.member_deliver_type - 1;
this.invoiceList = res.data.extend_order_common.invoice_info; this.users_type = res.data.member_deliver_type; // 用户选择发货方式
this.is_invoice = this.invoiceList.invoice_id || false; this.invoiceList = res.data.extend_order_common.invoice_info;
this.invoice_type = this.invoiceList.invoice_type; this.is_invoice = this.invoiceList.invoice_id || false;
// console.log(this.invoiceList,this.is_invoice,this.invoice_type); this.invoice_type = this.invoiceList.invoice_type;
this.ordered_type = res.data.store_deliver_type; // 发货方式
// 骑手
this.takeawayer_info = res.data.takeawayer || {}; // 骑手信息
// 自提
this.mineBy_img = res.data.extend_order_common.sendimg; // 自提图片
this.mineBy_text = res.data.extend_order_common.deliver_explain; // 自提备注
// console.log(this.invoiceList,this.is_invoice,this.invoice_type);
} }
}); });
this.$u.api.takeawayerlist({}).then(res => { this.$u.api.takeawayerlist({}).then(res => {
@ -538,7 +582,15 @@ export default {
this.list = arr; this.list = arr;
} }
}); });
} },
// 预览图片
viewImage() {
console.log(this.mineBy_img);
uni.previewImage({
urls: this.mineBy_img,
current: 1
})
}
} }
}; };
</script> </script>
@ -625,6 +677,51 @@ export default {
} }
} }
} }
.refunds-user-two {
padding: 25rpx 0;
background-color: #ffffff;
margin-bottom: 20rpx;
> view {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 30rpx;
@mixin image-class($width, $right) {
> image {
flex-shrink: 0;
width: $width;
height: 40rpx;
margin-right: $right;
}
}
&:first-child {
@include image-class($width: 40rpx, $right: 20rpx);
}
&:nth-child(2) {
margin-left: 4rpx;
@include image-class($width: 32rpx, $right: 24rpx);
}
&:last-child {
margin-left: 2rpx;
@include image-class($width: 36rpx, $right: 22rpx);
}
> view {
flex: 1;
font-size: 26rpx;
color: rgba(51, 51, 51, 1);
}
}
}
.ziti-title {
margin: 20rpx 0 10rpx;
font-size: 28rpx;
color: #333;
}
.certificate-img {
width: 320rpx;
height: 240rpx;
border-radius: 4rpx;
}
.user-info { .user-info {
.info-title { .info-title {
font-size: 30rpx; font-size: 30rpx;

1
pages/index/mention.vue
View File

@ -69,6 +69,7 @@
} }
// 提交 // 提交
this.$u.api.bindmention({ this.$u.api.bindmention({
store_deliver_type: 3,
shipping_express_id: "e1000", shipping_express_id: "e1000",
deliver_explain: this.textareaVal, deliver_explain: this.textareaVal,
order_id: this.order_id, order_id: this.order_id,

16
pages/release/zhibo.nvue
View File

@ -73,10 +73,10 @@
</view> </view>
</div> </div>
<div class="jieshu" v-if="!zhibo" :style="{'height':height + 'px'}"> <div class="jieshu" v-if="!zhibo" :style="{'height':height + 'px'}">
<div class="jieshuback" :style="{'height':height + 'px'}"></div> <div class="jieshuback" :style="{'height':height + 'px'}" @click="closes1"></div>
<image class="closeimg" src="../../static/image/cloneb.png" @click="closes"></image> <image class="closeimg" src="../../static/image/cloneb.png" @click="closes"></image>
<text class="jieshutitle">徳铭阳光在线</text> <text class="jieshutitle">徳铭阳光在线</text>
<image class="jieshuheadimg" :src="info.member_avatar"></image> <image class="jieshuheadimg" @click="closes1" :src="info.member_avatar"></image>
<text class="jieshuusername">{{info.member_nickname}}</text> <text class="jieshuusername">{{info.member_nickname}}</text>
<div class="jieshubox"> <div class="jieshubox">
<view class="jieshuboxitem"> <view class="jieshuboxitem">
@ -138,6 +138,7 @@
.jieshutitle{ .jieshutitle{
font-size: 30rpx; font-size: 30rpx;
color:#fff; color:#fff;
width: 350rpx;
position: fixed; position: fixed;
top: 70rpx; top: 70rpx;
left: 31rpx; left: 31rpx;
@ -146,13 +147,14 @@
.jieshuback{ .jieshuback{
background-color: #000; background-color: #000;
opacity: 0.8; opacity: 0.8;
position: absolute; position: fixed;
left: 0; left: 0;
top: 0; top: 0;
width: 750rpx; width: 750rpx;
z-index: 901;
} }
.jieshu{ .jieshu{
z-index: 9999;
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
@ -175,7 +177,7 @@
bottom: 24rpx; bottom: 24rpx;
} }
.closeimg{ .closeimg{
position: fixed; position: absolute;
top: 70rpx; top: 70rpx;
right: 31rpx; right: 31rpx;
width: 51rpx; width: 51rpx;
@ -623,7 +625,11 @@
duration: 2000 duration: 2000
}); });
}, },
closes1() {
console.log(111);
},
closes(){ closes(){
console.log(this.zhibo)
if(!this.zhibo){ if(!this.zhibo){
uni.navigateBack({ uni.navigateBack({
delta:1 delta:1