From 5e9ac097a04fa5abe23bf147b0876e806e776426 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 17 Nov 2023 18:10:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E5=93=81=E7=89=8C?=
 =?UTF-8?q?=E5=A5=BD=E5=BA=97=20-=20=E9=A3=8E=E6=A0=BC=E4=B8=89=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/mobilePage/home_shop.vue       | 10 ++++------
 .../merchant/list/handle/merEditForm.vue      | 20 ++++++++++++++-----
 src/views/merchant/list/handle/merInfo.vue    |  8 ++++++++
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/components/mobilePage/home_shop.vue b/src/components/mobilePage/home_shop.vue
index bcd58c4..f3cadfb 100644
--- a/src/components/mobilePage/home_shop.vue
+++ b/src/components/mobilePage/home_shop.vue
@@ -37,11 +37,7 @@
       </div>
       <!-- 风格三 -->
       <div class="mobile-page mobile-page-style-3" v-if="isOne == 2">
-        <div
-          class="home-shop shop-block"
-          v-for="(item, index) in shopList" :key="index"
-          :style="{borderRadius:(bgStyle == 1 ? '8px' : '')}"
-        >
+        <div class="home-shop shop-block" v-for="(item, index) in shopList" :key="index" :style="{borderRadius:(bgStyle == 1 ? '8px' : '')}">
           <div class="shop-block-top">
             <div class="image">
               <img class="store-avatar" src="@/assets/images/store_avatar.png">
@@ -106,6 +102,7 @@
           </div>
         </div>
       </div>
+      <!-- 统一底部 -->
       <div class="shop-more">更多店铺<span class="iconfont iconjinru"></span></div>
     </div>
   </div>
@@ -571,10 +568,11 @@ export default {
       .store-desc{
         padding-left: 10px;
         width: calc(100% - var(--store-avatar-size-));
+        height: var(--store-avatar-size-);
         display: inline-flex;
         flex-direction: column;
         flex-wrap: nowrap;
-        justify-content: center;
+        justify-content: space-evenly;
         align-items: flex-start;
 
         .store-name{
diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index e8facb5..f206832 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -124,6 +124,20 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="人均消费额：" prop="avg_consumption">
+                <el-input type="number" v-model="merData.avg_consumption" placeholder="请填写人均消费额" class="selWidth" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="商户标签：" prop="mer_label">
+                <el-input type="textarea" v-model="merData.mer_label" placeholder="请填写商户标签，多个以逗号隔开!" class="selWidth" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </div>
       </el-tab-pane>
       <el-tab-pane label="经营信息" name="operate">
@@ -218,11 +232,7 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="商户关键字：" prop="mer_keyword">
-                  <el-input
-                    v-model="merData.mer_keyword"
-                    placeholder="请填写商户关键字"
-                    class="selWidth"
-                  />
+                  <el-input v-model="merData.mer_keyword" placeholder="请填写商户关键字" class="selWidth" />
                 </el-form-item>
               </el-col>
            </el-row>
diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue
index 29fb272..eb89446 100644
--- a/src/views/merchant/list/handle/merInfo.vue
+++ b/src/views/merchant/list/handle/merInfo.vue
@@ -46,6 +46,14 @@
               <div>备注：</div>
               <div class="value">{{merData.mark}}</div>
             </li>
+            <li class="item">
+              <div>人均消费额：</div>
+              <div class="value">{{merData.avg_consumption}}</div>
+            </li>
+            <li class="item">
+              <div>商户标签：</div>
+              <div class="value">{{merData.mer_label}}</div>
+            </li>
           </ul>
         </div>
       </el-tab-pane>