From afe1df98f3e3db5cc2f6d8600dca6b227e1a68e5 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 28 Nov 2024 09:24:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96webConfig=E5=92=8CwxmpConfig?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E8=A1=A8=E5=8D=95=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/oms/apps/develop/AppDeployCustom/add.vue   | 14 --------------
 .../develop/AppDeployCustom/config/webConfig.vue   |  4 ++--
 .../develop/AppDeployCustom/config/wxmpConfig.vue  |  6 ++----
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/project/oms/apps/develop/AppDeployCustom/add.vue b/project/oms/apps/develop/AppDeployCustom/add.vue
index 1f2de457..721cdde2 100644
--- a/project/oms/apps/develop/AppDeployCustom/add.vue
+++ b/project/oms/apps/develop/AppDeployCustom/add.vue
@@ -113,20 +113,6 @@ export default {
         {prop: 'category', label: "分类", dict: "appsCategory"},
         {prop: 'name', label: "模块名"}
       ],
-      tabBar: {
-        color: "#666666",
-        selectedColor: "#197DF0",
-        backgroundColor: "#ffffff",
-        list: [
-          {pagePath: "pages/AppHome/AppHome", text: "首页", iconPath: "static/TabBar/home.png", selectedIconPath: "static/TabBar/home_selected.png"},
-          {pagePath: "pages/AppModules/AppModules", text: "应用", iconPath: "static/TabBar/service.png", selectedIconPath: "static/TabBar/service_selected.png"},
-          {
-            pagePath: "pages/AppEnteringVillage/AppEnteringVillage", text: "进村",
-            iconPath: "static/TabBar/custom.png", selectedIconPath: "static/TabBar/custom_selected.png"
-          },
-          {pagePath: "pages/AppMine/AppMine", text: "我的", iconPath: "static/TabBar/me.png", selectedIconPath: "static/TabBar/me_selected.png"}
-        ]
-      }
     }
   },
   methods: {
diff --git a/project/oms/apps/develop/AppDeployCustom/config/webConfig.vue b/project/oms/apps/develop/AppDeployCustom/config/webConfig.vue
index bbf2cccf..37f9a667 100644
--- a/project/oms/apps/develop/AppDeployCustom/config/webConfig.vue
+++ b/project/oms/apps/develop/AppDeployCustom/config/webConfig.vue
@@ -11,8 +11,8 @@ export default {
   },
   watch: {
     form: {
-      handler() {
-        this.$emit("input", this.form)
+      handler(v) {
+        this.$emit("input", v)
       },
       deep: true
     }
diff --git a/project/oms/apps/develop/AppDeployCustom/config/wxmpConfig.vue b/project/oms/apps/develop/AppDeployCustom/config/wxmpConfig.vue
index ce291cc8..0ec7afbc 100644
--- a/project/oms/apps/develop/AppDeployCustom/config/wxmpConfig.vue
+++ b/project/oms/apps/develop/AppDeployCustom/config/wxmpConfig.vue
@@ -22,8 +22,7 @@ export default {
     },
     tabBar: {
       deep: true, handler(v) {
-        this.tabBar.list = this.tabBar.list.filter(e => !!e.pagePath) || []
-        this.$set(this.form, "tabBar", v)
+        this.$emit("input", {...this.form, tabBar: {...v, list: v.list.filter(e => !!e.pagePath) || []}})
       }
     }
   },
@@ -52,8 +51,7 @@ export default {
     }
   },
   methods: {
-    handleTabbarChange(row, {id, name, label}) {
-      row.id = id
+    handleTabbarChange(row, {name, label}) {
       row.text = label
       row.pagePath = `pages/${name}/${name}`
     },