|
@@ -22,14 +22,14 @@
|
|
|
<view class="item acea-row row-between-wrapper">
|
|
<view class="item acea-row row-between-wrapper">
|
|
|
<view>{{$t(`发货方式`)}}</view>
|
|
<view>{{$t(`发货方式`)}}</view>
|
|
|
<view class="mode acea-row row-middle row-right">
|
|
<view class="mode acea-row row-middle row-right">
|
|
|
- <view class="goods" :class="active === item.key ? 'on' : ''" v-for="(item, index) in types"
|
|
|
|
|
|
|
+ <view class="goods" :class="active === index ? 'on' : ''" v-for="(item, index) in types"
|
|
|
:key="index" @click="changeType(item, index)">
|
|
:key="index" @click="changeType(item, index)">
|
|
|
{{ item.title }}<span class="iconfont icon-xuanzhong2"></span>
|
|
{{ item.title }}<span class="iconfont icon-xuanzhong2"></span>
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
<block v-if="logistics.length>0">
|
|
<block v-if="logistics.length>0">
|
|
|
- <view class="list" v-show="active === 1">
|
|
|
|
|
|
|
+ <view class="list" v-show="active === 0">
|
|
|
<view class="item acea-row row-between-wrapper" v-if="delivery.config_export_open == 1">
|
|
<view class="item acea-row row-between-wrapper" v-if="delivery.config_export_open == 1">
|
|
|
<view>{{$t(`发货类型`)}}</view>
|
|
<view>{{$t(`发货类型`)}}</view>
|
|
|
<view class="mode acea-row row-middle row-right">
|
|
<view class="mode acea-row row-middle row-right">
|
|
@@ -101,7 +101,7 @@
|
|
|
</view>
|
|
</view>
|
|
|
</block>
|
|
</block>
|
|
|
|
|
|
|
|
- <view class="list" v-show="active === 2">
|
|
|
|
|
|
|
+ <view class="list" v-show="active === 1">
|
|
|
<view class="item acea-row row-between-wrapper">
|
|
<view class="item acea-row row-between-wrapper">
|
|
|
<view>{{$t(`送货人`)}}</view>
|
|
<view>{{$t(`送货人`)}}</view>
|
|
|
<view class="select-box" v-if="postPeople.length>0">
|
|
<view class="select-box" v-if="postPeople.length>0">
|
|
@@ -113,7 +113,7 @@
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
- <textarea v-show="active === 3" v-model="fictitious_content" class="textarea" @blur="bindTextAreaBlur"
|
|
|
|
|
|
|
+ <textarea v-show="active === 2" v-model="fictitious_content" class="textarea" @blur="bindTextAreaBlur"
|
|
|
:placeholder="$t(`备注`)" :maxlength="500" auto-height />
|
|
:placeholder="$t(`备注`)" :maxlength="500" auto-height />
|
|
|
</view>
|
|
</view>
|
|
|
<view style="height:1.2rem;"></view>
|
|
<view style="height:1.2rem;"></view>
|
|
@@ -143,7 +143,11 @@
|
|
|
title: this.$t(`发货`),
|
|
title: this.$t(`发货`),
|
|
|
key: 1
|
|
key: 1
|
|
|
},
|
|
},
|
|
|
-
|
|
|
|
|
|
|
+ {
|
|
|
|
|
+ type: "send",
|
|
|
|
|
+ title: this.$t(`送货`),
|
|
|
|
|
+ key: 2
|
|
|
|
|
+ },
|
|
|
{
|
|
{
|
|
|
type: "fictitious",
|
|
type: "fictitious",
|
|
|
title: this.$t(`无需物流`),
|
|
title: this.$t(`无需物流`),
|
|
@@ -160,7 +164,7 @@
|
|
|
},
|
|
},
|
|
|
],
|
|
],
|
|
|
curExpress: 1,
|
|
curExpress: 1,
|
|
|
- active: 1,
|
|
|
|
|
|
|
+ active: 0,
|
|
|
order_id: "",
|
|
order_id: "",
|
|
|
delivery: [],
|
|
delivery: [],
|
|
|
logistics: [],
|
|
logistics: [],
|
|
@@ -235,14 +239,7 @@
|
|
|
// 获取配送员列表
|
|
// 获取配送员列表
|
|
|
geTorderOrderDelivery() {
|
|
geTorderOrderDelivery() {
|
|
|
orderOrderDelivery().then(res => {
|
|
orderOrderDelivery().then(res => {
|
|
|
- if (res.data.length) {
|
|
|
|
|
- this.postPeople = res.data
|
|
|
|
|
- this.types.push({
|
|
|
|
|
- type: "send",
|
|
|
|
|
- title: this.$t(`送货`),
|
|
|
|
|
- key: 2
|
|
|
|
|
- })
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ this.postPeople = res.data
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
// 配送员选择
|
|
// 配送员选择
|
|
@@ -255,7 +252,7 @@
|
|
|
this.getLogistics(index || '');
|
|
this.getLogistics(index || '');
|
|
|
},
|
|
},
|
|
|
changeType: function(item, index) {
|
|
changeType: function(item, index) {
|
|
|
- this.active = item.key;
|
|
|
|
|
|
|
+ this.active = index;
|
|
|
this.delivery_type = item.key;
|
|
this.delivery_type = item.key;
|
|
|
},
|
|
},
|
|
|
getIndex: function() {
|
|
getIndex: function() {
|