From a7c688375667cf50ea85b20ed84c78b9679499dc Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Sat, 2 Jul 2022 09:59:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppMerchantManage/AppMerchantManage.vue   |  6 +--
 .../xicheng/AppMerchantManage/detail.vue      | 40 +++++++++++++++++--
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/project/xicheng/AppMerchantManage/AppMerchantManage.vue b/src/project/xicheng/AppMerchantManage/AppMerchantManage.vue
index 4377f9cc..ea76be78 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" @search="current=1,getList()"/>
+      <u-search placeholder="请输入姓名、手机号、店面" :show-action="false" v-model="keyword" confirm-type="search" @search="current = 1, getList()"/>
     </AiTopFixed>
     <div class="list">
       <div class="item" v-for="item in list" :key="item.id" @click="linkTo('./detail?id=' + item.id)">
@@ -61,13 +61,13 @@
 
     methods: {
       getList() {
-        if (this.current > this.pages) return
+        if (this.current > this.pages && this.current !== 1) return
 
         this.$http.post('/app/appcompany/list', null, {
           params: {
             size: 10,
             current: this.current,
-            con: this.keyword,
+            businessName: this.keyword
           },
         }).then((res) => {
           if (res.code == 0) {
diff --git a/src/project/xicheng/AppMerchantManage/detail.vue b/src/project/xicheng/AppMerchantManage/detail.vue
index 6f7d9aaa..74618b2c 100644
--- a/src/project/xicheng/AppMerchantManage/detail.vue
+++ b/src/project/xicheng/AppMerchantManage/detail.vue
@@ -18,7 +18,7 @@
       </div>
       <div class="info">
         <span>电话</span>
-        <span class="color-3D94FB">{{ info.telephone }}</span>
+        <span class="color-3D94FB" @click="call(info.telephone)">{{ info.telephone }}</span>
       </div>
       <div class="info">
         <span>身份证</span>
@@ -28,18 +28,18 @@
         <div class="info">
           <span>门店照片</span>
         </div>
-        <image v-if="info.storePicUrl" :src="info.storePicUrl" mode="widthFix" />
+        <image v-if="info.storePicUrl" :src="info.storePicUrl" mode="aspectFill" @click="preview(info.storePicUrl)" />
       </div>
       <div class="info">
         <span>地图</span>
-        <span class="color-3D94FB">定位</span>
+        <span class="color-3D94FB" @click="openLocation">定位</span>
       </div>
     </div>
     <div class="content" v-if="info.detailList.length">
       <div class="title">店员信息</div>
       <div class="info" v-for="(item, index) in info.detailList" :key="index">
         <span>{{ item.userName }}</span>
-        <span class="color-3D94FB">{{ item.userPhone }}</span>
+        <span class="color-3D94FB" @click="call(item.userPhone)">{{ item.userPhone }}</span>
       </div>
     </div>
     <AiGap h="112"/>
@@ -90,6 +90,33 @@
         uni.navigateTo({
           url
         })
+      },
+
+      call (phone) {
+        uni.makePhoneCall({
+          phoneNumber: '114'
+        })
+      },
+
+      openLocation () {
+        if (!this.info.lat) {
+          return this.$u.toast('未设置定位')
+        }
+
+        uni.openLocation({
+          latitude: this.info.lat,
+          longitude: this.info.lon,
+          success: function () {
+            console.log('success');
+          }
+        })
+      },
+
+      preview (url) {
+        uni.previewImage({
+          urls: [url],
+          current: url
+        })
       }
     }
   }
@@ -163,11 +190,16 @@
       }
       .color-3D94FB{
         color: #3D94FB;
+
+        &:active {
+          opacity: 0.6;
+        }
       }
     }
     .img-list{
       image {
         width: 100%;
+        height: 320px;
       }
     }
   }