Merge branch 'dev/v4.8.33_yf' of qmx/jy into feature/v4.8.33

src/web/staticres/common-module/pc-dialog/js/leave-info-dialog.js

@@ -11,18 +11,18 @@ var temp = `
             <div class="basic clearfix">
               <div class="form-title">基本信息</div>
               <div class="form-main clearfix">
-                <div class="short-control fl">
+                <div class="short-control fl" v-if="moduleShow.name">
                   <el-form-item label="姓名 :" prop="name">
                     <el-input v-model.trim="form.name"  class="item-input" placeholder="请输入姓名" @focus="nameFocus" required>
                     </el-input>
                   </el-form-item>
                 </div>
-                <div class="short-control fr">
+                <div class="short-control fr" v-if="moduleShow.mail">
                   <el-form-item label="邮箱 :" prop="mail">
                     <el-input v-model.trim="form.mail"  class="item-input" placeholder="请输入邮箱" @focus="mailFocus"></el-input>
                   </el-form-item>
                 </div>
-                <div class="short-control fl">
+                <div class="short-control fl" v-if="moduleShow.phone">
                   <el-form-item label="手机号 :" prop="phone">
                     <el-input v-model.trim="form.phone" maxlength="11" @input="inputPhone"  class="item-input" placeholder="请输入准确的手机号" @focus="phoneFocus"></el-input>
                   </el-form-item>
@@ -39,7 +39,7 @@ var temp = `
             <div class="company clearfix">
               <div class="form-title">公司信息</div>
               <div class="form-main">
-                <div class="long-control" style="position: relative;">
+                <div class="long-control" style="position: relative;" v-if="moduleShow.companyName">
                   <el-form-item label="公司名称 :" prop="companyName">
                     <el-input
                     v-model.trim="form.companyName"
@@ -54,7 +54,7 @@ var temp = `
                     <div class="company-list" v-for="item in companyList" :key="item" @click="selectCompany(item)" v-html="item"></div>
                   </div>
                 </div>
-                <div class="long-control" >
+                <div class="long-control" v-if="moduleShow.companyType">
                   <el-form-item label="公司类型 :" class="company-type" prop="companyType">
                     <el-checkbox-group v-model="form.companyType">
                       <el-checkbox label="投标企业"></el-checkbox>
@@ -67,7 +67,7 @@ var temp = `
                     </el-checkbox-group>
                   </el-form-item>
                 </div>
-                <div class="short-control fl">
+                <div class="short-control fl" v-if="moduleShow.job">
                   <el-form-item label="职位 :" prop="job">
                     <el-select v-model="form.job" placeholder="请选择职位"  class="item-input" clearable>
                       <el-option v-for="item in jobData" :key="item.value" :label="item.label" :value="item.value">
@@ -249,6 +249,13 @@ var vm = new Vue({
         }
       }
     }
+    var validBranch = function(rule,value,callback) {
+      if(value === '') {
+        return callback(new Error('请选择部门'));
+      } else {
+        callback();
+      }
+    }
     return {
       dialogTitle: '为给您匹配精准的推荐信息，请完善个人信息',
       jobData: jobData, // 职位数据
@@ -324,7 +331,8 @@ var vm = new Vue({
           {
             required: true,
             trigger: 'blur',
-            message: '请选择部门'
+            validator: validBranch,
+            message: ''
           }
         ],
       },
@@ -334,7 +342,18 @@ var vm = new Vue({
       showSuccess: false, // 显示提交成功弹框
       showExport: false,
       isForce: false, // 是否强制
-      source: '' // 来源模块
+      source: '', // 来源模块
+      interest: '', // 感兴趣内容
+      moduleShow: {
+        name: true,
+        phone: true,
+        mail: true,
+        code: false,
+        companyName: true,
+        companyType: true,
+        job: true,
+        branch: false
+      }
     }
   },
   computed: {
@@ -376,6 +395,30 @@ var vm = new Vue({
     $(document).off('click')
   },
   methods: {
+    getModules: function () {
+      var source = this.source
+      switch (source) {
+        case 'pc_supermarket_Noresults_customization':
+        case 'pc_market_ApplicationScenario': 
+        case 'pc_supermarket_details_customization': 
+        case 'pc_supermarket_details_buy': {
+          this.hideModule(['mail'])
+          break;
+        }
+        default:
+          this.hideModule()
+          break;
+      }
+    },
+    hideModule: function (keys) {
+      if (!keys) return
+      var hideType = keys
+      for (var k in this.moduleShow) {
+        if (hideType.indexOf(k) !== -1) {
+          this.moduleShow[k] = false
+        }
+      }
+    },
     changeTop: function () {
       this.$nextTick(function () {
         var dialogDom = $('#collectUserInfoDialog .dialog-container')
@@ -468,12 +511,13 @@ var vm = new Vue({
       })
     },
     // 是否留资
-    isNeedSubmit: function(source, callback, dom) {
+    isNeedSubmit: function(source, callback, interest) {
       if (!loginflag) {
         openLoginDig()
         return
       }
       this.source = source
+      this.interest = interest
       this.logAjax(source)
       var _this = this
       $.ajax({
@@ -525,11 +569,24 @@ var vm = new Vue({
     // 自定义弹窗头部
     isSelfHeader: function(){
       var imgUrl = '/common-module/pc-dialog/image/structed-title.png'
-      if (this.source.indexOf('custom_export') > -1 || this.source.indexOf('custom_data') > -1) {
+      var custom_export = this.source.indexOf('custom_export') > -1
+      var custom_data = this.source.indexOf('custom_data') > -1
+      var api_interface = this.source.indexOf('api_interface') > -1
+      // 数据超市source
+      var marketNoResult = this.source.indexOf('pc_supermarket_Noresults_customization') > -1 // 数据超市列表无数据-申请定制
+      var marketApplicationScenario = this.source.indexOf('pc_market_ApplicationScenario') > -1 // 数据市场落地页-大数据服务应用场景-立即咨询
+      var marketBuy = this.source.indexOf('pc_supermarket_details_buy') > -1 // 数据超市详情页-申请购买
+      var marketDetailCustom = this.source.indexOf('pc_supermarket_details_customization') > -1 // 数据超市详情页-申请定制
+      if (custom_export || custom_data || marketNoResult || marketDetailCustom) {
         imgUrl =  '/common-module/pc-dialog/image/leave-title-custom.png'
-      } else if (this.source.indexOf('api_interface') > -1) {
+      } else if (api_interface) {
         imgUrl =  '/common-module/pc-dialog/image/leave-title-api.png'
+      } else if (marketApplicationScenario) {
+        imgUrl =  '/common-module/pc-dialog/image/data-supermarket-contact.png'
+      } else if (marketBuy) {
+        imgUrl =  '/common-module/pc-dialog/image/data-supermarket-buy.png'
       }
+      this.getModules()
       this.$nextTick(function(){
         $('#collectUserInfoDialog .dialog-header').css('background-image', 'url(' + imgUrl + ')')
       })
@@ -558,7 +615,8 @@ var vm = new Vue({
         position: this.form.job == '其他' ?  this.form.job + '/' + this.form.otherJob : this.form.job,
         code: this.form.code,
         agree: true, // 原来留资模块的同意协议字段，，，默认传一个true 方便后端处理
-        branch: this.form.branch.indexOf('总裁') > -1 || this.form.branch.indexOf('总经理') > -1 || !this.form.job ? '' : this.form.branch
+        branch: this.form.branch.indexOf('总裁') > -1 || this.form.branch.indexOf('总经理') > -1 || !this.form.job ? '' : this.form.branch,
+        interest: this.interest // 感兴趣内容
       }
       if (info) {
         params = info

src/web/templates/pc/dataSmt/index.html

@@ -3,8 +3,8 @@
   <head>
     <meta charset="UTF-8" />
     <title>数据市场-剑鱼标讯</title>
-    <meta name="Keywords" content=''/>
-    <meta name="Description" content=''/>
+    <meta name="Keywords" content='数据市场,数据超市'/>
+    <meta name="Description" content='数据市场,数据超市'/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <meta name="format-detection" content="tephone=no" />
     <meta content="数据市场" theme="light" name="enable-header"/>
@@ -13,6 +13,8 @@
     <link rel="stylesheet" type="text/css" href='{{Msg "seo" "cdn"}}/pccss/reset_pc.css?v={{Msg "seo" "version"}}' />
     <link rel="stylesheet" type="text/css" href='{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}' />
     <link href='{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}' rel="stylesheet">
+    <link href="//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.7/lib/theme-chalk/index.css" rel="stylesheet">
+    <link href='{{Msg "seo" "cdn"}}/common-module/pc-dialog/css/leave-info-dialog.css?v={{Msg "seo" "version"}}' rel="stylesheet">
     <link href='{{Msg "seo" "cdn"}}/dataSmt/css/index.css?v={{Msg "seo" "version"}}' rel="stylesheet">
   </head>
 	<body>
@@ -55,7 +57,7 @@
             <div class="item-pro">
               <img src='{{Msg "seo" "cdn"}}/dataSmt/images/download-1.png' alt="">
               <p>标讯数据</p>
-              <a class="btn-light" href="/front/dataExport/toSieve" title="标讯数据" onClick="goUseHandle(); return false;">立即使用</a>
+              <a id="bid-data-use" class="btn-light" href="/front/dataExport/toSieve" title="标讯数据" onClick="goUseHandle(); return false;">立即使用</a>
             </div>
             <div class="item-pro disabled">
               <img src='{{Msg "seo" "cdn"}}/dataSmt/images/download-2.png' alt="">
@@ -88,7 +90,7 @@
             </div>
           </div>
           <div class="download-footer">
-            <a href="/front/dataExport/toSieve" title="标讯数据" onClick="goUseHandle(); return false;" class="learn-more">了解更多></a>
+            <a id="learn-more-download" href="/front/dataExport/toSieve" title="标讯数据" onClick="goUseHandle(); return false;" class="learn-more">了解更多></a>
           </div>
         </div>
       </div>
@@ -175,51 +177,51 @@
             </div>
           </div>
           <p class="learn-more-container">
-            <a href="javascript:;" class="learn-more" onClick="needSubmitHandle('pc_data_custom_data')">了解更多></a>
+            <a id="learn-more-data-export" href="javascript:;" class="learn-more" onClick="needSubmitHandle('pc_data_custom_data')">了解更多></a>
           </p>
         </div>
         <div class="export-case">
           <div class="case-title">500+企业数据定制案例</div>
           <div class="case-container">
             <div class="case-item">
-              <img src='{{Msg "seo" "cdn"}}/dataSmt/images/case-langchao.png' alt="浪潮">
+              <img src='{{Msg "seo" "cdn"}}/dataSmt/images/case-langchao.png' alt="浪潮软件科技">
               <p>浪潮软件科技</p>
-              <div class="btn-light">立即咨询</div>
+              <div id="consult-lc" class="btn-light"  onClick="needSubmitHandle('pc_data_custom_data', '浪潮软件科技')">立即咨询</div>
             </div>
             <div class="case-item">
               <img src='{{Msg "seo" "cdn"}}/dataSmt/images/case-ruijie.png' alt="锐捷网络">
               <p>锐捷网络</p>
-              <div class="btn-light">立即咨询</div>
+              <div id="consult-rj" class="btn-light"  onClick="needSubmitHandle('pc_data_custom_data', '锐捷网络')">立即咨询</div>
             </div>
             <div class="case-item">
               <img src='{{Msg "seo" "cdn"}}/dataSmt/images/case-ccscc.png' alt="中通服">
               <p>中通服</p>
-              <div class="btn-light">立即咨询</div>
+              <div id="consult-ztf" class="btn-light"  onClick="needSubmitHandle('pc_data_custom_data', '中通服')">立即咨询</div>
             </div>
             <div class="case-item">
               <img src='{{Msg "seo" "cdn"}}/dataSmt/images/case-cec.png' alt="中国电子">
               <p>中国电子</p>
-              <div class="btn-light">立即咨询</div>
+              <div id="consult-zgdz" class="btn-light"  onClick="needSubmitHandle('pc_data_custom_data', '中国电子')">立即咨询</div>
             </div>
             <div class="case-item">
               <img src='{{Msg "seo" "cdn"}}/dataSmt/images/case-soft.png' alt="东软集团">
               <p>东软集团</p>
-              <div class="btn-light">立即咨询</div>
+              <div id="consult-drjt" class="btn-light"  onClick="needSubmitHandle('pc_data_custom_data', '东软集团')">立即咨询</div>
             </div>
             <div class="case-item">
               <img src='{{Msg "seo" "cdn"}}/dataSmt/images/case-minsheng.png' alt="中国民生银行">
               <p>中国民生银行</p>
-              <div class="btn-light">立即咨询</div>
+              <div id="consult-msyh" class="btn-light"  onClick="needSubmitHandle('pc_data_custom_data', '中国民生银行')">立即咨询</div>
             </div>
             <div class="case-item">
               <img src='{{Msg "seo" "cdn"}}/dataSmt/images/case-siemens.png' alt="西门子医疗">
               <p>西门子医疗</p>
-              <div class="btn-light">立即咨询</div>
+              <div id="consult-smz" class="btn-light"  onClick="needSubmitHandle('pc_data_custom_data', '西门子医疗')">立即咨询</div>
             </div>
             <div class="case-item">
               <img src='{{Msg "seo" "cdn"}}/dataSmt/images/case-liantong.png' alt="中国联通">
               <p>中国联通</p>
-              <div class="btn-light">立即咨询</div>
+              <div id="consult-zglt" class="btn-light"  onClick="needSubmitHandle('pc_data_custom_data', '中国联通')">立即咨询</div>
             </div>
           </div>
         </div>
@@ -248,14 +250,18 @@
             </div>
           </div>
           <div class="scene-btn">
-            <span>立即咨询</span>
+            <span id="consult-scene-btn" onClick="needSubmitHandle('pc_market_ApplicationScenario')">立即咨询</span>
           </div>
         </div>
       </div>
       {{include "/common/pcbottom.html"}}
     </section>
+    <div id="vue-collect-user-info"></div>
   </body>
   <script type="text/javascript" src='{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}'></script>
+  <script src="//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js"></script>
+  <script src="//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.7/lib/index.js"></script>
+  <script src='{{Msg "seo" "cdn"}}/common-module/pc-dialog/js/leave-info-dialog.js?v={{Msg "seo" "version"}}'></script>
   <script>
     haslogin({{.T.logid}});
     function goUseHandle(e) {
@@ -266,6 +272,12 @@
         location.href = '/front/dataExport/toSieve'
       }
     }
+    function needSubmitHandle (source, name){
+      // 调用组件是否留资方法
+      vm.isNeedSubmit(source, function(){
+        vm.showSuccess = true
+      }, name)
+    }
   </script>
   {{include "/common/baiducc.html"}}