diff --git a/admin/components.d.ts b/admin/components.d.ts index 21ccdf88..2b6a9d9e 100644 --- a/admin/components.d.ts +++ b/admin/components.d.ts @@ -10,7 +10,6 @@ declare module '@vue/runtime-core' { Attachment: typeof import('./src/components/upload-attachment/attachment.vue')['default'] DiyLink: typeof import('./src/components/diy-link/index.vue')['default'] Editor: typeof import('./src/components/editor/index.vue')['default'] - ElAlert: typeof import('element-plus/es')['ElAlert'] ElAside: typeof import('element-plus/es')['ElAside'] ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] diff --git a/admin/package-lock.json b/admin/package-lock.json index 2621871f..df8586c1 100644 --- a/admin/package-lock.json +++ b/admin/package-lock.json @@ -9,6 +9,11 @@ "version": "1.0.0", "dependencies": { "@element-plus/icons-vue": "2.0.10", + "@fullcalendar/core": "^6.1.17", + "@fullcalendar/daygrid": "^6.1.17", + "@fullcalendar/interaction": "^6.1.17", + "@fullcalendar/timegrid": "^6.1.17", + "@fullcalendar/vue3": "^6.1.17", "@highlightjs/vue-plugin": "2.1.0", "@types/lodash-es": "4.17.6", "@vueuse/core": "9.12.0", @@ -962,6 +967,50 @@ "resolved": "https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.1.6.tgz", "integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==" }, + "node_modules/@fullcalendar/core": { + "version": "6.1.17", + "resolved": "https://registry.npmmirror.com/@fullcalendar/core/-/core-6.1.17.tgz", + "integrity": "sha512-0W7lnIrv18ruJ5zeWBeNZXO8qCWlzxDdp9COFEsZnyNjiEhUVnrW/dPbjRKYpL0edGG0/Lhs0ghp1z/5ekt8ZA==", + "dependencies": { + "preact": "~10.12.1" + } + }, + "node_modules/@fullcalendar/daygrid": { + "version": "6.1.17", + "resolved": "https://registry.npmmirror.com/@fullcalendar/daygrid/-/daygrid-6.1.17.tgz", + "integrity": "sha512-K7m+pd7oVJ9fW4h7CLDdDGJbc9szJ1xDU1DZ2ag+7oOo1aCNLv44CehzkkknM6r8EYlOOhgaelxQpKAI4glj7A==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.17" + } + }, + "node_modules/@fullcalendar/interaction": { + "version": "6.1.17", + "resolved": "https://registry.npmmirror.com/@fullcalendar/interaction/-/interaction-6.1.17.tgz", + "integrity": "sha512-AudvQvgmJP2FU89wpSulUUjeWv24SuyCx8FzH2WIPVaYg+vDGGYarI7K6PcM3TH7B/CyaBjm5Rqw9lXgnwt5YA==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.17" + } + }, + "node_modules/@fullcalendar/timegrid": { + "version": "6.1.17", + "resolved": "https://registry.npmmirror.com/@fullcalendar/timegrid/-/timegrid-6.1.17.tgz", + "integrity": "sha512-K4PlA3L3lclLOs3IX8cvddeiJI9ZVMD7RA9IqaWwbvac771971foc9tFze9YY+Pqesf6S+vhS2dWtEVlERaGlQ==", + "dependencies": { + "@fullcalendar/daygrid": "~6.1.17" + }, + "peerDependencies": { + "@fullcalendar/core": "~6.1.17" + } + }, + "node_modules/@fullcalendar/vue3": { + "version": "6.1.17", + "resolved": "https://registry.npmmirror.com/@fullcalendar/vue3/-/vue3-6.1.17.tgz", + "integrity": "sha512-0+qi/PK/xCkTQXh2CaeN2AkP+SvQTznPhwBXuIyrtsR0Ua8UpmGEXI+my3qQ6o003r8gPUY2e785ywIyhX2zCA==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.17", + "vue": "^3.0.11" + } + }, "node_modules/@highlightjs/vue-plugin": { "version": "2.1.0", "resolved": "https://registry.npmmirror.com/@highlightjs/vue-plugin/-/vue-plugin-2.1.0.tgz", @@ -4997,6 +5046,15 @@ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", "dev": true }, + "node_modules/preact": { + "version": "10.12.1", + "resolved": "https://registry.npmmirror.com/preact/-/preact-10.12.1.tgz", + "integrity": "sha512-l8386ixSsBdbreOAkqtrwqHwdvR35ID8c3rKPa8lCWuO86dBi32QWHV4vfsZK1utLLFMvw+Z5Ad4XLkZzchscg==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/preact" + } + }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.2.1.tgz", diff --git a/admin/package.json b/admin/package.json index a113a30d..4e61ae3e 100644 --- a/admin/package.json +++ b/admin/package.json @@ -6,10 +6,18 @@ "scripts": { "dev": "vite", "build": "vite build && node publish.cjs", - "preview": "vite preview" + "preview": "vite preview", + "lint": "eslint .", + "lint:fix": "eslint . --ext .ts --ext .vue --ext .js --fix", + "format": "prettier --write src/**/*.{ts,vue,js,json}" }, "dependencies": { "@element-plus/icons-vue": "2.0.10", + "@fullcalendar/core": "^6.1.17", + "@fullcalendar/daygrid": "^6.1.17", + "@fullcalendar/interaction": "^6.1.17", + "@fullcalendar/timegrid": "^6.1.17", + "@fullcalendar/vue3": "^6.1.17", "@highlightjs/vue-plugin": "2.1.0", "@types/lodash-es": "4.17.6", "@vueuse/core": "9.12.0", @@ -55,4 +63,4 @@ "vite": "4.1.0", "vue-tsc": "1.0.24" } -} \ No newline at end of file +} diff --git a/admin/src/App.vue b/admin/src/App.vue index b3376ded..5ecb1cdd 100644 --- a/admin/src/App.vue +++ b/admin/src/App.vue @@ -1,7 +1,7 @@ diff --git a/admin/src/addon/shop/api/delivery.ts b/admin/src/addon/shop/api/delivery.ts index 370404aa..bed958fc 100644 --- a/admin/src/addon/shop/api/delivery.ts +++ b/admin/src/addon/shop/api/delivery.ts @@ -7,7 +7,7 @@ import request from '@/utils/request' * @returns */ export function getCompanyPageList(params: Record) { - return request.get(`shop/delivery/company`, { params }) + return request.get(`shop/delivery/company`, { params }) } /** @@ -16,7 +16,7 @@ export function getCompanyPageList(params: Record) { * @returns */ export function getCompanyList(params: Record) { - return request.get(`shop/delivery/company/list`, { params }) + return request.get(`shop/delivery/company/list`, { params }) } /** @@ -25,7 +25,7 @@ export function getCompanyList(params: Record) { * @returns */ export function getCompanyInfo(company_id: number) { - return request.get(`shop/delivery/company/${ company_id }`); + return request.get(`shop/delivery/company/${company_id}`) } /** @@ -34,7 +34,10 @@ export function getCompanyInfo(company_id: number) { * @returns */ export function addCompany(params: Record) { - return request.post('shop/delivery/company', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/delivery/company', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -43,10 +46,10 @@ export function addCompany(params: Record) { * @returns */ export function editCompany(params: Record) { - return request.put(`shop/delivery/company/${ params.company_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/delivery/company/${params.company_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -55,10 +58,12 @@ export function editCompany(params: Record) { * @returns */ export function deleteCompany(company_id: number) { - return request.delete(`shop/delivery/company/${ company_id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/delivery/company/${company_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } - /********************************* 运费模版 ***************************************/ /** * 获取运费模版分页列表 @@ -66,7 +71,7 @@ export function deleteCompany(company_id: number) { * @returns */ export function getShippingTemplatePageList(params: Record) { - return request.get(`shop/shipping/template`, { params }) + return request.get(`shop/shipping/template`, { params }) } /** @@ -75,7 +80,7 @@ export function getShippingTemplatePageList(params: Record) { * @returns */ export function getShippingTemplateList(params: Record) { - return request.get(`shop/shipping/template/list`, { params }) + return request.get(`shop/shipping/template/list`, { params }) } /** @@ -84,7 +89,7 @@ export function getShippingTemplateList(params: Record) { * @returns */ export function getShippingTemplateInfo(template_id: number) { - return request.get(`shop/shipping/template/${ template_id }`); + return request.get(`shop/shipping/template/${template_id}`) } /** @@ -93,7 +98,10 @@ export function getShippingTemplateInfo(template_id: number) { * @returns */ export function addShippingTemplate(params: Record) { - return request.post('shop/shipping/template', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/shipping/template', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -102,10 +110,10 @@ export function addShippingTemplate(params: Record) { * @returns */ export function editShippingTemplate(params: Record) { - return request.put(`shop/shipping/template/${ params.template_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/shipping/template/${params.template_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -114,13 +122,12 @@ export function editShippingTemplate(params: Record) { * @returns */ export function deleteShippingTemplate(template_id: number) { - return request.delete(`shop/shipping/template/${ template_id }`, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.delete(`shop/shipping/template/${template_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } - /********************************* 自提门店 ***************************************/ /** * 获取自提门店列表 @@ -128,7 +135,7 @@ export function deleteShippingTemplate(template_id: number) { * @returns */ export function getStoreList(params: Record) { - return request.get(`shop/delivery/store`, { params }) + return request.get(`shop/delivery/store`, { params }) } /** @@ -137,7 +144,7 @@ export function getStoreList(params: Record) { * @returns */ export function getStoreInfo(store_id: number) { - return request.get(`shop/delivery/store/${ store_id }`); + return request.get(`shop/delivery/store/${store_id}`) } /** @@ -146,7 +153,10 @@ export function getStoreInfo(store_id: number) { * @returns */ export function addStore(params: Record) { - return request.post('shop/delivery/store', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/delivery/store', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -155,10 +165,10 @@ export function addStore(params: Record) { * @returns */ export function editStore(params: Record) { - return request.put(`shop/delivery/store/${ params.store_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/delivery/store/${params.store_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -167,7 +177,10 @@ export function editStore(params: Record) { * @returns */ export function deleteStore(store_id: number) { - return request.delete(`shop/delivery/store/${ store_id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/delivery/store/${store_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /********************************* 物流查询 ***************************************/ @@ -177,7 +190,10 @@ export function deleteStore(store_id: number) { * @returns */ export function setDeliverySearch(params: Record) { - return request.post('shop/delivery/search', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/delivery/search', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -185,7 +201,7 @@ export function setDeliverySearch(params: Record) { * @returns */ export function getDeliverySearch() { - return request.get('shop/delivery/search') + return request.get('shop/delivery/search') } /** @@ -193,7 +209,7 @@ export function getDeliverySearch() { * @returns */ export function getShopDeliveryList() { - return request.get('shop/delivery/deliveryList') + return request.get('shop/delivery/deliveryList') } /** @@ -202,7 +218,7 @@ export function getShopDeliveryList() { * @returns */ export function setShopDeliveryConfig(params: Record) { - return request.put(`shop/delivery/setConfig`, params) + return request.put(`shop/delivery/setConfig`, params) } /** @@ -211,7 +227,7 @@ export function setShopDeliveryConfig(params: Record) { * @returns */ export function getShopDelivery(params: Record) { - return request.get('shop/delivery/staff', { params }) + return request.get('shop/delivery/staff', { params }) } /** @@ -220,7 +236,7 @@ export function getShopDelivery(params: Record) { * @returns */ export function getShopDeliverInfo(staff_id: number) { - return request.get(`shop/delivery/staff/${ staff_id }`); + return request.get(`shop/delivery/staff/${staff_id}`) } /** @@ -229,7 +245,9 @@ export function getShopDeliverInfo(staff_id: number) { * @returns */ export function addShopDeliver(params: Record) { - return request.post('shop/delivery/staff', params, { showSuccessMessage: true }) + return request.post('shop/delivery/staff', params, { + showSuccessMessage: true, + }) } /** @@ -238,7 +256,9 @@ export function addShopDeliver(params: Record) { * @returns */ export function editShopDeliver(params: Record) { - return request.put(`shop/delivery/staff/${ params.deliver_id }`, params, { showSuccessMessage: true }) + return request.put(`shop/delivery/staff/${params.deliver_id}`, params, { + showSuccessMessage: true, + }) } /** @@ -247,7 +267,7 @@ export function editShopDeliver(params: Record) { * @returns */ export function deleteShopDeliver(staff_id: number) { - return request.delete(`shop/delivery/staff/${ staff_id }`) + return request.delete(`shop/delivery/staff/${staff_id}`) } /** @@ -255,7 +275,7 @@ export function deleteShopDeliver(staff_id: number) { * @returns */ export function getLocal() { - return request.get('shop/local'); + return request.get('shop/local') } /** @@ -264,5 +284,5 @@ export function getLocal() { * @returns */ export function setLocal(params: Record) { - return request.put('shop/local', params, { showSuccessMessage: true }) -} \ No newline at end of file + return request.put('shop/local', params, { showSuccessMessage: true }) +} diff --git a/admin/src/addon/shop/api/electronic_sheet.ts b/admin/src/addon/shop/api/electronic_sheet.ts index 7f75c124..ec23bc81 100644 --- a/admin/src/addon/shop/api/electronic_sheet.ts +++ b/admin/src/addon/shop/api/electronic_sheet.ts @@ -6,7 +6,7 @@ import request from '@/utils/request' * @returns */ export function getElectronicSheetPageList(params: Record) { - return request.get(`shop/electronic_sheet`, { params }) + return request.get(`shop/electronic_sheet`, { params }) } /** @@ -15,7 +15,7 @@ export function getElectronicSheetPageList(params: Record) { * @returns */ export function getElectronicSheetList(params: Record) { - return request.get(`shop/electronic_sheet/list`, { params }) + return request.get(`shop/electronic_sheet/list`, { params }) } /** @@ -24,7 +24,7 @@ export function getElectronicSheetList(params: Record) { * @returns */ export function getElectronicSheetInfo(id: number) { - return request.get(`shop/electronic_sheet/${ id }`); + return request.get(`shop/electronic_sheet/${id}`) } /** @@ -33,10 +33,10 @@ export function getElectronicSheetInfo(id: number) { * @returns */ export function addElectronicSheet(params: Record) { - return request.post('shop/electronic_sheet', params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.post('shop/electronic_sheet', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -45,10 +45,10 @@ export function addElectronicSheet(params: Record) { * @returns */ export function editElectronicSheet(params: Record) { - return request.put(`shop/electronic_sheet/${ params.id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/electronic_sheet/${params.id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -57,10 +57,10 @@ export function editElectronicSheet(params: Record) { * @returns */ export function deleteElectronicSheet(id: number) { - return request.delete(`shop/electronic_sheet/${ id }`, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.delete(`shop/electronic_sheet/${id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -69,10 +69,10 @@ export function deleteElectronicSheet(id: number) { * @returns */ export function setDefaultElectronicSheet(params: Record) { - return request.put(`shop/electronic_sheet/setDefault/${ params.id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/electronic_sheet/setDefault/${params.id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -81,10 +81,10 @@ export function setDefaultElectronicSheet(params: Record) { * @returns */ export function setElectronicSheetConfig(params: Record) { - return request.post('shop/electronic_sheet/config', params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.post('shop/electronic_sheet/config', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -92,7 +92,7 @@ export function setElectronicSheetConfig(params: Record) { * @returns */ export function getElectronicSheetConfig() { - return request.get(`shop/electronic_sheet/config`) + return request.get(`shop/electronic_sheet/config`) } /** @@ -100,7 +100,7 @@ export function getElectronicSheetConfig() { * @returns */ export function getElectronicSheetPayType() { - return request.get(`shop/electronic_sheet/paytype`) + return request.get(`shop/electronic_sheet/paytype`) } /** @@ -109,8 +109,8 @@ export function getElectronicSheetPayType() { * @returns */ export function printElectronicSheet(params: Record) { - return request.post('shop/electronic_sheet/print', params, { - showErrorMessage: true, - showSuccessMessage: true - }) -} \ No newline at end of file + return request.post('shop/electronic_sheet/print', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) +} diff --git a/admin/src/addon/shop/api/goods.ts b/admin/src/addon/shop/api/goods.ts index ff78ff46..c9a0f091 100644 --- a/admin/src/addon/shop/api/goods.ts +++ b/admin/src/addon/shop/api/goods.ts @@ -6,7 +6,7 @@ import request from '@/utils/request' * @returns */ export function getGoodsPageList(params: Record) { - return request.get(`shop/goods`, { params }) + return request.get(`shop/goods`, { params }) } /** @@ -15,7 +15,7 @@ export function getGoodsPageList(params: Record) { * @returns */ export function getGoodsInfo(goods_id: number) { - return request.get(`shop/goods/${ goods_id }`); + return request.get(`shop/goods/${goods_id}`) } /** @@ -24,7 +24,10 @@ export function getGoodsInfo(goods_id: number) { * @returns */ export function addGoods(params: Record) { - return request.post('shop/goods', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/goods', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -32,7 +35,10 @@ export function addGoods(params: Record) { * @param params */ export function editGoods(params: Record) { - return request.put(`shop/goods/${ params.goods_id }`, params, { showErrorMessage: true, showSuccessMessage: true }) + return request.put(`shop/goods/${params.goods_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -40,7 +46,7 @@ export function editGoods(params: Record) { * @param params */ export function getGoodsInit(params: Record) { - return request.get(`shop/goods/init`, { params }); + return request.get(`shop/goods/init`, { params }) } /** @@ -49,7 +55,10 @@ export function getGoodsInit(params: Record) { * @returns */ export function addVirtualGoods(params: Record) { - return request.post('shop/goods/virtual', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/goods/virtual', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -57,10 +66,10 @@ export function addVirtualGoods(params: Record) { * @param params */ export function editVirtualGoods(params: Record) { - return request.put(`shop/goods/virtual/${ params.goods_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/virtual/${params.goods_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -68,7 +77,7 @@ export function editVirtualGoods(params: Record) { * @param params */ export function getVirtualGoodsInit(params: Record) { - return request.get(`shop/goods/virtual/init`, { params }); + return request.get(`shop/goods/virtual/init`, { params }) } /** @@ -77,7 +86,10 @@ export function getVirtualGoodsInit(params: Record) { * @returns */ export function deleteGoods(params: Record) { - return request.put(`shop/goods/delete`, params, { showErrorMessage: true, showSuccessMessage: true }) + return request.put(`shop/goods/delete`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -86,7 +98,7 @@ export function deleteGoods(params: Record) { * @returns */ export function getRecycleGoodsPageList(params: Record) { - return request.get(`shop/goods/recycle`, { params }) + return request.get(`shop/goods/recycle`, { params }) } /** @@ -95,7 +107,10 @@ export function getRecycleGoodsPageList(params: Record) { * @returns */ export function recycleGoods(params: Record) { - return request.put(`shop/goods/recycle`, params, { showErrorMessage: true, showSuccessMessage: true }) + return request.put(`shop/goods/recycle`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -103,7 +118,7 @@ export function recycleGoods(params: Record) { * @param params */ export function editGoodsSort(params: Record) { - return request.put(`shop/goods/sort`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/sort`, params, { showSuccessMessage: true }) } /** @@ -111,7 +126,7 @@ export function editGoodsSort(params: Record) { * @param params */ export function editGoodsStatus(params: Record) { - return request.put(`shop/goods/status`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/status`, params, { showSuccessMessage: true }) } /** @@ -119,7 +134,9 @@ export function editGoodsStatus(params: Record) { * @param params */ export function copyGoods(params: Record) { - return request.put(`shop/goods/copy/${ params.goods_id }`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/copy/${params.goods_id}`, params, { + showSuccessMessage: true, + }) } /** @@ -128,7 +145,7 @@ export function copyGoods(params: Record) { * @returns */ export function getGoodsSelectPageList(params: Record) { - return request.get(`shop/goods/select`, { params }) + return request.get(`shop/goods/select`, { params }) } /** @@ -137,7 +154,7 @@ export function getGoodsSelectPageList(params: Record) { * @returns */ export function getGoodsSkuList(params: Record) { - return request.get(`shop/goods/sku`, { params }) + return request.get(`shop/goods/sku`, { params }) } /** @@ -146,7 +163,7 @@ export function getGoodsSkuList(params: Record) { * @returns */ export function getGoodsSkuNoPageList(params: Record) { - return request.get(`shop/goods/selectgoodssku`, { params }) + return request.get(`shop/goods/selectgoodssku`, { params }) } /** 查询商品参与营销活动的数量 @@ -154,7 +171,7 @@ export function getGoodsSkuNoPageList(params: Record) { * @returns */ export function getActiveGoodsCount(params: Record) { - return request.get(`shop/goods/active/count`, { params }) + return request.get(`shop/goods/active/count`, { params }) } /** @@ -163,7 +180,9 @@ export function getActiveGoodsCount(params: Record) { * @returns */ export function editGoodsListStock(params: Record) { - return request.put(`shop/goods/sku/stock`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/sku/stock`, params, { + showSuccessMessage: true, + }) } /** @@ -172,7 +191,9 @@ export function editGoodsListStock(params: Record) { * @returns */ export function editGoodsListPrice(params: Record) { - return request.put(`shop/goods/sku/price`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/sku/price`, params, { + showSuccessMessage: true, + }) } /** @@ -181,7 +202,9 @@ export function editGoodsListPrice(params: Record) { * @returns */ export function editGoodsListMemberPrice(params: Record) { - return request.put(`shop/goods/sku/member_price`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/sku/member_price`, params, { + showSuccessMessage: true, + }) } /** @@ -189,7 +212,7 @@ export function editGoodsListMemberPrice(params: Record) { * @returns */ export function getGoodsType() { - return request.get(`shop/goods/type`); + return request.get(`shop/goods/type`) } /** @@ -198,7 +221,7 @@ export function getGoodsType() { * @returns */ export function getLabelPageList(params: Record) { - return request.get(`shop/goods/label`, { params }) + return request.get(`shop/goods/label`, { params }) } /** @@ -207,7 +230,7 @@ export function getLabelPageList(params: Record) { * @returns */ export function getLabelList(params: Record) { - return request.get(`shop/goods/label/list`, { params }) + return request.get(`shop/goods/label/list`, { params }) } /** @@ -216,7 +239,7 @@ export function getLabelList(params: Record) { * @returns */ export function getLabelInfo(label_id: number) { - return request.get(`shop/goods/label/${ label_id }`); + return request.get(`shop/goods/label/${label_id}`) } /** @@ -225,7 +248,10 @@ export function getLabelInfo(label_id: number) { * @returns */ export function addLabel(params: Record) { - return request.post('shop/goods/label', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/goods/label', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -234,10 +260,10 @@ export function addLabel(params: Record) { * @returns */ export function editLabel(params: Record) { - return request.put(`shop/goods/label/${ params.label_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/label/${params.label_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -245,7 +271,9 @@ export function editLabel(params: Record) { * @param params */ export function modifyLabelStatus(params: Record) { - return request.put(`shop/goods/label/status`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/label/status`, params, { + showSuccessMessage: true, + }) } /** @@ -254,7 +282,10 @@ export function modifyLabelStatus(params: Record) { * @returns */ export function deleteLabel(label_id: number) { - return request.delete(`shop/goods/label/${ label_id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/goods/label/${label_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -262,7 +293,9 @@ export function deleteLabel(label_id: number) { * @param params */ export function modifyLabelSort(params: Record) { - return request.put(`shop/goods/label/sort`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/label/sort`, params, { + showSuccessMessage: true, + }) } /** @@ -271,7 +304,7 @@ export function modifyLabelSort(params: Record) { * @returns */ export function getLabelGroupPageList(params: Record) { - return request.get(`shop/goods/label/group`, { params }) + return request.get(`shop/goods/label/group`, { params }) } /** @@ -280,7 +313,7 @@ export function getLabelGroupPageList(params: Record) { * @returns */ export function getLabelGroupList(params: Record) { - return request.get(`shop/goods/label/group/list`, { params }) + return request.get(`shop/goods/label/group/list`, { params }) } /** @@ -289,7 +322,7 @@ export function getLabelGroupList(params: Record) { * @returns */ export function getLabelGroupInfo(label_id: number) { - return request.get(`shop/goods/label/group/${ label_id }`); + return request.get(`shop/goods/label/group/${label_id}`) } /** @@ -298,7 +331,10 @@ export function getLabelGroupInfo(label_id: number) { * @returns */ export function addLabelGroup(params: Record) { - return request.post('shop/goods/label/group', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/goods/label/group', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -307,10 +343,10 @@ export function addLabelGroup(params: Record) { * @returns */ export function editLabelGroup(params: Record) { - return request.put(`shop/goods/label/group/${ params.group_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/label/group/${params.group_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -319,7 +355,10 @@ export function editLabelGroup(params: Record) { * @returns */ export function deleteLabelGroup(group_id: number) { - return request.delete(`shop/goods/label/group/${ group_id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/goods/label/group/${group_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -327,7 +366,9 @@ export function deleteLabelGroup(group_id: number) { * @param params */ export function modifyLabelGroupSort(params: Record) { - return request.put(`shop/goods/label/group/sort`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/label/group/sort`, params, { + showSuccessMessage: true, + }) } /** @@ -336,7 +377,7 @@ export function modifyLabelGroupSort(params: Record) { * @returns */ export function getBrandPageList(params: Record) { - return request.get(`shop/goods/brand`, { params }) + return request.get(`shop/goods/brand`, { params }) } /** @@ -345,7 +386,7 @@ export function getBrandPageList(params: Record) { * @returns */ export function getBrandList(params: Record) { - return request.get(`shop/goods/brand/list`, { params }) + return request.get(`shop/goods/brand/list`, { params }) } /** @@ -354,7 +395,7 @@ export function getBrandList(params: Record) { * @returns */ export function getBrandInfo(brand_id: number) { - return request.get(`shop/goods/brand/${ brand_id }`); + return request.get(`shop/goods/brand/${brand_id}`) } /** @@ -363,7 +404,10 @@ export function getBrandInfo(brand_id: number) { * @returns */ export function addBrand(params: Record) { - return request.post('shop/goods/brand', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/goods/brand', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -372,10 +416,10 @@ export function addBrand(params: Record) { * @returns */ export function editBrand(params: Record) { - return request.put(`shop/goods/brand/${ params.brand_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/brand/${params.brand_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -383,7 +427,9 @@ export function editBrand(params: Record) { * @param params */ export function modifyBrandSort(params: Record) { - return request.put(`shop/goods/brand/sort`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/brand/sort`, params, { + showSuccessMessage: true, + }) } /** @@ -392,7 +438,10 @@ export function modifyBrandSort(params: Record) { * @returns */ export function deleteBrand(brand_id: number) { - return request.delete(`shop/goods/brand/${ brand_id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/goods/brand/${brand_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -401,7 +450,7 @@ export function deleteBrand(brand_id: number) { * @returns */ export function getServePageList(params: Record) { - return request.get(`shop/goods/service`, { params }) + return request.get(`shop/goods/service`, { params }) } /** @@ -410,7 +459,7 @@ export function getServePageList(params: Record) { * @returns */ export function getServeList(params: Record) { - return request.get(`shop/goods/service/list`, { params }) + return request.get(`shop/goods/service/list`, { params }) } /** @@ -419,7 +468,7 @@ export function getServeList(params: Record) { * @returns */ export function getServeInfo(service_id: number) { - return request.get(`shop/goods/service/${ service_id }`); + return request.get(`shop/goods/service/${service_id}`) } /** @@ -428,7 +477,10 @@ export function getServeInfo(service_id: number) { * @returns */ export function addServe(params: Record) { - return request.post('shop/goods/service', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/goods/service', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -437,10 +489,10 @@ export function addServe(params: Record) { * @returns */ export function editServe(params: Record) { - return request.put(`shop/goods/service/${ params.service_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/service/${params.service_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -449,7 +501,10 @@ export function editServe(params: Record) { * @returns */ export function deleteServe(service_id: number) { - return request.delete(`shop/goods/service/${ service_id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/goods/service/${service_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -457,7 +512,7 @@ export function deleteServe(service_id: number) { * @returns */ export function getCategoryTree() { - return request.get(`shop/goods/tree`) + return request.get(`shop/goods/tree`) } /** @@ -466,7 +521,7 @@ export function getCategoryTree() { * @returns */ export function getCategoryList(params: Record) { - return request.get(`shop/goods/category`, { params }) + return request.get(`shop/goods/category`, { params }) } /** @@ -475,7 +530,7 @@ export function getCategoryList(params: Record) { * @returns */ export function getCategoryInfo(category_id: number) { - return request.get(`shop/goods/category/${ category_id }`); + return request.get(`shop/goods/category/${category_id}`) } /** @@ -484,7 +539,10 @@ export function getCategoryInfo(category_id: number) { * @returns */ export function addCategory(params: Record) { - return request.post('shop/goods/category', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/goods/category', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -493,10 +551,10 @@ export function addCategory(params: Record) { * @returns */ export function editCategory(params: Record) { - return request.put(`shop/goods/category/${ params.category_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/category/${params.category_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -505,7 +563,10 @@ export function editCategory(params: Record) { * @returns */ export function deleteCategory(category_id: number) { - return request.delete(`shop/goods/category/${ category_id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/goods/category/${category_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -514,7 +575,10 @@ export function deleteCategory(category_id: number) { * @returns */ export function updateCategory(params: Record) { - return request.post(`shop/goods/category/update`, params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post(`shop/goods/category/update`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -523,7 +587,10 @@ export function updateCategory(params: Record) { * @returns */ export function setCategoryConfig(params: Record) { - return request.post(`shop/goods/category/config`, params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post(`shop/goods/category/config`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -531,7 +598,7 @@ export function setCategoryConfig(params: Record) { * @returns */ export function getCategoryConfig() { - return request.get(`shop/goods/category/config`); + return request.get(`shop/goods/category/config`) } /** @@ -539,7 +606,7 @@ export function getCategoryConfig() { * @returns */ export function getCategoryTreeComponents() { - return request.get(`shop/goods/category/components`) + return request.get(`shop/goods/category/components`) } /** @@ -548,7 +615,7 @@ export function getCategoryTreeComponents() { * @returns */ export function getSupplierList(params: Record) { - return request.get(`shop_supplier/supplier/list`, { params }) + return request.get(`shop_supplier/supplier/list`, { params }) } /** @@ -557,7 +624,7 @@ export function getSupplierList(params: Record) { * @returns */ export function getEvaluateList(params: Record) { - return request.get(`shop/goods/evaluate`, { params }) + return request.get(`shop/goods/evaluate`, { params }) } /** @@ -566,7 +633,10 @@ export function getEvaluateList(params: Record) { * @returns */ export function addEvaluate(params: Record) { - return request.post('shop/goods/evaluate', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/goods/evaluate', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -575,7 +645,10 @@ export function addEvaluate(params: Record) { * @returns */ export function deleteEvaluate(evaluate_id: number) { - return request.delete(`shop/goods/evaluate/${ evaluate_id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/goods/evaluate/${evaluate_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -584,10 +657,10 @@ export function deleteEvaluate(evaluate_id: number) { * @returns */ export function adoptEvaluate(evaluate_id: number) { - return request.put(`shop/goods/evaluate/adopt/${ evaluate_id }`, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/evaluate/adopt/${evaluate_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -596,10 +669,10 @@ export function adoptEvaluate(evaluate_id: number) { * @returns */ export function refuseEvaluate(evaluate_id: number) { - return request.put(`shop/goods/evaluate/refuse/${ evaluate_id }`, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/evaluate/refuse/${evaluate_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -608,10 +681,14 @@ export function refuseEvaluate(evaluate_id: number) { * @returns */ export function replyEvaluate(params: Record) { - return request.put(`shop/goods/evaluate/reply/${ params.evaluate_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put( + `shop/goods/evaluate/reply/${params.evaluate_id}`, + params, + { + showErrorMessage: true, + showSuccessMessage: true, + } + ) } /** @@ -620,10 +697,10 @@ export function replyEvaluate(params: Record) { * @returns */ export function toppingEvaluate(evaluate_id: number) { - return request.put(`shop/goods/evaluate/topping/${ evaluate_id }`, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/evaluate/topping/${evaluate_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -632,10 +709,10 @@ export function toppingEvaluate(evaluate_id: number) { * @returns */ export function cancelToppingEvaluate(evaluate_id: number) { - return request.put(`shop/goods/evaluate/cancel_topping/${ evaluate_id }`, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/evaluate/cancel_topping/${evaluate_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -644,7 +721,7 @@ export function cancelToppingEvaluate(evaluate_id: number) { * @returns */ export function getAttrPageList(params: Record) { - return request.get(`shop/goods/attr`, { params }) + return request.get(`shop/goods/attr`, { params }) } /** @@ -653,7 +730,7 @@ export function getAttrPageList(params: Record) { * @returns */ export function getAttrList(params: Record) { - return request.get(`shop/goods/attr/list`, { params }) + return request.get(`shop/goods/attr/list`, { params }) } /** @@ -662,7 +739,7 @@ export function getAttrList(params: Record) { * @returns */ export function getAttrInfo(attr_id: number) { - return request.get(`shop/goods/attr/${ attr_id }`); + return request.get(`shop/goods/attr/${attr_id}`) } /** @@ -671,7 +748,10 @@ export function getAttrInfo(attr_id: number) { * @returns */ export function addAttr(params: Record) { - return request.post('shop/goods/attr', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/goods/attr', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -680,10 +760,10 @@ export function addAttr(params: Record) { * @returns */ export function editAttr(params: Record) { - return request.put(`shop/goods/attr/${ params.attr_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/attr/${params.attr_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -692,7 +772,10 @@ export function editAttr(params: Record) { * @returns */ export function deleteAttr(attr_id: number) { - return request.delete(`shop/goods/attr/${ attr_id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/goods/attr/${attr_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -700,7 +783,9 @@ export function deleteAttr(attr_id: number) { * @param params */ export function modifyAttrSort(params: Record) { - return request.put(`shop/goods/attr/sort`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/attr/sort`, params, { + showSuccessMessage: true, + }) } /** @@ -708,7 +793,9 @@ export function modifyAttrSort(params: Record) { * @param params */ export function modifyAttrName(params: Record) { - return request.put(`shop/goods/attr/attr_name`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/attr/attr_name`, params, { + showSuccessMessage: true, + }) } /** @@ -716,7 +803,9 @@ export function modifyAttrName(params: Record) { * @param params */ export function modifyAttrValue(params: Record) { - return request.put(`shop/goods/attr/attr_value`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/attr/attr_value`, params, { + showSuccessMessage: true, + }) } /** @@ -724,7 +813,7 @@ export function modifyAttrValue(params: Record) { * @returns */ export function getGoodsBatchSetDict() { - return request.get(`shop/goods/batchSet/dict`) + return request.get(`shop/goods/batchSet/dict`) } /** @@ -732,5 +821,7 @@ export function getGoodsBatchSetDict() { * @param params */ export function goodsBatchSet(params: Record) { - return request.put(`shop/goods/batchSet`, params, { showSuccessMessage: true }) -} \ No newline at end of file + return request.put(`shop/goods/batchSet`, params, { + showSuccessMessage: true, + }) +} diff --git a/admin/src/addon/shop/api/marketing.ts b/admin/src/addon/shop/api/marketing.ts index b48dd32f..d94114f4 100644 --- a/admin/src/addon/shop/api/marketing.ts +++ b/admin/src/addon/shop/api/marketing.ts @@ -6,7 +6,7 @@ import request from '@/utils/request' * @returns */ export function getMarketingIndex(params: Record) { - return request.get(`shop/marketing`, { params }) + return request.get(`shop/marketing`, { params }) } /** @@ -15,7 +15,7 @@ export function getMarketingIndex(params: Record) { * @returns */ export function getGoodsCategoryList(params: Record) { - return request.get(`shop/goods/coupon/init`, { params }) + return request.get(`shop/goods/coupon/init`, { params }) } /** @@ -24,7 +24,10 @@ export function getGoodsCategoryList(params: Record) { * @returns */ export function addCoupon(params: Record) { - return request.post(`shop/goods/coupon`, params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post(`shop/goods/coupon`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -32,7 +35,7 @@ export function addCoupon(params: Record) { * @returns */ export function getCouponStatusList() { - return request.get(`shop/goods/coupon/status`) + return request.get(`shop/goods/coupon/status`) } /** @@ -41,7 +44,7 @@ export function getCouponStatusList() { * @returns */ export function getCouponList(params: Record) { - return request.get(`shop/goods/coupon`, { params }) + return request.get(`shop/goods/coupon`, { params }) } /** @@ -50,7 +53,7 @@ export function getCouponList(params: Record) { * @returns */ export function getCouponSelectList(params: Record) { - return request.get(`shop/goods/coupon/select`, { params }) + return request.get(`shop/goods/coupon/select`, { params }) } /** @@ -59,7 +62,7 @@ export function getCouponSelectList(params: Record) { * @returns */ export function getCouponRecords(params: Record) { - return request.get(`shop/goods/coupon/records`, { params }); + return request.get(`shop/goods/coupon/records`, { params }) } /** @@ -68,7 +71,7 @@ export function getCouponRecords(params: Record) { * @returns */ export function getCouponInfo(id: number) { - return request.get(`shop/goods/coupon/detail/${ id }`); + return request.get(`shop/goods/coupon/detail/${id}`) } /** @@ -77,7 +80,9 @@ export function getCouponInfo(id: number) { * @returns */ export function editCouponStatus(params: Record) { - return request.put(`shop/goods/coupon/setstatus/${ params.status }`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/coupon/setstatus/${params.status}`, params, { + showSuccessMessage: true, + }) } /** @@ -86,10 +91,10 @@ export function editCouponStatus(params: Record) { * @returns */ export function editCoupon(params: Record) { - return request.put(`shop/goods/coupon/edit/${ params.id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/coupon/edit/${params.id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -98,7 +103,7 @@ export function editCoupon(params: Record) { * @returns */ export function deleteCoupon(id: number) { - return request.delete(`shop/goods/coupon/${ id }`, { showSuccessMessage: true }) + return request.delete(`shop/goods/coupon/${id}`, { showSuccessMessage: true }) } /** @@ -107,7 +112,9 @@ export function deleteCoupon(id: number) { * @returns */ export function closeCoupon(id: number) { - return request.put(`shop/goods/coupon/invalid/${ id }`, { showSuccessMessage: true }) + return request.put(`shop/goods/coupon/invalid/${id}`, { + showSuccessMessage: true, + }) } /** @@ -116,7 +123,7 @@ export function closeCoupon(id: number) { * @returns */ export function getSelectedCouponList(params: Record) { - return request.get(`shop/goods/coupon/selected`, { params }) + return request.get(`shop/goods/coupon/selected`, { params }) } /************ 限时折扣 ****************/ @@ -126,7 +133,7 @@ export function getSelectedCouponList(params: Record) { * @returns */ export function getActiveDiscountPageList(params: Record) { - return request.get(`shop/active/discount`, { params }) + return request.get(`shop/active/discount`, { params }) } /** @@ -134,7 +141,7 @@ export function getActiveDiscountPageList(params: Record) { * @returns */ export function getActiveDiscountStatusList() { - return request.get(`shop/active/status`) + return request.get(`shop/active/status`) } /** @@ -143,7 +150,7 @@ export function getActiveDiscountStatusList() { * @returns */ export function getActiveDiscountInfo(active_id: number) { - return request.get(`shop/active/discount/${ active_id }`); + return request.get(`shop/active/discount/${active_id}`) } /** @@ -152,7 +159,10 @@ export function getActiveDiscountInfo(active_id: number) { * @returns */ export function addActiveDiscount(params: Record) { - return request.post('shop/active/discount', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/active/discount', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -161,10 +171,10 @@ export function addActiveDiscount(params: Record) { * @returns */ export function editActiveDiscount(params: Record) { - return request.put(`shop/active/discount/${ params.active_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/active/discount/${params.active_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -173,10 +183,14 @@ export function editActiveDiscount(params: Record) { * @returns */ export function closeActiveDiscount(active_id: number) { - return request.put(`shop/active/discount/close/${ active_id }`, {}, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put( + `shop/active/discount/close/${active_id}`, + {}, + { + showErrorMessage: true, + showSuccessMessage: true, + } + ) } /** @@ -185,7 +199,9 @@ export function closeActiveDiscount(active_id: number) { * @returns */ export function deleteActiveDiscount(active_id: number) { - return request.delete(`shop/active/discount/${ active_id }`, { showSuccessMessage: true }) + return request.delete(`shop/active/discount/${active_id}`, { + showSuccessMessage: true, + }) } /** @@ -194,7 +210,9 @@ export function deleteActiveDiscount(active_id: number) { * @returns */ export function getActiveDiscountGoodsPageList(params: Record) { - return request.get(`shop/active/discount/goods/${ params.active_id }`, { params }) + return request.get(`shop/active/discount/goods/${params.active_id}`, { + params, + }) } /** @@ -203,7 +221,9 @@ export function getActiveDiscountGoodsPageList(params: Record) { * @returns */ export function getActiveDiscountOrderPageList(params: Record) { - return request.get(`shop/active/discount/order/${ params.active_id }`, { params }) + return request.get(`shop/active/discount/order/${params.active_id}`, { + params, + }) } /** @@ -212,7 +232,9 @@ export function getActiveDiscountOrderPageList(params: Record) { * @returns */ export function getActiveDiscountMemberPageList(params: Record) { - return request.get(`shop/active/discount/member/${ params.active_id }`, { params }) + return request.get(`shop/active/discount/member/${params.active_id}`, { + params, + }) } /** @@ -220,7 +242,7 @@ export function getActiveDiscountMemberPageList(params: Record) { * @returns */ export function getActiveDiscountConfig() { - return request.get(`shop/active/discount/config`); + return request.get(`shop/active/discount/config`) } /** @@ -229,10 +251,10 @@ export function getActiveDiscountConfig() { * @returns */ export function editActiveDiscountConfig(params: Record) { - return request.put(`shop/active/discount/config`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/active/discount/config`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /********** 积分商品 ***********/ @@ -243,7 +265,7 @@ export function editActiveDiscountConfig(params: Record) { * @returns */ export function getActiveExchangePageList(params: Record) { - return request.get(`shop/active/exchange`, { params }) + return request.get(`shop/active/exchange`, { params }) } /** @@ -252,7 +274,7 @@ export function getActiveExchangePageList(params: Record) { * @returns */ export function getActiveExchangeInfo(id: number) { - return request.get(`shop/active/exchange/${ id }`); + return request.get(`shop/active/exchange/${id}`) } /** @@ -261,7 +283,10 @@ export function getActiveExchangeInfo(id: number) { * @returns */ export function addActiveExchange(params: Record) { - return request.post('shop/active/exchange', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/active/exchange', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -270,10 +295,10 @@ export function addActiveExchange(params: Record) { * @returns */ export function editActiveExchange(params: Record) { - return request.put(`shop/active/exchange/${ params.id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/active/exchange/${params.id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -282,10 +307,10 @@ export function editActiveExchange(params: Record) { * @returns */ export function editActiveExchangeStatus(params: Record) { - return request.put(`shop/active/exchange/status/${ params.id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/active/exchange/status/${params.id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -294,7 +319,9 @@ export function editActiveExchangeStatus(params: Record) { * @returns */ export function deleteActiveExchange(id: number) { - return request.delete(`shop/active/exchange/${ id }`, { showSuccessMessage: true }) + return request.delete(`shop/active/exchange/${id}`, { + showSuccessMessage: true, + }) } /** @@ -302,7 +329,7 @@ export function deleteActiveExchange(id: number) { * @returns */ export function getActiveExchangeStatus() { - return request.get(`shop/active/exchange/status`) + return request.get(`shop/active/exchange/status`) } /************ 新人专享 ****************/ @@ -312,7 +339,7 @@ export function getActiveExchangeStatus() { * @returns */ export function getActiveNewcomerConfig() { - return request.get(`shop/active/newcomer/config`); + return request.get(`shop/active/newcomer/config`) } /** @@ -321,10 +348,10 @@ export function getActiveNewcomerConfig() { * @returns */ export function editActiveNewcomerConfig(params: Record) { - return request.put(`shop/active/newcomer/config`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/active/newcomer/config`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -333,7 +360,7 @@ export function editActiveNewcomerConfig(params: Record) { * @returns */ export function getNewcomerGoodsList(params: Record) { - return request.get('shop/active/newcomer/goods/select', { params }) + return request.get('shop/active/newcomer/goods/select', { params }) } /** @@ -342,7 +369,7 @@ export function getNewcomerGoodsList(params: Record) { * @returns */ export function getNewcomerSelectGoodsList(params: Record) { - return request.get('shop/active/newcomer/goods/selectgoodssku', { params }) + return request.get('shop/active/newcomer/goods/selectgoodssku', { params }) } /************ 商品榜单 ****************/ @@ -353,7 +380,10 @@ export function getNewcomerSelectGoodsList(params: Record) { * @returns */ export function setRankConfig(params: Record) { - return request.post('shop/good/rank/config', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/good/rank/config', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -361,7 +391,7 @@ export function setRankConfig(params: Record) { * @returns */ export function getRankConfig() { - return request.get(`shop/good/rank/config`) + return request.get(`shop/good/rank/config`) } /** @@ -370,7 +400,7 @@ export function getRankConfig() { * @returns */ export function getRankPageList(params: Record) { - return request.get(`shop/good/rank`, { params }) + return request.get(`shop/good/rank`, { params }) } /** @@ -378,7 +408,7 @@ export function getRankPageList(params: Record) { * @returns */ export function optionData() { - return request.get(`shop/good/rank/dict`) + return request.get(`shop/good/rank/dict`) } /** @@ -387,7 +417,7 @@ export function optionData() { * @returns */ export function getRankInfo(rank_id: number) { - return request.get(`shop/good/rank/${ rank_id }`); + return request.get(`shop/good/rank/${rank_id}`) } /** @@ -396,7 +426,10 @@ export function getRankInfo(rank_id: number) { * @returns */ export function addGoodRank(params: Record) { - return request.post('shop/good/rank', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/good/rank', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -405,10 +438,10 @@ export function addGoodRank(params: Record) { * @returns */ export function editGoodRank(params: Record) { - return request.put(`shop/good/rank/${ params.id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/good/rank/${params.id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -417,10 +450,10 @@ export function editGoodRank(params: Record) { * @returns */ export function editRankStatus(params: Record) { - return request.put(`shop/goods/rank/status`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/rank/status`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -429,7 +462,7 @@ export function editRankStatus(params: Record) { * @returns */ export function deleteGoodRank(id: number) { - return request.delete(`shop/good/rank/${ id }`, { showSuccessMessage: true }) + return request.delete(`shop/good/rank/${id}`, { showSuccessMessage: true }) } /** @@ -438,7 +471,9 @@ export function deleteGoodRank(id: number) { * @returns */ export function batchDelete(params: Record) { - return request.put(`shop/good/rank/batchDelete`, params, { showSuccessMessage: true }) + return request.put(`shop/good/rank/batchDelete`, params, { + showSuccessMessage: true, + }) } /** @@ -447,7 +482,9 @@ export function batchDelete(params: Record) { * @returns */ export function modifyGoodsRankSort(params: Record) { - return request.put(`shop/good/rank/sort`, params, { showSuccessMessage: true }) + return request.put(`shop/good/rank/sort`, params, { + showSuccessMessage: true, + }) } /** @@ -456,7 +493,7 @@ export function modifyGoodsRankSort(params: Record) { * @returns */ export function getSelectRankPageList(params: Record) { - return request.get(`shop/good/rank/select`, { params }) + return request.get(`shop/good/rank/select`, { params }) } /************ 满减 ****************/ @@ -467,7 +504,7 @@ export function getSelectRankPageList(params: Record) { * @returns */ export function getManjianList(params: Record) { - return request.get(`shop/manjian`, { params }) + return request.get(`shop/manjian`, { params }) } /** @@ -475,7 +512,7 @@ export function getManjianList(params: Record) { * @returns */ export function getManjianStatusList() { - return request.get(`shop/manjian/status`) + return request.get(`shop/manjian/status`) } /** @@ -484,7 +521,7 @@ export function getManjianStatusList() { * @returns */ export function addManjian(params: Record) { - return request.post('shop/manjian', params) + return request.post('shop/manjian', params) } /** @@ -493,7 +530,7 @@ export function addManjian(params: Record) { * @returns */ export function editManjian(params: Record) { - return request.put(`shop/manjian/${ params.id }`, params) + return request.put(`shop/manjian/${params.id}`, params) } /** @@ -502,7 +539,7 @@ export function editManjian(params: Record) { * @returns */ export function getManjianInfo(params: Record) { - return request.get(`shop/manjian/init`, { params }); + return request.get(`shop/manjian/init`, { params }) } /** @@ -511,7 +548,7 @@ export function getManjianInfo(params: Record) { * @returns */ export function goodsCheck(params: Record) { - return request.post('shop/manjian/goods/check', params) + return request.post('shop/manjian/goods/check', params) } /** @@ -520,7 +557,7 @@ export function goodsCheck(params: Record) { * @returns */ export function getManjianMemberPageList(params: Record) { - return request.get(`shop/manjian/member/${ params.id }`, { params }) + return request.get(`shop/manjian/member/${params.id}`, { params }) } /** @@ -529,10 +566,14 @@ export function getManjianMemberPageList(params: Record) { * @returns */ export function closeManjian(manjian_id: number) { - return request.put(`shop/manjian/close/${ manjian_id }`, {}, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put( + `shop/manjian/close/${manjian_id}`, + {}, + { + showErrorMessage: true, + showSuccessMessage: true, + } + ) } /** @@ -541,7 +582,7 @@ export function closeManjian(manjian_id: number) { * @returns */ export function getGoodsSelectByReplaceBuy(params: Record) { - return request.get(`shop/goods/buy/goods/select`, { params }) + return request.get(`shop/goods/buy/goods/select`, { params }) } /** @@ -550,7 +591,7 @@ export function getGoodsSelectByReplaceBuy(params: Record) { * @returns */ export function getGoodsSelectedByReplaceBuy(params: Record) { - return request.get(`shop/goods/buy/goods/selected`, { params }) + return request.get(`shop/goods/buy/goods/selected`, { params }) } /** @@ -559,7 +600,7 @@ export function getGoodsSelectedByReplaceBuy(params: Record) { * @returns */ export function getGoodsSkuInfo(params: Record) { - return request.get(`shop/goods/buy/sku/select`, { params }) + return request.get(`shop/goods/buy/sku/select`, { params }) } /* @@ -568,7 +609,9 @@ export function getGoodsSkuInfo(params: Record) { * @returns */ export function deleteManjian(manjian_id: number) { - return request.delete(`shop/manjian/${ manjian_id }`, { showSuccessMessage: true }) + return request.delete(`shop/manjian/${manjian_id}`, { + showSuccessMessage: true, + }) } /** @@ -577,7 +620,9 @@ export function deleteManjian(manjian_id: number) { * @returns */ export function batchDeleteManjian(params: Record) { - return request.put(`shop/manjian/goods/batchDelete`, params, { showSuccessMessage: true }) + return request.put(`shop/manjian/goods/batchDelete`, params, { + showSuccessMessage: true, + }) } /** @@ -586,5 +631,7 @@ export function batchDeleteManjian(params: Record) { * @returns */ export function batchCloseMajian(params: Record) { - return request.put(`shop/manjian/goods/batchClose`, params, { showSuccessMessage: true }) + return request.put(`shop/manjian/goods/batchClose`, params, { + showSuccessMessage: true, + }) } diff --git a/admin/src/addon/shop/api/order.ts b/admin/src/addon/shop/api/order.ts index 787c9e7c..dd96bf3e 100644 --- a/admin/src/addon/shop/api/order.ts +++ b/admin/src/addon/shop/api/order.ts @@ -5,7 +5,7 @@ import request from '@/utils/request' * @returns */ export function getConfig() { - return request.get('shop/order/config') + return request.get('shop/order/config') } /** @@ -13,7 +13,7 @@ export function getConfig() { * @returns */ export function setConfig(param: any) { - return request.post('shop/order/config', param, { showSuccessMessage: true }) + return request.post('shop/order/config', param, { showSuccessMessage: true }) } /** @@ -21,7 +21,7 @@ export function setConfig(param: any) { * @returns */ export function getOrderList(params: Record) { - return request.get('shop/order/list', { params }) + return request.get('shop/order/list', { params }) } /** @@ -29,7 +29,7 @@ export function getOrderList(params: Record) { * @returns */ export function getOrderDetail(order_id: number) { - return request.get(`shop/order/detail/${ order_id }`) + return request.get(`shop/order/detail/${order_id}`) } /** @@ -37,7 +37,7 @@ export function getOrderDetail(order_id: number) { * @return */ export function getOrderStatus() { - return request.get(`shop/order/status`) + return request.get(`shop/order/status`) } /** @@ -45,7 +45,7 @@ export function getOrderStatus() { * @return */ export function getOrderType() { - return request.get(`shop/order/type`) + return request.get(`shop/order/type`) } /** @@ -53,7 +53,7 @@ export function getOrderType() { * @return */ export function orderClose(order_id: number) { - return request.put(`shop/order/close/${ order_id }`) + return request.put(`shop/order/close/${order_id}`) } /** @@ -61,7 +61,7 @@ export function orderClose(order_id: number) { * @return */ export function getOrderDeliveryType(params: Record) { - return request.get(`shop/order/delivery_type`, { params }) + return request.get(`shop/order/delivery_type`, { params }) } /** @@ -69,7 +69,7 @@ export function getOrderDeliveryType(params: Record) { * @return */ export function orderDelivery(params: Record) { - return request.put(`shop/order/delivery`, params) + return request.put(`shop/order/delivery`, params) } /** @@ -77,7 +77,7 @@ export function orderDelivery(params: Record) { * @return */ export function setShopRemark(params: Record) { - return request.put(`shop/order/shop_remark`, params) + return request.put(`shop/order/shop_remark`, params) } /** @@ -85,7 +85,7 @@ export function setShopRemark(params: Record) { * @return */ export function orderFinish(order_id: number) { - return request.put(`shop/order/finish/${ order_id }`) + return request.put(`shop/order/finish/${order_id}`) } /** @@ -93,7 +93,7 @@ export function orderFinish(order_id: number) { * @return */ export function deliveryPackage(params: Record) { - return request.get(`shop/order/delivery/package`, { params }) + return request.get(`shop/order/delivery/package`, { params }) } /** @@ -101,7 +101,7 @@ export function deliveryPackage(params: Record) { * @return */ export function deliveryPackageList(params: Record) { - return request.get(`shop/order/delivery/package/list`, { params }) + return request.get(`shop/order/delivery/package/list`, { params }) } /** @@ -110,14 +110,14 @@ export function deliveryPackageList(params: Record) { * @return */ export function orderRefund(params: Record) { - return request.get(`shop/order/refund`, { params }) + return request.get(`shop/order/refund`, { params }) } /** * 退款维权详情 */ export function orderRefundDetail(refund_id: number) { - return request.get(`shop/order/refund/${ refund_id }`) + return request.get(`shop/order/refund/${refund_id}`) } /** @@ -125,7 +125,10 @@ export function orderRefundDetail(refund_id: number) { * @return */ export function auditRefund(params: Record) { - return request.put(`shop/order/refund/audit/${ params.order_refund_no }`, params) + return request.put( + `shop/order/refund/audit/${params.order_refund_no}`, + params + ) } /** @@ -133,56 +136,61 @@ export function auditRefund(params: Record) { * @return */ export function refundDelivery(params: Record) { - return request.put(`shop/order/refund/delivery/${ params.order_refund_no }`, params) + return request.put( + `shop/order/refund/delivery/${params.order_refund_no}`, + params + ) } /** * 获取可退款金额 */ export function getRefundMoney(params: Record) { - return request.get(`shop/order/refund/refund_money`, { params }) + return request.get(`shop/order/refund/refund_money`, { params }) } /** * 商家主动退款 */ export function shopActiveRefund(params: Record) { - return request.post(`shop/order/refund/active`, params, { showSuccessMessage: true }) + return request.post(`shop/order/refund/active`, params, { + showSuccessMessage: true, + }) } /** * 获取发票列表 */ export function getInvoiceList(params: Record) { - return request.get(`shop/invoice`, { params }) + return request.get(`shop/invoice`, { params }) } /** * 获取发票列表 */ export function getInvoiceDetail(id: number) { - return request.get(`shop/invoice/${ id }`) + return request.get(`shop/invoice/${id}`) } /** * 开具发票 */ export function setInvoice(id: number, params: Record) { - return request.put(`shop/invoice/${ id }`, params, { showSuccessMessage: true }) + return request.put(`shop/invoice/${id}`, params, { showSuccessMessage: true }) } /** * 获取支付类型 */ export function getOrderPayType() { - return request.get(`shop/order/pay/type`) + return request.get(`shop/order/pay/type`) } /** * 获取订单来源 */ export function getOrderFrom() { - return request.get(`shop/order/from`) + return request.get(`shop/order/from`) } /** @@ -190,7 +198,9 @@ export function getOrderFrom() { * @return */ export function orderEditPrice(params: Record) { - return request.put(`shop/order/edit_price`, params, { showSuccessMessage: true }) + return request.put(`shop/order/edit_price`, params, { + showSuccessMessage: true, + }) } /** @@ -198,7 +208,7 @@ export function orderEditPrice(params: Record) { * @return */ export function getOrderEditAddress(params: Record) { - return request.get(`shop/order/edit_delivery`, { params }) + return request.get(`shop/order/edit_delivery`, { params }) } /** @@ -206,7 +216,7 @@ export function getOrderEditAddress(params: Record) { * @return */ export function getDeliveryList() { - return request.get(`shop/delivery/store/list`) + return request.get(`shop/delivery/store/list`) } /** @@ -214,7 +224,7 @@ export function getDeliveryList() { * @return */ export function orderEditAddress(params: Record) { - return request.put(`shop/order/edit_delivery`, params) + return request.put(`shop/order/edit_delivery`, params) } /** @@ -222,7 +232,7 @@ export function orderEditAddress(params: Record) { * @return */ export function getOrderBatchDeliveryList(params: Record) { - return request.get(`shop/order_batch_delivery`, { params }) + return request.get(`shop/order_batch_delivery`, { params }) } /** @@ -230,7 +240,10 @@ export function getOrderBatchDeliveryList(params: Record) { * @return */ export function addBatchOrderDelivery(params: Record) { - return request.put(`shop/order_batch_delivery/add_batch_order_delivery`, params) + return request.put( + `shop/order_batch_delivery/add_batch_order_delivery`, + params + ) } /** @@ -238,7 +251,7 @@ export function addBatchOrderDelivery(params: Record) { * @return */ export function getOrderBatchDeliveryState() { - return request.get(`shop/order_batch_delivery/get_status`) + return request.get(`shop/order_batch_delivery/get_status`) } /** @@ -246,5 +259,5 @@ export function getOrderBatchDeliveryState() { * @return */ export function getOrderBatchDeliveryType() { - return request.get(`shop/order_batch_delivery/get_type`) + return request.get(`shop/order_batch_delivery/get_type`) } diff --git a/admin/src/addon/shop/api/shop.ts b/admin/src/addon/shop/api/shop.ts index b2bea12c..5e56b4c8 100644 --- a/admin/src/addon/shop/api/shop.ts +++ b/admin/src/addon/shop/api/shop.ts @@ -4,40 +4,40 @@ import request from '@/utils/request' * 获取统计总数 */ export function getShopCountList() { - return request.get(`shop/stat/total`) + return request.get(`shop/stat/total`) } /** * 获取今日统计总数 */ export function getShopTodayCountList() { - return request.get(`shop/stat/today`) + return request.get(`shop/stat/today`) } /** * 获取昨日统计总数 */ export function getShopYesterdayCountList() { - return request.get(`shop/stat/yesterday`) + return request.get(`shop/stat/yesterday`) } /** * 获取统计图数据 */ export function getShopStat() { - return request.get(`shop/stat`) + return request.get(`shop/stat`) } /** * 获取订单统计 */ export function getShopOrderStat() { - return request.get(`shop/stat/order`) + return request.get(`shop/stat/order`) } /** * 获取商品统计 */ export function getShopGoodsStat() { - return request.get(`shop/stat/goods`) + return request.get(`shop/stat/goods`) } diff --git a/admin/src/addon/shop/api/shop_address.ts b/admin/src/addon/shop/api/shop_address.ts index 450d2ddc..563deacd 100644 --- a/admin/src/addon/shop/api/shop_address.ts +++ b/admin/src/addon/shop/api/shop_address.ts @@ -6,7 +6,7 @@ import request from '@/utils/request' * @returns */ export function getShopAddressList(params: Record) { - return request.get(`shop/shop_address`, { params }) + return request.get(`shop/shop_address`, { params }) } /** @@ -15,7 +15,7 @@ export function getShopAddressList(params: Record) { * @returns */ export function getShopAddressInfo(id: number) { - return request.get(`shop/shop_address/${ id }`); + return request.get(`shop/shop_address/${id}`) } /** @@ -24,7 +24,10 @@ export function getShopAddressInfo(id: number) { * @returns */ export function addShopAddress(params: Record) { - return request.post('shop/shop_address', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/shop_address', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -33,7 +36,10 @@ export function addShopAddress(params: Record) { * @returns */ export function editShopAddress(params: Record) { - return request.put(`shop/shop_address/${ params.id }`, params, { showErrorMessage: true, showSuccessMessage: true }) + return request.put(`shop/shop_address/${params.id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -42,7 +48,10 @@ export function editShopAddress(params: Record) { * @returns */ export function deleteShopAddress(id: number) { - return request.delete(`shop/shop_address/${ id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/shop_address/${id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -50,7 +59,7 @@ export function deleteShopAddress(id: number) { * @returns */ export function getShopDefaultDeliveryAddressInfo() { - return request.get('shop/shop_address/default/delivery'); + return request.get('shop/shop_address/default/delivery') } /** @@ -58,5 +67,5 @@ export function getShopDefaultDeliveryAddressInfo() { * @returns */ export function getOrderRefundAddress() { - return request.get('shop/order/refund/address'); -} \ No newline at end of file + return request.get('shop/order/refund/address') +} diff --git a/admin/src/addon/shop/api/stat.ts b/admin/src/addon/shop/api/stat.ts index b0e49c1d..8759bc56 100644 --- a/admin/src/addon/shop/api/stat.ts +++ b/admin/src/addon/shop/api/stat.ts @@ -4,7 +4,7 @@ import request from '@/utils/request' * @returns */ export function getGoodsStatisticsBasic(params: Record) { - return request.get('shop/goods/statistics/basic', { params }) + return request.get('shop/goods/statistics/basic', { params }) } /** @@ -12,13 +12,13 @@ export function getGoodsStatisticsBasic(params: Record) { * @returns */ export function getGoodsStatisticsTrend(params: Record) { - return request.get('shop/goods/statistics/trend', { params }) + return request.get('shop/goods/statistics/trend', { params }) } /** * 获取商品排行榜统计类型 */ export function getGoodsStatisticsType() { - return request.get(`shop/goods/statistics/type`) + return request.get(`shop/goods/statistics/type`) } /** @@ -26,5 +26,5 @@ export function getGoodsStatisticsType() { * @returns */ export function getGoodsStatisticsRank(params: Record) { - return request.get('shop/goods/statistics/rank', { params }) + return request.get('shop/goods/statistics/rank', { params }) } diff --git a/admin/src/addon/shop/lang/zh-cn/address.edit.json b/admin/src/addon/shop/lang/zh-cn/address.edit.json index 43e5ec4a..503f3b68 100644 --- a/admin/src/addon/shop/lang/zh-cn/address.edit.json +++ b/admin/src/addon/shop/lang/zh-cn/address.edit.json @@ -1,35 +1,35 @@ { - "contactName":"联系人", - "mobile":"联系方式", - "provinceId":"省", - "cityId":"市", - "districtId":"区", - "address":"详细地址", - "fullAddress":"地址", - "lat":"纬度", - "lng":"经度", - "isDeliveryAddress":"是否是发货地址", - "isRefundAddress":"是否是退货地址", - "isDefaultDelivery":"默认发货地址", - "isDefaultRefund":"默认收货地址", - "contactNamePlaceholder":"请输入联系人", - "mobilePlaceholder":"请输入联系方式", - "mobileTips":"请输入正确的手机号", - "addressPlaceholder":"请输入详细地址", - "fullAddressPlaceholder":"请输入地址", - "latPlaceholder":"请输入纬度", - "lngPlaceholder":"请输入经度", - "isDeliveryAddressPlaceholder":"请输入是否是发货地址", - "isRefundAddressPlaceholder":"请输入是否是退货地址", - "isDefaultDeliveryPlaceholder":"请输入默认发货地址", - "isDefaultRefundPlaceholder":"请输入默认收货地址", - "addShopAddress":"添加商家地址库", - "updateShopAddress":"编辑商家地址库", - "shopAddressDeleteTips":"确定要删除该商家地址库吗？", - "addressType": "地址类型", - "deliveryAddress": "发货地址", - "refundAddress": "收货地址", - "defaultDeliveryAddress": "是否设为默认发货地址", - "defaultRefundAddress": "是否设为默认收货地址", - "addressTypeRequire": "至少需设置一项类型" -} \ No newline at end of file + "contactName": "联系人", + "mobile": "联系方式", + "provinceId": "省", + "cityId": "市", + "districtId": "区", + "address": "详细地址", + "fullAddress": "地址", + "lat": "纬度", + "lng": "经度", + "isDeliveryAddress": "是否是发货地址", + "isRefundAddress": "是否是退货地址", + "isDefaultDelivery": "默认发货地址", + "isDefaultRefund": "默认收货地址", + "contactNamePlaceholder": "请输入联系人", + "mobilePlaceholder": "请输入联系方式", + "mobileTips": "请输入正确的手机号", + "addressPlaceholder": "请输入详细地址", + "fullAddressPlaceholder": "请输入地址", + "latPlaceholder": "请输入纬度", + "lngPlaceholder": "请输入经度", + "isDeliveryAddressPlaceholder": "请输入是否是发货地址", + "isRefundAddressPlaceholder": "请输入是否是退货地址", + "isDefaultDeliveryPlaceholder": "请输入默认发货地址", + "isDefaultRefundPlaceholder": "请输入默认收货地址", + "addShopAddress": "添加商家地址库", + "updateShopAddress": "编辑商家地址库", + "shopAddressDeleteTips": "确定要删除该商家地址库吗？", + "addressType": "地址类型", + "deliveryAddress": "发货地址", + "refundAddress": "收货地址", + "defaultDeliveryAddress": "是否设为默认发货地址", + "defaultRefundAddress": "是否设为默认收货地址", + "addressTypeRequire": "至少需设置一项类型" +} diff --git a/admin/src/addon/shop/lang/zh-cn/address.list.json b/admin/src/addon/shop/lang/zh-cn/address.list.json index 17372d2e..29bd5fa0 100644 --- a/admin/src/addon/shop/lang/zh-cn/address.list.json +++ b/admin/src/addon/shop/lang/zh-cn/address.list.json @@ -22,4 +22,4 @@ "deliveryAddress": "发货地址", "refundAddress": "收货地址", "default": "默认" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/common.json b/admin/src/addon/shop/lang/zh-cn/common.json index f53e8247..0a5c41da 100644 --- a/admin/src/addon/shop/lang/zh-cn/common.json +++ b/admin/src/addon/shop/lang/zh-cn/common.json @@ -88,41 +88,41 @@ "goodsSearchSet": "搜索设置", "goodsSearchText": "搜索内容", "goodsSearchTextPlaceholder": "请输入搜索内容", - "shopMemberInfoComponentUidTextColor":"编号颜色", - "shopMemberInfoComponentAccount":"账号信息", - "shopGoodsRecommendComponentTag":"标签", - "shopGoodsRecommendComponentTagcolor":"标签颜色", - "shopGoodsRecommendComponentTagPlaceholder":"请输入标签内容", - "shopGoodsRecommendComponentButtonBorderColor":"按钮边框颜色", - "carouselStyle":"轮播样式", - "recommendIndicatorStyle":"指示器设置", - "recommendIndicatorColor":"常规颜色", - "recommendIndicatorActiveColor":"选中颜色", - "activeCubeBlockContent":"板块内容" , - "bgImage":"背景图片", - "rankingTitleIcon":"图标" , - "rankSelect":"榜单选择", - "rankName":"榜单名称", - "rankNamePlaceholder":"请输入榜单名称", - "showGoodsNum":"榜单商品数量", - "goodsSourceName":"商品来源", - "ruleTypeName":"排序规则", - "rankTypeName":"排行周期", + "shopMemberInfoComponentUidTextColor": "编号颜色", + "shopMemberInfoComponentAccount": "账号信息", + "shopGoodsRecommendComponentTag": "标签", + "shopGoodsRecommendComponentTagcolor": "标签颜色", + "shopGoodsRecommendComponentTagPlaceholder": "请输入标签内容", + "shopGoodsRecommendComponentButtonBorderColor": "按钮边框颜色", + "carouselStyle": "轮播样式", + "recommendIndicatorStyle": "指示器设置", + "recommendIndicatorColor": "常规颜色", + "recommendIndicatorActiveColor": "选中颜色", + "activeCubeBlockContent": "板块内容", + "bgImage": "背景图片", + "rankingTitleIcon": "图标", + "rankSelect": "榜单选择", + "rankName": "榜单名称", + "rankNamePlaceholder": "请输入榜单名称", + "showGoodsNum": "榜单商品数量", + "goodsSourceName": "商品来源", + "ruleTypeName": "排序规则", + "rankTypeName": "排行周期", "rankSelectPopupAfterTip": "个榜单", "rankSelectPopupGoodsMinTip": "所选榜单数量不能少于", "rankSelectPopupGoodsMaxTip": "所选榜单数量不能超过", - "rankingTitleImage":"头部图片" , - "rankingSubTitle":"副标题", - "rankingSubTitleTextColor":"副标题颜色", - "rankTextColor":"名称颜色", - "rankingSubTitleLink":"副标题链接", - "listFrameColor":"背景颜色", - "topRounded":"上圆角", - "bottomRounded":"下圆角", + "rankingTitleImage": "头部图片", + "rankingSubTitle": "副标题", + "rankingSubTitleTextColor": "副标题颜色", + "rankTextColor": "名称颜色", + "rankingSubTitleLink": "副标题链接", + "listFrameColor": "背景颜色", + "topRounded": "上圆角", + "bottomRounded": "下圆角", "rankingStyle": "板块样式", "styleRecommend": "风格推荐", "countDownStyle": "倒计时样式", "newcomerNumberColor": "数字颜色", "newcomerNumberBg": "数字背景色", "newcomerOtherColor": "文字颜色" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.company.json b/admin/src/addon/shop/lang/zh-cn/delivery.company.json index 7f74fd91..79ab26be 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.company.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.company.json @@ -1,20 +1,20 @@ { - "companyId":"", - "companyIdPlaceholder":"请输入", - "companyName":"名称", - "companyNamePlaceholder":"请输入物流公司名称", - "logo":"LOGO", - "logoPlaceholder":"请输入物流公司logo", - "url":"网址", - "urlPlaceholder":"请输入物流公司网址", - "expressNoPlaceholder":"请输入物流公司编号", - "expressNoTips": "物流公司编号作用于物流查询，请根据物流跟踪对应配置设置编号", - "expressNoKd100":"快递100编码", - "expressNoKd100Placeholder":"请输入快递100编码", - "addCompany":"添加物流公司", - "updateCompany":"编辑物流公司", - "electronicSheetSwitchName": "是否支持电子面单", - "expressNoElectronicSheet":"电子面单编号", - "expressNo":"物流跟踪编号", - "companyDeleteTips":"确定要删除该数据吗？" -} \ No newline at end of file + "companyId": "", + "companyIdPlaceholder": "请输入", + "companyName": "名称", + "companyNamePlaceholder": "请输入物流公司名称", + "logo": "LOGO", + "logoPlaceholder": "请输入物流公司logo", + "url": "网址", + "urlPlaceholder": "请输入物流公司网址", + "expressNoPlaceholder": "请输入物流公司编号", + "expressNoTips": "物流公司编号作用于物流查询，请根据物流跟踪对应配置设置编号", + "expressNoKd100": "快递100编码", + "expressNoKd100Placeholder": "请输入快递100编码", + "addCompany": "添加物流公司", + "updateCompany": "编辑物流公司", + "electronicSheetSwitchName": "是否支持电子面单", + "expressNoElectronicSheet": "电子面单编号", + "expressNo": "物流跟踪编号", + "companyDeleteTips": "确定要删除该数据吗？" +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.company_edit.json b/admin/src/addon/shop/lang/zh-cn/delivery.company_edit.json index 207333dc..33676130 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.company_edit.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.company_edit.json @@ -1,44 +1,43 @@ { - "companyId":"", - "companyIdPlaceholder":"请输入", - "companyName":"名称", - "companyNamePlaceholder":"请输入物流公司名称", - "logo":"LOGO", - "logoPlaceholder":"请输入物流公司logo", - "url":"网址", - "urlPlaceholder":"请输入物流公司网址", - "expressNo":"物流跟踪编号", - "expressNoPlaceholder":"请输入物流公司编号", - "expressNoTips": "物流公司编号作用于物流查询，请根据物流跟踪对应配置设置编号", - "expressNoKd100":"快递100编码", - "expressNoKd100Placeholder":"请输入快递100编码", - "addCompany":"添加物流公司", - "updateCompany":"编辑物流公司", - "expressNoElectronicSheet":"电子面单编号", - "expressNoElectronicSheetTips":"电子面单编号作用于电子面单查询，请根据电子面单对应配置设置编号", - "printStyle": "模板样式", - "addPrintStyle": "添加模板样式", - "expType": "业务类型", - "addExpType": "添加业务类型", - "expTypeName": "业务名称", - "expTypeTextTips": "业务名称不能为空", - "expTypeValueTips": "业务值不能为空", - "expTypeTextRepeatTips": "业务名称不可以重复，请重新填写", - "expTypeValueRepeatTips": "业务值不可以重复，请重新填写", - "expTypeValueNullTips": "业务值不可以为零", - "expTypeValue": "业务值", - "electronicSheetSwitch": "是否支持电子面单", - "printStyleName": "模板名称" , - "printStyleNameTips": "模板名称不能为空", - "printStyleSizeTips": "模板尺寸不能为空", - "printStyleNameRepeatTips": "模板名称不可以重复，请重新填写", - "printStyleSizeRepeatTips": "模板尺寸不可以重复，请重新填写", - "printStyleId": "模板尺寸", - "expTypeTips": "快递鸟业务类型" , - "expTypeTips1": "不填默认为1" , - "printStyleTips": "快递鸟模版规格(常用)", - "printStyleTips1": "主流快递单打印纸尺寸一般为：76*130，100*180（单位mm）", - "printStyleTips2": "不填写则取物流公司的默认模板", - "examine": "点击查看" - -} \ No newline at end of file + "companyId": "", + "companyIdPlaceholder": "请输入", + "companyName": "名称", + "companyNamePlaceholder": "请输入物流公司名称", + "logo": "LOGO", + "logoPlaceholder": "请输入物流公司logo", + "url": "网址", + "urlPlaceholder": "请输入物流公司网址", + "expressNo": "物流跟踪编号", + "expressNoPlaceholder": "请输入物流公司编号", + "expressNoTips": "物流公司编号作用于物流查询，请根据物流跟踪对应配置设置编号", + "expressNoKd100": "快递100编码", + "expressNoKd100Placeholder": "请输入快递100编码", + "addCompany": "添加物流公司", + "updateCompany": "编辑物流公司", + "expressNoElectronicSheet": "电子面单编号", + "expressNoElectronicSheetTips": "电子面单编号作用于电子面单查询，请根据电子面单对应配置设置编号", + "printStyle": "模板样式", + "addPrintStyle": "添加模板样式", + "expType": "业务类型", + "addExpType": "添加业务类型", + "expTypeName": "业务名称", + "expTypeTextTips": "业务名称不能为空", + "expTypeValueTips": "业务值不能为空", + "expTypeTextRepeatTips": "业务名称不可以重复，请重新填写", + "expTypeValueRepeatTips": "业务值不可以重复，请重新填写", + "expTypeValueNullTips": "业务值不可以为零", + "expTypeValue": "业务值", + "electronicSheetSwitch": "是否支持电子面单", + "printStyleName": "模板名称", + "printStyleNameTips": "模板名称不能为空", + "printStyleSizeTips": "模板尺寸不能为空", + "printStyleNameRepeatTips": "模板名称不可以重复，请重新填写", + "printStyleSizeRepeatTips": "模板尺寸不可以重复，请重新填写", + "printStyleId": "模板尺寸", + "expTypeTips": "快递鸟业务类型", + "expTypeTips1": "不填默认为1", + "printStyleTips": "快递鸟模版规格(常用)", + "printStyleTips1": "主流快递单打印纸尺寸一般为：76*130，100*180（单位mm）", + "printStyleTips2": "不填写则取物流公司的默认模板", + "examine": "点击查看" +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.config.json b/admin/src/addon/shop/lang/zh-cn/delivery.config.json index e502b15f..6f845c75 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.config.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.config.json @@ -1,11 +1,11 @@ { - "store":"启动门店自提后，买家可选择自提点提货。", - "express":"启用物流配送后，买家下单可以选择快递发货。", - "local_delivery":"启用同城配送后，在配送范围内的买家可以选择同城配送。", - "deliveryStaff":"配送员", - "deliveryCompany":"物流公司", - "deliveryTemplate":"运费模版", - "deliverySearch":"物流跟踪", - "deliveryStore":"自提点", - "localConfig": "同城配送设置" -} \ No newline at end of file + "store": "启动门店自提后，买家可选择自提点提货。", + "express": "启用物流配送后，买家下单可以选择快递发货。", + "local_delivery": "启用同城配送后，在配送范围内的买家可以选择同城配送。", + "deliveryStaff": "配送员", + "deliveryCompany": "物流公司", + "deliveryTemplate": "运费模版", + "deliverySearch": "物流跟踪", + "deliveryStore": "自提点", + "localConfig": "同城配送设置" +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet.json b/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet.json index 4b72fa8b..1c50cc68 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet.json @@ -14,4 +14,4 @@ "setDefault": "设为默认", "electronicSheetDeleteTips": "确定要删除该数据吗？", "electronicSheetSetDefaultTips": "确定要设置为默认模版吗？" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_config.json b/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_config.json index b8fdb16a..b51d2662 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_config.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_config.json @@ -18,4 +18,4 @@ "serverPort2Placeholder": "请输入服务器端口2", "httpsPort": "HTTPS端口", "httpsPortPlaceholder": "请输入HTTPS端口" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_edit.json b/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_edit.json index 2b1bee70..ce79ed5c 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_edit.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_edit.json @@ -31,4 +31,4 @@ "examine": "点击查看", "customerNameTips": "快递鸟电子面单账号申请", "customerNameTips1": "电子面单账号对照表" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.local.json b/admin/src/addon/shop/lang/zh-cn/delivery.local.json index 321ec0cd..1c34ebb2 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.local.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.local.json @@ -1,55 +1,55 @@ { - "basicSettings":"同城配送基础设置", - "timeIsOpen":"配送时间设置", - "timeIsOpenTips":"开启后，买家下单选择同城配送时，可选择配送时间，提交订单后，将在买家备注中显示。", - "close": "关闭", - "open": "开启", - "everyDay": "每天", - "monday": "周一", - "tuesday": "周二", - "wednesday": "周三", - "thursday": "周四", - "friday": "周五", - "saturday": "周六", - "sunday": "周日", - "timeWeekRequire": "请选择配送时间", - "deliveryTimeSetting": "配送时间设置", - "feeType": "收费标准", - "region": "按区域收取配送费", - "distance": "按距离收取配送费", - "district": "按行政区域收取配送费", - "feeSetting": "费用设置", - "weightFee": "续重收费", - "feeSettingTextOne": "km内按", - "feeSettingTextTwo": "元收取配送费，每超出", - "feeSettingTextThree": "km费用增加", - "priceUnit": "元", - "weightFeeTextOne": "商品重量", - "weightFeeTextTwo": "kg 内不额外收费，每超出", - "weightFeeTextThree": "kg 费用增加", - "areaName": "区域名称", - "startPrice": "起送价", - "deliveryPrice": "配送费", - "areaType": "划分方式", - "radius": "半径", - "custom": "自定义", - "addDeliveryArea": "添加配送区域", - "baseDistRequire": "请输入起始公里数", - "gradDistRequire": "请输入超出公里数", - "basePriceRequire": "请输入起始公里内的配送费用", - "gradPriceRequire": "请输入每超出公里部分的费用", - "areaNameRequire": "请输入区域名称", - "startPriceRequire": "请输入起送价", - "startPriceMin": "起送价不能小于0", - "deliveryPriceRequire": "请输入配送费", - "deliveryPriceMin": "配送费不能小于0", - "areaPlaceholder": "请添加配送区域", - "deliveryType": "配送方式", - "business": "商家自配送", - "deliveryTypeRequire": "至少需选择一种配送方式", - "deliveryAddress": "取货地址", - "defaultDeliveryAddressEmpty": "请先配置默认发货地址", - "toSetting": "去配置", - "update": "修改", - "deliveryAddressChange": "取货地址已变更请注意是否需重新调整配送区域" -} \ No newline at end of file + "basicSettings": "同城配送基础设置", + "timeIsOpen": "配送时间设置", + "timeIsOpenTips": "开启后，买家下单选择同城配送时，可选择配送时间，提交订单后，将在买家备注中显示。", + "close": "关闭", + "open": "开启", + "everyDay": "每天", + "monday": "周一", + "tuesday": "周二", + "wednesday": "周三", + "thursday": "周四", + "friday": "周五", + "saturday": "周六", + "sunday": "周日", + "timeWeekRequire": "请选择配送时间", + "deliveryTimeSetting": "配送时间设置", + "feeType": "收费标准", + "region": "按区域收取配送费", + "distance": "按距离收取配送费", + "district": "按行政区域收取配送费", + "feeSetting": "费用设置", + "weightFee": "续重收费", + "feeSettingTextOne": "km内按", + "feeSettingTextTwo": "元收取配送费，每超出", + "feeSettingTextThree": "km费用增加", + "priceUnit": "元", + "weightFeeTextOne": "商品重量", + "weightFeeTextTwo": "kg 内不额外收费，每超出", + "weightFeeTextThree": "kg 费用增加", + "areaName": "区域名称", + "startPrice": "起送价", + "deliveryPrice": "配送费", + "areaType": "划分方式", + "radius": "半径", + "custom": "自定义", + "addDeliveryArea": "添加配送区域", + "baseDistRequire": "请输入起始公里数", + "gradDistRequire": "请输入超出公里数", + "basePriceRequire": "请输入起始公里内的配送费用", + "gradPriceRequire": "请输入每超出公里部分的费用", + "areaNameRequire": "请输入区域名称", + "startPriceRequire": "请输入起送价", + "startPriceMin": "起送价不能小于0", + "deliveryPriceRequire": "请输入配送费", + "deliveryPriceMin": "配送费不能小于0", + "areaPlaceholder": "请添加配送区域", + "deliveryType": "配送方式", + "business": "商家自配送", + "deliveryTypeRequire": "至少需选择一种配送方式", + "deliveryAddress": "取货地址", + "defaultDeliveryAddressEmpty": "请先配置默认发货地址", + "toSetting": "去配置", + "update": "修改", + "deliveryAddressChange": "取货地址已变更请注意是否需重新调整配送区域" +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.search.json b/admin/src/addon/shop/lang/zh-cn/delivery.search.json index ccfb3e43..0b0e6436 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.search.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.search.json @@ -1,20 +1,20 @@ { - "prompt": "提示", - "promptTips1-1": "请到快递鸟官网申请", - "promptTips1-2": "快递鸟接口：目前只支持“申通，圆通、百世，极兔”免费查询。", - "promptTips2": "请到快递100官网申请", - "interfaceType": "接口类型", - "kdn": "快递鸟", - "kd100": "快递100", - "kdnEBusinessIDPlaceholder": "请输入快递鸟EBusinessID", - "kdnEBusinessIDTips": "快递鸟电商ID", - "kdnAppKeyPlaceholder": "请输入快递鸟AppKey", - "kdnAppKeyTips": "快递鸟分配的电商加密私钥", - "isPayEdition": "快递鸟套餐", - "free": "免费", - "pay": "付费", - "kd100AppKeyPlaceholder": "请输入快递100AppKey", - "kd100AppKeyTips": "快递100应用密钥", - "kd100CustomerPlaceholder": "请输入快递100Customer", - "kd100CustomerTips": "快递100分配给的公司编号" -} \ No newline at end of file + "prompt": "提示", + "promptTips1-1": "请到快递鸟官网申请", + "promptTips1-2": "快递鸟接口：目前只支持“申通，圆通、百世，极兔”免费查询。", + "promptTips2": "请到快递100官网申请", + "interfaceType": "接口类型", + "kdn": "快递鸟", + "kd100": "快递100", + "kdnEBusinessIDPlaceholder": "请输入快递鸟EBusinessID", + "kdnEBusinessIDTips": "快递鸟电商ID", + "kdnAppKeyPlaceholder": "请输入快递鸟AppKey", + "kdnAppKeyTips": "快递鸟分配的电商加密私钥", + "isPayEdition": "快递鸟套餐", + "free": "免费", + "pay": "付费", + "kd100AppKeyPlaceholder": "请输入快递100AppKey", + "kd100AppKeyTips": "快递100应用密钥", + "kd100CustomerPlaceholder": "请输入快递100Customer", + "kd100CustomerTips": "快递100分配给的公司编号" +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.staff.json b/admin/src/addon/shop/lang/zh-cn/delivery.staff.json index 2d285388..a2f139bd 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.staff.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.staff.json @@ -1,9 +1,9 @@ { - "addDeliveryPersonnel":"添加配送员", - "updateDeliver":"编辑配送员", - "deliverName":"配送员名称", - "deliverMobile":"配送员手机号", - "deliverNamePlaceholder":"请输入配送员名称", - "deliverMobilePlaceholder":"请输入配送员手机号", - "deliverDeleteTips":"确定要删除该数据吗？" -} \ No newline at end of file + "addDeliveryPersonnel": "添加配送员", + "updateDeliver": "编辑配送员", + "deliverName": "配送员名称", + "deliverMobile": "配送员手机号", + "deliverNamePlaceholder": "请输入配送员名称", + "deliverMobilePlaceholder": "请输入配送员手机号", + "deliverDeleteTips": "确定要删除该数据吗？" +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.store.json b/admin/src/addon/shop/lang/zh-cn/delivery.store.json index d3e0d04c..a20008d8 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.store.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.store.json @@ -1,18 +1,18 @@ { - "storeId":"", - "storeName":"自提点信息", - "storeNamePlaceholder":"请输入自提点名称", - "storeLogo":"自提点logo", - "storeMobile":"联系电话", - "address":"详细地址", - "fullAddress":"联系地址", - "longitude":"经度", - "latitude":"纬度", - "tradeTime":"营业时间", - "createTime":"添加时间", - "createTimePlaceholder":"请输入添加时间", - "addStore":"添加自提点", - "updateStore":"编辑自提点", - "storeDeleteTips":"确定要删除该数据吗？", - "storeInfo": "自提点信息" -} \ No newline at end of file + "storeId": "", + "storeName": "自提点信息", + "storeNamePlaceholder": "请输入自提点名称", + "storeLogo": "自提点logo", + "storeMobile": "联系电话", + "address": "详细地址", + "fullAddress": "联系地址", + "longitude": "经度", + "latitude": "纬度", + "tradeTime": "营业时间", + "createTime": "添加时间", + "createTimePlaceholder": "请输入添加时间", + "addStore": "添加自提点", + "updateStore": "编辑自提点", + "storeDeleteTips": "确定要删除该数据吗？", + "storeInfo": "自提点信息" +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.store_edit.json b/admin/src/addon/shop/lang/zh-cn/delivery.store_edit.json index 861f59d2..48798606 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.store_edit.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.store_edit.json @@ -1,38 +1,38 @@ { - "storeName":"自提点名称", - "storeDesc":"简介", - "storeLogo":"自提点logo", - "storeMobile":"手机号", - "provinceId":"省id", - "cityId":"市", - "districtId":"县（区）", - "address":"详细地址", - "fullAddress":"完整地址", - "longitude":"经度", - "latitude":"纬度", - "tradeTime":"营业时间", - "createTime":"下单时间", - "updateTime":"更新时间", - "storeNamePlaceholder":"请输入自提点名称", - "storeDescPlaceholder":"请输入简介", - "storeLogoPlaceholder":"请上传自提点logo", - "storeMobilePlaceholder":"请输入手机号", - "provinceIdPlaceholder":"请选择省id", - "cityIdPlaceholder":"请选择市", - "districtIdPlaceholder":"请选择县（区）", - "addressPlaceholder":"请输入详细地址", - "fullAddressPlaceholder":"请输入完整地址", - "longitudePlaceholder":"请输入经度", - "latitudePlaceholder":"请输入纬度", - "tradeTimePlaceholder":"请输入营业时间", - "tradeTimeTips": "例：上午9:00-12:00，下午2:00-6:00", - "createTimePlaceholder":"请选择添加时间", - "updateTimePlaceholder":"请输入更新时间", - "addStore":"添加自提点", - "updateStore":"编辑自提点", - "storeDeleteTips":"确定要删除该自提点吗？", - "storeAddress": "自提点地址", - "storeAddressPlaceholder": "请选择自提点地址", - "storeAddressDetail": "自提点详细地址", - "storeAddressDetailPlaceholder": "请输入自提点详细地址" -} \ No newline at end of file + "storeName": "自提点名称", + "storeDesc": "简介", + "storeLogo": "自提点logo", + "storeMobile": "手机号", + "provinceId": "省id", + "cityId": "市", + "districtId": "县（区）", + "address": "详细地址", + "fullAddress": "完整地址", + "longitude": "经度", + "latitude": "纬度", + "tradeTime": "营业时间", + "createTime": "下单时间", + "updateTime": "更新时间", + "storeNamePlaceholder": "请输入自提点名称", + "storeDescPlaceholder": "请输入简介", + "storeLogoPlaceholder": "请上传自提点logo", + "storeMobilePlaceholder": "请输入手机号", + "provinceIdPlaceholder": "请选择省id", + "cityIdPlaceholder": "请选择市", + "districtIdPlaceholder": "请选择县（区）", + "addressPlaceholder": "请输入详细地址", + "fullAddressPlaceholder": "请输入完整地址", + "longitudePlaceholder": "请输入经度", + "latitudePlaceholder": "请输入纬度", + "tradeTimePlaceholder": "请输入营业时间", + "tradeTimeTips": "例：上午9:00-12:00，下午2:00-6:00", + "createTimePlaceholder": "请选择添加时间", + "updateTimePlaceholder": "请输入更新时间", + "addStore": "添加自提点", + "updateStore": "编辑自提点", + "storeDeleteTips": "确定要删除该自提点吗？", + "storeAddress": "自提点地址", + "storeAddressPlaceholder": "请选择自提点地址", + "storeAddressDetail": "自提点详细地址", + "storeAddressDetailPlaceholder": "请输入自提点详细地址" +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.template.json b/admin/src/addon/shop/lang/zh-cn/delivery.template.json index 4508f1eb..4f6ba643 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.template.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.template.json @@ -1,12 +1,12 @@ { - "templateName":"运费模板名称", - "templateNamePlaceholder":"请输入运费模板名称", - "createTime":"创建时间", - "addTemplate":"添加运费模板", - "updateTemplate":"编辑运费模板", - "templateDeleteTips":"确定要删除该模板吗？", - "feeTypeName": "计费类型", - "freeShipping": "指定区域包邮", - "open": "启用", - "close": "关闭" -} \ No newline at end of file + "templateName": "运费模板名称", + "templateNamePlaceholder": "请输入运费模板名称", + "createTime": "创建时间", + "addTemplate": "添加运费模板", + "updateTemplate": "编辑运费模板", + "templateDeleteTips": "确定要删除该模板吗？", + "feeTypeName": "计费类型", + "freeShipping": "指定区域包邮", + "open": "启用", + "close": "关闭" +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.template_edit.json b/admin/src/addon/shop/lang/zh-cn/delivery.template_edit.json index 1cd0689e..5da4c502 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.template_edit.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.template_edit.json @@ -1,39 +1,39 @@ { - "templateName":"运费模板名称", - "templateNamePlaceholder":"请输入运费模板名称", - "createTime":"创建时间", - "addTemplate":"添加运费模板", - "updateTemplate":"编辑运费模板", - "templateDeleteTips":"确定要删除该模板吗？", - "feeTypeName": "计费类型", - "isDefault": "默认模板", - "num": "按件", - "weight": "按重量", - "volume": "按体积", - "feeSetting": "费用设置", - "selectArea": "选择地区", - "firstNum": "首件（件）", - "continueNum": "续件（件）", - "firstWeight": "首件重量（kg）", - "fee": "运费（元）", - "continueFee": "续费（元）", - "continueWeight": "续件重量（kg）", - "firstVolume": "首件体积（m³）", - "continueVolume": "续件体积（m³）", - "deliveryArea": "配送区域", - "addDeliveryArea": "添加单独配送区域", - "freeShipping": "指定区域包邮", - "freeShippingArea": "包邮区域", - "addFreeShippingArea": "添加包邮区域", - "freeShippingAreaTips": "两个条件满足其一便可以包邮", - "noDelivery": "不配送区域", - "addNoDelivery": "添加不配送区域", - "freeShippingNum": "包邮件数", - "freeShippingWeight": "包邮重量（kg）", - "freeShippingVolume": "包邮体积（m³）", - "freeShippingPrice": "包邮金额", - "areaPlaceholder":"请选择地区", - "noDeliveryPlaceholder": "请选择不配送的地区", - "freeShippingPlaceholder": "请选择包邮的地区", - "notUnderZero": "不能小于等于0" -} \ No newline at end of file + "templateName": "运费模板名称", + "templateNamePlaceholder": "请输入运费模板名称", + "createTime": "创建时间", + "addTemplate": "添加运费模板", + "updateTemplate": "编辑运费模板", + "templateDeleteTips": "确定要删除该模板吗？", + "feeTypeName": "计费类型", + "isDefault": "默认模板", + "num": "按件", + "weight": "按重量", + "volume": "按体积", + "feeSetting": "费用设置", + "selectArea": "选择地区", + "firstNum": "首件（件）", + "continueNum": "续件（件）", + "firstWeight": "首件重量（kg）", + "fee": "运费（元）", + "continueFee": "续费（元）", + "continueWeight": "续件重量（kg）", + "firstVolume": "首件体积（m³）", + "continueVolume": "续件体积（m³）", + "deliveryArea": "配送区域", + "addDeliveryArea": "添加单独配送区域", + "freeShipping": "指定区域包邮", + "freeShippingArea": "包邮区域", + "addFreeShippingArea": "添加包邮区域", + "freeShippingAreaTips": "两个条件满足其一便可以包邮", + "noDelivery": "不配送区域", + "addNoDelivery": "添加不配送区域", + "freeShippingNum": "包邮件数", + "freeShippingWeight": "包邮重量（kg）", + "freeShippingVolume": "包邮体积（m³）", + "freeShippingPrice": "包邮金额", + "areaPlaceholder": "请选择地区", + "noDeliveryPlaceholder": "请选择不配送的地区", + "freeShippingPlaceholder": "请选择包邮的地区", + "notUnderZero": "不能小于等于0" +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.attr.json b/admin/src/addon/shop/lang/zh-cn/goods.attr.json index e0290cdc..d0f352b9 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.attr.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.attr.json @@ -5,6 +5,6 @@ "addShopGoodsAttr": "添加参数模板", "updateShopGoodsAttr": "编辑参数模板", "goodsAttrDeleteTips": "确定要删除该数据吗？", - "sortTips":"排序号格式输入错误", + "sortTips": "排序号格式输入错误", "manage": "管理" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.attr_edit.json b/admin/src/addon/shop/lang/zh-cn/goods.attr_edit.json index 0c03e2ae..d127a986 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.attr_edit.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.attr_edit.json @@ -15,4 +15,4 @@ "attrValueName": "参数名称", "addAttrValue": "添加参数", "attrValueNamePlaceholder": "请输入参数名称" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.brand_list.json b/admin/src/addon/shop/lang/zh-cn/goods.brand_list.json index 71be5bba..24733403 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.brand_list.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.brand_list.json @@ -1,15 +1,15 @@ { - "brandId":"品牌ID", - "brandIdPlaceholder":"请输入品牌ID", - "brandName":"品牌名称", - "brandNamePlaceholder":"请输入品牌名称", - "logo":"品牌logo", - "logoPlaceholder":"请输入品牌logo", - "desc":"品牌介绍", - "descPlaceholder":"请输入品牌介绍", - "sort":"排序", - "sortPlaceholder":"请输入排序", - "addBrand":"添加商品品牌", - "updateBrand":"编辑商品品牌", - "brandDeleteTips":"确定要删除该数据吗？" -} \ No newline at end of file + "brandId": "品牌ID", + "brandIdPlaceholder": "请输入品牌ID", + "brandName": "品牌名称", + "brandNamePlaceholder": "请输入品牌名称", + "logo": "品牌logo", + "logoPlaceholder": "请输入品牌logo", + "desc": "品牌介绍", + "descPlaceholder": "请输入品牌介绍", + "sort": "排序", + "sortPlaceholder": "请输入排序", + "addBrand": "添加商品品牌", + "updateBrand": "编辑商品品牌", + "brandDeleteTips": "确定要删除该数据吗？" +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.category.json b/admin/src/addon/shop/lang/zh-cn/goods.category.json index fd8f9f7f..c2d44c2f 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.category.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.category.json @@ -1,26 +1,26 @@ { - "categoryId":"商品分类id", - "categoryIdPlaceholder":"请输入商品分类id", - "categoryName":"分类名称", - "categoryNamePlaceholder":"请输入分类名称", - "image":"分类图片", - "imagePlaceholder":"请输入分类图片", - "pid":"上级分类", - "pidPlaceholder":"请选择上级分类", - "categoryFullName":"组装分类名称", - "categoryFullNamePlaceholder":"请输入组装分类名称", - "isShow":"是否显示", - "sort":"排序号", - "sortPlaceholder":"请输入排序号", - "addCategory":"添加商品分类", - "updateCategory":"编辑商品分类", - "categoryDeleteTips":"确定要删除该数据吗？", - "categoryDeleteTips1":"子级分类也会删除，确定要删除该数据吗？", - "spreadGoodsCategory": "推广", - "goodsCategorySpreadTitle": "商品分类推广", - "spreadLink": "推广链接", - "copy": "复制", - "downloadQrcode": "下载二维码", - "tabGoodsCategory": "商品分类", - "tabGoodsCategoryConfig": "分类设置" -} \ No newline at end of file + "categoryId": "商品分类id", + "categoryIdPlaceholder": "请输入商品分类id", + "categoryName": "分类名称", + "categoryNamePlaceholder": "请输入分类名称", + "image": "分类图片", + "imagePlaceholder": "请输入分类图片", + "pid": "上级分类", + "pidPlaceholder": "请选择上级分类", + "categoryFullName": "组装分类名称", + "categoryFullNamePlaceholder": "请输入组装分类名称", + "isShow": "是否显示", + "sort": "排序号", + "sortPlaceholder": "请输入排序号", + "addCategory": "添加商品分类", + "updateCategory": "编辑商品分类", + "categoryDeleteTips": "确定要删除该数据吗？", + "categoryDeleteTips1": "子级分类也会删除，确定要删除该数据吗？", + "spreadGoodsCategory": "推广", + "goodsCategorySpreadTitle": "商品分类推广", + "spreadLink": "推广链接", + "copy": "复制", + "downloadQrcode": "下载二维码", + "tabGoodsCategory": "商品分类", + "tabGoodsCategoryConfig": "分类设置" +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.category_config.json b/admin/src/addon/shop/lang/zh-cn/goods.category_config.json index 041cb29f..7a9978d9 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.category_config.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.category_config.json @@ -1,27 +1,27 @@ { - "categoryTemplate":"分类模板", - "categoryType":"分类类型", - "categorystyleOne":"一级分类", - "categorystyleTwo":"二级分类", - "pageSettings":"页面设置", - "pageTitle":"页面名称", - "pageTitlePlaceholder":"请输入页面名称", - "searchControl":"搜索栏", - "searchTitle":"搜索栏文字", - "searchTitlePlaceholder":"请输入搜索栏文字", - "open":"开启", - "close":"关闭", - "goodsStyle":"商品排列", - "singleCols": "单列", - "doubleCols": "双列", - "sort":"商品排序", - "sortPlaceholder":"请选择商品排序", - "cartControl":"购物车显示", - "cartStyle":"购物车样式", - "cartTextPlaceholder":"请输入购物车按钮文字", - "cartEvent":"点击按钮", - "detail": "跳转商品详情", - "cart": "加入购物车", - "tabGoodsCategory": "商品分类", - "tabGoodsCategoryConfig": "分类设置" -} \ No newline at end of file + "categoryTemplate": "分类模板", + "categoryType": "分类类型", + "categorystyleOne": "一级分类", + "categorystyleTwo": "二级分类", + "pageSettings": "页面设置", + "pageTitle": "页面名称", + "pageTitlePlaceholder": "请输入页面名称", + "searchControl": "搜索栏", + "searchTitle": "搜索栏文字", + "searchTitlePlaceholder": "请输入搜索栏文字", + "open": "开启", + "close": "关闭", + "goodsStyle": "商品排列", + "singleCols": "单列", + "doubleCols": "双列", + "sort": "商品排序", + "sortPlaceholder": "请选择商品排序", + "cartControl": "购物车显示", + "cartStyle": "购物车样式", + "cartTextPlaceholder": "请输入购物车按钮文字", + "cartEvent": "点击按钮", + "detail": "跳转商品详情", + "cart": "加入购物车", + "tabGoodsCategory": "商品分类", + "tabGoodsCategoryConfig": "分类设置" +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.evaluate.json b/admin/src/addon/shop/lang/zh-cn/goods.evaluate.json index 731211ce..ffee2f50 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.evaluate.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.evaluate.json @@ -1,49 +1,49 @@ { - "evaluateId":"", - "evaluateIdPlaceholder":"请输入", - "orderId":"订单id", - "orderIdPlaceholder":"请输入订单id", - "orderGoodsId":"订单项ID", - "orderGoodsIdPlaceholder":"请输入订单项ID", - "goodsId":"商品ID", - "goodsIdPlaceholder":"请选择商品", - "memberId":"会员ID", - "memberIdPlaceholder":"请输入会员ID", - "content":"评价内容", - "contentPlaceholder":"请输入评价内容", - "images":"评价图片", - "imagesPlaceholder":"请输入评价图片", - "isAnonymous":"是否匿名", - "anonymous": "匿名", - "notAnonymous": "不匿名", - "scores":"评价等级", - "scoresPlaceholder":"请输入评价分数 1-5", - "auditName":"审核状态", - "explainFirst":"商家回复", - "explainFirstPlaceholder": "请输入商家回复", - "createTime":"评价时间", - "createTimePlaceholder":"请输入评价时间", - "again": "追评", - "againTime":"追评时间", - "againTimePlaceholder":"请输入追评时间", - "isShow":"是否显示", - "show": "显示", - "notShow": "不显示", - "isShowPlaceholder":"请输入是否显示 1显示 2不显示", - "addEvaluate":"添加自评", - "updateEvaluate":"编辑商品评价", - "evaluateDeleteTips":"确定要删除该数据吗？", - "goodsInfo": "商品信息", - "memberHead": "会员头像", - "memberName": "会员名称", - "memberNamePlaceholder": "请输入会员名称", - "adopt": "通过", - "refuse": "拒绝", - "auditAdoptTips": "确定要通过审核吗？", - "reply": "回复", - "goodsName": "商品名称", - "goodsNamePlaceholder": "请输入商品名称", - "topping": "置顶", - "cancelTopping": "取消置顶", - "memberHeadPlaceholder": "请上传会员头像" -} \ No newline at end of file + "evaluateId": "", + "evaluateIdPlaceholder": "请输入", + "orderId": "订单id", + "orderIdPlaceholder": "请输入订单id", + "orderGoodsId": "订单项ID", + "orderGoodsIdPlaceholder": "请输入订单项ID", + "goodsId": "商品ID", + "goodsIdPlaceholder": "请选择商品", + "memberId": "会员ID", + "memberIdPlaceholder": "请输入会员ID", + "content": "评价内容", + "contentPlaceholder": "请输入评价内容", + "images": "评价图片", + "imagesPlaceholder": "请输入评价图片", + "isAnonymous": "是否匿名", + "anonymous": "匿名", + "notAnonymous": "不匿名", + "scores": "评价等级", + "scoresPlaceholder": "请输入评价分数 1-5", + "auditName": "审核状态", + "explainFirst": "商家回复", + "explainFirstPlaceholder": "请输入商家回复", + "createTime": "评价时间", + "createTimePlaceholder": "请输入评价时间", + "again": "追评", + "againTime": "追评时间", + "againTimePlaceholder": "请输入追评时间", + "isShow": "是否显示", + "show": "显示", + "notShow": "不显示", + "isShowPlaceholder": "请输入是否显示 1显示 2不显示", + "addEvaluate": "添加自评", + "updateEvaluate": "编辑商品评价", + "evaluateDeleteTips": "确定要删除该数据吗？", + "goodsInfo": "商品信息", + "memberHead": "会员头像", + "memberName": "会员名称", + "memberNamePlaceholder": "请输入会员名称", + "adopt": "通过", + "refuse": "拒绝", + "auditAdoptTips": "确定要通过审核吗？", + "reply": "回复", + "goodsName": "商品名称", + "goodsNamePlaceholder": "请输入商品名称", + "topping": "置顶", + "cancelTopping": "取消置顶", + "memberHeadPlaceholder": "请上传会员头像" +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.evaluate_edit.json b/admin/src/addon/shop/lang/zh-cn/goods.evaluate_edit.json index e9224851..f9347a12 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.evaluate_edit.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.evaluate_edit.json @@ -1,37 +1,37 @@ { - "orderId":"订单id", - "orderGoodsId":"订单项ID", - "goodsId":"商品ID", - "memberId":"会员ID", - "content":"评价内容", - "images":"评价图片", - "isAnonymous":"0 匿名 1不匿名", - "scores":"评价分数 1-5", - "isAudit":"审核状态 1待审 2通过 3拒绝", - "explainFirst":"解释内容", - "againContent":"追评内容", - "againImages":"追评图片", - "againExplain":"追评解释", - "againTime":"追评时间", - "againIsAudit":"审核状态 1待审 2通过 3拒绝", - "isShow":"是否显示 1显示 2不显示", - "orderIdPlaceholder":"请输入订单id", - "orderGoodsIdPlaceholder":"请输入订单项ID", - "goodsIdPlaceholder":"请输入商品ID", - "memberIdPlaceholder":"请输入会员ID", - "contentPlaceholder":"请输入评价内容", - "imagesPlaceholder":"请上传评价图片", - "isAnonymousPlaceholder":"请输入0 匿名 1不匿名", - "scoresPlaceholder":"请输入评价分数 1-5", - "isAuditPlaceholder":"请输入审核状态 1待审 2通过 3拒绝", - "explainFirstPlaceholder":"请输入解释内容", - "againContentPlaceholder":"请输入追评内容", - "againImagesPlaceholder":"请上传追评图片", - "againExplainPlaceholder":"请输入追评解释", - "againTimePlaceholder":"请输入追评时间", - "againIsAuditPlaceholder":"请输入审核状态 1待审 2通过 3拒绝", - "isShowPlaceholder":"请输入是否显示 1显示 2不显示", - "addEvaluate":"添加商品评价", - "updateEvaluate":"编辑商品评价", - "evaluateDeleteTips":"确定要删除该商品评价吗？" -} \ No newline at end of file + "orderId": "订单id", + "orderGoodsId": "订单项ID", + "goodsId": "商品ID", + "memberId": "会员ID", + "content": "评价内容", + "images": "评价图片", + "isAnonymous": "0 匿名 1不匿名", + "scores": "评价分数 1-5", + "isAudit": "审核状态 1待审 2通过 3拒绝", + "explainFirst": "解释内容", + "againContent": "追评内容", + "againImages": "追评图片", + "againExplain": "追评解释", + "againTime": "追评时间", + "againIsAudit": "审核状态 1待审 2通过 3拒绝", + "isShow": "是否显示 1显示 2不显示", + "orderIdPlaceholder": "请输入订单id", + "orderGoodsIdPlaceholder": "请输入订单项ID", + "goodsIdPlaceholder": "请输入商品ID", + "memberIdPlaceholder": "请输入会员ID", + "contentPlaceholder": "请输入评价内容", + "imagesPlaceholder": "请上传评价图片", + "isAnonymousPlaceholder": "请输入0 匿名 1不匿名", + "scoresPlaceholder": "请输入评价分数 1-5", + "isAuditPlaceholder": "请输入审核状态 1待审 2通过 3拒绝", + "explainFirstPlaceholder": "请输入解释内容", + "againContentPlaceholder": "请输入追评内容", + "againImagesPlaceholder": "请上传追评图片", + "againExplainPlaceholder": "请输入追评解释", + "againTimePlaceholder": "请输入追评时间", + "againIsAuditPlaceholder": "请输入审核状态 1待审 2通过 3拒绝", + "isShowPlaceholder": "请输入是否显示 1显示 2不显示", + "addEvaluate": "添加商品评价", + "updateEvaluate": "编辑商品评价", + "evaluateDeleteTips": "确定要删除该商品评价吗？" +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.label_group_list.json b/admin/src/addon/shop/lang/zh-cn/goods.label_group_list.json index dfceabec..91990e86 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.label_group_list.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.label_group_list.json @@ -9,4 +9,4 @@ "updateLabelGroup": "编辑标签分组", "sortTips": "排序号格式输入错误", "labelGroupDeleteTips": "确定要删除该数据吗？" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.label_list.json b/admin/src/addon/shop/lang/zh-cn/goods.label_list.json index c5230b4c..0fe25d86 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.label_list.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.label_list.json @@ -27,4 +27,4 @@ "status": "状态", "label": "标签", "createTime": "创建时间" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.list.json b/admin/src/addon/shop/lang/zh-cn/goods.list.json index 2fc98f61..db15b77e 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.list.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.list.json @@ -14,13 +14,13 @@ "startSaleNumTips": "最低销量输入错误", "endSaleNumPlaceholder": "最高销量", "endSaleNumTips": "最高销量输入错误", - "shopSaleNumTips":"最低销量不能大于最高销量", + "shopSaleNumTips": "最低销量不能大于最高销量", "skuPrice": "价格", "startPricePlaceholder": "最低价格", "startPriceTips": "最低价格输入错误", "endPricePlaceholder": "最高价格", "endPriceTips": "最高价格输入错误", - "shopPriceTips":"最低价格不能大于最高价格", + "shopPriceTips": "最低价格不能大于最高价格", "statusOn": "销售中", "statusOff": "仓库中", "statusAll": "全部商品", @@ -40,7 +40,7 @@ "addGoods": "添加商品", "statusActionOn": "上架", "statusActionOff": "下架", - "statusChangeTips":"确定要下架该商品吗？", + "statusChangeTips": "确定要下架该商品吗？", "spreadGoods": "推广", "copyGoods": "复制", @@ -105,7 +105,6 @@ "discountHint": "会员折扣说明：按照默认会员等级折扣优惠", "fixedPriceHint": "会员价说明：指定优惠价格，商品未参与活动时，按照会员价优惠，若商品参与活动，则以活动价为准", - "addGoodsLabel": "添加商品标签", "addGoodsService": "添加商品服务", "addGoodsCategory": "添加分类", @@ -133,9 +132,9 @@ "addDeliveryTemplateId": "添加运费模板", "deliveryType": "配送方式", "deliveryTypePlaceholder": "请选择配送方式", - "yuan":"元", - "label":"商品标签", - "service":"商品服务", + "yuan": "元", + "label": "商品标签", + "service": "商品服务", "virtualSaleNum": "虚拟销量", "goodsBrand": "商品品牌", "goodsPoster": "商品海报", diff --git a/admin/src/addon/shop/lang/zh-cn/goods.real_edit.json b/admin/src/addon/shop/lang/zh-cn/goods.real_edit.json index 67b335b4..ce01c9ba 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.real_edit.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.real_edit.json @@ -11,9 +11,9 @@ "subTitlePlaceholder": "请输入副标题", "subTitleMaxLengthTips": "副标题不能超过80个字符", "goodsImage": "商品图片", - "goodsImagePlaceholder":"请上传商品图片", + "goodsImagePlaceholder": "请上传商品图片", "goodsVideo": "商品视频", - "goodsVideoPlaceholder":"请上传商品视频", + "goodsVideoPlaceholder": "请上传商品视频", "goodsCategory": "商品分类", "refresh": "刷新", "addGoodsCategory": "添加分类", @@ -87,21 +87,21 @@ "deliveryTab": "配送设置", "deliveryType": "配送方式", "deliveryTypePlaceholder": "请选择配送方式", - "pleaseSelectSku":"请先选择商品规格", - "isLimit":"是否限购", - "isLimitTips":"启用限购后，购买商品时，会对该商品购买量做限制判断。", - "limitType":"限购类型", - "limitTypeTips":"单次限购是针对于每次下单不能超过限购数量，单人限购是针对于会员账号购买这个商品的总数不能超过限购数量。", - "singleTime":"单次限购", - "singlePerson":"单人限购", - "maxBuy":"限购数量", - "maxBuyPlaceholder":"请输入限购数量", + "pleaseSelectSku": "请先选择商品规格", + "isLimit": "是否限购", + "isLimitTips": "启用限购后，购买商品时，会对该商品购买量做限制判断。", + "limitType": "限购类型", + "limitTypeTips": "单次限购是针对于每次下单不能超过限购数量，单人限购是针对于会员账号购买这个商品的总数不能超过限购数量。", + "singleTime": "单次限购", + "singlePerson": "单人限购", + "maxBuy": "限购数量", + "maxBuyPlaceholder": "请输入限购数量", "maxBuyTips": "[限购数量]格式输入错误", - "maxBuyWarnTips":"限购数量超出商品库存时，买家将无法购买该商品", + "maxBuyWarnTips": "限购数量超出商品库存时，买家将无法购买该商品", "maxBuyNotZeroTips": "限购数量不能小于1", - "minBuy":"起购数量", - "minBuyTips":"起购数量超出商品库存时，买家将无法购买该商品", - "minBuyFormatErrorTips":"[起购数量]格式输入错误", + "minBuy": "起购数量", + "minBuyTips": "起购数量超出商品库存时，买家将无法购买该商品", + "minBuyFormatErrorTips": "[起购数量]格式输入错误", "minBuyNotZeroTips": "起购数量不能小于0", "minBuyGreaterThanMaxBuyTips": "起购数量不能大于限购数量", diff --git a/admin/src/addon/shop/lang/zh-cn/goods.service.json b/admin/src/addon/shop/lang/zh-cn/goods.service.json index 95510240..18515ce1 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.service.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.service.json @@ -1,10 +1,10 @@ { - "serviceName":"服务名称", - "serviceNamePlaceholder":"请输入服务名称", - "desc":"描述", - "descPlaceholder":"请输入描述", - "addServe":"添加商品服务", - "updateServe":"编辑商品服务", - "serveDeleteTips":"确定要删除该数据吗？", - "imagePlaceholder": "请上传服务图片" -} \ No newline at end of file + "serviceName": "服务名称", + "serviceNamePlaceholder": "请输入服务名称", + "desc": "描述", + "descPlaceholder": "请输入描述", + "addServe": "添加商品服务", + "updateServe": "编辑商品服务", + "serveDeleteTips": "确定要删除该数据吗？", + "imagePlaceholder": "请上传服务图片" +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.virtual_edit.json b/admin/src/addon/shop/lang/zh-cn/goods.virtual_edit.json index 40fbe3c3..79043fa3 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.virtual_edit.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.virtual_edit.json @@ -11,9 +11,9 @@ "subTitlePlaceholder": "请输入副标题", "subTitleMaxLengthTips": "副标题不能超过80个字符", "goodsImage": "商品图片", - "goodsImagePlaceholder":"请上传商品图片", + "goodsImagePlaceholder": "请上传商品图片", "goodsVideo": "商品视频", - "goodsVideoPlaceholder":"请上传商品视频", + "goodsVideoPlaceholder": "请上传商品视频", "goodsCategory": "商品分类", "refresh": "刷新", "addGoodsCategory": "添加分类", @@ -81,20 +81,20 @@ "maxAddSpecTips": "最多添加5个规格项", "pleaseEditSpecPlaceholder": "请编辑规格信息", "refreshSuccess": "刷新成功", - "isLimit":"是否限购", - "isLimitTips":"启用限购后，购买商品时，会对该商品购买量做限制判断。", - "limitType":"限购类型", - "limitTypeTips":"单次限购是针对于每次下单不能超过限购数量，单人限购是针对于会员账号购买这个商品的总数不能超过限购数量。", - "singleTime":"单次限购", - "singlePerson":"单人限购", - "maxBuy":"限购数量", - "maxBuyPlaceholder":"请输入限购数量", + "isLimit": "是否限购", + "isLimitTips": "启用限购后，购买商品时，会对该商品购买量做限制判断。", + "limitType": "限购类型", + "limitTypeTips": "单次限购是针对于每次下单不能超过限购数量，单人限购是针对于会员账号购买这个商品的总数不能超过限购数量。", + "singleTime": "单次限购", + "singlePerson": "单人限购", + "maxBuy": "限购数量", + "maxBuyPlaceholder": "请输入限购数量", "maxBuyTips": "[限购数量]格式输入错误", - "maxBuyWarnTips":"限购数量超出商品库存时，买家将无法购买该商品", + "maxBuyWarnTips": "限购数量超出商品库存时，买家将无法购买该商品", "maxBuyNotZeroTips": "限购数量不能小于1", - "minBuy":"起购数量", - "minBuyTips":"起购数量超出商品库存时，买家将无法购买该商品", - "minBuyFormatErrorTips":"[起购数量]格式输入错误", + "minBuy": "起购数量", + "minBuyTips": "起购数量超出商品库存时，买家将无法购买该商品", + "minBuyFormatErrorTips": "[起购数量]格式输入错误", "minBuyNotZeroTips": "起购数量不能小于0", "minBuyGreaterThanMaxBuyTips": "起购数量不能大于限购数量", @@ -124,7 +124,6 @@ "specValueNameRepeat": "规格值不能重复", "lackDefaultSpec": "商品缺少默认规格", - "setDeliverGoods": "发货设置", "autoDeliverGoods": "自动发货", "handDeliverGoods": "手动发货", @@ -163,5 +162,4 @@ "fixedPriceHint": "会员价说明：指定优惠价格，商品未参与活动时，按照会员价优惠，若商品参与活动，则以活动价为准", "participateInActiveDisableTips": "商品正在参与营销活动，禁止操作" - } diff --git a/admin/src/addon/shop/lang/zh-cn/index.index.json b/admin/src/addon/shop/lang/zh-cn/index.index.json index 88e23253..94c20f58 100644 --- a/admin/src/addon/shop/lang/zh-cn/index.index.json +++ b/admin/src/addon/shop/lang/zh-cn/index.index.json @@ -1,20 +1,20 @@ { - "realtimeOverview":"实时概况", - "updateTime":"更新时间:", - "todayOrderCount":"今日订单数", - "todayOrderSale":"今日销售额", - "todayAddMemberCount":"今日退款金额", - "todayBrowseCount":"今日浏览量", - "yesterday":"昨日:", - "orderCount":"订单总数", - "salesTotal":"销售总额(元)", - "memberTotal":"退款金额", - "browseTotal":"总浏览量", - "agentMatters":"待办事项", - "waitPayOrder":"待付款订单", - "waitDeliveryOrder":"待发货订单", - "waitTakeOrder":"待收货订单", - "refundOrder":"退款订单", - "saleGoodsNum":"出售商品数量", - "warehouseGoodsNum":"仓库商品数量" -} \ No newline at end of file + "realtimeOverview": "实时概况", + "updateTime": "更新时间:", + "todayOrderCount": "今日订单数", + "todayOrderSale": "今日销售额", + "todayAddMemberCount": "今日退款金额", + "todayBrowseCount": "今日浏览量", + "yesterday": "昨日:", + "orderCount": "订单总数", + "salesTotal": "销售总额(元)", + "memberTotal": "退款金额", + "browseTotal": "总浏览量", + "agentMatters": "待办事项", + "waitPayOrder": "待付款订单", + "waitDeliveryOrder": "待发货订单", + "waitTakeOrder": "待收货订单", + "refundOrder": "退款订单", + "saleGoodsNum": "出售商品数量", + "warehouseGoodsNum": "仓库商品数量" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.coupon.add.json b/admin/src/addon/shop/lang/zh-cn/marketing.coupon.add.json index 6b7d33f5..4cb995a6 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.coupon.add.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.coupon.add.json @@ -1,42 +1,42 @@ { - "addCoupon": "添加优惠券", - "title": "名称", - "titlePlaceholder": "请如：XXX优惠券，最多20个字", - "type": "类型", - "price": "面值", - "receiveType": "是否手动领取", - "startTime": "开始时间", - "endTime": "结束时间", - "remainCount": "剩余数量", - "limitCount": "已领取数量", - "receive": "领取记录", - "user": "是", - "grant": "否", - "limit": "限量", - "unlimited": "不限量", - "receiveNumber": "发放数量", - "pricePlaceholder": "请输入优惠券面值", - "remainCountPlaceholder": "最多发放100000张", - "reduction": "满减券", - "noThreshold": "无门槛券", - "threshold": "使用门槛", - "minConditionMoneyPlaceholder": "请输入优惠券的最低消费金额", - "userLimitCount": "限领张数", - "userLimitCountPlaceholder": "请输入限领张数", - "receiveTime": "领取时间", - "limitedTime": "限时", - "unlimitedTime": "不限时", - "days":"天数", - "times": "固定时间", - "validType": "有效期", - "lengthPlaceholder": "请输入使用时间", - "status": "状态", - "open": "开启", - "close": "关闭", - "cancel": "取消", - "save": "保存", - "startDate": "开始时间", - "endDate": "结束时间", - "validTimePlaceholder": "用券截止时间", - "arrivalTimePlaceholder": "领券截止时间" -} \ No newline at end of file + "addCoupon": "添加优惠券", + "title": "名称", + "titlePlaceholder": "请如：XXX优惠券，最多20个字", + "type": "类型", + "price": "面值", + "receiveType": "是否手动领取", + "startTime": "开始时间", + "endTime": "结束时间", + "remainCount": "剩余数量", + "limitCount": "已领取数量", + "receive": "领取记录", + "user": "是", + "grant": "否", + "limit": "限量", + "unlimited": "不限量", + "receiveNumber": "发放数量", + "pricePlaceholder": "请输入优惠券面值", + "remainCountPlaceholder": "最多发放100000张", + "reduction": "满减券", + "noThreshold": "无门槛券", + "threshold": "使用门槛", + "minConditionMoneyPlaceholder": "请输入优惠券的最低消费金额", + "userLimitCount": "限领张数", + "userLimitCountPlaceholder": "请输入限领张数", + "receiveTime": "领取时间", + "limitedTime": "限时", + "unlimitedTime": "不限时", + "days": "天数", + "times": "固定时间", + "validType": "有效期", + "lengthPlaceholder": "请输入使用时间", + "status": "状态", + "open": "开启", + "close": "关闭", + "cancel": "取消", + "save": "保存", + "startDate": "开始时间", + "endDate": "结束时间", + "validTimePlaceholder": "用券截止时间", + "arrivalTimePlaceholder": "领券截止时间" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.coupon.edit.json b/admin/src/addon/shop/lang/zh-cn/marketing.coupon.edit.json index 5d4a3c78..4a29925f 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.coupon.edit.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.coupon.edit.json @@ -1,42 +1,42 @@ { - "editCoupon": "编辑优惠券", - "title": "名称", - "titlePlaceholder": "请如：XXX优惠券，最多20个字", - "type": "类型", - "price": "面值", - "receiveType": "是否手动领取", - "startTime": "开始时间", - "endTime": "结束时间", - "remainCount": "剩余数量", - "limitCount": "已领取数量", - "receive": "领取记录", - "user": "是", - "grant": "否", - "limit": "限量", - "unlimited": "不限量", - "receiveNumber": "发放数量", - "pricePlaceholder": "请输入优惠券面值", - "remainCountPlaceholder": "最多发放100000张", - "reduction": "满减券", - "noThreshold": "无门槛券", - "threshold": "使用门槛", - "minConditionMoneyPlaceholder": "请输入优惠券的最低消费金额", - "userLimitCount": "限领张数", - "userLimitCountPlaceholder": "请输入限领张数", - "receiveTime": "领取时间", - "limitedTime": "限时", - "unlimitedTime": "不限时", - "days":"天数", - "times": "固定时间", - "validType": "使用时间", - "lengthPlaceholder": "请输入使用时间", - "status": "状态", - "open": "开启", - "close": "关闭", - "cancel": "取消", - "save": "保存", - "startDate": "开始时间", - "endDate": "结束时间", - "validTimePlaceholder": "用券截止时间", - "arrivalTimePlaceholder": "领券截止时间" -} \ No newline at end of file + "editCoupon": "编辑优惠券", + "title": "名称", + "titlePlaceholder": "请如：XXX优惠券，最多20个字", + "type": "类型", + "price": "面值", + "receiveType": "是否手动领取", + "startTime": "开始时间", + "endTime": "结束时间", + "remainCount": "剩余数量", + "limitCount": "已领取数量", + "receive": "领取记录", + "user": "是", + "grant": "否", + "limit": "限量", + "unlimited": "不限量", + "receiveNumber": "发放数量", + "pricePlaceholder": "请输入优惠券面值", + "remainCountPlaceholder": "最多发放100000张", + "reduction": "满减券", + "noThreshold": "无门槛券", + "threshold": "使用门槛", + "minConditionMoneyPlaceholder": "请输入优惠券的最低消费金额", + "userLimitCount": "限领张数", + "userLimitCountPlaceholder": "请输入限领张数", + "receiveTime": "领取时间", + "limitedTime": "限时", + "unlimitedTime": "不限时", + "days": "天数", + "times": "固定时间", + "validType": "使用时间", + "lengthPlaceholder": "请输入使用时间", + "status": "状态", + "open": "开启", + "close": "关闭", + "cancel": "取消", + "save": "保存", + "startDate": "开始时间", + "endDate": "结束时间", + "validTimePlaceholder": "用券截止时间", + "arrivalTimePlaceholder": "领券截止时间" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.coupon.list.json b/admin/src/addon/shop/lang/zh-cn/marketing.coupon.list.json index 91ecaa41..f1afeb9b 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.coupon.list.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.coupon.list.json @@ -1,47 +1,47 @@ { - "addCoupon": "添加优惠券", - "title": "名称", - "titlePlaceholder": "请输入优惠券名称", - "type": "类型", - "price": "面值", - "receiveType": "是否手动领取", - "startTime": "开始时间", - "endTime": "结束时间", - "sumCount": "剩余数量/发放数量", - "remainCount": "已领用/已使用", - "receive": "领取记录", - "edit": "编辑", - "Status": "是否关闭领取", - "threshold": "使用门槛", - "reduction": "满减券", - "noThreshold": "无门槛券", - "couponDeleteTips": "确定要删除该优惠券吗？", - "couponColseTips": "确定要关闭该优惠券吗？关闭后将不可领取，若会员已领取将变为失效", - "validType": "有效期", - "statusName":"状态", - "receiveTypeTime": "领取有效期", - "spreadGoods":"推广", - "close":"关闭", - "couponSpreadTitle":"优惠券推广", - "downloadQrcode": "下载二维码", - "spreadLink": "推广链接", - "receiveUseCount": "已使用", + "addCoupon": "添加优惠券", + "title": "名称", + "titlePlaceholder": "请输入优惠券名称", + "type": "类型", + "price": "面值", + "receiveType": "是否手动领取", + "startTime": "开始时间", + "endTime": "结束时间", + "sumCount": "剩余数量/发放数量", + "remainCount": "已领用/已使用", + "receive": "领取记录", + "edit": "编辑", + "Status": "是否关闭领取", + "threshold": "使用门槛", + "reduction": "满减券", + "noThreshold": "无门槛券", + "couponDeleteTips": "确定要删除该优惠券吗？", + "couponColseTips": "确定要关闭该优惠券吗？关闭后将不可领取，若会员已领取将变为失效", + "validType": "有效期", + "statusName": "状态", + "receiveTypeTime": "领取有效期", + "spreadGoods": "推广", + "close": "关闭", + "couponSpreadTitle": "优惠券推广", + "downloadQrcode": "下载二维码", + "spreadLink": "推广链接", + "receiveUseCount": "已使用", - "collectionCoupon":"领取记录", - "collectionTtitle": "优惠券名称", - "userName": "领用会员", - "collectionReceiveType": "领用方式", - "createTime": "领取时间", - "expireTime": "到期时间", - "status":"当前状态", - "useTime": "使用时间", - "validity":"使用有效期", - "mobile": "手机号", - "memberInfo": "会员信息", - "memberInfoPlaceholder":"请输入会员昵称/手机号", - "collectionSumCount": "发放数量", - "couponInfo": "优惠券基本信息", - "receiveCount":"已领取", - "receiveExpireCount":"已过期", - "showOrder": "查看订单" -} \ No newline at end of file + "collectionCoupon": "领取记录", + "collectionTtitle": "优惠券名称", + "userName": "领用会员", + "collectionReceiveType": "领用方式", + "createTime": "领取时间", + "expireTime": "到期时间", + "status": "当前状态", + "useTime": "使用时间", + "validity": "使用有效期", + "mobile": "手机号", + "memberInfo": "会员信息", + "memberInfoPlaceholder": "请输入会员昵称/手机号", + "collectionSumCount": "发放数量", + "couponInfo": "优惠券基本信息", + "receiveCount": "已领取", + "receiveExpireCount": "已过期", + "showOrder": "查看订单" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.discount.add.json b/admin/src/addon/shop/lang/zh-cn/marketing.discount.add.json index a67d7e6d..3ebb9e9b 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.discount.add.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.discount.add.json @@ -1,38 +1,38 @@ { - "editDiscount":"添加限时折扣", - "name": "活动名称", - "namePlaceholder":"请输入活动名称", - "nameTip":"活动标题用于在手机或者电脑前端，建议输入长度不要大于5", - "title":"标题", - "titlePlaceholder":"请输入活动标题", - "titleTip":"活动标题用户展示在手机或者电脑前端展示使用，建议输入长度不要大于5", - "activityTime": "活动时间", - "discountTimePlaceholder":"请选择活动时间", - "selectProduct": "选择商品", - "selectProductPlaceholder": "请选择商品", - "noSpaceAllowed": "内容不能为空", - "batchOperation": "批量设置", - "batchEmptySelectedGoodsTips": "请选择要操作的商品", - "discountType":"折扣类型", - "price":"原价", - "discounts":"打折", - "discountsTips":"[打折]格式错误", - "discountsTipsTwo":"打折折扣不可小于0", - "discountsTipsThree":"打折折扣不可大于9.9", - "discountsPlaceholder":"请输入打折折扣", - "reduceMoney":"减钱", - "reduceMoneyTips":"[减钱]格式错误", - "reduceMoneyTipsTwo":"减钱金额不可小于等于0", - "reduceMoneyTipsThree":"减钱金额不可大于等于原价金额", - "reduceMoneyPlaceholder":"请输入减钱金额", - "promotional":"促销价", - "promotionalTips":"[促销价]格式错误", - "promotionalTipsTwo":"促销价金额不可小于等于0", - "promotionalTipsThree":"促销价金额不可大于等于原价金额", - "promotionalPlaceholder":"请输入促销价", - "delete":"删除", - "enabled":"设为参与", - "noEnabled":"设为不参与", - "skuDiscountSettings":"规格折扣设置", - "skuDiscountSettingsPlaceholder":"请输入规格折扣设置" + "editDiscount": "添加限时折扣", + "name": "活动名称", + "namePlaceholder": "请输入活动名称", + "nameTip": "活动标题用于在手机或者电脑前端，建议输入长度不要大于5", + "title": "标题", + "titlePlaceholder": "请输入活动标题", + "titleTip": "活动标题用户展示在手机或者电脑前端展示使用，建议输入长度不要大于5", + "activityTime": "活动时间", + "discountTimePlaceholder": "请选择活动时间", + "selectProduct": "选择商品", + "selectProductPlaceholder": "请选择商品", + "noSpaceAllowed": "内容不能为空", + "batchOperation": "批量设置", + "batchEmptySelectedGoodsTips": "请选择要操作的商品", + "discountType": "折扣类型", + "price": "原价", + "discounts": "打折", + "discountsTips": "[打折]格式错误", + "discountsTipsTwo": "打折折扣不可小于0", + "discountsTipsThree": "打折折扣不可大于9.9", + "discountsPlaceholder": "请输入打折折扣", + "reduceMoney": "减钱", + "reduceMoneyTips": "[减钱]格式错误", + "reduceMoneyTipsTwo": "减钱金额不可小于等于0", + "reduceMoneyTipsThree": "减钱金额不可大于等于原价金额", + "reduceMoneyPlaceholder": "请输入减钱金额", + "promotional": "促销价", + "promotionalTips": "[促销价]格式错误", + "promotionalTipsTwo": "促销价金额不可小于等于0", + "promotionalTipsThree": "促销价金额不可大于等于原价金额", + "promotionalPlaceholder": "请输入促销价", + "delete": "删除", + "enabled": "设为参与", + "noEnabled": "设为不参与", + "skuDiscountSettings": "规格折扣设置", + "skuDiscountSettingsPlaceholder": "请输入规格折扣设置" } diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.discount.config.json b/admin/src/addon/shop/lang/zh-cn/marketing.discount.config.json index 2781754d..3bbcf8a9 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.discount.config.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.discount.config.json @@ -1,8 +1,8 @@ { - "headTitle":"顶部广告图", - "image":"图片上传", - "imagePlaceholder":"请上传图片", - "toLink":"跳转链接", - "toLinkPlaceholder":"请输入跳转链接", - "addConfigList":"添加广告图" -} \ No newline at end of file + "headTitle": "顶部广告图", + "image": "图片上传", + "imagePlaceholder": "请上传图片", + "toLink": "跳转链接", + "toLinkPlaceholder": "请输入跳转链接", + "addConfigList": "添加广告图" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.discount.detail.json b/admin/src/addon/shop/lang/zh-cn/marketing.discount.detail.json index b3364c6f..80fa2653 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.discount.detail.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.discount.detail.json @@ -34,4 +34,4 @@ "participationNum": "参与次数", "orderTime": "最后下单时间", "memberInfo": "会员信息" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.discount.edit.json b/admin/src/addon/shop/lang/zh-cn/marketing.discount.edit.json index 7dec8b59..3088051f 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.discount.edit.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.discount.edit.json @@ -1,38 +1,38 @@ { - "editDiscount":"编辑限时折扣", - "name": "活动名称", - "namePlaceholder":"请输入活动名称", - "nameTip":"活动名称用于展示在商家后台管理", - "title":"标题", - "titlePlaceholder":"请输入活动标题", - "titleTip":"活动标题用于在手机或者电脑前端，建议输入长度不要大于5", - "activityTime": "活动时间", - "discountTimePlaceholder":"请选择活动时间", - "noSpaceAllowed":"内容不能为空", - "selectProduct": "选择商品", - "selectProductPlaceholder": "请选择商品", - "batchOperation": "批量设置", - "batchEmptySelectedGoodsTips": "请选择要操作的商品", - "discountType":"折扣类型", - "price":"原价", - "discounts":"打折", - "discountsTips":"[打折]格式错误", - "discountsTipsTwo":"打折折扣不可小于0", - "discountsTipsThree":"打折折扣不可大于9.9", - "discountsPlaceholder":"请输入打折折扣", - "reduceMoney":"减钱", - "reduceMoneyTips":"[减钱]格式错误", - "reduceMoneyTipsTwo":"减钱金额不可小于等于0", - "reduceMoneyTipsThree":"减钱金额不可大于等于原价金额", - "reduceMoneyPlaceholder":"请输入减钱金额", - "promotional":"促销价", - "promotionalTips":"[促销价]格式错误", - "promotionalTipsTwo":"促销价金额不可小于等于0", - "promotionalTipsThree":"促销价金额不可大于等于原价金额", - "promotionalPlaceholder":"请输入促销价", - "delete":"删除", - "enabled":"设为参与", - "noEnabled":"设为不参与", - "skuDiscountSettings":"规格折扣设置", - "skuDiscountSettingsPlaceholder":"请输入规格折扣设置" + "editDiscount": "编辑限时折扣", + "name": "活动名称", + "namePlaceholder": "请输入活动名称", + "nameTip": "活动名称用于展示在商家后台管理", + "title": "标题", + "titlePlaceholder": "请输入活动标题", + "titleTip": "活动标题用于在手机或者电脑前端，建议输入长度不要大于5", + "activityTime": "活动时间", + "discountTimePlaceholder": "请选择活动时间", + "noSpaceAllowed": "内容不能为空", + "selectProduct": "选择商品", + "selectProductPlaceholder": "请选择商品", + "batchOperation": "批量设置", + "batchEmptySelectedGoodsTips": "请选择要操作的商品", + "discountType": "折扣类型", + "price": "原价", + "discounts": "打折", + "discountsTips": "[打折]格式错误", + "discountsTipsTwo": "打折折扣不可小于0", + "discountsTipsThree": "打折折扣不可大于9.9", + "discountsPlaceholder": "请输入打折折扣", + "reduceMoney": "减钱", + "reduceMoneyTips": "[减钱]格式错误", + "reduceMoneyTipsTwo": "减钱金额不可小于等于0", + "reduceMoneyTipsThree": "减钱金额不可大于等于原价金额", + "reduceMoneyPlaceholder": "请输入减钱金额", + "promotional": "促销价", + "promotionalTips": "[促销价]格式错误", + "promotionalTipsTwo": "促销价金额不可小于等于0", + "promotionalTipsThree": "促销价金额不可大于等于原价金额", + "promotionalPlaceholder": "请输入促销价", + "delete": "删除", + "enabled": "设为参与", + "noEnabled": "设为不参与", + "skuDiscountSettings": "规格折扣设置", + "skuDiscountSettingsPlaceholder": "请输入规格折扣设置" } diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.discount.list.json b/admin/src/addon/shop/lang/zh-cn/marketing.discount.list.json index 0b76eb16..06ac4282 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.discount.list.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.discount.list.json @@ -1,50 +1,50 @@ { - "addDiscount":"添加限时折扣", - "name":"名称", - "namePlaceholder":"请输入活动名称", - "title":"标题", - "status":"状态", - "statusPlaceholder":"请选择状态", - "paymentAmount":"支付金额", - "memberCount":"会员数", - "orderCount":"订单数", - "discountTime":"活动时间", - "detail":"详情", - "close":"关闭", - "closeTips":"活动正在进行中，是否确认关闭当前活动？", - "deleteTips":"是否确认删除当前活动", - "baseInfo": "基础信息", - "createTime": "创建时间", - "startTime": "活动开始时间", - "endTime": "活动结束时间", - "keywordPlaceholder": "请输入商品名称", - "keyword": "商品名称", - "goodsInfo": "商品信息", - "price": "商品价格", - "activeOrderMoney": "累计订单金额", - "activeOrderNum": "累计订单数", - "activeMemberNum": "参与会员数", - "activeSuccessNum": "支付销量", - "orderInfo": "订单编号", - "payTime": "支付时间", - "orderNo": "订单编号", - "orderMoney": "订单金额", - "buyInfo": "买家/收货人", - "payType": "支付类型", - "orderStatus": "订单状态", - "toBePaid": "待支付", - "toBeShipped": "待发货", - "shipped": "已发货", - "receivedGoods": "已收货", - "completed": "已完成", - "closed": "已关闭", - "consumptionMoney": "消费总额", - "participationNum": "参与次数", - "orderTime": "最后下单时间", - "memberInfo": "会员信息", - "activeName": "活动名称", - "participationMemberCount": "参与会员数", - "payOrderCount": "支付订单数", - "startDate": "开始时间", - "endDate": "结束时间" -} \ No newline at end of file + "addDiscount": "添加限时折扣", + "name": "名称", + "namePlaceholder": "请输入活动名称", + "title": "标题", + "status": "状态", + "statusPlaceholder": "请选择状态", + "paymentAmount": "支付金额", + "memberCount": "会员数", + "orderCount": "订单数", + "discountTime": "活动时间", + "detail": "详情", + "close": "关闭", + "closeTips": "活动正在进行中，是否确认关闭当前活动？", + "deleteTips": "是否确认删除当前活动", + "baseInfo": "基础信息", + "createTime": "创建时间", + "startTime": "活动开始时间", + "endTime": "活动结束时间", + "keywordPlaceholder": "请输入商品名称", + "keyword": "商品名称", + "goodsInfo": "商品信息", + "price": "商品价格", + "activeOrderMoney": "累计订单金额", + "activeOrderNum": "累计订单数", + "activeMemberNum": "参与会员数", + "activeSuccessNum": "支付销量", + "orderInfo": "订单编号", + "payTime": "支付时间", + "orderNo": "订单编号", + "orderMoney": "订单金额", + "buyInfo": "买家/收货人", + "payType": "支付类型", + "orderStatus": "订单状态", + "toBePaid": "待支付", + "toBeShipped": "待发货", + "shipped": "已发货", + "receivedGoods": "已收货", + "completed": "已完成", + "closed": "已关闭", + "consumptionMoney": "消费总额", + "participationNum": "参与次数", + "orderTime": "最后下单时间", + "memberInfo": "会员信息", + "activeName": "活动名称", + "participationMemberCount": "参与会员数", + "payOrderCount": "支付订单数", + "startDate": "开始时间", + "endDate": "结束时间" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_add.json b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_add.json index 66ddcb71..8f4c86e3 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_add.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_add.json @@ -1,66 +1,66 @@ { - "addGoods":"添加商品", - "baseInfo":"基础设置", - "goodsType":"商品类型", - "goodsName":"商品名称", - "goodsNamePlaceholder":"请输入商品名称", - "goodsTitle":"副标题", - "goodsTitlePlaceholder":"请输入副标题", - "image":"商品图片", - "imagePlaceholder":"请选择商品图片", - "selectProduct": "选择商品", - "selectGoodsPlaceholder": "请选择商品", - "goodsStatus":"商品状态", - "goodsSelect":"选择商品", - "redemptionSettings":"积分设置", + "addGoods": "添加商品", + "baseInfo": "基础设置", + "goodsType": "商品类型", + "goodsName": "商品名称", + "goodsNamePlaceholder": "请输入商品名称", + "goodsTitle": "副标题", + "goodsTitlePlaceholder": "请输入副标题", + "image": "商品图片", + "imagePlaceholder": "请选择商品图片", + "selectProduct": "选择商品", + "selectGoodsPlaceholder": "请选择商品", + "goodsStatus": "商品状态", + "goodsSelect": "选择商品", + "redemptionSettings": "积分设置", - "batchOperation": "批量设置", - "batchEmptySelectedGoodsTips": "请选择要操作的商品", - "goodsSelectPopupGoodsInfo":"商品信息", - "price":"销售价", - "stock":"兑换库存", - "stockPlaceholder":"请输入兑换库存", - "stockTips":"[兑换库存]格式错误", - "stockTipsTwo":"兑换库存不可小于等于0", - "stockTipsThree":"兑换限制数量不可大于商品库存", - "limit":"兑换限制", - "limitPlaceholder":"请输入兑换限制", - "limitTips":"[兑换限制]格式错误", - "limitTipsTwo":"兑换限制数量不可小于等于0", - "limitTipsThree":"兑换限制数量不能大于兑换库存", - "limitUnit":"件/人", - "integralUnit":"积分", - "prickUnit":"元", - "pointPlaceholder":"请输入积分积分", - "pointTips":"[积分]格式错误", - "pointTipsTwo":"积分不可小于等于0", - "money":"兑换价", - "newPrice":"价格", - "moneyTips":"[价格]格式错误", - "moneyTipsTwo":"价格不可小于0", - "limitRules":"每人每单可兑换件数", - - "couponSelect":"选择优惠券", - "couponSelectPlaceholder":"请选择优惠券", - "couponName":"优惠券名称", - "couponType":"类型", - "couponPrice":"面值", - "sumCount":"总库存", - "threshold": "使用门槛", - "validType": "有效期", - "receiveTypeTime": "领取有效期", + "batchOperation": "批量设置", + "batchEmptySelectedGoodsTips": "请选择要操作的商品", + "goodsSelectPopupGoodsInfo": "商品信息", + "price": "销售价", + "stock": "兑换库存", + "stockPlaceholder": "请输入兑换库存", + "stockTips": "[兑换库存]格式错误", + "stockTipsTwo": "兑换库存不可小于等于0", + "stockTipsThree": "兑换限制数量不可大于商品库存", + "limit": "兑换限制", + "limitPlaceholder": "请输入兑换限制", + "limitTips": "[兑换限制]格式错误", + "limitTipsTwo": "兑换限制数量不可小于等于0", + "limitTipsThree": "兑换限制数量不能大于兑换库存", + "limitUnit": "件/人", + "integralUnit": "积分", + "prickUnit": "元", + "pointPlaceholder": "请输入积分积分", + "pointTips": "[积分]格式错误", + "pointTipsTwo": "积分不可小于等于0", + "money": "兑换价", + "newPrice": "价格", + "moneyTips": "[价格]格式错误", + "moneyTipsTwo": "价格不可小于0", + "limitRules": "每人每单可兑换件数", - "balance":"兑换余额", - "balancePlaceholder":"请输入兑换余额", - "balanceTips":"[兑换余额]格式错误", - "balanceTipsTwo":"兑换余额不可小于等于0", - "balanceType":"余额类型", + "couponSelect": "选择优惠券", + "couponSelectPlaceholder": "请选择优惠券", + "couponName": "优惠券名称", + "couponType": "类型", + "couponPrice": "面值", + "sumCount": "总库存", + "threshold": "使用门槛", + "validType": "有效期", + "receiveTypeTime": "领取有效期", - "goodsSkuTitle":"选择商品规格", - "goodsSkuPlaceholder":"请选择商品规格", - "goodsStock":"库存", - "enabled":"设为参与", - "noEnabled":"设为不参与", - "noEnabledTip":"请至少设置一个规格参与", - "goodsDetail":"商品详情" -} \ No newline at end of file + "balance": "兑换余额", + "balancePlaceholder": "请输入兑换余额", + "balanceTips": "[兑换余额]格式错误", + "balanceTipsTwo": "兑换余额不可小于等于0", + "balanceType": "余额类型", + + "goodsSkuTitle": "选择商品规格", + "goodsSkuPlaceholder": "请选择商品规格", + "goodsStock": "库存", + "enabled": "设为参与", + "noEnabled": "设为不参与", + "noEnabledTip": "请至少设置一个规格参与", + "goodsDetail": "商品详情" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_edit.json b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_edit.json index ace24e94..0f812f57 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_edit.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_edit.json @@ -1,67 +1,66 @@ { - "editGoods":"编辑商品", - "baseInfo":"基础设置", - "goodsType":"商品类型", - "goodsName":"商品名称", - "goodsNamePlaceholder":"请输入商品名称", - "goodsTitle":"副标题", - "goodsTitlePlaceholder":"请输入副标题", - "image":"商品图片", - "imagePlaceholder":"请选择商品图片", - "selectProduct": "选择商品", - "selectGoodsPlaceholder": "请选择商品", - "goodsStatus":"商品状态", - "goodsSelect":"选择商品", - "redemptionSettings":"积分设置", + "editGoods": "编辑商品", + "baseInfo": "基础设置", + "goodsType": "商品类型", + "goodsName": "商品名称", + "goodsNamePlaceholder": "请输入商品名称", + "goodsTitle": "副标题", + "goodsTitlePlaceholder": "请输入副标题", + "image": "商品图片", + "imagePlaceholder": "请选择商品图片", + "selectProduct": "选择商品", + "selectGoodsPlaceholder": "请选择商品", + "goodsStatus": "商品状态", + "goodsSelect": "选择商品", + "redemptionSettings": "积分设置", - "batchOperation": "批量设置", - "batchEmptySelectedGoodsTips": "请选择要操作的商品", - "goodsSelectPopupGoodsInfo":"商品信息", - "price":"销售价", - "stock":"兑换库存", - "stockPlaceholder":"请输入兑换库存", - "stockTips":"[兑换库存]格式错误", - "stockTipsTwo":"兑换库存不可小于等于0", - "stockTipsThree":"兑换限制数量不可大于商品库存", - "limit":"兑换限制", - "limitPlaceholder":"请输入兑换限制", - "limitTips":"[兑换限制]格式错误", - "limitTipsTwo":"兑换限制数量不可小于等于0", - "limitTipsThree":"兑换限制数量不能大于兑换库存", - "limitUnit":"件/人", - "integralUnit":"积分", - "prickUnit":"元", - "pointPlaceholder":"请输入积分积分", - "pointTips":"[积分]格式错误", - "pointTipsTwo":"积分不可小于等于0", - "money":"兑换价", - "newPrice":"价格", - "moneyTips":"[价格]格式错误", - "moneyTipsTwo":"价格不可小于0", - "limitRules":"每人每单可兑换件数", + "batchOperation": "批量设置", + "batchEmptySelectedGoodsTips": "请选择要操作的商品", + "goodsSelectPopupGoodsInfo": "商品信息", + "price": "销售价", + "stock": "兑换库存", + "stockPlaceholder": "请输入兑换库存", + "stockTips": "[兑换库存]格式错误", + "stockTipsTwo": "兑换库存不可小于等于0", + "stockTipsThree": "兑换限制数量不可大于商品库存", + "limit": "兑换限制", + "limitPlaceholder": "请输入兑换限制", + "limitTips": "[兑换限制]格式错误", + "limitTipsTwo": "兑换限制数量不可小于等于0", + "limitTipsThree": "兑换限制数量不能大于兑换库存", + "limitUnit": "件/人", + "integralUnit": "积分", + "prickUnit": "元", + "pointPlaceholder": "请输入积分积分", + "pointTips": "[积分]格式错误", + "pointTipsTwo": "积分不可小于等于0", + "money": "兑换价", + "newPrice": "价格", + "moneyTips": "[价格]格式错误", + "moneyTipsTwo": "价格不可小于0", + "limitRules": "每人每单可兑换件数", - - "couponSelect":"选择优惠券", - "couponSelectPlaceholder":"请选择优惠券", - "couponName":"优惠券名称", - "couponType":"类型", - "couponPrice":"面值", - "sumCount":"总库存", - "threshold": "使用门槛", - "validType": "有效期", - "receiveTypeTime": "领取有效期", + "couponSelect": "选择优惠券", + "couponSelectPlaceholder": "请选择优惠券", + "couponName": "优惠券名称", + "couponType": "类型", + "couponPrice": "面值", + "sumCount": "总库存", + "threshold": "使用门槛", + "validType": "有效期", + "receiveTypeTime": "领取有效期", - "balance":"兑换余额", - "balancePlaceholder":"请输入兑换余额", - "balanceTips":"[兑换余额]格式错误", - "balanceTipsTwo":"兑换余额不可小于等于0", - "balanceType":"余额类型", + "balance": "兑换余额", + "balancePlaceholder": "请输入兑换余额", + "balanceTips": "[兑换余额]格式错误", + "balanceTipsTwo": "兑换余额不可小于等于0", + "balanceType": "余额类型", - "goodsSkuTitle":"选择商品规格", - "goodsSkuPlaceholder":"请选择商品规格", - "goodsStock":"库存", - "enabled":"设为参与", - "noEnabled":"设为不参与", - "noEnabledTip":"请至少设置一个规格参与", - "goodsDetail":"商品详情" -} \ No newline at end of file + "goodsSkuTitle": "选择商品规格", + "goodsSkuPlaceholder": "请选择商品规格", + "goodsStock": "库存", + "enabled": "设为参与", + "noEnabled": "设为不参与", + "noEnabledTip": "请至少设置一个规格参与", + "goodsDetail": "商品详情" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_list.json b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_list.json index 1b2a030a..b11282fd 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_list.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_list.json @@ -1,27 +1,27 @@ { - "addGoods":"添加商品", - "goods":"商品", - "goodsName":"商品名称", - "goodsNamePlaceholder":"请输入商品名称", - "status":"状态", - "statusPlaceholder":"请选择状态", - "goodsType":"商品类型", - "exchangePrice":"兑换价格", - "pointUnit":"积分", - "priceUnit":"元", - "redeemedAndSurplus":"已兑/剩余", - "deleteTips":"是否确认删除当前商品", - "createTime":"创建时间", - "spreadGoods": "推广", - "copyGoods": "复制", - "spreadLink": "推广链接", - "copy": "复制", - "downloadQrcode": "下载二维码", - "goodsSpreadTitle": "积分商品推广", - "up":"上架", - "upTips":"是否确认上架当前商品", - "down":"下架", - "downTips":"是否确认下架当前商品", - "startDate":"开始时间", - "endDate":"结束时间" -} \ No newline at end of file + "addGoods": "添加商品", + "goods": "商品", + "goodsName": "商品名称", + "goodsNamePlaceholder": "请输入商品名称", + "status": "状态", + "statusPlaceholder": "请选择状态", + "goodsType": "商品类型", + "exchangePrice": "兑换价格", + "pointUnit": "积分", + "priceUnit": "元", + "redeemedAndSurplus": "已兑/剩余", + "deleteTips": "是否确认删除当前商品", + "createTime": "创建时间", + "spreadGoods": "推广", + "copyGoods": "复制", + "spreadLink": "推广链接", + "copy": "复制", + "downloadQrcode": "下载二维码", + "goodsSpreadTitle": "积分商品推广", + "up": "上架", + "upTips": "是否确认上架当前商品", + "down": "下架", + "downTips": "是否确认下架当前商品", + "startDate": "开始时间", + "endDate": "结束时间" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.order_list.json b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.order_list.json index ddb11dfd..05f05b5f 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.order_list.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.order_list.json @@ -1,55 +1,55 @@ { - "orderNo":"订单编号", - "orderNoPlaceholder": "请输入订单编号", - "orderStatus": "订单状态", - "orderStatusPlaceholder": "请选择订单状态", - "orderFrom": "订单类型", - "orderFromPlaceholder": "请选择订单类型", - "payTime": "支付时间", - "orderGoods": "商品", - "goodsPriceNumber": "单价（元）/数量", - "orderMoney": "实付金额（元）", - "startDate": "开始时间", - "endDate": "结束时间", - "piece": "件", - "activeRefund": "主动退款", - "notes": "备注", - "offlinePayment": "线下支付", - "orderClose": "关闭订单", - "editPrice": "修改价格", - "editAddress": "修改地址", - "sendOutGoods": "发货", - "confirmTakeDelivery": "确认收货", - "all": "全部", - "toBeShipped": "待发货", - "shipped": "已发货", - "receivedGoods": "已收货", - "completed": "已完成", - "closed": "已关闭", - "refunding": "退款中", - "notesDetail": "备注信息", - - "delivery": "订单发货", - "company": "物流公司", - "companyPlaceholder": "请选择物流公司", - "expressNumber": "物流单号", - "expressNumberPlaceholder": "请输入物流单号", - "orderGoodsIdsPlaceholder": "请选择订单项", - "virtualDelivery": "虚拟发货", - "goodsName": "商品名称", - "num": "商品数量", - "orderCloseTips": "关闭订单后该订单将无法支付，是否确认关闭?", - "orderFinishTips": "是否确认用户已经收货？", - "orderGoodsPlaceholder": "请选择要发货的商品", - "deliveryStatusName": "发货状态", - "fromType": "订单来源", - "payType": "支付类型", - "orderInfo": "订单信息", - "refundStatusName": "退款状态", - "outTradeNo": "交易流水号", + "orderNo": "订单编号", + "orderNoPlaceholder": "请输入订单编号", + "orderStatus": "订单状态", + "orderStatusPlaceholder": "请选择订单状态", + "orderFrom": "订单类型", + "orderFromPlaceholder": "请选择订单类型", + "payTime": "支付时间", + "orderGoods": "商品", + "goodsPriceNumber": "单价（元）/数量", + "orderMoney": "实付金额（元）", + "startDate": "开始时间", + "endDate": "结束时间", + "piece": "件", + "activeRefund": "主动退款", + "notes": "备注", + "offlinePayment": "线下支付", + "orderClose": "关闭订单", + "editPrice": "修改价格", + "editAddress": "修改地址", + "sendOutGoods": "发货", + "confirmTakeDelivery": "确认收货", + "all": "全部", + "toBeShipped": "待发货", + "shipped": "已发货", + "receivedGoods": "已收货", + "completed": "已完成", + "closed": "已关闭", + "refunding": "退款中", + "notesDetail": "备注信息", - "exportOrderType": "导出订单类型", - "shopOrder": "订单数据表", - "shopOrderGoods": "订单商品表", - "point":"积分" -} \ No newline at end of file + "delivery": "订单发货", + "company": "物流公司", + "companyPlaceholder": "请选择物流公司", + "expressNumber": "物流单号", + "expressNumberPlaceholder": "请输入物流单号", + "orderGoodsIdsPlaceholder": "请选择订单项", + "virtualDelivery": "虚拟发货", + "goodsName": "商品名称", + "num": "商品数量", + "orderCloseTips": "关闭订单后该订单将无法支付，是否确认关闭?", + "orderFinishTips": "是否确认用户已经收货？", + "orderGoodsPlaceholder": "请选择要发货的商品", + "deliveryStatusName": "发货状态", + "fromType": "订单来源", + "payType": "支付类型", + "orderInfo": "订单信息", + "refundStatusName": "退款状态", + "outTradeNo": "交易流水号", + + "exportOrderType": "导出订单类型", + "shopOrder": "订单数据表", + "shopOrderGoods": "订单商品表", + "point": "积分" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.manjian.detail.json b/admin/src/addon/shop/lang/zh-cn/marketing.manjian.detail.json index 7ba75abb..80fa2653 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.manjian.detail.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.manjian.detail.json @@ -1,37 +1,37 @@ { - "baseInfo": "基础信息", - "name": "活动名称", - "title": "标题", - "status": "状态", - "paymentAmount": "支付金额", - "memberCount": "参与会员数", - "orderCount": "支付订单数", - "createTime": "创建时间", - "startTime": "活动开始时间", - "endTime": "活动结束时间", - "keywordPlaceholder": "请输入商品名称", - "keyword": "商品名称", - "goodsInfo": "商品信息", - "price": "商品价格", - "activeOrderMoney": "累计订单金额", - "activeOrderNum": "累计订单数", - "activeMemberNum": "参与会员数", - "activeSuccessNum": "支付销量", - "orderInfo": "订单编号", - "payTime": "支付时间", - "orderNo": "订单编号", - "orderMoney": "订单金额", - "buyInfo": "买家/收货人", - "payType": "支付类型", - "orderStatus": "订单状态", - "toBePaid": "待支付", - "toBeShipped": "待发货", - "shipped": "已发货", - "receivedGoods": "已收货", - "completed": "已完成", - "closed": "已关闭", - "consumptionMoney": "消费总额", - "participationNum": "参与次数", - "orderTime": "最后下单时间", - "memberInfo": "会员信息" -} \ No newline at end of file + "baseInfo": "基础信息", + "name": "活动名称", + "title": "标题", + "status": "状态", + "paymentAmount": "支付金额", + "memberCount": "参与会员数", + "orderCount": "支付订单数", + "createTime": "创建时间", + "startTime": "活动开始时间", + "endTime": "活动结束时间", + "keywordPlaceholder": "请输入商品名称", + "keyword": "商品名称", + "goodsInfo": "商品信息", + "price": "商品价格", + "activeOrderMoney": "累计订单金额", + "activeOrderNum": "累计订单数", + "activeMemberNum": "参与会员数", + "activeSuccessNum": "支付销量", + "orderInfo": "订单编号", + "payTime": "支付时间", + "orderNo": "订单编号", + "orderMoney": "订单金额", + "buyInfo": "买家/收货人", + "payType": "支付类型", + "orderStatus": "订单状态", + "toBePaid": "待支付", + "toBeShipped": "待发货", + "shipped": "已发货", + "receivedGoods": "已收货", + "completed": "已完成", + "closed": "已关闭", + "consumptionMoney": "消费总额", + "participationNum": "参与次数", + "orderTime": "最后下单时间", + "memberInfo": "会员信息" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.manjian.edit.json b/admin/src/addon/shop/lang/zh-cn/marketing.manjian.edit.json index 2d526265..e966425e 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.manjian.edit.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.manjian.edit.json @@ -84,5 +84,5 @@ "limitTipsThree": "必须大于上一层级的优惠门槛", "ruleTypeTips": "阶梯优惠根据设定的门槛逐级增加优惠，达到特定层级门槛即可享受对应优惠，最高可设5个层级。", "ruleTypeTipsTwo": "循环优惠指每次达到门槛即获赠一次优惠，无次数上限，需合理设置门槛。", - "goodsOffTips":"该商品已下架" + "goodsOffTips": "该商品已下架" } diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.config.json b/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.config.json index 162a3fad..6d6f631f 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.config.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.config.json @@ -1,45 +1,45 @@ { - "basicInfoTab":"基础设置", - "bannerList":"顶部广告图", - "activeStatus":"是否启用", - "validityType":"有效期", - "validityDay":"天数", - "validityDayPlaceholder":"请输入有效天数", - "validityDayTips":"有效天数不可小于等于0", - "validityDayTipsLeft":"达成门槛立即生效，", - "validityDayTipsRight":"天有效期", - "validityTime":"固定时间", - "validityTimePlaceholder":"请选择有效期截止时间", - "validityTimePlaceholderTwo":"请先选择参与门槛时间", - "validityTimePlaceholderThree":"有效期截止时间不可小于参与门槛时间", - "validityTimeTips":"达成门槛立即生效，有效期截止为", - "validityTimeTipsTwo":"修改有效期将同步更新所有未参与活动用户的结束时间", - "participationWay":"参与门槛", - "neverOrder":"从未下过单的会员", - "assignTimeOrder":"指定时间内未下过单的会员", - "assignTimeRegister":"指定时间内注册的会员", - "appointTimePlaceholder":"请选择指定时间", - "activityGoods":"活动商品", - "selectGoods":"选择商品", - "goodsSkuIdsPlaceholder":"请选择商品", - "limitNum":"限购数量", - "limitNumPlaceholder":"请输入限购数量", - "limitNumTips":"限购数量不可小于等于0", - "limitNumTipsThree":"限购数量不可超过已选商品数量", - "oldPrice":"原价", - "newcomerPrice":"新人价", - "newcomerPricePlaceholder":"请输入新人价", - "newcomerPriceTips":"[新人价]格式错误", - "newcomerPriceTipsOne":"新人价不可小于0", - "newcomerPriceTipsTwo":"新人价不可大于原价", - "batchOperation":"批量操作", - "batchEmptySelectedGoodsTips": "请选择要操作的商品", - "activeDesc":"规则说明", - "activeDescPlaceholder":"请输入规则说明", - "useDefaultActiveDesc": "使用默认说明", - "image":"图片上传", - "imagePlaceholder":"请上传图片", - "toLink":"跳转链接", - "toLinkPlaceholder":"请输入跳转链接", - "addConfigList":"添加广告图" -} \ No newline at end of file + "basicInfoTab": "基础设置", + "bannerList": "顶部广告图", + "activeStatus": "是否启用", + "validityType": "有效期", + "validityDay": "天数", + "validityDayPlaceholder": "请输入有效天数", + "validityDayTips": "有效天数不可小于等于0", + "validityDayTipsLeft": "达成门槛立即生效，", + "validityDayTipsRight": "天有效期", + "validityTime": "固定时间", + "validityTimePlaceholder": "请选择有效期截止时间", + "validityTimePlaceholderTwo": "请先选择参与门槛时间", + "validityTimePlaceholderThree": "有效期截止时间不可小于参与门槛时间", + "validityTimeTips": "达成门槛立即生效，有效期截止为", + "validityTimeTipsTwo": "修改有效期将同步更新所有未参与活动用户的结束时间", + "participationWay": "参与门槛", + "neverOrder": "从未下过单的会员", + "assignTimeOrder": "指定时间内未下过单的会员", + "assignTimeRegister": "指定时间内注册的会员", + "appointTimePlaceholder": "请选择指定时间", + "activityGoods": "活动商品", + "selectGoods": "选择商品", + "goodsSkuIdsPlaceholder": "请选择商品", + "limitNum": "限购数量", + "limitNumPlaceholder": "请输入限购数量", + "limitNumTips": "限购数量不可小于等于0", + "limitNumTipsThree": "限购数量不可超过已选商品数量", + "oldPrice": "原价", + "newcomerPrice": "新人价", + "newcomerPricePlaceholder": "请输入新人价", + "newcomerPriceTips": "[新人价]格式错误", + "newcomerPriceTipsOne": "新人价不可小于0", + "newcomerPriceTipsTwo": "新人价不可大于原价", + "batchOperation": "批量操作", + "batchEmptySelectedGoodsTips": "请选择要操作的商品", + "activeDesc": "规则说明", + "activeDescPlaceholder": "请输入规则说明", + "useDefaultActiveDesc": "使用默认说明", + "image": "图片上传", + "imagePlaceholder": "请上传图片", + "toLink": "跳转链接", + "toLinkPlaceholder": "请输入跳转链接", + "addConfigList": "添加广告图" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.order_list.json b/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.order_list.json index 3bcab31f..3a15fc4f 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.order_list.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.order_list.json @@ -1,57 +1,57 @@ { - "orderNo":"订单编号", - "orderNoPlaceholder": "请输入订单编号", - "orderStatus": "订单状态", - "orderStatusPlaceholder": "请选择订单状态", - "orderFrom": "订单类型", - "orderFromPlaceholder": "请选择订单类型", - "payTime": "支付时间", - "orderGoods": "商品", - "goodsPriceNumber": "单价（元）/数量", - "goodsPriceNumberTips": "新人价商品购买数量为1时，单价显示新人价，购买数量大于1时，单价显示原价或折扣价或会员价", - "orderMoney": "实付金额（元）", - "startDate": "开始时间", - "endDate": "结束时间", - "piece": "件", - "createTime": "创建时间", - "activeRefund": "主动退款", - "notes": "备注", - "offlinePayment": "线下支付", - "orderClose": "关闭订单", - "editPrice": "修改价格", - "editAddress": "修改地址", - "sendOutGoods": "发货", - "confirmTakeDelivery": "确认收货", - "all": "全部", - "toBeShipped": "待发货", - "shipped": "已发货", - "receivedGoods": "已收货", - "completed": "已完成", - "closed": "已关闭", - "refunding": "退款中", - "notesDetail": "备注信息", - - "delivery": "订单发货", - "company": "物流公司", - "companyPlaceholder": "请选择物流公司", - "expressNumber": "物流单号", - "expressNumberPlaceholder": "请输入物流单号", - "orderGoodsIdsPlaceholder": "请选择订单项", - "virtualDelivery": "虚拟发货", - "goodsName": "商品名称", - "num": "商品数量", - "orderCloseTips": "关闭订单后该订单将无法支付，是否确认关闭?", - "orderFinishTips": "是否确认用户已经收货？", - "orderGoodsPlaceholder": "请选择要发货的商品", - "deliveryStatusName": "发货状态", - "fromType": "订单来源", - "payType": "支付类型", - "orderInfo": "订单信息", - "refundStatusName": "退款状态", - "outTradeNo": "交易流水号", + "orderNo": "订单编号", + "orderNoPlaceholder": "请输入订单编号", + "orderStatus": "订单状态", + "orderStatusPlaceholder": "请选择订单状态", + "orderFrom": "订单类型", + "orderFromPlaceholder": "请选择订单类型", + "payTime": "支付时间", + "orderGoods": "商品", + "goodsPriceNumber": "单价（元）/数量", + "goodsPriceNumberTips": "新人价商品购买数量为1时，单价显示新人价，购买数量大于1时，单价显示原价或折扣价或会员价", + "orderMoney": "实付金额（元）", + "startDate": "开始时间", + "endDate": "结束时间", + "piece": "件", + "createTime": "创建时间", + "activeRefund": "主动退款", + "notes": "备注", + "offlinePayment": "线下支付", + "orderClose": "关闭订单", + "editPrice": "修改价格", + "editAddress": "修改地址", + "sendOutGoods": "发货", + "confirmTakeDelivery": "确认收货", + "all": "全部", + "toBeShipped": "待发货", + "shipped": "已发货", + "receivedGoods": "已收货", + "completed": "已完成", + "closed": "已关闭", + "refunding": "退款中", + "notesDetail": "备注信息", - "exportOrderType": "导出订单类型", - "shopOrder": "订单数据表", - "shopOrderGoods": "订单商品表", - "point":"积分" -} \ No newline at end of file + "delivery": "订单发货", + "company": "物流公司", + "companyPlaceholder": "请选择物流公司", + "expressNumber": "物流单号", + "expressNumberPlaceholder": "请输入物流单号", + "orderGoodsIdsPlaceholder": "请选择订单项", + "virtualDelivery": "虚拟发货", + "goodsName": "商品名称", + "num": "商品数量", + "orderCloseTips": "关闭订单后该订单将无法支付，是否确认关闭?", + "orderFinishTips": "是否确认用户已经收货？", + "orderGoodsPlaceholder": "请选择要发货的商品", + "deliveryStatusName": "发货状态", + "fromType": "订单来源", + "payType": "支付类型", + "orderInfo": "订单信息", + "refundStatusName": "退款状态", + "outTradeNo": "交易流水号", + + "exportOrderType": "导出订单类型", + "shopOrder": "订单数据表", + "shopOrderGoods": "订单商品表", + "point": "积分" +} diff --git a/admin/src/addon/shop/lang/zh-cn/order.batch_delivery.json b/admin/src/addon/shop/lang/zh-cn/order.batch_delivery.json index 85ffdf8a..b7fdddad 100644 --- a/admin/src/addon/shop/lang/zh-cn/order.batch_delivery.json +++ b/admin/src/addon/shop/lang/zh-cn/order.batch_delivery.json @@ -1,25 +1,25 @@ { - "failuresNum":"发货失败单数", - "succeedNum":"发货成功单数", - "totalNum":"总发货单数", - "operationTime":"操作时间", - "operationType":"操作类型", - "state":"状态", - "operator":"操作人", - "importData":"批量发货", - "templateType":"模板类型", - "fullOrderDelivery":"整单发货模板", - "openOrderDelivery":"拆单发货模板", - "uploadFile":"上传文件", - "createTime":"时间", - "uploadFilePlaceholder":"请上传文件", - "operatorPlaceholder":"请选择操作人", - "causeFailure":"下载失败记录", - "downloadRecord":"下载记录", - "orderTemplate":"下载整单发货模板.xls", - "orderGoodsTemplate":"下载拆单发货模板.xls", - "checkCause": "查看失败原因", - "startTime": "开始时间", - "endTime": "结束时间", - "checkCause1": "失败原因" -} \ No newline at end of file + "failuresNum": "发货失败单数", + "succeedNum": "发货成功单数", + "totalNum": "总发货单数", + "operationTime": "操作时间", + "operationType": "操作类型", + "state": "状态", + "operator": "操作人", + "importData": "批量发货", + "templateType": "模板类型", + "fullOrderDelivery": "整单发货模板", + "openOrderDelivery": "拆单发货模板", + "uploadFile": "上传文件", + "createTime": "时间", + "uploadFilePlaceholder": "请上传文件", + "operatorPlaceholder": "请选择操作人", + "causeFailure": "下载失败记录", + "downloadRecord": "下载记录", + "orderTemplate": "下载整单发货模板.xls", + "orderGoodsTemplate": "下载拆单发货模板.xls", + "checkCause": "查看失败原因", + "startTime": "开始时间", + "endTime": "结束时间", + "checkCause1": "失败原因" +} diff --git a/admin/src/addon/shop/lang/zh-cn/order.config.json b/admin/src/addon/shop/lang/zh-cn/order.config.json index dea0f710..6d0d9425 100644 --- a/admin/src/addon/shop/lang/zh-cn/order.config.json +++ b/admin/src/addon/shop/lang/zh-cn/order.config.json @@ -1,41 +1,41 @@ { - "closeOrderInfo":"自动取消订单", - "closeOrderInfoLeft":"提交订单", - "closeOrderInfoRight":"分钟未付款，自动取消订单", - "closeOrderInfoBottom":"订单取消时间必须在10-1440分钟之间", - "CloseLengthPlaceholder":"请输入订单取消时间", - "isClose":"自动取消订单", - "confirm":"自动确认收货", - "confirmLeft":"发货后", - "confirmRight":"天，自动确认收货", - "confirmBottom":"自动确认收货时间必须在1-30天之间", - "finishLengthPlaceholder":"请输入自动确认收货时间", - "isFinish":"自动确认收货", - "refund":"确认收货后售后", - "refundLeft":"确认收货", - "refundRight":"天内，可申请售后", - "refundBottom":"确认收货后售后时间必须在1-30天之间", - "noAllowRefund":"确认收货后不支持售后", - "validRefundLengthPlaceholder":"请输入确认收货后售后时间", - "invoice":"发票设置", - "isInvoice":"发票开关", - "isInvoiceClose":"关闭", - "isInvoiceOpen":"开启", - "invoiceContent":"发票内容", - "insert":"添加", - "paperInvoice":"纸质发票", - "electronicInvoice":"电子发票", - "invoicePlaceholder":"所有发票内容不能为空", - "invoiceType":"发票类型", - "invoiceTypePlaceholder":"请至少选择一个发票类型", - "evaluate": "评价设置", - "isEvaluate": "评价开关", - "evaluateIsToExamine": "评价审核", - "evaluateIsShow": "评价显示", - "isEvaluateOpen": "开启", - "isEvaluateClose": "关闭", + "closeOrderInfo": "自动取消订单", + "closeOrderInfoLeft": "提交订单", + "closeOrderInfoRight": "分钟未付款，自动取消订单", + "closeOrderInfoBottom": "订单取消时间必须在10-1440分钟之间", + "CloseLengthPlaceholder": "请输入订单取消时间", + "isClose": "自动取消订单", + "confirm": "自动确认收货", + "confirmLeft": "发货后", + "confirmRight": "天，自动确认收货", + "confirmBottom": "自动确认收货时间必须在1-30天之间", + "finishLengthPlaceholder": "请输入自动确认收货时间", + "isFinish": "自动确认收货", + "refund": "确认收货后售后", + "refundLeft": "确认收货", + "refundRight": "天内，可申请售后", + "refundBottom": "确认收货后售后时间必须在1-30天之间", + "noAllowRefund": "确认收货后不支持售后", + "validRefundLengthPlaceholder": "请输入确认收货后售后时间", + "invoice": "发票设置", + "isInvoice": "发票开关", + "isInvoiceClose": "关闭", + "isInvoiceOpen": "开启", + "invoiceContent": "发票内容", + "insert": "添加", + "paperInvoice": "纸质发票", + "electronicInvoice": "电子发票", + "invoicePlaceholder": "所有发票内容不能为空", + "invoiceType": "发票类型", + "invoiceTypePlaceholder": "请至少选择一个发票类型", + "evaluate": "评价设置", + "isEvaluate": "评价开关", + "evaluateIsToExamine": "评价审核", + "evaluateIsShow": "评价显示", + "isEvaluateOpen": "开启", + "isEvaluateClose": "关闭", - "diyForm": "万能表单", - "diyFormPlaceholder": "请选择万能表单", - "addDiyForm": "添加表单" + "diyForm": "万能表单", + "diyFormPlaceholder": "请选择万能表单", + "addDiyForm": "添加表单" } diff --git a/admin/src/addon/shop/lang/zh-cn/order.detail.json b/admin/src/addon/shop/lang/zh-cn/order.detail.json index 1f7e80a1..bba63d6a 100644 --- a/admin/src/addon/shop/lang/zh-cn/order.detail.json +++ b/admin/src/addon/shop/lang/zh-cn/order.detail.json @@ -131,4 +131,4 @@ "refundGoodsNum": "数量", "refundGoodsPlaceholder": "请选择退款的商品", "formDetail": "表单详情" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/order.invoice.json b/admin/src/addon/shop/lang/zh-cn/order.invoice.json index b91598cd..456514da 100644 --- a/admin/src/addon/shop/lang/zh-cn/order.invoice.json +++ b/admin/src/addon/shop/lang/zh-cn/order.invoice.json @@ -1,40 +1,40 @@ { - "isInvoice":"是否开票", - "isInvoicePlaceholder":"请输入开票类型", - "startDate":"开始时间", - "endDate":"结束时间", - "headType":"抬头类型", - "headerTypeName":"抬头类型", - "person":"个人", - "firm":"企业", - "headTypePlaceholder":"请输入抬头类型", - "headerName":"发票抬头", - "headerNamePlaceholder":"请输入发票抬头", - "name":"发票内容", - "tradeType":"发票类型", - "typeName":"发票名称", - "headTypeName":"抬头类型", - "taxNumber":"纳税人识别号", - "mobile":"手机号", - "email":"邮件", - "telephone":"电话号", - "address":"地址", - "bankTame":"开户银行", - "bankCardNumber":"开户行账号", - "money":"开票金额", - "invoiceNumber":"发票号码", - "invoiceVoucher":"发票凭证", - "remark":"备注", - "createTime":"创建时间", - "invoiceTime":"开票时间", - "status":"状态", - "operation":"操作", - "detail":"详情", - "hasInvoice":"已开票", - "noInvoice":"未开票", - "all":"全部", - "invoice":"开票", - "viewOrder":"查看订单", - "invoiceNumberPlaceholder":"请输入发票号码", - "invoiceVoucherPlaceholder":"请输入发票凭证" -} \ No newline at end of file + "isInvoice": "是否开票", + "isInvoicePlaceholder": "请输入开票类型", + "startDate": "开始时间", + "endDate": "结束时间", + "headType": "抬头类型", + "headerTypeName": "抬头类型", + "person": "个人", + "firm": "企业", + "headTypePlaceholder": "请输入抬头类型", + "headerName": "发票抬头", + "headerNamePlaceholder": "请输入发票抬头", + "name": "发票内容", + "tradeType": "发票类型", + "typeName": "发票名称", + "headTypeName": "抬头类型", + "taxNumber": "纳税人识别号", + "mobile": "手机号", + "email": "邮件", + "telephone": "电话号", + "address": "地址", + "bankTame": "开户银行", + "bankCardNumber": "开户行账号", + "money": "开票金额", + "invoiceNumber": "发票号码", + "invoiceVoucher": "发票凭证", + "remark": "备注", + "createTime": "创建时间", + "invoiceTime": "开票时间", + "status": "状态", + "operation": "操作", + "detail": "详情", + "hasInvoice": "已开票", + "noInvoice": "未开票", + "all": "全部", + "invoice": "开票", + "viewOrder": "查看订单", + "invoiceNumberPlaceholder": "请输入发票号码", + "invoiceVoucherPlaceholder": "请输入发票凭证" +} diff --git a/admin/src/addon/shop/lang/zh-cn/order.refund.json b/admin/src/addon/shop/lang/zh-cn/order.refund.json index b07aea9e..bd4756c1 100644 --- a/admin/src/addon/shop/lang/zh-cn/order.refund.json +++ b/admin/src/addon/shop/lang/zh-cn/order.refund.json @@ -1,106 +1,106 @@ { - "goodsName": "商品名称", - "orderNo": "订单编号", - "orderRefundNo": "退款编号", - "refundTime": "退款时间", - "startDate": "开始时间", - "endDate": "结束时间", - "goodsNamePlaceholder": "请输入商品名称", - "orderNoPlaceholder": "请输入订单编号", - "orderRefundNoPlaceholder": "请输入退款编号", - "goodsInfo": "商品信息", - "orderMoney": "订单金额", - "realityMoney":"实付金额", - "goodsMoney": "商品金额", - "buyMember": "买家", - "refundMoney": "退款金额", - "createTime": "申请时间", - "refundStatus": "退款状态", - "all": "全部", - "refundType": "退款方式", - "applyForRefund": "申请退款", - "refundEnd": "维权结束", - "toBeReturned": "买家待退货", - "receivedGoods": "卖家待收货", - "refundRefuse": "卖家拒绝", - "orderInfo": "订单信息", - "outTradeNo": "交易流水号", - "orderType": "订单类型", - "orderForm": "订单来源", - "takerName": "收货人", - "takerMobile": "收货人手机号", - "takerFullAddress": "收货地址", - "goodsDetail": "商品信息", - "price": "价格", - "num": "数量", - "preferentialMoney": "优惠金额", - "deliveryMoney": "配送金额", - "operateLog": "订单日志", - "orderStatus": "订单状态", - "orderStatusPlaceholder": "请选择订单状态", - "orderFrom": "订单类型", - "orderFromPlaceholder": "请选择订单类型", - "payTime": "支付时间", - "orderGoods": "商品", - "goodsPriceNumber": "单价（元）/数量", - "detailOrderMoney": "实付金额（元）", - "buyInfo": "买家/收货人", - "deliveryType": "配送方式", - "piece": "件", - "payType": "支付方式", - "notes": "备注", - "editAddress": "修改地址", - "remind": "提醒", - "remindTips1": "如果未发货，请点击同意退款给买家。", - "remindTips2": "如果实际已发货，请主动与买家联系。", - "remindTips3": "如果订单整体退款后，优惠券和余额会退还给买家。", - "close": "关闭订单", - "finish": "确认收货", - "delivery": "订单发货", - "deliveryTypePlaceholder": "请选择配送方式", - "company": "物流公司", - "companyPlaceholder": "请选择物流公司", - "expressNumber": "物流单号", - "expressNumberPlaceholder": "请输入物流单号", - "orderGoodsIdsPlaceholder": "请选择订单项", - "virtualDelivery": "虚拟发货", - "orderCloseTips": "关闭订单后该订单将无法支付，是否确认关闭？", - "orderFinishTips": "是否确认用户已经收货？", - "orderGoodsPlaceholder": "请选择要发货的商品", - "memberRemark": "买家留言", - "discountMoney": "订单详情", - "orderDelivery": "物流信息", - "devliveryTime": "发货时间", - "companyName": "物流公司", - "logisticNo": "物流单号", - "packageInfo": "物流包裹信息", - "deliveryInfo": "发货信息", - "logisticInfo": "物流信息", - "storeName": "自提点名称", - "storeAddress": "自提点地址", - "storeMobile": "自提点电话", - "tradeTime": "营业时间", - "deliveryStatusName": "发货状态", - "refundReason": "退款原因", - "afterSales": "售后信息", - "orderRefundRefuse": "退款拒绝", - "orderRefundAgree": "同意退款", - "agree": "同意", - "applyMoney": "申请金额", - "refuse": "拒绝", - "transferAccounts": "转账", - "refuseReason": "拒绝原因", - "shopReasonPlaceholder": "请输入拒绝原因", - "confirmDelivery": "确认收货", - "orderDeliveryTips": "确定商品收到了吗？", - "agreeRefundDelivery": "同意买家收货", - "refundDeliveryAddress": "退货地址", - "refundVoucher": "申请凭证", - "refundRemark": "退款描述", - "agreeMoney": "退款金额", - "moneyPlaceholder": "请输入退款金额", - "refundaddressPlaceholder": "请输入退货地址", - "expressCompany": "物流公司", - "expressRemark": "物流说明", - "orderInfoEmpty": "暂无数据" -} \ No newline at end of file + "goodsName": "商品名称", + "orderNo": "订单编号", + "orderRefundNo": "退款编号", + "refundTime": "退款时间", + "startDate": "开始时间", + "endDate": "结束时间", + "goodsNamePlaceholder": "请输入商品名称", + "orderNoPlaceholder": "请输入订单编号", + "orderRefundNoPlaceholder": "请输入退款编号", + "goodsInfo": "商品信息", + "orderMoney": "订单金额", + "realityMoney": "实付金额", + "goodsMoney": "商品金额", + "buyMember": "买家", + "refundMoney": "退款金额", + "createTime": "申请时间", + "refundStatus": "退款状态", + "all": "全部", + "refundType": "退款方式", + "applyForRefund": "申请退款", + "refundEnd": "维权结束", + "toBeReturned": "买家待退货", + "receivedGoods": "卖家待收货", + "refundRefuse": "卖家拒绝", + "orderInfo": "订单信息", + "outTradeNo": "交易流水号", + "orderType": "订单类型", + "orderForm": "订单来源", + "takerName": "收货人", + "takerMobile": "收货人手机号", + "takerFullAddress": "收货地址", + "goodsDetail": "商品信息", + "price": "价格", + "num": "数量", + "preferentialMoney": "优惠金额", + "deliveryMoney": "配送金额", + "operateLog": "订单日志", + "orderStatus": "订单状态", + "orderStatusPlaceholder": "请选择订单状态", + "orderFrom": "订单类型", + "orderFromPlaceholder": "请选择订单类型", + "payTime": "支付时间", + "orderGoods": "商品", + "goodsPriceNumber": "单价（元）/数量", + "detailOrderMoney": "实付金额（元）", + "buyInfo": "买家/收货人", + "deliveryType": "配送方式", + "piece": "件", + "payType": "支付方式", + "notes": "备注", + "editAddress": "修改地址", + "remind": "提醒", + "remindTips1": "如果未发货，请点击同意退款给买家。", + "remindTips2": "如果实际已发货，请主动与买家联系。", + "remindTips3": "如果订单整体退款后，优惠券和余额会退还给买家。", + "close": "关闭订单", + "finish": "确认收货", + "delivery": "订单发货", + "deliveryTypePlaceholder": "请选择配送方式", + "company": "物流公司", + "companyPlaceholder": "请选择物流公司", + "expressNumber": "物流单号", + "expressNumberPlaceholder": "请输入物流单号", + "orderGoodsIdsPlaceholder": "请选择订单项", + "virtualDelivery": "虚拟发货", + "orderCloseTips": "关闭订单后该订单将无法支付，是否确认关闭？", + "orderFinishTips": "是否确认用户已经收货？", + "orderGoodsPlaceholder": "请选择要发货的商品", + "memberRemark": "买家留言", + "discountMoney": "订单详情", + "orderDelivery": "物流信息", + "devliveryTime": "发货时间", + "companyName": "物流公司", + "logisticNo": "物流单号", + "packageInfo": "物流包裹信息", + "deliveryInfo": "发货信息", + "logisticInfo": "物流信息", + "storeName": "自提点名称", + "storeAddress": "自提点地址", + "storeMobile": "自提点电话", + "tradeTime": "营业时间", + "deliveryStatusName": "发货状态", + "refundReason": "退款原因", + "afterSales": "售后信息", + "orderRefundRefuse": "退款拒绝", + "orderRefundAgree": "同意退款", + "agree": "同意", + "applyMoney": "申请金额", + "refuse": "拒绝", + "transferAccounts": "转账", + "refuseReason": "拒绝原因", + "shopReasonPlaceholder": "请输入拒绝原因", + "confirmDelivery": "确认收货", + "orderDeliveryTips": "确定商品收到了吗？", + "agreeRefundDelivery": "同意买家收货", + "refundDeliveryAddress": "退货地址", + "refundVoucher": "申请凭证", + "refundRemark": "退款描述", + "agreeMoney": "退款金额", + "moneyPlaceholder": "请输入退款金额", + "refundaddressPlaceholder": "请输入退货地址", + "expressCompany": "物流公司", + "expressRemark": "物流说明", + "orderInfoEmpty": "暂无数据" +} diff --git a/admin/src/addon/shop/lang/zh-cn/order.refund_detail.json b/admin/src/addon/shop/lang/zh-cn/order.refund_detail.json index 89c5d0f4..220216af 100644 --- a/admin/src/addon/shop/lang/zh-cn/order.refund_detail.json +++ b/admin/src/addon/shop/lang/zh-cn/order.refund_detail.json @@ -91,4 +91,4 @@ "expressCompany": "物流公司", "expressRemark": "物流说明", "orderInfoEmpty": "暂无数据" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/stat.goods.json b/admin/src/addon/shop/lang/zh-cn/stat.goods.json index 172d17ed..ea3bcd05 100644 --- a/admin/src/addon/shop/lang/zh-cn/stat.goods.json +++ b/admin/src/addon/shop/lang/zh-cn/stat.goods.json @@ -1,37 +1,37 @@ { - "goodsOverview": "商品概况", - "timeFilter": "时间筛选", - "startTime": "开始时间", - "endTime": "结束时间", - "search": "搜索", - "goodsAccessNum": "商品浏览量", - "goodsAccessNumTip": "统计时间内，所有商品详情页被访问的次数，一个人在统计时间内访问多次记为多次", - "goodsVisitCount": "商品访客数", - "goodsVisitCountTips":"统计时间内，访问任何商品详情页的人数，一个人在统计时间范围内访问多次只记为一个", - "cartNum":"加购件数", - "cartNumTips":"统计时间内，添加商品进入购物车的商品件数", - "saleNum": "下单件数", - "saleNumTips": "统计时间内，成功下单的商品件数之和（不剔除退款订单）", - "payNum": "支付件数", - "payNumTips": "统计时间内， 成功付款订单的商品件数之和（不剔除退款订单）", - "payMoney":"支付金额", - "payMoneyTips":"统计时间内，成功付款订单的商品金额之和（不剔除退款订单）", - "refundMoney":"退款金额", - "refundMoneyTips":"统计时间内，成功退款的商品金额之和", - "refundNum":"退款件数", - "refundNumTips":"统计时间内，成功退款的商品件数之和", - "goodsRank": "商品排行", - "goodsName":"商品名称", - "goodsNamePlaceholder":"请输入商品名称", - "goodsCategory": "商品分类", - "all":"全部", - "totalType":"统计类型", - "totalTypePlaceholder":"请选择统计类型", - "goodsInfo":"商品信息", - "accessNum":"访问次数", - "visitCount":"访客数", - "cartNumber":"加入购物车数量", - "saleNumber":"商品销量", - "payTotal":"支付总金额", - "collectNum":"收藏数量" -} \ No newline at end of file + "goodsOverview": "商品概况", + "timeFilter": "时间筛选", + "startTime": "开始时间", + "endTime": "结束时间", + "search": "搜索", + "goodsAccessNum": "商品浏览量", + "goodsAccessNumTip": "统计时间内，所有商品详情页被访问的次数，一个人在统计时间内访问多次记为多次", + "goodsVisitCount": "商品访客数", + "goodsVisitCountTips": "统计时间内，访问任何商品详情页的人数，一个人在统计时间范围内访问多次只记为一个", + "cartNum": "加购件数", + "cartNumTips": "统计时间内，添加商品进入购物车的商品件数", + "saleNum": "下单件数", + "saleNumTips": "统计时间内，成功下单的商品件数之和（不剔除退款订单）", + "payNum": "支付件数", + "payNumTips": "统计时间内， 成功付款订单的商品件数之和（不剔除退款订单）", + "payMoney": "支付金额", + "payMoneyTips": "统计时间内，成功付款订单的商品金额之和（不剔除退款订单）", + "refundMoney": "退款金额", + "refundMoneyTips": "统计时间内，成功退款的商品金额之和", + "refundNum": "退款件数", + "refundNumTips": "统计时间内，成功退款的商品件数之和", + "goodsRank": "商品排行", + "goodsName": "商品名称", + "goodsNamePlaceholder": "请输入商品名称", + "goodsCategory": "商品分类", + "all": "全部", + "totalType": "统计类型", + "totalTypePlaceholder": "请选择统计类型", + "goodsInfo": "商品信息", + "accessNum": "访问次数", + "visitCount": "访客数", + "cartNumber": "加入购物车数量", + "saleNumber": "商品销量", + "payTotal": "支付总金额", + "collectNum": "收藏数量" +} diff --git a/admin/src/addon/shop/views/address/edit.vue b/admin/src/addon/shop/views/address/edit.vue index fad35649..8d676f6c 100644 --- a/admin/src/addon/shop/views/address/edit.vue +++ b/admin/src/addon/shop/views/address/edit.vue @@ -1,69 +1,158 @@ diff --git a/admin/src/addon/shop/views/address/list.vue b/admin/src/addon/shop/views/address/list.vue index 7d8b73d3..d9fa670d 100644 --- a/admin/src/addon/shop/views/address/list.vue +++ b/admin/src/addon/shop/views/address/list.vue @@ -1,89 +1,144 @@ - + diff --git a/admin/src/addon/shop/views/delivery/company.vue b/admin/src/addon/shop/views/delivery/company.vue index ee9a86fd..24b07db2 100644 --- a/admin/src/addon/shop/views/delivery/company.vue +++ b/admin/src/addon/shop/views/delivery/company.vue @@ -1,67 +1,124 @@ - + diff --git a/admin/src/addon/shop/views/delivery/company_edit.vue b/admin/src/addon/shop/views/delivery/company_edit.vue index c3298eb5..7ffced3e 100644 --- a/admin/src/addon/shop/views/delivery/company_edit.vue +++ b/admin/src/addon/shop/views/delivery/company_edit.vue @@ -1,122 +1,281 @@ - + diff --git a/admin/src/addon/shop/views/delivery/components/delivery-personnel-edit.vue b/admin/src/addon/shop/views/delivery/components/delivery-personnel-edit.vue index 3951874b..9571496a 100644 --- a/admin/src/addon/shop/views/delivery/components/delivery-personnel-edit.vue +++ b/admin/src/addon/shop/views/delivery/components/delivery-personnel-edit.vue @@ -1,27 +1,64 @@ diff --git a/admin/src/addon/shop/views/delivery/config.vue b/admin/src/addon/shop/views/delivery/config.vue index 15041102..0981e497 100644 --- a/admin/src/addon/shop/views/delivery/config.vue +++ b/admin/src/addon/shop/views/delivery/config.vue @@ -1,53 +1,108 @@ diff --git a/admin/src/addon/shop/views/delivery/electronic_sheet.vue b/admin/src/addon/shop/views/delivery/electronic_sheet.vue index 15add295..8977289e 100644 --- a/admin/src/addon/shop/views/delivery/electronic_sheet.vue +++ b/admin/src/addon/shop/views/delivery/electronic_sheet.vue @@ -1,131 +1,216 @@ - + diff --git a/admin/src/addon/shop/views/delivery/electronic_sheet_config.vue b/admin/src/addon/shop/views/delivery/electronic_sheet_config.vue index f09e4aae..bf3d5fb3 100644 --- a/admin/src/addon/shop/views/delivery/electronic_sheet_config.vue +++ b/admin/src/addon/shop/views/delivery/electronic_sheet_config.vue @@ -1,184 +1,257 @@ diff --git a/admin/src/addon/shop/views/delivery/electronic_sheet_edit.vue b/admin/src/addon/shop/views/delivery/electronic_sheet_edit.vue index 0a37ae2b..d0988dc9 100644 --- a/admin/src/addon/shop/views/delivery/electronic_sheet_edit.vue +++ b/admin/src/addon/shop/views/delivery/electronic_sheet_edit.vue @@ -1,270 +1,384 @@ diff --git a/admin/src/addon/shop/views/delivery/local.vue b/admin/src/addon/shop/views/delivery/local.vue index c3d35606..3b977bd7 100644 --- a/admin/src/addon/shop/views/delivery/local.vue +++ b/admin/src/addon/shop/views/delivery/local.vue @@ -1,18 +1,25 @@ diff --git a/admin/src/addon/shop/views/delivery/search.vue b/admin/src/addon/shop/views/delivery/search.vue index 6a80f470..39b643ad 100644 --- a/admin/src/addon/shop/views/delivery/search.vue +++ b/admin/src/addon/shop/views/delivery/search.vue @@ -1,76 +1,116 @@ diff --git a/admin/src/addon/shop/views/delivery/staff.vue b/admin/src/addon/shop/views/delivery/staff.vue index 691ae3d8..97a75df9 100644 --- a/admin/src/addon/shop/views/delivery/staff.vue +++ b/admin/src/addon/shop/views/delivery/staff.vue @@ -1,57 +1,98 @@ diff --git a/admin/src/addon/shop/views/delivery/store.vue b/admin/src/addon/shop/views/delivery/store.vue index ad71b5b6..a27fc36a 100644 --- a/admin/src/addon/shop/views/delivery/store.vue +++ b/admin/src/addon/shop/views/delivery/store.vue @@ -1,77 +1,129 @@ - + diff --git a/admin/src/addon/shop/views/delivery/store_edit.vue b/admin/src/addon/shop/views/delivery/store_edit.vue index 76c0f635..cb9bb25c 100644 --- a/admin/src/addon/shop/views/delivery/store_edit.vue +++ b/admin/src/addon/shop/views/delivery/store_edit.vue @@ -1,63 +1,136 @@ diff --git a/admin/src/addon/shop/views/delivery/template.vue b/admin/src/addon/shop/views/delivery/template.vue index 31e450d7..166648c8 100644 --- a/admin/src/addon/shop/views/delivery/template.vue +++ b/admin/src/addon/shop/views/delivery/template.vue @@ -1,84 +1,137 @@ - + diff --git a/admin/src/addon/shop/views/delivery/template_edit.vue b/admin/src/addon/shop/views/delivery/template_edit.vue index 6209cd5e..1e92ff86 100644 --- a/admin/src/addon/shop/views/delivery/template_edit.vue +++ b/admin/src/addon/shop/views/delivery/template_edit.vue @@ -1,149 +1,286 @@ diff --git a/admin/src/addon/shop/views/diy/components/edit-goods-coupon.vue b/admin/src/addon/shop/views/diy/components/edit-goods-coupon.vue index 63321032..df934dfb 100644 --- a/admin/src/addon/shop/views/diy/components/edit-goods-coupon.vue +++ b/admin/src/addon/shop/views/diy/components/edit-goods-coupon.vue @@ -1,119 +1,203 @@ - + \ No newline at end of file + diff --git a/admin/src/addon/shop/views/diy/components/edit-goods-list.vue b/admin/src/addon/shop/views/diy/components/edit-goods-list.vue index 47cb6360..ef567139 100644 --- a/admin/src/addon/shop/views/diy/components/edit-goods-list.vue +++ b/admin/src/addon/shop/views/diy/components/edit-goods-list.vue @@ -1,196 +1,372 @@ diff --git a/admin/src/addon/shop/views/diy/components/edit-many-goods-list.vue b/admin/src/addon/shop/views/diy/components/edit-many-goods-list.vue index e344d0c6..f6c3184e 100644 --- a/admin/src/addon/shop/views/diy/components/edit-many-goods-list.vue +++ b/admin/src/addon/shop/views/diy/components/edit-many-goods-list.vue @@ -1,272 +1,498 @@ diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-exchange-goods.vue b/admin/src/addon/shop/views/diy/components/edit-shop-exchange-goods.vue index e05caee9..cbbb3403 100644 --- a/admin/src/addon/shop/views/diy/components/edit-shop-exchange-goods.vue +++ b/admin/src/addon/shop/views/diy/components/edit-shop-exchange-goods.vue @@ -1,8 +1,8 @@ diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-exchange-info.vue b/admin/src/addon/shop/views/diy/components/edit-shop-exchange-info.vue index 17757aa7..2c787575 100644 --- a/admin/src/addon/shop/views/diy/components/edit-shop-exchange-info.vue +++ b/admin/src/addon/shop/views/diy/components/edit-shop-exchange-info.vue @@ -1,38 +1,37 @@ diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-goods-ranking.vue b/admin/src/addon/shop/views/diy/components/edit-shop-goods-ranking.vue index 9bb60ec0..9e37f58b 100644 --- a/admin/src/addon/shop/views/diy/components/edit-shop-goods-ranking.vue +++ b/admin/src/addon/shop/views/diy/components/edit-shop-goods-ranking.vue @@ -1,83 +1,150 @@ diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-member-info.vue b/admin/src/addon/shop/views/diy/components/edit-shop-member-info.vue index 10a65585..f7e24614 100644 --- a/admin/src/addon/shop/views/diy/components/edit-shop-member-info.vue +++ b/admin/src/addon/shop/views/diy/components/edit-shop-member-info.vue @@ -1,41 +1,41 @@ diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-newcomer.vue b/admin/src/addon/shop/views/diy/components/edit-shop-newcomer.vue index 5feb6593..7b5260f1 100644 --- a/admin/src/addon/shop/views/diy/components/edit-shop-newcomer.vue +++ b/admin/src/addon/shop/views/diy/components/edit-shop-newcomer.vue @@ -1,116 +1,232 @@ diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-order-info.vue b/admin/src/addon/shop/views/diy/components/edit-shop-order-info.vue index 187f9edf..e3555b38 100644 --- a/admin/src/addon/shop/views/diy/components/edit-shop-order-info.vue +++ b/admin/src/addon/shop/views/diy/components/edit-shop-order-info.vue @@ -1,78 +1,104 @@ diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-search.vue b/admin/src/addon/shop/views/diy/components/edit-shop-search.vue index cd175271..805f9e50 100644 --- a/admin/src/addon/shop/views/diy/components/edit-shop-search.vue +++ b/admin/src/addon/shop/views/diy/components/edit-shop-search.vue @@ -1,24 +1,27 @@ - + diff --git a/admin/src/addon/shop/views/goods/attr_edit.vue b/admin/src/addon/shop/views/goods/attr_edit.vue index 7e4989c4..48b09b34 100644 --- a/admin/src/addon/shop/views/goods/attr_edit.vue +++ b/admin/src/addon/shop/views/goods/attr_edit.vue @@ -1,202 +1,363 @@ diff --git a/admin/src/addon/shop/views/goods/components/brand-edit.vue b/admin/src/addon/shop/views/goods/components/brand-edit.vue index 600c3175..f6e51388 100644 --- a/admin/src/addon/shop/views/goods/components/brand-edit.vue +++ b/admin/src/addon/shop/views/goods/components/brand-edit.vue @@ -1,30 +1,71 @@ diff --git a/admin/src/addon/shop/views/goods/components/category-edit.vue b/admin/src/addon/shop/views/goods/components/category-edit.vue index 2fd0f87c..0ba64043 100644 --- a/admin/src/addon/shop/views/goods/components/category-edit.vue +++ b/admin/src/addon/shop/views/goods/components/category-edit.vue @@ -1,38 +1,84 @@ diff --git a/admin/src/addon/shop/views/goods/components/coupon-select-popup.vue b/admin/src/addon/shop/views/goods/components/coupon-select-popup.vue index 68d53da9..54091d8f 100644 --- a/admin/src/addon/shop/views/goods/components/coupon-select-popup.vue +++ b/admin/src/addon/shop/views/goods/components/coupon-select-popup.vue @@ -1,76 +1,124 @@ diff --git a/admin/src/addon/shop/views/goods/components/evaluate-add.vue b/admin/src/addon/shop/views/goods/components/evaluate-add.vue index 61052688..58813751 100644 --- a/admin/src/addon/shop/views/goods/components/evaluate-add.vue +++ b/admin/src/addon/shop/views/goods/components/evaluate-add.vue @@ -1,47 +1,95 @@ diff --git a/admin/src/addon/shop/views/goods/components/goods-batch-settings-popup.vue b/admin/src/addon/shop/views/goods/components/goods-batch-settings-popup.vue index 1a248a9b..0259fd3d 100644 --- a/admin/src/addon/shop/views/goods/components/goods-batch-settings-popup.vue +++ b/admin/src/addon/shop/views/goods/components/goods-batch-settings-popup.vue @@ -1,155 +1,379 @@ diff --git a/admin/src/addon/shop/views/goods/components/goods-category-spread-popup.vue b/admin/src/addon/shop/views/goods/components/goods-category-spread-popup.vue index f41c0fb1..095bc32b 100644 --- a/admin/src/addon/shop/views/goods/components/goods-category-spread-popup.vue +++ b/admin/src/addon/shop/views/goods/components/goods-category-spread-popup.vue @@ -1,24 +1,32 @@ diff --git a/admin/src/addon/shop/views/goods/components/goods-member-price-popup.vue b/admin/src/addon/shop/views/goods/components/goods-member-price-popup.vue index e9a17350..ce3ab67c 100644 --- a/admin/src/addon/shop/views/goods/components/goods-member-price-popup.vue +++ b/admin/src/addon/shop/views/goods/components/goods-member-price-popup.vue @@ -1,84 +1,175 @@ diff --git a/admin/src/addon/shop/views/goods/components/goods-price-edit-popup.vue b/admin/src/addon/shop/views/goods/components/goods-price-edit-popup.vue index 85382eb3..89c205bd 100644 --- a/admin/src/addon/shop/views/goods/components/goods-price-edit-popup.vue +++ b/admin/src/addon/shop/views/goods/components/goods-price-edit-popup.vue @@ -1,74 +1,152 @@