From 283d28f23998d5e9680499b24bca97d419fe9cb3 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Mon, 29 Apr 2019 01:07:52 +0800
Subject: [PATCH] wallet

---
 .../plugins/view/wallet/wallet/nav.html       |  4 ++--
 public/static/plugins/css/wallet/wallet.css   | 21 +++++++++++++++----
 public/static/plugins/js/wallet/wallet.js     |  5 +++--
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/application/plugins/view/wallet/wallet/nav.html b/application/plugins/view/wallet/wallet/nav.html
index ebe3bd401..06e4952f4 100755
--- a/application/plugins/view/wallet/wallet/nav.html
+++ b/application/plugins/view/wallet/wallet/nav.html
@@ -47,7 +47,7 @@
             <form class="am-form form-validation-plugins-recharge-pay" action="{{:MyUrl('admin/order/pay')}}" method="POST" request-type="ajax-reload">
                 <!-- 支付方式 -->
                 <div class="business-item am-form-group">
-                    <h3>选择支付</h3>
+                    <label>选择支付</label>
                     {{if !empty($buy_payment_list)}}
                         <ul class="payment-list" data-type="payment">
                             {{foreach $buy_payment_list as $payment}}
@@ -63,7 +63,7 @@
                     {{if empty($buy_payment_list)}}
                         <div class="table-no"><i class="am-icon-warning"></i> 没有支付方式</div>
                     {{/if}}
-                    <input type="number" name="payment_id" data-validation-message="请选择支付方式" value="" required />
+                    <input type="number" name="payment_id" min="1" data-validation-message="请选择支付方式" value="0" required />
                 </div>
 
                 <div class="am-form-group">
diff --git a/public/static/plugins/css/wallet/wallet.css b/public/static/plugins/css/wallet/wallet.css
index b35ef73a0..668a72175 100644
--- a/public/static/plugins/css/wallet/wallet.css
+++ b/public/static/plugins/css/wallet/wallet.css
@@ -2,7 +2,7 @@
 .thin, .pay-list { overflow:hidden; }
 .thin .so { width:66%; }
 .thin_sub { font-weight:100; margin:10px 0px 0px 10px; cursor: pointer; }
-.so-list { width:100%; margin-top: 20px; }
+.so-list { width:100%; margin-top: 10px; }
 .so-list * { font-size:1.2rem !important; }
 .so-list input { height:28px; display:inline !important; }
 .time input, .so-list .chosen-container { background:#FFF !important; }
@@ -31,9 +31,21 @@
     .so-list select { width: calc(100% - 44px); display: -webkit-inline-box; }
 }
 
+/**
+ * 列表
+ */
+.user-content-body .data-list {
+    margin-top: 10px;
+}
+
 /**
  * 账户信息
  */
+.user-content-body .am-alert-secondary {
+    background-color: #f6f6f6;
+    border-color: #ececec;
+    margin-bottom: 20px;
+}
 .user-content-body .available .integral-value {
     color: #4CAF50;
 }
@@ -48,10 +60,10 @@
     font-weight: 700;
 }
 .user-content-body .integral-tips {
-    color: #c27300;
-    background: #e7e3d9;
+    color: #d7b27d;
+    background: #f8f5ee;
     padding: 3px 6px;
-    border: 1px solid #e7d8c2;
+    border: 1px solid #f4eadb;
     margin-left: 10px;
 }
 
@@ -87,6 +99,7 @@
 /**
  * 业务弹窗
  */
+.user-content-body .business-item label { margin-bottom: 0px; }
 .user-content-body .business-item h3 { font-weight: 700; }
 .user-content-body .business-item ul { padding: 5px 1px; overflow: hidden; }
 .user-content-body .business-item ul li { border:1px solid transparent ;overflow: hidden; float: left; cursor: pointer; padding: 5px; border: 1px solid #eee; margin: 0 10px 10px 0; background: #fff; }
diff --git a/public/static/plugins/js/wallet/wallet.js b/public/static/plugins/js/wallet/wallet.js
index 3dc108a89..ed453ac92 100644
--- a/public/static/plugins/js/wallet/wallet.js
+++ b/public/static/plugins/js/wallet/wallet.js
@@ -6,13 +6,14 @@ $(function()
     // 混合列表选择
     $('.business-item ul li').on('click', function()
     {
+        var value = '';
         if($(this).hasClass('selected'))
         {
-            $('form.form-validation-plugins-recharge-pay input[name='+$(this).parent().data('type')+'_id]').val(0);
             $(this).removeClass('selected');
         } else {
-            $('form.form-validation-plugins-recharge-pay input[name='+$(this).parent().data('type')+'_id]').val($(this).data('value'));
+            value = $(this).data('value');
             $(this).addClass('selected').siblings('li').removeClass('selected');
         }
+        $('form.form-validation-plugins-recharge-pay input[name='+$(this).parent().data('type')+'_id]').val(value).blur();
     });
 });
\ No newline at end of file