订单编号:{{d.order_sn}}
订单类型:{{d.order_type_text}}
+前置订单: + {{# if(d.is_frontend == '1'){ }} + 是 + {{# } else { }} + 否 + {{# } }} +
下单时间:{{d.create_time}}
支付时间: {{# if(d.pay_time == '0'){ }} @@ -427,8 +445,8 @@ , page: true , text: {none: '暂无数据！'} ,response: { - statusCode: 1 - } + statusCode: 1 + } , parseData: function (res) { return { "code": res.code, diff --git a/server/app/admin/view/user/business_team/adjust_account.html b/server/app/admin/view/user/business_team/adjust_account.html new file mode 100644 index 00000000..ce28cd05 --- /dev/null +++ b/server/app/admin/view/user/business_team/adjust_account.html @@ -0,0 +1,171 @@ +{layout name="layout2" /} + +
+
+
+
+
diff --git a/server/app/admin/view/user/business_team/adjust_first_leader.html b/server/app/admin/view/user/business_team/adjust_first_leader.html
new file mode 100644
index 00000000..2064a5ed
--- /dev/null
+++ b/server/app/admin/view/user/business_team/adjust_first_leader.html
@@ -0,0 +1,87 @@
+{layout name="layout2" /}
+
+
+
+
+
+
+
+
+ -
+
- 不可提现金额调整 +
- 成长值调整 +
- 积分调整 +
- 佣金调整 +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/server/app/admin/view/user/business_team/adjust_level.html b/server/app/admin/view/user/business_team/adjust_level.html
new file mode 100644
index 00000000..a397c980
--- /dev/null
+++ b/server/app/admin/view/user/business_team/adjust_level.html
@@ -0,0 +1,52 @@
+{layout name="layout2" /}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {if is_array($first_leader)}
+
+ {else}
+
+ {/if}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/server/app/admin/view/user/business_team/edit.html b/server/app/admin/view/user/business_team/edit.html
new file mode 100644
index 00000000..54c65f50
--- /dev/null
+++ b/server/app/admin/view/user/business_team/edit.html
@@ -0,0 +1,130 @@
+{layout name="layout2" /}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {$info.sn}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {if $info.avatar}
+
+
+ 
+
+
+
+ {else}
+
+ {/if}
+ x
+
+
+ 建议尺寸：宽200像素*高200像素的jpg，jpeg，png图片
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 禁用后用户将无法正常登录
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/app/admin/view/user/business_team/info.html b/server/app/admin/view/user/business_team/info.html
new file mode 100644
index 00000000..2d363df6
--- /dev/null
+++ b/server/app/admin/view/user/business_team/info.html
@@ -0,0 +1,181 @@
+{layout name="layout2" /}
+
+
+
+
+
+
+ -
+
- 下一级 +
- 下二级 +
+
+
+
+
+
+
+
+
+ 用户信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/app/admin/view/user/business_team/lists.html b/server/app/admin/view/user/business_team/lists.html
new file mode 100644
index 00000000..232daa58
--- /dev/null
+++ b/server/app/admin/view/user/business_team/lists.html
@@ -0,0 +1,162 @@
+{layout name="layout1" /}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {if $detail.first_leader_info != '系统'}
+
+ {else}
+
+ {/if}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/server/app/admin/view/user/business_team/set_tag.html b/server/app/admin/view/user/business_team/set_tag.html
new file mode 100644
index 00000000..e763e918
--- /dev/null
+++ b/server/app/admin/view/user/business_team/set_tag.html
@@ -0,0 +1,34 @@
+{layout name="layout2" /}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/app/admin/view/user/business_team/user_lists.html b/server/app/admin/view/user/business_team/user_lists.html
new file mode 100644
index 00000000..7670c17d
--- /dev/null
+++ b/server/app/admin/view/user/business_team/user_lists.html
@@ -0,0 +1,121 @@
+{layout name="layout1" /}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/app/api/logic/OrderLogic.php b/server/app/api/logic/OrderLogic.php
index a5242681..7a26da6b 100644
--- a/server/app/api/logic/OrderLogic.php
+++ b/server/app/api/logic/OrderLogic.php
@@ -1203,7 +1203,7 @@ class OrderLogic extends Logic
}
}
}
- $lists[$k]['frontend_array'] = explode(',', $list['frontend_info']);
+ $lists[$k]['frontend_array'] = array_filter(explode(',', $list['frontend_info']));
}
$data = [
'list' => $lists,
diff --git a/server/app/shop/controller/order/Order.php b/server/app/shop/controller/order/Order.php
index a77accd6..64ef4f3e 100644
--- a/server/app/shop/controller/order/Order.php
+++ b/server/app/shop/controller/order/Order.php
@@ -20,7 +20,7 @@
namespace app\shop\controller\order;
-use app\shop\logic\order\OrderExportLogic;
+//use app\shop\logic\order\OrderExportLogic;
use app\common\basics\ShopBase;
use app\common\model\order\OrderLog;
use app\common\model\order\Order as OrderModel;
diff --git a/server/app/shop/logic/order/OrderLogic.php b/server/app/shop/logic/order/OrderLogic.php
index beba7cce..ee6b306f 100644
--- a/server/app/shop/logic/order/OrderLogic.php
+++ b/server/app/shop/logic/order/OrderLogic.php
@@ -70,7 +70,7 @@ class OrderLogic extends Logic
* @author suny
* @date 2021/7/14 10:23 上午
*/
- public static function statistics($get = [], $shop_id, $is_export = false)
+ public static function statistics($get = [], $shop_id = 0, $is_export = false)
{
$order = new Order();
@@ -130,6 +130,10 @@ class OrderLogic extends Logic
$where[] = ['o.pay_way', '=', $get['pay_way']];
}
+ if (isset($get['is_frontend']) && $get['is_frontend'] != '') {
+ $where[] = ['o.is_frontend', '=', $get['is_frontend']];
+ }
+
if (isset($get['order_source']) && $get['order_source'] != '') {
$where[] = ['o.order_source', '=', $get['order_source']];
}
diff --git a/server/app/shop/view/order/order/lists.html b/server/app/shop/view/order/order/lists.html
index 1d83c12b..86c27a2b 100644
--- a/server/app/shop/view/order/order/lists.html
+++ b/server/app/shop/view/order/order/lists.html
@@ -121,6 +121,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 用户信息
+
+
+
+
+
+
+
+