切换导航条
此项目
正在载入...
登录
anyv
/
xkeasy
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
anyv
6 years ago
提交
89413f6a1206bcc2d5eacefdbc0d944abccd487a
1 个父辈
37159963
1 个管道 的构建
通过
耗费 3 秒
4
变更
9
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
9 个修改的文件
包含
68 行增加
和
6 行删除
app/admin/controller/AftersaleController.php
app/admin/controller/SalesmanController.php
app/admin/controller/SalesmangoodsController.php
app/portal/controller/OrderController.php
data/lang/zh-cn/admin_menu.php
public/themes/admin_simpleboot3/admin/aftersale/index.html
public/themes/admin_simpleboot3/admin/salesmangoods/salesman_list.html
public/themes/simpleboot3/portal/order/get_one.html
simplewind/cmf/controller/WeChatBaseController.php
app/admin/controller/AftersaleController.php
0 → 100644
查看文件 @
89413f6
<?php
namespace
app\admin\controller
;
use
app\admin\model\RouteModel
;
use
cmf\controller\AdminBaseController
;
use
think\Db
;
class
AftersaleController
extends
AdminBaseController
{
/**
* 售后咨询显示页
*/
public
function
index
(){
if
(
$this
->
request
->
isPost
()){
Db
::
name
(
'token'
)
->
where
(
'id'
,
3
)
->
update
([
'phone'
=>
$_POST
[
'phone'
]]);
}
$phone
=
Db
::
name
(
'token'
)
->
where
(
'id'
,
3
)
->
find
();
$this
->
assign
(
'phone'
,
$phone
);
return
$this
->
fetch
();
}
}
\ No newline at end of file
...
...
app/admin/controller/SalesmanController.php
查看文件 @
89413f6
...
...
@@ -222,6 +222,10 @@ class SalesmanController extends AdminBaseController{
$id
=
$_POST
[
'id'
];
$data
=
Db
::
name
(
'goods'
)
->
where
(
'id'
,
$id
)
->
update
([
'is_out'
=>
0
]);
//删除购物车 浏览记录 收藏表中下架的数据
Db
::
name
(
'browsing_history'
)
->
where
(
'goods_id'
,
$id
)
->
delete
();
Db
::
name
(
'collect'
)
->
where
(
'goods_id'
,
$id
)
->
delete
();
Db
::
name
(
'shopping_cart'
)
->
where
(
'goods_id'
,
$id
)
->
delete
();
if
(
$data
){
return
true
;
}
else
{
...
...
app/admin/controller/SalesmangoodsController.php
查看文件 @
89413f6
...
...
@@ -19,17 +19,17 @@ class SalesmangoodsController extends AdminBaseController{
if
(
!
empty
(
$_POST
[
'start_time'
])
&&
!
empty
(
$_POST
[
'end_time'
])){
$start_time
=
strtotime
(
$_POST
[
'start_time'
]);
$end_time
=
strtotime
(
$_POST
[
'end_time'
]);
$where
[
'create_time'
]
=
[[
'>='
,
$start_time
],[
'<='
,
$end_time
]];
$where
[
'
a.
create_time'
]
=
[[
'>='
,
$start_time
],[
'<='
,
$end_time
]];
}
if
(
!
empty
(
$_POST
[
'keyword'
])){
$keyword
=
$_POST
[
'keyword'
];
$where
[
'book_name'
]
=
[
'like'
,
"%
$keyword
%"
];
$where
[
'
a.
book_name'
]
=
[
'like'
,
"%
$keyword
%"
];
}
$data
=
Db
::
name
(
'goods'
)
->
where
(
$where
)
->
paginate
(
1000000
);
$data
=
Db
::
name
(
'goods'
)
->
alias
(
'a'
)
->
field
(
'a.*,b.user_nickname'
)
->
join
(
'user b'
,
"a.uid=b.id"
,
'LEFT'
)
->
where
(
$where
)
->
paginate
(
1000000
);
$this
->
assign
(
'data'
,
$data
);
return
$this
->
fetch
();
}
else
{
$data
=
Db
::
name
(
'goods'
)
->
where
(
'type'
,
2
)
->
paginate
(
12
);
$data
=
Db
::
name
(
'goods'
)
->
alias
(
'a'
)
->
field
(
'a.*,b.user_nickname'
)
->
join
(
'user b'
,
"a.uid=b.id"
,
'LEFT'
)
->
where
(
'type'
,
2
)
->
paginate
(
12
);
$this
->
assign
(
'data'
,
$data
);
return
$this
->
fetch
();
}
...
...
app/portal/controller/OrderController.php
查看文件 @
89413f6
...
...
@@ -77,6 +77,9 @@ class OrderController extends WeChatBaseController
$data
[
'address'
]
=
$address
;
$data
[
'indent_goods'
]
=
$indentGoods
;
$this
->
assign
(
'data'
,
$data
);
//显示售后咨询手机号
$phone
=
Db
::
name
(
'token'
)
->
where
(
'id'
,
3
)
->
find
();
$this
->
assign
(
'phone'
,
$phone
);
return
$this
->
fetch
();
}
public
function
cancel_order
(){
...
...
data/lang/zh-cn/admin_menu.php
查看文件 @
89413f6
<?php
return
array
(
'ADMIN_AFTERSALE_INDEX'
=>
'售后咨询'
,
'ADMIN_AUDIT_AUDIT_LIST'
=>
'业务员审核'
,
'ADMIN_GOODS_GOODS_LIST'
=>
'平台商品列表'
,
'ADMIN_GOODS_INDEX'
=>
'商品管理'
,
...
...
public/themes/admin_simpleboot3/admin/aftersale/index.html
0 → 100644
查看文件 @
89413f6
<include
file=
"public@header"
/>
</head>
<body>
<div
style=
"padding: 100px 100px 10px;"
>
<form
class=
"bs-example bs-example-form"
role=
"form"
method=
"post"
action=
"{:url('Aftersale/index')}"
>
<div
class=
"input-group"
style=
"width: 100px;"
>
<span
class=
"input-group-addon"
>
售后咨询
</span>
</div>
<br>
<div
class=
"input-group"
>
<span
class=
"input-group-addon"
>
手机号:
</span>
<input
type=
"text"
name=
"phone"
class=
"form-control"
value=
"{$phone.phone}"
>
</div>
<br>
<button
type=
"submit"
class=
"btn btn-default"
>
确定
</button>
</form>
</div>
</body>
<script>
/**
*
*/
</script>
</html>
\ No newline at end of file
...
...
public/themes/admin_simpleboot3/admin/salesmangoods/salesman_list.html
查看文件 @
89413f6
...
...
@@ -30,6 +30,7 @@
<tr>
<th>
序号
</th>
<th>
商品名称
</th>
<th>
所属业务员
</th>
<th>
售价
</th>
<th>
销量
</th>
<th>
创建时间
</th>
...
...
@@ -41,6 +42,7 @@
<tr>
<td>
{$vo.id}
</td>
<td>
{$vo.book_name}
</td>
<td>
{$vo.user_nickname}
</td>
<td>
{$vo.price}
</td>
<td>
{$vo.sales}
</td>
<td>
{$vo.create_time|date="Y-m-d H:i:s",###}
</td>
...
...
public/themes/simpleboot3/portal/order/get_one.html
查看文件 @
89413f6
...
...
@@ -57,7 +57,7 @@
<div
class=
"tx_maskCon2"
style=
"border-radius: 0.1rem;"
>
<div
class=
"delete_school"
>
</div>
<div
class=
"dianhua"
>
售后电话:
12345678911
</div>
<div
class=
"dianhua"
>
售后电话:
{$phone.phone}
</div>
</div>
</div>
</div>
...
...
simplewind/cmf/controller/WeChatBaseController.php
查看文件 @
89413f6
...
...
@@ -204,7 +204,7 @@ class WeChatBaseController extends BaseController
*/
public
function
checkWeChatUserLogin
()
{
/*$user = Db::name('user')->where('id',
29
)->find();
/*$user = Db::name('user')->where('id',
13
)->find();
cmf_update_current_user($user);*/
$userId
=
cmf_get_current_user_id
();
if
(
empty
(
$userId
))
{
...
...
请
注册
或
登录
后发表评论