From 6285bc1e655710834e643755614730490ec06800 Mon Sep 17 00:00:00 2001
From: JS-LM <2497833386@QQ.com>
Date: Sat, 17 Jun 2023 13:27:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=BC=80=E7=A5=A8=E8=AF=A6=E6=83=85=E9=A1=B5=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=82=AE=E7=AE=B1=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/order/invoice/detail.vue |  1 +
 jsowell-ui/src/views/pile/merchant/index.vue  | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/jsowell-ui/src/views/order/invoice/detail.vue b/jsowell-ui/src/views/order/invoice/detail.vue
index 3862f60db..217b9fbc4 100644
--- a/jsowell-ui/src/views/order/invoice/detail.vue
+++ b/jsowell-ui/src/views/order/invoice/detail.vue
@@ -17,6 +17,7 @@
         <el-descriptions-item label="税号">{{ invoiceTitle.taxId }}</el-descriptions-item>
         <el-descriptions-item label="地址">{{ invoiceTitle.unitAddress }}</el-descriptions-item>
         <el-descriptions-item label="电话号码">{{ invoiceTitle.phoneNumber }}</el-descriptions-item>
+        <el-descriptions-item label="邮箱">{{ invoiceTitle.email }}</el-descriptions-item>
       </el-descriptions>
       <div class="marginTop"></div>
     </el-card>
diff --git a/jsowell-ui/src/views/pile/merchant/index.vue b/jsowell-ui/src/views/pile/merchant/index.vue
index 53cc7e1f0..51d80e4ae 100644
--- a/jsowell-ui/src/views/pile/merchant/index.vue
+++ b/jsowell-ui/src/views/pile/merchant/index.vue
@@ -129,7 +129,7 @@
                 align="center"
                 prop="servicePhone"
             />
-            <el-table-column label="logo" align="center" prop="logoUrl" >
+            <el-table-column label="公司logo" align="center" prop="logoUrl" >
               <template slot-scope="scope">
 <el-image style="width: 100px; height: 100px"
                 :src="scope.row.logoUrl"></el-image>
@@ -256,7 +256,7 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <el-form-item label="logo" prop="logoUrl">
+                <el-form-item label="公司logo" prop="logoUrl">
                     <el-upload
                         class="upload-demo"
                         :action="actionUrl"
@@ -273,7 +273,7 @@
                             >点击上传</el-button
                         >
                         <div slot="tip" class="el-upload__tip">
-                            只能上传jpg/png文件，且不超过500kb
+                            当前仅支持上传jpg/png格式
                         </div>
                     </el-upload>
                     <!-- <el-input v-model="form.logoUrl" placeholder="" /> -->
@@ -394,7 +394,7 @@ export default {
                     },
                 ],
                 logoUrl: [
-                    { required: true, message: "请输入logo", trigger: "blur" },
+                    { required: true, message: "请上传公司logo", trigger: "blur" },
                 ],
             },
         };
@@ -555,3 +555,8 @@ export default {
     },
 };
 </script>
+<style lang="scss" scoped>
+::v-deep .el-upload-list--picture .el-upload-list__item{
+width: 40% ;
+}
+</style>