From 16c74333618928beaf61c6765dfb9a1c0c49aae9 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Sat, 2 Jul 2022 16:58:20 +0800
Subject: [PATCH] bug

---
 src/project/xicheng/AppMerchanGird/AddMerchan.vue |  2 +-
 .../AppMerchantManage/AppMerchantManage.vue       |  7 ++++---
 src/project/xicheng/AppMerchantManage/add.vue     |  4 ++--
 src/project/xicheng/AppMerchantManage/detail.vue  | 15 ++++++---------
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/project/xicheng/AppMerchanGird/AddMerchan.vue b/src/project/xicheng/AppMerchanGird/AddMerchan.vue
index b345b4c9..76382b99 100644
--- a/src/project/xicheng/AppMerchanGird/AddMerchan.vue
+++ b/src/project/xicheng/AppMerchanGird/AddMerchan.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="AddMerchan">
     <AiTopFixed>
-      <u-search placeholder="请输入店名、店主、电话" :show-action="false" v-model="businessName" confirm-type="search" @search="current = 1, getList()"/>
+      <u-search placeholder="请输入店名、店主、电话" :show-action="false" v-model="businessName" confirm-type="search" @clear="current = 1, getList()" @search="current = 1, getList()"/>
     </AiTopFixed>
     <div class="userList" v-if="list.length">
       <ul v-for="(item,index) in list" :key="index">
diff --git a/src/project/xicheng/AppMerchantManage/AppMerchantManage.vue b/src/project/xicheng/AppMerchantManage/AppMerchantManage.vue
index aff86ba5..68e63cd1 100644
--- a/src/project/xicheng/AppMerchantManage/AppMerchantManage.vue
+++ b/src/project/xicheng/AppMerchantManage/AppMerchantManage.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="AppMerchantManage">
     <AiTopFixed>
-      <u-search placeholder="请输入姓名、手机号、店面" :show-action="false" v-model="keyword" confirm-type="search" @search="current = 1, getList()"/>
+      <u-search placeholder="请输入姓名、手机号、店名" :show-action="false" v-model="keyword" confirm-type="search" @clear="current = 1, getList()" @search="current = 1, getList()"/>
     </AiTopFixed>
     <div class="list">
       <u-swipe-action
@@ -168,6 +168,8 @@
         // background: #eee;
       }
       .title{
+        display: flex;
+        align-items: center;
         margin-bottom: 38px;
         img{
           width: 72px;
@@ -177,12 +179,11 @@
         }
         p{
           display: inline-block;
+          line-height: 1.3;
           width: 400px;
           font-size: 32px;
-          font-family: PingFangSC-Medium, PingFang SC;
           font-weight: 500;
           color: #000;
-          line-height: 32px;
         }
         span{
           display: inline-block;
diff --git a/src/project/xicheng/AppMerchantManage/add.vue b/src/project/xicheng/AppMerchantManage/add.vue
index 5a5d869f..e47323fb 100644
--- a/src/project/xicheng/AppMerchantManage/add.vue
+++ b/src/project/xicheng/AppMerchantManage/add.vue
@@ -59,7 +59,7 @@
       <span class="tips"></span>
       <div class="border">
         <span class="label">地图标注</span>
-        <span class="value" style="color:#3D94FB;" @click="chooseLocation">{{ form.businessAddress || '地图标绘' }}</span>
+        <span class="value" style="color:#3D94FB;" @click="chooseLocation">{{ form.lat ? '已标绘' : '地图标绘' }}</span>
       </div>
     </div>
     <AiGap h="112"/>
@@ -95,7 +95,7 @@
     computed: {...mapState(['user'])},
 
     onLoad (query) {
-      if (query) {
+      if (query.id) {
         this.id = query.id
         this.getInfo()
       }
diff --git a/src/project/xicheng/AppMerchantManage/detail.vue b/src/project/xicheng/AppMerchantManage/detail.vue
index 241f21c9..e766fce8 100644
--- a/src/project/xicheng/AppMerchantManage/detail.vue
+++ b/src/project/xicheng/AppMerchantManage/detail.vue
@@ -3,10 +3,10 @@
     <div class="header">
       <img :src="$cdn + 'xincheng/icon.png'" alt="" class="logo-img">
       <div class="text-info">
-        <p>{{ info.bossName }}</p>
+        <p>{{ info.businessName }}</p>
         <div>
           <img :src="$cdn + 'xincheng/dw.png'" alt="" class="local-icon">
-          <span>{{ info.businessName }}</span>
+          <span>{{ info.businessAddress }}</span>
         </div>
       </div>
     </div>
@@ -14,7 +14,7 @@
       <div class="title">基础信息</div>
       <div class="info">
         <span>店主</span>
-        <span class="color-333">{{ info.businessName }}</span>
+        <span class="color-333">{{ info.bossName }}</span>
       </div>
       <div class="info">
         <span>电话</span>
@@ -32,7 +32,7 @@
       </div>
       <div class="info">
         <span>地图</span>
-        <span class="color-3D94FB" @click="openLocation">{{ info.businessAddress }}</span>
+        <span class="color-3D94FB" @click="openLocation">{{ info.lng ? '已定位' : '未定位' }}</span>
       </div>
     </div>
     <div class="content" v-if="info.detailList.length">
@@ -100,15 +100,12 @@
 
       openLocation () {
         if (!this.info.lat) {
-          return this.$u.toast('未设置定位')
+          return false
         }
 
         uni.openLocation({
           latitude: this.info.lat,
-          longitude: this.info.lng,
-          success: function () {
-            console.log('success');
-          }
+          longitude: this.info.lng
         })
       },