Merge pull request 'gdpao' (#97) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/97
This commit is contained in:
commit
909082f7ca
@ -43,16 +43,20 @@
|
||||
</view>
|
||||
<view>
|
||||
<view class="title">手机号</view>
|
||||
<view class="value">{{ info.extend_order_common.reciver_info.mob_phone }}</view>
|
||||
<view class="value" @longtap="longtap(info.extend_order_common.reciver_info.mob_phone)">{{ info.extend_order_common.reciver_info.mob_phone }}</view>
|
||||
</view>
|
||||
<view>
|
||||
<view class="title">收货地址</view>
|
||||
<view class="value u-line-1">{{ info.extend_order_common.reciver_info.address }}</view>
|
||||
<view class="value u-line-2" @longtap="longtap(info.extend_order_common.reciver_info.address)">{{ info.extend_order_common.reciver_info.address }}</view>
|
||||
</view>
|
||||
<view>
|
||||
<view class="title">派送方式</view>
|
||||
<view class="value u-line-1">{{ users_type == 0 ? "-" : users_type == 1 ? "快递" : users_type == 2 ? "骑手" : "自提" }}</view>
|
||||
</view>
|
||||
<view class="remark">
|
||||
<view class="title">订单备注</view>
|
||||
<view class="value" @longtap="longtap(info.extend_order_common.order_message)">{{ info.extend_order_common.order_message }}</view>
|
||||
</view>
|
||||
<view @click="showInvoice">
|
||||
<view class="title">开具发票</view>
|
||||
<view class="invoice">
|
||||
@ -83,9 +87,9 @@
|
||||
<view class="delivery" v-if="type == 1">
|
||||
<view class="title">派送方式</view>
|
||||
<view class="methods">
|
||||
<view :class="{ active: cur == 0 }" @click="pushstyleA">快递</view>
|
||||
<view :class="{ active: cur == 1 }" @click="pushstyleB">骑手</view>
|
||||
<view :class="{ active: cur == 2 }" @click="pushstyleC">自提</view>
|
||||
<view :class="{ active: cur == 0 }" @click="pushstyle(1)">快递</view>
|
||||
<view :class="{ active: cur == 1 }" @click="pushstyle(2)">骑手</view>
|
||||
<view :class="{ active: cur == 2 }" @click="pushstyle(3)">自提</view>
|
||||
</view>
|
||||
<view v-if="cur != 2 && (pushid || selctcar)">
|
||||
<view class="title">{{cur == 0 ? '快递单号':'骑手信息'}}</view>
|
||||
@ -275,6 +279,7 @@ export default {
|
||||
this.type = option.type;
|
||||
// console.log(this.type)
|
||||
this.orderid = option.id;
|
||||
|
||||
this.resetinfo();
|
||||
if (this.type == 1) {
|
||||
// 获取快递公司
|
||||
@ -329,6 +334,16 @@ export default {
|
||||
this.refundid = e
|
||||
console.log(e);
|
||||
},
|
||||
pushstyle(index) {
|
||||
// console.log(this.users_type);
|
||||
if (this.users_type == 1 && index == 1) {
|
||||
this.showcompany = true;
|
||||
} else if (this.users_type == 2 && index == 2) {
|
||||
this.show = true;
|
||||
} else if (this.users_type == 3 && index == 3) {
|
||||
this.cur = 2;
|
||||
}
|
||||
},
|
||||
// 人工配送
|
||||
pushstyleA() {
|
||||
this.cur = 0;
|
||||
@ -339,7 +354,7 @@ export default {
|
||||
this.cur = 1;
|
||||
this.show = true;
|
||||
},
|
||||
// 选择骑手
|
||||
// 自提
|
||||
pushstyleC() {
|
||||
this.cur = 2;
|
||||
},
|
||||
@ -544,7 +559,7 @@ export default {
|
||||
this.$u.api.orderdetail({
|
||||
order_id: this.orderid
|
||||
}).then(res => {
|
||||
console.log(res);
|
||||
// console.log(res);
|
||||
if (res.errCode != 0) {
|
||||
this.$refs.uToast.show({
|
||||
title: res.message,
|
||||
@ -558,6 +573,7 @@ export default {
|
||||
this.is_invoice = this.invoiceList.invoice_id || false;
|
||||
this.invoice_type = this.invoiceList.invoice_type;
|
||||
this.ordered_type = res.data.store_deliver_type; // 发货方式
|
||||
// console.log(this.users_type,this.cur);
|
||||
// 骑手
|
||||
this.takeawayer_info = res.data.takeawayer || {}; // 骑手信息
|
||||
// 自提
|
||||
@ -590,6 +606,15 @@ export default {
|
||||
urls: this.mineBy_img,
|
||||
current: 1
|
||||
})
|
||||
},
|
||||
// 复制到粘贴板
|
||||
longtap(text) {
|
||||
console.log(text);
|
||||
uni.setClipboardData({
|
||||
data: text,
|
||||
success: (res) => {
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
@ -736,10 +761,16 @@ export default {
|
||||
padding: 0 30rpx;
|
||||
background-color: #ffffff;
|
||||
margin-bottom: 20rpx;
|
||||
.remark {
|
||||
padding: 10rpx 0;
|
||||
height: 100%;
|
||||
min-height: 88rpx;
|
||||
}
|
||||
> view {
|
||||
height: 88rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
height: 88rpx;
|
||||
padding: 10rpx 0;
|
||||
color: rgba(51, 51, 51, 1);
|
||||
&:not(:last-child) {
|
||||
border-bottom: 2rpx solid #ececec;
|
||||
@ -800,11 +831,11 @@ export default {
|
||||
}
|
||||
.btn {
|
||||
position: absolute;
|
||||
bottom: 40rpx;
|
||||
left: 50%;
|
||||
transform: translate(-50%, 0);
|
||||
width: 690rpx;
|
||||
height: 98rpx;
|
||||
margin: 40rpx 0;
|
||||
background: rgba(255, 120, 15, 1);
|
||||
border-radius: 49rpx;
|
||||
font-size: 36rpx;
|
||||
|
||||
@ -149,7 +149,6 @@ export default {
|
||||
this.getLiveSpec();
|
||||
|
||||
this.device = uni.getSystemInfoSync(); // 获取信息
|
||||
console.log(this.device);
|
||||
},
|
||||
methods: {
|
||||
publish() {
|
||||
@ -158,7 +157,7 @@ export default {
|
||||
for (let index in arr) {
|
||||
newarr.push(arr[index].file_id);
|
||||
}
|
||||
console.log(this.imgarrA);
|
||||
console.log(this.imgarrA,newarr);
|
||||
this.$u.api
|
||||
.publishphoto({
|
||||
article_title: this.form.name,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user