切换导航条
此项目
正在载入...
登录
李忠强
/
temporaryfood
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
何书鹏
3 years ago
提交
0ed145e040c5f5ecd8e58b873ca5a59654da0c63
1 个父辈
333b3bf3
评价状态
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
8 行增加
和
3 行删除
application/api/controller/Classification.php
application/api/controller/Order.php
application/api/controller/Rider.php
public/assets/js/backend/litestore/litestoregoods.js
application/api/controller/Classification.php
查看文件 @
0ed145e
...
...
@@ -91,7 +91,7 @@ class Classification extends Api
$page
=
$this
->
request
->
post
(
'page'
,
1
);
$model
=
new
Goods
();
if
(
$sort_id
>
0
){
$list
=
$model
->
where
(
'is_index'
,
'1'
)
$list
=
$model
->
where
(
'is_delete'
,
'0'
)
->
where
(
'category_id'
,
$sort_id
)
->
where
(
'goods_status'
,
'10'
)
...
...
@@ -114,6 +114,8 @@ class Classification extends Api
});
}
else
{
$list
=
$model
->
where
(
'is_delete'
,
'0'
)
->
where
(
'goods_status'
,
'10'
)
->
field
(
'goods_id,goods_name,image'
)
->
paginate
(
10
,
false
,[
'page'
=>
$page
])
->
each
(
function
(
$item
,
$key
){
...
...
application/api/controller/Order.php
查看文件 @
0ed145e
...
...
@@ -107,7 +107,7 @@ class Order extends Api
'fa_litestore_order.pay_status'
=>
'20'
,
'fa_litestore_order.freight_status'
=>
'20'
,
'fa_litestore_order.receipt_status'
=>
'20'
,
'fa_litestore_order.
order
_status'
=>
'10'
,
'fa_litestore_order.
comment
_status'
=>
'10'
,
];
break
;
}
...
...
@@ -623,6 +623,7 @@ class Order extends Api
$order
->
rider_status
=
'20'
;
//送达状态:已送达
$order
->
receipt_status
=
'20'
;
//收货状态:已收货
$order
->
receipt_time
=
time
();
//收货时间
$order
->
order_status
=
'30'
;
//订单状态变为已完成
$order
->
save
();
// 修改配送单信息
$rider_order
->
status
=
'2'
;
//已送达
...
...
@@ -817,7 +818,7 @@ class Order extends Api
}
$ordermodel
=
new
\app\api\model\Order
();
$ordermodel
->
whereIn
(
'id'
,
$orderids
)
->
update
([
'
order_status'
=>
'3
0'
]);
$ordermodel
->
whereIn
(
'id'
,
$orderids
)
->
update
([
'
comment_status'
=>
'2
0'
]);
$commentmodel
=
new
GoodsComment
();
$commentmodel
->
isUpdate
(
false
)
->
saveAll
(
$params
);
$this
->
success
(
'评价成功'
);
...
...
application/api/controller/Rider.php
查看文件 @
0ed145e
...
...
@@ -332,6 +332,7 @@ class Rider extends Api
$order
->
rider_status
=
'20'
;
//送达状态:已送达
$order
->
receipt_status
=
'20'
;
//收货状态:已收货
$order
->
receipt_time
=
time
();
//收货时间
$order
->
order_status
=
'30'
;
//订单状态变为已完成
$order
->
save
();
// 修改配送单信息
$rider_order
->
status
=
'2'
;
//已送达
...
...
public/assets/js/backend/litestore/litestoregoods.js
查看文件 @
0ed145e
...
...
@@ -45,6 +45,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','template','litestoreg
// {field: 'delivery_id', title: __('Delivery_id')},
{
field
:
'goods_status'
,
title
:
__
(
'Goods_status'
),
searchList
:
{
"10"
:
__
(
'Goods_status 10'
),
"20"
:
__
(
'Goods_status 20'
)},
formatter
:
Table
.
api
.
formatter
.
status
},
{
field
:
'is_delete'
,
title
:
__
(
'Is_delete'
),
searchList
:
{
"0"
:
__
(
'Is_delete 0'
),
"1"
:
__
(
'Is_delete 1'
)},
formatter
:
Table
.
api
.
formatter
.
normal
},
{
field
:
'is_index'
,
title
:
__
(
'Is_index'
),
searchList
:
{
"0"
:
__
(
'Is_index 0'
),
"1"
:
__
(
'Is_index 1'
)},
formatter
:
Table
.
api
.
formatter
.
normal
},
{
field
:
'createtime'
,
title
:
__
(
'Createtime'
),
operate
:
'RANGE'
,
addclass
:
'datetimerange'
,
formatter
:
Table
.
api
.
formatter
.
datetime
},
{
field
:
'updatetime'
,
title
:
__
(
'Updatetime'
),
operate
:
'RANGE'
,
addclass
:
'datetimerange'
,
formatter
:
Table
.
api
.
formatter
.
datetime
},
{
field
:
'operate'
,
title
:
__
(
'Operate'
),
table
:
table
,
events
:
Table
.
api
.
events
.
operate
,
formatter
:
Table
.
api
.
formatter
.
operate
}
...
...
请
注册
或
登录
后发表评论