From 79aa55a42ce99e4341df537f9cd27a08678cc11b Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Sat, 6 Mar 2021 23:49:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E7=82=B9=E7=B1=BB=E5=9E=8B=EF=BC=8C?=
 =?UTF-8?q?=E8=87=AA=E6=8F=90=E7=82=B9=E6=96=B0=E5=A2=9Elogo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Site.php         |  1 +
 .../view/default/site/sitetype/index.html     | 32 +++++++++++++++----
 application/service/ConfigService.php         |  7 ++++
 public/static/admin/default/css/site.css      |  6 ++++
 public/static/admin/default/js/site.js        | 16 +++++++++-
 5 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/application/admin/controller/Site.php b/application/admin/controller/Site.php
index 06b4f57b0..512d95993 100755
--- a/application/admin/controller/Site.php
+++ b/application/admin/controller/Site.php
@@ -311,6 +311,7 @@ class Site extends Common
 					foreach($address as $k=>$v)
 					{
 						$address[$k]['id'] = $k;
+						$address[$k]['logo'] = ResourcesService::AttachmentPathHandle($v['logo']);
 					}
 					$params['common_self_extraction_address'] = json_encode($address, JSON_UNESCAPED_UNICODE);
 				}
diff --git a/application/admin/view/default/site/sitetype/index.html b/application/admin/view/default/site/sitetype/index.html
index d3ce36f26..3d72a9fd5 100644
--- a/application/admin/view/default/site/sitetype/index.html
+++ b/application/admin/view/default/site/sitetype/index.html
@@ -82,12 +82,20 @@
                 <div class="am-panel-hd">
                     <h3 class="am-panel-title">自提点</h3>
                 </div>
-                <div class="am-panel-bd am-padding-vertical-xs">
+                <div class="am-panel-bd">
                     <ul class="am-list am-list-static am-list-border am-list-striped am-form-group am-btn-sm am-form-group-refreshing am-margin-bottom-0 am-padding-bottom-0 address-list">
                         {{if !empty($sitetype_address_list) and is_array($sitetype_address_list)}}
                             {{foreach $sitetype_address_list as $address}}
                                 <li>
-                                    <span>{{$address.province_name}} {{$address.city_name}} {{$address.county_name}} {{$address.address}}（{{$address.name}}-{{$address.tel}}）{{if !empty($address['alias'])}}<span class="am-badge am-radius am-badge-success am-margin-left-xs">{{$address.alias}}</span>{{/if}}</span>
+                                    {{if !empty($address['logo'])}}
+                                        <img src="{{$address.logo}}" alt="{{$address.name}}" class="am-img-thumbnail am-radius address-logo" />
+                                    {{/if}}
+                                    <span class="address-content">
+                                        <span class="address-text">{{$address.province_name}} {{$address.city_name}} {{$address.county_name}} {{$address.address}}（{{$address.name}}-{{$address.tel}}）</span>
+                                        {{if !empty($address['alias'])}}
+                                            <span class="am-badge am-radius am-badge-success am-margin-left-xs">{{$address.alias}}</span>
+                                        {{/if}}
+                                    </span>
                                     <span class="am-badge am-radius am-icon-remove delete-submit"> 移除</span>
                                     <span class="am-badge am-radius am-icon-edit edit-submit"> 编辑</span>
                                 </li>
@@ -127,7 +135,7 @@
 <!-- right content end  -->
 
 <!-- 自提点地址添加弹层 -->
-<div class="am-popup" id="popup-address-win">
+<div class="am-popup" id="popup-address-win" data-default-logo="{{$attachment_host}}/static/admin/default/images/default-images.jpg">
     <div class="am-popup-inner">
         <div class="am-popup-hd">
             <h4 class="am-popup-title">地址添加</h4>
@@ -135,23 +143,33 @@
         </div>
         <div class="am-popup-bd">
             <form class="am-form form-validation-address" method="post" request-type="sync" request-value="ViewAddressModalBack">
+                <div class="am-form-group am-form-file">
+                    <label class="block">logo图片<span class="am-form-group-label-tips-must">必传</span><span class="am-form-group-label-tips">建议300x300px</span></label>
+                    <ul class="plug-file-upload-view sitetype-logo" data-form-name="logo" data-max-number="1" data-delete="0" data-dialog-type="images">
+                        <li>
+                            <input type="text" name="logo" value="" data-validation-message="请上传logo图片" required />
+                            <img src="{{$attachment_host}}/static/admin/default/images/default-images.jpg" />
+                        </li>
+                    </ul>
+                    <div class="plug-file-upload-submit" data-view-tag="ul.sitetype-logo">+上传图片</div>
+                </div>
                 <div class="am-form-group">
-                    <label>别名</label>
+                    <label>别名<span class="am-form-group-label-tips">选填</span></label>
                     <input type="text" name="alias" placeholder="别名" minlength="0" maxlength="16" data-validation-message="别名格式最多 16 个字符" class="am-radius" />
                 </div>
 
                 <div class="am-form-group">
-                    <label>联系人</label>
+                    <label>联系人<span class="am-form-group-label-tips-must">必填</span></label>
                     <input type="text" name="name" placeholder="联系人" minlength="2" maxlength="16" data-validation-message="联系人格式 2~16 个字符之间" class="am-radius" required />
                 </div>
                 <div class="am-form-group">
-                    <label>联系电话</label>
+                    <label>联系电话<span class="am-form-group-label-tips-must">必填</span></label>
                     <input type="text" name="tel" placeholder="联系电话" minlength="6" maxlength="30" data-validation-message="联系电话格式有误" class="am-radius" required />
                 </div>
 
                 {{include file="lib/region_linkage" /}}
                 <div class="am-form-group">
-                    <label>详细地址</label>
+                    <label>详细地址<span class="am-form-group-label-tips-must">必填</span></label>
                     <div class="am-input-group am-input-group-sm">
                         <input type="hidden" name="lng" id="form-lng" />
                         <input type="hidden" name="lat" id="form-lat" />
diff --git a/application/service/ConfigService.php b/application/service/ConfigService.php
index 9363fcbde..3d9bd9fa5 100755
--- a/application/service/ConfigService.php
+++ b/application/service/ConfigService.php
@@ -359,6 +359,13 @@ class ConfigService
                 $data = $temp_data;
             }
         }
+        if(!empty($data))
+        {
+            foreach($data as &$v)
+            {
+                $v['logo'] = ResourcesService::AttachmentPathViewHandle($v['logo']);
+            }
+        }
 
         // 自提点地址列表数据钩子
         $hook_name = 'plugins_service_site_extraction_address_list';
diff --git a/public/static/admin/default/css/site.css b/public/static/admin/default/css/site.css
index 9d15dd973..81e25ab1a 100755
--- a/public/static/admin/default/css/site.css
+++ b/public/static/admin/default/css/site.css
@@ -18,6 +18,12 @@ ul.home_site_user_register_bg_images-images-view li {
 /**
  * 地址添加/编辑
  */
+.address-list .address-logo {
+    width: 18px;
+    height: 18px;
+    margin-right: 2px;
+    vertical-align: text-top;
+}
 .address-list .edit-submit,
 .address-list .delete-submit {
     cursor: pointer;
diff --git a/public/static/admin/default/js/site.js b/public/static/admin/default/js/site.js
index ccbcc5f5a..36475ac9b 100644
--- a/public/static/admin/default/js/site.js
+++ b/public/static/admin/default/js/site.js
@@ -15,6 +15,7 @@ function AddressModalHandle(data)
     $(function()
     {
         // 参数处理
+        var logo = data.logo || null;
         var alias = data.alias || null;
         var name = data.name || null;
         var tel = data.tel || null;
@@ -37,7 +38,12 @@ function AddressModalHandle(data)
 
         // 数据拼接
         var html = '<li>';
-            html += '<span>'+data['province_name']+' '+data['city_name']+' '+data['county_name']+' '+address+'（'+name+'-'+tel+'）';
+            if(logo != null)
+            {
+                html += '<img src="'+logo+'" alt="'+name+'" class="am-img-thumbnail am-radius address-logo" /> ';
+            }
+            html += '<span class="address-content">';
+            html += '<span class="address-text">'+data['province_name']+' '+data['city_name']+' '+data['county_name']+' '+address+'（'+name+'-'+tel+'）</span>';
             if(alias != null)
             {
                 html += '<span class="am-badge am-radius am-badge-success am-margin-left-xs">'+alias+'</span>';
@@ -96,6 +102,10 @@ $(function()
         $popup_address.modal();
         $popup_address.attr('data-type', 'add');
 
+        // logo
+        $popup_address.find('.sitetype-logo input[name="logo"]').val('');
+        $popup_address.find('.sitetype-logo img').attr('src', $popup_address.data('default-logo'));
+
         // 清空数据
         FormDataFill({"alias":"", "name":"", "tel":"", "address":"", "province":0, "city":0, "county":0, "lng":"", "lat":""}, 'form.form-validation-address');
 
@@ -144,6 +154,10 @@ $(function()
             return false;
         }
 
+        // logo
+        $popup_address.find('.sitetype-logo input[name="logo"]').val(item.logo || '');
+        $popup_address.find('.sitetype-logo img').attr('src', item.logo || $popup_address.data('default-logo'));
+
         // 数据填充
         FormDataFill(item, 'form.form-validation-address');