Merge branch 'dev' of hlm/hlm_pl_mall into master

app/api/controller/MobileMember.php

@@ -164,7 +164,11 @@ class MobileMember extends MobileHome
         }
         curl_setopt($curl, CURLOPT_POSTFIELDS, $bodys);
         $res = curl_exec($curl);
-        return json_decode($res,true);
+        $data = json_decode($res,true);
+        if ($data['code'] == 1001) {
+            $data['msg'] = '请上传合法营业执照照片';
+        }
+        return $data;
     }
 
     public function getNegative()

app/api/controller/Sellerjoinin.php

@@ -142,17 +142,26 @@ class Sellerjoinin extends MobileMember
         $this->step2_save_valid($param);
         //store type 0 店铺  个人1
         if ($param['store_type'] == 0) {
+            if (empty($param['business_licence_number_electronic'])) {
+                ds_json_encode(10001,'请上传营业执照电子版');
+            }
+            if (empty($param['business_author_letter'])) {
+                ds_json_encode(10001,'请上企业授权书照片');
+            }
             $res = $this->getCompanyInfo($param['business_licence_number_electronic']);
             if ($res['code'] == 200) {
                 $info = $res['data'];
                 if ($param['company_name'] != $info['company'] || $param['business_licence_number'] !== $info['reg_num']) {
-                    $this->error('您提交的企业信息或营业执照照片未通过校验,请仔细核对后提交');
+                    ds_json_encode(10001,'您提交的企业信息或营业执照照片未通过校验,请仔细核对后提交');
                 }
             } else {
-                $this->error($res['msg']);
+                ds_json_encode(10001,$res['msg']);
             }
         }
         if ($param['store_type'] == 1) {
+            if (empty($param['business_licence_number_electronic'])) {
+                ds_json_encode(10001,'请上传身份证正面照片');
+            }
             if (empty($param['business_author_letter'])) {
                 ds_json_encode(10001,'请上传身份证背面照片');
             }

app/common/validate/Sellerjoinin.php

@@ -83,15 +83,15 @@ class  Sellerjoinin extends Validate
         //sellerjoininc2c
         'business_sphere.require' => '姓名不能为空|姓名不能小于50个字',
         'business_sphere.length' => '姓名不能为空|姓名不能小于50个字',
-        'business_licence_number_electronic.require' => '请上传证件照片',
-        'business_author_letter.require' => '请上企业授权书照片',
+//        'business_licence_number_electronic.require' => '请上传证件照片',
+//        'business_author_letter.require' => '请上企业授权书照片',
     ];
     protected $scene = [
-        'step2_save_valid' => ['company_name', 'company_address_detail', 'company_registered_capital', 'contacts_name', 'contacts_phone', 'contacts_email', 'business_licence_number', 'business_licence_start', 'business_licence_end', 'business_licence_number_electronic', 'business_author_letter'],
+        'step2_save_valid' => ['company_name', 'company_address_detail', 'company_registered_capital', 'contacts_name', 'contacts_phone', 'contacts_email', 'business_licence_number', 'business_licence_start', 'business_licence_end'],
         'step3_save_valid' => ['bank_account_name', 'bank_account_number', 'bank_name', 'settlement_bank_account_name', 'settlement_bank_account_number', 'settlement_bank_name'],
         'step4_save_valid' => ['seller_name', 'store_name', 'storegrade_id', 'storeclass_id'],
         //sellerjoininc2c
-        'step2_save_valid2' => ['company_name', 'company_address_detail', 'contacts_name', 'contacts_phone', 'contacts_email', 'business_licence_number', 'business_licence_number_electronic'],
+        'step2_save_valid2' => ['company_name', 'company_address_detail', 'contacts_name', 'contacts_phone', 'contacts_email', 'business_licence_number'],
         'step3_save_valid3' => ['settlement_bank_account_name', 'settlement_bank_account_number'],
         'step4_save_valid4' => ['seller_name', 'store_name', 'storegrade_id', 'storeclass_id'],
 

app/home/controller/BaseMember.php

@@ -299,7 +299,11 @@ class BaseMember extends BaseHome
         }
         curl_setopt($curl, CURLOPT_POSTFIELDS, $bodys);
         $res = curl_exec($curl);
-        return json_decode($res,true);
+        $data = json_decode($res,true);
+         if ($data['code'] == 1001) {
+             $data['msg'] = '请上传合法营业执照照片';
+         }
+        return $data;
     }
 
     public function getNegative()

app/home/view/default/member/sellerjoinin/step1.html

@@ -424,6 +424,12 @@ $(document).ready(function(){
             business_licence_start: {
                 required: true
             },
+            business_licence_number_electronic: {
+                required: true
+            },
+            business_author_letter: {
+                required: true
+            },
            
         },
          messages : {
@@ -467,6 +473,12 @@ $(document).ready(function(){
             business_licence_start: {
                 required: '{$Think.lang.select_effective_date}'
             },
+         business_licence_number_electronic: {
+             required: '请上传营业执照电子版'
+         },
+         business_author_letter: {
+             required: '请上传企业授权书'
+         },
 
         }
     });