From 0593ad11f0ecb8d2d9619c700c40dae3b7f9be48 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Tue, 6 Feb 2024 16:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E9=9D=9E=E6=99=AE?=
 =?UTF-8?q?=E9=80=9A=E5=95=86=E6=88=B7=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E7=94=A8=E6=88=B7=E4=B8=BA=E5=91=98=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/userList/index.vue                  | 13 +++++++++----
 src/views/systemForm/setSystem/modifyStoreInfo.vue |  6 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/components/userList/index.vue b/src/components/userList/index.vue
index d6d5765..4f392d0 100644
--- a/src/components/userList/index.vue
+++ b/src/components/userList/index.vue
@@ -5,11 +5,12 @@
       <div slot="header" class="clearfix">
         <el-form inline size="small">
           <el-form-item>
-            <el-input v-model="tableFrom.nickname" placeholder="请输入用户名称"class="selWidth" @keyup.enter.native="getList(1)">
+            <el-input v-model="tableFrom.uid" placeholder="请输入用户UID" class="selWidth" />
+            <el-input v-model="tableFrom.nickname" placeholder="请输入用户名称" class="selWidth" @keyup.enter.native="getList(1)">
               <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="getList(1)" />
             </el-input>
           </el-form-item>
-          <el-form-item>
+          <el-form-item v-if="config.merchant_type == 0">
             <span style="font-size: 12px;color: #C0C4CC;">注：将用户添加为员工时,请确保用户先关注本店铺</span>
           </el-form-item>
         </el-form>
@@ -97,7 +98,8 @@ export default {
       tableFrom: {
         page: 1,
         limit: 20,
-        nickname: ''
+        nickname: '',
+        uid: ''
       }
     }
   },
@@ -141,5 +143,8 @@ export default {
 </script>
 
 <style scoped>
-
+.selWidth{
+  width: 300px!important;
+  margin-bottom: 10px!important;
+}
 </style>
diff --git a/src/views/systemForm/setSystem/modifyStoreInfo.vue b/src/views/systemForm/setSystem/modifyStoreInfo.vue
index 017794c..b4eeb95 100644
--- a/src/views/systemForm/setSystem/modifyStoreInfo.vue
+++ b/src/views/systemForm/setSystem/modifyStoreInfo.vue
@@ -13,7 +13,7 @@
           <span class="basic-label">商户负责人手机号：</span>
            {{ merData.mer_phone }}
         </div>
-        <div v-if="merData.merchantCategory.category_name" class="basic-information">
+        <div v-if="merData.merchantCategory" class="basic-information">
           <span class="basic-label">商户分类：</span>
            {{ merData.merchantCategory.category_name || "" }}
         </div>
@@ -21,7 +21,7 @@
           <span class="basic-label"> 商户类型：</span>
           {{ merData.merchantType.type_name }}
         </div>
-        <div v-if="merData.merchantCategory.category_name" class="basic-information">
+        <div v-if="merData.merchantCategory" class="basic-information">
           <span class="basic-label"> 商户类别：</span>
           {{ merData.is_trader ? "自营" : "非自营" }}
         </div>
@@ -352,7 +352,7 @@
         </div>
       </div>
       <div v-if="infoType == '3'" class="user-msg">
-        <div class="basic-information">
+        <div class="basic-information" v-if="merData.merchantCategory">
           <span class="basic-label"> 商户手续费：</span>
           {{ Number(merData.commission_rate) > 0 ? (parseFloat(merData.commission_rate)).toFixed(2) : (parseFloat(merData.merchantCategory.commission_rate * 100)).toFixed(2)}}%
         </div>