From 8b4d1667e48833af8d12abb6a83096fcf9267bbd Mon Sep 17 00:00:00 2001 From: Wayne Date: Sun, 30 Jul 2023 09:38:15 +0800 Subject: [PATCH] sku --- admin/.env.development | 2 +- admin/src/pages/order/Info/index.vue | 21 -- admin/src/pages/order/css/common.less | 11 +- admin/src/pages/order/index.vue | 2 - app/app/adminapi/controller/v1/Order.php | 1 + app/app/appapi/controller/v1/Fds.php | 15 ++ app/app/appapi/controller/v1/Goods.php | 78 +++--- app/app/appapi/controller/v1/Pos.php | 35 +++ app/app/common/Goods.php | 3 +- app/public/admin/assets/Index-f046a4bf.js | 1 + app/public/admin/assets/Info-7f45f09f.js | 1 + app/public/admin/assets/UseList-651fc8dc.js | 1 + app/public/admin/assets/affiliate-2786f83c.js | 1 + app/public/admin/assets/affiliate-3f491631.js | 1 + app/public/admin/assets/bonus-80eb9af2.js | 1 + app/public/admin/assets/bonus-98b80f90.js | 1 + app/public/admin/assets/dashboard-16181eab.js | 60 +++++ app/public/admin/assets/index-0eeae18e.js | 1 + app/public/admin/assets/index-4f8aae43.css | 1 + app/public/admin/assets/index-58fe572c.js | 2 + app/public/admin/assets/index-6bc8cca6.js | 2 + app/public/admin/assets/index-7d3bc945.js | 1 + app/public/admin/assets/index-8463a12c.js | 1 + app/public/admin/assets/index-97b1f490.css | 1 + app/public/admin/assets/index-af9cdf80.js | 1 + app/public/admin/assets/index-c067d2db.css | 1 + app/public/admin/assets/index-dacd5417.js | 2 + app/public/admin/assets/index-e3ce12a4.js | 1 + app/public/admin/assets/login-a0992c1d.js | 1 + app/public/admin/assets/order-44b3e354.js | 1 + app/public/admin/assets/order-7a4c09a2.js | 1 + app/public/admin/assets/order-b48db812.js | 1 + app/public/admin/assets/order-d7fe5dfb.js | 1 + app/public/admin/assets/order-da492a48.css | 1 + app/public/admin/assets/order-e3fcd520.js | 1 + app/public/admin/assets/payment-4bb49277.js | 1 + app/public/admin/assets/printcard-2bccd01c.js | 1 + app/public/admin/assets/request-ce1488f3.js | 1 + app/public/admin/assets/shipping-d4c338b3.js | 1 + .../admin/assets/shopConfig-4aef579a.js | 6 + app/public/admin/goods.php | 1 - app/public/admin/includes/inc_menu.php | 24 +- app/public/admin/navigator.php | 4 +- app/public/admin/order.html | 4 +- app/public/admin/printcard.html | 23 -- app/public/admin/styles/general.css | 8 +- app/public/admin/styles/main.css | 20 +- app/public/admin/templates/category_info.htm | 24 +- app/public/admin/templates/goods_info.htm | 195 +++++++------- app/public/admin/templates/goods_list.htm | 10 +- app/public/admin/templates/index.htm | 10 +- app/public/admin/templates/pageheader.htm | 4 +- app/public/includes/lib_main.php | 2 +- app/public/includes/www_mb5_com_cn.php | 2 +- app/public/languages/zh_tw/admin/bonus.php | 2 +- app/public/languages/zh_tw/admin/category.php | 24 +- app/public/languages/zh_tw/admin/common.php | 2 +- .../languages/zh_tw/admin/ebao_commend.php | 2 +- .../zh_tw/admin/gen_goods_script.php | 2 +- app/public/languages/zh_tw/admin/goods.php | 8 +- .../languages/zh_tw/admin/goods_batch.php | 4 +- .../languages/zh_tw/admin/goods_export.php | 2 +- .../languages/zh_tw/admin/group_buy.php | 2 +- app/public/languages/zh_tw/admin/index.php | 6 +- .../languages/zh_tw/admin/log_action.php | 2 +- app/public/languages/zh_tw/admin/pre_sale.php | 2 +- .../languages/zh_tw/admin/shop_config.php | 8 +- .../languages/zh_tw/admin/statistic.php | 2 +- .../languages/zh_tw/admin/suppliers_goods.php | 8 +- app/public/languages/zh_tw/admin/template.php | 6 +- app/public/languages/zh_tw/admin/topic.php | 2 +- app/public/languages/zh_tw/common.php | 6 +- .../languages/zh_tw/convert/shopex46.php | 2 +- .../languages/zh_tw/convert/shopex47.php | 2 +- .../languages/zh_tw/convert/shopex48.php | 2 +- app/shop.sql.bak2 | 8 +- h5/components.d.ts | 1 + h5/src/pages/Cart/Checkout.vue | 10 +- h5/src/pages/Category/Index.vue | 238 +++++++++-------- h5/src/pages/Category/component/goods.vue | 251 +++++++++++------- h5/src/pages/Login/LineLogin.vue | 1 + h5/src/pages/Register/Index.vue | 8 +- h5/src/router/index.ts | 104 +++++--- h5/src/store/Cart.js | 4 +- 84 files changed, 787 insertions(+), 531 deletions(-) create mode 100644 app/app/appapi/controller/v1/Fds.php create mode 100644 app/app/appapi/controller/v1/Pos.php create mode 100644 app/public/admin/assets/Index-f046a4bf.js create mode 100644 app/public/admin/assets/Info-7f45f09f.js create mode 100644 app/public/admin/assets/UseList-651fc8dc.js create mode 100644 app/public/admin/assets/affiliate-2786f83c.js create mode 100644 app/public/admin/assets/affiliate-3f491631.js create mode 100644 app/public/admin/assets/bonus-80eb9af2.js create mode 100644 app/public/admin/assets/bonus-98b80f90.js create mode 100644 app/public/admin/assets/dashboard-16181eab.js create mode 100644 app/public/admin/assets/index-0eeae18e.js create mode 100644 app/public/admin/assets/index-4f8aae43.css create mode 100644 app/public/admin/assets/index-58fe572c.js create mode 100644 app/public/admin/assets/index-6bc8cca6.js create mode 100644 app/public/admin/assets/index-7d3bc945.js create mode 100644 app/public/admin/assets/index-8463a12c.js create mode 100644 app/public/admin/assets/index-97b1f490.css create mode 100644 app/public/admin/assets/index-af9cdf80.js create mode 100644 app/public/admin/assets/index-c067d2db.css create mode 100644 app/public/admin/assets/index-dacd5417.js create mode 100644 app/public/admin/assets/index-e3ce12a4.js create mode 100644 app/public/admin/assets/login-a0992c1d.js create mode 100644 app/public/admin/assets/order-44b3e354.js create mode 100644 app/public/admin/assets/order-7a4c09a2.js create mode 100644 app/public/admin/assets/order-b48db812.js create mode 100644 app/public/admin/assets/order-d7fe5dfb.js create mode 100644 app/public/admin/assets/order-da492a48.css create mode 100644 app/public/admin/assets/order-e3fcd520.js create mode 100644 app/public/admin/assets/payment-4bb49277.js create mode 100644 app/public/admin/assets/printcard-2bccd01c.js create mode 100644 app/public/admin/assets/request-ce1488f3.js create mode 100644 app/public/admin/assets/shipping-d4c338b3.js create mode 100644 app/public/admin/assets/shopConfig-4aef579a.js delete mode 100644 app/public/admin/printcard.html diff --git a/admin/.env.development b/admin/.env.development index b480e3a0..b394d1af 100644 --- a/admin/.env.development +++ b/admin/.env.development @@ -2,4 +2,4 @@ VITE_APP_BASE_URL = 'http://localhost:8080/' VITE_APP_IMG_URL = 'http://localhost:8080/' -VITE_APP_API_URL = 'http://localhost:8080/adminapi/v1' +VITE_APP_API_URL = 'http://localhost:8080/adminapi/v1' \ No newline at end of file diff --git a/admin/src/pages/order/Info/index.vue b/admin/src/pages/order/Info/index.vue index 2768a662..78f892af 100644 --- a/admin/src/pages/order/Info/index.vue +++ b/admin/src/pages/order/Info/index.vue @@ -587,26 +587,6 @@ const dialogPrintVisible = ref(false); const dialogPrintAddrVisible = ref(false); const handleOp = async (op) => { - if (op === "prepare") { - // if (op === "prepare") { - // router.push({ path: "/printcard", query: { order_sn: orderInfo.value.order_sn } }); - // openPrintCard(orderInfo.value.order_sn); - dialogPrintCardVisible.value = true; - // } - - let res = await updateOrderAction({ - op, - order_id: orderInfo.value.order_id, - action_note: orderInfo.value.action_note, - }); - if (res.code == 200) { - if (op === "remove") { - router.push({ path: "/list" }); - } else { - getOrder(order_id); - } - } - } else { console.log('op', op) ElMessageBox.confirm("確認" + opName[op] + "?", "訂單操作", {}) .then(async () => { @@ -626,7 +606,6 @@ const handleOp = async (op) => { .catch(() => { return; }); - } return; }; diff --git a/admin/src/pages/order/css/common.less b/admin/src/pages/order/css/common.less index 7f413a17..12abd159 100644 --- a/admin/src/pages/order/css/common.less +++ b/admin/src/pages/order/css/common.less @@ -1,5 +1,10 @@ +*{ + font-size: 16px; + box-sizing: border-box; +} + body{ - font-size: 14px; + font-size: 16px; } .main { @@ -48,4 +53,8 @@ body{ .el-card__body { color: #909399; +} + +:root{ + // --el-pagination-font-size-small: 16px; } \ No newline at end of file diff --git a/admin/src/pages/order/index.vue b/admin/src/pages/order/index.vue index 908d6005..867b7109 100644 --- a/admin/src/pages/order/index.vue +++ b/admin/src/pages/order/index.vue @@ -41,7 +41,6 @@ -