From ee4e8c49d26e357c24b0714da55e957bbb3e6228 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Sun, 28 Apr 2019 15:26:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/default/userintegral/index.html      | 13 ++++++++++++
 .../static/index/default/css/userintegral.css | 21 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/application/index/view/default/userintegral/index.html b/application/index/view/default/userintegral/index.html
index 45eac4992..36dd1c2cc 100755
--- a/application/index/view/default/userintegral/index.html
+++ b/application/index/view/default/userintegral/index.html
@@ -22,6 +22,19 @@
     <!-- content start -->
     <div class="user-content">
         <div class="user-content-body">
+            <div class="am-alert am-alert-secondary" data-am-alert>
+                <div class="available">
+                    <span>可用积分</span>
+                    <span class="integral-value">{{$user.integral}}</span>
+                    <span class="integral-tips">正常可以使用的积分</span>
+                </div>
+                <div class="locking">
+                    <span>锁定积分</span>
+                    <span class="integral-value">{{$user.locking_integral}}</span>
+                    <span class="integral-tips">一般积分交易中，交易并未完成、锁定相应的积分</span>
+                </div>
+            </div>
+
             <form class="am-form form-validation" method="post" action="{{:MyUrl('index/userintegral/index')}}" request-type="form">
                 <div class="thin">
                     <div class="am-input-group am-input-group-sm am-fl so">
diff --git a/public/static/index/default/css/userintegral.css b/public/static/index/default/css/userintegral.css
index df9904db5..8e7f8eebf 100755
--- a/public/static/index/default/css/userintegral.css
+++ b/public/static/index/default/css/userintegral.css
@@ -29,4 +29,25 @@
     .so-list tr td:last-child { padding-top:0px !important; }
     .chosen-container-single .chosen-search input[type="text"] { width: 100% !important; }
     .so-list select { width: calc(100% - 44px); display: -webkit-inline-box; }
+}
+
+.user-content-body .available .integral-value {
+    color: #4CAF50;
+}
+.user-content-body .locking {
+    margin-top: 5px;
+}
+.user-content-body .locking .integral-value {
+    color: #FF9800;
+}
+.user-content-body .integral-value {
+    font-size: 18px;
+    font-weight: 700;
+}
+.user-content-body .integral-tips {
+    color: #c27300;
+    background: #e7e3d9;
+    padding: 3px 6px;
+    border: 1px solid #e7d8c2;
+    margin-left: 5px;
 }
\ No newline at end of file
-- 
GitLab