diff --git a/components/me-icon/me-icon.css b/components/me-icon/me-icon.css index d3230f8..68bd950 100644 --- a/components/me-icon/me-icon.css +++ b/components/me-icon/me-icon.css @@ -1,57 +1,59 @@ -.icon-progress-2-line:before { +.icon-copy:before { content: "\e900"; } .icon-money-cny-circle-line:before { - content: "\e901"; -} -.icon-user:before { - content: "\e902"; -} -.icon-upload-cloud-fill:before { - content: "\e903"; -} -.icon-time:before { - content: "\e904"; -} -.icon-reset-left-line:before { - content: "\e905"; -} -.icon-reset-left-fill:before { - content: "\e906"; -} -.icon-navigation:before { - content: "\e907"; -} -.icon-logout:before { - content: "\e908"; -} -.icon-info:before { - content: "\e909"; -} -.icon-flashlight:before { - content: "\e90a"; } .icon-edit-line:before { + content: "\e902"; +} +.icon-user:before { + content: "\e903"; +} +.icon-upload-cloud-fill:before { + content: "\e904"; +} +.icon-time:before { + content: "\e905"; +} +.icon-reset-left-line:before { + content: "\e906"; +} +.icon-reset-left-fill:before { + content: "\e907"; +} +.icon-progress-2-line:before { + content: "\e908"; +} +.icon-navigation:before { + content: "\e909"; +} +.icon-logout:before { + content: "\e90a"; +} +.icon-info:before { content: "\e90b"; } -.icon-close-circle-fill:before { +.icon-flashlight:before { content: "\e90c"; } -.icon-checkbox-circle:before { +.icon-close-circle-fill:before { content: "\e90d"; } -.icon-checkbox-blank-circle:before { +.icon-checkbox-circle:before { content: "\e90e"; } -.icon-call:before { +.icon-checkbox-blank-circle:before { content: "\e90f"; } -.icon-arrow-up-line:before { +.icon-call:before { content: "\e910"; } -.icon-arrow-right:before { +.icon-arrow-up-line:before { content: "\e911"; } -.icon-arrow-right-circle:before { +.icon-arrow-right:before { content: "\e912"; } +.icon-arrow-right-circle:before { + content: "\e913"; +} diff --git a/components/me-icon/me-icon.ttf b/components/me-icon/me-icon.ttf index 8bdf38c..0280ea9 100644 Binary files a/components/me-icon/me-icon.ttf and b/components/me-icon/me-icon.ttf differ diff --git a/pages/order/order-info.vue b/pages/order/order-info.vue index adf1d3f..130d60d 100644 --- a/pages/order/order-info.vue +++ b/pages/order/order-info.vue @@ -18,9 +18,10 @@ - 订单编号 - + 工单号 + {{ data.order_info.order_no }} + @@ -426,13 +427,13 @@ const getOrderStatusText = (status) => { height: 80rpx; position: relative; .title { - width: 200rpx; + width: 190rpx; height: 100%; font-size: 30rpx; color: var(--summaryColor); } .value { - width: 446rpx; + width: 456rpx; height: 100%; font-size: 30rpx; color: var(--titleColor); diff --git a/svg_icons/copy.svg b/svg_icons/copy.svg new file mode 100644 index 0000000..c6e0dfc --- /dev/null +++ b/svg_icons/copy.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/utils/helpers.js b/utils/helpers.js index 1b9eb74..65dd854 100644 --- a/utils/helpers.js +++ b/utils/helpers.js @@ -196,5 +196,24 @@ class helpers { }); } + static copy = (content) => { + if (!content) { + helpers.showToast('复制的内容不能为空') + return + } + + // 复制内容,必须字符串,数字需要转换为字符串 + content = typeof content === 'string' ? content : content.toString() + uni.setClipboardData({ + data: content, + success: function() { + helpers.showToast('复制成功') + }, + fail:function(){ + helpers.showToast('复制失败') + } + }); + } + } export default helpers