diff --git a/App.vue b/App.vue index 942d85d6..ecfe47c8 100644 --- a/App.vue +++ b/App.vue @@ -787,7 +787,7 @@ // 拨打电话 call_tel(data) { - var value = (typeof(data) == 'object') ? (data.currentTarget.dataset.value || null) : (value || null); + var value = (typeof(data) == 'object') ? (data.currentTarget.dataset.value || null) : (data || null); if (value != null) { uni.makePhoneCall({ phoneNumber: value.toString() @@ -1211,6 +1211,24 @@ } } } + }, + + // 文本事件 + text_event_handle(e) { + var event = e.currentTarget.dataset.event || null; + if(event != null) { + var value = e.currentTarget.dataset.value; + switch(event) { + // 拨打电话 + case 'tel' : + this.call_tel(value); + break; + // 复制文本 + case 'copy' : + this.text_copy_event(value); + break; + } + } }, // 剪贴板 diff --git a/pages/plugins/distribution/map/map.vue b/pages/plugins/distribution/map/map.vue index 45a9e950..44560d81 100644 --- a/pages/plugins/distribution/map/map.vue +++ b/pages/plugins/distribution/map/map.vue @@ -24,13 +24,13 @@ {{item.user_name_view}} - + - + - + @@ -38,10 +38,10 @@ {{item.address}} - + - + @@ -179,14 +179,9 @@ }); }, - // 文本复制 - text_copy_event(e) { - app.globalData.text_copy_event(e); - }, - - // 拨打电话 - call_tel(e) { - app.globalData.call_tel(e); + // 文本事件 + text_event(e) { + app.globalData.text_event_handle(e); }, // 地址导航 diff --git a/pages/plugins/distribution/order-detail/order-detail.css b/pages/plugins/distribution/order-detail/order-detail.css index d1ffe075..5233e973 100644 --- a/pages/plugins/distribution/order-detail/order-detail.css +++ b/pages/plugins/distribution/order-detail/order-detail.css @@ -19,4 +19,27 @@ .goods-image { width: 160rpx; height: 160rpx; +} + +/* +* 地址信息 +*/ +.address-base, +.address-detail { + padding: 10rpx 0; +} +.address-detail .icon { + width: 30rpx; + height: 35rpx !important; +} +.address-detail .text { + width: calc(100% - 40rpx); +} +.address-detail .text { + line-height: 36rpx; +} +.address-alias, +.address-map-submit { + padding: 0 15rpx; + line-height: 40rpx; } \ No newline at end of file diff --git a/pages/plugins/distribution/order-detail/order-detail.vue b/pages/plugins/distribution/order-detail/order-detail.vue index 657000c7..a6371399 100644 --- a/pages/plugins/distribution/order-detail/order-detail.vue +++ b/pages/plugins/distribution/order-detail/order-detail.vue @@ -1,7 +1,23 @@