From d32ea4f1ce6dd94c762ba8b63919e051769baa75 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 18 May 2021 14:18:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=B4=A2=E5=BC=95=E5=88=9D=E5=A7=8B=E5=8C=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/api/index.js | 5 +++++ .../sys/setting-manage/setting/GOODS_SETTING.vue | 16 +++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/manager/src/api/index.js b/manager/src/api/index.js index 658ad6cd..30be8a95 100644 --- a/manager/src/api/index.js +++ b/manager/src/api/index.js @@ -411,3 +411,8 @@ export const getChildRegion = (id) => { export const resetPassword = (params) => { return postRequest(`/user/resetPassword/${params}"`); }; + +// 初始化商品索引 +export const createIndex = () => { + return getRequest(`/elasticsearch`); +}; diff --git a/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue b/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue index 42359af9..88d59d2c 100644 --- a/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue +++ b/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue @@ -55,14 +55,14 @@
- +
- - - diff --git a/manager/src/views/promotion/coupon/couponPublish.vue b/manager/src/views/promotion/coupon/couponPublish.vue index 10ead81a..a58aee0e 100644 --- a/manager/src/views/promotion/coupon/couponPublish.vue +++ b/manager/src/views/promotion/coupon/couponPublish.vue @@ -459,7 +459,7 @@ export default { let ids = []; let list = []; this.form.promotionGoodsList.forEach((e) => { - ids.push(e.id); + ids.push(e.skuId); }); item.forEach((e) => { if (!ids.includes(e.id)) { @@ -478,7 +478,7 @@ export default { }, getGoodsCategory(e) { // 获取级联选择器商品分类id - console.log(e); + // console.log(e); }, async getCagetoryList() { diff --git a/manager/src/views/promotion/pointsGoods/addPointsGoods.vue b/manager/src/views/promotion/pointsGoods/addPointsGoods.vue index 7cc7f5d1..895f23c7 100644 --- a/manager/src/views/promotion/pointsGoods/addPointsGoods.vue +++ b/manager/src/views/promotion/pointsGoods/addPointsGoods.vue @@ -396,7 +396,7 @@ export default { let ids = []; let list = []; this.form.promotionGoodsList.forEach((e) => { - ids.push(e.id); + ids.push(e.skuId); }); item.forEach((e) => { if (!ids.includes(e.id)) { diff --git a/manager/src/views/sys/menu-manage/menuManage.vue b/manager/src/views/sys/menu-manage/menuManage.vue index 920fa190..b2e07467 100644 --- a/manager/src/views/sys/menu-manage/menuManage.vue +++ b/manager/src/views/sys/menu-manage/menuManage.vue @@ -111,34 +111,9 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/seller/src/libs/icon.js b/seller/src/libs/icon.js deleted file mode 100644 index b1fa5323..00000000 --- a/seller/src/libs/icon.js +++ /dev/null @@ -1,3513 +0,0 @@ -export const icons = [ - { - "icons": [ - "ios-add-circle-outline" - ], - "tags": [ - "circle" - ] - }, - { - "icons": [ - "ios-add-circle", - "md-add-circle" - ], - "tags": [ - "add", - "circle" - ] - }, - { - "icons": [ - "ios-add", - "md-add" - ], - "tags": [ - "add", - "include", - "invite", - "plus" - ] - }, - { - "icons": [ - "ios-alarm", - "md-alarm" - ], - "tags": [ - "alarm" - ] - }, - { - "icons": [ - "ios-albums", - "md-albums" - ], - "tags": [ - "albums", - "boxes", - "slides", - "square" - ] - }, - { - "icons": [ - "ios-alert", - "md-alert" - ], - "tags": [ - "!", - "alert", - "attention", - "exclamation", - "notice", - "warning" - ] - }, - { - "icons": [ - "ios-american-football", - "md-american-football" - ], - "tags": [ - "american", - "football" - ] - }, - { - "icons": [ - "ios-analytics", - "md-analytics" - ], - "tags": [ - "analytics", - "data", - "metrics", - "track" - ] - }, - { - "icons": [ - "ios-aperture", - "md-aperture" - ], - "tags": [ - "aperture", - "dark", - "images", - "levels", - "light", - "settings" - ] - }, - { - "icons": [ - "ios-apps", - "md-apps" - ], - "tags": [ - "apps", - "applications" - ] - }, - { - "icons": [ - "ios-appstore", - "md-appstore" - ], - "tags": [ - "appstore", - "store" - ] - }, - { - "icons": [ - "ios-archive", - "md-archive" - ], - "tags": [ - "archive", - "email" - ] - }, - { - "icons": [ - "ios-arrow-back", - "md-arrow-back" - ], - "tags": [ - "arrow", - "back", - "chevron", - "navigation" - ] - }, - { - "icons": [ - "ios-arrow-down", - "md-arrow-down" - ], - "tags": [ - "arrow", - "chevron", - "down" - ] - }, - { - "icons": [ - "ios-arrow-dropdown-circle", - "md-arrow-dropdown-circle" - ], - "tags": [ - "arrow", - "circle", - "dropdown" - ] - }, - { - "icons": [ - "ios-arrow-dropdown", - "md-arrow-dropdown" - ], - "tags": [ - "arrow", - "dropdown" - ] - }, - { - "icons": [ - "ios-arrow-dropleft-circle", - "md-arrow-dropleft-circle" - ], - "tags": [ - "arrow", - "circle", - "dropleft" - ] - }, - { - "icons": [ - "ios-arrow-dropleft", - "md-arrow-dropleft" - ], - "tags": [ - "arrow", - "dropleft" - ] - }, - { - "icons": [ - "ios-arrow-dropright-circle", - "md-arrow-dropright-circle" - ], - "tags": [ - "arrow", - "circle", - "dropright" - ] - }, - { - "icons": [ - "ios-arrow-dropright", - "md-arrow-dropright" - ], - "tags": [ - "arrow", - "dropright" - ] - }, - { - "icons": [ - "ios-arrow-dropup-circle", - "md-arrow-dropup-circle" - ], - "tags": [ - "arrow", - "circle", - "dropup" - ] - }, - { - "icons": [ - "ios-arrow-dropup", - "md-arrow-dropup" - ], - "tags": [ - "arrow", - "dropup" - ] - }, - { - "icons": [ - "ios-arrow-forward", - "md-arrow-forward" - ], - "tags": [ - "arrow", - "chevron", - "forward", - "navigation" - ] - }, - { - "icons": [ - "ios-arrow-round-back", - "md-arrow-round-back" - ], - "tags": [ - "arrow", - "back", - "round" - ] - }, - { - "icons": [ - "ios-arrow-round-down", - "md-arrow-round-down" - ], - "tags": [ - "arrow", - "down", - "round" - ] - }, - { - "icons": [ - "ios-arrow-round-forward", - "md-arrow-round-forward" - ], - "tags": [ - "arrow", - "forward", - "round" - ] - }, - { - "icons": [ - "ios-arrow-round-up", - "md-arrow-round-up" - ], - "tags": [ - "arrow", - "round", - "up" - ] - }, - { - "icons": [ - "ios-arrow-up", - "md-arrow-up" - ], - "tags": [ - "arrow", - "chevron", - "up" - ] - }, - { - "icons": [ - "ios-at", - "md-at" - ], - "tags": [ - "@", - "at" - ] - }, - { - "icons": [ - "ios-attach", - "md-attach" - ], - "tags": [ - "attach" - ] - }, - { - "icons": [ - "ios-backspace", - "md-backspace" - ], - "tags": [ - "backspace" - ] - }, - { - "icons": [ - "ios-barcode", - "md-barcode" - ], - "tags": [ - "barcode", - "camera", - "reader" - ] - }, - { - "icons": [ - "ios-baseball", - "md-baseball" - ], - "tags": [ - "baseball" - ] - }, - { - "icons": [ - "ios-basket", - "md-basket" - ], - "tags": [ - "basket" - ] - }, - { - "icons": [ - "ios-basketball", - "md-basketball" - ], - "tags": [ - "basketball" - ] - }, - { - "icons": [ - "ios-battery-charging", - "md-battery-charging" - ], - "tags": [ - "battery", - "charging" - ] - }, - { - "icons": [ - "ios-battery-dead", - "md-battery-dead" - ], - "tags": [ - "battery", - "dead" - ] - }, - { - "icons": [ - "ios-battery-full", - "md-battery-full" - ], - "tags": [ - "battery", - "full" - ] - }, - { - "icons": [ - "ios-beaker", - "md-beaker" - ], - "tags": [ - "beaker", - "flask", - "mixture", - "potion" - ] - }, - { - "icons": [ - "ios-beer", - "md-beer" - ], - "tags": [ - "beer", - "drink", - "eat", - "food" - ] - }, - { - "icons": [ - "ios-bicycle", - "md-bicycle" - ], - "tags": [ - "bicycle" - ] - }, - { - "icons": [ - "ios-bluetooth", - "md-bluetooth" - ], - "tags": [ - "bluetooth", - "cloud", - "connection" - ] - }, - { - "icons": [ - "ios-boat", - "md-boat" - ], - "tags": [ - "boat" - ] - }, - { - "icons": [ - "ios-body", - "md-body" - ], - "tags": [ - "body" - ] - }, - { - "icons": [ - "ios-bonfire", - "md-bonfire" - ], - "tags": [ - "bonfire", - "heat", - "hot" - ] - }, - { - "icons": [ - "ios-book", - "md-book" - ], - "tags": [ - "book", - "read" - ] - }, - { - "icons": [ - "ios-bookmark", - "md-bookmark" - ], - "tags": [ - "bookmark", - "favorite", - "save", - "tag" - ] - }, - { - "icons": [ - "ios-bookmarks", - "md-bookmarks" - ], - "tags": [ - "bookmarks", - "favorite" - ] - }, - { - "icons": [ - "ios-bowtie", - "md-bowtie" - ], - "tags": [ - "bowtie" - ] - }, - { - "icons": [ - "ios-briefcase", - "md-briefcase" - ], - "tags": [ - "briefcase", - "folder", - "organize" - ] - }, - { - "icons": [ - "ios-browsers", - "md-browsers" - ], - "tags": [ - "browsers", - "square" - ] - }, - { - "icons": [ - "ios-brush", - "md-brush" - ], - "tags": [ - "brush" - ] - }, - { - "icons": [ - "ios-bug", - "md-bug" - ], - "tags": [ - "bug", - "develop", - "error", - "hacker", - "program" - ] - }, - { - "icons": [ - "ios-build", - "md-build" - ], - "tags": [ - "build" - ] - }, - { - "icons": [ - "ios-bulb", - "md-bulb" - ], - "tags": [ - "bulb" - ] - }, - { - "icons": [ - "ios-bus", - "md-bus" - ], - "tags": [ - "bus" - ] - }, - { - "icons": [ - "ios-cafe", - "md-cafe" - ], - "tags": [ - "cafe" - ] - }, - { - "icons": [ - "ios-calculator", - "md-calculator" - ], - "tags": [ - "arithmatic", - "calculator", - "math" - ] - }, - { - "icons": [ - "ios-calendar", - "md-calendar" - ], - "tags": [ - "calendar", - "date", - "month", - "week" - ] - }, - { - "icons": [ - "ios-call", - "md-call" - ], - "tags": [ - "call", - "telephone" - ] - }, - { - "icons": [ - "ios-camera", - "md-camera" - ], - "tags": [ - "camera", - "image", - "photo" - ] - }, - { - "icons": [ - "ios-car", - "md-car" - ], - "tags": [ - "car" - ] - }, - { - "icons": [ - "ios-card", - "md-card" - ], - "tags": [ - "$", - "card", - "cash", - "credit", - "debit", - "dollars", - "money", - "price", - "shopping" - ] - }, - { - "icons": [ - "ios-cart", - "md-cart" - ], - "tags": [ - "cart" - ] - }, - { - "icons": [ - "ios-cash", - "md-cash" - ], - "tags": [ - "$", - "cash", - "credit", - "debit", - "dollars", - "money", - "price", - "shopping" - ] - }, - { - "icons": [ - "ios-chatboxes", - "md-chatboxes" - ], - "tags": [ - "chatboxes", - "talk" - ] - }, - { - "icons": [ - "ios-chatbubbles", - "md-chatbubbles" - ], - "tags": [ - "chatbubbles", - "talk" - ] - }, - { - "icons": [ - "ios-checkbox-outline", - "md-checkbox-outline" - ], - "tags": [ - "checkbox", - "success" - ] - }, - { - "icons": [ - "ios-checkbox", - "md-checkbox" - ], - "tags": [ - "checkbox", - "success" - ] - }, - { - "icons": [ - "ios-checkmark-circle-outline", - "md-checkmark-circle-outline" - ], - "tags": [ - "checkmark", - "success" - ] - }, - { - "icons": [ - "ios-checkmark-circle", - "md-checkmark-circle" - ], - "tags": [ - "checkmark", - "circle", - "success" - ] - }, - { - "icons": [ - "ios-checkmark", - "md-checkmark" - ], - "tags": [ - "checkmark", - "success" - ] - }, - { - "icons": [ - "ios-clipboard", - "md-clipboard" - ], - "tags": [ - "clipboard", - "write" - ] - }, - { - "icons": [ - "ios-clock", - "md-clock" - ], - "tags": [ - "clock", - "time" - ] - }, - { - "icons": [ - "ios-close-circle-outline" - ], - "tags": [ - "close", - "cicle" - ] - }, - { - "icons": [ - "ios-close-circle", - "md-close-circle" - ], - "tags": [ - "circle", - "close" - ] - }, - { - "icons": [ - "ios-close", - "md-close" - ], - "tags": [ - "close", - "delete", - "remove" - ] - }, - { - "icons": [ - "ios-cloud-circle", - "md-cloud-circle" - ], - "tags": [ - "circle", - "cloud" - ] - }, - { - "icons": [ - "ios-cloud-done", - "md-cloud-done" - ], - "tags": [ - "cloud", - "done" - ] - }, - { - "icons": [ - "ios-cloud-download", - "md-cloud-download" - ], - "tags": [ - "cloud", - "download", - "storage" - ] - }, - { - "icons": [ - "ios-cloud-outline", - "md-cloud-outline" - ], - "tags": [ - "cloud" - ] - }, - { - "icons": [ - "ios-cloud-upload", - "md-cloud-upload" - ], - "tags": [ - "cloud", - "storage", - "upload" - ] - }, - { - "icons": [ - "ios-cloud", - "md-cloud" - ], - "tags": [ - "cloud", - "storage", - "weather", - "whether" - ] - }, - { - "icons": [ - "ios-cloudy-night", - "md-cloudy-night" - ], - "tags": [ - "cloudy", - "night", - "overcast", - "weather", - "whether" - ] - }, - { - "icons": [ - "ios-cloudy", - "md-cloudy" - ], - "tags": [ - "cloudy", - "overcast", - "weather", - "whether" - ] - }, - { - "icons": [ - "ios-code-download", - "md-code-download" - ], - "tags": [ - "code", - "develop", - "download", - "hacker", - "program" - ] - }, - { - "icons": [ - "ios-code-working", - "md-code-working" - ], - "tags": [ - "code", - "develop", - "hacker", - "program", - "working" - ] - }, - { - "icons": [ - "ios-code", - "md-code" - ], - "tags": [ - "code", - "develop", - "hacker", - "program" - ] - }, - { - "icons": [ - "ios-cog", - "md-cog" - ], - "tags": [ - "cog", - "gear", - "options", - "settings" - ] - }, - { - "icons": [ - "ios-color-fill", - "md-color-fill" - ], - "tags": [ - "color", - "fill" - ] - }, - { - "icons": [ - "ios-color-filter", - "md-color-filter" - ], - "tags": [ - "color", - "filter" - ] - }, - { - "icons": [ - "ios-color-palette", - "md-color-palette" - ], - "tags": [ - "color", - "palette" - ] - }, - { - "icons": [ - "ios-color-wand", - "md-color-wand" - ], - "tags": [ - "color", - "wand" - ] - }, - { - "icons": [ - "ios-compass", - "md-compass" - ], - "tags": [ - "compass", - "directions", - "location", - "navigation" - ] - }, - { - "icons": [ - "ios-construct", - "md-construct" - ], - "tags": [ - "construct" - ] - }, - { - "icons": [ - "ios-contact", - "md-contact" - ], - "tags": [ - "contact", - "people", - "users" - ] - }, - { - "icons": [ - "ios-contacts", - "md-contacts" - ], - "tags": [ - "contacts", - "people", - "users" - ] - }, - { - "icons": [ - "ios-contract", - "md-contract" - ], - "tags": [ - "contract" - ] - }, - { - "icons": [ - "ios-contrast", - "md-contrast" - ], - "tags": [ - "contrast", - "dark", - "images", - "levels", - "light", - "settings" - ] - }, - { - "icons": [ - "ios-copy", - "md-copy" - ], - "tags": [ - "copy", - "duplicate", - "paper" - ] - }, - { - "icons": [ - "ios-create", - "md-create" - ], - "tags": [ - "create" - ] - }, - { - "icons": [ - "ios-crop", - "md-crop" - ], - "tags": [ - "crop" - ] - }, - { - "icons": [ - "ios-cube", - "md-cube" - ], - "tags": [ - "box", - "container", - "cube", - "square" - ] - }, - { - "icons": [ - "ios-cut", - "md-cut" - ], - "tags": [ - "cut" - ] - }, - { - "icons": [ - "ios-desktop", - "md-desktop" - ], - "tags": [ - "desktop" - ] - }, - { - "icons": [ - "ios-disc", - "md-disc" - ], - "tags": [ - "cd", - "disc", - "vinyl" - ] - }, - { - "icons": [ - "ios-document", - "md-document" - ], - "tags": [ - "document", - "file", - "paper" - ] - }, - { - "icons": [ - "ios-done-all", - "md-done-all" - ], - "tags": [ - "all", - "done" - ] - }, - { - "icons": [ - "ios-download", - "md-download" - ], - "tags": [ - "download", - "export" - ] - }, - { - "icons": [ - "ios-easel", - "md-easel" - ], - "tags": [ - "easel" - ] - }, - { - "icons": [ - "ios-egg", - "md-egg" - ], - "tags": [ - "baby", - "bird", - "birth", - "egg", - "twitter" - ] - }, - { - "icons": [ - "ios-exit", - "md-exit" - ], - "tags": [ - "exit" - ] - }, - { - "icons": [ - "ios-expand", - "md-expand" - ], - "tags": [ - "expand" - ] - }, - { - "icons": [ - "ios-eye-off", - "md-eye-off" - ], - "tags": [ - "eye", - "off" - ] - }, - { - "icons": [ - "ios-eye", - "md-eye" - ], - "tags": [ - "exposed", - "eye", - "look", - "see", - "view" - ] - }, - { - "icons": [ - "ios-fastforward", - "md-fastforward" - ], - "tags": [ - "fastforward", - "jump", - "next", - "skip" - ] - }, - { - "icons": [ - "ios-female", - "md-female" - ], - "tags": [ - "dudette", - "female", - "girl", - "lady" - ] - }, - { - "icons": [ - "ios-filing", - "md-filing" - ], - "tags": [ - "archive", - "filing" - ] - }, - { - "icons": [ - "ios-film", - "md-film" - ], - "tags": [ - "film" - ] - }, - { - "icons": [ - "ios-finger-print", - "md-finger-print" - ], - "tags": [ - "finger", - "print" - ] - }, - { - "icons": [ - "ios-flag", - "md-flag" - ], - "tags": [ - "favorite", - "flag", - "marker" - ] - }, - { - "icons": [ - "ios-flame", - "md-flame" - ], - "tags": [ - "fire", - "flame", - "heat", - "hot" - ] - }, - { - "icons": [ - "ios-flash", - "md-flash" - ], - "tags": [ - "flash", - "lightning", - "weather", - "whether" - ] - }, - { - "icons": [ - "ios-flask", - "md-flask" - ], - "tags": [ - "bubbles", - "flask", - "mixture", - "potion" - ] - }, - { - "icons": [ - "ios-flower", - "md-flower" - ], - "tags": [ - "flower" - ] - }, - { - "icons": [ - "ios-folder-open", - "md-folder-open" - ], - "tags": [ - "folder", - "open" - ] - }, - { - "icons": [ - "ios-folder", - "md-folder" - ], - "tags": [ - "file", - "folder" - ] - }, - { - "icons": [ - "ios-football", - "md-football" - ], - "tags": [ - "football", - "soccer" - ] - }, - { - "icons": [ - "ios-funnel", - "md-funnel" - ], - "tags": [ - "funnel", - "sort" - ] - }, - { - "icons": [ - "ios-git-branch", - "md-git-branch" - ], - "tags": [ - "branch", - "git" - ] - }, - { - "icons": [ - "ios-git-commit", - "md-git-commit" - ], - "tags": [ - "commit", - "git" - ] - }, - { - "icons": [ - "ios-git-compare", - "md-git-compare" - ], - "tags": [ - "compare", - "git" - ] - }, - { - "icons": [ - "ios-git-merge", - "md-git-merge" - ], - "tags": [ - "git", - "merge" - ] - }, - { - "icons": [ - "ios-git-network", - "md-git-network" - ], - "tags": [ - "git", - "network" - ] - }, - { - "icons": [ - "ios-git-pull-request", - "md-git-pull-request" - ], - "tags": [ - "git", - "pull", - "request" - ] - }, - { - "icons": [ - "ios-glasses", - "md-glasses" - ], - "tags": [ - "glasses", - "look", - "reading", - "see", - "steve" - ] - }, - { - "icons": [ - "ios-globe", - "md-globe" - ], - "tags": [ - "globe" - ] - }, - { - "icons": [ - "ios-grid", - "md-grid" - ], - "tags": [ - "grid", - "menu" - ] - }, - { - "icons": [ - "ios-hammer", - "md-hammer" - ], - "tags": [ - "hammer", - "options", - "settings", - "tools" - ] - }, - { - "icons": [ - "ios-hand", - "md-hand" - ], - "tags": [ - "hand", - "stop" - ] - }, - { - "icons": [ - "ios-happy", - "md-happy" - ], - "tags": [ - "fun", - "good", - "happy", - "like", - "yes" - ] - }, - { - "icons": [ - "ios-headset", - "md-headset" - ], - "tags": [ - "headset" - ] - }, - { - "icons": [ - "ios-heart", - "md-heart" - ], - "tags": [ - "heart", - "love" - ] - }, - { - "icons": [ - "ios-help-buoy", - "md-help-buoy" - ], - "tags": [ - "?", - "buoy", - "help", - "question" - ] - }, - { - "icons": [ - "ios-help-circle", - "md-help-circle" - ], - "tags": [ - "circle", - "help" - ] - }, - { - "icons": [ - "ios-help", - "md-help" - ], - "tags": [ - "?", - "help", - "information", - "question" - ] - }, - { - "icons": [ - "ios-home", - "md-home" - ], - "tags": [ - "home", - "house" - ] - }, - { - "icons": [ - "ios-ice-cream", - "md-ice-cream" - ], - "tags": [ - "cream", - "ice" - ] - }, - { - "icons": [ - "ios-image", - "md-image" - ], - "tags": [ - "camera", - "image", - "photo" - ] - }, - { - "icons": [ - "ios-images", - "md-images" - ], - "tags": [ - "images", - "photo" - ] - }, - { - "icons": [ - "ios-infinite", - "md-infinite" - ], - "tags": [ - "forever", - "infinite", - "loop" - ] - }, - { - "icons": [ - "ios-information-circle", - "md-information-circle" - ], - "tags": [ - "circle", - "information" - ] - }, - { - "icons": [ - "ios-information", - "md-information" - ], - "tags": [ - "help", - "information", - "knowledge" - ] - }, - { - "icons": [ - "ios-jet", - "md-jet" - ], - "tags": [ - "fly", - "jet", - "plane" - ] - }, - { - "icons": [ - "ios-key", - "md-key" - ], - "tags": [ - "access", - "key" - ] - }, - { - "icons": [ - "ios-keypad", - "md-keypad" - ], - "tags": [ - "keypad", - "type" - ] - }, - { - "icons": [ - "ios-laptop", - "md-laptop" - ], - "tags": [ - "apple", - "laptop", - "macbook", - "osx" - ] - }, - { - "icons": [ - "ios-leaf", - "md-leaf" - ], - "tags": [ - "green", - "leaf", - "nature", - "plant", - "recycle" - ] - }, - { - "icons": [ - "ios-link", - "md-link" - ], - "tags": [ - "anchor", - "attach", - "chain", - "href", - "link" - ] - }, - { - "icons": [ - "ios-list-box", - "md-list-box" - ], - "tags": [ - "box", - "list" - ] - }, - { - "icons": [ - "ios-list", - "md-list" - ], - "tags": [ - "list" - ] - }, - { - "icons": [ - "ios-locate", - "md-locate" - ], - "tags": [ - "gps", - "locate", - "maps", - "navigate" - ] - }, - { - "icons": [ - "ios-lock", - "md-lock" - ], - "tags": [ - "lock" - ] - }, - { - "icons": [ - "ios-log-in", - "md-log-in" - ], - "tags": [ - "in", - "log", - "signin" - ] - }, - { - "icons": [ - "ios-log-out", - "md-log-out" - ], - "tags": [ - "log", - "out", - "signout" - ] - }, - { - "icons": [ - "ios-magnet", - "md-magnet" - ], - "tags": [ - "attraction", - "magnet", - "sticky" - ] - }, - { - "icons": [ - "ios-mail-open", - "md-mail-open" - ], - "tags": [ - "mail", - "open" - ] - }, - { - "icons": [ - "ios-mail", - "md-mail" - ], - "tags": [ - "email", - "mail" - ] - }, - { - "icons": [ - "ios-male", - "md-male" - ], - "tags": [ - "boy", - "dude", - "guy", - "male", - "male" - ] - }, - { - "icons": [ - "ios-man", - "md-man" - ], - "tags": [ - "boy", - "dude", - "guy", - "male", - "man" - ] - }, - { - "icons": [ - "ios-map", - "md-map" - ], - "tags": [ - "gps", - "map", - "navigation", - "pin" - ] - }, - { - "icons": [ - "ios-medal", - "md-medal" - ], - "tags": [ - "medal" - ] - }, - { - "icons": [ - "ios-medical", - "md-medical" - ], - "tags": [ - "medical" - ] - }, - { - "icons": [ - "ios-medkit", - "md-medkit" - ], - "tags": [ - "case", - "disease", - "firstaid", - "health", - "medkit", - "sick" - ] - }, - { - "icons": [ - "ios-megaphone", - "md-megaphone" - ], - "tags": [ - "megaphone" - ] - }, - { - "icons": [ - "ios-menu", - "md-menu" - ], - "tags": [ - "menu" - ] - }, - { - "icons": [ - "ios-mic-off", - "md-mic-off" - ], - "tags": [ - "mic", - "noise", - "off", - "sound", - "speaker", - "talk" - ] - }, - { - "icons": [ - "ios-mic", - "md-mic" - ], - "tags": [ - "mic", - "noise", - "sound", - "speaker", - "talk" - ] - }, - { - "icons": [ - "ios-microphone", - "md-microphone" - ], - "tags": [ - "microphone", - "music", - "noise", - "recorde", - "sound", - "speak" - ] - }, - { - "icons": [ - "ios-moon", - "md-moon" - ], - "tags": [ - "dark", - "moon", - "night", - "sky" - ] - }, - { - "icons": [ - "ios-more", - "md-more" - ], - "tags": [ - "more", - "options" - ] - }, - { - "icons": [ - "ios-move", - "md-move" - ], - "tags": [ - "move" - ] - }, - { - "icons": [ - "ios-musical-note", - "md-musical-note" - ], - "tags": [ - "listening", - "musical", - "noise", - "note", - "play", - "sound" - ] - }, - { - "icons": [ - "ios-musical-notes", - "md-musical-notes" - ], - "tags": [ - "listening", - "musical", - "noise", - "notes", - "play", - "sound" - ] - }, - { - "icons": [ - "ios-navigate", - "md-navigate" - ], - "tags": [ - "gps", - "location", - "map", - "navigate", - "pin" - ] - }, - { - "icons": [ - "ios-notifications-off", - "md-notifications-off" - ], - "tags": [ - "notifications", - "off" - ] - }, - { - "icons": [ - "ios-notifications-outline", - "md-notifications-outline" - ], - "tags": [ - "notifications" - ] - }, - { - "icons": [ - "ios-notifications", - "md-notifications" - ], - "tags": [ - "notifications" - ] - }, - { - "icons": [ - "ios-nuclear", - "md-nuclear" - ], - "tags": [ - "danger", - "hazard", - "nuclear", - "warning" - ] - }, - { - "icons": [ - "ios-nutrition", - "md-nutrition" - ], - "tags": [ - "nutrition" - ] - }, - { - "icons": [ - "ios-open", - "md-open" - ], - "tags": [ - "open" - ] - }, - { - "icons": [ - "ios-options", - "md-options" - ], - "tags": [ - "options" - ] - }, - { - "icons": [ - "ios-outlet", - "md-outlet" - ], - "tags": [ - "computer", - "digital", - "electricity", - "outlet" - ] - }, - { - "icons": [ - "ios-paper-plane", - "md-paper-plane" - ], - "tags": [ - "paper", - "plane" - ] - }, - { - "icons": [ - "ios-paper", - "md-paper" - ], - "tags": [ - "feed", - "paper", - "paper" - ] - }, - { - "icons": [ - "ios-partly-sunny", - "md-partly-sunny" - ], - "tags": [ - "partly", - "sunny" - ] - }, - { - "icons": [ - "ios-pause", - "md-pause" - ], - "tags": [ - "break", - "freeze", - "hold", - "music", - "pause" - ] - }, - { - "icons": [ - "ios-paw", - "md-paw" - ], - "tags": [ - "paw" - ] - }, - { - "icons": [ - "ios-people", - "md-people" - ], - "tags": [ - "head", - "human", - "people", - "person", - "stalker", - "users" - ] - }, - { - "icons": [ - "ios-person-add", - "md-person-add" - ], - "tags": [ - "add", - "head", - "human", - "member", - "new", - "person", - "staff", - "users" - ] - }, - { - "icons": [ - "ios-person", - "md-person" - ], - "tags": [ - "head", - "human", - "person", - "staff", - "users" - ] - }, - { - "icons": [ - "ios-phone-landscape", - "md-phone-landscape" - ], - "tags": [ - "landscape", - "phone" - ] - }, - { - "icons": [ - "ios-phone-portrait", - "md-phone-portrait" - ], - "tags": [ - "phone", - "portrait" - ] - }, - { - "icons": [ - "ios-photos", - "md-photos" - ], - "tags": [ - "images", - "photos", - "square", - "stills" - ] - }, - { - "icons": [ - "ios-pie", - "md-pie" - ], - "tags": [ - "cog", - "options", - "pie", - "settings" - ] - }, - { - "icons": [ - "ios-pin", - "md-pin" - ], - "tags": [ - "gps", - "navigation", - "pin" - ] - }, - { - "icons": [ - "ios-pint", - "md-pint" - ], - "tags": [ - "pint" - ] - }, - { - "icons": [ - "ios-pizza", - "md-pizza" - ], - "tags": [ - "drink", - "eat", - "food", - "pizza" - ] - }, - { - "icons": [ - "ios-planet", - "md-planet" - ], - "tags": [ - "globe", - "home", - "nature", - "planet", - "planet", - "space" - ] - }, - { - "icons": [ - "ios-play", - "md-play" - ], - "tags": [ - "arrow", - "music", - "play", - "right", - "watch" - ] - }, - { - "icons": [ - "ios-podium", - "md-podium" - ], - "tags": [ - "award", - "compete", - "competition", - "lose", - "podium", - "win" - ] - }, - { - "icons": [ - "ios-power", - "md-power" - ], - "tags": [ - "off", - "on", - "power" - ] - }, - { - "icons": [ - "ios-pricetag", - "md-pricetag" - ], - "tags": [ - "$", - "commerce", - "items", - "money", - "pricetag", - "shopping" - ] - }, - { - "icons": [ - "ios-pricetags", - "md-pricetags" - ], - "tags": [ - "$", - "commerce", - "items", - "money", - "pricetags", - "shopping" - ] - }, - { - "icons": [ - "ios-print", - "md-print" - ], - "tags": [ - "print" - ] - }, - { - "icons": [ - "ios-pulse", - "md-pulse" - ], - "tags": [ - "hot", - "live", - "pulse", - "rate" - ] - }, - { - "icons": [ - "ios-qr-scanner", - "md-qr-scanner" - ], - "tags": [ - "qr", - "reader", - "scanner" - ] - }, - { - "icons": [ - "ios-quote", - "md-quote" - ], - "tags": [ - "chat", - "quotation", - "quote" - ] - }, - { - "icons": [ - "ios-radio-button-off", - "md-radio-button-off" - ], - "tags": [ - "button", - "off", - "radio" - ] - }, - { - "icons": [ - "ios-radio-button-on", - "md-radio-button-on" - ], - "tags": [ - "button", - "on", - "radio" - ] - }, - { - "icons": [ - "ios-radio", - "md-radio" - ], - "tags": [ - "radio" - ] - }, - { - "icons": [ - "ios-rainy", - "md-rainy" - ], - "tags": [ - "cloud", - "rainy", - "water", - "weather", - "whether" - ] - }, - { - "icons": [ - "ios-recording", - "md-recording" - ], - "tags": [ - "film", - "recording", - "tape", - "voicemail" - ] - }, - { - "icons": [ - "ios-redo", - "md-redo" - ], - "tags": [ - "forward", - "redo" - ] - }, - { - "icons": [ - "ios-refresh-circle", - "md-refresh-circle" - ], - "tags": [ - "circle", - "refresh" - ] - }, - { - "icons": [ - "ios-refresh", - "md-refresh" - ], - "tags": [ - "refresh", - "reload", - "renew", - "reset" - ] - }, - { - "icons": [ - "ios-remove-circle", - "md-remove-circle" - ], - "tags": [ - "circle", - "remove" - ] - }, - { - "icons": [ - "ios-remove", - "md-remove" - ], - "tags": [ - "minus", - "remove", - "subtract" - ] - }, - { - "icons": [ - "ios-reorder", - "md-reorder" - ], - "tags": [ - "reorder" - ] - }, - { - "icons": [ - "ios-repeat", - "md-repeat" - ], - "tags": [ - "repeat" - ] - }, - { - "icons": [ - "ios-resize", - "md-resize" - ], - "tags": [ - "resize" - ] - }, - { - "icons": [ - "ios-restaurant", - "md-restaurant" - ], - "tags": [ - "restaurant" - ] - }, - { - "icons": [ - "ios-return-left", - "md-return-left" - ], - "tags": [ - "left", - "return" - ] - }, - { - "icons": [ - "ios-return-right", - "md-return-right" - ], - "tags": [ - "return", - "right" - ] - }, - { - "icons": [ - "ios-reverse-camera", - "md-reverse-camera" - ], - "tags": [ - "camera", - "picture", - "reverse" - ] - }, - { - "icons": [ - "ios-rewind", - "md-rewind" - ], - "tags": [ - "back", - "music", - "previous", - "rewind" - ] - }, - { - "icons": [ - "ios-ribbon", - "md-ribbon" - ], - "tags": [ - "ribbon" - ] - }, - { - "icons": [ - "ios-rose", - "md-rose" - ], - "tags": [ - "rose" - ] - }, - { - "icons": [ - "ios-sad", - "md-sad" - ], - "tags": [ - "bad", - "cry", - "no", - "sad" - ] - }, - { - "icons": [ - "ios-school", - "md-school" - ], - "tags": [ - "school" - ] - }, - { - "icons": [ - "ios-search", - "md-search" - ], - "tags": [ - "magnifyingglass", - "search" - ] - }, - { - "icons": [ - "ios-send", - "md-send" - ], - "tags": [ - "email", - "paper", - "send" - ] - }, - { - "icons": [ - "ios-settings", - "md-settings" - ], - "tags": [ - "options", - "settings" - ] - }, - { - "icons": [ - "ios-share-alt", - "md-share-alt" - ], - "tags": [ - "alt", - "share" - ] - }, - { - "icons": [ - "ios-share", - "md-share" - ], - "tags": [ - "share" - ] - }, - { - "icons": [ - "ios-shirt", - "md-shirt" - ], - "tags": [ - "shirt" - ] - }, - { - "icons": [ - "ios-shuffle", - "md-shuffle" - ], - "tags": [ - "random", - "shuffle" - ] - }, - { - "icons": [ - "ios-skip-backward", - "md-skip-backward" - ], - "tags": [ - "backward", - "music", - "previous", - "skip" - ] - }, - { - "icons": [ - "ios-skip-forward", - "md-skip-forward" - ], - "tags": [ - "forward", - "music", - "next", - "skip" - ] - }, - { - "icons": [ - "ios-snow", - "md-snow" - ], - "tags": [ - "snow" - ] - }, - { - "icons": [ - "ios-speedometer", - "md-speedometer" - ], - "tags": [ - "drive", - "level", - "speed", - "speedometer" - ] - }, - { - "icons": [ - "ios-square-outline", - "md-square-outline" - ], - "tags": [ - "square" - ] - }, - { - "icons": [ - "ios-square", - "md-square" - ], - "tags": [ - "square" - ] - }, - { - "icons": [ - "ios-star-half", - "md-star-half" - ], - "tags": [ - "favorite", - "half", - "rate", - "star" - ] - }, - { - "icons": [ - "ios-star-outline", - "md-star-outline" - ], - "tags": [ - "star" - ] - }, - { - "icons": [ - "ios-star", - "md-star" - ], - "tags": [ - "favorite", - "star" - ] - }, - { - "icons": [ - "ios-stats", - "md-stats" - ], - "tags": [ - "stats" - ] - }, - { - "icons": [ - "ios-stopwatch", - "md-stopwatch" - ], - "tags": [ - "stopwatch" - ] - }, - { - "icons": [ - "ios-subway", - "md-subway" - ], - "tags": [ - "subway" - ] - }, - { - "icons": [ - "ios-sunny", - "md-sunny" - ], - "tags": [ - "light", - "sky", - "sunny", - "weather", - "whether" - ] - }, - { - "icons": [ - "ios-swap", - "md-swap" - ], - "tags": [ - "swap" - ] - }, - { - "icons": [ - "ios-switch", - "md-switch" - ], - "tags": [ - "switch" - ] - }, - { - "icons": [ - "ios-sync", - "md-sync" - ], - "tags": [ - "sync" - ] - }, - { - "icons": [ - "ios-tablet-landscape", - "md-tablet-landscape" - ], - "tags": [ - "landscape", - "tablet" - ] - }, - { - "icons": [ - "ios-tablet-portrait", - "md-tablet-portrait" - ], - "tags": [ - "portrait", - "tablet" - ] - }, - { - "icons": [ - "ios-tennisball", - "md-tennisball" - ], - "tags": [ - "tennisball" - ] - }, - { - "icons": [ - "ios-text", - "md-text" - ], - "tags": [ - "text" - ] - }, - { - "icons": [ - "ios-thermometer", - "md-thermometer" - ], - "tags": [ - "cold", - "heat", - "hot", - "mercury", - "temperature", - "thermometer" - ] - }, - { - "icons": [ - "ios-thumbs-down", - "md-thumbs-down" - ], - "tags": [ - "down", - "thumbs" - ] - }, - { - "icons": [ - "ios-thumbs-up", - "md-thumbs-up" - ], - "tags": [ - "thumbs", - "up" - ] - }, - { - "icons": [ - "ios-thunderstorm", - "md-thunderstorm" - ], - "tags": [ - "cloudy", - "lightning", - "overcast", - "rain", - "sky", - "storm", - "thunderstorm", - "weather", - "whether" - ] - }, - { - "icons": [ - "ios-time", - "md-time" - ], - "tags": [ - "clock", - "hour", - "minute", - "second", - "time", - "watch" - ] - }, - { - "icons": [ - "ios-timer", - "md-timer" - ], - "tags": [ - "clock", - "timer" - ] - }, - { - "icons": [ - "ios-train", - "md-train" - ], - "tags": [ - "train" - ] - }, - { - "icons": [ - "ios-transgender", - "md-transgender" - ], - "tags": [ - "transgender" - ] - }, - { - "icons": [ - "ios-trash", - "md-trash" - ], - "tags": [ - "close", - "delete", - "remove", - "trash" - ] - }, - { - "icons": [ - "ios-trending-down", - "md-trending-down" - ], - "tags": [ - "down", - "trending" - ] - }, - { - "icons": [ - "ios-trending-up", - "md-trending-up" - ], - "tags": [ - "trending", - "up" - ] - }, - { - "icons": [ - "ios-trophy", - "md-trophy" - ], - "tags": [ - "award", - "compete", - "competition", - "lose", - "trophy", - "win" - ] - }, - { - "icons": [ - "ios-umbrella", - "md-umbrella" - ], - "tags": [ - "dry", - "rain", - "shelter", - "umbrella", - "wet" - ] - }, - { - "icons": [ - "ios-undo", - "md-undo" - ], - "tags": [ - "reply", - "undo" - ] - }, - { - "icons": [ - "ios-unlock", - "md-unlock" - ], - "tags": [ - "unlock" - ] - }, - { - "icons": [ - "ios-videocam", - "md-videocam" - ], - "tags": [ - "camera", - "film", - "movie", - "videocam" - ] - }, - { - "icons": [ - "ios-volume-mute", - "md-volume-mute" - ], - "tags": [ - "mute", - "sound", - "volume" - ] - }, - { - "icons": [ - "ios-volume-off", - "md-volume-off" - ], - "tags": [ - "off", - "volume" - ] - }, - { - "icons": [ - "ios-walk", - "md-walk" - ], - "tags": [ - "walk" - ] - }, - { - "icons": [ - "ios-warning", - "md-warning" - ], - "tags": [ - "warning" - ] - }, - { - "icons": [ - "ios-watch", - "md-watch" - ], - "tags": [ - "watch" - ] - }, - { - "icons": [ - "ios-water", - "md-water" - ], - "tags": [ - "water" - ] - }, - { - "icons": [ - "ios-wifi", - "md-wifi" - ], - "tags": [ - "bars", - "connection", - "internet", - "wifi" - ] - }, - { - "icons": [ - "ios-wine", - "md-wine" - ], - "tags": [ - "wine" - ] - }, - { - "icons": [ - "ios-woman", - "md-woman" - ], - "tags": [ - "dudette", - "female", - "girl", - "lady", - "woman" - ] - }, - { - "icons": [ - "logo-android" - ], - "tags": [ - "android" - ] - }, - { - "icons": [ - "logo-angular" - ], - "tags": [ - "angular" - ] - }, - { - "icons": [ - "logo-apple" - ], - "tags": [ - "apple" - ] - }, - { - "icons": [ - "logo-bitcoin" - ], - "tags": [ - "bitcoin" - ] - }, - { - "icons": [ - "logo-buffer" - ], - "tags": [ - "buffer" - ] - }, - { - "icons": [ - "logo-chrome" - ], - "tags": [ - "chrome" - ] - }, - { - "icons": [ - "logo-codepen" - ], - "tags": [ - "codepen" - ] - }, - { - "icons": [ - "logo-css3" - ], - "tags": [ - "css3" - ] - }, - { - "icons": [ - "logo-designernews" - ], - "tags": [ - "designernews" - ] - }, - { - "icons": [ - "logo-dribbble" - ], - "tags": [ - "dribbble" - ] - }, - { - "icons": [ - "logo-dropbox" - ], - "tags": [ - "dropbox" - ] - }, - { - "icons": [ - "logo-euro" - ], - "tags": [ - "euro" - ] - }, - { - "icons": [ - "logo-facebook" - ], - "tags": [ - "facebook" - ] - }, - { - "icons": [ - "logo-foursquare" - ], - "tags": [ - "foursquare" - ] - }, - { - "icons": [ - "logo-freebsd-devil" - ], - "tags": [ - "freebsd-devil" - ] - }, - { - "icons": [ - "logo-github" - ], - "tags": [ - "github" - ] - }, - { - "icons": [ - "logo-google" - ], - "tags": [ - "google" - ] - }, - { - "icons": [ - "logo-googleplus" - ], - "tags": [ - "googleplus" - ] - }, - { - "icons": [ - "logo-hackernews" - ], - "tags": [ - "hackernews" - ] - }, - { - "icons": [ - "logo-html5" - ], - "tags": [ - "html5" - ] - }, - { - "icons": [ - "logo-instagram" - ], - "tags": [ - "instagram" - ] - }, - { - "icons": [ - "logo-javascript" - ], - "tags": [ - "javascript" - ] - }, - { - "icons": [ - "logo-linkedin" - ], - "tags": [ - "linkedin" - ] - }, - { - "icons": [ - "logo-markdown" - ], - "tags": [ - "markdown" - ] - }, - { - "icons": [ - "logo-nodejs" - ], - "tags": [ - "nodejs" - ] - }, - { - "icons": [ - "logo-octocat" - ], - "tags": [ - "octocat" - ] - }, - { - "icons": [ - "logo-pinterest" - ], - "tags": [ - "pinterest" - ] - }, - { - "icons": [ - "logo-playstation" - ], - "tags": [ - "playstation" - ] - }, - { - "icons": [ - "logo-python" - ], - "tags": [ - "python" - ] - }, - { - "icons": [ - "logo-reddit" - ], - "tags": [ - "reddit" - ] - }, - { - "icons": [ - "logo-rss" - ], - "tags": [ - "rss" - ] - }, - { - "icons": [ - "logo-sass" - ], - "tags": [ - "sass" - ] - }, - { - "icons": [ - "logo-skype" - ], - "tags": [ - "skype" - ] - }, - { - "icons": [ - "logo-snapchat" - ], - "tags": [ - "snapchat" - ] - }, - { - "icons": [ - "logo-steam" - ], - "tags": [ - "steam" - ] - }, - { - "icons": [ - "logo-tumblr" - ], - "tags": [ - "tumblr" - ] - }, - { - "icons": [ - "logo-tux" - ], - "tags": [ - "tux" - ] - }, - { - "icons": [ - "logo-twitch" - ], - "tags": [ - "twitch" - ] - }, - { - "icons": [ - "logo-twitter" - ], - "tags": [ - "twitter" - ] - }, - { - "icons": [ - "logo-usd" - ], - "tags": [ - "usd" - ] - }, - { - "icons": [ - "logo-vimeo" - ], - "tags": [ - "vimeo" - ] - }, - { - "icons": [ - "logo-whatsapp" - ], - "tags": [ - "whatsapp" - ] - }, - { - "icons": [ - "logo-windows" - ], - "tags": [ - "windows" - ] - }, - { - "icons": [ - "logo-wordpress" - ], - "tags": [ - "wordpress" - ] - }, - { - "icons": [ - "logo-xbox" - ], - "tags": [ - "xbox" - ] - }, - { - "icons": [ - "logo-yahoo" - ], - "tags": [ - "yahoo" - ] - }, - { - "icons": [ - "logo-yen" - ], - "tags": [ - "yen" - ] - }, - { - "icons": [ - "logo-youtube" - ], - "tags": [ - "youtube" - ] - } -] diff --git a/seller/src/main.js b/seller/src/main.js index 1828a240..c288d27c 100644 --- a/seller/src/main.js +++ b/seller/src/main.js @@ -54,6 +54,12 @@ Vue.prototype.setStore = setStore; Vue.prototype.getStore = getStore; Vue.prototype.removeStore = removeStore; Vue.prototype.md5 = md5; +Vue.prototype.linkTo = function (goodsId, skuId, link='https://pc-b2b2c.pickmall.cn') { // 跳转买家端商品 + window.open(`${link}/goodsDetail?goodsId=${goodsId}&skuId=${skuId}`, '_blank') +}; +Vue.prototype.wapLinkTo = function (goodsId, skuId) { // app端二维码 + return `https://m-b2b2c.pickmall.cn/pages/product/goods?id=${skuId}&goodsId=${goodsId}` +}; Array.prototype.remove = function(from, to) { var rest = this.slice((to || from) + 1 || this.length); diff --git a/seller/src/views/distribution/distributionGoods.vue b/seller/src/views/distribution/distributionGoods.vue index a1a1492f..d04523b1 100644 --- a/seller/src/views/distribution/distributionGoods.vue +++ b/seller/src/views/distribution/distributionGoods.vue @@ -31,7 +31,7 @@
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue index 537ad9c4..034f70cc 100644 --- a/seller/src/views/goods/goods-seller/goodsOperation.vue +++ b/seller/src/views/goods/goods-seller/goodsOperation.vue @@ -1839,18 +1839,19 @@ export default { this.$Message.error("请上传商品图片"); return; } - if ( - !this.baseInfoForm.storeCategoryPath || - !this.baseInfoForm.storeCategoryPath.length - ) { - this.submitLoading = false; - this.$Message.error("请选择店内分类"); - return; - } + // if ( + // !this.baseInfoForm.storeCategoryPath || + // !this.baseInfoForm.storeCategoryPath.length + // ) { + // this.submitLoading = false; + // this.$Message.error("请选择店内分类"); + // return; + // } //如果选择的是买家承担运费 则运费模板重置为0 if (this.baseInfoForm.freightPayer == "BUYER") { this.baseInfoForm.templateId = 0; } + this.baseInfoForm.skuList = this.skuTableData.map((sku) => { delete sku._index; delete sku._rowKey; diff --git a/seller/src/views/promotion/coupon/coupon.vue b/seller/src/views/promotion/coupon/coupon.vue index df0cd184..a97d679f 100644 --- a/seller/src/views/promotion/coupon/coupon.vue +++ b/seller/src/views/promotion/coupon/coupon.vue @@ -51,8 +51,8 @@ -   -   + + @@ -106,7 +106,6 @@