123

igirl-channel-web/app/front/vues/pages/icorder/icorder.css

@@ -106,7 +106,6 @@
 .icorder-main-con-left>div {
     width: 100%;
     height: 54px;
-    line-height: 54px;
 }
 
 .icorder-main-con-left>.text1 {
@@ -120,6 +119,7 @@
     font-size: 21px;
     font-family: MicrosoftYaHei;
     font-weight: 400;
+    padding-right: 20px;
     color: rgba(51, 51, 51, 1);
 }
 
@@ -251,7 +251,5 @@
 }
 
 .icorder-main-con-left>.text2 {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
+    
 }
\ No newline at end of file

igirl-channel-web/app/front/vues/pages/icorder/icorder.html

@@ -58,8 +58,7 @@
         <div class="main-con1-name" style="flex:1;font-size: 12px;text-align: center;color: #f15533;">{{item.levels}}
         </div>
       </div>
-      <div class="icorder-main-con1-name"
-        v-if="findStatus ||(company.similarCityList && company.similarCityList.length == 0)"> <img
+      <div class="icorder-main-con1-name" v-if="findStatus == 0 && showBtm"> <img
           src="/imgs/home/con1name.png" alt=""> 没有相同或相似名称企业</div>
     </div>
   </div>

igirl-channel-web/app/front/vues/pages/icorder/icorder.js

@@ -29,40 +29,53 @@
           label: '成都'
         }],
         value2: '',
-        options2: [{
-          value: '文化',
-          label: '文化'
-        }, {
-          value: '科技',
-          label: '科技'
-        }, {
-          value: '管理',
-          label: '管理'
-        }, {
-          value: '咨询',
-          label: '咨询'
-        }, {
-          value: '服务',
-          label: '服务'
-        }, {
-          value: '传媒',
-          label: '传媒'
-        }, {
-          value: '影业',
-          label: '影业'
-        }, {
-          value: '贸易',
-          label: '贸易'
-        }, {
-          value: '广告',
-          label: '广告'
-        }, {
-          value: '教育',
-          label: '教育'
-        }, {
-          value: '设计',
-          label: '设计'
-        }], value3: '',
+        options2: [
+          {
+            value: '文化',
+            label: '文化'
+          },
+          {
+            value: '科技',
+            label: '科技'
+          },
+          {
+            value: '管理',
+            label: '管理'
+          },
+          {
+            value: '咨询',
+            label: '咨询'
+          },
+          {
+            value: '服务',
+            label: '服务'
+          },
+          {
+            value: '传媒',
+            label: '传媒'
+          },
+          {
+            value: '影业',
+            label: '影业'
+          },
+          {
+            value: '贸易',
+            label: '贸易'
+          },
+          {
+            value: '广告',
+            label: '广告'
+          },
+          {
+            value: '教育',
+            label: '教育'
+          },
+          {
+            value: '设计',
+            label: '设计'
+          }
+        ],
+        value3: '',
         options3: [{
           value: '有限公司',
           label: '有限公司'
@@ -73,7 +86,10 @@
           value: '集团公司',
           label: '集团公司'
         }],
-        findStatus: false,
+        findStatus: null,
+        /** 判断返回数据是否有key值*/
+        nuans: null,
+        showBtm: false,
       }
     },
   mounted: function() {
@@ -95,23 +111,8 @@
           spinner: 'el-icon-loading',
           background: 'rgba(0, 0, 0, 0.7)'
         });
-        this.$root.postReq("/web/trademark/tmqueryCtl/icheming", params).then(function (d) {
-          loading.close();
-          if (d.status != Number(-200)) {
-            console.log(d);
-            this_.company = d.data;
-          } else {
-
-            this_.$message('没有相同或相似名称企业');
-          }
-        })
-      } else {
-        this.findStatus = true;
-        this.$message('您之前填写的信息有误');
-      };
-
-
-
+        this.searchResult();
+      }
     }
   },
   created: function() {
@@ -136,8 +137,16 @@
       });
       var obj = this.$root.copyParams(obj, "icheming", "/action/tmQuery/springBoard");
       this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
-        this_.company = d.data;
         loading.close();
+        if (d.status == 0) {
+          this_.company = d.data;
+          this_.findStatus = d.status;
+          this_.nuans = Object.keys(d.data).length;
+          if (this_.nuans > 0) {
+            d.data.similarCityList.length == 0 ? this_.showBtm = true : this_.showBtm = false;
+          }
+        }
+
       })
     },
   },

igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.css

@@ -300,9 +300,6 @@
 }
 
 
-
-
-
 .jdindentlist-list .el-table::before {
     height: 0;
 }

igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js

@@ -468,8 +468,6 @@
                 icbcChannelServiceNo: '',
                 icbcOrderStatusName: null,
                 icbcData: [],
-
-
                 icbcOrderStatusNameList: [
                     {
                         value: '',
@@ -530,7 +528,6 @@
             this.navActive = 'second';
             this.getIcbcList();
         }
-
         this.getChannelFrom();
     },
 

igirl-channel-web/app/front/vues/pages/jdindustry/jdindustry.js

@@ -359,6 +359,23 @@
     },
 
     goVerification(){
+      if (this.cityName == '选择城市') {
+        this.$message('请选择城市后再进行核名');
+        return
+      }
+      if (!this.companyName) {
+        this.$message('请输入公司名称');
+        return
+      }
+      if (this.industry == '选择行业') {
+        this.$message('请选择行业后再进行核名');
+        return
+
+      }
+      if (this.companyType == '选择类型') {
+        this.$message('请选择类型后再进行核名');
+        return
+      }
       let obj = {
         cityname: this.cityName,
         keyword: this.companyName,