From 15f7763f4b2b12d52d7ccb3e31fd61f9bb83d857 Mon Sep 17 00:00:00 2001
From: Xia Kaixiang <kaixiang.xia@supwisdom.com>
Date: Fri, 17 May 2019 12:19:54 +0800
Subject: [PATCH] =?utf8?q?=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../supwisdom/dlpay/api/dao/PaytypeConfigDao.java    |  2 ++
 .../dlpay/system/service/impl/ParamServiceImpl.java  |  2 +-
 .../templates/system/param/paytypeconfig.html        | 12 ++++++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/supwisdom/dlpay/api/dao/PaytypeConfigDao.java b/src/main/java/com/supwisdom/dlpay/api/dao/PaytypeConfigDao.java
index 021d3985..50cf1e18 100644
--- a/src/main/java/com/supwisdom/dlpay/api/dao/PaytypeConfigDao.java
+++ b/src/main/java/com/supwisdom/dlpay/api/dao/PaytypeConfigDao.java
@@ -15,4 +15,6 @@ public interface PaytypeConfigDao extends JpaRepository<TPaytypeConfig, TPaytype
     List<TPaytypeConfig> getByPaytype(String paytype);
 
     TPaytypeConfig getByPaytypeAndAndConfigid(String paytype, String configid);
+
+    List<TPaytypeConfig> getByPaytypeOrderByConfigid(String paytype);
 }
diff --git a/src/main/java/com/supwisdom/dlpay/system/service/impl/ParamServiceImpl.java b/src/main/java/com/supwisdom/dlpay/system/service/impl/ParamServiceImpl.java
index 4fff8ced..72cbb378 100644
--- a/src/main/java/com/supwisdom/dlpay/system/service/impl/ParamServiceImpl.java
+++ b/src/main/java/com/supwisdom/dlpay/system/service/impl/ParamServiceImpl.java
@@ -187,7 +187,7 @@ public class ParamServiceImpl implements ParamService {
   @Override
   public List<TPaytypeConfig> getPaytypeConfigList(String paytype) {
     if (!StringUtil.isEmpty(paytype)) {
-      List<TPaytypeConfig> list = paytypeConfigDao.getByPaytype(paytype.trim());
+      List<TPaytypeConfig> list = paytypeConfigDao.getByPaytypeOrderByConfigid(paytype.trim());
       if (!StringUtil.isEmpty(list))
         return list;
     }
diff --git a/src/main/resources/templates/system/param/paytypeconfig.html b/src/main/resources/templates/system/param/paytypeconfig.html
index 180e578d..c087c949 100644
--- a/src/main/resources/templates/system/param/paytypeconfig.html
+++ b/src/main/resources/templates/system/param/paytypeconfig.html
@@ -8,8 +8,10 @@
     </div>
 
     <div class="layui-form-item" th:if="${configlist.size()} gt 0" th:each="config:${configlist}">
-        <label class="layui-form-label" th:text="${config.configid}">参数名</label>
-        <div class="layui-input-block">
+        <div class="layui-input-block" style="margin:0;display: inline;float: left;width: 20%;">
+            <label class="layui-form-label" style="float: right;width: 100%;" th:text="${config.configid}">参数名</label>
+        </div>
+        <div class="layui-input-block" style="margin:0;display: inline;float: right;width: 80%;">
             <input type="text" th:name="${config.configid}" class="layui-input" th:value="${config.configValue}"/>
         </div>
     </div>
@@ -30,12 +32,14 @@
         form.on('submit(form-submit)', function (data) {
             layer.load(2);
             var vdata = data.field;
-            if(vdata.length <=0){
-                admin.finishPopupCenter();
+            if(JSON.stringify(vdata)=="{}"){
+                layer.closeAll('loading');
+                admin.closePopupCenter();
                 return; //无配置项，直接关闭
             }
             var token=$("meta[name='_csrf_token']").attr("value");
             vdata["hid_paytype"] = $("#hid_paytype").val();
+            console.log('addpaytype:',vdata);
             debugger
             $.ajax({
                 type : "POST",
-- 
2.17.1