diff --git a/packages/address-edit/Detail.js b/packages/address-edit/Detail.js new file mode 100644 index 000000000..705b46906 --- /dev/null +++ b/packages/address-edit/Detail.js @@ -0,0 +1,81 @@ +import { use, isAndroid } from '../utils'; +import Cell from '../cell'; +import Field from '../field'; + +const [sfc, bem, t] = use('address-edit-detail'); +const android = isAndroid(); + +export default sfc({ + props: { + value: String, + error: Boolean, + focused: Boolean, + detailRows: Number, + searchResult: Array, + showSearchResult: Boolean + }, + + computed: { + searchList() { + if (this.showSearchResult && this.focused) { + return this.searchResult || []; + } + return []; + }, + + showIcon() { + return this.value && this.focused; + } + }, + + methods: { + onSelect(express) { + this.$emit('select-search', express); + this.$emit('input', `${express.address || ''} ${express.name || ''}`.trim()); + } + }, + + render(h) { + return ( + + + {this.showIcon && android && ( +
{ + this.$refs.field.blur(); + }} + > + {t('complete')} +
+ )} +
+ {this.searchList.map(express => ( + { + this.onSelect(express); + }} + /> + ))} + + ); + } +}); diff --git a/packages/address-edit/Detail.vue b/packages/address-edit/Detail.vue deleted file mode 100644 index a43ea28d3..000000000 --- a/packages/address-edit/Detail.vue +++ /dev/null @@ -1,81 +0,0 @@ - - - diff --git a/packages/address-edit/index.vue b/packages/address-edit/index.js similarity index 54% rename from packages/address-edit/index.vue rename to packages/address-edit/index.js index e9568ad3b..ce6b88499 100644 --- a/packages/address-edit/index.vue +++ b/packages/address-edit/index.js @@ -1,115 +1,16 @@ - - - diff --git a/packages/address-edit/test/__snapshots__/demo.spec.js.snap b/packages/address-edit/test/__snapshots__/demo.spec.js.snap index 71282f5c3..09e149ea0 100644 --- a/packages/address-edit/test/__snapshots__/demo.spec.js.snap +++ b/packages/address-edit/test/__snapshots__/demo.spec.js.snap @@ -75,6 +75,7 @@ exports[`renders demo correctly 1`] = ` +
设为默认收货地址
@@ -87,7 +88,8 @@ exports[`renders demo correctly 1`] = `
-
+
+