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 @@ -