Merge branch 'master' of ssh://git.ichunt.net:22611/mushishixian/liexin_supplier

app/Http/Validators/SupplierAccountValidator.php

@@ -17,6 +17,7 @@ class SupplierAccountValidator
         $account = $request->all();
         $account = $request->all();
         $rules = [
         $rules = [
             "supplier_code" => "required",
             "supplier_code" => "required",
+            "contacts_name" => "required",
             "mobile" => "required|regex:/^1[0-9][0-9]{9}$/",
             "mobile" => "required|regex:/^1[0-9][0-9]{9}$/",
             "password_raw" => "required",
             "password_raw" => "required",
             "a_type" => "required",
             "a_type" => "required",
@@ -55,6 +56,7 @@ class SupplierAccountValidator
     {
     {
         return [
         return [
             'supplier_code.required' => '请选择一个供应商',
             'supplier_code.required' => '请选择一个供应商',
+            'contacts_name.required' => '联系人不能为空',
             'a_type.required' => '类型必须勾选为芯链商家',
             'a_type.required' => '类型必须勾选为芯链商家',
             'mobile.required' => '登录账号不能为空',
             'mobile.required' => '登录账号不能为空',
             'mobile.regex' => '账号格式必须为手机号',
             'mobile.regex' => '账号格式必须为手机号',

resources/views/web/AddSupplierAccount.blade.php

@@ -23,7 +23,7 @@
             </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">邮箱 : </label>
                 <div class="layui-input-block">
                 <div class="layui-input-block">
                     <input type="text" name="email" id="email" placeholder="请输入邮箱" class="layui-input" value="{{$account['email'] or ''}}">
                     <input type="text" name="email" id="email" placeholder="请输入邮箱" class="layui-input" value="{{$account['email'] or ''}}">
                 </div>
                 </div>

resources/views/web/UpdateSupplierAccount.blade.php

@@ -24,7 +24,7 @@
             </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">邮箱 : </label>
                 <div class="layui-input-block">
                 <div class="layui-input-block">
                     <input type="text" name="email" id="email" placeholder="请输入邮箱" class="layui-input" value="{{$account['email'] or ''}}">
                     <input type="text" name="email" id="email" placeholder="请输入邮箱" class="layui-input" value="{{$account['email'] or ''}}">
                 </div>
                 </div>