From b68359eceae3ce3060e7733586501f1b9a82c42e Mon Sep 17 00:00:00 2001
From: zhouhao <787329763@qq.com>
Date: Thu, 04 Nov 2021 18:20:15 +0800
Subject: [PATCH] 解决商户查询问题

---
 src/views/mine/mer/mer-manager.vue |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/views/mine/mer/mer-manager.vue b/src/views/mine/mer/mer-manager.vue
index ecb29ca..522115b 100644
--- a/src/views/mine/mer/mer-manager.vue
+++ b/src/views/mine/mer/mer-manager.vue
@@ -28,12 +28,13 @@
                                     <use xlink:href="#iconshanghuguanliliebiao"></use>
                                 </svg>
                             </div>
-                            <div>
+                            <div style="width:120px">
                                 <p class="name" v-text="item.merName">商户名称</p>
                                 <p class="tel" v-text="item.priMblNo">未配置产品</p>
                                 <p class="tel" v-text="item.hbStatusName"></p>
                             </div>
                         </div>
+                        <van-button :style="{background:$store.state.backColor}" class="btn" @click.stop="goStoreMer(item.merId)" v-if="orgType != 2">门店管理</van-button>
                         <van-button :style="{background:$store.state.backColor}" class="btn" @click.stop="goTempDetail(item.merId)" v-if="orgType != 2">产品管理</van-button>
                     </div>
                 </div>
@@ -121,6 +122,10 @@
                 }).then(res=>{
                     this.list = res.body
                 })
+                if(this.value==''){
+                      this.loading = false
+                        this.finished = false
+                }
             },
             saleOrderLoad(params={}){
                 if(this.chanId){
@@ -154,6 +159,15 @@
                 })
             },
             //跳转到模板详情
+            goStoreMer(merId){
+                this.$router.push({
+                    path:'/mine/stores',
+                    query:{
+                        merId
+                    }
+                })
+            },
+            //跳转到模板详情
             goTempDetail(merId){
                 this.$router.push({
                     path:'/template/detail',
@@ -180,7 +194,6 @@
                     let list = res.body || [];
                     this.parseArea(list)
                     this.areaList = calcAreaTwo(this.Area)
-                    console.log(this.areaList)
                 });
             },
             merInit(){
@@ -274,7 +287,7 @@
 
         .name {
             font-weight: bold;
-            max-width: 170px;
+            max-width: 120px;
         }
 
         .tel {
@@ -285,6 +298,7 @@
 
         .btn {
             .lh(25px);
+            margin-right: 0px;
             padding: 0 12px;
             background: @c-bg-default;
             border-radius: 13px;

--
Gitblit v1.8.0