From bcc97f30460ac270b11259b73426698ee1dbadfa Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Fri, 19 Apr 2019 16:51:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/plugins/petscms/Petsadmin.php     |   5 ++++
 .../plugins/view/petscms/pets/index.html      |  22 +++++++++++++-----
 .../plugins/view/petscms/petsadmin/index.html |  22 +++++++++++++-----
 public/static/plugins/css/petscms/pets.css    |   1 +
 .../static/plugins/css/petscms/petsadmin.css  |   1 +
 .../qrcode/2019/04/19/2019041916395788696.png | Bin 0 -> 815 bytes
 6 files changed, 39 insertions(+), 12 deletions(-)
 create mode 100644 public/static/upload/images/plugins_petscms/qrcode/2019/04/19/2019041916395788696.png

diff --git a/application/plugins/petscms/Petsadmin.php b/application/plugins/petscms/Petsadmin.php
index 778c96a58..097946fde 100644
--- a/application/plugins/petscms/Petsadmin.php
+++ b/application/plugins/petscms/Petsadmin.php
@@ -62,6 +62,11 @@ class PetsAdmin extends Controller
         );
         $data = Service::PetsList($data_params);
         $this->assign('data_list', $data['data']);
+
+        // 插件配置信息
+        $base = PluginsService::PluginsData('petscms', ['logo', 'pets_default_images', 'alipay_qrcode_images', 'weixin_qrcode_images'], false);
+        $this->assign('plugins_base_data', $base['data']);
+
         $this->assign('params', $params);
         $this->assign('pets_attribute_status_list', Service::$pets_attribute_status_list);
         $this->assign('pets_attribute_is_text_list', Service::$pets_attribute_is_text_list);
diff --git a/application/plugins/view/petscms/pets/index.html b/application/plugins/view/petscms/pets/index.html
index 81d295a49..79e26dbb5 100644
--- a/application/plugins/view/petscms/pets/index.html
+++ b/application/plugins/view/petscms/pets/index.html
@@ -123,17 +123,27 @@
                                 <tr>
                                     <td class="am-hide-sm-only row-first">
                                         <p class="ellipsis">{{$v.title}}</p>
-                                        {{if !empty($v['photo'])}}
-                                            <div data-am-widget="slider" class="am-slider am-slider-a1" data-am-slider='{"directionNav":false, "slideshow":false}'  >
-                                                <ul class="am-slides">
+                                        <div data-am-widget="slider" class="am-slider am-slider-a1" data-am-slider='{"directionNav":false, "slideshow":false}'  >
+                                            <ul class="am-slides">
+                                                {{if !empty($v['photo'])}}
                                                     {{foreach $v.photo as $photo}}
                                                         <li>
                                                             <img src="{{$photo.images}}" alt="{{$v.title}}" />
                                                         </li>
                                                     {{/foreach}}
-                                                </ul>
-                                            </div>
-                                        {{/if}}
+                                                {{else /}}
+                                                    {{if !empty($plugins_base_data['pets_default_images'])}}
+                                                        <li>
+                                                            <img src="{{$plugins_base_data.pets_default_images}}" alt="{{$v.title}}" />
+                                                        </li>
+                                                    {{else /}}
+                                                        <li>
+                                                            <img src="{{$attachment_host}}/static/plugins/images/petscms/pets-default-images.jpg" alt="{{$v.title}}" />
+                                                        </li>
+                                                    {{/if}}
+                                                {{/if}}
+                                            </ul>
+                                        </div>
                                     </td>
                                     <td>
                                         编号：{{if empty($v['pest_no'])}}<span class="items-value-empty">未填写</span>{{else /}}{{$v.pest_no}}{{/if}}<br />
diff --git a/application/plugins/view/petscms/petsadmin/index.html b/application/plugins/view/petscms/petsadmin/index.html
index 9f0ad30e2..cd92e125b 100644
--- a/application/plugins/view/petscms/petsadmin/index.html
+++ b/application/plugins/view/petscms/petsadmin/index.html
@@ -110,17 +110,27 @@
                                 <tr id="data-list-{{$v.id}}">
                                     <td class="am-hide-sm-only row-first">
                                         <p class="ellipsis">{{$v.title}}</p>
-                                        {{if !empty($v['photo'])}}
-                                            <div data-am-widget="slider" class="am-slider am-slider-a1" data-am-slider='{"directionNav":false, "slideshow":false}'  >
-                                                <ul class="am-slides">
+                                        <div data-am-widget="slider" class="am-slider am-slider-a1" data-am-slider='{"directionNav":false, "slideshow":false}'  >
+                                            <ul class="am-slides">
+                                                {{if !empty($v['photo'])}}
                                                     {{foreach $v.photo as $photo}}
                                                         <li>
                                                             <img src="{{$photo.images}}" alt="{{$v.title}}" />
                                                         </li>
                                                     {{/foreach}}
-                                                </ul>
-                                            </div>
-                                        {{/if}}
+                                                {{else /}}
+                                                    {{if !empty($plugins_base_data['pets_default_images'])}}
+                                                        <li>
+                                                            <img src="{{$plugins_base_data.pets_default_images}}" alt="{{$v.title}}" />
+                                                        </li>
+                                                    {{else /}}
+                                                        <li>
+                                                            <img src="{{$attachment_host}}/static/plugins/images/petscms/pets-default-images.jpg" alt="{{$v.title}}" />
+                                                        </li>
+                                                    {{/if}}
+                                                {{/if}}
+                                            </ul>
+                                        </div>
                                     </td>
                                     <td>
                                         编号：{{if empty($v['pest_no'])}}<span class="items-value-empty">未填写</span>{{else /}}{{$v.pest_no}}{{/if}}<br />
diff --git a/public/static/plugins/css/petscms/pets.css b/public/static/plugins/css/petscms/pets.css
index 1837cb485..7c291e290 100644
--- a/public/static/plugins/css/petscms/pets.css
+++ b/public/static/plugins/css/petscms/pets.css
@@ -24,6 +24,7 @@
 .row-first p { font-weight: 500; max-width: 240px; }
 .row-first .am-slider { max-height: 130px; }
 .row-first .am-slider .am-slides img { width: auto; max-height: 100%; margin: 0 auto; }
+.data-list table.am-table .am-slides li { height: 150px; }
 @media only screen and (min-width: 641px){
     .so-list .chosen-container, .so-list select { width:217px !important; display: -webkit-inline-box; }
     .thin_sub:hover { color:#F60; }
diff --git a/public/static/plugins/css/petscms/petsadmin.css b/public/static/plugins/css/petscms/petsadmin.css
index 29a7490e9..1c762a5cf 100644
--- a/public/static/plugins/css/petscms/petsadmin.css
+++ b/public/static/plugins/css/petscms/petsadmin.css
@@ -24,6 +24,7 @@
 .row-first p { font-weight: 500; max-width: 240px; }
 .row-first .am-slider { max-height: 130px; }
 .row-first .am-slider .am-slides img { width: auto; max-height: 100%; margin: 0 auto; }
+.data-list table.am-table .am-slides li { height: 150px; }
 @media only screen and (min-width: 641px){
     .so-list .chosen-container, .so-list select { width:217px !important; display: -webkit-inline-box; }
     .thin_sub:hover { color:#F60; }
diff --git a/public/static/upload/images/plugins_petscms/qrcode/2019/04/19/2019041916395788696.png b/public/static/upload/images/plugins_petscms/qrcode/2019/04/19/2019041916395788696.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0179b2fb435fffb0b5e33046923fcf14aac0770
GIT binary patch
literal 815
zcmV+~1JL}5P)<h;3K|Lk000e1NJLTq00F`P00F`Q0{{R3M%G&f00006P)t-s|Ns90
z0033O(|!N|0^~_VK~#90?V3w+t3V7zRmB3lB(~0ySO8UeLI37C&M<=<4X|nVktesL
z+X4}SAc$X&mqr|4H>&5?<?yvDZ)H>e7I8sBE@XW6e%a4WV=W=uXUUs@ge=mP)*?IZ
z-*(G$wj!@cen3KgM~>ySWSyN767myi`!#O8jNKB<M){L&A^$RIVaweBO@i&Se(ax+
zf0>Nmvd?|GL_k6=<cPauEw0ILy`a6>4+&|}697#Qen_6^DxxW#ksK0okhgy_bF{nZ
z-Zb5nY9ty(F8U!P<RH^OxlP)A%i_HEk!_YSNXUv*T4~N}RP8@Ir79%klYEuZhLgIt
z)MTkVm2|m-gly7X)0W-s;lXYHtF?K_(mx>~C2Q0c^{GabZqtV%rNkKj2njh!RhM8|
zr<CPWhj;W@5E3%Or4^Sv);V-meM_j-2MIYyZ*2XBNDc(7v>hqX(B?SSK|;p<<5dqs
zOk`HjvJ3XZ{$al$Av;Ffi<ok=L|)5ErNfOwLP|^pMAA-qqQ`uo&U;<tAR(KKBY)Jb
z%n{*TaITD*6eMJlv0_KKv`IO!Y)dXK%P|#zgmf|{+)Le>_Io%f6X-HefP|EqaOYrB
zrw3Qf{jEM7Cpt(-i7wdB^!?lYdy26KnA&eBK|(%Adrd?N8gGqs$;#wMs1_13qimAa
zRxKS$&H}!D&I<{dpMBb2pqcHl4-&G-oNGUPd0u?llwGiMKtc}Et&`-Oa#dd&_ktiH
zpQJ4h=WWeSW3qJA+AYC%x`q7nq(!>yZQ3dCf<Cqk9kv)DA>|Q1707I^v~pKw$z72z
zNXUisKBu8Mi**d(w^NJ)3AvE7g5_NM%5mhGYoWeNT9J^DMf%pm>y{;o;kNnm|HhUA
z3HgC^9k%_hhy5YEZFWIO$T#G!eOpaYqi*SH#33Pzw1{(Db-{Q6ph}kgLqEZVglsZA
tQ_ccRbJ+!t{B>!HkdO;W5Crk7@ee^oYyswWN+tjR002ovPDHLkV1hO-fM@^!

literal 0
HcmV?d00001