0000494

.devcontainer/Dockerfile

@@ -0,0 +1,20 @@
+FROM node:20-alpine3.17
+
+# Install basic development tools
+# RUN apt update \
+# && apt install -y less sudo \
+# && apt install -y php \
+# && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
+# && php composer-setup.php \
+# && php -r "unlink('composer-setup.php');" \
+# && mv composer.phar /usr/local/bin/composer
+
+
+# # Ensure default `node` user has access to `sudo`
+# ARG USERNAME=node
+# RUN echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
+#     && chmod 0440 /etc/sudoers.d/$USERNAME
+WORKDIR /app
+
+# Set `DEVCONTAINER` environment variable to help with orientation
+ENV DEVCONTAINER=true

.devcontainer/devcontainer.json

@@ -0,0 +1,10 @@
+// See https://containers.dev/implementors/json_reference/ for configuration reference
+{
+	"name": "Slash Shop H5 Dev",
+	"build": {
+		"dockerfile": "Dockerfile"
+	},
+	"workspaceMount": "source=${localWorkspaceFolder},target=/app,type=bind",
+	"workspaceFolder": "/app",
+  	"remoteUser": "root"
+}

src/pages/order/Info/index.vue

@@ -632,11 +632,12 @@ const dialogPrintAddrVisible = ref(false);
 
 const handleOp = async (op) => {
   if (op === "prepare") {
-    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,
@@ -650,6 +651,7 @@ const handleOp = async (op) => {
       }
     }
   } else {
+    console.log('op',op)
     ElMessageBox.confirm("確認" + opName[op] + "?", "訂單操作", {})
       .then(async () => {
         let res = await updateOrderAction({
@@ -718,10 +720,11 @@ const printObj = ref({
 });
 
 const handleFinish = async () => {
+  
   let res = await updateOrderAction({
     op: "printcard",
     order_id: orderInfo.value.order_id,
-    action_note: orderInfo.value.action_note,
+    action_note: '完成配貨',
   });
 
   if (res.code === 200) {

src/pages/order/index.vue

@@ -80,7 +80,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted, watch } from "vue";
+import { ref, watch, onActivated } from "vue";
 import { getList } from "@/api/order";
 import { useRouter, useRoute } from "vue-router";
 
@@ -134,7 +134,12 @@ if (route.query.user_id) {
   search.value.user_id = route.query.user_id;
 }
 
-onMounted(async () => {
+
+onActivated(()=>{
+  getListData();
+})
+
+const getListData = async()=>{
   let res = await getList({
     page: page.value,
     size: pageSize.value,
@@ -145,7 +150,7 @@ onMounted(async () => {
     tableData.value = res.data.data;
     total.value = res.data.total;
   }
-});
+}
 
 watch(
   () => page.value,

vite.config.js

@@ -16,6 +16,9 @@ export default defineConfig(({ mode }) => {
 
   return {
     base: './',
+    server: {
+      host: '0.0.0.0'
+    },
     resolve: {
       alias: {
         '@': resolve(__dirname, 'src'),