Merge branch '20120518-daili' into dev

zhaoxiaoqiang

2021-05-17 af0d8cd16a8292959ee47f875b6fda4c71dcf62f

 src/views/mine/stores/stores.vue

@@ -5,7 +5,6 @@
-->
<template>
  <div class="stores-box h-100-g">

    <v-navbar title="门店管理" fixed></v-navbar>
    <van-search class="search" placeholder="请输入门店名称/负责人姓名/负责人手机号" v-model="value" shape='round' @search="onSearch"/>
    <div class="item-box">
@@ -32,7 +31,7 @@
      </van-list>
    </div>

    <van-button class="btn" @click="$router.push('/mine/stores-add')">
    <van-button class="btn" @click="$router.push(`/mine/stores-add?merId=${merId}`)">
      <div class="inner">
        <van-icon name="plus"/>
        <span class="text">新增</span>
@@ -83,17 +82,14 @@
          }
        })
      },

        //跳转到模板详情
        goStoreOprs(merId){
            this.$router.push({
                path:'/mine/storesOprs',
                query:{
                    storeId:this.storeId
                }
            })
        },

      goStoreOprs(storeId){
          this.$router.push({
              path:'/mine/storesOprs',
              query:{
                  storeId:storeId
              }
          })
      },
      go(id) {
        this.$router.push({path:'/mine/stores-detail',query:{storeId:id}});
      },
@@ -188,6 +184,9 @@
        margin-bottom: 5px;
        font-weight: bold;
        width:200px;
        overflow: hidden;
        white-space: nowrap;
        text-overflow: ellipsis;
      }

      .opr-btn {