钱包优化

application/plugins/view/wallet/public/nav.html

@@ -12,10 +12,10 @@
 
     <div class="am-topbar-right">
         {{if in_array($plugins_control, ['wallet', 'recharge'])}}
-            <button class="am-btn am-btn-secondary am-topbar-btn am-btn-sm am-icon-shield" data-am-modal="{target: '#plugins-recharge-pay-modal', width: 260, height: 130}"> 在线充值</button>
+            <button class="am-btn am-btn-secondary am-topbar-btn am-btn-sm am-icon-shield" data-am-modal="{target: '#plugins-recharge-pay-modal', width: 260, height: 130}"> 充值</button>
         {{/if}}
         {{if in_array($plugins_control, ['wallet', 'cash'])}}
-            <a class="am-btn am-btn-success am-topbar-btn am-btn-sm am-icon-money"> 申请提现</a>
+            <a class="am-btn am-btn-success am-topbar-btn am-btn-sm am-icon-money"> 提现</a>
         {{/if}}
     </div>
 </ul>
@@ -33,7 +33,7 @@
             <span>冻结金额</span>
             <span class="integral-value">{{$user_wallet.frozen_money}}</span>
             <em>元</em>
-            <span class="integral-tips">一般积分交易中、提现、交易并未完成，锁定相应的积分</span>
+            <span class="integral-tips">一般积分预交易中、提现、交易并未完成，冻结相应的金额</span>
         </div>
         <div class="give">
             <span>赠送金额</span>

application/plugins/view/wallet/walletadmin/saveinfo.html

@@ -55,6 +55,11 @@
                       <textarea class="am-radius" name="msg" rows="3" maxlength="80" placeholder="最多80个字符" data-validation-message="操作原因格式最多 80 个字符"></textarea>
                     </div>
 
+                    <div class="am-form-group">
+                        <label class="block">发送站内信</label>
+                        <input name="is_send_message" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch checked="true" />
+                    </div>
+
                     <div class="am-form-group am-form-group-refreshing">
                         <input type="hidden" name="id" {{if !empty($data['id'])}} value="{{$data.id}}"{{/if}} />
                         <button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm w100" data-am-loading="{loadingText:'处理中...'}">保存</button>

application/plugins/wallet/service/WalletService.php

@@ -326,6 +326,9 @@ class WalletService
             ['field' => 'give_money', 'money_type' => 2],
         ];
 
+        // 是否发送消息
+        $is_send_message = (isset($params['is_send_message']) && $params['is_send_message'] == 1) ? 1 : 0;
+
         // 操作原因
         $operation_msg = empty($params['msg']) ? '' : ' [ '.$params['msg'].' ]';
         foreach($money_field as $v)
@@ -352,7 +355,10 @@ class WalletService
                 }
 
                 // 消息通知
-                MessageService::MessageAdd($wallet['user_id'], '账户余额变动', $log_data['msg'], 0, $wallet['id']);
+                if($is_send_message == 1)
+                {
+                    MessageService::MessageAdd($wallet['user_id'], '账户余额变动', $log_data['msg'], 0, $wallet['id']);
+                }
             }
         }
 

public/static/plugins/css/wallet/index/common.css

@@ -16,11 +16,11 @@
 .chosen-container-single .chosen-single, .so-list select { height: 28px; line-height: 28px; width: 100%; }
 .reset-submit { margin-left: 20px; }
 .so-list select { padding: 0 0 0 8px; }
-@media only screen and (min-width: 641px){
+@media only screen and (min-width: 641px) {
     .so-list .chosen-container, .so-list select { width:217px !important; display: -webkit-inline-box; }
     .thin_sub:hover { color:#F60; }
 }
-@media only screen and (max-width: 641px){
+@media only screen and (max-width: 641px) {
     .so-list input { width:40% !important; }
     .so-list td { width:100%; display:block; }
     .so-list tr td:last-child { margin-top:10px; }
@@ -52,6 +52,7 @@
 }
 .user-content-body .am-nav .am-topbar-right {
     margin-right: 0;
+    text-align: right;
 }
 .user-content-body .am-nav .am-topbar-right .am-btn:not(:last-child) {
     margin-right: 5px;
@@ -59,6 +60,15 @@
 .user-content-body .am-nav .am-topbar-right .am-topbar-btn {
     margin-top: 0;
 }
+@media only screen and (max-width: 641px) {
+    .user-content-body .am-nav li a {
+        font-size: 12px;
+        padding: 2px 5px;
+    }
+    .user-content-body .am-nav .am-topbar-right .am-topbar-btn {
+        padding: 2px 5px;
+    }
+}
 
 /**
  * 账户信息
@@ -79,12 +89,17 @@
     font-weight: 700;
 }
 .user-content-body .integral-tips {
-    color: #d7b27d;
-    background: #f8f5ee;
+    color: #ff9600;
+    background: #fdf8ed;
     padding: 3px 6px;
     border: 1px solid #f4eadb;
     margin-left: 10px;
 }
+@media only screen and (max-width: 641px) {
+    .user-content-body .integral-tips {
+        display: none;
+    }
+}
 
 /**
  * 业务弹窗