From e992c9cdfd3f5ad878f7256a6866eceb5cae4f34 Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Wed, 19 Jul 2023 11:20:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=95=86=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B=E5=A4=A7=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/router/index.js               | 14 ++--
 jsowell-ui/src/views/pile/merchant/index.vue | 80 ++++++++++++--------
 2 files changed, 57 insertions(+), 37 deletions(-)

diff --git a/jsowell-ui/src/router/index.js b/jsowell-ui/src/router/index.js
index 481c601c0..0492be725 100644
--- a/jsowell-ui/src/router/index.js
+++ b/jsowell-ui/src/router/index.js
@@ -166,32 +166,32 @@ export const constantRoutes = [
       },
     ],
   },
-   {
+  {
     path: "/financial/merchant",
     component: Layout,
-     hidden: true,
+    hidden: true,
     children: [
       {
         path: "merchantVirtual",
         component: () => import("@/views/financial/components/virtualFinance"),
         name: "merchantVirtual",
-        meta: { title: "虚拟财务",activeMenu: "/financial/merchant"},
+        meta: { title: "虚拟财务", activeMenu: "/financial/merchant" },
       },
     ],
   },
   {
-       path: "/financial/merchant",
+    path: "/financial/merchant",
     component: Layout,
-     hidden: true,
+    hidden: true,
     children: [
       {
         path: "cleanFinancial",
         component: () => import("@/views/financial/components/cleanFinancial"),
         name: "cleanFinancial",
-        meta: { title: "清分财务",activeMenu: "/financial/merchant"},
+        meta: { title: "清分财务", activeMenu: "/financial/merchant" },
       },
     ],
-   }
+  }
 ];
 
 // 动态路由，基于用户权限动态去加载
diff --git a/jsowell-ui/src/views/pile/merchant/index.vue b/jsowell-ui/src/views/pile/merchant/index.vue
index 4f04f2cbb..dcf8ab24a 100644
--- a/jsowell-ui/src/views/pile/merchant/index.vue
+++ b/jsowell-ui/src/views/pile/merchant/index.vue
@@ -129,12 +129,15 @@
                 align="center"
                 prop="servicePhone"
             />
-            <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>
-              </template>
-
+            <el-table-column label="公司logo" align="center" prop="logoUrl">
+                <template slot-scope="scope">
+                    <el-image
+                        style="width: 100px; height: 100px"
+                        :src="scope.row.logoUrl"
+                        :preview-src-list="[scope.row.logoUrl]"
+                        fit="fill"
+                    ></el-image>
+                </template>
             </el-table-column>
             <el-table-column
                 label="操作"
@@ -207,11 +210,8 @@
                     </el-col>
                 </el-row>
                 <el-form-item label="地址" prop="address">
-                            <el-input
-                                v-model="form.address"
-                                placeholder="请输入地址"
-                            />
-                        </el-form-item>
+                    <el-input v-model="form.address" placeholder="请输入地址" />
+                </el-form-item>
                 <!-- <el-row>
                     <el-col span="24">
 
@@ -280,21 +280,29 @@
                 </el-form-item>
 
                 <el-row>
-                    <el-divider>填入运营商管理员账号和密码，则自动创建一个该运营商的管理员账号</el-divider>
+                    <el-divider
+                        >填入运营商管理员账号和密码，则自动创建一个该运营商的管理员账号</el-divider
+                    >
                     <el-col :span="12">
                         <el-form-item label="运营商管理员账号" prop="userName">
-                            <el-input v-model="form.userName" placeholder="请输入运营商管理员账号"/>
+                            <el-input
+                                v-model="form.userName"
+                                placeholder="请输入运营商管理员账号"
+                            />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="运营商管理员密码" prop="password">
-                            <el-input v-model="form.password" placeholder="请输入运营商管理员密码"/>
+                            <el-input
+                                v-model="form.password"
+                                placeholder="请输入运营商管理员密码"
+                            />
                         </el-form-item>
                     </el-col>
                 </el-row>
-             </el-form>
+            </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitForm" >确 定</el-button>
+                <el-button type="primary" @click="submitForm">确 定</el-button>
                 <el-button @click="cancel">取 消</el-button>
             </div>
         </el-dialog>
@@ -363,14 +371,19 @@ export default {
                         message: "请输入运营商名称",
                         trigger: "blur",
                     },
-                    { min: 1, max: 35, message: '长度在 1 到 35 个字符', trigger: 'blur' }
+                    {
+                        min: 1,
+                        max: 35,
+                        message: "长度在 1 到 35 个字符",
+                        trigger: "blur",
+                    },
                 ],
                 organizationCode: [
                     {
                         required: true,
                         message: "请输入组织机构代码",
                         trigger: "blur",
-                    }
+                    },
                 ],
                 address: [
                     { required: true, message: "请输入地址", trigger: "blur" },
@@ -397,7 +410,11 @@ export default {
                     },
                 ],
                 logoUrl: [
-                    { required: true, message: "请上传公司logo", trigger: "blur" },
+                    {
+                        required: true,
+                        message: "请上传公司logo",
+                        trigger: "blur",
+                    },
                 ],
             },
         };
@@ -407,9 +424,9 @@ export default {
     },
     methods: {
         checkPermi,
-        closeBefore(){
-          this.open = false
-          this.fileList = []
+        closeBefore() {
+            this.open = false;
+            this.fileList = [];
         },
         handleExceed(files, fileList) {
             this.$message.warning(
@@ -423,7 +440,7 @@ export default {
             console.log("图片上传成功 url：", this.imageUrl);
             console.log("图片上传成功 res：", res);
             this.fileList.push({ url: res.url });
-            this.form.logoUrl = res.url
+            this.form.logoUrl = res.url;
         },
         handleRemove(file, fileList) {
             console.log("移除图片", file, fileList);
@@ -443,7 +460,10 @@ export default {
             this.loading = true;
             listMerchant(this.queryParams).then((response) => {
                 this.merchantList = response.rows;
-                  console.log('this.merchantList',this.merchantList)
+                // console.log(response.rows[0].logoUrl,222222222);
+                // this.srcList=response.rows[0].logoUrl;
+                // console.log(this.srcList,222222222);
+                console.log("this.merchantList", this.merchantList);
                 this.total = response.total;
                 this.loading = false;
             });
@@ -451,7 +471,7 @@ export default {
         // 取消按钮
         cancel() {
             this.open = false;
-            this.fileList = []
+            this.fileList = [];
             this.reset();
         },
         // 表单重置
@@ -498,8 +518,8 @@ export default {
         },
         /** 修改按钮操作 */
         handleUpdate(row) {
-            this.fileList = []
-             this.fileList.push({"url": row.logoUrl});
+            this.fileList = [];
+            this.fileList.push({ url: row.logoUrl });
             this.reset();
             const id = row.id || this.ids;
             getMerchant(id).then((response) => {
@@ -510,7 +530,7 @@ export default {
         },
         /** 提交按钮 */
         submitForm() {
-          console.log('this.form',this.form,this.form.logoUrl )
+            console.log("this.form", this.form, this.form.logoUrl);
             this.$refs["form"].validate((valid) => {
                 if (valid) {
                     if (this.form.id != null) {
@@ -559,7 +579,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::v-deep .el-upload-list--picture .el-upload-list__item{
-width: 40% ;
+::v-deep .el-upload-list--picture .el-upload-list__item {
+    width: 40%;
 }
 </style>