From 03afcf30cc680d53a3f81a92983397931bca4c18 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Fri, 4 Mar 2022 17:30:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=99=BB=E5=BD=95=E5=92=8C?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E9=A1=B5=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Order.php                   | 14 +++++++++-----
 app/admin/view/default/admin/login_info.html     |  4 ++--
 app/admin/view/default/goods/save_info.html      |  2 +-
 app/admin/view/default/orderaftersale/index.html |  4 ++--
 app/admin/view/default/warehouse/save_info.html  |  4 ++--
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/admin/controller/Order.php b/app/admin/controller/Order.php
index 69a7a1a68..61fc24917 100755
--- a/app/admin/controller/Order.php
+++ b/app/admin/controller/Order.php
@@ -56,13 +56,17 @@ class Order extends Common
         // 总数
         $total = OrderService::OrderTotal($this->form_where);
 
+        // 提示信息
+        $tips_msg = OrderService::OrderTipsMsg($this->form_where);
+
         // 分页
         $page_params = [
-            'number'    =>  $this->page_size,
-            'total'     =>  $total,
-            'where'     =>  $this->data_request,
-            'page'      =>  $this->page,
-            'url'       =>  MyUrl('admin/order/index'),
+            'number'    => $this->page_size,
+            'total'     => $total,
+            'where'     => $this->data_request,
+            'page'      => $this->page,
+            'url'       => MyUrl('admin/order/index'),
+            'tips_msg'  => $tips_msg,
         ];
         $page = new \base\Page($page_params);
 
diff --git a/app/admin/view/default/admin/login_info.html b/app/admin/view/default/admin/login_info.html
index 9701e4e11..d67f97191 100755
--- a/app/admin/view/default/admin/login_info.html
+++ b/app/admin/view/default/admin/login_info.html
@@ -117,8 +117,8 @@
                             </div>
                         {{/if}}
 
-                        <div class="am-padding-horizontal-sm am-nbfc">
-                            <a href="javascript:;" class="text-muted" data-am-popover="{theme: 'danger sm', content: '请联系管理员重置密码', trigger: 'hover focus'}">忘记密码?</a>
+                        <div class="am-padding-horizontal am-nbfc">
+                            <a href="https://doc.shopxo.net/article/1/265389860360028160.html" target="_blank" class="text-muted" data-am-popover="{theme: 'danger sm', content: '请联系管理员重置密码', trigger: 'hover focus'}">忘记密码?</a>
                         </div>
                     </div>
                 </div>
diff --git a/app/admin/view/default/goods/save_info.html b/app/admin/view/default/goods/save_info.html
index faeb94f67..5ab018a2c 100755
--- a/app/admin/view/default/goods/save_info.html
+++ b/app/admin/view/default/goods/save_info.html
@@ -56,8 +56,8 @@
                 <div class="am-panel-bd am-padding-vertical-xs">
 					<div class="am-form-group">
 						<label>标题名称<span class="am-form-group-label-tips-must">必填</span></label>
+						<input type="hidden" name="title_color" value="{{if !empty($data['title_color'])}}{{$data.title_color}}{{/if}}" />
 						<div class="am-input-group am-input-group-sm">
-							<input type="hidden" name="title_color" value="{{if !empty($data['title_color'])}}{{$data.title_color}}{{/if}}" />
 							<input type="text" name="title" placeholder="标题名称" minlength="2" maxlength="160" data-validation-message="标题名称格式 2~160 个字符" class="am-form-field am-radius" {{if !empty($data)}} value="{{$data.title}}" {{/if}} {{if !empty($data['title_color'])}} style="color:{{$data.title_color}};" {{/if}} required />
 							<span class="am-input-group-btn">
 								<button type="button" class="am-btn am-btn-default am-btn-xs colorpicker-submit" data-input-tag="input[name='title']" data-color-tag="input[name='title_color']">
diff --git a/app/admin/view/default/orderaftersale/index.html b/app/admin/view/default/orderaftersale/index.html
index d2da26bac..62c5e1522 100644
--- a/app/admin/view/default/orderaftersale/index.html
+++ b/app/admin/view/default/orderaftersale/index.html
@@ -46,7 +46,7 @@
                         {{/if}}
                     </div>
 
-                    <div class="am-form-group reply-submit am-form-group-refreshing">
+                    <div class="am-form-group reply-submit am-form-group-refreshing am-margin-top-sm">
                         <input type="hidden" name="id" value="" />
                         <button type="submit" class="am-btn am-btn-primary am-radius am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">确认</button>
                     </div>
@@ -92,7 +92,7 @@
                         <textarea name="refuse_reason" rows="5" class="am-radius" placeholder="拒绝原因格式 2~230 个字符" data-validation-message="拒绝原因格式 2~230 个字符" minlength="2" maxlength="230" required></textarea>
                     </div>
 
-                    <div class="am-form-group reply-submit am-form-group-refreshing">
+                    <div class="am-form-group reply-submit am-form-group-refreshing am-margin-top-sm">
                         <input type="hidden" name="id" value="" />
                         <button type="submit" class="am-btn am-btn-danger am-radius am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">确认</button>
                     </div>
diff --git a/app/admin/view/default/warehouse/save_info.html b/app/admin/view/default/warehouse/save_info.html
index 3df0208b8..420e64449 100644
--- a/app/admin/view/default/warehouse/save_info.html
+++ b/app/admin/view/default/warehouse/save_info.html
@@ -12,14 +12,14 @@
 
             <div class="am-form-group">
                 <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" {{if !empty($data)}} value="{{$data.name}}"{{/if}} required />
+                <input type="text" name="name" placeholder="名称" minlength="2" maxlength="30" data-validation-message="名称格式 2~30 个字符之间" class="am-radius" {{if !empty($data)}} value="{{$data.name}}"{{/if}} required />
             </div>
             <div class="am-form-group">
                 <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" {{if !empty($data)}} value="{{$data.alias}}"{{/if}} />
             </div>
             <div class="am-form-group">
-                <label>权重<span class="am-form-group-label-tips">选填</span></label>
+                <label>权重<span class="am-form-group-label-tips">选填、权重数值越大代表权重越高</span></label>
                 <input type="number" name="level" placeholder="权重" minlength="0" maxlength="16" data-validation-message="请输入有效权重数值" class="am-radius" {{if !empty($data)}} value="{{$data.level}}"{{/if}} />
             </div>