From cfd594072d3e5cd799bf6a9f2fd9cdeb3fce6251 Mon Sep 17 00:00:00 2001
From: ly19960718 <1622779752@qq.com>
Date: Mon, 22 Mar 2021 17:53:45 +0800
Subject: [PATCH] Merge branch 'main' of D:\CF_work\ideaWorkSpace\business-card
 with conflicts.

---
 src/main/resources/application.yml             | 13 ++-----------
 src/main/resources/static/route/shop/list.html | 10 ++++++++--
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a70e400..acbcb91 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,11 +1,6 @@
 server:
-<<<<<<< HEAD
-  port: 8090
-  url: http://127.0.0.1:8090/businesscard
-=======
-  port: 8088
-  url: http://192.168.0.111:8088/businesscard
->>>>>>> 5a94052e7f98f2f26229a8ea58ceffc20b2b0ed6
+  port: 8080
+  url: http://127.0.0.1:8080/businesscard
   system-title: 名片管理系统
   system-sub-title: 名片系统
   servlet:
@@ -34,11 +29,7 @@ spring:
       db-type: mysql
       driver-class-name: com.mysql.cj.jdbc.Driver
       username: root
-<<<<<<< HEAD
-      password: admin
-=======
       password: 123456
->>>>>>> 5a94052e7f98f2f26229a8ea58ceffc20b2b0ed6
       initial-size: 2
       min-idle: 2
       max-active: 10
diff --git a/src/main/resources/static/route/shop/list.html b/src/main/resources/static/route/shop/list.html
index 8cc1ad4..b29060c 100644
--- a/src/main/resources/static/route/shop/list.html
+++ b/src/main/resources/static/route/shop/list.html
@@ -81,7 +81,7 @@
                         {field: 'shopLogo', width: 180, title: '店铺LOGO', align:'center',
                             templet: function(row) {
                                 var rowData = row[this.field];
-                                return  '<div id="imgShow"><img src="route/file/download/true/'+rowData+'"></div>';
+                                return  '<div class="imgShow"><img style="height: 30px;width: 30px;" src="route/file/download/true/'+rowData+'"></div>';
                             }
                         },
                         {field: 'shopName', width: 180, title: '店铺名称', align:'center',
@@ -135,7 +135,6 @@
                         {field: 'isCertification', width: 180, title: '是否认证', align:'center',
                             templet: function(row) {
                                 var rowData = row[this.field];
-                                console.log(rowData)
                                 if(rowData == 0){
                                     return "未认证";
                                 }
@@ -155,6 +154,8 @@
                     'count': data.total,
                     'data': data.rows
                 };
+            },done:function(){
+
             }
         });
         }
@@ -220,6 +221,11 @@
         $(document).on('click', '#search', function() {
             reloadTable(1);
         });
+
+        $(document).on('click', '.imgShow', function() {
+
+        });
+
         // 事件 - 增删改
         table.on('toolbar(dataTable)', function(obj) {
             var layEvent = obj.event;