+
-
-
+
- {$info.sn}
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
- {if $info.avatar}
-
-
- 
-
-
-
- {else}
-
- {/if}
- x
-
-
- 建议尺寸：宽200像素*高200像素的jpg，jpeg，png图片
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 禁用后用户将无法正常登录
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/server/app/admin/view/user/business_team/fans.html b/server/app/admin/view/user/business_team/fans.html
deleted file mode 100644
index 2cab2746..00000000
--- a/server/app/admin/view/user/business_team/fans.html
+++ /dev/null
@@ -1,158 +0,0 @@
-{layout name="layout1" /}
-
-
-
+
-
+
+
+
-
+
-
+
-
-
-
-
\ 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
deleted file mode 100644
index 2d363df6..00000000
--- a/server/app/admin/view/user/business_team/info.html
+++ /dev/null
@@ -1,181 +0,0 @@
-{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
index 232daa58..cd12a790 100644
--- a/server/app/admin/view/user/business_team/lists.html
+++ b/server/app/admin/view/user/business_team/lists.html
@@ -1,134 +1,103 @@
{layout name="layout1" /}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {if $detail.first_leader_info != '系统'}
-
- {else}
-
- {/if}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/server/app/admin/view/user/business_team/set_tag.html b/server/app/admin/view/user/business_team/set_tag.html
deleted file mode 100644
index e763e918..00000000
--- a/server/app/admin/view/user/business_team/set_tag.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{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
deleted file mode 100644
index 7670c17d..00000000
--- a/server/app/admin/view/user/business_team/user_lists.html
+++ /dev/null
@@ -1,121 +0,0 @@
-{layout name="layout1" /}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/server/app/admin/view/user/user/add.html b/server/app/admin/view/user/user/add.html
new file mode 100644
index 00000000..d0eb659e
--- /dev/null
+++ b/server/app/admin/view/user/user/add.html
@@ -0,0 +1,39 @@
+{layout name="layout2" /}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- 用户信息
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/server/app/admin/view/user/user/edit.html b/server/app/admin/view/user/user/edit.html
index 54c65f50..22854ff2 100644
--- a/server/app/admin/view/user/user/edit.html
+++ b/server/app/admin/view/user/user/edit.html
@@ -75,6 +75,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -97,7 +103,9 @@
var $ = layui.$,form = layui.form,laydate = layui.laydate;
var xmSelect = layui.xmSelect;
var tag_list = '{$tag_list|raw}';
+ var team_list = '{$team_list|raw}';
var initValue = '{$info.tag_ids | raw}';
+ var teamValue = '{$info.team_ids | raw}';
laydate.render({
elem: '#birthday'
@@ -116,6 +124,23 @@
initValue: JSON.parse(initValue)
})
+ var xmIns = xmSelect.render({
+ el: '#teamList',
+ language: 'zn',
+ data: JSON.parse(team_list),
+ name: 'team_id',
+ radio: true,
+ prop: {
+ value: 'id'
+ },
+ initValue: JSON.parse(teamValue)
+ })
+
+ // $('#teamList').on('change', function(e) {
+ // var selectedValue = e.target.value;
+ // $('#team-value').val(selectedValue);
+ // });
+
// 图片上传
like.delUpload();
$(document).on("click", "#avatar", function () {
diff --git a/server/app/admin/view/user/user/lists.html b/server/app/admin/view/user/user/lists.html
index 319870dd..216c770a 100644
--- a/server/app/admin/view/user/user/lists.html
+++ b/server/app/admin/view/user/user/lists.html
@@ -68,6 +68,17 @@
+
+
+
+
+
@@ -105,6 +116,7 @@
@@ -219,6 +232,7 @@
$('#tag').val(''); //清空输入框
$('#client').val(''); //清空输入框
$('#disable').val(''); //清空禁用状态
+ $('#team_id').val(''); //业务团队
$('#total_amount_start').val(''); //清空输入框
$('#total_amount_end').val(''); //清空输入框
$('#start_time').val(''); //清空输入框
@@ -343,7 +357,46 @@
}
});
- }
+ },
+ add: function(){
+ var index = layer.open({
+ type: 2
+ ,title: '新增会员'
+ ,content: '{:url("user.user/add")}'
+ ,area: ['90%', '90%']
+ ,btn: ['保存', '取消']
+ ,maxmin: true
+ ,yes: function(index, layero){
+ var iframeWindow = window['layui-layer-iframe'+ index]
+ ,submitID = 'add-user_level-submit'
+ ,submit = layero.find('iframe').contents().find('#'+ submitID);
+ //监听提交
+ iframeWindow.layui.form.on('submit('+ submitID +')', function(data){
+ var field = data.field;
+ like.ajax({
+ url:'{:url("user.user/add")}',
+ data:field,
+ type:"post",
+ success:function(res)
+ {
+ if(res.code == 1)
+ {
+ layui.layer.msg(res.msg, {
+ offset: '15px'
+ , icon: 1
+ , time: 1000
+ });
+ layer.close(index); //关闭弹层
+ table.reload('user-lists'); //数据刷新
+ }
+ }
+ });
+ });
+
+ submit.trigger('click');
+ }
+ });
+ },
}
$('.layui-btn.layuiadmin-btn-user').on('click', function(){
var type = $(this).data('type');
diff --git a/server/app/api/logic/OrderLogic.php b/server/app/api/logic/OrderLogic.php
index 7a26da6b..8b92e2a3 100644
--- a/server/app/api/logic/OrderLogic.php
+++ b/server/app/api/logic/OrderLogic.php
@@ -923,6 +923,8 @@ class OrderLogic extends Logic
$order_data['coupon_list_id'] = $coupon_list_id;
$order_data['create_time'] = time();
+ $order_data['team_id'] = $user['team_id'];//订单所属团队
+
// 前置订单
$order_data['is_frontend'] = 0;
if (!empty($post['is_frontend'])) {
@@ -1673,9 +1675,9 @@ class OrderLogic extends Logic
->field('o.id,order_status,total_num,og.image,o.consignee,o.mobile,o.province,o.city,o.district,o.address,pay_time,confirm_take_time,o.shipping_status,shipping_time')
->append(['delivery_address'])
->find();
- if (!self::checkDelivery($order['delivery_id'])) {
- return false;
- }
+// if (!self::checkDelivery($order['delivery_id'])) {
+// return false;
+// }
//初始化数据
$order_tips = '已下单';
$order_traces = [];
diff --git a/server/app/common/enum/ClientEnum.php b/server/app/common/enum/ClientEnum.php
index 549ecc11..3f7bedd3 100644
--- a/server/app/common/enum/ClientEnum.php
+++ b/server/app/common/enum/ClientEnum.php
@@ -29,6 +29,7 @@ class ClientEnum
const android = 4;
const pc = 5;
const h5 = 6;//h5(非微信环境h5)
+ const backend = 7;//PC后台
function getName($value)
{
@@ -50,6 +51,8 @@ class ClientEnum
break;
case self::oa:
$name = '公众号';
+ case self::backend:
+ $name = '后台';
break;
}
return $name;
@@ -65,6 +68,7 @@ class ClientEnum
self::mnp => '小程序商城',
self::ios => '苹果APP商城',
self::android => '安卓APP商城',
+ self::backend => '后台',
];
if ($type === true) {
return $desc;
+
@@ -122,6 +134,7 @@
正常
{{# } }}
+ 业务团队：{{d.team_name}}