From 48a01ef1da31ef4f073344cbffd644161610c5a1 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 1 Jul 2022 15:11:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppMerchantManage/AppMerchantManage.vue   | 34 +++++++++++++++++++
 src/project/xicheng/AppMerchantManage/add.vue | 33 ++++++++++++++++++
 .../xicheng/AppMerchantManage/addClerk.vue    | 33 ++++++++++++++++++
 .../xicheng/AppMerchantMap/AppMerchantMap.vue |  2 +-
 4 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 src/project/xicheng/AppMerchantManage/addClerk.vue

diff --git a/src/project/xicheng/AppMerchantManage/AppMerchantManage.vue b/src/project/xicheng/AppMerchantManage/AppMerchantManage.vue
index e69de29b..4682bb39 100644
--- a/src/project/xicheng/AppMerchantManage/AppMerchantManage.vue
+++ b/src/project/xicheng/AppMerchantManage/AppMerchantManage.vue
@@ -0,0 +1,34 @@
+<template>
+  <div class="AppMerchantManage">
+    
+  </div>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: 'AppMerchantManage',
+  appName: '商户管理',
+  data() {
+    return {
+      
+    }
+  },
+  computed: {...mapState(['user'])},
+  created() {
+
+  },
+  onShow() {
+    document.title = "商户管理"
+  },
+  methods: {
+    
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppMerchantManage {
+}
+</style>
diff --git a/src/project/xicheng/AppMerchantManage/add.vue b/src/project/xicheng/AppMerchantManage/add.vue
index e69de29b..a9ef3cf4 100644
--- a/src/project/xicheng/AppMerchantManage/add.vue
+++ b/src/project/xicheng/AppMerchantManage/add.vue
@@ -0,0 +1,33 @@
+<template>
+  <div class="add">
+    
+  </div>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: 'add',
+  data() {
+    return {
+      
+    }
+  },
+  computed: {...mapState(['user'])},
+  created() {
+
+  },
+  onShow() {
+    document.title = "商户管理"
+  },
+  methods: {
+    
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.add {
+}
+</style>
diff --git a/src/project/xicheng/AppMerchantManage/addClerk.vue b/src/project/xicheng/AppMerchantManage/addClerk.vue
new file mode 100644
index 00000000..c093802e
--- /dev/null
+++ b/src/project/xicheng/AppMerchantManage/addClerk.vue
@@ -0,0 +1,33 @@
+<template>
+  <div class="addClerk">
+    
+  </div>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: 'addClerk',
+  data() {
+    return {
+      
+    }
+  },
+  computed: {...mapState(['user'])},
+  created() {
+
+  },
+  onShow() {
+    document.title = "商户管理"
+  },
+  methods: {
+    
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.addClerk {
+}
+</style>
diff --git a/src/project/xicheng/AppMerchantMap/AppMerchantMap.vue b/src/project/xicheng/AppMerchantMap/AppMerchantMap.vue
index 3c0db60b..65f473b4 100644
--- a/src/project/xicheng/AppMerchantMap/AppMerchantMap.vue
+++ b/src/project/xicheng/AppMerchantMap/AppMerchantMap.vue
@@ -245,7 +245,7 @@ uni-page-body{
 
   .map-content {
     width: 100%;
-    height: calc(100% - 210px);
+    height: calc(100% - 110px);
   }
 
   .popup {