From 7cf301b04b16620b2cbde32e493589262b4fd262 Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Mon, 1 Feb 2021 16:53:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=A1=B5=E9=9D=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/view/default/payment/index.html     | 10 +++++---
 .../view/default/pluginsadmin/save_info.html  |  2 +-
 .../view/default/pluginsadmin/upload.html     | 14 ++++++-----
 .../view/default/site/siteset/extends.html    |  9 +++++++
 .../view/default/site/siteset/search.html     | 25 +++++++++++++++++++
 5 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/application/admin/view/default/payment/index.html b/application/admin/view/default/payment/index.html
index c23598c0c..b3eb76772 100755
--- a/application/admin/view/default/payment/index.html
+++ b/application/admin/view/default/payment/index.html
@@ -34,10 +34,12 @@
                         <p class="am-margin-left-lg">3.2 ErrorReturn 支付失败（可选）</p>
                         <p class="am-margin-top-xs cr-red">PS：以上条件不满足则无法查看插件，将插件放入.zip压缩包中上传、支持一个压缩中包含多个支付插件</p>
                     </div>
-                    <div class="am-form-group am-form-file">
-                        <button type="button" class="am-btn am-btn-default am-btn-sm am-radius"><i class="am-icon-cloud-upload"></i> 选择文件</button>
-                        <input type="file" name="file" class="file-event" data-tips-tag="#form-payment-tips" data-validation-message="请选择需要上传的文件" accept=".zip" multiple required />
-                        <div id="form-payment-tips" class="am-margin-top-xs"></div>
+                    <div class="am-form-group">
+                        <div class="am-form-file">
+                            <button type="button" class="am-btn am-btn-default am-btn-sm am-radius"><i class="am-icon-cloud-upload"></i> 选择文件</button>
+                            <input type="file" name="file" class="file-event" data-tips-tag="#form-payment-tips" data-validation-message="请选择需要上传的文件" accept=".zip" multiple required />
+                            <div id="form-payment-tips" class="am-margin-top-xs"></div>
+                        </div>
                     </div>
                     <div class="am-form-group am-form-group-refreshing am-margin-top-lg am-padding-horizontal-0">
                         <button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">确认</button>
diff --git a/application/admin/view/default/pluginsadmin/save_info.html b/application/admin/view/default/pluginsadmin/save_info.html
index e789c2769..e6a5c0582 100755
--- a/application/admin/view/default/pluginsadmin/save_info.html
+++ b/application/admin/view/default/pluginsadmin/save_info.html
@@ -43,7 +43,7 @@
 
             <div class="am-form-group">
                 <label>版本<span class="am-form-group-label-tips">主版本.次版本号.修订号，每个段不超过6位，如 1.0.0</span></label>
-                <input type="text" name="version" placeholder="版本" minlength="2" maxlength="16" data-validation-message="版本格式有误" pattern="^[0-9]{1,6}\.[0-9]{1,6}\.[0-9]{1,6}$" class="am-radius" {{if !empty($data)}} value="{{$data.version}}"{{/if}} required />
+                <input type="text" name="version" placeholder="版本" minlength="5" maxlength="18" data-validation-message="版本格式有误" pattern="^[0-9]{1,6}\.[0-9]{1,6}\.[0-9]{1,6}$" class="am-radius" {{if !empty($data)}} value="{{$data.version}}"{{/if}} required />
             </div>
 
             <div class="am-form-group am-form-file">
diff --git a/application/admin/view/default/pluginsadmin/upload.html b/application/admin/view/default/pluginsadmin/upload.html
index e2cc1629c..cd869e993 100755
--- a/application/admin/view/default/pluginsadmin/upload.html
+++ b/application/admin/view/default/pluginsadmin/upload.html
@@ -9,12 +9,14 @@
         
         <!-- form start -->
         <form class="am-form form-validation view-save am-margin-top-sm" action="{{:MyUrl('admin/pluginsadmin/upload')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/pluginsadmin/index')}}" enctype="multipart/form-data">
-            <div class="am-form-group am-form-group-refreshing am-margin-bottom-0 am-form-file">
-                <button type="button" class="am-btn am-btn-default am-btn-sm am-radius">
-                <i class="am-icon-cloud-upload"></i> 选择文件</button>
-                <input type="file" name="file" class="file-event" data-tips-tag="#form-file-tips" data-validation-message="请选择需要上传的文件" accept=".zip" required />
-                <span class="tips am-text-xs">上传一个zip压缩格式的应用安装包</span>
-                <div id="form-file-tips" class="am-margin-top-xs"></div>
+            <div class="am-form-group am-form-group-refreshing am-margin-bottom-0">
+                <div class="am-form-file">
+                    <button type="button" class="am-btn am-btn-default am-btn-sm am-radius">
+                    <i class="am-icon-cloud-upload"></i> 选择文件</button>
+                    <input type="file" name="file" class="file-event" data-tips-tag="#form-file-tips" data-validation-message="请选择需要上传的文件" accept=".zip" required />
+                    <span class="tips am-text-xs">上传一个zip压缩格式的应用安装包</span>
+                    <div id="form-file-tips" class="am-margin-top-xs"></div>
+                </div>
             </div>
             <div class="am-form-group am-form-group-refreshing">
                 <button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm" data-am-loading="{loadingText:'上传中...'}">确认上传</button>
diff --git a/application/admin/view/default/site/siteset/extends.html b/application/admin/view/default/site/siteset/extends.html
index 76c6899d0..75b67209f 100644
--- a/application/admin/view/default/site/siteset/extends.html
+++ b/application/admin/view/default/site/siteset/extends.html
@@ -27,6 +27,15 @@
                             {{/foreach}}
                         </select>
                     </div>
+
+                    <div class="am-form-group">
+                        <label>{{$data.common_is_pay_price_must_max_equal.name}}<span class="am-form-group-label-tips">{{$data.common_is_pay_price_must_max_equal.describe}}</span></label>
+                        <select name="{{$data.common_is_pay_price_must_max_equal.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_is_pay_price_must_max_equal.error_tips}}" required>
+                            {{foreach $site_site_state_list as $v}}
+                                <option value="{{$v.value}}" {{if isset($data['common_is_pay_price_must_max_equal']['value']) and $data['common_is_pay_price_must_max_equal']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                            {{/foreach}}
+                        </select>
+                    </div>
                 </div>
             </div>
 
diff --git a/application/admin/view/default/site/siteset/search.html b/application/admin/view/default/site/siteset/search.html
index 623081969..0150c63fe 100644
--- a/application/admin/view/default/site/siteset/search.html
+++ b/application/admin/view/default/site/siteset/search.html
@@ -36,6 +36,31 @@
                 </div>
             </div>
 
+            <div class="am-form-group">
+                <label>{{$data.home_search_is_price.name}}<span class="am-form-group-label-tips">{{$data.home_search_is_price.describe}}</span></label>
+                <select name="{{$data.home_search_is_price.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_search_is_price.error_tips}}" required>
+                    {{foreach $site_site_state_list as $v}}
+                        <option value="{{$v.value}}" {{if isset($data['home_search_is_price']['value']) and $data['home_search_is_price']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                    {{/foreach}}
+                </select>
+            </div>
+            <div class="am-form-group">
+                <label>{{$data.home_search_is_params.name}}<span class="am-form-group-label-tips">{{$data.home_search_is_params.describe}}</span></label>
+                <select name="{{$data.home_search_is_params.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_search_is_params.error_tips}}" required>
+                    {{foreach $site_site_state_list as $v}}
+                        <option value="{{$v.value}}" {{if isset($data['home_search_is_params']['value']) and $data['home_search_is_params']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                    {{/foreach}}
+                </select>
+            </div>
+            <div class="am-form-group">
+                <label>{{$data.home_search_is_spec.name}}<span class="am-form-group-label-tips">{{$data.home_search_is_spec.describe}}</span></label>
+                <select name="{{$data.home_search_is_spec.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_search_is_spec.error_tips}}" required>
+                    {{foreach $site_site_state_list as $v}}
+                        <option value="{{$v.value}}" {{if isset($data['home_search_is_spec']['value']) and $data['home_search_is_spec']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                    {{/foreach}}
+                </select>
+            </div>
+
             <div class="am-form-group am-form-group-refreshing am-margin-top-lg am-padding-left-0">
                 <input type="hidden" name="nav_type" value="{{$nav_type}}" />
                 <input type="hidden" name="view_type" value="{{$view_type}}" />