diff --git a/.env.development b/.env.development index 72a4624..3760639 100644 --- a/.env.development +++ b/.env.development @@ -12,7 +12,7 @@ ENV = 'development' # VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/ # VITE_ADMIN_PROXY_PATH = http://localhost:9999/ -VITE_ADMIN_PROXY_PATH = http://192.168.101.174:9999/ # 邓-本地 +VITE_ADMIN_PROXY_PATH = http://192.168.101.185:9999/ # 邓-本地 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上 # 图片访问基础地址 @@ -20,7 +20,7 @@ VITE_ADMIN_PROXY_PATH = http://192.168.101.174:9999/ # 邓-本地 # VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # VITE_IMAGE_BASE_PATH = http://localhost:9999 -VITE_IMAGE_BASE_PATH = http://192.168.101.174:9999 # 邓-本地 +VITE_IMAGE_BASE_PATH = http://192.168.101.185:9999 # 邓-本地 # VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上 # 代码生成服务地址 diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue index 0ff3304..22576e0 100644 --- a/src/views/hard/hard-order/index.vue +++ b/src/views/hard/hard-order/index.vue @@ -76,24 +76,32 @@ @@ -262,13 +270,14 @@ const AdminRefundDialog = defineAsyncComponent(() => import("./admin-refund-dial const ShopCar = defineAsyncComponent(() => import("../components/shop-car.vue")) const TransactionList = defineAsyncComponent(() => import("/@/views/wallet/components/transaction-list.vue")) // 定义查询字典 -const { hard_pay_type, hard_order_type, hard_order_status, hard_type, hard_refund_status, daily_menu } = useDict( +const { hard_pay_type, hard_order_type, hard_order_status, hard_type, hard_refund_status, daily_menu, wallet_type } = useDict( "hard_pay_type", "hard_order_type", "hard_order_status", "hard_type", "hard_refund_status", "daily_menu", + "wallet_type", ) // 定义变量内容 const formDialogRef = ref() diff --git a/src/views/supermarketerp/supermarketSpu/index.vue b/src/views/supermarketerp/supermarketSpu/index.vue index 419393c..708494d 100644 --- a/src/views/supermarketerp/supermarketSpu/index.vue +++ b/src/views/supermarketerp/supermarketSpu/index.vue @@ -224,9 +224,11 @@ const syncSupermarket = async () => { try { const res = await HardMqApi.syncSupermarket({}) console.log("商品分类同步至消费机:", res); + useMessage().success("同步成功") loading.close() } catch (error: any) { console.error("商品分类同步至消费机:", error); + useMessage().error(error.msg) loading.close() } }