From b9ef6ab5ff50a9f9bd14c134ed533424a5a21dc3 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Tue, 18 Sep 2018 17:52:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/View/Default/Payment/SaveInfo.html      | 15 +++++++++++++--
 .../Application/Library/Payment/Alipay.class.php  | 10 ++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/service/Application/Admin/View/Default/Payment/SaveInfo.html b/service/Application/Admin/View/Default/Payment/SaveInfo.html
index 73f65cb6a..83097418e 100755
--- a/service/Application/Admin/View/Default/Payment/SaveInfo.html
+++ b/service/Application/Admin/View/Default/Payment/SaveInfo.html
@@ -59,9 +59,10 @@
 										</foreach>
 									<else />
 										<input
+											class="am-radius"
 											type="{{$element.type}}"
 											name="plug_{{$element.name}}"
-											value="<if condition="isset($data['config'][$element['name']])">{{$data['config'][$element['name']]}}<else />{{$element.default}}</if>"
+											value="<if condition="isset($data['config'][$element['name']])">{{$data['config'][$element['name']]}}<else /><if condition="isset($element['default'])">{{$element.default}}</if></if>"
 											<if condition="isset($element['placeholder'])">placeholder="{{$element.placeholder}}"</if>
 											<if condition="isset($element['message'])">data-validation-message="{{$element.message}}"</if>
 											<if condition="isset($element['is_required']) and $element['is_required'] eq 1">required</if>
@@ -71,7 +72,7 @@
 								<case value="select">
 									<if condition="!empty($element['element_data']) and is_array($element['element_data'])">
 										<select
-											class="chosen-select"
+											class="chosen-select am-radius"
 											name="plug_{{$element.name}}"
 											<if condition="isset($element['message'])">data-validation-message="{{$element.message}}"</if>
 											<if condition="isset($element['placeholder'])">data-placeholder="{{$element.placeholder}}"<else />{{:L('common_select_can_choose')}}</if>
@@ -94,6 +95,16 @@
 										</select>
 									</if>
 								</case>
+								<case value="textarea">
+									<textarea
+										class="am-radius"
+										name="plug_{{$element.name}}"
+										<if condition="isset($element['rows'])">rows="{{$element.rows}}"</if>
+										<if condition="isset($element['maxlength'])">maxlength="{{$element.maxlength}}"</if>
+										<if condition="isset($element['maxlength'])">maxlength="{{$element.maxlength}}"</if>
+										<if condition="isset($element['placeholder'])">placeholder="{{$element.placeholder}}"</if>
+									><if condition="isset($data['config'][$element['name']])">{{$data['config'][$element['name']]}}<else /><if condition="isset($element['default'])">{{$element.default}}</if></if></textarea>
+								</case>
 							</switch>
 						</div>
 					</foreach>
diff --git a/service/Application/Library/Payment/Alipay.class.php b/service/Application/Library/Payment/Alipay.class.php
index ef4334a4a..0e9cd8622 100644
--- a/service/Application/Library/Payment/Alipay.class.php
+++ b/service/Application/Library/Payment/Alipay.class.php
@@ -87,6 +87,16 @@ class Alipay
                 'is_required'   => 0,  // 是否需要强制填写/选择
                 'message'       => '请填写测试输入框不需要验证', // 错误提示（is_required=1方可有效）
             ],
+            [
+                'element'       => 'textarea',
+                'default'       => '',
+                'name'          => 'rsa_private',
+                'placeholder'   => 'RSA证书',
+                'title'         => 'RSA证书',
+                'minlength'     => 10,
+                //'maxlength'     => 300,  // 不填则不限
+                'rows'          => 6,
+            ],
             [
                 'element'       => 'input',
                 'type'          => 'checkbox',