From c820ffa290bb83bec4462a04c4231f91c3907b80 Mon Sep 17 00:00:00 2001 From: chuzhichao Date: Fri, 30 Jun 2023 11:23:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=9A=E5=91=98=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9=E3=80=81=E5=A7=93=E5=90=8D?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 3 + src/router/index.js | 14 ++ src/utils/DataHidden.js | 30 ++++ src/views/oms/order/detail.vue | 188 ++++++++++++++++++++++++++ src/views/oms/order/index.vue | 104 ++++++++------ src/views/ums/memberAddress/index.vue | 23 +--- 6 files changed, 299 insertions(+), 63 deletions(-) create mode 100644 src/utils/DataHidden.js create mode 100644 src/views/oms/order/detail.vue diff --git a/src/main.js b/src/main.js index c21d655..e377af7 100644 --- a/src/main.js +++ b/src/main.js @@ -20,6 +20,7 @@ import './permission' // permission control import { getDicts } from "@/api/system/dict/data"; import { getConfigKey } from "@/api/system/config"; import { parseTime, resetForm, addDateRange, addDateRange2, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"; +import { getHiddenName, getHiddenDetailAddress } from '@/utils/DataHidden' // 分页组件 import Pagination from "@/components/Pagination"; // 自定义表格工具组件 @@ -55,6 +56,8 @@ Vue.prototype.selectDictLabels = selectDictLabels Vue.prototype.download = download Vue.prototype.handleTree = handleTree Vue.prototype.addDateRange2 = addDateRange2 +Vue.prototype.getHiddenName = getHiddenName +Vue.prototype.getHiddenDetailAddress = getHiddenDetailAddress // 全局组件挂载 diff --git a/src/router/index.js b/src/router/index.js index 0a2ee16..ed6abc8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -175,6 +175,20 @@ export const dynamicRoutes = [ meta: { title: '编辑商品' } } ] + }, + { + path: '/order', + component: Layout, + hidden: true, + permissions: ['manager:oms:order:query'], + children: [ + { + path: 'detail', + component: () => import('@/views/oms/order/detail'), + name: 'orderDetail', + meta: { title: '订单详情' } + } + ] } ] diff --git a/src/utils/DataHidden.js b/src/utils/DataHidden.js new file mode 100644 index 0000000..22cd137 --- /dev/null +++ b/src/utils/DataHidden.js @@ -0,0 +1,30 @@ +/** + * 姓名隐藏，只展示第一位，其余替换为 * + */ +export function getHiddenName(data){ + if (!data) return '' + const surname = data.substr(0, 1) + const star = '*'.repeat(data.length - 1) + return surname + star +} + +/** + * 详细地址隐藏数字包含中文数字，替换为 * + */ +export function getHiddenDetailAddress(data){ + const chineseNumbers = ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十'] + if (!data || data.length === 0){ + return '' + } + let tempResult = data.replace((/\d/g),'*') + let result = '' + for(let i=0;i +
+ + + + + {{ orderDetail.orderId }} + {{ orderDetail.userName }} + {{ orderDetail.userPhone }} + {{ parseTime(orderDetail.createTime, '') }} + {{ getPayType(orderDetail) }} + {{ parseTime(orderDetail.payTime, '') + }} + {{ getOrderStatus(orderDetail) }} + + + + + {{ getHiddenName(addressInfo.name) }} + {{ addressInfo.userPhone }} + {{ addressInfo.area }} + {{ getHiddenDetailAddress(addressInfo.address) }} + + + +
商品信息
+ + + + + + + + + + + + + + + + + + {{ parseTime(orderDetail.deliveryTime, '') + }} + {{ orderDetail.expressNo }} + {{ orderDetail.expressName }} + + + + + + + + + + + + +
+ + + + + diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue index 4ac3e7f..3d4e2cd 100644 --- a/src/views/oms/order/index.vue +++ b/src/views/oms/order/index.vue @@ -42,74 +42,81 @@ - + - - + - -