From 4ee3ee51ea96bd0e399edd3aed5a7786b3c4a75a Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Sun, 7 Mar 2021 19:19:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E7=82=B9=E6=96=B0=E5=A2=9Elo?=
 =?UTF-8?q?ho=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Site.php         |  2 +-
 .../view/default/site/sitetype/index.html     | 11 ++---
 application/index/view/default/buy/index.html | 41 +++++++++++--------
 changelog.txt                                 |  3 ++
 public/static/admin/default/js/site.js        | 15 +++++--
 public/static/index/default/css/buy.css       |  4 ++
 6 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/application/admin/controller/Site.php b/application/admin/controller/Site.php
index 512d95993..a0ea8d13c 100755
--- a/application/admin/controller/Site.php
+++ b/application/admin/controller/Site.php
@@ -311,7 +311,7 @@ class Site extends Common
 					foreach($address as $k=>$v)
 					{
 						$address[$k]['id'] = $k;
-						$address[$k]['logo'] = ResourcesService::AttachmentPathHandle($v['logo']);
+						$address[$k]['logo'] = empty($v['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 3d72a9fd5..9cd3cab4c 100644
--- a/application/admin/view/default/site/sitetype/index.html
+++ b/application/admin/view/default/site/sitetype/index.html
@@ -135,7 +135,7 @@
 <!-- right content end  -->
 
 <!-- 自提点地址添加弹层 -->
-<div class="am-popup" id="popup-address-win" data-default-logo="{{$attachment_host}}/static/admin/default/images/default-images.jpg">
+<div class="am-popup" id="popup-address-win">
     <div class="am-popup-inner">
         <div class="am-popup-hd">
             <h4 class="am-popup-title">地址添加</h4>
@@ -144,13 +144,8 @@
         <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>
+                    <label class="block">logo图片<span class="am-form-group-label-tips">选传</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-dialog-type="images"></ul>
                     <div class="plug-file-upload-submit" data-view-tag="ul.sitetype-logo">+上传图片</div>
                 </div>
                 <div class="am-form-group">
diff --git a/application/index/view/default/buy/index.html b/application/index/view/default/buy/index.html
index 96d2cb02e..9698c7517 100755
--- a/application/index/view/default/buy/index.html
+++ b/application/index/view/default/buy/index.html
@@ -173,23 +173,30 @@
                         <div class="am-popup-bd">
                             <ul class="am-list">
                                 {{foreach $base.extraction_address as $key=>$address}}
-                                    <li class="extraction-address-item" data-value="{{$key}}">
-                                        <p>
-                                            {{if !empty($address['alias'])}}
-                                                <span class="am-badge am-badge-secondary-plain am-radius am-margin-right-xs">{{$address.alias}}</span>
-                                            {{/if}}
-                                            <span>{{$address.name}}</span>
-                                            <span>{{$address.tel}}</span>
-                                        </p>
-                                        <p class="address-detail">
-                                            <span>{{$address.province_name}}</span>
-                                            <span>{{$address.city_name}}</span>
-                                            <span>{{$address.county_name}}</span>
-                                            <span>{{$address.address}}</span>
-                                            {{if !empty($address['lng']) and !empty($address['lat'])}}
-                                                <a href="javascript:;" class="am-badge am-badge-default am-radius extraction-address-map-submit am-icon-map-marker am-margin-left-sm" data-lng="{{$address.lng}}" data-lat="{{$address.lat}}"> 查看地图</a>
-                                            {{/if}}
-                                        </p>
+                                    <li class="extraction-address-item am-nbfc" data-value="{{$key}}">
+                                        {{if !empty($address['logo'])}}
+                                            <div class="am-fl am-margin-right-xs">
+                                                <img src="{{$address.logo}}" alt="{{$address.name}}" class="am-img-thumbnail am-radius address-logo" />
+                                            </div>
+                                        {{/if}}
+                                        <div class="am-fl">
+                                            <p>
+                                                {{if !empty($address['alias'])}}
+                                                    <span class="am-badge am-badge-secondary-plain am-radius am-margin-right-xs">{{$address.alias}}</span>
+                                                {{/if}}
+                                                <span>{{$address.name}}</span>
+                                                <span>{{$address.tel}}</span>
+                                            </p>
+                                            <p class="address-detail">
+                                                <span>{{$address.province_name}}</span>
+                                                <span>{{$address.city_name}}</span>
+                                                <span>{{$address.county_name}}</span>
+                                                <span>{{$address.address}}</span>
+                                                {{if !empty($address['lng']) and !empty($address['lat'])}}
+                                                    <a href="javascript:;" class="am-badge am-badge-default am-radius extraction-address-map-submit am-icon-map-marker am-margin-left-sm" data-lng="{{$address.lng}}" data-lat="{{$address.lat}}"> 查看地图</a>
+                                                {{/if}}
+                                            </p>
+                                        </div>
                                         {{if (isset($params['address_id']) and $params['address_id'] eq $key) or (!empty($base['address']) and $base.address.id eq $key)}}
                                             <button type="button" class="am-btn am-btn-default am-radius" disabled>已选</button>
                                         {{else /}}
diff --git a/changelog.txt b/changelog.txt
index ced7898e4..9f97d1e67 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -11,6 +11,8 @@
 	7. 新增翼支付方式
 	8. 商品详情购买导航按钮统一标准化
 	9. 非兼容模式去掉index.php
+	10. 已完成订单退数量，则释放销量
+	11. 自提取货点新增logo图片
 
 web端
 	1. 编辑器图片、附件、视频多选支持按照顺序选择插入编辑器
@@ -28,6 +30,7 @@ web端
 
 插件
 	1. 应用商店（在线自动安装应用插件、开发者提供优质插件、VIP授权管理）
+	2. 新增主题自动切换插件
 
 
 +=========================================================+
diff --git a/public/static/admin/default/js/site.js b/public/static/admin/default/js/site.js
index 36475ac9b..3f5daf52a 100644
--- a/public/static/admin/default/js/site.js
+++ b/public/static/admin/default/js/site.js
@@ -103,8 +103,7 @@ $(function()
         $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'));
+        $popup_address.find('.sitetype-logo').html('');
 
         // 清空数据
         FormDataFill({"alias":"", "name":"", "tel":"", "address":"", "province":0, "city":0, "county":0, "lng":"", "lat":""}, 'form.form-validation-address');
@@ -155,8 +154,16 @@ $(function()
         }
 
         // 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'));
+        var html = '';
+        if((item.logo || null) != null)
+        {
+            html += '<li>';
+            html += '<input type="text" name="logo" value="'+item.logo+'" data-validation-message="请上传logo图片" required />';
+            html += '<img src="'+item.logo+'" alt="'+item.name+'" />';
+            html += '<i>×</i>';
+            html += '</li>';
+        }
+        $popup_address.find('.sitetype-logo').html(html);
 
         // 数据填充
         FormDataFill(item, 'form.form-validation-address');
diff --git a/public/static/index/default/css/buy.css b/public/static/index/default/css/buy.css
index 52946e09e..5415ab770 100755
--- a/public/static/index/default/css/buy.css
+++ b/public/static/index/default/css/buy.css
@@ -232,6 +232,10 @@ ul.address-list, .business-item ul { overflow: hidden; }
   padding: 10px 5px;
   border-color: #eee;
 }
+#extraction-address-popup .address-logo {
+  width: 38px;
+  height: 38px;
+}
 #extraction-address-popup .am-list > li:first-child {
   border-top: 0;
 }