Skip to content

J
jiedao-app-customer-new-master
Commit f337b0cf authored by zhengyi's avatar zhengyi
Browse files
Options

Merge branch 'test' into release 

# Conflicts:
#	src/pages/create_order/create_order.vue
parents 61c3c02f 75a9dfbf
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
src/pages/create_order/create_order.vue
View file @ f337b0cf
...@@ -1995,9 +1995,13 @@ ...@@ -1995,9 +1995,13 @@
} }
that.getOffData() that.getOffData()
// 没有收货人信息 // // 没有收货人信息
if(!that.params.consigneeVO){ // if(!that.params.consigneeVO){
that.hasConsignee = false // that.hasConsignee = false
// }
// 如果用户当前不支持无收货人，则强制显示收货人信息
if(that.noConsignee){
that.hasConsignee = true
} }
// 回显目的城市和目的国 // 回显目的城市和目的国
...@@ -2035,10 +2039,6 @@ ...@@ -2035,10 +2039,6 @@
} }
this.hasConsignee = res.data.hasConsignee this.hasConsignee = res.data.hasConsignee
// 如果用户当前不支持无收货人，则强制显示收货人信息
if(!that.noConsignee){
that.hasConsignee = true
}
} }
}) })
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment