Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
杨树贤
/
liexin_supplier
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
0c28bb4b
authored
May 25, 2021
by
mushishixian
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
修复bug
parent
921869d1
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
7 deletions
app/Http/Services/SkuService.php
app/Http/Validators/SupplierAccountValidator.php
resources/views/script/SkuListScript.blade.php
resources/views/web/AddSupplierAccount.blade.php
resources/views/web/UpdateSupplierAccount.blade.php
app/Http/Services/SkuService.php
View file @
0c28bb4b
...
@@ -35,7 +35,6 @@ class SkuService
...
@@ -35,7 +35,6 @@ class SkuService
$sku
[
'goods_id'
]
=
$goodsId
;
$sku
[
'goods_id'
]
=
$goodsId
;
$sku
[
'update_time'
]
=
date
(
'Y-m-d H:i:s'
,
$sku
[
'update_time'
]);
$sku
[
'update_time'
]
=
date
(
'Y-m-d H:i:s'
,
$sku
[
'update_time'
]);
$sku
[
'status_name'
]
=
Config
(
'field.GoodsStatus'
)[
$sku
[
'goods_status'
]];
$sku
[
'status_name'
]
=
Config
(
'field.GoodsStatus'
)[
$sku
[
'goods_status'
]];
if
(
!
empty
(
$auditData
[
$goodsId
]))
{
if
(
!
empty
(
$auditData
[
$goodsId
]))
{
$sku
[
'audit_time'
]
=
date
(
'Y-m-d H:i:s'
,
$auditData
[
$goodsId
][
'audit_time'
]);
$sku
[
'audit_time'
]
=
date
(
'Y-m-d H:i:s'
,
$auditData
[
$goodsId
][
'audit_time'
]);
$sku
[
'audit_user'
]
=
$auditData
[
$goodsId
][
'audit_name'
];
$sku
[
'audit_user'
]
=
$auditData
[
$goodsId
][
'audit_name'
];
...
...
app/Http/Validators/SupplierAccountValidator.php
View file @
0c28bb4b
...
@@ -56,7 +56,7 @@ class SupplierAccountValidator
...
@@ -56,7 +56,7 @@ class SupplierAccountValidator
return
[
return
[
'supplier_code.required'
=>
'请选择一个供应商'
,
'supplier_code.required'
=>
'请选择一个供应商'
,
'a_type.required'
=>
'类型必须勾选为云芯商家'
,
'a_type.required'
=>
'类型必须勾选为云芯商家'
,
'mobile.required'
=>
'登
陆
账号不能为空'
,
'mobile.required'
=>
'登
录
账号不能为空'
,
'mobile.regex'
=>
'账号格式必须为手机号'
,
'mobile.regex'
=>
'账号格式必须为手机号'
,
'password_raw.required'
=>
'账号密码不能为空'
,
'password_raw.required'
=>
'账号密码不能为空'
,
];
];
...
...
resources/views/script/SkuListScript.blade.php
View file @
0c28bb4b
...
@@ -45,7 +45,7 @@
...
@@ -45,7 +45,7 @@
{
field
:
'hk_delivery_time'
,
title
:
'香港交期'
,
align
:
'center'
,
width
:
100
},
{
field
:
'hk_delivery_time'
,
title
:
'香港交期'
,
align
:
'center'
,
width
:
100
},
{
{
field
:
'status_name'
,
title
:
'状态'
,
align
:
'center'
,
width
:
70
,
templet
:
function
(
d
)
{
field
:
'status_name'
,
title
:
'状态'
,
align
:
'center'
,
width
:
70
,
templet
:
function
(
d
)
{
return
d
.
goods_status
==
=
1
?
"
<
a
class
=
'layui-btn layui-btn-xs'
>
上架
<
/a>"
:
return
d
.
goods_status
==
1
?
"
<
a
class
=
'layui-btn layui-btn-xs'
>
上架
<
/a>"
:
"
<
a
class
=
'layui-btn layui-btn-xs layui-btn-danger'
>
下架
<
/a>"
;
"
<
a
class
=
'layui-btn layui-btn-xs layui-btn-danger'
>
下架
<
/a>"
;
}
}
},
},
...
...
resources/views/web/AddSupplierAccount.blade.php
View file @
0c28bb4b
...
@@ -14,10 +14,10 @@
...
@@ -14,10 +14,10 @@
</div>
</div>
</div>
</div>
<div
class=
"layui-form-item"
>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
><span
class=
"require"
>
*
</span>
登
陆
账号 :
</label>
<label
class=
"layui-form-label"
><span
class=
"require"
>
*
</span>
登
录
账号 :
</label>
<div
class=
"layui-input-block"
>
<div
class=
"layui-input-block"
>
<input
type=
"text"
name=
"mobile"
id=
"mobile"
<input
type=
"text"
name=
"mobile"
id=
"mobile"
placeholder=
"请输入登
陆
账号"
class=
"layui-input"
placeholder=
"请输入登
录
账号"
class=
"layui-input"
value=
"{{$account['mobile'] or ''}}"
>
value=
"{{$account['mobile'] or ''}}"
>
</div>
</div>
</div>
</div>
...
...
resources/views/web/UpdateSupplierAccount.blade.php
View file @
0c28bb4b
...
@@ -15,11 +15,11 @@
...
@@ -15,11 +15,11 @@
</div>
</div>
</div>
</div>
<div
class=
"layui-form-item"
>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
><span
class=
"require"
>
*
</span>
登
陆
账号 :
</label>
<label
class=
"layui-form-label"
><span
class=
"require"
>
*
</span>
登
录
账号 :
</label>
<div
class=
"layui-input-block"
>
<div
class=
"layui-input-block"
>
<input
type=
"text"
name=
"mobile"
id=
"mobile"
<input
type=
"text"
name=
"mobile"
id=
"mobile"
disabled
disabled
placeholder=
"请输入登
陆
账号"
class=
"layui-input layui-disabled"
placeholder=
"请输入登
录
账号"
class=
"layui-input layui-disabled"
value=
"{{$account['mobile'] or ''}}"
>
value=
"{{$account['mobile'] or ''}}"
>
</div>
</div>
</div>
</div>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment