diff --git a/application/plugins/view/membershiplevel/admin/index.html b/application/plugins/view/membershiplevel/admin/index.html index 18cb63145928fc3ba45aa83abf5528df8656a097..c86608724100dfb8a013572ade2f8c51745b434a 100755 --- a/application/plugins/view/membershiplevel/admin/index.html +++ b/application/plugins/view/membershiplevel/admin/index.html @@ -10,7 +10,7 @@
-
+
基础数据 编辑 diff --git a/application/plugins/view/wallet/admin/index.html b/application/plugins/view/wallet/admin/index.html index 18cb63145928fc3ba45aa83abf5528df8656a097..92907895991733ef7f520cf1e6e33d18926e7041 100755 --- a/application/plugins/view/wallet/admin/index.html +++ b/application/plugins/view/wallet/admin/index.html @@ -4,46 +4,82 @@
- 会员等级 + 钱包 返回 -
+
-
+
基础数据 - 编辑 + 编辑
-
- -
- {{if isset($data['level_rules']) and isset($members_level_rules_list[$data['level_rules']])}} - {{:$members_level_rules_list[$data['level_rules']]['name']}} - {{else /}} - 未设置，默认[ 积分（可用积分）] - {{/if}} -
-
- -
- -
- -
-
+
    +
  • +
    + +
    + {{if isset($data['is_recharge']) and $data['is_recharge'] eq 1}} + 是 + {{else /}} + 否 + {{/if}} +
    +
    +
    • +
  • +
    + +
    + {{if isset($data['is_cash']) and $data['is_cash'] eq 1}} + 是 + {{else /}} + 否 + {{/if}} +
    +
    +
    • +
  • +
    + +
    + {{if isset($data['is_pay']) and $data['is_pay'] eq 1}} + 是 + {{else /}} + 否 + {{/if}} +
    +
    +
    • +
  • +
    + +
    + {{if isset($data['recharge_give_type']) and isset($data['recharge_give_value']) and $data['recharge_give_value'] gt 0}} + {{if $data['recharge_give_type'] eq 0}} + 固定金额（{{$data.recharge_give_value}}元） + {{elseif $data['recharge_give_type'] eq 1 /}} + 比例（{{$data.recharge_give_value}}%） + {{/if}} + {{else /}} + 不赠送 + {{/if}} +
    +
    +
    • +
- -
+ +
- 会员等级 - 编辑 + 管理
- + hello
diff --git a/application/plugins/view/wallet/admin/saveinfo.html b/application/plugins/view/wallet/admin/saveinfo.html index 653055f9ff8462eb965c195c1a3fd56d6156bbee..b92b222844d0780c4bce21d63fb550f63e049841 100755 --- a/application/plugins/view/wallet/admin/saveinfo.html +++ b/application/plugins/view/wallet/admin/saveinfo.html @@ -4,35 +4,65 @@
-
+ - 会员等级 - 返回 + 钱包 + 返回
- +
- {{foreach $members_level_rules_list as $v}} + {{foreach $is_whether_list as $v}} {{/foreach}}
-
- -
    - {{if !empty($data['default_level_images'])}} -
  • - - - × -
    • - {{/if}} -
-
+上传图片
+
+ +
+ {{foreach $is_whether_list as $v}} + + {{/foreach}} +
+
+ +
+ +
+ {{foreach $is_whether_list as $v}} + + {{/foreach}} +
+
+ +
+ +

+ 赠送金额规则，小于0或空则不赠送
+ + 固定金额：填写相应的金额即可
+ 比例：填写百分比数值，如 10% 则填写 10（小数保留两位、四舍五入） + +

+
+
+ +
+ {{foreach $recharge_give_type_list as $v}} + + {{/foreach}} +
+
diff --git a/application/plugins/wallet/Admin.php b/application/plugins/wallet/Admin.php index b065c1594dceeb34541778e2999e250266d6d1a3..2bc8750e88c4cb957bc7bf5d73a2d9d39091de25 100755 --- a/application/plugins/wallet/Admin.php +++ b/application/plugins/wallet/Admin.php @@ -11,7 +11,7 @@ namespace app\plugins\wallet; use think\Controller; -use app\plugins\wallet\Service; +use app\plugins\wallet\service\BaseService; use app\service\PluginsService; /** @@ -33,12 +33,9 @@ class Admin extends Controller */ public function index($params = []) { - $ret = PluginsService::PluginsData('wallet', Service::$base_config_attachment_field, false); + $ret = PluginsService::PluginsData('wallet', '', false); if($ret['code'] == 0) - { - // 等级规则 - $this->assign('members_level_rules_list', Service::$members_level_rules_list); - + { $this->assign('data', $ret['data']); return $this->fetch('../../../plugins/view/wallet/admin/index'); } else { @@ -56,11 +53,22 @@ class Admin extends Controller */ public function saveinfo($params = []) { - $ret = PluginsService::PluginsData('wallet', Service::$base_config_attachment_field, false); + $ret = PluginsService::PluginsData('wallet', '', false); if($ret['code'] == 0) { - // 等级规则 - $this->assign('members_level_rules_list', Service::$members_level_rules_list); + // 是否 + $is_whether_list = [ + 0 => array('value' => 0, 'name' => '否', 'checked' => true), + 1 => array('value' => 1, 'name' => '是'), + ]; + $this->assign('is_whether_list', $is_whether_list); + + // 充值赠送类型 + $recharge_give_type_list = [ + 0 => array('value' => 0, 'name' => '固定金额', 'checked' => true), + 1 => array('value' => 1, 'name' => '比例'), + ]; + $this->assign('recharge_give_type_list', $recharge_give_type_list); $this->assign('data', $ret['data']); return $this->fetch('../../../plugins/view/wallet/admin/saveinfo'); @@ -79,8 +87,6 @@ class Admin extends Controller */ public function save($params = []) { - $level = Service::LevelDataList(); - $params['level_list'] = $level['data']; return PluginsService::PluginsDataSave(['plugins'=>'wallet', 'data'=>$params]); } } diff --git a/public/static/plugins/css/membershiplevel/admin/admin.css b/public/static/plugins/css/membershiplevel/admin/admin.css index d7104e437b30d8287cbdf1120aa93246bc2946c7..cfb8e3db54e4c3722801b9489c006e3b9fed7591 100755 --- a/public/static/plugins/css/membershiplevel/admin/admin.css +++ b/public/static/plugins/css/membershiplevel/admin/admin.css @@ -16,9 +16,6 @@ .membershiplevel-content .items .immages-tag img { max-width: 100%; } -.membershiplevel-content .edit-submit { - margin-bottom: 20px; -} /** * iframe diff --git a/public/static/plugins/css/wallet/admin/admin.css b/public/static/plugins/css/wallet/admin/admin.css index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a303a83ab02404de94b7abc8f62390335dd9ceaa 100644 --- a/public/static/plugins/css/wallet/admin/admin.css +++ b/public/static/plugins/css/wallet/admin/admin.css @@ -0,0 +1,12 @@ +/** + * 首页 + */ +.wallet-content-base .am-panel-bd, .wallet-content-base .items { + padding: 10px; +} +.wallet-content-base .am-panel-bd .am-gallery { + padding: 0; +} +.wallet-content-base .items { + border: 1px dashed #eee; +} \ No newline at end of file