diff --git a/application/index/view/default/index/index.html b/application/index/view/default/index/index.html index ac1ee58e26eb82042014743e7f7057523a8edec9..2e542b8f37bbc375052d0a9df191fc4fcc8796f7 100755 --- a/application/index/view/default/index/index.html +++ b/application/index/view/default/index/index.html @@ -154,11 +154,7 @@ {{if !empty($floor['items'])}} {{foreach $floor.items as $category_key=>$category}} {{if $category_key lt 6 and isset($category['is_home_recommended']) and $category['is_home_recommended'] eq 1}} - - - {{:mb_substr($category['name'], 0, 4, 'utf-8')}} - - + {{:mb_substr($category['name'], 0, 4, 'utf-8')}} {{/if}} {{/foreach}} {{/if}} diff --git a/application/plugins/view/wallet/walletadmin/saveinfo.html b/application/plugins/view/wallet/walletadmin/saveinfo.html index 5337bc366774b68349654a6a02e8e6af4c78cc1c..b86800b328dc02bd0db6ec72954ae7e4c02a177e 100644 --- a/application/plugins/view/wallet/walletadmin/saveinfo.html +++ b/application/plugins/view/wallet/walletadmin/saveinfo.html @@ -8,22 +8,36 @@ 返回 -
+
-
+ +
+
+ 有效金额： + {{$data.normal_money}} +
+
+ 冻结金额： + {{$data.frozen_money}} +
+
+ 赠送金额： + {{$data.give_money}} +
+
- +
- +
- +
diff --git a/application/plugins/wallet/Walletadmin.php b/application/plugins/wallet/Walletadmin.php index 07057ea040469e90ac98f5197652f8a8570b38c3..530dea37fb523ef168083f94e4b7654762c0875c 100644 --- a/application/plugins/wallet/Walletadmin.php +++ b/application/plugins/wallet/Walletadmin.php @@ -86,10 +86,27 @@ class Walletadmin extends Controller */ public function saveinfo($params = []) { - // 静态数据 - $this->assign('wallet_status_list', WalletService::$wallet_status_list); - - return $this->fetch('../../../plugins/view/wallet/walletadmin/saveinfo'); + if(!empty($params['id'])) + { + $data_params = array( + 'm' => 0, + 'n' => 1, + 'where' => ['id'=>intval($params['id'])], + ); + $data = WalletService::WalletList($data_params); + if(empty($data['data'][0])) + { + return '钱包有误'; + } + $this->assign('data', $data['data'][0]); + + // 静态数据 + $this->assign('wallet_status_list', WalletService::$wallet_status_list); + + return $this->fetch('../../../plugins/view/wallet/walletadmin/saveinfo'); + } else { + return '钱包id有误'; + } } } ?> \ No newline at end of file diff --git a/public/static/index/default/css/index.css b/public/static/index/default/css/index.css index d055a4de053dbbdd46147b6493d875b2ddabe7cc..d1c1f6c44992257cc86de2d9d23166ef4f7bd882 100755 --- a/public/static/index/default/css/index.css +++ b/public/static/index/default/css/index.css @@ -63,10 +63,8 @@ text-align: center;float:none} .recommendation .info h3{font-size:12px;color:#F03726} /*小标签*/ -.list .word{padding: 5px 10px; overflow: hidden;} -.word .outer {margin: 5px; width: 50px;height: 50px;text-align: center;color: #2f2f2f;background-color: #fff;border-radius: 50px; display: inline-block; } -.word .outer .inner {display: table-cell;vertical-align: middle;width:50px;height:50px;} -.word .outer .text {font-weight: 400;display: inline-block; max-width:35px;margin: 0 auto;} +.list .word{padding: 5px; overflow: hidden;} +.word .outer {margin: 5px; width: calc(50% - 12px); height: 28px; line-height: 28px; text-align: center;color: #fff;background-color: rgba(0, 0, 0, 0.03);border-radius: 3px; display: inline-block; border: 1px solid #fff; text-decoration: none; overflow: hidden;} /*楼层左侧*/ .list .outer-con .describe { color: #fff; max-width: 100%; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 3; -webkit-box-orient: vertical; } @@ -151,11 +149,11 @@ text-align: center;float:none} .flood .list img {position: absolute;top:auto;left:0;bottom:0;max-width: 100%;} /*楼层 hover*/ - .word .outer:hover { background: #f9918f; color: #fff !important; -webkit-transition: background .2s ease-in; -moz-transition: background .2s ease-in; -ms-transition: background .2s ease-in; -o-transition: background .2s ease-in; transition: background .2s ease-in; } - .goods-items:before { content: ""; position: absolute; top: 0; left: -100%; display: block; height: 100%; width: 50%; z-index: 999; background-color: rgba(255, 255, 255, 0.3); -webkit-transition: all 1s ease 0s; -moz-transition: all 1s ease 0s; -o-transition: all 1s ease 0s; transition: all 1s ease 0s; -ms-transform: skewX(-20deg); -webkit-transform: skewX(-20deg); -o-transform: skewX(-20deg); transform: skewX(-20deg); background: -webkit-linear-gradient(90deg, transparent 0, rgba(255, 255, 255, 0.4) 100%); background: -moz-linear-gradient(90deg, transparent 0, rgba(255, 255, 255, 0.4) 100%); background: -o-linear-gradient(90deg, transparent 0, rgba(255, 255, 255, 0.4) 100%); background: linear-gradient(90deg, transparent 0, rgba(255, 255, 255, 0.4) 100%); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=transparent, endColorstr=rgba(255, 255, 255, 0.4),GradientType=0.9); } - .goods-items:hover:before { left: 100%; } + .word .outer:hover { background: #fff; color: #d2354c !important; -webkit-transition: background .2s ease-in; -moz-transition: background .2s ease-in; -ms-transition: background .2s ease-in; -o-transition: background .2s ease-in; transition: background .2s ease-in; -webkit-transition: color .2s ease-in; -moz-transition: color .2s ease-in; -ms-transition: color .2s ease-in; -o-transition: color .2s ease-in; transition: color .2s ease-in; } + /*.goods-items:before { content: ""; position: absolute; top: 0; left: -100%; display: block; height: 100%; width: 50%; z-index: 999; background-color: rgba(255, 255, 255, 0.3); -webkit-transition: all 1s ease 0s; -moz-transition: all 1s ease 0s; -o-transition: all 1s ease 0s; transition: all 1s ease 0s; -ms-transform: skewX(-20deg); -webkit-transform: skewX(-20deg); -o-transform: skewX(-20deg); transform: skewX(-20deg); background: -webkit-linear-gradient(90deg, transparent 0, rgba(255, 255, 255, 0.4) 100%); background: -moz-linear-gradient(90deg, transparent 0, rgba(255, 255, 255, 0.4) 100%); background: -o-linear-gradient(90deg, transparent 0, rgba(255, 255, 255, 0.4) 100%); background: linear-gradient(90deg, transparent 0, rgba(255, 255, 255, 0.4) 100%); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=transparent, endColorstr=rgba(255, 255, 255, 0.4),GradientType=0.9); } + .goods-items:hover:before { left: 100%; }*/ .goods-items:hover { z-index: 99; -webkit-box-shadow: 0 15px 30px rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 15px 30px rgba(0, 0, 0, 0.1); box-shadow: 0 15px 30px rgba(0, 0, 0, 0.1); -webkit-transition: box-shadow .2s ease-in; -moz-transition: box-shadow .2s ease-in; -ms-transition: box-shadow .2s ease-in; -o-transition: box-shadow .2s ease-in; transition: box-shadow .2s ease-in; } - .flood .list img { -webkit-transition: transform .2s ease-in; -moz-transition: transform .2s ease-in; -ms-transition: transform .2s ease-in; -o-transition: transform .2s ease-in; transition: transform .2s ease-in; } + .flood .list img { -webkit-transition: transform .6s ease-in; -moz-transition: transform .6s ease-in; -ms-transition: transform .6s ease-in; -o-transition: transform .6s ease-in; transition: transform .6s ease-in; } .flood .list img:hover { transform: scale(1.1); -moz-transform: scale(1.1); -webkit-transform: scale(1.1); -o-transform: scale(1.1); -ms-transform: scale(1.1); } } @@ -259,6 +257,7 @@ text-align: center;float:none} /*楼层左侧*/ .flood .list { width: 222px; height: 456px; } + .list .word{ padding: 5px 10px; } /*楼层商品*/ .flood .goods-list .goods-items { height: 228px; } @@ -313,12 +312,10 @@ text-align: center;float:none} /*楼层*/ .flood .list { width: 100%; height: auto; } - .word .outer { display: inline-flex; padding: 5px 0; height: auto;background-color: transparent; width: 32.33%; margin: 0; } - .word .outer .inner { color: #2f2f2f; background-color: #fff; border-radius: 50px; margin: 0 auto; padding: 0 12px;} + .list .word { padding: 10px; } + .word .outer { width: calc(33% - 12px); } .flood .goods-list .goods-items { width: 50%; float: left; padding: 10px; border-bottom: 1px solid #eee; } .flood .goods-list .goods-items img { padding: 10px; } .flood .goods-list .goods-items:nth-of-type(2n + 1) { border-right: 1px solid #eee; } .flood .goods-list .goods-items:nth-of-type(2n) { border-left: 1px solid transparent; } - .list .word { padding: 10px 0; } - .word .outer .text { display: table-cell; vertical-align: middle; width: 35px; height: 50px; } } diff --git a/public/static/plugins/css/wallet/admin/walletadmin.css b/public/static/plugins/css/wallet/admin/walletadmin.css index 8de1c26cfccc44cd9bbaee3632f96f58c52f06db..9a9e9d69103ff5d5b16b823f011ab16ef2459fd0 100644 --- a/public/static/plugins/css/wallet/admin/walletadmin.css +++ b/public/static/plugins/css/wallet/admin/walletadmin.css @@ -30,15 +30,32 @@ max-height: 75px; margin-right: 5px; } -.wallet-content table.am-table .money span { + +/** + * 金额 + */ +.wallet-content .normal-money, +.wallet-content .frozen-money, +.wallet-content .give-money { font-weight: 700; } -.wallet-content table.am-table .normal-money { +.wallet-content .normal-money { color: #4CAF50; } -.wallet-content table.am-table .frozen-money { +.wallet-content .frozen-money { color: #FF9800; } -.wallet-content table.am-table .give-money { +.wallet-content .give-money { color: #666; -} \ No newline at end of file +} + +/** + * 编辑 + */ + + +@media only screen and (min-width: 641px) { + .wallet-content form .am-alert { + margin: 0; + } +}