From 7afb0b1db902c38f2764ac845d00ca44764b862d Mon Sep 17 00:00:00 2001 From: wuhui_zzw <1760308791@qq.com> Date: Wed, 22 Feb 2023 15:10:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0:=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=B8=82=E5=9C=BA=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addon/futures/config/diy_view.php | 11 +--- addon/futures/config/event.php | 14 +++-- addon/futures/config/info.php | 4 +- addon/futures/config/menu_shop.php | 91 +++++++-------------------- addon/futures/event/Install.php | 2 +- addon/futures/event/OrderCreate.php | 60 ------------------ addon/futures/event/OrderPayment.php | 51 --------------- addon/futures/event/ShowPromotion.php | 15 ++--- addon/futures/event/UnInstall.php | 2 +- config/menu_shop.php | 2 +- 10 files changed, 46 insertions(+), 206 deletions(-) delete mode 100644 addon/futures/event/OrderCreate.php delete mode 100644 addon/futures/event/OrderPayment.php diff --git a/addon/futures/config/diy_view.php b/addon/futures/config/diy_view.php index 66690c07..ec2293e5 100644 --- a/addon/futures/config/diy_view.php +++ b/addon/futures/config/diy_view.php @@ -16,16 +16,7 @@ return [ 'util' => [], // 自定义页面路径 - 'link' => [ - [ - 'name' => 'DIY_FUTURES', - 'title' => '期货', - 'parent' => 'INTERACTION_PROMOTION', - 'wap_url' => '', - 'web_url' => '', - 'sort' => 4 - ] - ], + 'link' => [], // 自定义图标库 'icon_library' => [], diff --git a/addon/futures/config/event.php b/addon/futures/config/event.php index 41fed481..5e4af100 100644 --- a/addon/futures/config/event.php +++ b/addon/futures/config/event.php @@ -10,12 +10,14 @@ return [ 'ShowPromotion' => [ 'addon\futures\event\ShowPromotion', ], - 'OrderPayment' => [ - //'addon\form\event\OrderPayment', - ], - 'OrderCreate' => [ - 'addon\futures\event\OrderCreate', - ] + + + + + + + + ], 'subscribe' => [ diff --git a/addon/futures/config/info.php b/addon/futures/config/info.php index 6f7b2a36..74f24070 100644 --- a/addon/futures/config/info.php +++ b/addon/futures/config/info.php @@ -10,8 +10,8 @@ */ return [ 'name' => 'futures', - 'title' => '期货', - 'description' => '期货', + 'title' => '交易市场', + 'description' => '交易市场', 'type' => 'promotion', //插件类型 system :系统插件(自动安装), business:业务插件 promotion:营销插件 tool:工具插件 'status' => 1, 'author' => '', diff --git a/addon/futures/config/menu_shop.php b/addon/futures/config/menu_shop.php index 593d1db6..0da44ae6 100644 --- a/addon/futures/config/menu_shop.php +++ b/addon/futures/config/menu_shop.php @@ -4,77 +4,34 @@ // +---------------------------------------------------------------------- return [ [ - 'name' => 'SYSTEM_FORM', - 'title' => '系统表单', - 'url' => 'form://shop/form/lists', - 'parent' => 'PROMOTION_TOOL', - 'is_show' => 1, - 'is_control' => 1, - 'is_icon' => 0, - 'picture' => '', - 'picture_select' => '', - 'sort' => 1, - 'child_list' => [ + 'name' => 'TRADING_MARKET', + 'title' => '交易市场', + 'url' => 'futures://shop/futures/index', + 'parent' => 'CHANNEL_ROOT', + 'is_show' => 1, + 'sort' => 1, + 'picture' => 'addon/futures/shop/view/public/img/futures_new.png', // 图标 + 'picture_selected' => 'addon/futures/shop/view/public/img/futures_select.png', // 选中图标 + 'child_list' => [ [ - 'name' => 'FORM_ADD', - 'title' => '添加表单', - 'url' => 'form://shop/form/addform', - 'is_show' => 0, - 'is_control' => 1, - 'is_icon' => 0, - 'picture' => '', - 'picture_selected' => '', + 'name' => 'TRADING_MARKET_HOME', + 'title' => '交易市场', + 'url' => 'futures://shop/futures/index', + 'is_show' => 1, + 'sort' => 1, ], [ - 'name' => 'FORM_EDIT', - 'title' => '编辑表单', - 'url' => 'form://shop/form/editform', - 'is_show' => 0, - 'is_control' => 1, - 'is_icon' => 0, - 'picture' => '', - 'picture_selected' => '', - ], - [ - 'name' => 'FORM_DELETE', - 'title' => '删除表单', - 'url' => 'form://shop/form/deleteform', - 'is_show' => 0, - 'is_control' => 1, - 'is_icon' => 0, - 'picture' => '', - 'picture_selected' => '', - ], - [ - 'name' => 'FORM_IS_USE', - 'title' => '表单是否启用', - 'url' => 'form://shop/form/editisuse', - 'is_show' => 0, - 'is_control' => 1, - 'is_icon' => 0, - 'picture' => '', - 'picture_selected' => '', - ], - [ - 'name' => 'FORM_DATA', - 'title' => '表单数据', - 'url' => 'form://shop/form/formdata', - 'is_show' => 0, - 'is_control' => 1, - 'is_icon' => 0, - 'picture' => '', - 'picture_selected' => '', - ], - [ - 'name' => 'FORM_DATA_EXPORT', - 'title' => '表单数据详情', - 'url' => 'form://shop/form/exportform', - 'is_show' => 0, - 'is_control' => 1, - 'is_icon' => 0, - 'picture' => '', - 'picture_selected' => '', + 'name' => 'TRADING_MARKET_USER', + 'title' => '用户管理', + 'url' => 'futures://shop/user/index', + 'is_show' => 1, + 'sort' => 2, ], + + + + + ] ], ]; diff --git a/addon/futures/event/Install.php b/addon/futures/event/Install.php index ec4f9ac5..72eb221f 100644 --- a/addon/futures/event/Install.php +++ b/addon/futures/event/Install.php @@ -10,7 +10,7 @@ */ -namespace addon\form\event; +namespace addon\futures\event; /** * 应用安装 diff --git a/addon/futures/event/OrderCreate.php b/addon/futures/event/OrderCreate.php deleted file mode 100644 index d4cf4cfc..00000000 --- a/addon/futures/event/OrderCreate.php +++ /dev/null @@ -1,60 +0,0 @@ -addFormData([ - 'site_id' => $create_data['site_id'], - 'form_id' => $create_data['form_data']['form_id'], - 'member_id' => $create_data['member_id'], - 'relation_id' => $data['order_id'], - 'form_data' => $create_data['form_data']['form_data'], - 'scene' => 'order' - ]); - if ($res['code'] != 0) return $res; - } - - // 添加商品表单 - if (isset($create_data['form_data']['goods_form'])) { - $goods_list = array_column($create_data['shop_goods_list']['goods_list'], null, 'sku_id'); - foreach ($create_data['form_data']['goods_form'] as $sku_id => $form_item) { - $res = $form->addFormData([ - 'site_id' => $create_data['site_id'], - 'form_id' => $form_item['form_id'], - 'member_id' => $create_data['member_id'], - 'relation_id' => isset($goods_list[ $sku_id ]) && isset($goods_list[ $sku_id ]['order_goods_id']) ? $goods_list[ $sku_id ]['order_goods_id'] : 0, - 'form_data' => $form_item['form_data'], - 'scene' => 'goods' - ]); - if ($res['code'] != 0) return $res; - } - } - } - return success(); - } -} \ No newline at end of file diff --git a/addon/futures/event/OrderPayment.php b/addon/futures/event/OrderPayment.php deleted file mode 100644 index 7eda3e06..00000000 --- a/addon/futures/event/OrderPayment.php +++ /dev/null @@ -1,51 +0,0 @@ -getFormInfo([ ['site_id', '=', $data['site_id'] ], ['is_use', '=', 1], ['form_type', '=', 'order'] ], 'id,json_data,form_name'); - if (!empty($info['data'])) { - $info['data']['json_data'] = json_decode($info['data']['json_data'], true); - $data['system_form'] = $info['data']; - } - $goods_model = new Goods(); - foreach ($data['shop_goods_list']['goods_list'] as $goods_key => $goods_item) { - $condition = [ - ['g.site_id', '=', $data['site_id'] ], - ['g.goods_id', '=', $goods_item['goods_id'] ], - ['g.form_id', '>', 0 ], - ['f.is_use', '=', 1 ] - ]; - $goods_form = $goods_model->getGoodsInfo($condition, 'f.id,f.json_data', 'g', [ ['form f', 'g.form_id = f.id', 'left'] ])['data']; - if (!empty($goods_form)) { - $goods_form['json_data'] = json_decode($goods_form['json_data'], true); - $data['shop_goods_list']['goods_list'][$goods_key]['goods_form'] = $goods_form; - } - } - return $data; - } -} \ No newline at end of file diff --git a/addon/futures/event/ShowPromotion.php b/addon/futures/event/ShowPromotion.php index 1fd1c67b..086df7c9 100644 --- a/addon/futures/event/ShowPromotion.php +++ b/addon/futures/event/ShowPromotion.php @@ -5,10 +5,11 @@ * Copy right 2019-2029 成都云之牛科技有限公司, 保留所有权利。 * ---------------------------------------------- * 官方网址: https://www.cdcloudshop.com + * ========================================================= */ -namespace addon\form\event; +namespace addon\futures\event; /** * 活动展示 @@ -26,17 +27,17 @@ class ShowPromotion 'shop' => [ [ //插件名称 - 'name' => 'futures', + 'name' => 'futures', //店铺端展示分类 shop:营销活动 member:互动营销 - 'show_type' => 'shop', + 'show_type' => 'shop', //展示主题 - 'title' => '期货', + 'title' => '交易市场', //展示介绍 - 'description' => '期货', + 'description' => '交易市场', //展示图标 - 'icon' => 'addon/futures/icon.png', + 'icon' => 'addon/futures/icon.png', //跳转链接 - 'url' => 'form://shop/futures/lists', + 'url' => 'futures://shop/futures/index', ] ] diff --git a/addon/futures/event/UnInstall.php b/addon/futures/event/UnInstall.php index a1d6b51f..c41d4baf 100644 --- a/addon/futures/event/UnInstall.php +++ b/addon/futures/event/UnInstall.php @@ -10,7 +10,7 @@ */ -namespace addon\form\event; +namespace addon\futures\event; /** * 应用卸载 diff --git a/config/menu_shop.php b/config/menu_shop.php index 047c69ea..466613ce 100644 --- a/config/menu_shop.php +++ b/config/menu_shop.php @@ -3319,7 +3319,7 @@ return [ 'title' => '模块管理', 'url' => 'shop/system/addon', 'parent' => '', - 'is_show' => 0, + 'is_show' => 1, 'picture' => 'app/shop/view/public/img/icon_new/plug_management_new.png', 'picture_selected' => 'app/shop/view/public/img/icon_new/plug_management_select.png', 'sort' => 2,