From bdd09ddf761c9413d06ff346813052bed02c54ee Mon Sep 17 00:00:00 2001 From: liqianjin <949671634@qq.com> Date: Fri, 7 Apr 2023 11:22:27 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E7=8C=9C?= =?UTF-8?q?=E4=BD=A0=E5=96=9C=E6=AC=A2=E5=88=97=E8=A1=A8=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=95=86=E5=93=81bug=E4=BF=AE=E5=A4=8D=20=E3=80=90?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91SAAS=E8=8F=9C=E5=8D=95=E9=9A=90?= =?UTF-8?q?=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addon/saasagent/config/menu_shop.php | 604 +++++++++++++-------------- app/api/controller/Goodssku.php | 2 +- 2 files changed, 303 insertions(+), 303 deletions(-) diff --git a/addon/saasagent/config/menu_shop.php b/addon/saasagent/config/menu_shop.php index 2062b00..f33926a 100644 --- a/addon/saasagent/config/menu_shop.php +++ b/addon/saasagent/config/menu_shop.php @@ -3,306 +3,306 @@ // | 平台端菜单设置 // +---------------------------------------------------------------------- return [ - [ - 'name' => 'SHOP_SAASAGENT_ROOT', - 'title' => 'SAAS店铺', - 'url' => 'saasagent://shop/saas/index', - 'parent' => 'PROMOTION_ROOT', - 'picture_select' => '', - 'picture' => 'addon/saasagent/icon.png', - 'is_show' => 1, - 'sort' => 1, - 'is_control' => 0, - 'child_list' => [ - [ - 'name' => 'SHOP_SAASAGENT_INDEX', - 'title' => '概要', - 'url' => 'saasagent://shop/saas/index', - 'is_control' => 0, - 'sort' => 1, - 'is_show' => 1 - ], - [ - 'name' => 'SHOP_SAASAGENT_CLOUDORDER', - 'title' => '云订购', - 'url' => 'saasagent://shop/saas/cloudorder', - 'is_control' => 0, - 'sort' => 2, - 'is_show' => 1, - 'child_list' => [ - [ - 'name' => 'SHOP_SAASAGENT_CLOUDORDER_LIST', - 'title' => '云订购', - 'url' => 'saasagent://shop/saas/cloudorder', - 'is_control' => 0, - 'sort' => 1, - 'is_show' => 1, - ], - [ - 'name' => 'SHOP_SAASAGENT_MINCODE', - 'title' => '小程序管理', - 'url' => 'saasagent://shop/mincode/list', - 'is_control' => 0, - 'sort' => 2, - 'is_show' => 1, - 'child_list' => [ - [ - 'name' => 'SHOP_SAASAGENT_CODEREG', - 'title' => '小程序注册', - 'url' => 'saasagent://shop/mincode/codereg', - 'is_control' => 0, - 'is_show' => 0, - ], - [ - 'name' => 'SHOP_SAASAGENT_ALICODEREG', - 'title' => '支付宝小程序注册', - 'url' => 'saasagent://shop/mincode/aliappreg', - 'is_control' => 0, - 'is_show' => 0, - ], - [ - 'name' => 'SHOP_SAASAGENT_BINGSHOP', - 'title' => '绑定店铺', - 'url' => 'saasagent://shop/mincode/bingshop', - 'is_control' => 0, - 'sort' => 1, - 'is_show' => 0, - ], - [ - 'name' => 'SHOP_SAASAGENT_MINIAUTH', - 'title' => '授权接入小程序', - 'url' => 'saasagent://shop/mincode/miniauth', - 'is_control' => 0, - 'sort' => 1, - 'is_show' => 0, - ] - ] - ], - ] - ], - [ - 'name' => 'SHOP_SAASAGENT_PAY', - 'title' => '直通商户', - 'url' => 'saasagent://shop/pay/list', - 'parent' => 'PROMOTION_ROOT', - 'picture_select' => 'addon/saasagent/shop/view/pay/pay_select.png', - 'picture' => 'addon/saasagent/shop/view/pay/pay.png', - 'is_show' => 1, - 'sort' => 2, - 'is_control' => 0, - 'child_list' => [ - [ - 'name' => 'SHOP_STOREPAY_INDEX', - 'title' => '商户列表', - 'url' => 'saasagent://shop/pay/list', - 'is_control' => 0, - 'sort' => 1, - 'is_show' => 1, - 'child_list' => [ - [ - 'name' => 'SHOP_STOREPAY_REG', - 'title' => '商户注册', - 'url' => 'saasagent://shop/pay/reg', - 'is_control' => 0, - 'sort' => 1, - 'is_show' => 0, - ], - [ - 'name' => 'SHOP_STOREPAY_EDIT', - 'title' => '商户编辑', - 'url' => 'saasagent://shop/pay/edit', - 'is_control' => 0, - 'sort' => 1, - 'is_show' => 0, - ], - [ - 'name' => 'SHOP_STOREPAY_BINGSHOP', - 'title' => '绑定店铺', - 'url' => 'saasagent://shop/pay/bingshop', - 'is_control' => 0, - 'sort' => 1, - 'is_show' => 0, - ], - [ - 'name' => 'SHOP_STOREPAY_ALIPAY', - 'title' => '绑定支付宝', - 'url' => 'saasagent://shop/pay/alipayauth', - 'is_control' => 0, - 'sort' => 1, - 'is_show' => 0, - ], - [ - 'name' => 'SHOP_STOREPAY_DETAILS', - 'title' => '详情', - 'url' => 'saasagent://shop/pay/details', - 'is_control' => 0, - 'sort' => 1, - 'is_show' => 0, - ], - [ - 'name' => 'SHOP_STOREPAY_PAYSTORE', - 'title' => '支付码牌', - 'url' => 'saasagent://shop/pay/paystore', - 'is_control' => 0, - 'sort' => 2, - 'is_show' => 1 - ], - ] - ], - [ - 'name' => 'SHOP_SAASAGENT_ZMLIST', - 'title' => '芝麻商户', - 'url' => 'saasagent://shop/alipay/list', - 'is_show' => 1, - 'picture' => '', - 'picture_select' => '', - 'sort' => 2, - 'is_control' => 0, - 'child_list' => [ - [ - 'name' => 'SHOP_SAASAGENT_ZMSHOPADD', - 'title' => '添加', - 'url' => 'saasagent://shop/alipay/add', - 'is_control' => 0, - 'is_show' => 0, - ], - [ - 'name' => 'SHOP_SAASAGENT_ZMEDIT', - 'title' => '编辑', - 'url' => 'saasagent://shop/alipay/edit', - 'is_control' => 0, - 'is_show' => 0, - ] - ] - ], - ] - ], - [ - 'name' => 'SHOP_SAASAGENT_USERLIST', - 'title' => '店铺列表', - 'url' => 'saasagent://shop/saas/list', - 'is_show' => 1, - 'picture' => '', - 'picture_select' => '', - 'sort' => 3, - 'is_control' => 0, - 'child_list' => [ - [ - 'name' => 'SHOP_SAASAGENT_SHOPADD', - 'title' => '添加店铺', - 'url' => 'saasagent://shop/saas/reg', - 'is_control' => 0, - 'is_show' => 0, - ], - [ - 'name' => 'SHOP_SAASAGENT_EDIT', - 'title' => '编辑', - 'url' => 'saasagent://shop/saas/edituser', - 'is_control' => 0, - 'is_show' => 0, - ], - [ - 'name' => 'SHOP_SAASAGENT_BING', - 'title' => '绑定设置', - 'url' => 'saasagent://shop/saas/bing', - 'is_control' => 0, - 'is_show' => 0, - ], - [ - 'name' => 'SHOP_SAASBING_STORE', - 'title' => '绑定店铺', - 'url' => 'saasagent://shop/agent/bingstore', - 'is_control' => 0, - 'is_show' => 0, - ] - ] - ], - [ - 'name' => 'SHOP_SAASAGENT_MAGE', - 'title' => '合伙人成员', - 'parent' => 'PROMOTION_ROOT', - 'url' => 'saasagent://shop/agent/lists', - 'is_show' => 1, - 'sort' => 6, - 'picture' => 'static/shop/img/icon/member_list.png', - 'child_list' => [ - [ - 'name' => 'SHOP_SAASAGENT_AGENTLIST', - 'title' => '成员管理', - 'url' => 'saasagent://shop/agent/lists', - 'is_control' => 0, - 'is_show' => 1, - 'sort' => 1, - 'child_list' => [ - [ - 'name' => 'SHOP_SAASAGENT_AGENTADD', - 'title' => '添加成员', - 'url' => 'saasagent://shop/agent/adduser', - 'is_control' => 0, - 'is_show' => 0, - ] - , [ - 'name' => 'SHOP_SAASAGENT_EDITUSER', - 'title' => '编辑', - 'url' => 'saasagent://shop/agent/edituser', - 'is_control' => 0, - 'is_show' => 0, - ] - , [ - 'name' => 'SHOP_SAASAGENT_RECHARGE', - 'title' => '充值', - 'url' => 'saasagent://shop/agent/recharge', - 'is_control' => 0, - 'is_show' => 0, - ], - [ - 'name' => 'SHOP_SAASAGENT_DELUSET', - 'title' => '删除', - 'url' => 'saasagent://shop/agent/deluser', - 'is_control' => 0, - 'is_show' => 0, - ], [ - 'name' => 'SAASAGENT_APPLY', - 'title' => '代理商审核', - 'url' => 'saasagent://shop/agent/apply', - 'is_control' => 0, - 'is_show' => 0, - ] - ] - ], - [ - 'name' => 'SHOP_SAASAGENT_LEVEL', - 'title' => '等级角色', - 'url' => 'saasagent://shop/level/agentlevel', - 'is_control' => 0, - 'is_show' => 1, - 'sort' => 2, - 'child_list' => [ - [ - 'name' => 'SHOP_SAASAGENT_AGENTADDLEVEL', - 'title' => '添加角色', - 'url' => 'saasagent://shop/level/addlevel', - 'is_control' => 0, - 'is_show' => 0, - ] - , [ - 'name' => 'SHOP_SAASAGENT_EDITLEVEL', - 'title' => '编辑', - 'url' => 'saasagent://shop/level/editlevel', - 'is_control' => 0, - 'is_show' => 0, - ], - [ - 'name' => 'SHOP_SAASAGENT_DELLEVEL', - 'title' => '删除', - 'url' => 'saasagent://shop/level/dellevel', - 'is_control' => 0, - 'is_show' => 0, - ] - ] - ] - ] - ], - ] - ] + // [ + // 'name' => 'SHOP_SAASAGENT_ROOT', + // 'title' => 'SAAS店铺', + // 'url' => 'saasagent://shop/saas/index', + // 'parent' => 'PROMOTION_ROOT', + // 'picture_select' => '', + // 'picture' => 'addon/saasagent/icon.png', + // 'is_show' => 1, + // 'sort' => 1, + // 'is_control' => 0, + // 'child_list' => [ + // [ + // 'name' => 'SHOP_SAASAGENT_INDEX', + // 'title' => '概要', + // 'url' => 'saasagent://shop/saas/index', + // 'is_control' => 0, + // 'sort' => 1, + // 'is_show' => 1 + // ], + // [ + // 'name' => 'SHOP_SAASAGENT_CLOUDORDER', + // 'title' => '云订购', + // 'url' => 'saasagent://shop/saas/cloudorder', + // 'is_control' => 0, + // 'sort' => 2, + // 'is_show' => 1, + // 'child_list' => [ + // [ + // 'name' => 'SHOP_SAASAGENT_CLOUDORDER_LIST', + // 'title' => '云订购', + // 'url' => 'saasagent://shop/saas/cloudorder', + // 'is_control' => 0, + // 'sort' => 1, + // 'is_show' => 1, + // ], + // [ + // 'name' => 'SHOP_SAASAGENT_MINCODE', + // 'title' => '小程序管理', + // 'url' => 'saasagent://shop/mincode/list', + // 'is_control' => 0, + // 'sort' => 2, + // 'is_show' => 1, + // 'child_list' => [ + // [ + // 'name' => 'SHOP_SAASAGENT_CODEREG', + // 'title' => '小程序注册', + // 'url' => 'saasagent://shop/mincode/codereg', + // 'is_control' => 0, + // 'is_show' => 0, + // ], + // [ + // 'name' => 'SHOP_SAASAGENT_ALICODEREG', + // 'title' => '支付宝小程序注册', + // 'url' => 'saasagent://shop/mincode/aliappreg', + // 'is_control' => 0, + // 'is_show' => 0, + // ], + // [ + // 'name' => 'SHOP_SAASAGENT_BINGSHOP', + // 'title' => '绑定店铺', + // 'url' => 'saasagent://shop/mincode/bingshop', + // 'is_control' => 0, + // 'sort' => 1, + // 'is_show' => 0, + // ], + // [ + // 'name' => 'SHOP_SAASAGENT_MINIAUTH', + // 'title' => '授权接入小程序', + // 'url' => 'saasagent://shop/mincode/miniauth', + // 'is_control' => 0, + // 'sort' => 1, + // 'is_show' => 0, + // ] + // ] + // ], + // ] + // ], + // [ + // 'name' => 'SHOP_SAASAGENT_PAY', + // 'title' => '直通商户', + // 'url' => 'saasagent://shop/pay/list', + // 'parent' => 'PROMOTION_ROOT', + // 'picture_select' => 'addon/saasagent/shop/view/pay/pay_select.png', + // 'picture' => 'addon/saasagent/shop/view/pay/pay.png', + // 'is_show' => 1, + // 'sort' => 2, + // 'is_control' => 0, + // 'child_list' => [ + // [ + // 'name' => 'SHOP_STOREPAY_INDEX', + // 'title' => '商户列表', + // 'url' => 'saasagent://shop/pay/list', + // 'is_control' => 0, + // 'sort' => 1, + // 'is_show' => 1, + // 'child_list' => [ + // [ + // 'name' => 'SHOP_STOREPAY_REG', + // 'title' => '商户注册', + // 'url' => 'saasagent://shop/pay/reg', + // 'is_control' => 0, + // 'sort' => 1, + // 'is_show' => 0, + // ], + // [ + // 'name' => 'SHOP_STOREPAY_EDIT', + // 'title' => '商户编辑', + // 'url' => 'saasagent://shop/pay/edit', + // 'is_control' => 0, + // 'sort' => 1, + // 'is_show' => 0, + // ], + // [ + // 'name' => 'SHOP_STOREPAY_BINGSHOP', + // 'title' => '绑定店铺', + // 'url' => 'saasagent://shop/pay/bingshop', + // 'is_control' => 0, + // 'sort' => 1, + // 'is_show' => 0, + // ], + // [ + // 'name' => 'SHOP_STOREPAY_ALIPAY', + // 'title' => '绑定支付宝', + // 'url' => 'saasagent://shop/pay/alipayauth', + // 'is_control' => 0, + // 'sort' => 1, + // 'is_show' => 0, + // ], + // [ + // 'name' => 'SHOP_STOREPAY_DETAILS', + // 'title' => '详情', + // 'url' => 'saasagent://shop/pay/details', + // 'is_control' => 0, + // 'sort' => 1, + // 'is_show' => 0, + // ], + // [ + // 'name' => 'SHOP_STOREPAY_PAYSTORE', + // 'title' => '支付码牌', + // 'url' => 'saasagent://shop/pay/paystore', + // 'is_control' => 0, + // 'sort' => 2, + // 'is_show' => 1 + // ], + // ] + // ], + // [ + // 'name' => 'SHOP_SAASAGENT_ZMLIST', + // 'title' => '芝麻商户', + // 'url' => 'saasagent://shop/alipay/list', + // 'is_show' => 1, + // 'picture' => '', + // 'picture_select' => '', + // 'sort' => 2, + // 'is_control' => 0, + // 'child_list' => [ + // [ + // 'name' => 'SHOP_SAASAGENT_ZMSHOPADD', + // 'title' => '添加', + // 'url' => 'saasagent://shop/alipay/add', + // 'is_control' => 0, + // 'is_show' => 0, + // ], + // [ + // 'name' => 'SHOP_SAASAGENT_ZMEDIT', + // 'title' => '编辑', + // 'url' => 'saasagent://shop/alipay/edit', + // 'is_control' => 0, + // 'is_show' => 0, + // ] + // ] + // ], + // ] + // ], + // [ + // 'name' => 'SHOP_SAASAGENT_USERLIST', + // 'title' => '店铺列表', + // 'url' => 'saasagent://shop/saas/list', + // 'is_show' => 1, + // 'picture' => '', + // 'picture_select' => '', + // 'sort' => 3, + // 'is_control' => 0, + // 'child_list' => [ + // [ + // 'name' => 'SHOP_SAASAGENT_SHOPADD', + // 'title' => '添加店铺', + // 'url' => 'saasagent://shop/saas/reg', + // 'is_control' => 0, + // 'is_show' => 0, + // ], + // [ + // 'name' => 'SHOP_SAASAGENT_EDIT', + // 'title' => '编辑', + // 'url' => 'saasagent://shop/saas/edituser', + // 'is_control' => 0, + // 'is_show' => 0, + // ], + // [ + // 'name' => 'SHOP_SAASAGENT_BING', + // 'title' => '绑定设置', + // 'url' => 'saasagent://shop/saas/bing', + // 'is_control' => 0, + // 'is_show' => 0, + // ], + // [ + // 'name' => 'SHOP_SAASBING_STORE', + // 'title' => '绑定店铺', + // 'url' => 'saasagent://shop/agent/bingstore', + // 'is_control' => 0, + // 'is_show' => 0, + // ] + // ] + // ], + // [ + // 'name' => 'SHOP_SAASAGENT_MAGE', + // 'title' => '合伙人成员', + // 'parent' => 'PROMOTION_ROOT', + // 'url' => 'saasagent://shop/agent/lists', + // 'is_show' => 1, + // 'sort' => 6, + // 'picture' => 'static/shop/img/icon/member_list.png', + // 'child_list' => [ + // [ + // 'name' => 'SHOP_SAASAGENT_AGENTLIST', + // 'title' => '成员管理', + // 'url' => 'saasagent://shop/agent/lists', + // 'is_control' => 0, + // 'is_show' => 1, + // 'sort' => 1, + // 'child_list' => [ + // [ + // 'name' => 'SHOP_SAASAGENT_AGENTADD', + // 'title' => '添加成员', + // 'url' => 'saasagent://shop/agent/adduser', + // 'is_control' => 0, + // 'is_show' => 0, + // ] + // , [ + // 'name' => 'SHOP_SAASAGENT_EDITUSER', + // 'title' => '编辑', + // 'url' => 'saasagent://shop/agent/edituser', + // 'is_control' => 0, + // 'is_show' => 0, + // ] + // , [ + // 'name' => 'SHOP_SAASAGENT_RECHARGE', + // 'title' => '充值', + // 'url' => 'saasagent://shop/agent/recharge', + // 'is_control' => 0, + // 'is_show' => 0, + // ], + // [ + // 'name' => 'SHOP_SAASAGENT_DELUSET', + // 'title' => '删除', + // 'url' => 'saasagent://shop/agent/deluser', + // 'is_control' => 0, + // 'is_show' => 0, + // ], [ + // 'name' => 'SAASAGENT_APPLY', + // 'title' => '代理商审核', + // 'url' => 'saasagent://shop/agent/apply', + // 'is_control' => 0, + // 'is_show' => 0, + // ] + // ] + // ], + // [ + // 'name' => 'SHOP_SAASAGENT_LEVEL', + // 'title' => '等级角色', + // 'url' => 'saasagent://shop/level/agentlevel', + // 'is_control' => 0, + // 'is_show' => 1, + // 'sort' => 2, + // 'child_list' => [ + // [ + // 'name' => 'SHOP_SAASAGENT_AGENTADDLEVEL', + // 'title' => '添加角色', + // 'url' => 'saasagent://shop/level/addlevel', + // 'is_control' => 0, + // 'is_show' => 0, + // ] + // , [ + // 'name' => 'SHOP_SAASAGENT_EDITLEVEL', + // 'title' => '编辑', + // 'url' => 'saasagent://shop/level/editlevel', + // 'is_control' => 0, + // 'is_show' => 0, + // ], + // [ + // 'name' => 'SHOP_SAASAGENT_DELLEVEL', + // 'title' => '删除', + // 'url' => 'saasagent://shop/level/dellevel', + // 'is_control' => 0, + // 'is_show' => 0, + // ] + // ] + // ] + // ] + // ], + // ] + // ] ]; \ No newline at end of file diff --git a/app/api/controller/Goodssku.php b/app/api/controller/Goodssku.php index 8fd1263..c7959c0 100644 --- a/app/api/controller/Goodssku.php +++ b/app/api/controller/Goodssku.php @@ -572,7 +572,7 @@ class Goodssku extends BaseApi } else if ($guess_you_like[ 'sources' ] == 'sale') { $order_by = 'sale_num desc'; } else if ($guess_you_like[ 'sources' ] == 'diy') { - $condition[] = [ 'gs.goods_id', 'in', $guess_you_like[ 'goods_ids' ] ]; + $condition[] = [ 'gs.goods_id', 'in', $guess_you_like[ 'goods_id' ] ]; } $field = 'gs.is_consume_discount,gs.discount_config,gs.discount_method,gs.member_price,g.sale_show,gs.goods_id,gs.sku_id,gs.sku_name,gs.price,gs.market_price,gs.discount_price,gs.stock,(g.sale_num + g.virtual_sale) as sale_num,gs.goods_name,gs.promotion_type,g.goods_image,gs.unit,g.label_name';