|
@@ -80,7 +80,7 @@
|
|
|
</el-collapse-item>
|
|
|
<el-collapse-item title="商品订单" name="3" class="add-order-item">
|
|
|
<div class="addProductTool">
|
|
|
- <by-tool :propConfig="toolConfig" ref="tool" v-if="orderValue.status !== 'Delivering' && orderValue.status !== 'Sent'"></by-tool>
|
|
|
+ <by-tool :propConfig="toolConfig" ref="tool"></by-tool>
|
|
|
<div class="preferential">
|
|
|
<div class="pre-title">抵扣金额<i class="el-icon-info" title="支持输入数字和百分比。若输入百分比,将自动计算折扣金额=商品成交总金额*百分比(举例:打9折,请输入10%),
|
|
|
只在订单创建时计算一次,在订单创建后修改商品价格不会自动计算,运费不参与折扣。"></i>:</div>
|
|
@@ -933,7 +933,12 @@ export default class AddOrder extends Vue {
|
|
|
if(v === 0 || v === 1){
|
|
|
this.orderValue.isPay = v;
|
|
|
}
|
|
|
- this.orderValue.isCod = v === 3 ? 1:0
|
|
|
+ if(v === 3){
|
|
|
+ this.orderValue.isCod = 1
|
|
|
+ this.orderValue.isPay = 0
|
|
|
+ }else{
|
|
|
+ this.orderValue.isCod = 0
|
|
|
+ }
|
|
|
}
|
|
|
created(){
|
|
|
this.userInfo = this.$store.getters.userInfo;
|
|
@@ -1505,10 +1510,10 @@ export default class AddOrder extends Vue {
|
|
|
//确定
|
|
|
btn(n?:string){
|
|
|
this.getOrderValue().then(()=>{
|
|
|
-
|
|
|
this.orderValue.receiverCountryCode = '86';
|
|
|
this.orderValue.receiverCountry="中华人民共和国";
|
|
|
this.load = true;
|
|
|
+ this.orderValue.isCod = this.orderValue.isCod ? 1 : 0
|
|
|
addOrder(this.orderValue).then((res:any) => {
|
|
|
if(n != 'continue'){
|
|
|
this.value = false;
|