From 9b88e976724c8f6e9060286975407ff71bf46a03 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Tue, 25 Aug 2020 11:15:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/PartnerController.class.php | 2 +-
 Application/Admin/View/Partner/edit.html                 | 6 +++---
 Application/Admin/View/Partner/show.html                 | 7 ++++---
 Application/Admin/View/PromoteCompany/edit.html          | 6 +++---
 Application/Admin/View/PromoteCompany/view.html          | 4 ++--
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php
index 47a7c739c..677d89ded 100644
--- a/Application/Admin/Controller/PartnerController.class.php
+++ b/Application/Admin/Controller/PartnerController.class.php
@@ -496,7 +496,7 @@ class PartnerController extends ThinkController
         }else{
             $data['validity_end_time']='';
         }
-        
+
         $selfCompanies = M('company_info', 'tab_')->field('id,partner company_name,link_man,link_phone')->where(['status' => 1])->select();
 
         $this->assign('selfCompanies', $selfCompanies);
diff --git a/Application/Admin/View/Partner/edit.html b/Application/Admin/View/Partner/edit.html
index 43025d6d0..db887a558 100644
--- a/Application/Admin/View/Partner/edit.html
+++ b/Application/Admin/View/Partner/edit.html
@@ -132,15 +132,15 @@
 
                     </table>
                 </div>
-                <div id="tab2" class="tab-pane in tab2 ">
+                <div id="tab2" class="tab-pane tab2 ">
                     <table  border="0" cellspacing="0" cellpadding="0">
                         <tbody>
                             <tr>
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>合作方式:</td>
                                 <td class="r">
                                   <select name="relation[collaborate_way]" id="collaborate_way" class="select_gallery">
-                                    <option  value="1" <?php if($relation['collaborate_way'] == 0):?>selected<?php endif;?>>甲方</option>
-                                    <option  value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>乙方</option>
+                                    <option  value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>甲方</option>
+                                    <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>乙方</option>
                                   </select>
                                   <span class="notice-text"></span>
                                 </td>
diff --git a/Application/Admin/View/Partner/show.html b/Application/Admin/View/Partner/show.html
index fb094527e..8f6a02ca2 100644
--- a/Application/Admin/View/Partner/show.html
+++ b/Application/Admin/View/Partner/show.html
@@ -137,8 +137,8 @@
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>合作方式:</td>
                                 <td class="r">
                                   <select name="relation[collaborate_way]" disabled id="collaborate_way" class="select_gallery">
-                                      <option  value="1" <?php if($relation['collaborate_way'] == 0):?>selected<?php endif;?>>甲方</option>
-                                      <option  value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>乙方</option>
+                                      <option  value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>甲方</option>
+                                      <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>乙方</option>
                                   </select>
                                   <span class="notice-text"></span>
                                 </td>
@@ -413,10 +413,11 @@
     <script>
         showTab();
         <?php if($data['file_info']):?>
-        var doc = "<?=$data['file_info']?>"
+        var doc = <?=$data['file_info']?>
         <?php else:?>
         var doc
         <?php endif;?>
+
         if(!doc){
             doc = [];
         }
diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html
index ffd8589f9..0537e22b1 100644
--- a/Application/Admin/View/PromoteCompany/edit.html
+++ b/Application/Admin/View/PromoteCompany/edit.html
@@ -133,7 +133,7 @@
             width: auto;
         }
         .deposit-item.no-deposit {
-            display: none;
+            display: none!important;
         }
     </style>
 
@@ -370,8 +370,8 @@
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>合作方式:</td>
                                 <td class="r">
                                   <select name="relation[collaborate_way]" id="collaborate_way" class="select_gallery">
-                                    <option  value="1" <?php if($relation['collaborate_way'] == 0):?>selected<?php endif;?>>甲方</option>
-                                    <option  value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>乙方</option>
+                                    <option  value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>甲方</option>
+                                    <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>乙方</option>
                                   </select>
                                   <span class="notice-text"></span>
                                 </td>
diff --git a/Application/Admin/View/PromoteCompany/view.html b/Application/Admin/View/PromoteCompany/view.html
index 03fee9d75..ed72c2bb0 100644
--- a/Application/Admin/View/PromoteCompany/view.html
+++ b/Application/Admin/View/PromoteCompany/view.html
@@ -381,8 +381,8 @@
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>合作方式:</td>
                                 <td class="r">
                                   <select name="relation[collaborate_way]" disabled id="collaborate_way" class="select_gallery">
-                                      <option  value="1" <?php if($relation['collaborate_way'] == 0):?>selected<?php endif;?>>甲方</option>
-                                      <option  value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>乙方</option>
+                                      <option  value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>甲方</option>
+                                      <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>乙方</option>
                                   </select>
                                   <span class="notice-text"></span>
                                 </td>