|
|
|
@ -7,27 +7,18 @@
|
|
|
|
|
</view> |
|
|
|
|
<view class="address"> |
|
|
|
|
<view class="name"> |
|
|
|
|
{{ delivery.realName |
|
|
|
|
}} |
|
|
|
|
{{ delivery.realName }} |
|
|
|
|
<text class="phone">{{ delivery.userPhone }}</text> |
|
|
|
|
</view> |
|
|
|
|
<view>{{ delivery.userAddress }}</view> |
|
|
|
|
</view> |
|
|
|
|
<view class="line"> |
|
|
|
|
<image src="@/static/images/line.jpg" /> |
|
|
|
|
</view> |
|
|
|
|
<view class="line"><image src="@/static/images/line.jpg" /></view> |
|
|
|
|
</header> |
|
|
|
|
<view class="wrapper"> |
|
|
|
|
<view class="item acea-row row-between-wrapper"> |
|
|
|
|
<view>发货方式</view> |
|
|
|
|
<view class="mode acea-row row-middle row-right"> |
|
|
|
|
<view |
|
|
|
|
class="goods" |
|
|
|
|
:class="active === typesIndex ? 'on' : ''" |
|
|
|
|
v-for="(item, typesIndex) in types" |
|
|
|
|
:key="typesIndex" |
|
|
|
|
@click="changeType(item, typesIndex)" |
|
|
|
|
> |
|
|
|
|
<view class="goods" :class="active === typesIndex ? 'on' : ''" v-for="(item, typesIndex) in types" :key="typesIndex" @click="changeType(item, typesIndex)"> |
|
|
|
|
{{ item.title }} |
|
|
|
|
<text class="iconfont icon-xuanzhong2"></text> |
|
|
|
|
</view> |
|
|
|
@ -36,21 +27,24 @@
|
|
|
|
|
<view class="list" v-show="active === 0"> |
|
|
|
|
<view class="item acea-row row-between-wrapper"> |
|
|
|
|
<view>快递公司</view> |
|
|
|
|
<input type="text" placeholder="填写快递公司" v-model="delivery_name" class="mode" /> |
|
|
|
|
<picker mode="selector" :range="logistics" class="mode" range-key="name" @change="changeLog"> |
|
|
|
|
<input type="text" placeholder="填写快递公司" disabled="disabled" v-model="deliveryNames" class="mode" /> |
|
|
|
|
</picker> |
|
|
|
|
<!-- <input type="text" placeholder="填写快递公司" v-model="deliveryName" class="mode" /> --> |
|
|
|
|
</view> |
|
|
|
|
<view class="item acea-row row-between-wrapper"> |
|
|
|
|
<view>快递单号</view> |
|
|
|
|
<input type="text" placeholder="填写快递单号" v-model="delivery_id" class="mode" /> |
|
|
|
|
<input type="text" placeholder="填写快递单号" v-model="deliveryId" class="mode" /> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<view class="list" v-show="active === 1"> |
|
|
|
|
<view class="item acea-row row-between-wrapper"> |
|
|
|
|
<view>送货人</view> |
|
|
|
|
<input type="text" placeholder="填写送货人" v-model="delivery_name" class="mode" /> |
|
|
|
|
<input type="text" placeholder="填写送货人" v-model="deliveryName" class="mode" /> |
|
|
|
|
</view> |
|
|
|
|
<view class="item acea-row row-between-wrapper"> |
|
|
|
|
<view>送货电话</view> |
|
|
|
|
<input type="text" placeholder="填写送货电话" v-model="delivery_id" class="mode" /> |
|
|
|
|
<input type="text" placeholder="填写送货电话" v-model="deliveryId" class="mode" /> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
@ -59,21 +53,21 @@
|
|
|
|
|
</view> |
|
|
|
|
</template> |
|
|
|
|
<script> |
|
|
|
|
import { getAdminOrderDelivery, setAdminOrderDelivery } from "@/api/admin"; |
|
|
|
|
import { getLogistics } from "@/api/public"; |
|
|
|
|
import { required } from "@/utils/validate"; |
|
|
|
|
import { validatorDefaultCatch } from "@/utils/dialog"; |
|
|
|
|
import { getAdminOrderDelivery, setAdminOrderDelivery } from '@/api/admin'; |
|
|
|
|
import { getLogistics } from '@/api/public'; |
|
|
|
|
import { required } from '@/utils/validate'; |
|
|
|
|
import { validatorDefaultCatch } from '@/utils/dialog'; |
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
|
name: "GoodsDeliver", |
|
|
|
|
name: 'GoodsDeliver', |
|
|
|
|
components: {}, |
|
|
|
|
props: {}, |
|
|
|
|
data: function() { |
|
|
|
|
return { |
|
|
|
|
types: [ |
|
|
|
|
{ |
|
|
|
|
type: "express", |
|
|
|
|
title: "发货" |
|
|
|
|
type: 'express', |
|
|
|
|
title: '发货' |
|
|
|
|
} |
|
|
|
|
// { |
|
|
|
|
// type: "send", |
|
|
|
@ -85,16 +79,17 @@ export default {
|
|
|
|
|
// } |
|
|
|
|
], |
|
|
|
|
active: 0, |
|
|
|
|
order_id: "", |
|
|
|
|
order_id: '', |
|
|
|
|
delivery: [], |
|
|
|
|
logistics: [], |
|
|
|
|
delivery_type: "express", |
|
|
|
|
delivery_name: "", |
|
|
|
|
delivery_id: "" |
|
|
|
|
delivery_type: 'express', |
|
|
|
|
deliveryName: '', |
|
|
|
|
deliveryId: '', |
|
|
|
|
deliveryNames: '请选择' |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
watch: { |
|
|
|
|
"$yroute.query.oid": function(newVal) { |
|
|
|
|
'$yroute.query.oid': function(newVal) { |
|
|
|
|
let that = this; |
|
|
|
|
if (newVal != undefined) { |
|
|
|
|
that.order_id = newVal; |
|
|
|
@ -105,14 +100,18 @@ export default {
|
|
|
|
|
mounted: function() { |
|
|
|
|
this.order_id = this.$yroute.query.oid; |
|
|
|
|
this.getIndex(); |
|
|
|
|
//this.getLogistics(); |
|
|
|
|
this.getLogistics(); |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
changeLog: function(value) { |
|
|
|
|
this.deliveryNames = this.logistics[value.detail.value].name; |
|
|
|
|
this.deliveryName = this.logistics[value.detail.value].id; |
|
|
|
|
}, |
|
|
|
|
changeType: function(item, index) { |
|
|
|
|
this.active = index; |
|
|
|
|
this.delivery_type = item.type; |
|
|
|
|
this.delivery_name = ""; |
|
|
|
|
this.delivery_id = ""; |
|
|
|
|
this.deliveryName = ''; |
|
|
|
|
this.deliveryId = ''; |
|
|
|
|
}, |
|
|
|
|
getIndex: function() { |
|
|
|
|
let that = this; |
|
|
|
@ -123,7 +122,7 @@ export default {
|
|
|
|
|
error => { |
|
|
|
|
uni.showToast({ |
|
|
|
|
title: error.msg, |
|
|
|
|
icon: "none", |
|
|
|
|
icon: 'none', |
|
|
|
|
duration: 2000 |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
@ -133,12 +132,13 @@ export default {
|
|
|
|
|
let that = this; |
|
|
|
|
getLogistics().then( |
|
|
|
|
res => { |
|
|
|
|
console.log(res.data); |
|
|
|
|
that.logistics = res.data; |
|
|
|
|
}, |
|
|
|
|
error => { |
|
|
|
|
uni.showToast({ |
|
|
|
|
title: error.msg, |
|
|
|
|
icon: "none", |
|
|
|
|
icon: 'none', |
|
|
|
|
duration: 2000 |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
@ -147,59 +147,61 @@ export default {
|
|
|
|
|
async saveInfo() { |
|
|
|
|
let that = this, |
|
|
|
|
delivery_type = that.delivery_type, |
|
|
|
|
delivery_name = that.delivery_name, |
|
|
|
|
delivery_id = that.delivery_id, |
|
|
|
|
deliveryName = that.deliveryName, |
|
|
|
|
deliveryId = that.deliveryId, |
|
|
|
|
save = {}; |
|
|
|
|
save.orderId = that.order_id; |
|
|
|
|
save.deliveryType = that.delivery_type; |
|
|
|
|
switch (delivery_type) { |
|
|
|
|
case "send": |
|
|
|
|
case 'express': |
|
|
|
|
try { |
|
|
|
|
await this.$validator({ |
|
|
|
|
delivery_name: [required(required.message("快递公司"))], |
|
|
|
|
delivery_id: [required(required.message("快递单号"))] |
|
|
|
|
}).validate({ delivery_name, delivery_id }); |
|
|
|
|
deliveryName: [required(required.message('快递公司'))], |
|
|
|
|
deliveryId: [required(required.message('快递单号'))] |
|
|
|
|
}).validate({ deliveryName, deliveryId }); |
|
|
|
|
} catch (e) { |
|
|
|
|
return validatorDefaultCatch(e); |
|
|
|
|
} |
|
|
|
|
save.delivery_name = delivery_name; |
|
|
|
|
save.delivery_id = delivery_id; |
|
|
|
|
save.deliveryName = deliveryName; |
|
|
|
|
save.deliveryId = deliveryId; |
|
|
|
|
that.setInfo(save); |
|
|
|
|
break; |
|
|
|
|
case "express": |
|
|
|
|
case 'send': |
|
|
|
|
try { |
|
|
|
|
await this.$validator({ |
|
|
|
|
delivery_name: [required(required.message("发货人姓名"))], |
|
|
|
|
delivery_id: [required(required.message("发货人电话"))] |
|
|
|
|
}).validate({ delivery_name, delivery_id }); |
|
|
|
|
deliveryName: [required(required.message('发货人姓名'))], |
|
|
|
|
deliveryId: [required(required.message('发货人电话'))] |
|
|
|
|
}).validate({ deliveryName, deliveryId }); |
|
|
|
|
} catch (e) { |
|
|
|
|
return validatorDefaultCatch(e); |
|
|
|
|
} |
|
|
|
|
save.deliveryName = delivery_name; |
|
|
|
|
save.deliveryId = delivery_id; |
|
|
|
|
save.deliveryName = deliveryName; |
|
|
|
|
save.deliveryId = deliveryId; |
|
|
|
|
that.setInfo(save); |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
setInfo: function(item) { |
|
|
|
|
let that = this; |
|
|
|
|
setAdminOrderDelivery(item).then( |
|
|
|
|
res => { |
|
|
|
|
console.log(item); |
|
|
|
|
setAdminOrderDelivery(item) |
|
|
|
|
.then(res => { |
|
|
|
|
console.log(res); |
|
|
|
|
uni.showToast({ |
|
|
|
|
title: res.msg, |
|
|
|
|
icon: "none", |
|
|
|
|
icon: 'none', |
|
|
|
|
duration: 2000 |
|
|
|
|
}); |
|
|
|
|
that.$yrouter.go(-1); |
|
|
|
|
}, |
|
|
|
|
error => { |
|
|
|
|
}) |
|
|
|
|
.catch(err => { |
|
|
|
|
console.log(err); |
|
|
|
|
uni.showToast({ |
|
|
|
|
title: error.msg, |
|
|
|
|
icon: "none", |
|
|
|
|
title: err.msg || err.response.data.msg || err.response.data.message, |
|
|
|
|
icon: 'none', |
|
|
|
|
duration: 2000 |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|