From dd529edac9bea827f380b54e3e63e745d6ceff5d Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Sat, 2 Jul 2022 18:51:25 +0800
Subject: [PATCH] bug

---
 .../xicheng/AppMerchantManage/AppMerchantManage.vue   | 11 ++++++-----
 src/project/xicheng/AppMerchantMap/AppMerchantMap.vue |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/project/xicheng/AppMerchantManage/AppMerchantManage.vue b/src/project/xicheng/AppMerchantManage/AppMerchantManage.vue
index d41811ad..d8f2c374 100644
--- a/src/project/xicheng/AppMerchantManage/AppMerchantManage.vue
+++ b/src/project/xicheng/AppMerchantManage/AppMerchantManage.vue
@@ -17,7 +17,7 @@
         <div class="title">
           <img :src="$cdn + 'xincheng/icon.png'" alt="">
           <p>{{ item.businessName }}</p>
-          <span>店员 ({{ item.detailList ? item.detailList.length : 0 }}) </span>
+          <span>店员 ({{ item.userCount }}) </span>
         </div>
         <div class="info">
           <img :src="$cdn + 'xincheng/dh.png'" alt="">
@@ -27,10 +27,11 @@
           <img :src="$cdn + 'xincheng/dz@2x.png'" alt="">
           <div>{{ item.businessAddress }}</div>
         </div>
-        <!-- <div class="info" style="margin-bottom: 0;">
+        <div class="info" style="margin-bottom: 0;">
           <img :src="$cdn + 'xincheng/wgz@2x.png'" alt="">
-          <div>李毅-网格长</div>
-        </div> -->
+          <div v-if="item.girdUserName">{{ item.girdUserName }}-{{ item.girdUserType }}</div>
+          <div v-else>未绑定网格员</div>
+        </div>
 		  </u-swipe-action>
       <AiEmpty v-if="!list.length"></AiEmpty>
     </div>
@@ -82,7 +83,7 @@
       getList () {
         if (this.current > this.pages && this.current !== 1) return
 
-        this.$http.post('/app/appcompany/list', null, {
+        this.$http.post('/app/appcompany/getPageWithGird', null, {
           params: {
             size: 10,
             current: this.current,
diff --git a/src/project/xicheng/AppMerchantMap/AppMerchantMap.vue b/src/project/xicheng/AppMerchantMap/AppMerchantMap.vue
index 69b1e866..53fd2d09 100644
--- a/src/project/xicheng/AppMerchantMap/AppMerchantMap.vue
+++ b/src/project/xicheng/AppMerchantMap/AppMerchantMap.vue
@@ -2,7 +2,7 @@
   <div class="AppMerchantMap">
     <div class="search">
       <image :src="$cdn + 'xincheng/search.png'" />
-      <input placeholder="请输入姓名、店名、电话" v-model="businessName" @input="getList(true)">
+      <input placeholder="请输入店主姓名、店名" v-model="businessName" @input="getList(true)">
     </div>
     <div class="search-list" v-if="isShow">
       <div class="item border" v-for="(item, index) in list" :key="index" @click="toDetail(item)">