From 0890b44385dcd781fdc442709a80f1eb013e0e5c Mon Sep 17 00:00:00 2001 From: woody Date: Thu, 22 May 2025 16:50:14 +0800 Subject: [PATCH] =?UTF-8?q?feat(lint):=E6=B7=BB=E5=8A=A0lint=20=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=97=B6=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintignore | 5 + .eslintrc.js | 26 + .prettierrc.js | 13 + package-lock.json | 6799 +++++++++++++++++++- package.json | 12 +- src/api/index.js | 50 +- src/api/settle.js | 91 +- src/components/top-member-select/index.vue | 169 + src/pages/logistics/commodity/index.vue | 13 +- src/pages/statistics/underDirectAdd.vue | 832 +-- 10 files changed, 7360 insertions(+), 650 deletions(-) create mode 100644 .eslintignore create mode 100644 .eslintrc.js create mode 100644 .prettierrc.js create mode 100644 src/components/top-member-select/index.vue diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..5002ca5 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,5 @@ +node_modules/ +dist/ +unpackage/ +*.log +*.lock \ No newline at end of file diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..6ee4c98 --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,26 @@ +module.exports = { + root: true, + env: { + node: true, + 'vue/setup-compiler-macros': true, // 针对 + + diff --git a/src/pages/logistics/commodity/index.vue b/src/pages/logistics/commodity/index.vue index 96e9787..8f2e21d 100644 --- a/src/pages/logistics/commodity/index.vue +++ b/src/pages/logistics/commodity/index.vue @@ -67,6 +67,10 @@ {{ item.orderAmount | toThousandthAndKeepDecimal }} + + {{ '订单业绩'+ `(${isLocals()})` }} + {{ item.orderAchieve| toThousandthAndKeepDecimal }} + {{ '商品订单' + "BV" }} @@ -77,10 +81,7 @@ {{ '订单邮费' }} {{ item.postage| toThousandthAndKeepDecimal }} - - {{ '订单业绩'+ `(${isLocals()})` }} - {{ item.orderAchieve| toThousandthAndKeepDecimal }} - + {{ '发货方式' }} {{ item.deliveryWayStr }} @@ -101,6 +102,10 @@ {{ '支付日期' }} {{ item.payTime }} + + 订单套数 + {{ item.boxNum }} + - + @@ -18,27 +16,8 @@ - - - - - - - - - - + +
国旗 - - - - - -
{{ '国家' }}{{ item.shortName }}
@@ -78,449 +57,476 @@
{{ '会员编号' }} {{ item.memberCode }}
- + - - + + + + + - + - + - - - - + + - - + + - - - - + + - - + + - - - - - - - - - - - - - + + - - + + - + - +
\ No newline at end of file + .tftable { + font-size: 12px; + border-collapse: collapse; + border-radius: 10px; + width: 100%; + background: #fff; + border: 1px solid #f9f9f9; + margin-top: 20rpx; + td { + font-size: 11px; + font-family: + PingFang SC-Medium, + PingFang SC; + font-weight: 500; + color: #999; + padding: 20rpx 40rpx; + width: 50%; + // height: 60px; + border-left: 1px solid #333; + border-bottom: 1px solid #333; + } + td:nth-child(odd) { + border-left: 1px solid #f9f9f9; + } + tr :nth-child(2) { + color: #333333; + } + } + .tt { + padding: 20rpx; + margin-top: 20rpx; + } + ::v-deep .u-transition { + z-index: 998 !important; + } + .footer { + display: flex; + align-items: center; + padding: 20rpx 60rpx; + .btnn { + margin-right: 40rpx; + } + } + ::v-deep .u-input { + padding: 0 9px !important; + } + ::v-deep .u-form-item__body__left__content__label { + font-size: 12px; + } + ::v-deep .u-form-item__body { + padding: 5px 0; + } + .theflex { + display: flex; + align-items: center; + } +