Merge branch 'dev' of www.gitinn.com:proginn/boss

pages/main/index/solution_detail.vue

@@ -9,7 +9,7 @@
         <el-image
           style="width: 50px; height: 50px"
           :src="detailData.verifying && detailData.verifying.icon_url"
-          ></el-image>
+        ></el-image>
       </el-col>
       <el-col :span="8">
         <el-button size="mini" @click="userinfo(detailData.verifying.uid)" type="info">用户信息</el-button>
@@ -28,60 +28,63 @@
       </el-col>
     </el-row>
     <el-divider></el-divider>
-    <el-row>
-      <el-col :span="19">
-        基本信息
-      </el-col>
-    </el-row>
-    <el-divider></el-divider>
-    <el-row>
-      <el-col :span="2">
-        <el-image
-          style="width: 50px; height: 50px"
-          :src="detailData.companyInfo.base.logo"
+    <div v-if="detailData.companyInfo.base">
+      <el-row>
+        <el-col :span="19">
+          基本信息
+        </el-col>
+      </el-row>
+      <el-divider></el-divider>
+      <el-row>
+        <el-col :span="2">
+          <el-image
+            style="width: 50px; height: 50px"
+            :src="detailData.companyInfo.base.logo"
           ></el-image>
-      </el-col>
-      <el-col :span="22">
-        {{detailData.companyInfo.applyInfo.name}}
-        <br>
-      </el-col>
-    </el-row>
-    <br>
-    <el-row>
-      <el-col :span="2">
-        企业联系人
-      </el-col>
-      <el-col :span="22">
+        </el-col>
+        <el-col :span="22">
+          {{detailData.companyInfo.applyInfo.name}}
+          <br>
+        </el-col>
+      </el-row>
+      <br>
+      <el-row>
+        <el-col :span="2">
+          企业联系人
+        </el-col>
+        <el-col :span="22">
 
-      </el-col>
-    </el-row>
-    <br>
-    <el-row>
-      <el-col :span="2">
-        联系方式
-      </el-col>
-      <el-col :span="22">
-        {{detailData.companyInfo.applyInfo.phone}}
-      </el-col>
-    </el-row>
-    <br>
-    <el-row>
-      <el-col :span="2">
-        职位
-      </el-col>
-      <el-col :span="22">
+        </el-col>
+      </el-row>
+      <br>
+      <el-row>
+        <el-col :span="2">
+          联系方式
+        </el-col>
+        <el-col :span="22">
+          {{detailData.companyInfo.applyInfo.phone}}
+        </el-col>
+      </el-row>
+      <br>
+      <el-row>
+        <el-col :span="2">
+          职位
+        </el-col>
+        <el-col :span="22">
+
+        </el-col>
+      </el-row>
+      <br>
+      <el-row>
+        <el-col :span="2">
+          企业介绍
+        </el-col>
+        <el-col :span="22">
+          {{detailData.companyInfo.description}}
+        </el-col>
+      </el-row>
+    </div>
 
-      </el-col>
-    </el-row>
-    <br>
-    <el-row>
-      <el-col :span="2">
-        企业介绍
-      </el-col>
-      <el-col :span="22">
-        {{detailData.companyInfo.description}}
-      </el-col>
-    </el-row>
     <el-divider></el-divider>
     <el-row style=" box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04)">
       <el-row style="padding: 5px">
@@ -94,7 +97,7 @@
           <el-image
             style="width: 100px; height: 100px"
             :src="item.images"
-            ></el-image>
+          ></el-image>
         </el-col>
         <el-col :span="15">
           <h3>{{item.title}}</h3>
@@ -122,14 +125,15 @@
         <el-row style="padding: 5px">
           当前申请认证解决方案
         </el-row>
-        <el-row style="padding: 10px; box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04); cursor: pointer"
+        <el-row
+          style="padding: 10px; box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04); cursor: pointer"
           @click.native="jumpToDetail(detailData.verifying)"
         >
           <el-col :span="3">
             <el-image
               style="width: 100px; height: 100px"
               :src="detailData.verifying.images"
-              ></el-image>
+            ></el-image>
           </el-col>
           <el-col :span="15">
             <h3>{{detailData.verifying.title}}</h3>
@@ -317,7 +321,7 @@
       },
       async jumpToDetail(item) {
         console.log('item', item)
-        const {id} = item
+        const { id } = item
         let url = window.location.href;
         let baseUrl = 'https://www.proginn.com'
         if (url.indexOf('dev') !== -1 || url.indexOf('local') !== -1) {