Merge branch '20120518-daili' into dev

zhaoxiaoqiang

2021-05-17 af0d8cd16a8292959ee47f875b6fda4c71dcf62f

 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>
@@ -148,6 +149,15 @@
            goMerDetail(merId){
                this.$router.push({
                    path:'/mine/mer-info',
                    query:{
                        merId
                    }
                })
            },
            //跳转到模板详情
            goStoreMer(merId){
                this.$router.push({
                    path:'/mine/stores',
                    query:{
                        merId
                    }
@@ -274,7 +284,7 @@

        .name {
            font-weight: bold;
            max-width: 170px;
            max-width: 120px;
        }

        .tel {
@@ -285,6 +295,7 @@

        .btn {
            .lh(25px);
            margin-right: 0px;
            padding: 0 12px;
            background: @c-bg-default;
            border-radius: 13px;