Commit 0c28bb4b by mushishixian

修复bug

parent 921869d1
...@@ -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'];
......
...@@ -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' => '账号密码不能为空',
]; ];
......
...@@ -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>";
} }
}, },
......
...@@ -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>
......
...@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment