Skip to content

M
merchant-manage-ui
Commit ba103189 authored by 张子雨's avatar 张子雨
Browse files
Options

Merge branch 'master' into feat/constructionOne 

* master:
  feat: sentry添加sourcemap上报
  feat: 解决offsetTop问题
  feat: 调用仅退款(未发货)审核逻辑
  feat: 售后订单管理-仅退款(发货中)-添加审核按钮
  feat: 添加大额支付标签
  feat: 售后订单管理:添加仅退款(发货中)字段
  feat: 回归测试
  feat: 售后订单管理添加仅退款(发货中)字段
  feat: sentry
  feat: sentry测试
  feat: 测试
  feat: 测试
  feat:  测试sentry
  feat: sentry
  feat：新增大额支付标签
parents 0b20964f 3f7fa4ce
Show whitespace changes
Inline Side-by-side
Showing with 343 additions and 29 deletions
.sentryclirc.js 0 → 100644
View file @ ba103189
const pkgInfo = require('./package.json');
const project = pkgInfo.name;
module.exports = {
org: 'sentry',
project,
authToken: '3f1f6f3789594e3a81280c1cd8d4d1008037a7abad714698b60b6f358c3d7562',
url: 'http://newsentry.quantgroups.com',
release: `${project}@1.0.0`,
ignore: ['node_modules', 'tests'],
silent: true,
include: [
{
paths: ['./dist'],
},
],
};
config/plugin.config.js
View file @ ba103189
......@@ -5,7 +5,8 @@
import ThemeColorReplacer from 'webpack-theme-color-replacer';
import generate from '@ant-design/colors/lib/generate';
import path from 'path';
const SentryPlugin = require('@qg/sentry-webpack-plugin');
const SentryConfig = require('../.sentryclirc');
function getModulePackageName(module) {
if (!module.context) return null;
const nodeModulesPath = path.join(__dirname, '../node_modules/');
......@@ -27,6 +28,9 @@ function getModulePackageName(module) {
}
export default config => {
if (process.env.NODE_ENV === 'production') {
config.plugin('sentry-webpack-plugin').use(SentryPlugin, [SentryConfig]);
}
// preview.pro.ant.design only do not use in your production;
if (
process.env.ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION === 'site' ||
......
package-lock.json
View file @ ba103189
......@@ -42340,6 +42340,106 @@
"fastq": "^1.6.0"
}
},
"@qg/sentry-cli": {
"version": "1.74.5",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fsentry-cli/-/sentry-cli-1.74.5.tgz",
"integrity": "sha512-zXsp9b+BWSd/cyte00Xt9+U5lit5abmgoiod2XdZtGkz96NlOh+QU4lmIBytK3zpXzSp0sRf2/SUHalOMzZfkg==",
"dev": true,
"requires": {
"https-proxy-agent": "^5.0.0",
"mkdirp": "^0.5.5",
"node-fetch": "^2.6.7",
"npmlog": "^4.1.2",
"progress": "^2.0.3",
"proxy-from-env": "^1.1.0",
"which": "^2.0.2"
},
"dependencies": {
"agent-base": {
"version": "6.0.2",
"resolved": "http://npmprivate.quantgroups.com/agent-base/-/agent-base-6.0.2.tgz",
"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
"dev": true,
"requires": {
"debug": "4"
}
},
"https-proxy-agent": {
"version": "5.0.1",
"resolved": "http://npmprivate.quantgroups.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
"integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
"dev": true,
"requires": {
"agent-base": "6",
"debug": "4"
}
},
"minimist": {
"version": "1.2.8",
"resolved": "http://npmprivate.quantgroups.com/minimist/-/minimist-1.2.8.tgz",
"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
"dev": true
},
"mkdirp": {
"version": "0.5.6",
"resolved": "http://npmprivate.quantgroups.com/mkdirp/-/mkdirp-0.5.6.tgz",
"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
"dev": true,
"requires": {
"minimist": "^1.2.6"
}
},
"node-fetch": {
"version": "2.6.9",
"resolved": "http://npmprivate.quantgroups.com/node-fetch/-/node-fetch-2.6.9.tgz",
"integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
"dev": true,
"requires": {
"whatwg-url": "^5.0.0"
}
},
"tr46": {
"version": "0.0.3",
"resolved": "http://npmprivate.quantgroups.com/tr46/-/tr46-0.0.3.tgz",
"integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
"dev": true
},
"webidl-conversions": {
"version": "3.0.1",
"resolved": "http://npmprivate.quantgroups.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
"integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
"dev": true
},
"whatwg-url": {
"version": "5.0.0",
"resolved": "http://npmprivate.quantgroups.com/whatwg-url/-/whatwg-url-5.0.0.tgz",
"integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
"dev": true,
"requires": {
"tr46": "~0.0.3",
"webidl-conversions": "^3.0.0"
}
},
"which": {
"version": "2.0.2",
"resolved": "http://npmprivate.quantgroups.com/which/-/which-2.0.2.tgz",
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"dev": true,
"requires": {
"isexe": "^2.0.0"
}
}
}
},
"@qg/sentry-webpack-plugin": {
"version": "1.19.0",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fsentry-webpack-plugin/-/sentry-webpack-plugin-1.19.0.tgz",
"integrity": "sha512-3YL+cMVdHlb3EQG3kljxduu4hxo+t4ISYx0qMYS+VOlmLEH0MIP5Gxz4Oe0obExonUt2N4oUB0tNo7ycQqxt8w==",
"dev": true,
"requires": {
"@qg/sentry-cli": "1.74.5"
}
},
"@qixian.cs/path-to-regexp": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/@qixian.cs/path-to-regexp/-/path-to-regexp-6.1.0.tgz",
......@@ -42370,6 +42470,64 @@
"any-observable": "^0.3.0"
}
},
"@sentry/browser": {
"version": "7.41.0",
"resolved": "http://npmprivate.quantgroups.com/@sentry%2fbrowser/-/browser-7.41.0.tgz",
"integrity": "sha512-ZEtgTXPOHZ9/Qn42rr9ZAPTKCV6fAjyDC4FFWMGP4HoUqJqr2woRddP9O5n1jvjsoIPAFOmGzbCuZwFrPVVnpQ==",
"requires": {
"@sentry/core": "7.41.0",
"@sentry/replay": "7.41.0",
"@sentry/types": "7.41.0",
"@sentry/utils": "7.41.0",
"tslib": "^1.9.3"
}
},
"@sentry/core": {
"version": "7.41.0",
"resolved": "http://npmprivate.quantgroups.com/@sentry%2fcore/-/core-7.41.0.tgz",
"integrity": "sha512-yT3wl3wMfPymstIZRWNjuov4xhieIEPD0z9MIW9VmoemqkD5BEZsgPuvGaVIyQVMyx61GsN4H4xd0JCyNqNvLg==",
"requires": {
"@sentry/types": "7.41.0",
"@sentry/utils": "7.41.0",
"tslib": "^1.9.3"
}
},
"@sentry/react": {
"version": "7.41.0",
"resolved": "http://npmprivate.quantgroups.com/@sentry%2freact/-/react-7.41.0.tgz",
"integrity": "sha512-Ajt71pa6Nj4h3hLi2LeS25miVqMv1Zt5NPX5QpSvlPxFRJiIYPOQRWRt0r1pMYR5wD+Y54hJDue+EcWS1H3AKA==",
"requires": {
"@sentry/browser": "7.41.0",
"@sentry/types": "7.41.0",
"@sentry/utils": "7.41.0",
"hoist-non-react-statics": "^3.3.2",
"tslib": "^1.9.3"
}
},
"@sentry/replay": {
"version": "7.41.0",
"resolved": "http://npmprivate.quantgroups.com/@sentry%2freplay/-/replay-7.41.0.tgz",
"integrity": "sha512-/vxuO17AysCoBbCl9wCwjsCFBD4lEbYgfC1GJm8ayWwPU1uhvZcEx6reUwi0rEFpWYGHSHh3+gi+QsOcY/EmnQ==",
"requires": {
"@sentry/core": "7.41.0",
"@sentry/types": "7.41.0",
"@sentry/utils": "7.41.0"
}
},
"@sentry/types": {
"version": "7.41.0",
"resolved": "http://npmprivate.quantgroups.com/@sentry%2ftypes/-/types-7.41.0.tgz",
"integrity": "sha512-4z9VdObynwd64i0VHCqkeIAHmsFzapL21qN41Brzb7jY/eGxjn/0rxInDGH+vkoE9qacGqiYfWj4vRNPLsC/bw=="
},
"@sentry/utils": {
"version": "7.41.0",
"resolved": "http://npmprivate.quantgroups.com/@sentry%2futils/-/utils-7.41.0.tgz",
"integrity": "sha512-SL+MGitvkakbkrOTb48rDuJp9GYx/veB6EOzYygh49+zwz4DGM7dD4/rvf/mVlgmXUzPgdGDgkVmxgX3nT7I7g==",
"requires": {
"@sentry/types": "7.41.0",
"tslib": "^1.9.3"
}
},
"@sinonjs/commons": {
"version": "1.8.3",
"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
......@@ -45203,8 +45361,7 @@
"ajv-keywords": {
"version": "3.5.2",
"resolved": "http://npmprivate.quantgroups.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
"requires": {}
"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
},
"ansi-escapes": {
"version": "3.2.0",
......@@ -45454,11 +45611,27 @@
"picomatch": "^2.0.4"
}
},
"aproba": {
"version": "1.2.0",
"resolved": "http://npmprivate.quantgroups.com/aproba/-/aproba-1.2.0.tgz",
"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
"dev": true
},
"arch": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
"integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ=="
},
"are-we-there-yet": {
"version": "1.1.7",
"resolved": "http://npmprivate.quantgroups.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
"integrity": "sha1-sVR0qTKtq0/4pQ2a36fk6SbyEUY=",
"dev": true,
"requires": {
"delegates": "^1.0.0",
"readable-stream": "^2.0.6"
}
},
"argparse": {
"version": "1.0.10",
"resolved": "http://npmprivate.quantgroups.com/argparse/-/argparse-1.0.10.tgz",
......@@ -46310,6 +46483,7 @@
"version": "1.1.11",
"resolved": "http://npmprivate.quantgroups.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -47175,7 +47349,8 @@
"concat-map": {
"version": "0.0.1",
"resolved": "http://npmprivate.quantgroups.com/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"dev": true
},
"concat-stream": {
"version": "1.6.2",
......@@ -47219,6 +47394,12 @@
"resolved": "http://npmprivate.quantgroups.com/console-browserify/-/console-browserify-1.2.0.tgz",
"integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="
},
"console-control-strings": {
"version": "1.1.0",
"resolved": "http://npmprivate.quantgroups.com/console-control-strings/-/console-control-strings-1.1.0.tgz",
"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
"dev": true
},
"constants-browserify": {
"version": "1.0.0",
"resolved": "http://npmprivate.quantgroups.com/constants-browserify/-/constants-browserify-1.0.0.tgz",
......@@ -47908,6 +48089,12 @@
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
"dev": true
},
"delegates": {
"version": "1.0.0",
"resolved": "http://npmprivate.quantgroups.com/delegates/-/delegates-1.0.0.tgz",
"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
"dev": true
},
"depd": {
"version": "1.1.2",
"resolved": "http://npmprivate.quantgroups.com/depd/-/depd-1.1.2.tgz",
......@@ -49389,7 +49576,8 @@
"esutils": {
"version": "2.0.3",
"resolved": "http://npmprivate.quantgroups.com/esutils/-/esutils-2.0.3.tgz",
"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
"dev": true
},
"etag": {
"version": "1.8.1",
......@@ -50479,6 +50667,53 @@
"integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
"dev": true
},
"gauge": {
"version": "2.7.4",
"resolved": "http://npmprivate.quantgroups.com/gauge/-/gauge-2.7.4.tgz",
"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"dev": true,
"requires": {
"aproba": "^1.0.3",
"console-control-strings": "^1.0.0",
"has-unicode": "^2.0.0",
"object-assign": "^4.1.0",
"signal-exit": "^3.0.0",
"string-width": "^1.0.1",
"strip-ansi": "^3.0.1",
"wide-align": "^1.1.0"
},
"dependencies": {
"is-fullwidth-code-point": {
"version": "1.0.0",
"resolved": "http://npmprivate.quantgroups.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true,
"requires": {
"number-is-nan": "^1.0.0"
}
},
"string-width": {
"version": "1.0.2",
"resolved": "http://npmprivate.quantgroups.com/string-width/-/string-width-1.0.2.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
"strip-ansi": "^3.0.0"
}
},
"strip-ansi": {
"version": "3.0.1",
"resolved": "http://npmprivate.quantgroups.com/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": {
"ansi-regex": "^2.0.0"
}
}
}
},
"gensync": {
"version": "1.0.0-beta.2",
"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
......@@ -50821,6 +51056,12 @@
"has-symbols": "^1.0.2"
}
},
"has-unicode": {
"version": "2.0.1",
"resolved": "http://npmprivate.quantgroups.com/has-unicode/-/has-unicode-2.0.1.tgz",
"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
"dev": true
},
"has-value": {
"version": "1.0.0",
"resolved": "http://npmprivate.quantgroups.com/has-value/-/has-value-1.0.0.tgz",
......@@ -51702,6 +51943,7 @@
"version": "1.0.6",
"resolved": "http://npmprivate.quantgroups.com/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"dev": true,
"requires": {
"once": "^1.3.0",
"wrappy": "1"
......@@ -56652,11 +56894,6 @@
"object-visit": "^1.0.0"
}
},
"mapvgl": {
"version": "1.0.0-beta.174",
"resolved": "http://npmprivate.quantgroups.com/mapvgl/-/mapvgl-1.0.0-beta.174.tgz",
"integrity": "sha512-ljn2pMhfxKzZuBEMv7QRFZHufUCckHh/1pbtAbBIRaEHKX/gxf6p80o6pzFUBbzbs6HhLKf56jdNu5RfKieHNg=="
},
"markdown-escapes": {
"version": "1.0.4",
"resolved": "http://npmprivate.quantgroups.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz",
......@@ -57216,6 +57453,7 @@
"version": "3.0.4",
"resolved": "http://npmprivate.quantgroups.com/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"dev": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......@@ -57287,6 +57525,7 @@
"version": "0.5.1",
"resolved": "http://npmprivate.quantgroups.com/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"dev": true,
"requires": {
"minimist": "0.0.8"
},
......@@ -57294,7 +57533,8 @@
"minimist": {
"version": "0.0.8",
"resolved": "http://npmprivate.quantgroups.com/minimist/-/minimist-0.0.8.tgz",
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
"dev": true
}
}
},
......@@ -57618,6 +57858,18 @@
"path-key": "^2.0.0"
}
},
"npmlog": {
"version": "4.1.2",
"resolved": "http://npmprivate.quantgroups.com/npmlog/-/npmlog-4.1.2.tgz",
"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
"dev": true,
"requires": {
"are-we-there-yet": "~1.1.2",
"console-control-strings": "~1.1.0",
"gauge": "~2.7.3",
"set-blocking": "~2.0.0"
}
},
"nth-check": {
"version": "1.0.2",
"resolved": "http://npmprivate.quantgroups.com/nth-check/-/nth-check-1.0.2.tgz",
......@@ -58101,7 +58353,8 @@
"path-is-absolute": {
"version": "1.0.1",
"resolved": "http://npmprivate.quantgroups.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
"dev": true
},
"path-is-inside": {
"version": "1.0.2",
......@@ -60365,15 +60618,6 @@
"resolved": "http://npmprivate.quantgroups.com/react-amap/-/react-amap-1.2.8.tgz",
"integrity": "sha512-uHPEUXti+CcwFyCeqGGqR0ACnXJA9D8S/lQYal9AG3XEOrwkaOFbWUavrvXxjcfAclROIWg8uKxzlRpMQnkHFg=="
},
"react-bmapgl": {
"version": "0.2.17",
"resolved": "http://npmprivate.quantgroups.com/react-bmapgl/-/react-bmapgl-0.2.17.tgz",
"integrity": "sha512-pcpPOaUeHY3eMmP3Wfz3qdkcrkmtBcbLy8Ih14exYwCe0XJ3IZpmkkarnMvayLymzhH2iyXAyZv42tGnkmv2LA==",
"requires": {
"mapvgl": "^1.0.0-beta.174",
"shallowequal": "^1.1.0"
}
},
"react-copy-to-clipboard": {
"version": "5.0.2",
"resolved": "http://npmprivate.quantgroups.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.2.tgz",
......@@ -60679,7 +60923,7 @@
},
"react-router-dom": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.1.2.tgz",
"resolved": "http://npmprivate.quantgroups.com/react-router-dom/-/react-router-dom-5.1.2.tgz",
"integrity": "sha512-7BPHAaIwWpZS074UKaw1FjVdZBSVWEk8IuDXdB+OkLb8vd/WRQIpA4ag9WQk61aEfQs47wHyjWUoUGGZxpQXew==",
"requires": {
"@babel/runtime": "^7.1.2",
......@@ -64984,7 +65228,8 @@
"through": {
"version": "2.3.8",
"resolved": "http://npmprivate.quantgroups.com/through/-/through-2.3.8.tgz",
"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
"dev": true
},
"timers-browserify": {
"version": "2.0.11",
......@@ -66060,6 +66305,15 @@
"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
"dev": true
},
"wide-align": {
"version": "1.1.5",
"resolved": "http://npmprivate.quantgroups.com/wide-align/-/wide-align-1.1.5.tgz",
"integrity": "sha1-3x1MIGhUNp7PPJpImPGyP72dFdM=",
"dev": true,
"requires": {
"string-width": "^1.0.2 || 2 || 3 || 4"
}
},
"wolfy87-eventemitter": {
"version": "5.1.0",
"resolved": "http://npmprivate.quantgroups.com/wolfy87-eventemitter/-/wolfy87-eventemitter-5.1.0.tgz",
src/app.js
View file @ ba103189
/* eslint-disable no-console */
import * as Sentry from '@sentry/react';
import localStorage from '@/utils/localStorage';
// process.env.SENTRY_ENV !== 'test' 加上测试环境不会报错
if (process.env.NODE_ENV === 'production' && process.env.SENTRY_ENV !== 'test') {
try {
Sentry.init({
dsn: 'https://b3f60c62e1234e26a5b851b9f26fba07@sentry.q-gp.com/34',
release: 'merchant-manage-ui@1.0.0',
maxBreadcrumbs: 50,
tracesSampleRate: 1,
beforeSend: e => {
const err = e.exception?.values || [];
// XXX 不上报[object Object]此类基础库异常
if (err.some(item => item.value.indexOf('ResizeObserver') > -1)) {
return null;
}
return e;
},
});
Sentry.configureScope(scope => {
scope.setUser({
token: localStorage.get('token') || null,
});
});
} catch (e) {
console.log('Sentry无法加载', e);
}
}
export const dva = {
config: {
......
src/pages/AfterSaleManage/data.js
View file @ ba103189
......@@ -257,6 +257,9 @@ export const getColumns = props => {
</span>
);
}
if (+serviceType === 4) {
return <span style={{ color: '#ff1616' }}> 仅退款(发货中)</span>;
}
return <span>退货退款</span>;
},
},
......@@ -268,6 +271,7 @@ export const getColumns = props => {
<div>
{r.timeout ? <Tag color="red">{serviceNo}</Tag> : serviceNo}
{<Badge count={r.reminderFlag ? '催' : ''} size="default" />}
{<Badge count={+r.autoCancelTimeType === 1 ? '大额支付' : ''} size="default" />}
</div>
),
},
......@@ -512,8 +516,8 @@ export const getColumns = props => {
}
}
// 实物商品-仅退款未发货 serviceType = 0
if (serviceType === 0) {
// 实物商品-仅退款未发货 serviceType = 0, 仅退款(发货中) serviceType = 4
if (serviceType === 0 || serviceType === 4) {
// 待商户审核14 待审核0
if ([14, 0].includes(status)) {
return [cancelAuditBtn, cancelDetailBtn, viewLogBtn];
......
src/pages/AfterSaleManage/index.jsx
View file @ ba103189
......@@ -300,7 +300,7 @@ const AfterSale = props => {
const clientInfo = getClientInfo();
const calculationLayoutHeight = e => {
const otherHeight = typeof e === 'number' ? e : 330;
const h = clientInfo.height - scrollYRef.current.offsetTop - otherHeight;
const h = clientInfo.height - (scrollYRef?.current?.offsetTop || 0) - otherHeight;
setTableScrollY(h < 500 ? '500px' : h);
};
......
src/pages/cancelBillManage/data.js
View file @ ba103189
......@@ -14,6 +14,7 @@ export const column = [
<div>
{r.auditTimeOut ? <Tag color="red">{orderId}</Tag> : orderId}
{<Badge count={r.reminderFlag ? '催' : ''} size="small" />}
{<Badge count={+r.autoCancelTimeType === 1 ? '大额支付' : ''} size="default" />}
</div>
),
},
......
src/utils/websocket.js
View file @ ba103189
......@@ -100,9 +100,12 @@ class Socket extends EventEmitter {
};
onerror = e => {
console.log('ws: error', e);
try {
this.socket = null;
this.event.emit('error', e);
} catch {
console.log('ws: error', e);
}
};
sendMessage = value => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment