Merge branch 'dev' of hlm/hlm_pl_mall into master

app/api/controller/Sellerjoinin.php

@@ -164,13 +164,13 @@ class Sellerjoinin extends MobileMember
                     ds_json_encode(10001,'填写注册资金与营业执照不匹配,请仔细核对后提交');
                 }
                 if ($info['company'] != $param['company_name']) {
-                    ds_json_encode(10001,'填写营业执照号与营业执照不匹配,请仔细核对后提交');
-                }
-                if ($info['reg_num'] != $param['business_licence_number']) {
                     ds_json_encode(10001,'填写企业名称与营业执照不匹配,请仔细核对后提交');
                 }
+                if ($info['reg_num'] != strtoupper($param['business_licence_number'])) {
+                    ds_json_encode(10001,'填写营业执照号与营业执照不匹配,请仔细核对后提交');
+                }
 
-                ds_json_encode(10001,'您提交的企业信息或营业执照照片未通过校验,请仔细核对后提交');
+//                ds_json_encode(10001,'您提交的企业信息或营业执照照片未通过校验,请仔细核对后提交');
             } else {
                 ds_json_encode(10001,$res['msg']);
             }

app/home/controller/Sellerjoinin.php

@@ -151,18 +151,19 @@ class Sellerjoinin extends BaseMember
             $res = $this->getCompanyInfo($param['business_licence_number_electronic']);
             if ($res['code'] == 200) {
                 $info = $res['data'];
+//                dd($info);
                 $info['capital'] = cn2num($info['capital'])/10000;
                 if ($info['capital'] != $param['company_registered_capital']) {
                     $this->error('填写注册资金与营业执照不匹配,请仔细核对后提交');
                 }
                 if ($info['company'] != $param['company_name']) {
-                    $this->error('填写营业执照号与营业执照不匹配,请仔细核对后提交');
-                }
-                if ($info['reg_num'] != $param['business_licence_number']) {
                     $this->error('填写企业名称与营业执照不匹配,请仔细核对后提交');
                 }
+                if ($info['reg_num'] != strtoupper($param['business_licence_number'])) {
+                    $this->error('填写营业执照号与营业执照不匹配,请仔细核对后提交');
+                }
 
-                $this->error('您提交的企业信息或营业执照照片未通过校验,请仔细核对后提交');
+//                $this->error('您提交的企业信息或营业执照照片未通过校验,请仔细核对后提交');
             } else {
                 $this->error($res['msg']);
             }

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

@@ -345,7 +345,7 @@
             <th><i>*</i>企业授权书照片：</th>
             <td><input name="business_author_letter" type="file" class="w200" />
                 <span class="block">{$Think.lang.upload_information2}</span>
-                <span><a style="color: #0a6dee" target="_blank" href="https://s1.ax1x.com/2023/05/12/p9ynd6H.png">点击下载企业授权书模板</a></span>
+                <span><a style="color: #0a6dee" target="_blank" href="https://www.cctc365.com/uploads/home/store/p9ynd6H.png">点击下载企业授权书模板</a></span>
             </td>
         </tr>
       </tbody>