Skip to content

O
op-web-service
Commit e007fb32 authored by liwenhong's avatar liwenhong
Browse files
Options

Merge branch 'master' into lwh/head-distribution 

# Conflicts:
#	server/utils/request.js
#	src/pages/Activity/ActivityDetail/index.vue
#	src/pages/Activity/releaseProduc/components/addProduc.vue
#	src/pages/Activity/releaseProduc/components/infoEditing.vue
#	src/pages/Activity/releaseProduc/components/myMap.vue
#	src/pages/Activity/releaseProduc/index.vue
#	src/pages/Goods/Detail/index.vue
#	src/utils/util.js
parents c3a373c3 e0d63de7
Show whitespace changes
Inline Side-by-side
Showing with 15633 additions and 15460 deletions
package-lock.json
View file @ e007fb32
...@@ -2167,17 +2167,6 @@ ...@@ -2167,17 +2167,6 @@
"color-convert": "^2.0.1" "color-convert": "^2.0.1"
} }
}, },
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646734234&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz",
"integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"cliui": { "cliui": {
"version": "6.0.0", "version": "6.0.0",
"resolved": "https://registry.npm.taobao.org/cliui/download/cliui-6.0.0.tgz", "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-6.0.0.tgz",
...@@ -2213,25 +2202,6 @@ ...@@ -2213,25 +2202,6 @@
"ms": "2.1.2" "ms": "2.1.2"
} }
}, },
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
"integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
"dev": true,
"optional": true
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.nlark.com/loader-utils/download/loader-utils-2.0.0.tgz",
"integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"ms": { "ms": {
"version": "2.1.2", "version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz?cache=0&sync_timestamp=1607433988749&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.1.2.tgz", "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz?cache=0&sync_timestamp=1607433988749&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.1.2.tgz",
...@@ -2247,28 +2217,6 @@ ...@@ -2247,28 +2217,6 @@
"minipass": "^3.1.1" "minipass": "^3.1.1"
} }
}, },
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1626703400240&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
"integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.5.0",
"resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.5.0.tgz?cache=0&sync_timestamp=1628666727543&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.5.0.tgz",
"integrity": "sha1-CcTgcSRmiZ40uZpoZSTxkWX7KJI=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
}
},
"wrap-ansi": { "wrap-ansi": {
"version": "6.2.0", "version": "6.2.0",
"resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-6.2.0.tgz", "resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-6.2.0.tgz",
...@@ -2796,7 +2744,7 @@ ...@@ -2796,7 +2744,7 @@
}, },
"aggregate-error": { "aggregate-error": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npm.taobao.org/aggregate-error/download/aggregate-error-3.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faggregate-error%2Fdownload%2Faggregate-error-3.1.0.tgz", "resolved": "https://registry.npm.taobao.org/aggregate-error/download/aggregate-error-3.1.0.tgz?cache=0&sync_timestamp=1618681544430&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faggregate-error%2Fdownload%2Faggregate-error-3.1.0.tgz",
"integrity": "sha1-kmcP9Q9TWb23o+DUDQ7DDFc3aHo=", "integrity": "sha1-kmcP9Q9TWb23o+DUDQ7DDFc3aHo=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -4339,7 +4287,7 @@ ...@@ -4339,7 +4287,7 @@
}, },
"cli-truncate": { "cli-truncate": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.nlark.com/cli-truncate/download/cli-truncate-2.1.0.tgz?cache=0&sync_timestamp=1628634500202&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcli-truncate%2Fdownload%2Fcli-truncate-2.1.0.tgz", "resolved": "https://registry.nlark.com/cli-truncate/download/cli-truncate-2.1.0.tgz",
"integrity": "sha1-w54ovwXtzeW+O5iZKiLe7Vork8c=", "integrity": "sha1-w54ovwXtzeW+O5iZKiLe7Vork8c=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -4364,7 +4312,7 @@ ...@@ -4364,7 +4312,7 @@
}, },
"color-convert": { "color-convert": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz", "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -4373,13 +4321,13 @@ ...@@ -4373,13 +4321,13 @@
}, },
"color-name": { "color-name": {
"version": "1.1.4", "version": "1.1.4",
"resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz", "resolved": "https://registry.nlark.com/color-name/download/color-name-1.1.4.tgz",
"integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
"dev": true "dev": true
}, },
"slice-ansi": { "slice-ansi": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/slice-ansi/download/slice-ansi-3.0.0.tgz?cache=0&sync_timestamp=1618554945131&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fslice-ansi%2Fdownload%2Fslice-ansi-3.0.0.tgz", "resolved": "https://registry.nlark.com/slice-ansi/download/slice-ansi-3.0.0.tgz",
"integrity": "sha1-Md3BCTCht+C2ewjJbC9Jt3p4l4c=", "integrity": "sha1-Md3BCTCht+C2ewjJbC9Jt3p4l4c=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -7975,7 +7923,7 @@ ...@@ -7975,7 +7923,7 @@
}, },
"indent-string": { "indent-string": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npm.taobao.org/indent-string/download/indent-string-4.0.0.tgz?cache=0&sync_timestamp=1618679442183&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Findent-string%2Fdownload%2Findent-string-4.0.0.tgz", "resolved": "https://registry.nlark.com/indent-string/download/indent-string-4.0.0.tgz",
"integrity": "sha1-Yk+PRJfWGbLZdoUx1Y9BIoVNclE=", "integrity": "sha1-Yk+PRJfWGbLZdoUx1Y9BIoVNclE=",
"dev": true "dev": true
}, },
...@@ -8434,7 +8382,7 @@ ...@@ -8434,7 +8382,7 @@
}, },
"is-regexp": { "is-regexp": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/is-regexp/download/is-regexp-1.0.0.tgz?cache=0&sync_timestamp=1617816642607&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-regexp%2Fdownload%2Fis-regexp-1.0.0.tgz", "resolved": "https://registry.nlark.com/is-regexp/download/is-regexp-1.0.0.tgz",
"integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=", "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
"dev": true "dev": true
}, },
...@@ -9037,7 +8985,7 @@ ...@@ -9037,7 +8985,7 @@
}, },
"braces": { "braces": {
"version": "3.0.2", "version": "3.0.2",
"resolved": "https://registry.npm.taobao.org/braces/download/braces-3.0.2.tgz", "resolved": "https://registry.nlark.com/braces/download/braces-3.0.2.tgz",
"integrity": "sha1-NFThpGLujVmeI23zNs2epPiv4Qc=", "integrity": "sha1-NFThpGLujVmeI23zNs2epPiv4Qc=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9046,7 +8994,7 @@ ...@@ -9046,7 +8994,7 @@
}, },
"chalk": { "chalk": {
"version": "4.1.2", "version": "4.1.2",
"resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646655305&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz", "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646734234&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz",
"integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=", "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9056,7 +9004,7 @@ ...@@ -9056,7 +9004,7 @@
}, },
"color-convert": { "color-convert": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz", "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9065,19 +9013,19 @@ ...@@ -9065,19 +9013,19 @@
}, },
"color-name": { "color-name": {
"version": "1.1.4", "version": "1.1.4",
"resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz", "resolved": "https://registry.nlark.com/color-name/download/color-name-1.1.4.tgz",
"integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
"dev": true "dev": true
}, },
"commander": { "commander": {
"version": "7.2.0", "version": "7.2.0",
"resolved": "https://registry.nlark.com/commander/download/commander-7.2.0.tgz?cache=0&sync_timestamp=1627358314526&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcommander%2Fdownload%2Fcommander-7.2.0.tgz", "resolved": "https://registry.nlark.com/commander/download/commander-7.2.0.tgz?cache=0&sync_timestamp=1627359190297&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcommander%2Fdownload%2Fcommander-7.2.0.tgz",
"integrity": "sha1-o2y1fQtQHOEI5NIFWaFQo5HZerc=", "integrity": "sha1-o2y1fQtQHOEI5NIFWaFQo5HZerc=",
"dev": true "dev": true
}, },
"cosmiconfig": { "cosmiconfig": {
"version": "7.0.1", "version": "7.0.1",
"resolved": "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.1.tgz", "resolved": "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.1.tgz?cache=0&sync_timestamp=1629602330801&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.1.tgz",
"integrity": "sha1-cU11ZSLKzoZ4Z8y0R0xdAbuuXW0=", "integrity": "sha1-cU11ZSLKzoZ4Z8y0R0xdAbuuXW0=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9127,7 +9075,7 @@ ...@@ -9127,7 +9075,7 @@
}, },
"fill-range": { "fill-range": {
"version": "7.0.1", "version": "7.0.1",
"resolved": "https://registry.npm.taobao.org/fill-range/download/fill-range-7.0.1.tgz", "resolved": "https://registry.nlark.com/fill-range/download/fill-range-7.0.1.tgz",
"integrity": "sha1-GRmmp8df44ssfHflGYU12prN2kA=", "integrity": "sha1-GRmmp8df44ssfHflGYU12prN2kA=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9136,7 +9084,7 @@ ...@@ -9136,7 +9084,7 @@
}, },
"get-stream": { "get-stream": {
"version": "6.0.1", "version": "6.0.1",
"resolved": "https://registry.npm.taobao.org/get-stream/download/get-stream-6.0.1.tgz", "resolved": "https://registry.nlark.com/get-stream/download/get-stream-6.0.1.tgz",
"integrity": "sha1-omLY7vZ6ztV8KFKtYWdSakPL97c=", "integrity": "sha1-omLY7vZ6ztV8KFKtYWdSakPL97c=",
"dev": true "dev": true
}, },
...@@ -9154,7 +9102,7 @@ ...@@ -9154,7 +9102,7 @@
}, },
"import-fresh": { "import-fresh": {
"version": "3.3.0", "version": "3.3.0",
"resolved": "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.3.0.tgz?cache=0&sync_timestamp=1608469532269&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimport-fresh%2Fdownload%2Fimport-fresh-3.3.0.tgz", "resolved": "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.3.0.tgz?cache=0&sync_timestamp=1608469520474&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimport-fresh%2Fdownload%2Fimport-fresh-3.3.0.tgz",
"integrity": "sha1-NxYsJfy566oublPVtNiM4X2eDCs=", "integrity": "sha1-NxYsJfy566oublPVtNiM4X2eDCs=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9164,7 +9112,7 @@ ...@@ -9164,7 +9112,7 @@
}, },
"is-number": { "is-number": {
"version": "7.0.0", "version": "7.0.0",
"resolved": "https://registry.npm.taobao.org/is-number/download/is-number-7.0.0.tgz", "resolved": "https://registry.nlark.com/is-number/download/is-number-7.0.0.tgz",
"integrity": "sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss=", "integrity": "sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss=",
"dev": true "dev": true
}, },
...@@ -9196,7 +9144,7 @@ ...@@ -9196,7 +9144,7 @@
}, },
"mimic-fn": { "mimic-fn": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/mimic-fn/download/mimic-fn-2.1.0.tgz?cache=0&sync_timestamp=1617823583529&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmimic-fn%2Fdownload%2Fmimic-fn-2.1.0.tgz", "resolved": "https://registry.nlark.com/mimic-fn/download/mimic-fn-2.1.0.tgz",
"integrity": "sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs=", "integrity": "sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs=",
"dev": true "dev": true
}, },
...@@ -9217,7 +9165,7 @@ ...@@ -9217,7 +9165,7 @@
}, },
"onetime": { "onetime": {
"version": "5.1.2", "version": "5.1.2",
"resolved": "https://registry.npm.taobao.org/onetime/download/onetime-5.1.2.tgz", "resolved": "https://registry.nlark.com/onetime/download/onetime-5.1.2.tgz",
"integrity": "sha1-0Oluu1awdHbfHdnEgG5SN5hcpF4=", "integrity": "sha1-0Oluu1awdHbfHdnEgG5SN5hcpF4=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9232,13 +9180,13 @@ ...@@ -9232,13 +9180,13 @@
}, },
"path-type": { "path-type": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npm.taobao.org/path-type/download/path-type-4.0.0.tgz", "resolved": "https://registry.npm.taobao.org/path-type/download/path-type-4.0.0.tgz?cache=0&sync_timestamp=1611752074264&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpath-type%2Fdownload%2Fpath-type-4.0.0.tgz",
"integrity": "sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs=", "integrity": "sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs=",
"dev": true "dev": true
}, },
"resolve-from": { "resolve-from": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npm.taobao.org/resolve-from/download/resolve-from-4.0.0.tgz", "resolved": "https://registry.nlark.com/resolve-from/download/resolve-from-4.0.0.tgz",
"integrity": "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY=", "integrity": "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY=",
"dev": true "dev": true
}, },
...@@ -9288,7 +9236,7 @@ ...@@ -9288,7 +9236,7 @@
}, },
"listr2": { "listr2": {
"version": "3.11.0", "version": "3.11.0",
"resolved": "https://registry.nlark.com/listr2/download/listr2-3.11.0.tgz?cache=0&sync_timestamp=1626978156161&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flistr2%2Fdownload%2Flistr2-3.11.0.tgz", "resolved": "https://registry.nlark.com/listr2/download/listr2-3.11.0.tgz",
"integrity": "sha1-l3GwJAeHWqeOc9bg/2VBu+wKruk=", "integrity": "sha1-l3GwJAeHWqeOc9bg/2VBu+wKruk=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9312,7 +9260,7 @@ ...@@ -9312,7 +9260,7 @@
}, },
"color-convert": { "color-convert": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz", "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9321,13 +9269,13 @@ ...@@ -9321,13 +9269,13 @@
}, },
"color-name": { "color-name": {
"version": "1.1.4", "version": "1.1.4",
"resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz", "resolved": "https://registry.nlark.com/color-name/download/color-name-1.1.4.tgz",
"integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
"dev": true "dev": true
}, },
"p-map": { "p-map": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.nlark.com/p-map/download/p-map-4.0.0.tgz?cache=0&sync_timestamp=1627082385032&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-map%2Fdownload%2Fp-map-4.0.0.tgz", "resolved": "https://registry.nlark.com/p-map/download/p-map-4.0.0.tgz?cache=0&sync_timestamp=1627082563421&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-map%2Fdownload%2Fp-map-4.0.0.tgz",
"integrity": "sha1-uy+Vpe2i7BaOySdOBqdHw+KQTSs=", "integrity": "sha1-uy+Vpe2i7BaOySdOBqdHw+KQTSs=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9336,7 +9284,7 @@ ...@@ -9336,7 +9284,7 @@
}, },
"wrap-ansi": { "wrap-ansi": {
"version": "7.0.0", "version": "7.0.0",
"resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-7.0.0.tgz", "resolved": "https://registry.nlark.com/wrap-ansi/download/wrap-ansi-7.0.0.tgz",
"integrity": "sha1-Z+FFz/UQpqaYS98RUpEdadLrnkM=", "integrity": "sha1-Z+FFz/UQpqaYS98RUpEdadLrnkM=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9538,7 +9486,7 @@ ...@@ -9538,7 +9486,7 @@
}, },
"log-update": { "log-update": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npm.taobao.org/log-update/download/log-update-4.0.0.tgz", "resolved": "https://registry.nlark.com/log-update/download/log-update-4.0.0.tgz",
"integrity": "sha1-WJ7NNSRx8qHAxXAodUOmTf0g4KE=", "integrity": "sha1-WJ7NNSRx8qHAxXAodUOmTf0g4KE=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9574,7 +9522,7 @@ ...@@ -9574,7 +9522,7 @@
}, },
"color-convert": { "color-convert": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz", "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9583,19 +9531,19 @@ ...@@ -9583,19 +9531,19 @@
}, },
"color-name": { "color-name": {
"version": "1.1.4", "version": "1.1.4",
"resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz", "resolved": "https://registry.nlark.com/color-name/download/color-name-1.1.4.tgz",
"integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
"dev": true "dev": true
}, },
"mimic-fn": { "mimic-fn": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/mimic-fn/download/mimic-fn-2.1.0.tgz?cache=0&sync_timestamp=1617823583529&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmimic-fn%2Fdownload%2Fmimic-fn-2.1.0.tgz", "resolved": "https://registry.nlark.com/mimic-fn/download/mimic-fn-2.1.0.tgz",
"integrity": "sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs=", "integrity": "sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs=",
"dev": true "dev": true
}, },
"onetime": { "onetime": {
"version": "5.1.2", "version": "5.1.2",
"resolved": "https://registry.npm.taobao.org/onetime/download/onetime-5.1.2.tgz", "resolved": "https://registry.nlark.com/onetime/download/onetime-5.1.2.tgz",
"integrity": "sha1-0Oluu1awdHbfHdnEgG5SN5hcpF4=", "integrity": "sha1-0Oluu1awdHbfHdnEgG5SN5hcpF4=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9614,7 +9562,7 @@ ...@@ -9614,7 +9562,7 @@
}, },
"slice-ansi": { "slice-ansi": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npm.taobao.org/slice-ansi/download/slice-ansi-4.0.0.tgz?cache=0&sync_timestamp=1618554945131&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fslice-ansi%2Fdownload%2Fslice-ansi-4.0.0.tgz", "resolved": "https://registry.nlark.com/slice-ansi/download/slice-ansi-4.0.0.tgz",
"integrity": "sha1-UA6N0P1VsFgVCGJVsxla3ypF/ms=", "integrity": "sha1-UA6N0P1VsFgVCGJVsxla3ypF/ms=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9625,7 +9573,7 @@ ...@@ -9625,7 +9573,7 @@
}, },
"wrap-ansi": { "wrap-ansi": {
"version": "6.2.0", "version": "6.2.0",
"resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-6.2.0.tgz", "resolved": "https://registry.nlark.com/wrap-ansi/download/wrap-ansi-6.2.0.tgz",
"integrity": "sha1-6Tk7oHEC5skaOyIUePAlfNKFblM=", "integrity": "sha1-6Tk7oHEC5skaOyIUePAlfNKFblM=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -10955,7 +10903,7 @@ ...@@ -10955,7 +10903,7 @@
}, },
"please-upgrade-node": { "please-upgrade-node": {
"version": "3.2.0", "version": "3.2.0",
"resolved": "https://registry.npm.taobao.org/please-upgrade-node/download/please-upgrade-node-3.2.0.tgz", "resolved": "https://registry.nlark.com/please-upgrade-node/download/please-upgrade-node-3.2.0.tgz",
"integrity": "sha1-rt3T+ZTJM+StmLmdmlVu+g4v6UI=", "integrity": "sha1-rt3T+ZTJM+StmLmdmlVu+g4v6UI=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -11869,7 +11817,7 @@ ...@@ -11869,7 +11817,7 @@
}, },
"prettier": { "prettier": {
"version": "2.3.2", "version": "2.3.2",
"resolved": "https://registry.nlark.com/prettier/download/prettier-2.3.2.tgz?cache=0&sync_timestamp=1624696193562&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fprettier%2Fdownload%2Fprettier-2.3.2.tgz", "resolved": "https://registry.nlark.com/prettier/download/prettier-2.3.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fprettier%2Fdownload%2Fprettier-2.3.2.tgz",
"integrity": "sha1-7ygKBewlNxLkhiM9tcbyNEHnNC0=", "integrity": "sha1-7ygKBewlNxLkhiM9tcbyNEHnNC0=",
"dev": true "dev": true
}, },
...@@ -12792,7 +12740,7 @@ ...@@ -12792,7 +12740,7 @@
}, },
"semver-compare": { "semver-compare": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/semver-compare/download/semver-compare-1.0.0.tgz", "resolved": "https://registry.nlark.com/semver-compare/download/semver-compare-1.0.0.tgz",
"integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=", "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
"dev": true "dev": true
}, },
...@@ -13615,7 +13563,7 @@ ...@@ -13615,7 +13563,7 @@
}, },
"string-argv": { "string-argv": {
"version": "0.3.1", "version": "0.3.1",
"resolved": "https://registry.npm.taobao.org/string-argv/download/string-argv-0.3.1.tgz", "resolved": "https://registry.nlark.com/string-argv/download/string-argv-0.3.1.tgz",
"integrity": "sha1-leL77AQnrhkYSTX4FtdKqkxcGdo=", "integrity": "sha1-leL77AQnrhkYSTX4FtdKqkxcGdo=",
"dev": true "dev": true
}, },
...@@ -13678,7 +13626,7 @@ ...@@ -13678,7 +13626,7 @@
"dependencies": { "dependencies": {
"is-obj": { "is-obj": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/is-obj/download/is-obj-1.0.1.tgz", "resolved": "https://registry.npm.taobao.org/is-obj/download/is-obj-1.0.1.tgz?cache=0&sync_timestamp=1618600242427&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-obj%2Fdownload%2Fis-obj-1.0.1.tgz",
"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
"dev": true "dev": true
} }
...@@ -14814,6 +14762,87 @@ ...@@ -14814,6 +14762,87 @@
} }
} }
}, },
"vue-loader-v16": {
"version": "npm:vue-loader@16.5.0",
"resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.5.0.tgz?cache=0&sync_timestamp=1628666727543&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.5.0.tgz",
"integrity": "sha1-CcTgcSRmiZ40uZpoZSTxkWX7KJI=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz",
"integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646734234&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz",
"integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.nlark.com/color-name/download/color-name-1.1.4.tgz",
"integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
"dev": true,
"optional": true
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
"integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
"dev": true,
"optional": true
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.nlark.com/loader-utils/download/loader-utils-2.0.0.tgz",
"integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1626703400240&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
"integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"vue-router": { "vue-router": {
"version": "4.0.8", "version": "4.0.8",
"resolved": "https://registry.nlark.com/vue-router/download/vue-router-4.0.8.tgz", "resolved": "https://registry.nlark.com/vue-router/download/vue-router-4.0.8.tgz",
...@@ -15592,7 +15621,7 @@ ...@@ -15592,7 +15621,7 @@
}, },
"yaml": { "yaml": {
"version": "1.10.2", "version": "1.10.2",
"resolved": "https://registry.nlark.com/yaml/download/yaml-1.10.2.tgz", "resolved": "https://registry.nlark.com/yaml/download/yaml-1.10.2.tgz?cache=0&sync_timestamp=1626517461854&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fyaml%2Fdownload%2Fyaml-1.10.2.tgz",
"integrity": "sha1-IwHF/78StGfejaIzOkWeKeeSDks=", "integrity": "sha1-IwHF/78StGfejaIzOkWeKeeSDks=",
"dev": true "dev": true
}, },
......
public/index.html
View file @ e007fb32
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
<% for (let i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.js) { %> <% for (let i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.js) { %>
<script src="<%= htmlWebpackPlugin.options.cdn.js[i] %>"></script> <script src="<%= htmlWebpackPlugin.options.cdn.js[i] %>"></script>
<% } %> <% } %>
<script src="//webapi.amap.com/maps?v=1.3&key=bb057625545d8cf77df1379e7aaae0b5"></script>
<script src="//webapi.amap.com/ui/1.0/main.js"></script>
<title><%= htmlWebpackPlugin.options.title %></title> <title><%= htmlWebpackPlugin.options.title %></title>
</head> </head>
......
server/controllers/relay.js 0 → 100644
View file @ e007fb32
const fs = require("fs");
const API_INTERNAL_URI = require("../config.js").API_INTERNAL_URI;
const reqOther = require("../utils/request").httpReqOther;
const FormData = require("form-data");
const http = require("http");
const GROUPMEAL_URI = require("../config.js").GROUPMEAL_URI;
exports.uploadPic = async (ctx, next) => {
const url = `${API_INTERNAL_URI}/ksy/ks3apiunencrypt/ks3api_upload`;
const {
body: { type },
files,
} = ctx.request;
console.log("type", type);
const filePath = files.file.path;
const file = fs.createReadStream(filePath);
const form = new FormData();
form.append("file", file);
form.append("type", type);
const opts = {
method: "post",
url: url,
body: form,
headers: form.getHeaders(),
};
ctx.body = await reqOther(opts);
};
exports.oldOrderExport = async (ctx) => {
const { marketing_id, type } = ctx.query;
// `${ENV}order/oldbackground/order_export?marketing_id=${eventId}&type=${type}`;
const url = `${GROUPMEAL_URI}/order/oldbackground/order_export?marketing_id=${marketing_id}&type=${type}`;
console.log("url", url);
const options = new URL(url);
let { buffer, res } = await requestPromise(options);
const fileName = res.headers["content-disposition"].split("=")[1];
ctx.set("Content-Type", "application/octet-stream");
ctx.set("Content-Disposition", `attachment; filename=${fileName}`);
ctx.body = buffer;
};
exports.orderExport = async (ctx) => {
const { marketing_id, type } = ctx.query;
const url = `${GROUPMEAL_URI}/order/background/order_export?marketing_id=${marketing_id}&type=${type}`;
console.log("url", url);
const options = new URL(url);
let { buffer, res } = await requestPromise(options);
const fileName = res.headers["content-disposition"].split("=")[1];
ctx.set("Content-Type", "application/octet-stream");
ctx.set("Content-Disposition", `attachment; filename=${fileName}`);
ctx.body = buffer;
};
function requestPromise(options) {
return new Promise(function (resolve, reject) {
const req = http.request(options, function (res) {
let { statusCode } = res;
//返回不是200
if (statusCode !== 200) {
return reject(new Error("error"));
}
let arr = [];
let len = 0;
res.on("data", (chunk) => {
len += chunk.length;
arr.push(Buffer.from(chunk));
});
res.on("end", () => {
//正确 success
return resolve({
buffer: Buffer.concat(arr, len),
res,
});
});
});
//请求出错
req.on("error", (err) => {
return reject(err);
});
req.end();
});
}
server/router.js
View file @ e007fb32
...@@ -10,6 +10,7 @@ const activity = require("./controllers/activity"); ...@@ -10,6 +10,7 @@ const activity = require("./controllers/activity");
const withdrawal = require("./controllers/withdrawal"); const withdrawal = require("./controllers/withdrawal");
const groupmeal = require("./controllers/groupmeal"); const groupmeal = require("./controllers/groupmeal");
const qr_code = require("./controllers/qr-code"); const qr_code = require("./controllers/qr-code");
const relay = require("./controllers/relay");
const router = Router(); const router = Router();
const API_VERSION = "/api/v1"; const API_VERSION = "/api/v1";
...@@ -143,4 +144,9 @@ router.post(`${API_VERSION}/get_reblack_list`, withdrawal.getReblackList); ...@@ -143,4 +144,9 @@ router.post(`${API_VERSION}/get_reblack_list`, withdrawal.getReblackList);
router.get(`${API_VERSION}/get_wallet_account_status`, withdrawal.getWalletAccountStatus); router.get(`${API_VERSION}/get_wallet_account_status`, withdrawal.getWalletAccountStatus);
router.post(`${API_VERSION}/reset_wallet_account_status`, withdrawal.resetAccountStatus); router.post(`${API_VERSION}/reset_wallet_account_status`, withdrawal.resetAccountStatus);
// 图片上传
router.post(`${API_VERSION}/relay/ks3api_upload`, relay.uploadPic);
router.get(`${API_VERSION}/relay/order_export`, relay.orderExport);
router.get(`${API_VERSION}/relay/old_order_export`, relay.oldOrderExport);
module.exports = router; module.exports = router;
server/utils/request.js
View file @ e007fb32
...@@ -28,3 +28,17 @@ exports.httpReq = (ctx, opts) => { ...@@ -28,3 +28,17 @@ exports.httpReq = (ctx, opts) => {
}); });
}); });
}; };
exports.httpReqOther = (opts) => {
opts.timeout = opts.timeout || 10000;
return new Promise((resolve, reject) => {
request(opts, (err, res, body) => {
if (!err) {
resolve(body);
} else {
reject(err);
console.error(opts.url, err);
}
});
});
};
src/pages/Activity/releaseProduc/components/addProduc.vue
View file @ e007fb32
...@@ -188,9 +188,8 @@ ...@@ -188,9 +188,8 @@
</template> </template>
<script> <script>
import { GOODS_URI } from "../../../../../server/config";
import { ElMessage } from "element-plus"; import { ElMessage } from "element-plus";
import { getCookie } from "@/utils/util"; import { getCookie, UploadPicUrl } from "@/utils/util";
import { addGoods, getBusinessList, pindanGoods, markGoodsInfo, editGoods } from "../../../../service/Activity/index"; import { addGoods, getBusinessList, pindanGoods, markGoodsInfo, editGoods } from "../../../../service/Activity/index";
// 当选择（每人最多买时 添加验证（非空）） // 当选择（每人最多买时 添加验证（非空））
...@@ -249,7 +248,7 @@ ...@@ -249,7 +248,7 @@
picUrlList: [], picUrlList: [],
picUploadList: [], // 上传详情图片列表 picUploadList: [], // 上传详情图片列表
isShowPopver: false, // 是否展示图片框 isShowPopver: false, // 是否展示图片框
uploadUrl: `${GOODS_URI}/ksy/ks3apiunencrypt/ks3api_upload`, // 金山云上传地址 uploadUrl: UploadPicUrl, // 金山云上传地址
hideUpload: false, hideUpload: false,
limitCount: 1, limitCount: 1,
......
src/pages/Activity/releaseProduc/components/infoEditing.vue
View file @ e007fb32
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
</template> </template>
<script> <script>
import { GOODS_URI } from "../../../../../server/config"; import { UploadPicUrl } from "@/utils/util";
export default { export default {
props: { props: {
infoEditArr: { infoEditArr: {
...@@ -61,7 +62,7 @@ ...@@ -61,7 +62,7 @@
picSubmitList: [], // 发布功能需要的图片列表 picSubmitList: [], // 发布功能需要的图片列表
propData: {}, propData: {},
isShowPopver: false, // 是否展示图片框 isShowPopver: false, // 是否展示图片框
uploadUrl: `${GOODS_URI}/ksy/ks3apiunencrypt/ks3api_upload`, // 金山云上传地址 uploadUrl: UploadPicUrl, // 金山云上传地址
hideUpload: false, hideUpload: false,
limitCount: 9, limitCount: 9,
}; };
......
src/pages/Activity/releaseProduc/components/myMap.vue
View file @ e007fb32
...@@ -108,6 +108,7 @@ ...@@ -108,6 +108,7 @@
mapConfig.center = [this.lng, this.lat]; mapConfig.center = [this.lng, this.lat];
} }
let map = new AMap.Map("js-container", mapConfig); let map = new AMap.Map("js-container", mapConfig);
let _this = this;
// 加载地图搜索插件 // 加载地图搜索插件
AMap.service("AMap.PlaceSearch", () => { AMap.service("AMap.PlaceSearch", () => {
...@@ -119,6 +120,22 @@ ...@@ -119,6 +120,22 @@
map: map, map: map,
panel: "js-result", panel: "js-result",
}); });
this.placeSearch.on("selectChanged", function ({ selected }) {
console.log(selected);
const { address, location, pname, cityname, adname } = selected.data;
_this.dragData = {
lng: location.lng,
lat: location.lat,
address: address,
province: pname,
city: cityname,
area: adname,
};
_this.searchKey = "";
});
}); });
// 启用工具条 // 启用工具条
......
src/pages/Activity/releaseProduc/index.vue
View file @ e007fb32
...@@ -153,6 +153,7 @@ ...@@ -153,6 +153,7 @@
for (var i in this.addProducArr) { for (var i in this.addProducArr) {
this.goodsSkuIDArr.push(this.addProducArr[i].goods_sku_id); this.goodsSkuIDArr.push(this.addProducArr[i].goods_sku_id);
} }
this.goodsSkuIDArr = [...new Set(this.goodsSkuIDArr)];
this.startDate = this.$refs.spellOrderSet.startDate; this.startDate = this.$refs.spellOrderSet.startDate;
this.endDate = this.$refs.spellOrderSet.endDate; this.endDate = this.$refs.spellOrderSet.endDate;
let params = { let params = {
......
src/pages/Goods/Detail/index.vue
View file @ e007fb32
...@@ -458,7 +458,7 @@ ...@@ -458,7 +458,7 @@
editGoods, editGoods,
} from "@/service/Goods/goods"; } from "@/service/Goods/goods";
import { GOODS_URI } from "../../../../server/config.js"; import { UploadPicUrl } from "@/utils/util";
import filterInput from "../utils/filterInput"; import filterInput from "../utils/filterInput";
...@@ -608,7 +608,7 @@ ...@@ -608,7 +608,7 @@
activeStartTime: "", // 活动开始时间 activeStartTime: "", // 活动开始时间
activeEndTime: "", // 活动结束时间 activeEndTime: "", // 活动结束时间
uploadUrl: `${GOODS_URI}/ksy/ks3apiunencrypt/ks3api_upload`, // 金山云上传地址 uploadUrl: UploadPicUrl, // 金山云上传地址
addShopShow: false, // 添加门店弹框显示 addShopShow: false, // 添加门店弹框显示
......
src/pages/Groupmeal/headManagement/index.vue
View file @ e007fb32
...@@ -21,15 +21,26 @@ ...@@ -21,15 +21,26 @@
<!-- <el-button type="primary" size="small">审核</el-button> --> <!-- <el-button type="primary" size="small">审核</el-button> -->
<template #default="scope"> <template #default="scope">
<!-- v-if="scope.row.audit_status == 0" --> <!-- v-if="scope.row.audit_status == 0" -->
<el-button type="primary" size="mini" @click="apply(scope.row)">审核</el-button> <el-button type="primary" size="mini" @click="handleApplyItem(scope.row)">审核</el-button>
<el-button type="text" size="small" v-if="scope.row.audit_status == 1">通过</el-button> <el-button type="text" size="small" v-if="scope.row.audit_status == 1">通过</el-button>
<el-button type="primary" size="small" @click="addPoint(scope.row.colonel_apply_id)">添加自提点</el-button> <el-button type="primary" size="small" v-if="scope.row.take_place_status == 1" @click="addPoint(scope.row.colonel_apply_id)">
添加自提点
</el-button>
<!-- v-if="scope.row.take_place_status==1" --> <!-- v-if="scope.row.take_place_status==1" -->
<el-button type="text" size="small" v-if="scope.row.audit_status == 2">拒绝</el-button> <el-button type="text" size="small" v-if="scope.row.audit_status == 2">拒绝</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-dialog title="团长审核" v-model="dialogFormVisible">
您确认通过{{ applyItem.contact_name }}的团长申请吗
<template #footer>
<span class="dialog-footer">
<el-button @click="apply(applyItem, 2)">拒绝申请</el-button>
<el-button type="primary" @click="apply(applyItem, 1)">通过申请</el-button>
</span>
</template>
</el-dialog>
<el-dialog title="添加自提点" v-model="showAddPointDialog" width="50%" top="2%"> <el-dialog title="添加自提点" v-model="showAddPointDialog" width="50%" top="2%">
<el-form :model="pointObj"> <el-form :model="pointObj">
<el-form-item label="联系人姓名"> <el-form-item label="联系人姓名">
...@@ -78,6 +89,7 @@ ...@@ -78,6 +89,7 @@
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
<div class="marketing"> <div class="marketing">
<!-- 表头 --> <!-- 表头 -->
<div class="header"> <div class="header">
...@@ -126,6 +138,8 @@ ...@@ -126,6 +138,8 @@
fileList: [], fileList: [],
uploadUrl: `${GOODS_URI}/ksy/ks3apiunencrypt/ks3api_upload`, // 金山云上传地址 uploadUrl: `${GOODS_URI}/ksy/ks3apiunencrypt/ks3api_upload`, // 金山云上传地址
pickStation: {}, pickStation: {},
dialogFormVisible: false,
applyItem: {},
}; };
}, },
async created() { async created() {
...@@ -133,6 +147,10 @@ ...@@ -133,6 +147,10 @@
await this.getColoneApplyList(); await this.getColoneApplyList();
}, },
methods: { methods: {
handleApplyItem(item) {
this.applyItem = item;
this.dialogFormVisible = true;
},
handleDetailSuccess(res) { handleDetailSuccess(res) {
this.pointObj.take_place_pic = res.result.url; this.pointObj.take_place_pic = res.result.url;
}, },
...@@ -142,25 +160,12 @@ ...@@ -142,25 +160,12 @@
if (res.code !== 0) return this.$message.error(res.reason); if (res.code !== 0) return this.$message.error(res.reason);
else return this.$message.success("添加成功"); else return this.$message.success("添加成功");
}, },
apply(item) { async apply(item, type) {
// this.applyPopTitle = `您确认通过(${name})的团长申请吗` let res = await colonelAudit({ colonel_apply_id: item.colonel_apply_id, audit_status: type });
this.$confirm(`您确认${item.audit_status == 2 ? "通过" : "驳回"}(${item.contact_name})的团长申请吗`, "团长审核", {
confirmButtonText: "确定",
cancelButtonText: "拒绝",
center: true,
})
.then(async () => {
let res = await colonelAudit({ colonel_apply_id: item.colonel_apply_id, audit_status: 1 });
await this.getColoneApplyList(); await this.getColoneApplyList();
this.dialogFormVisible = false;
if (res.code !== 0) return this.$message.error(res.reason); if (res.code !== 0) return this.$message.error(res.reason);
else this.$message.success("操作成功"); else this.$message.success("操作成功");
})
.catch(async (err) => {
let res = await colonelAudit({ colonel_apply_id: item.colonel_apply_id, audit_status: 2 });
await this.getColoneApplyList();
if (res.code !== 0) return this.$message.error(res.reason);
else this.$message.success("操作成功");
});
}, },
async addPoint(id) { async addPoint(id) {
let res = await colonelApplyPoint({ colonel_apply_id: id }); let res = await colonelApplyPoint({ colonel_apply_id: id });
......
src/service/Groupmeal/groupmeal.js
View file @ e007fb32
...@@ -112,15 +112,21 @@ export async function orderRefundReject(params) { ...@@ -112,15 +112,21 @@ export async function orderRefundReject(params) {
// 导出订单 // 导出订单
export function getOrderExportURL(eventId, type) { export function getOrderExportURL(eventId, type) {
var ENV; // var ENV;
if (process.env.NODE_ENV == "development") { // if(process.env.NODE_ENV == "development"){
ENV = "http://bp-dev.ini.yidian-inc.com/"; // ENV = "http://bp-dev.ini.yidian-inc.com/"
} else if (process.env.NODE_ENV == "test") { // }else if(process.env.NODE_ENV == "test"){
ENV = "http://bp-test.ini.yidian-inc.com/"; // ENV = "http://bp-test.ini.yidian-inc.com/"
// }else{
// ENV = "http://bp.int.yidian-inc.com/"
// }
// return `${ENV}order/oldbackground/order_export?marketing_id=${eventId}&type=${type}`;
if (process.env.NODE_ENV === "development") {
return `http://127.0.0.1:8055/api/v1/relay/old_order_export?marketing_id=${eventId}&type=${type}`;
} else { } else {
ENV = "http://bp.int.yidian-inc.com/"; return `/api/v1/relay/old_order_export?marketing_id=${eventId}&type=${type}`;
} }
return `${ENV}order/oldbackground/order_export?marketing_id=${eventId}&type=${type}`;
} }
// 新订单管理 // 新订单管理
...@@ -191,13 +197,10 @@ export async function newOrderRefundReject(params) { ...@@ -191,13 +197,10 @@ export async function newOrderRefundReject(params) {
// 导出订单 // 导出订单
export function newGetOrderExportURL(eventId, type) { export function newGetOrderExportURL(eventId, type) {
var ENV; if (process.env.NODE_ENV === "development") {
if (process.env.NODE_ENV == "development") { return `http://127.0.0.1:8055/api/v1/relay/order_export?marketing_id=${eventId}&type=${type}`;
ENV = "http://bp-dev.ini.yidian-inc.com/";
} else if (process.env.NODE_ENV == "test") {
ENV = "http://bp-test.ini.yidian-inc.com/";
} else { } else {
ENV = "http://bp.int.yidian-inc.com/"; return `/api/v1/relay/order_export?marketing_id=${eventId}&type=${type}`;
} }
return `${ENV}order/background/order_export?marketing_id=${eventId}&type=${type}`; // return `/api/v1/relay/order_export?marketing_id=${eventId}&type=${type}`;
} }
src/utils/util.js
View file @ e007fb32
...@@ -67,3 +67,6 @@ export function delCookie() { ...@@ -67,3 +67,6 @@ export function delCookie() {
} }
} }
} }
export const UploadPicUrl =
process.env.NODE_ENV === "development" ? `http://127.0.0.1:8055/api/v1/relay/ks3api_upload` : "/api/v1/relay/ks3api_upload";
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