diff --git a/application/plugins/view/wallet/public/nav.html b/application/plugins/view/wallet/public/nav.html index df413dee3379c2da7b6079ee2a5d101b2d0f51c4..360c6907db3cc0c6f2a92775910814208780abe2 100755 --- a/application/plugins/view/wallet/public/nav.html +++ b/application/plugins/view/wallet/public/nav.html @@ -12,10 +12,10 @@
{{if in_array($plugins_control, ['wallet', 'recharge'])}} - + {{/if}} {{if in_array($plugins_control, ['wallet', 'cash'])}} - 申请提现 + 提现 {{/if}}
@@ -33,7 +33,7 @@ 冻结金额 {{$user_wallet.frozen_money}} - 一般积分交易中、提现、交易并未完成,锁定相应的积分 + 一般积分预交易中、提现、交易并未完成,冻结相应的金额
赠送金额 diff --git a/application/plugins/view/wallet/walletadmin/saveinfo.html b/application/plugins/view/wallet/walletadmin/saveinfo.html index 2b21b0b5aaa22ce1e787c1a19c4fdca25ad807db..759b89feef4c07301bc32f0f24ebd4fc92b878cd 100644 --- a/application/plugins/view/wallet/walletadmin/saveinfo.html +++ b/application/plugins/view/wallet/walletadmin/saveinfo.html @@ -55,6 +55,11 @@
+
+ + +
+
diff --git a/application/plugins/wallet/service/WalletService.php b/application/plugins/wallet/service/WalletService.php index ec9a7ec5309148065136d83157698da846c55314..a4262afeb9879ed470fbacacdefb7b5ed63ae429 100644 --- a/application/plugins/wallet/service/WalletService.php +++ b/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']); + } } } diff --git a/public/static/plugins/css/wallet/index/common.css b/public/static/plugins/css/wallet/index/common.css index 1ce33da30762e9ffbe7269ab3e9c77a3150e8672..325e9d0847df7d8c47fc81546d46b084a746de70 100644 --- a/public/static/plugins/css/wallet/index/common.css +++ b/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; + } +} /** * 业务弹窗