Merge branch 'dev' of hlm/hlm_pl_mall into master

app/home/controller/BaseMember.php

@@ -206,7 +206,7 @@ class BaseMember extends BaseHome
 
     public function getIdCardInfo($memberInfo)
     {
-        $url = get_member_idcard_image($memberInfo['business_licence_number_electronic']);
+        $url = get_member_idcard_image($memberInfo['member_idcard_image2']);
         $url2 = get_member_idcard_image($memberInfo['member_idcard_image3']);
         $base64 = $this->getBase64($url);
         $base642 = $this->getBase64($url2);

app/home/controller/MemberAuth.php

@@ -133,6 +133,12 @@ class MemberAuth extends BaseMember
     {
         $file_name = input('param.id');
         if (!empty($_FILES[$file_name]['name'])) {
+//            $file = request()->file($file_name);
+//            $size = $file->getSize();
+//            if ($size > 10485760) {
+//                ds_json_encode(10001, '上传图片大学不能超过10M');
+//            }
+
 
             $res = ds_upload_pic(ATTACH_IDCARD_IMAGE, $file_name);
             if (!$res['code']) {
@@ -158,6 +164,11 @@ class MemberAuth extends BaseMember
         session('member_image_'.$memberId,'');
         $file_name = input('param.id');
         if (!empty($_FILES[$file_name]['name'])) {
+//            $file = request()->file($file_name);
+//            $size = $file->getSize();
+//            if ($size > 10485760) {
+//                ds_json_encode(10001, '上传图片大学不能超过10M');
+//            }
 
             $res = ds_upload_pic(ATTACH_STORE_JOININ, $file_name);
             if (!$res['code']) {

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

@@ -300,11 +300,10 @@
                                      src="{$Think.BASE_SITE_ROOT}/static/home/images/member_idcard_image2.png"
                                      id="img_member_idcard_image2_url"/>
                             </p>
-                            {if !in_array($member_info.member_auth_state,array(1,3))}<a
-                                href="javascript:dropImage('member_idcard_image2')"
-                                class="drop-btn iconfont">&#xe6e6;</a>{/if}
+<!--                            {if !in_array($member_info.member_auth_state,array(1,3))}<a-->
+<!--                                href="javascript:dropImage('member_idcard_image2')"-->
+<!--                                class="drop-btn iconfont">&#xe6e6;</a>{/if}-->
                         </div>
-                        {if !in_array($member_info.member_auth_state,array(1,3))}
                         <div class="dsm-upload-btn">
                             <a href="javascript:void(0);">
                                 <span><input type="file" hidefocus="true" size="1" class="input-file"
@@ -313,12 +312,11 @@
                                 <p><i class="iconfont">&#xe733;</i>图片上传</p>
                             </a>
                         </div>
-                        {/if}
                     </div>
                 </div>
                 <span class="w400">
                     <input type="text" style="width:0;opacity: 0" name="member_idcard_image2" id="member_idcard_image2"
-                           value="{$member_info.member_idcard_image2}" {if in_array($member_info.member_auth_state,array(1,3))}disabled="" {/if}>
+                           value="{$member_info.member_idcard_image2}"}>
                 </span>
             </td>
         </tr>
@@ -333,11 +331,11 @@
                                      src="{$Think.BASE_SITE_ROOT}/static/home/images/member_idcard_image3.png"
                                      id="img_member_idcard_image3_url"/>
                             </p>
-                            {if !in_array($member_info.member_auth_state,array(1,3))}<a
-                                href="javascript:dropImage('member_idcard_image3')"
-                                class="drop-btn iconfont">&#xe6e6;</a>{/if}
+<!--                            {if !in_array($member_info.member_auth_state,array(1,3))}<a-->
+<!--                                href="javascript:dropImage('member_idcard_image3')"-->
+<!--                                class="drop-btn iconfont">&#xe6e6;</a>{/if}-->
                         </div>
-                        {if !in_array($member_info.member_auth_state,array(1,3))}
+
                         <div class="dsm-upload-btn">
                             <a href="javascript:void(0);">
                                 <span><input type="file" hidefocus="true" size="1" class="input-file"
@@ -346,7 +344,6 @@
                                 <p><i class="iconfont">&#xe733;</i>图片上传</p>
                             </a>
                         </div>
-                        {/if}
                     </div>
                 </div>
 
@@ -355,7 +352,7 @@
 <!--                <input type="hidden" id="bbb" value="">-->
                 <span class="w400">
                     <input type="text" style="width:0;opacity: 0" name="member_idcard_image3" id="member_idcard_image3"
-                           value="{$member_info.member_idcard_image3}" {if in_array($member_info.member_auth_state,array(1,3))}disabled="" {/if}>
+                           value="{$member_info.member_idcard_image3}">
                 </span>
             </td>
         </tr>