diff --git a/Application/Home/Controller/FileController.class.php b/Application/Home/Controller/FileController.class.php
index 83138e02f..e784ea258 100644
--- a/Application/Home/Controller/FileController.class.php
+++ b/Application/Home/Controller/FileController.class.php
@@ -27,7 +27,7 @@ class FileController extends HomeController {
 			C('DOWNLOAD_UPLOAD_DRIVER'),
 			C("UPLOAD_{$file_driver}_CONFIG")
 		);
-
+		
 		/* 记录附件信息 */
 		if($info){
 			$return['data'] = think_encrypt(json_encode($info['download']));
@@ -62,7 +62,7 @@ class FileController extends HomeController {
         $return  = array('status' => 1, 'info' => '上传成功', 'data' => '');
 
         /* 调用文件上传组件上传文件 */
-        $Picture = D('Picture');
+		$Picture = D('Picture');
         $pic_driver = C('PICTURE_UPLOAD_DRIVER');
         $info = $Picture->upload(
             $_FILES,
@@ -70,17 +70,20 @@ class FileController extends HomeController {
             C('PICTURE_UPLOAD_DRIVER'),
             C("UPLOAD_{$pic_driver}_CONFIG")
         ); //TODO:上传到远程服务器
-
-        /* 记录图片信息 */
-        if($info){
+		/* 记录图片信息 */
+        if ($info) {
             $return['status'] = 1;
-            $return = array_merge($info['download'], $return);
+            if (empty($info['download'])) {
+                $file = $info['file'];
+            } else {
+                $file = $info['download'];
+            }
+            $return = array_merge($file, $return);
         } else {
             $return['status'] = 0;
-            $return['info']   = $Picture->getError();
+            $return['info'] = $Picture->getError();
         }
-        ob_clean();
-        /* 返回JSON数据 */
+		/* 返回JSON数据 */
         $this->ajaxReturn($return);
     }
 }
diff --git a/Application/Home/Controller/SafeController.class.php b/Application/Home/Controller/SafeController.class.php
index 1229e40d9..1d11552d8 100644
--- a/Application/Home/Controller/SafeController.class.php
+++ b/Application/Home/Controller/SafeController.class.php
@@ -156,8 +156,8 @@ class SafeController extends BaseController{
         if($_POST) {
             $id = get_pid();
             $ver_status = M('promote','tab_')->where(['id'=>$id])->getField('ver_status',true);
-            if($ver_status !== 0) {
-                return $this->success('认证',U('editModify'));
+            if($ver_status[0] == 1) {
+                 $this->success('认证',U('editModify'));
             }
             $username = $_REQUEST['username']; //真实姓名
             $id_card = $_REQUEST["id_card"]; //身份证号码
@@ -312,8 +312,13 @@ class SafeController extends BaseController{
             if(!empty(json_decode($address))) {
                 $addressArr = explode(',', json_decode($address)[0]);
                 $promoteInfo['addressdata'] = $addressArr;
+                $this->assign('addr',json_decode($address)[1]);
+            }else {
+                $this->assign('addr','未填写地址');
             }
             $promoteInfo['address'] = json_decode($address);
+            
+            $this->assign("ver_status",$promoteInfo['ver_status']);
             $this->assign('promoteinfo', $promoteInfo);
             
             
@@ -331,6 +336,8 @@ class SafeController extends BaseController{
                $promoteInfo['valuedata'][$key] = $value;
             }
         }
+        $address = json_decode($rs['address'],false)[1];
+        $this->assign('addr',$address);
         $this->assign('ver_status',$rs['ver_status']);
         $this->assign('rs',$rs);
         $this->assign('promoteInfo',$promoteInfo);
@@ -339,14 +346,18 @@ class SafeController extends BaseController{
     }   
 
     public function edit() {
+        $id = get_pid();
         $tel = $_REQUEST["tel"];
-        $address = $_REQUEST["address"];
+        $address1 = $_REQUEST["address"];
         $email = $_REQUEST["email"];
         $account_type = $_REQUEST["account_type"];
         $bank = $_REQUEST["bank"];
         $agreementpic = $_REQUEST["agreementpic"];
+        $Res = M("promote","tab_")->field('address')->where(['id'=>$id])->find();
+        $address = json_decode($Res['address'],false);
+        $address[1] = $address1;
         $data['mobile_phone'] = $tel;
-        $data['address'] = $address;
+        $data['address'] = json_encode($address,TRUE);
         $data['email'] = $email;
         $data['account_type'] = $account_type;
         $data['bank_card'] = $bank;
@@ -372,7 +383,7 @@ class SafeController extends BaseController{
         $this->assign('bank_card',$rs['bank_card']);
         $res = [
             'tel'=> $rs['mobile_phone'],
-            'address'=> $rs['address'],
+            'address'=> json_decode($rs['address'],false)[1],
             'email'=> $rs['email'],
             'account_type'=> $rs['account_type'],
             'bank_card'=> $rs['bank_card'],
diff --git a/Application/Home/View/default/Safe/editModify.html b/Application/Home/View/default/Safe/editModify.html
index 7aeac9759..d767abb7b 100644
--- a/Application/Home/View/default/Safe/editModify.html
+++ b/Application/Home/View/default/Safe/editModify.html
@@ -144,7 +144,7 @@
                 电话:  {$tel}
             </div>
             <div class="line_text">
-                联系地址:   {$rs['address']}
+                联系地址:   {$addr}
             </div>
             <div class="line_text">
                 邮箱:  {$rs['email']}
@@ -177,10 +177,17 @@
                    var address = res.address
                    var email = res.email
                    var account_type = res.account_type
+                   if(account_type == 1) {
+                       var complany = 'checked';
+                       var personal = '';
+                   }else {
+                    var complany = '';
+                       var personal = 'checked';
+                   }
                    var bank_card = res.bank_card
                    var complanystatus = res.complanystatus
                    var personalstatus = res.personalstatus
-                   console.log(res)
+
                 layer.open({
                         type: 1
                         ,title: false //不显示标题栏
@@ -199,7 +206,7 @@
                        +'<span id="confirm_password_tip"></span></td></tr>'
                       +' <tr><td class="l">邮箱:</td><td class="r"><input type="text" class="input txt" name="email" id="confirm_password"  style="width:430px" placeholder="" value="'+email+'">'
                        +'<span id="confirm_password_tip"></span></td></tr>'
-                       +' <tr><td class="l">账户类型:</td><td class="r"><input type="radio" class="input txt" name="account_type" value="公司" checked="'+complanystatus+'">公司<input type="radio" class="input txt" style="margin-left:20px" name="account_type" value="个人" checked="'+personalstatus+'">个人'
+                       +' <tr><td class="l">账户类型:</td><td class="r"><input type="radio" class="input txt" name="account_type" value="公司" '+complany+'>公司<input type="radio" class="input txt" style="margin-left:20px" name="account_type" value="个人" '+personal+'>个人'
                        +'<span id="confirm_password_tip"></span></td></tr>'
                        +' <tr><td class="l">开户银行:</td><td class="r"><input type="text" class="input txt" name="bank" id="confirm_password"  style="width:430px" placeholder="" value="'+bank_card+'">'
                        +'<span id="confirm_password_tip"></span></td></tr>'
@@ -210,12 +217,15 @@
                        +'<tr><td class="l"  colspan="5"><div style="margin-top:40px;" id="tab"><span style="padding-left:20px;color:#26c7dbd4" >*须补充修改协议(联系平台签署)</span></div> </td></tr>'
                        +'<tr style=""><td class="l"></td><td style="margin-top:50px" class="r">'
                           +'<input type="submit" class="tj btn ajax-post" value="保存" style="margin-top:40px;width:200px" title="" target-form="paw_info">'
-                          +'</td> </tr></table></form>'
+                          +'<input type="button" id="btn" class="tj btn ajax-post" value="返回" style="margin-top:40px;width:200px;margin-left:50px" title="" target-form="paw_info"></td> </tr></table></form>'
                             +'</div></div></div>'
                        // ,content:content
                      
                     
                  }) 
+                 $("#btn").click(function() {
+                   window.location.href = "{:U('safe/editModify')}"
+                 })
                  var uploaderImgagreementpic = WebUploader.create({
           // 选完文件后，是否自动上传。
           auto: true,
diff --git a/Application/Home/View/default/Safe/modifyBaseInfo.html b/Application/Home/View/default/Safe/modifyBaseInfo.html
index 95fc7f4c5..d47fbff1f 100644
--- a/Application/Home/View/default/Safe/modifyBaseInfo.html
+++ b/Application/Home/View/default/Safe/modifyBaseInfo.html
@@ -54,6 +54,16 @@
         <span style="padding-left:20px;color:red" >正在审核中，请耐心等待~加急,请联系您的平台对接人员</span>
     </div>
     <?php };?>
+    <?php if($promoteinfo['ver_status'] == 1) {?>
+        <div style="background: RGB(252,236,236);" id="tab">
+            <span style="padding-left:20px;color:#26c7dbd4" >认证审核成功</span>
+        </div>
+        <?php };?>
+        <?php if($promoteinfo['ver_status'] == 2) {?>
+            <div style="background: RGB(252,236,236);" id="tab">
+                <span style="padding-left:20px;color:red" >认证审核失败</span>
+            </div>
+            <?php };?>
     <div class="page-list normal_list promote-base_info-form"  style="min-height:120vh">
       <div class="trunk-title">
       	<img src="__IMG__/20180207/icon_normal_zhanghu.png">
@@ -66,12 +76,12 @@
                   <table class="table2" style="margin-top:20px;margin-left:30px;width:100%" >
        
                       <tr>
-                        <td class="l">真实姓名：</td>
+                        <td class="l">真实姓名{$ver_status}：</td>
                         <td class="r">
-                            <?php if($ver_status !== 0 ){?>
+                            <?php if($ver_status == 1 ){?>
                                 <input type="text"  disabled ="disabled" class="input txt" name="username" id="password" style="width:430px" placeholder="{$promoteinfo['real_name']}" value="{$promoteinfo['real_name']}">
                             <?php }?>
-                            <?php if($ver_status === 0 ){?>
+                            <?php if($ver_status != 1) {?>
                                 <input type="text"  class="input txt" name="username" id="password" style="width:430px" placeholder="{$promoteinfo['real_name']}" value="{$promoteinfo['real_name']}">
                             <?php }?>
                         <span id="password_tip"></span></td>
@@ -79,10 +89,10 @@
                       <tr>
                         <td class="l">身份证号码：</td>
                         <td class="r">
-                                <?php if($ver_status !== 0 ){?>
+                                <?php if($ver_status == 1 ){?>
                                     <input type="text" disabled ="disabled"  class="input txt" name="id_card" id="confirm_password"  style="width:430px" placeholder="{$promoteinfo['idcard']}" value="{$promoteinfo['idcard']}">
                                 <?php }?>
-                                <?php if($ver_status === 0 ){?>
+                               <?php if($ver_status != 1)  {?>
                                     <input type="text" class="input txt" name="id_card" id="confirm_password"  style="width:430px" placeholder="{$promoteinfo['idcard']}" value="{$promoteinfo['idcard']}">
                                 <?php }?>
                             
@@ -184,11 +194,11 @@
                        <tr style="margin-top:50px">
                         <td class="l">电话：</td>
                         <td class="r">
-                                <?php if($ver_status !== 0 ){?>
+                                <?php if($ver_status == 1 ){?>
                                     <input type="text"   disabled ="disabled" class="input txt" name="tel" id="confirm_password"  style="width:430px" placeholder="{$promoteinfo['mobile_phone']}" value="{$promoteinfo['mobile_phone']}">
                                 <?php }?>
-                                <?php if($ver_status === 0 ){?>
-                                    <input type="text" class="input txt" name="tel" id="confirm_password"  style="width:430px" placeholder="{$promoteinfo['mobile_phone']}" value="{$promoteinfo['mobile_phone']}">
+                               <?php if($ver_status != 1)  {?>
+                                    <input type="text"  class="input txt" name="tel" id="confirm_password"  style="width:430px" placeholder="{$promoteinfo['mobile_phone']}" value="{$promoteinfo['mobile_phone']}">
                                 <?php }?>
                             
                         <span id="confirm_password_tip"></span></td>
@@ -202,11 +212,11 @@
                                     <select id="s_province" name="s_province" class="areaselect1 select_gallery" style="width: 90px;"></select>  
                                     <select id="s_city" name="s_city"  class="areaselect2 select_gallery" style="width: 120px;"></select>  
                                     <select id="s_county" name="s_county"  class="areaselect3 select_gallery" style="width: 90px;"></select>
-                                    <?php if($ver_status !== 0 ){?>
-                                        <input type="text" class="input txt" disabled ="disabled" name="address" id="confirm_password"  style="width:430px;margin-left:20px" placeholder="" value="{$promoteinfo['address'][1]}">
+                                    <?php if($ver_status == 1 ){?>
+                                        <input type="text" class="input txt" disabled ="disabled" name="address" id="confirm_password"  style="width:430px;margin-left:20px" placeholder="{$addr}" value="{$addr}">
                                     <?php }?>
-                                    <?php if($ver_status === 0 ){?>
-                                        <input type="text" class="input txt" name="address" id="confirm_password"  style="width:430px;margin-left:20px" placeholder="" value="{$promoteinfo['address'][1]}">
+                                   <?php if($ver_status != 1)  {?>
+                                        <input type="text" class="input txt" name="address" id="confirm_password"  style="width:430px;margin-left:20px" placeholder="{$addr}" value='{$addr}'>
                                     <?php }?>
                                     
                                     <script type="text/javascript" >
@@ -235,10 +245,10 @@
                       <tr>
                         <td class="l">邮箱：</td>
                         <td class="r">
-                                <?php if($ver_status !== 0 ){?>
+                                <?php if($ver_status == 1 ){?>
                                     <input type="text" class="input txt"  disabled ="disabled"  name="email" id="confirm_password"  style="width:430px" placeholder="{$promoteinfo['email']}" value="{$promoteinfo['email']}">
                                 <?php }?>
-                                <?php if($ver_status === 0 ){?>
+                               <?php if($ver_status != 1)  {?>
                                     <input type="text" class="input txt" name="email" id="confirm_password"  style="width:430px" placeholder="{$promoteinfo['email']}" value="{$promoteinfo['email']}">
                                 <?php }?>
                             
@@ -246,17 +256,23 @@
                       </tr>
                       
                       <tr>
-                        <td class="l">账户类型：</td>
-                        <td class="r"><input type="radio" class="input txt" name="account_type" value="公司" checked="{$promoteinfo['complanystatus']}">公司<input type="radio" class="input txt" style="margin-left:20px" name="account_type" value="个人" checked="{$promoteinfo['personlastatus']}">个人
+                        <td class="l">账户类型{$promoteinfo['complanystatus']}：</td>
+                        <td class="r">
+                            <?php if($promoteinfo['complanystatus'] == 1) {?>
+                            <input type="radio" class="input txt" name="account_type" value="公司" checked>公司<input type="radio" class="input txt" style="margin-left:20px" name="account_type" value="个人" >个人
+                            <?php }?>
+                            <?php if($promoteinfo['complanystatus'] == 0) {?>
+                                <input type="radio" class="input txt" name="account_type" value="公司" >公司<input type="radio" class="input txt" style="margin-left:20px" name="account_type" value="个人" checked>个人
+                                <?php }?>
                         <span id="confirm_password_tip"></span></td>
                       </tr>
                       <tr>
                         <td class="l">开户银行：</td>
                         <td class="r">
-                                <?php if($ver_status !== 0 ){?>
+                                <?php if($ver_status == 1 ){?>
                                     <input type="text" class="input txt" disabled ="disabled" name="bank_name" id="confirm_password"  style="width:430px" placeholder="{$promoteinfo['bank_name']}" value="{$promoteinfo['bank_name']}">
                                 <?php }?>
-                                <?php if($ver_status === 0 ){?>
+                               <?php if($ver_status != 1)  {?>
                                     <input type="text" class="input txt" name="bank_name" id="confirm_password"  style="width:430px" placeholder="{$promoteinfo['bank_name']}" value="{$promoteinfo['bank_name']}">
                                 <?php }?>
                             
@@ -266,10 +282,10 @@
                       <tr>
                         <td class="l">银行账户名：</td>
                         <td class="r">
-                                <?php if($ver_status !== 0 ){?>
+                                <?php if($ver_status == 1 ){?>
                                     <input type="text" class="input txt"  disabled ="disabled" name="bank_account" id="confirm_password"  style="width:430px" placeholder="{$promoteinfo['bank_account']}" value="{$promoteinfo['bank_account']}">
                                 <?php }?>
-                                <?php if($ver_status === 0 ){?>
+                               <?php if($ver_status != 1)  {?>
                                     <input type="text" class="input txt" name="bank_account" id="confirm_password"  style="width:430px" placeholder="{$promoteinfo['bank_account']}" value="{$promoteinfo['bank_account']}">
                                 <?php }?>
                             
@@ -279,10 +295,10 @@
                       <tr>
                         <td class="l">银行账号：</td>
                         <td class="r">
-                                <?php if($ver_status !== 0 ){?>
+                                <?php if($ver_status == 1 ){?>
                                     <input type="text" class="input txt" disabled ="disabled" name="bank_card" id="confirm_password"  style="width:430px" placeholder="{$promoteinfo['bank_card']}" value="{$promoteinfo['bank_card']}">
                                 <?php }?>
-                                <?php if($ver_status === 0 ){?>
+                               <?php if($ver_status != 1)  {?>
                                     <input type="text" class="input txt" name="bank_card" id="confirm_password"  style="width:430px" placeholder="{$promoteinfo['bank_card']}" value="{$promoteinfo['bank_card']}">
                                 <?php }?>