From 7ead9573c0102a3e0fe786c71d40b58cb522956f Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Wed, 22 Jul 2020 23:06:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E6=8F=92=E4=BB=B6+=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/view/default/goods/module/info.html |  2 +-
 .../default/public/module/form_table.html     | 20 ++++++++---------
 .../default/public/module/form_table.html     | 22 +++++++++----------
 application/tags.php                          | 12 ++++++++++
 public/static/common/css/common.css           |  1 +
 5 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/application/admin/view/default/goods/module/info.html b/application/admin/view/default/goods/module/info.html
index baece3a92..5d6c4ea0f 100644
--- a/application/admin/view/default/goods/module/info.html
+++ b/application/admin/view/default/goods/module/info.html
@@ -2,7 +2,7 @@
 {{if !empty($module_data)}}
     <div class="am-nbfc">
         <a href="{{$module_data.goods_url}}" target="_blank" title="{{$module_data.title}}">
-            <img src="{{$module_data['images']}}" class="am-img-thumbnail am-radius am-margin-right-xs am-fl" width="60" height="60" />
+            <img src="{{$module_data.images}}" class="am-img-thumbnail am-radius am-margin-right-xs am-fl" width="60" height="60" />
         </a>
         <a href="{{$module_data.goods_url}}" target="_blank" title="{{$module_data.title}}" {{if !empty($module_data['title_color'])}} style="color:{{$module_data.title_color}};" {{/if}} class="am-nowrap-initial">{{$module_data.title}}</a>
         {{if !empty($module_data['simple_desc'])}}
diff --git a/application/admin/view/default/public/module/form_table.html b/application/admin/view/default/public/module/form_table.html
index 4779a86b7..6fb4afcd3 100644
--- a/application/admin/view/default/public/module/form_table.html
+++ b/application/admin/view/default/public/module/form_table.html
@@ -204,7 +204,7 @@
                                             {{/case}}
                                             {{case status}}
                                                 <!-- 数据状态操作按钮组件 -->
-                                                {{if !empty($t['key_field']) and !empty($t['post_url'])}}
+                                                {{if !empty($t['key_field']) and !empty($t['post_url']) and !empty($data_list[$i][$t['key_field']])}}
                                                     <a href="javascript:;"
                                                         class="am-icon-btn am-icon-check submit-state {{if $data_list[$i][$t['view_key']] eq 1}}am-success{{else /}}am-default{{/if}}"
                                                         data-url="{{$t.post_url}}"
@@ -245,6 +245,15 @@
                                                     }
                                                 {{/php}}
                                             {{/case}}
+                                            {{case radio}}
+                                                {{if isset($data_list[$i][$form_table['base']['key_field']])}}
+                                                    <div class="form-table-operate-radio">
+                                                        <label class="am-radio am-secondary am-radio-inline">
+                                                            <input type="radio" name="{{$t.view_key}}" value="{{$data_list[$i][$form_table['base']['key_field']]}}" {{if isset($t['is_checked']) and $t['is_checked'] eq 1}}checked{{/if}} data-am-ucheck />
+                                                        </label>
+                                                    </div>
+                                                {{/if}}
+                                            {{/case}}
                                             {{case checkbox}}
                                                 {{if isset($data_list[$i][$form_table['base']['key_field']])}}
                                                     <!-- 是否配置指定数据不显示控件 -->
@@ -257,15 +266,6 @@
                                                     {{/if}}
                                                 {{/if}}
                                             {{/case}}
-                                            {{case radio}}
-                                                {{if isset($data_list[$i][$form_table['base']['key_field']])}}
-                                                    <div class="form-table-operate-radio">
-                                                        <label class="am-radio am-secondary am-radio-inline">
-                                                            <input type="radio" name="{{$t.view_key}}" value="{{$data_list[$i][$form_table['base']['key_field']]}}" {{if isset($t['is_checked']) and $t['is_checked'] eq 1}}checked{{/if}} data-am-ucheck />
-                                                        </label>
-                                                    </div>
-                                                {{/if}}
-                                            {{/case}}
                                         {{/switch}}
                                     {{/if}}
                                 </td>
diff --git a/application/index/view/default/public/module/form_table.html b/application/index/view/default/public/module/form_table.html
index 0c4ad8edb..6fb4afcd3 100644
--- a/application/index/view/default/public/module/form_table.html
+++ b/application/index/view/default/public/module/form_table.html
@@ -171,7 +171,7 @@
                                                         {{/if}}
                                                     {{/foreach}}
                                                 {{else /}}
-                                                    <!-- 非数组则直接取值 -->
+                                                    <!-- 是否存在数据 key -->
                                                     {{if isset($data_list[$i][$t['view_key']])}}
                                                         <!-- 是否指定数据转换 -->
                                                         {{if !empty($t['view_data']) and is_array($t['view_data'])}}
@@ -204,7 +204,7 @@
                                             {{/case}}
                                             {{case status}}
                                                 <!-- 数据状态操作按钮组件 -->
-                                                {{if !empty($t['key_field']) and !empty($t['post_url'])}}
+                                                {{if !empty($t['key_field']) and !empty($t['post_url']) and !empty($data_list[$i][$t['key_field']])}}
                                                     <a href="javascript:;"
                                                         class="am-icon-btn am-icon-check submit-state {{if $data_list[$i][$t['view_key']] eq 1}}am-success{{else /}}am-default{{/if}}"
                                                         data-url="{{$t.post_url}}"
@@ -245,6 +245,15 @@
                                                     }
                                                 {{/php}}
                                             {{/case}}
+                                            {{case radio}}
+                                                {{if isset($data_list[$i][$form_table['base']['key_field']])}}
+                                                    <div class="form-table-operate-radio">
+                                                        <label class="am-radio am-secondary am-radio-inline">
+                                                            <input type="radio" name="{{$t.view_key}}" value="{{$data_list[$i][$form_table['base']['key_field']]}}" {{if isset($t['is_checked']) and $t['is_checked'] eq 1}}checked{{/if}} data-am-ucheck />
+                                                        </label>
+                                                    </div>
+                                                {{/if}}
+                                            {{/case}}
                                             {{case checkbox}}
                                                 {{if isset($data_list[$i][$form_table['base']['key_field']])}}
                                                     <!-- 是否配置指定数据不显示控件 -->
@@ -257,15 +266,6 @@
                                                     {{/if}}
                                                 {{/if}}
                                             {{/case}}
-                                            {{case radio}}
-                                                {{if isset($data_list[$i][$form_table['base']['key_field']])}}
-                                                    <div class="form-table-operate-radio">
-                                                        <label class="am-radio am-secondary am-radio-inline">
-                                                            <input type="radio" name="{{$t.view_key}}" value="{{$data_list[$i][$form_table['base']['key_field']]}}" {{if isset($t['is_checked']) and $t['is_checked'] eq 1}}checked{{/if}} data-am-ucheck />
-                                                        </label>
-                                                    </div>
-                                                {{/if}}
-                                            {{/case}}
                                         {{/switch}}
                                     {{/if}}
                                 </td>
diff --git a/application/tags.php b/application/tags.php
index 7fb4b4ce8..2638bf038 100755
--- a/application/tags.php
+++ b/application/tags.php
@@ -32,5 +32,17 @@ return array (
   'log_write' => 
   array (
   ),
+  'plugins_css' => 
+  array (
+    0 => 'app\\plugins\\freightfee\\Hook',
+  ),
+  'plugins_service_buy_handle' => 
+  array (
+    0 => 'app\\plugins\\freightfee\\Hook',
+  ),
+  'plugins_view_goods_detail_title' => 
+  array (
+    0 => 'app\\plugins\\freightfee\\Hook',
+  ),
 );
 ?>
\ No newline at end of file
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index 47511deac..c6347817f 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -14,6 +14,7 @@ ul { list-style: none; }
 .dl-content dd { padding-left: 120px; }
 .dl-content dd:not(:last-child) { border-bottom: 1px solid #efefef; }
 .dl-content dt, .dl-content dd { font-weight: normal !important; text-align: left; margin-top: 0px; line-height: 20px; min-height: 40px; padding-top: 10px; padding-bottom: 10px; }
+.dl-content-dd-only dd { padding-left: 0; }
 
 /**
  * 表单优化
-- 
GitLab