From 96854369a1198900470cf1d6c09e427544734866 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 14 Jul 2022 18:01:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E5=88=B6=E6=96=B9=E6=A1=88=E5=85=A8?=
 =?UTF-8?q?=E6=96=B0=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rest/custom/detail.js | 2 +-
 src/rest/wechat/getZip.js | 5 +++--
 src/tools/exec.js         | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/rest/custom/detail.js b/src/rest/custom/detail.js
index 67ace8e..a22e130 100644
--- a/src/rest/custom/detail.js
+++ b/src/rest/custom/detail.js
@@ -15,7 +15,7 @@ module.exports = {
       ]).then(() => {
         data.appList = data.appList.filter(Boolean).map(e => {
           if (data.type == 'mp') {
-            e.tabbar = e.id == data.extra?.tabBar.list?.[2].id
+            e.tabbar = e.id == data.extra?.tabBar.list?.[2]?.id
           }
           return e
         })
diff --git a/src/rest/wechat/getZip.js b/src/rest/wechat/getZip.js
index a9edd43..f655790 100644
--- a/src/rest/wechat/getZip.js
+++ b/src/rest/wechat/getZip.js
@@ -2,6 +2,7 @@ const db = require("../../utils/dbUitls");
 const execute = require("../../tools/exec")
 const dayjs = require("dayjs")
 const fse = require("fs-extra");
+const isDev = process.env.OS == 'Windows_NT'
 module.exports = {
   action: "/node/wxmp/getZip",
   method: "post",
@@ -17,8 +18,8 @@ module.exports = {
       db.query(sql).then(() => setTimeout(() => {
         response.send({code: 0})
       }, 2000))
-      const path = info.projectPath || '/home/deploy/node-service/dvcp_v2_wechat',
-          dest = `/home/deploy/wxmpZips/${uid}/`,
+      const path = info.projectPath || isDev ? 'E:\\code\\cunwei\\dvcp_v2_wechat' : '/home/deploy/node-service/dvcp_v2_wechat',
+          dest = isDev ? `E:\\wxmpZips\\${uid}` : `/home/deploy/wxmpZips/${uid}/`,
           processEnv = info.npmScript || 'build',
           dist = info.npmScript ? `${path}/dist/${info.npmScript}/` : `${path}/dist/build/mp-weixin/`
       execute(`cd ${path}&&npm run apps&&node bin/pages.js ${appid} ${id}&&npm run ${processEnv}`)
diff --git a/src/tools/exec.js b/src/tools/exec.js
index 7ec6337..2333861 100644
--- a/src/tools/exec.js
+++ b/src/tools/exec.js
@@ -1,6 +1,6 @@
 const {exec} = require("child_process");
 const execute = cmd => new Promise((resolve, reject) => {
-  let pid = exec(cmd, (err) => {
+  let pid = exec(cmd, {windowsHide: true}, (err) => {
     if (!err) {
       resolve()
     } else reject(err)