From 547241c385baf6bcc44f3fa39e87a1e2d976f62c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 14 Apr 2017 15:24:28 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E9=BB=98=E8=AE=A4=E5=8F=98=E9=87=8F($=5Furl=5F,$=5Fur?=
 =?UTF-8?q?i=5F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/user.index.html    |  2 +-
 application/wechat/view/config.index.html | 12 ++++++------
 application/wechat/view/config.pay.html   | 10 +++++-----
 application/wechat/view/fans.index.html   |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/application/admin/view/user.index.html b/application/admin/view/user.index.html
index dfd0af7d2..038525e54 100644
--- a/application/admin/view/user.index.html
+++ b/application/admin/view/user.index.html
@@ -14,7 +14,7 @@
 {block name="content"}
 
 <!-- 表单搜索 开始 -->
-<form class="animated form-search" action="{:request()->url(true)}" onsubmit="return false" method="get">
+<form class="animated form-search" action="{$_url_}" onsubmit="return false" method="get">
 
     <div class="row">
         <div class="col-xs-3">
diff --git a/application/wechat/view/config.index.html b/application/wechat/view/config.index.html
index d074f4c3a..2f0afbff1 100644
--- a/application/wechat/view/config.index.html
+++ b/application/wechat/view/config.index.html
@@ -1,11 +1,11 @@
 {extend name="extra@admin/content"}
 
 {block name="content"}
-<form onsubmit="return false;" action="{:request()->url(true)}" data-auto="true" method="post"
+<form onsubmit="return false;" action="{$_url_}" data-auto="true" method="post"
       class='form-horizontal' style='padding-top:20px'>
 
     <div class="form-group">
-        <label class="col-sm-2 col-xs-3 control-label">URL(服务器地址)</label>
+        <label class="col-sm-2 col-xs-3 control-label">URL <span class="nowrap">(服务器地址)</span></label>
         <div class="col-sm-8">
             <input onmouseenter="this.select()" class="layui-input" readonly="readonly"
                    value="{:url('@wechat/api','',true,true)}"/>
@@ -19,7 +19,7 @@
     <div class="hr-line-dashed"></div>
 
     <div class="form-group">
-        <label class="col-sm-2 control-label">AppID(应用ID)</label>
+        <label class="col-sm-2 col-xs-3 control-label">AppID <span class="nowrap">(应用ID)</span></label>
         <div class='col-sm-8'>
             <input type="text" name="wechat_appid" title="请输入以wx开头的18位公众号APPID"
                    pattern="^wx[0-9a-z]{16}$" maxlength="18" required="required"
@@ -33,7 +33,7 @@
     <div class="hr-line-dashed"></div>
 
     <div class="form-group">
-        <label class="col-sm-2 col-xs-3 control-label">AppSecret(应用密钥)</label>
+        <label class="col-sm-2 col-xs-3 control-label">AppSecret <span class="nowrap">(应用密钥)</span></label>
         <div class='col-sm-8'>
             <input type="password" name="wechat_appsecret" required="required" title="请输入32位公众号AppSecret"
                    placeholder="公众号AppSecret（必填）" value="{:sysconf('wechat_appsecret')}"
@@ -48,7 +48,7 @@
     <div class="hr-line-dashed"></div>
 
     <div class="form-group">
-        <label class="col-sm-2 col-xs-3 control-label">Token(令牌)</label>
+        <label class="col-sm-2 col-xs-3 control-label">Token <span class="nowrap">(令牌)</span></label>
         <div class='col-sm-8'>
             <input type="text" name="wechat_token" required="required" title="请输入接口Token(令牌)"
                    placeholder="Token（令牌）" value="{:sysconf('wechat_token')}"
@@ -62,7 +62,7 @@
     <div class="hr-line-dashed"></div>
 
     <div class="form-group">
-        <label class="col-sm-2 col-xs-3  control-label">EncodingAESKey</label>
+        <label class="col-sm-2 col-xs-3 control-label">Encoding<span class="nowrap">AESKey</span></label>
         <div class='col-sm-8'>
             <input type="text" name="wechat_encodingaeskey" title="请输入43位消息加密密钥"
                    placeholder="消息加密密钥，若开启了消息加密时必需填写（可选）" value="{:sysconf('wechat_encodingaeskey')}"
diff --git a/application/wechat/view/config.pay.html b/application/wechat/view/config.pay.html
index 1b7a5c64c..d50afdea8 100644
--- a/application/wechat/view/config.pay.html
+++ b/application/wechat/view/config.pay.html
@@ -16,11 +16,11 @@
 {/block}
 
 {block name="content"}
-<form onsubmit="return false;" action="{:request()->url(true)}" data-auto="true" method="post"
+<form onsubmit="return false;" action="{$_url_}" data-auto="true" method="post"
       class='form-horizontal' style='padding-top:20px'>
 
     <div class="form-group">
-        <label class="col-sm-2 control-label">MCH_ID(商户ID)</label>
+        <label class="col-sm-2 col-xs-3 control-label">MCH_ID <span class="nowrap">(商户ID)</span></label>
         <div class='col-sm-8'>
             <input type='tel' placeholder="请输入10位商户MCH_ID（必填）" title='请输入10位数字商户MCH_ID'
                    required="required" pattern="^\d{10}$" maxlength='10' name='wechat_mch_id'
@@ -34,7 +34,7 @@
     <div class="hr-line-dashed"></div>
 
     <div class="form-group">
-        <label class="col-sm-2 control-label">PartnerKey(商户密钥)</label>
+        <label class="col-sm-2 col-xs-3 control-label">PartnerKey <span class="nowrap">(商户密钥)</span></label>
         <div class='col-sm-8'>
             <input type='password' placeholder="请输入32位商户支付密钥（必填）" required title='请输入32位商户支付密钥'
                    pattern="^.{32}$" maxlength="32" name='wechat_partnerkey'
@@ -48,8 +48,8 @@
     <div class="hr-line-dashed"></div>
 
     <div class="form-group">
-        <label class="col-sm-2 control-label">Cert(双向证书)</label>
-        <div class="col-sm-8" style="min-width:540px">
+        <label class="col-sm-2 col-xs-3 control-label">Apiclient <span class="nowrap">(双向证书)</span></label>
+        <div class="col-sm-8">
             <input title="apiclient_key.pem" type="hidden" name="wechat_cert_key_md5">
             <input title="apiclient_cert.pem" type="hidden" name="wechat_cert_cert_md5">
             <button data-file="one" data-type="pem" data-field="wechat_cert_key_md5"
diff --git a/application/wechat/view/fans.index.html b/application/wechat/view/fans.index.html
index 3cb679345..a7d03ade0 100644
--- a/application/wechat/view/fans.index.html
+++ b/application/wechat/view/fans.index.html
@@ -11,7 +11,7 @@
 {block name="content"}
 
 <!-- 表单搜索 开始 -->
-<form class="animated form-search" action="{:request()->url(true)}" onsubmit="return false" method="get">
+<form class="animated form-search" action="{$_url_}" onsubmit="return false" method="get">
 
     <div class="row">
         <div class="col-xs-3">