Эх сурвалжийг харах

Merge branch 'master' into feature/v4.8.67

lianbingjie 1 жил өмнө
parent
commit
d3f076e055
28 өөрчлөгдсөн 567 нэмэгдсэн , 149 устгасан
  1. 2 2
      src/go.mod
  2. 4 4
      src/go.sum
  3. 1 1
      src/jfw/modules/app/src/web/staticres/jyapp/js/common.js
  4. 25 4
      src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info.html
  5. 39 7
      src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info_strud.html
  6. 12 4
      src/jfw/modules/publicapply/src/oneclick/entity/entity.go
  7. 9 3
      src/web/staticres/common-module/pc-dialog/css/leave-info-dialog.css
  8. BIN
      src/web/staticres/common-module/pc-dialog/image/data-supermarket-buy.png
  9. BIN
      src/web/staticres/common-module/pc-dialog/image/data-supermarket-contact.png
  10. BIN
      src/web/staticres/common-module/pc-dialog/image/industry-case.png
  11. BIN
      src/web/staticres/common-module/pc-dialog/image/leave-title-custom.png
  12. BIN
      src/web/staticres/common-module/pc-dialog/image/structed-title.png
  13. 95 49
      src/web/staticres/common-module/pc-dialog/js/leave-info-dialog.js
  14. 6 3
      src/web/staticres/common-module/perfect-info/index.css
  15. 174 47
      src/web/staticres/common-module/perfect-info/js/perfect-info.js
  16. 27 3
      src/web/staticres/css/dataSmt/dataMart.css
  17. 20 0
      src/web/staticres/css/dataSmt/dataMart_detail.css
  18. 16 4
      src/web/staticres/dataSmt/css/index.css
  19. BIN
      src/web/staticres/images/dataSmt/icon-tips.png
  20. 5 0
      src/web/staticres/js/biddingSearch.js
  21. 16 0
      src/web/staticres/js/superSearch.js
  22. 4 4
      src/web/templates/dataMarket/index.html
  23. 24 4
      src/web/templates/frontRouter/wx/bigmember/free/perfect_info.html
  24. 39 7
      src/web/templates/frontRouter/wx/bigmember/free/perfect_info_strud.html
  25. 7 2
      src/web/templates/pc/dataExport_sieve.html
  26. 24 0
      src/web/templates/pc/dataSmt/detail.html
  27. 10 1
      src/web/templates/pc/dataSmt/list.html
  28. 8 0
      src/web/templates/pc/supsearch.html

+ 2 - 2
src/go.mod

@@ -6,7 +6,7 @@ require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230308011651-df591d32df88
 	app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v0.0.0-20230926094058-438d017d0f81
+	app.yhyue.com/moapp/jypkg v0.0.0-20231017032120-01da044f6c92
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/bwmarrin/snowflake v0.3.0
@@ -141,7 +141,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gorm.io/driver/mysql v1.0.5 // indirect
 	gorm.io/gorm v1.21.3 // indirect
-	jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230710093759-d9d6c68de8b1 // indirect
+	jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20231017031425-45003ca9f35a // indirect
 	k8s.io/api v0.26.3 // indirect
 	k8s.io/apimachinery v0.27.0-alpha.3 // indirect
 	k8s.io/client-go v0.26.3 // indirect

+ 4 - 4
src/go.sum

@@ -9,8 +9,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40 h1:/FcBvpf/KW8g6GB
 app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v0.0.0-20230926094058-438d017d0f81 h1:YrT86U95eMPFf7mdum3FtYpr4CwvTVXC4ZzXWXvW+R0=
-app.yhyue.com/moapp/jypkg v0.0.0-20230926094058-438d017d0f81/go.mod h1:gPCOY8bVXdY5bD7nry7th+YNkKC/viG8Dc9+z4fUaRo=
+app.yhyue.com/moapp/jypkg v0.0.0-20231017032120-01da044f6c92 h1:ZEe+lUFbCk+MWUnNxTx4L+lsJmiAEIdFsgFyMT4ua+E=
+app.yhyue.com/moapp/jypkg v0.0.0-20231017032120-01da044f6c92/go.mod h1:76Kz6+MuxcRJRyFad9W8R4AByiQlVGzuGFzklY+2m38=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=
@@ -1432,8 +1432,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230710093759-d9d6c68de8b1 h1:BItxi1gkQUs3sjxaBk6tc34fZWSO4hUSXcTM3PcnY4I=
-jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230710093759-d9d6c68de8b1/go.mod h1:p/595fgbj4r6GhSJhHDpx3Ru1NkD5UASFL8OuIQw09E=
+jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20231017031425-45003ca9f35a h1:kwjO4pqB3gnNGrQ9aXyz6f8s9qXAUenPUDWip8gYR/Q=
+jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20231017031425-45003ca9f35a/go.mod h1:p/595fgbj4r6GhSJhHDpx3Ru1NkD5UASFL8OuIQw09E=
 k8s.io/api v0.22.9/go.mod h1:rcjO/FPOuvc3x7nQWx29UcDrFJMx82RxDob71ntNH4A=
 k8s.io/api v0.26.3 h1:emf74GIQMTik01Aum9dPP0gAypL8JTLl/lHa4V9RFSU=
 k8s.io/api v0.26.3/go.mod h1:PXsqwPMXBSBcL1lJ9CYDKy7kIReUydukS5JiRlxC3qE=

+ 1 - 1
src/jfw/modules/app/src/web/staticres/jyapp/js/common.js

@@ -1636,7 +1636,7 @@ function loginSuccess (result, loginType) {
     })
   }
   //判断是否需要跳过设置密码和兴趣爱好
-  var isPass =  getParam("activity")!==""
+  var isPass =  getParam("activity")
   // 当前为新用户(即注册)--跳转设置密码页
    if(!isPass&&result.userInfo && result.userInfo.isNewUser) {
      var href ="/jyapp/free/setPwd";

+ 25 - 4
src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info.html

@@ -41,11 +41,32 @@
       <div class="j-container">
         <div class="j-main info-collect">
           <div class="top-tip-group" v-if="getTipStr">
-            <p class="top-tip-text">
-              @@getTipStr@@
+            <p class="top-tip-text" v-html="getTipStr">
             </p>
           </div>
-          <div class="form-card-group">
+          <div class="form-card-group" v-show="notit_group">
+            <div class="form-title"></div>
+            <div class="form-content-card" >
+              <van-field v-model.trim="infoMap.name" label="姓名" @focus="infoCheckMap.name = ''"
+                @blur="getCheckMap('name')" :error-message="infoCheckMap.name" required placeholder="请输入姓名"></van-field>
+              <van-field v-model.trim="infoMap.phone" label="手机号" @focus="infoCheckMap.phone = ''"
+                @blur="getCheckMap('phone')" :error-message="infoCheckMap.phone" required placeholder="请输入准确的手机号">
+              </van-field>
+              <div class="associate-ent-group" v-show="isAssociateShow" style="top:2.72rem">
+                <div class="associate-ent-item" @click="selectEnt(item)" v-for="(item, i) in searchList" v-bind:key="i"
+                  v-html="highlightText(item, infoMap.company)"></div>
+              </div>
+              <van-field @input="entOnChange('input')" @blur="entOnChange('blur')" @focus="infoCheckMap.company = ''"
+                :error-message="infoCheckMap.company" required v-model.trim="infoMap.company" label="公司名称"
+                placeholder="请输入准确的公司名称"></van-field>
+              <van-field v-if="moduleShow.email" v-model.trim="infoMap.email" label="邮箱"
+                @focus="infoCheckMap.email = ''" @blur="getCheckMap('email')" :error-message="infoCheckMap.email"
+                required placeholder="请输入邮箱"></van-field>
+                <van-field v-if="moduleShow.data_requirement" maxlength="200" v-model="infoMap.data_requirement" label="数据需求" rows="2"
+                type="textarea" placeholder="请描述下您需要的数据"></van-field>
+            </div>
+          </div>
+          <div class="form-card-group" v-show="!notit_group">
             <div class="form-title">基本信息</div>
             <div class="form-content-card">
               <van-field v-model.trim="infoMap.name" label="姓名" @focus="infoCheckMap.name = ''"
@@ -64,7 +85,7 @@
                 is-link placeholder="请选择受雇类型"></van-field>
             </div>
           </div>
-          <div class="form-card-group">
+          <div class="form-card-group" v-show="!notit_group">
             <div class="form-title">公司信息</div>
             <div class="form-content-card">
               <div class="associate-ent-group" v-show="isAssociateShow">

+ 39 - 7
src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info_strud.html

@@ -2,7 +2,7 @@
 <html lang="zh-CN" style="font-size: 50px;">
 
 <head>
-    <title>完善信息</title>
+    <title>免费获取数据样例</title>
     <!--引入公共资源头部-->
     {{include "/big-member/meta.html"}}
 
@@ -36,10 +36,9 @@
         <div class="j-container">
             <div class="j-main info-collect">
                 <div class="top-tip-group">
-                    <p class="top-tip-text">请完善信息,我们将以邮件的形式发送数据样例
-                    </p>
+                    <p class="top-tip-text">请完善以下信息,以便为您找到最符合需求的数据样例。</p>
                 </div>
-                <div class="form-card-group">
+                <div class="form-card-group" v-if = "ajaxParams.source != 'structedData'">
                     <div class="form-title">基本信息</div>
                     <div class="form-content-card">
                         <van-field v-model.trim="infoMap.name" label="姓名" @focus="infoCheckMap.name = ''" @blur="getCheckMap('name')"
@@ -60,7 +59,7 @@
                                    :error-message="infoCheckMap.email" required placeholder="请输入邮箱"></van-field>
                     </div>
                 </div>
-                <div class="form-card-group">
+                <div class="form-card-group" v-if = "ajaxParams.source != 'structedData'">
                     <div class="form-title">公司信息</div>
                     <div class="form-content-card">
                         <div class="associate-ent-group" v-show="isAssociateShow">
@@ -77,6 +76,25 @@
                         <van-field v-if="showBranch" :error-message="infoCheckMap.branch" v-model="infoMap.branch" required label="部门" @click="openPop('部门')" readonly is-link placeholder="请选择部门"></van-field>
                     </div>
                 </div>
+                <div class="form-card-group" v-if = "ajaxParams.source == 'structedData'">
+                  <div class="form-title"></div>
+                  <div class="form-content-card">
+                    <van-field v-model.trim="infoMap.name" label="姓名" @focus="infoCheckMap.name = ''" @blur="getCheckMap('name')"
+                    :error-message="infoCheckMap.name" required placeholder="请输入姓名"></van-field>
+                    <van-field @input="getInputPhone" v-model.trim="infoMap.phone" label="手机号" @focus="infoCheckMap.phone = ''"
+                    @blur="getCheckMap('phone')" :error-message="infoCheckMap.phone" required
+                    placeholder="请输入准确的手机号"></van-field>
+                    <div class="associate-ent-group" v-show="isAssociateShow">
+                          <div class="associate-ent-item" @click="selectEnt(item)" v-for="(item, i) in searchList" v-bind:key="i" v-html="highlightText(item, infoMap.company)"></div>
+                      </div>
+                    <van-field @input="entOnChange('input')" @blur="getCheckMap('company')" @focus="infoCheckMap.company = ''"
+                                 :error-message="infoCheckMap.company" required v-model.trim="infoMap.company" label="公司名称" placeholder="请输入准确的公司名称"></van-field>
+                    <van-field v-model.trim="infoMap.email" label="邮箱" @focus="infoCheckMap.email = ''" @blur="getCheckMap('email')"
+                                 :error-message="infoCheckMap.email" required placeholder="请输入邮箱,用于接收数据样例"></van-field>
+                    <van-field  maxlength="200" v-model="infoMap.data_requirement" label="数据需求" rows="2"
+                                 type="textarea" placeholder="请描述下您需要的数据"></van-field>
+                  </div>
+              </div>
                 <div class="warm-prompt">
                   <span class="icon-warning"></span>
                   <span class="warm-text">温馨提示:请提供准确的信息,我们将为您推荐更准确、更个性化的商机和服务</span>
@@ -172,7 +190,8 @@
         companyType: '',
         position: '',
         position_other: '',
-        branch: ''
+        branch: '',
+        data_requirement:''
       },
       infoCheckMap: {
         name: '',
@@ -303,7 +322,8 @@
           return false
         }
         var namereg = /^[\u4E00-\u9FA5A-Za-z\s]+(·[\u4E00-\u9FA5A-Za-z]+)*$/;//中英文或加.的少数民族名字
-        return namereg.test(this.infoMap.name)
+        // return namereg.test(this.infoMap.name)
+        return this.infoMap.name
       },
       checkPhone () {
         return /^1[3-9]\d{9}$/.test(this.infoMap.phone)
@@ -349,7 +369,11 @@
         }
       },
       isSubmitDisabled () {
+        if(this.ajaxParams.source == 'structedData'){
+        return !this.checkName || !this.checkPhone || !this.checkEmail  
+       } else {
         return !this.checkName || !this.checkPhone || !this.checkEmail || !this.checkEntName || !this.checkEntType || !this.vercodecor || !this.checkPosition || this.checkBranch
+       }
       },
       isNextDisabled () {
         var type = this.popInfo.label
@@ -551,6 +575,9 @@
         if (data.branch) {
           this.setCheckForData('branch', 'branch', data.branch, '部门')
         }
+        if (data.data_requirement) {
+          this.setCheckForData('data_requirement', 'data_requirement', data.data_requirement)
+        }
       },
       setCheckForData (aKey, iKey, cKey, label) {
         this.ajaxParams[aKey] = cKey
@@ -714,12 +741,17 @@
         this.ajaxParams.companyType = this.infoMap.companyType
         this.ajaxParams.position = this.infoMap.position
         this.ajaxParams.branch = this.infoMap.branch.indexOf('总裁') > -1 || this.infoMap.branch.indexOf('总经理') > -1 ?  '' : this.infoMap.branch
+        this.ajaxParams.data_requirement=this.infoMap.data_requirement
         if(this.setcodeShow) {
           this.ajaxParams.code = this.infoMap.vercode
         }
         if (this.infoMap.position === '其他') {
           this.ajaxParams.position = '其他/' + this.infoMap.position_other
         }
+        if(this.ajaxParams.source == 'structedData'){
+          this.ajaxParams.source_desc = '数据定制导出-获取数据样例'
+          
+        }
         var _this = this
         var loading = _this.showLoading()
         $.ajax({

+ 12 - 4
src/jfw/modules/publicapply/src/oneclick/entity/entity.go

@@ -86,17 +86,25 @@ func (o *OneClickInfo) GetPhoneByToken() (map[string]interface{}, error) {
 				}()
 				// 复制代码运行请自行打印 API 的返回值
 				_result, _err := client.GetPhoneWithTokenWithOptions(getPhoneWithTokenRequest, runtime)
+				log.Println("GetPhoneWithTokenWithOptions _result:", _result)
 				if _err != nil {
-					log.Println("h5取号失败:", _err)
-					return fmt.Errorf("手机号填写错误"), ""
+					log.Println("GetPhoneWithTokenWithOptions:_err", _err)
+					if _result.Body != nil {
+						log.Println("GetPhoneWithTokenWithOptions _result", _result.Body.Code, _result.Body.Message)
+					}
+					if strings.Contains(_err.Error(), "GET_MOBILE_FAILED") {
+						return fmt.Errorf("输入手机号码和当前流量卡运营商归属不一致"), ""
+					}
+					return fmt.Errorf("无法识别网络环境,请使用验证码登录"), ""
 				}
 				if *_result.Body.Code == "OK" {
 					//获取手机号
 					return nil, *_result.Body.Data.Mobile
 				} else {
-					log.Println(*_result.Body.Message, *_result.Body.Code)
-					return fmt.Errorf("手机号填写错误"), ""
+					log.Println("GetPhoneWithTokenWithOptions:", *_result.Body.Message, *_result.Body.Code, o.SpToken)
+					return fmt.Errorf("无法识别网络环境,请使用验证码登录"), ""
 				}
+
 				//return fmt.Errorf(*_result.Body.Message), ""
 			}()
 		} else if o.AccessToken != "" {

+ 9 - 3
src/web/staticres/common-module/pc-dialog/css/leave-info-dialog.css

@@ -110,10 +110,11 @@
   text-align: center;
   background-position: top center;
   background-repeat: no-repeat;
-  background-image: url('/common-module/pc-dialog/image/structed-title.png?v={{Msg "seo" "version"}}');
-  background-size: 100% 250px;
+  /* background-image: url('/common-module/pc-dialog/image/structed-title.png?v={{Msg "seo" "version"}}'); */
+  background-size: 100% 100%;
 }
 #collectUserInfoDialog .dialog-content{
+  width: calc(100% - 4px);
   margin-top: -1px;
   padding: 0 32px 32px;
   border-radius: 0 0 8px 8px;
@@ -291,7 +292,8 @@
   display: none;
 }
 .el-input.is-active .el-input__inner,
-.el-input__inner:focus{
+.el-input__inner:focus,
+.el-textarea__inner:focus{
   border-color: #2CB7CA;
 }
 .el-select .el-input.is-focus .el-input__inner,
@@ -336,6 +338,10 @@
   /* height: 36px; */
   min-height: 36px!important;
 }
+.el-input__inner::placeholder,
+.el-textarea__inner::placeholder{
+  color: #999;
+}
 /* .el-select-dropdown__wrap{
   max-height:124px;
 } */

BIN
src/web/staticres/common-module/pc-dialog/image/data-supermarket-buy.png


BIN
src/web/staticres/common-module/pc-dialog/image/data-supermarket-contact.png


BIN
src/web/staticres/common-module/pc-dialog/image/industry-case.png


BIN
src/web/staticres/common-module/pc-dialog/image/leave-title-custom.png


BIN
src/web/staticres/common-module/pc-dialog/image/structed-title.png


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 95 - 49
src/web/staticres/common-module/pc-dialog/js/leave-info-dialog.js


+ 6 - 3
src/web/staticres/common-module/perfect-info/index.css

@@ -8,9 +8,12 @@
 .perfect-info-group .top-tip-text {
   margin: 0 auto;
   display: inline-block;
-  text-align: left;
+  text-align: center;
+}
+.tips_tel{
+  color: #2ABED1;
+  text-decoration: underline;
 }
-
 .perfect-info-group .top-tip-group {
   font-family: PingFang SC;
   font-style: normal;
@@ -19,7 +22,7 @@
   line-height: 0.4rem;
   color: #FF9F40;
   background-color: #FFF4E8;
-  padding: 0.24rem 0.2rem;
+  padding: 0.2rem 0.32rem;
   text-align: center;
 }
 

+ 174 - 47
src/web/staticres/common-module/perfect-info/js/perfect-info.js

@@ -4,7 +4,6 @@ var freeAttachText = '请留下联系方式,立即免费体验【附件下载
 var analysisTipText = '请完善个人信息,辅助你做投标决策及报价参考!'
 
 var emailRegExp = /\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/
-
 // 标题
 var titleMap = {
   app_article_member_freeuse: '免费体验大会员功能权益',
@@ -54,17 +53,26 @@ var titleMap = {
   wx_article_member_freeuse: '免费体验大会员功能权益',
 
   // 数据超市列表-申请数据定制
-  app_DataSupermarket_Customization: '量身定制数据解决方案',
-  wx_DataSupermarket_Customization: '量身定制数据解决方案',
-  h5_DataSupermarket_Customization: '量身定制数据解决方案',
+  app_DataSupermarket_Customization: '量身定制专属的数据解决方案',
+  wx_DataSupermarket_Customization: '量身定制专属的数据解决方案',
+  h5_DataSupermarket_Customization: '量身定制专属的数据解决方案',
   // 数据超市详情-申请购买
   app_supermarket_details_buy: '购买申请',
   wx_supermarket_details_buy: '购买申请',
   h5_supermarket_details_buy: '购买申请',
   // 数据超市详情-申请数据定制
-  app_supermarket_details_customization: '量身定制数据解决方案',
-  wx_supermarket_details_customization: '量身定制数据解决方案',
-  h5_supermarket_details_customization: '量身定制数据解决方案',
+  app_supermarket_details_customization: '量身定制专属的数据解决方案',
+  wx_supermarket_details_customization: '量身定制专属的数据解决方案',
+  h5_supermarket_details_customization: '量身定制专属的数据解决方案',
+  h5_DataSupermarket_IndustryFields:'量身定制专属的数据解决方案',
+  app_DataSupermarket_IndustryFields:'量身定制专属的数据解决方案',
+  wx_DataSupermarket_IndustryFields:'量身定制专属的数据解决方案',
+  app_supermarket_details_IndustryFields:'量身定制专属的数据解决方案',
+  wx_supermarket_details_IndustryFields:'量身定制专属的数据解决方案',
+  h5_supermarket_details_IndustryFields:'量身定制专属的数据解决方案',
+  app_supermarket_details_AnalysisCase:'免费下载行业案例',
+  wx_supermarket_details_AnalysisCase:'免费下载行业案例',
+  h5_supermarket_details_AnalysisCase:'免费下载行业案例',
   // 标书制作
   bid_document_Introduction_page: '完善信息',
   // 电信行业解决方案
@@ -171,20 +179,30 @@ var tipMap = {
   app_analysis_ProjectDetails: '请完善个人信息,我们将尽快与您联系,为您量身定制报告,做市场复盘数据支持。',
 
   // 数据超市列表-申请数据定制
-  app_DataSupermarket_Customization: '专业数据团队,支持私有化部署。请完善个人信息,获取定制化数据解决方案。',
-  wx_DataSupermarket_Customization: '专业数据团队,支持私有化部署。请完善个人信息,获取定制化数据解决方案。',
-  h5_DataSupermarket_Customization: '专业数据团队,支持私有化部署。请完善个人信息,获取定制化数据解决方案。',
+  app_DataSupermarket_Customization: '请留下您的联系方式及定制数据字段需求,我们将安排专业的数据经理与您对接,为您打造专属的数据服务方案,可快速交付!',
+  wx_DataSupermarket_Customization: '请留下您的联系方式及定制数据字段需求,我们将安排专业的数据经理与您对接,为您打造专属的数据服务方案,可快速交付!',
+  h5_DataSupermarket_Customization: '请留下您的联系方式及定制数据字段需求,我们将安排专业的数据经理与您对接,为您打造专属的数据服务方案,可快速交付!',
   // 数据超市详情-申请购买
-  app_supermarket_details_buy: '请留下联系方式,我们会尽快让数据经理与您联系,为您提供高效可靠的数据服务方案!',
-  wx_supermarket_details_buy: '请留下联系方式,我们会尽快让数据经理与您联系,为您提供高效可靠的数据服务方案!',
-  h5_supermarket_details_buy: '请留下联系方式,我们会尽快让数据经理与您联系,为您提供高效可靠的数据服务方案!',
+  app_supermarket_details_buy: '请留下您的联系方式,我们将安排专业数据经理与您对接。如有其他业务需求请联系客服:<a onclick="appcallPhone()" class="tips_tel">400-108-6670</a>',
+  wx_supermarket_details_buy: '请留下您的联系方式,我们将安排专业数据经理与您对接。如有其他业务需求请联系客服:<a href="tel:400-108-6670" class="tips_tel">400-108-6670</a>',
+  h5_supermarket_details_buy: '请留下您的联系方式,我们将安排专业数据经理与您对接。如有其他业务需求请联系客服:<a href="tel:400-108-6670" class="tips_tel">400-108-6670</a>',
   // 数据超市详情-申请数据定制
-  app_supermarket_details_customization: '专业数据团队,支持私有化部署。请完善个人信息,获取定制化数据解决方案。',
-  wx_supermarket_details_customization: '专业数据团队,支持私有化部署。请完善个人信息,获取定制化数据解决方案。',
-  h5_supermarket_details_customization: '专业数据团队,支持私有化部署。请完善个人信息,获取定制化数据解决方案。',
+  app_supermarket_details_customization: '请留下您的联系方式及定制数据字段需求,我们将安排专业的数据经理与您对接,为您打造专属的数据服务方案,可快速交付!',
+  wx_supermarket_details_customization: '请留下您的联系方式及定制数据字段需求,我们将安排专业的数据经理与您对接,为您打造专属的数据服务方案,可快速交付!',
+  h5_supermarket_details_customization: '请留下您的联系方式及定制数据字段需求,我们将安排专业的数据经理与您对接,为您打造专属的数据服务方案,可快速交付!',
+  h5_DataSupermarket_IndustryFields: '请留下您的联系方式及定制数据字段需求,我们将安排专业的数据经理与您对接,为您打造专属的数据服务方案,可快速交付!',
+  app_DataSupermarket_IndustryFields: '请留下您的联系方式及定制数据字段需求,我们将安排专业的数据经理与您对接,为您打造专属的数据服务方案,可快速交付!',
+  wx_DataSupermarket_IndustryFields: '请留下您的联系方式及定制数据字段需求,我们将安排专业的数据经理与您对接,为您打造专属的数据服务方案,可快速交付!',
+  app_supermarket_details_IndustryFields:'请留下您的联系方式及定制数据字段需求,我们将安排专业的数据经理与您对接,为您打造专属的数据服务方案,可快速交付!',
+  wx_supermarket_details_IndustryFields:'请留下您的联系方式及定制数据字段需求,我们将安排专业的数据经理与您对接,为您打造专属的数据服务方案,可快速交付!',
+  h5_supermarket_details_IndustryFields:'请留下您的联系方式及定制数据字段需求,我们将安排专业的数据经理与您对接,为您打造专属的数据服务方案,可快速交付!',
+  // 
+  app_supermarket_details_AnalysisCase:'请留下您的联系方式,免费获取领域客户应用案例。如有其他业务需求请联系客服:<a onclick="appcallPhone()" class="tips_tel">400-108-6670</a>',
+  wx_supermarket_details_AnalysisCase:'请留下您的联系方式,免费获取领域客户应用案例。如有其他业务需求请联系客服:<a href="tel:400-108-6670" class="tips_tel">400-108-6670</a>',
+  h5_supermarket_details_AnalysisCase:'请留下您的联系方式,免费获取领域客户应用案例。如有其他业务需求请联系客服:<a href="tel:400-108-6670" class="tips_tel">400-108-6670</a>',
   // 标书制作
   bid_document_Introduction_page: '请留下联系方式,我们会尽快联系您!',
-  // 电信行业解决方案
+  // 电信行业解决方案 
   telecom_solution: '请留下您的信息,我们会尽快和您联系'
 }
 
@@ -192,13 +210,32 @@ var tipMap = {
 var sourceDescMap = {
   app_article_member_freeuse: '标讯详情页-免费体验大会员',
   wx_article_member_freeuse: '标讯详情页-免费体验大会员',
-  h5_article_member_freeuse: '标讯详情页-免费体验大会员'
+  h5_article_member_freeuse: '标讯详情页-免费体验大会员',
+  wx_DataSupermarket_IndustryFields:'数据超市字段说明-申请定制行业字段',
+  app_DataSupermarket_IndustryFields:'数据超市字段说明-申请定制行业字段',
+  h5_DataSupermarket_IndustryFields:'数据超市字段说明-申请定制行业字段',
+  app_supermarket_details_IndustryFields:'数据超市产品详情页-申请定制行业字段',
+  wx_supermarket_details_IndustryFields:'数据超市产品详情页-申请定制行业字段',
+  h5_supermarket_details_IndustryFields:'数据超市产品详情页-申请定制行业字段',
+  app_supermarket_details_AnalysisCase:'数据超市产品详情页-下载行业数据分析案例',
+  wx_supermarket_details_AnalysisCase:'数据超市产品详情页-下载行业数据分析案例',
+  h5_supermarket_details_AnalysisCase:'数据超市产品详情页-下载行业数据分析案例',
+  app_supermarket_details_buy:'数据超市详情-申请购买',
+  wx_supermarket_details_buy: '数据超市详情-申请购买',
+  h5_supermarket_details_buy:'数据超市详情-申请购买',
+  app_DataSupermarket_Customization: '数据超市列表-申请数据定制',
+  wx_DataSupermarket_Customization: '数据超市列表-申请数据定制',
+  h5_DataSupermarket_Customization: '数据超市列表-申请数据定制',
+  app_supermarket_details_customization: '数据超市详情-申请数据定制',
+  wx_supermarket_details_customization: '数据超市详情-申请数据定制',
+  h5_supermarket_details_customization:'数据超市详情-申请数据定制'
 }
 
 var vNode = {
   delimiters: ['@@', '@@'],
   el: '#perfect-info-page',
   data: {
+    notit_group:false,
     areaDatas: areaItem,
     areaId: '',
     areaIndex: '',
@@ -225,7 +262,8 @@ var vNode = {
       workScope: '',
       partnerNeeds: '',
       position_other: '',
-      branch: ''
+      branch: '',
+      data_requirement: ''
     },
     infoCheckMap: {
       name: '',
@@ -261,7 +299,8 @@ var vNode = {
       partnerNeeds: '',
       branch: '',
       origin: location.origin,
-      interest: ''
+      interest: '',
+      data_requirement:''
     },
     // 默认为隐藏,需要展示则需判断
     moduleShow: {
@@ -275,7 +314,8 @@ var vNode = {
       workScope: true,
       partnerNeeds: true,
       agree: true,
-      branch: true
+      branch: true,
+      data_requirement:true
     },
     jobJson: [
       '总裁',
@@ -304,6 +344,7 @@ var vNode = {
       this.ajaxParams.interest = decodeURIComponent(utils.getParam('interest'))
     }
     this.sourceLogAjax(this.ajaxParams.source)
+    this.notit_group_init()
   },
   mounted: function () {
     // app头部默认隐藏检查
@@ -351,6 +392,10 @@ var vNode = {
             this.moduleShow[k] = false
           }
           this.moduleShow.position = true
+          if(source?.toLowerCase().indexOf('supermarket') > -1){
+            this.moduleShow.data_requirement = true
+            this.moduleShow.email = true
+          }  
         }
 
         if (source.indexOf('_freeuser') > -1 && infoText.indexOf('【') > -1) {
@@ -416,20 +461,32 @@ var vNode = {
           hideLabel()
           break
         }
-
+        // 数据超市相关
         case 'app_supermarket_Noresults_customization':
         case 'wx_DataSupermarket_Noresults_Customization':
         case 'h5_supermarket_Noresults_customization':
         case 'app_DataSupermarket_Customization':
         case 'wx_DataSupermarket_Customization':
         case 'h5_DataSupermarket_Customization':
-        case 'app_supermarket_details_buy':
-        case 'wx_supermarket_details_buy':
-        case 'h5_supermarket_details_buy':
         case 'app_supermarket_details_customization':
         case 'wx_supermarket_details_customization':
-        case 'h5_supermarket_details_customization':{
-          hideLabel(['email', 'area', 'class',  'workScope', 'partnerNeeds', 'agree'])
+        case 'h5_supermarket_details_customization': 
+        case 'h5_DataSupermarket_IndustryFields':
+        case 'app_DataSupermarket_IndustryFields':
+        case 'wx_DataSupermarket_IndustryFields':
+        case 'app_supermarket_details_IndustryFields':
+        case 'wx_supermarket_details_IndustryFields':
+        case 'h5_supermarket_details_IndustryFields':
+        case 'app_supermarket_details_AnalysisCase':
+        case 'wx_supermarket_details_AnalysisCase':
+        case 'h5_supermarket_details_AnalysisCase':{
+            hideLabel(['email'])
+          break
+        }
+        case 'app_supermarket_details_buy':
+        case 'wx_supermarket_details_buy':
+        case 'h5_supermarket_details_buy':{
+          hideLabel(['email','data_requirement'])
           break
         }
         default: {
@@ -440,7 +497,6 @@ var vNode = {
           }
         }
       }
-
       try {
         setHeaderTitle && setHeaderTitle()
       } catch (error) {}
@@ -492,7 +548,13 @@ var vNode = {
       return namereg.test(this.infoMap.position_other)
     },
     isSubmitDisabled () {
-      return !this.checkName || !this.checkPhone || !this.checkEmail || !this.checkEntName || !this.checkEntType || !this.checkPosition || (this.showBranch && !this.infoMap.branch)
+      if(this.notit_group){
+        return !this.checkName || !this.checkPhone || !this.checkEmail || !this.checkEntName
+
+      }else{
+        return !this.checkName || !this.checkPhone || !this.checkEmail || !this.checkEntName || !this.checkEntType || !this.checkPosition || (this.showBranch && !this.infoMap.branch)
+
+      }
     },
     isMoreSelect () {
       return this.popInfo.label === '公司类型'
@@ -753,6 +815,9 @@ var vNode = {
       if (data.partnerNeeds) {
         this.setCheckForData('partnerNeeds', 'partnerNeeds', data.partnerNeeds)
       }
+      if(data.data_requirement){
+        this.setCheckForData('data_requirement', 'data_requirement', data.data_requirement)
+      }
       if (typeof data.agree !== 'undefined') {
       this.ajaxParams.agree = data.agree
       this.isRead = data.agree
@@ -934,10 +999,11 @@ var vNode = {
       sessionStorage.removeItem('salesBackStatus')
       history.back()
     },
-    showMessage: function (msg, confirmText, callback) {
+    showMessage: function (msg, confirmText, callback,title) {
       var message = msg || '您的申请已提交,我们会尽快联系您并预约演示时间,请耐心等待~您将获得免费体验大会员全部功能!'
       this.$dialog.close()
       this.$dialog.confirm({
+        title: title?title:'',
         message: message,
         className: 'ent-search-dialog max-54',
         overlayClass: 'z-2030',
@@ -978,6 +1044,7 @@ var vNode = {
       this.ajaxParams.agree = this.isRead
       this.ajaxParams.branch = this.infoMap.branch.indexOf('总裁') > -1 || this.infoMap.branch.indexOf('总经理') > -1 ? '' : this.infoMap.branch
       this.ajaxParams.source_desc = sourceDescMap[this.ajaxParams.source]
+      this.ajaxParams.data_requirement = this.infoMap.data_requirement
 
       var _this = this
       var loading = _this.showLoading()
@@ -1020,18 +1087,18 @@ var vNode = {
               case 'jyarticle_see3_plus_wx': {
                 _this.showMessage('您已获得无限次免费查看标讯的权益,如需查看超前项目请联系客服:400-108-6670', '确定', function () {
                   history.back()
-                }, '提交成功')
+                })
                 setTimeout(function () {
                   sessionStorage.setItem('salesBackStatus', 'true')
                   history.back()
-                }, '提交成功')
+                })
                 break
               }
               case 'jyarticle_see3_plus_app': {
                 _this.showMessage('您已获得无限次免费查看标讯的权益,如需查看超前项目请联系客服:400-108-6670', '确定', function () {
                   sessionStorage.setItem('salesBackStatus', 'true')
                   history.back()
-                }, '提交成功')
+                })
                 break
               }
               case 'jypush_see10_plus_wx': {
@@ -1076,29 +1143,48 @@ var vNode = {
                 break
               }
               // 数据超市相关source
-              case 'app_supermarket_Noresults_customization':
-              case 'wx_DataSupermarket_Noresults_Customization':
-              case 'h5_supermarket_Noresults_customization':
-              case 'app_DataSupermarket_Customization':
-              case 'wx_DataSupermarket_Customization':
-              case 'h5_DataSupermarket_Customization':
               case 'app_supermarket_details_buy':
               case 'wx_supermarket_details_buy':
-              case 'h5_supermarket_details_buy':
-              case 'app_supermarket_details_customization':
-              case 'wx_supermarket_details_customization':
-              case 'h5_supermarket_details_customization': {
-                _this.showMessage('我们的客户经理会在24小时内尽快与您联系。', '我知道了', function () {
+              case 'h5_supermarket_details_buy':{
+                _this.showMessage('已收到您提交的购买申请,我们的数据经理会尽快联系您~', '我知道了', function () {
                   history.back()
-                },)
+                },'提交成功')
                 break
               }
+                case 'app_supermarket_Noresults_customization':
+                case 'wx_DataSupermarket_Noresults_Customization':
+                case 'h5_supermarket_Noresults_customization':
+                case 'app_DataSupermarket_Customization':
+                case 'wx_DataSupermarket_Customization':
+                case 'h5_DataSupermarket_Customization':
+                case 'app_supermarket_details_customization':
+                case 'wx_supermarket_details_customization':
+                case 'h5_supermarket_details_customization': 
+                case 'h5_DataSupermarket_IndustryFields':
+                case 'app_DataSupermarket_IndustryFields':
+                case 'wx_DataSupermarket_IndustryFields':
+                case 'app_supermarket_details_IndustryFields':
+                case 'wx_supermarket_details_IndustryFields':
+                case 'h5_supermarket_details_IndustryFields':{
+                  _this.showMessage('已收到您提交的数据定制申请,我们的数据经理会尽快联系您~', '我知道了', function () {
+                    history.back()
+                  },'提交成功')
+                  break
+                }
+                case 'app_supermarket_details_AnalysisCase':
+                case 'wx_supermarket_details_AnalysisCase':
+                case 'h5_supermarket_details_AnalysisCase':{
+                    _this.showMessage('已收到您的申请,我们的数据经理会尽快联系您~', '我知道了', function () {
+                      history.back()
+                    },'提交成功')
+                    break
+               }
               case 'app_article_member_freeuse':
               case 'h5_article_member_freeuse':
               case 'wx_article_member_freeuse': {
                 _this.showMessage('已收到您提交的免费体验大会员申请,我们会尽快联系您并预约演示时间。', '确定', function () {
                   history.back()
-                }, '提交成功')
+                })
                 break
               }
               default: {
@@ -1187,7 +1273,48 @@ var vNode = {
         forbidClick: true,
         message: message,
       })
-    }
+    },
+    notit_group_init () {
+      var source = this.ajaxParams.source
+      var notit_group_list = [
+      'app_supermarket_Noresults_customization',
+      'wx_DataSupermarket_Noresults_Customization',
+      'h5_supermarket_Noresults_customization',
+      'app_DataSupermarket_Customization',
+      'wx_DataSupermarket_Customization',
+      'h5_DataSupermarket_Customization',
+      'app_supermarket_details_buy',
+      'wx_supermarket_details_buy',
+      'h5_supermarket_details_buy',
+      'app_supermarket_details_customization',
+      'wx_supermarket_details_customization',
+      'h5_supermarket_details_customization',
+      'h5_DataSupermarket_IndustryFields',
+      'app_DataSupermarket_IndustryFields',
+      'wx_DataSupermarket_IndustryFields',
+      'app_supermarket_details_IndustryFields',
+      'wx_supermarket_details_IndustryFields',
+      'h5_supermarket_details_IndustryFields',
+      'app_supermarket_details_AnalysisCase',
+      'wx_supermarket_details_AnalysisCase',
+      'h5_supermarket_details_AnalysisCase'
+      ]
+      if(notit_group_list.includes(source)){
+     
+        this.notit_group = true
+      } else {
+    
+        this.notit_group = false
+      }
+    },
   }
 }
 var vPerfect = new Vue(vNode)
+function appcallPhone() {
+  try{
+  JyObj.callPhone('400-108-6670')
+} catch (error) {
+  console.log(error)
+}
+
+}

+ 27 - 3
src/web/staticres/css/dataSmt/dataMart.css

@@ -389,7 +389,7 @@
 }
 .dataMart .dataMart_dialog .content{
   width: 750px;
-  height: 674px;
+  /* height: 674px; */
   border-radius: 8px;
   position: absolute;
   left: 50%;
@@ -403,7 +403,7 @@
   width: calc(100% - 3px);
   margin: auto;
   margin-top: 16px;
-  height: 560px;
+  height: 500px;
   overflow-y:auto;
   padding: 0 4px;
 }
@@ -465,4 +465,28 @@ color: #1D1D1D;
  .dataMart_dialog table .values{
   width: calc(100% - 140px);
   text-align: left;
- }
+ }
+ .additional-remarks{
+  display: flex;
+  margin: 8px 32px 0;
+  padding: 5px 16px;
+  background: rgba(255, 159, 64, 0.08);
+  border-radius: 4px;
+  color: rgba(245, 101, 0, 1);
+  font-size: 14px;
+  line-height: 22px;
+  text-align: justify;
+ }
+ .additional-remarks img{
+  margin: 2px 4px 0 0;
+ }
+ .additional-remarks .light-text{
+  color: #2ABED1;
+  text-decoration: underline;
+  cursor: pointer;
+ }
+@media screen and (max-height: 800px) {
+  .dataMart .dataMart_dialog .content .table_box{
+    height: 400px;
+  }
+}

+ 20 - 0
src/web/staticres/css/dataSmt/dataMart_detail.css

@@ -302,3 +302,23 @@
   line-height: 18px;
   color: rgba(104, 104, 104, 1);
 }
+.additional-remarks{
+  display: flex;
+  margin-bottom: 8px;
+  justify-content: center;
+  padding: 5px 16px;
+  background: rgba(255, 159, 64, 0.08);
+  border-radius: 4px;
+  color: rgba(245, 101, 0, 1);
+  font-size: 14px;
+  line-height: 22px;
+  text-align: center;
+ }
+ .additional-remarks img{
+  margin: 2px 4px 0 0;
+ }
+ .additional-remarks .light-text{
+  color: #2ABED1;
+  text-decoration: underline;
+  cursor: pointer;
+ }

+ 16 - 4
src/web/staticres/dataSmt/css/index.css

@@ -391,18 +391,26 @@ a:focus{
 .data-scene .scene-item:nth-child(4){
   background-image: url(/dataSmt/images/scene-item-4.png);
 }
+.data-scene .scene-btn-container{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 40px 0 0;
+}
 .data-scene .scene-btn{
   width: 240px;
   height: 48px;
   line-height: 48px;
-  margin: 48px auto 0;
-  background-color: #fff;
   border-radius: 8px;
   text-align: center;
   cursor: pointer;
+  font-size: 20px;
 }
-
-.data-scene .scene-btn > span{
+.data-scene .consult-btn{
+  background-color: #fff;
+  margin-right: 72px;
+}
+.data-scene .consult-btn > span{
   /* background: linear-gradient(#33CCCC, #3399FF);
   -webkit-background-clip: text;
   -moz-background-clip:text;
@@ -417,6 +425,10 @@ a:focus{
   background: url(/dataSmt/images/zixun-font.png) no-repeat center center;
   background-size: contain;
 }
+.data-scene .download-btn{
+  color: #fff;
+  background: linear-gradient(to right,rgba(42, 190, 209, 1),rgba(54, 135, 255, 1));
+}
 
 .btn-light{
   position: relative;

BIN
src/web/staticres/images/dataSmt/icon-tips.png


+ 5 - 0
src/web/staticres/js/biddingSearch.js

@@ -349,6 +349,11 @@ function toPaydataExport(){
 		$(".code-text").html('<span style="font-size:22px;margin-top:10px;display:inline-block;color:#252627;font-weight:normal;"><img id="wxpng" src="/images/wx1.png">请先微信扫码登录</span>')
 		$("#bidLogin").modal("show");
 	}else{
+    // 列表如果没有数据 点击数据导出不能执行后续操作
+    if (!$('.hasNoData').is(':hidden') || !$('.working').is(':hidden')) {
+      console.log('列表没有数据,不能数据导出');
+      return
+    }
     //已登录跳转订单支付页面
     var selectIds = ""
     var idText = ""

+ 16 - 0
src/web/staticres/js/superSearch.js

@@ -197,6 +197,10 @@ function getNewBids(pnum, size){
 			$(".pagination").hide();
 			$(".working").hide();
       $(".hasNoData").show();
+      $('#right-export').css({
+        'opacity': '0.5',
+        'cursor': 'not-allowed'
+      })
       // 隐藏页码
       searchInnerVue.showPage = false
     }
@@ -260,6 +264,10 @@ function getNewBiddings(num, size){
 			$(".pagination").hide();
 			$(".working").hide();
       $(".hasNoData").show();
+      $('#right-export').css({
+        'opacity': '0.5',
+        'cursor': 'not-allowed'
+      })
       // 隐藏页码
       searchInnerVue.showPage = false
       allCount = 0
@@ -867,6 +875,10 @@ function getVIPData(clickpaging){
 			}else{
 				$(".working").hide();
         $(".hasNoData").show();
+        $('#right-export').css({
+          'opacity': '0.5',
+          'cursor': 'not-allowed'
+        })
         // 隐藏页码
         searchInnerVue.showPage = false
 			}
@@ -1332,6 +1344,10 @@ function pcAjaxReqCallBack(r){
 		$(".pagination").hide();
 		$(".working").hide();
     $(".hasNoData").show();
+    $('#right-export').css({
+      'opacity': '0.5',
+      'cursor': 'not-allowed'
+    })
     // 隐藏页码
     searchInnerVue.showPage = false
 		submitflag=true;

+ 4 - 4
src/web/templates/dataMarket/index.html

@@ -276,11 +276,11 @@
           <p>超前商机项目、<br>下一阶段采购项目预测</p>
         </li>
       </ul>
-      <div class="scene-btn" onClick="needSubmitHandle('pc_market_ApplicationScenario')">
-        <span id="consult-scene-btn">
-          <!-- 立即咨询 -->
-        </span>
+      <div class="scene-btn-container">
+        <div class="scene-btn consult-btn" id="consult-scene-btn" onClick="needSubmitHandle('pc_market_ApplicationScenario')"><span></span></div>
+        <div class="scene-btn download-btn" id="download-btn" onClick="needSubmitHandle('pc_market_AnalysisCase')">免费下载行业案例</div>
       </div>
+      
     </div>
   </div>
   {{include "/common/pcbottom.html"}}

+ 24 - 4
src/web/templates/frontRouter/wx/bigmember/free/perfect_info.html

@@ -47,11 +47,31 @@
         <div class="j-container">
             <div class="j-main info-collect">
                 <div class="top-tip-group" v-if="getTipStr">
-                    <p class="top-tip-text">
-                        @@getTipStr@@
+                    <p class="top-tip-text" v-html="getTipStr">
                     </p>
                 </div>
-                <div class="form-card-group">
+                <div class="form-card-group" v-show="notit_group">
+                    <div class="form-content-card">
+                      <van-field v-model.trim="infoMap.name" label="姓名" @focus="infoCheckMap.name = ''"
+                        @blur="getCheckMap('name')" :error-message="infoCheckMap.name" required placeholder="请输入姓名"></van-field>
+                      <van-field v-model.trim="infoMap.phone" label="手机号" @focus="infoCheckMap.phone = ''"
+                        @blur="getCheckMap('phone')" :error-message="infoCheckMap.phone" required placeholder="请输入准确的手机号">
+                      </van-field>
+                      <div class="associate-ent-group" v-show="isAssociateShow" style="top:2.72rem">
+                        <div class="associate-ent-item" @click="selectEnt(item)" v-for="(item, i) in searchList" v-bind:key="i"
+                          v-html="highlightText(item, infoMap.company)"></div>
+                      </div>
+                      <van-field @input="entOnChange('input')" @blur="entOnChange('blur')" @focus="infoCheckMap.company = ''"
+                        :error-message="infoCheckMap.company" required v-model.trim="infoMap.company" label="公司名称"
+                        placeholder="请输入准确的公司名称"></van-field>
+                      <van-field v-if="moduleShow.email" v-model.trim="infoMap.email" label="邮箱"
+                        @focus="infoCheckMap.email = ''" @blur="getCheckMap('email')" :error-message="infoCheckMap.email"
+                        required placeholder="请输入邮箱"></van-field>
+                        <van-field v-if="moduleShow.data_requirement" maxlength="200" v-model="infoMap.data_requirement" label="数据需求" rows="2"
+                        type="textarea" placeholder="请描述下您需要的数据"></van-field>
+                    </div>
+                </div>
+                <div class="form-card-group" v-show="!notit_group">
                     <div class="form-title">基本信息</div>
                     <div class="form-content-card">
                         <van-field v-model.trim="infoMap.name" label="姓名" @focus="infoCheckMap.name = ''" @blur="getCheckMap('name')"
@@ -69,7 +89,7 @@
                                    placeholder="请选择受雇类型"></van-field>
                     </div>
                 </div>
-                <div class="form-card-group">
+                <div class="form-card-group" v-show="!notit_group">
                     <div class="form-title">公司信息</div>
                     <div class="form-content-card">
                         <div class="associate-ent-group" v-show="isAssociateShow">

+ 39 - 7
src/web/templates/frontRouter/wx/bigmember/free/perfect_info_strud.html

@@ -2,7 +2,7 @@
 <html lang="zh-CN" style="font-size: 50px;">
 
 <head>
-    <title>完善信息</title>
+    <title>免费获取数据样例</title>
     <meta name="viewport"
           content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta name="apple-mobile-web-app-capable" content="yes">
@@ -47,10 +47,10 @@
       <div class="j-container">
           <div class="j-main info-collect">
               <div class="top-tip-group">
-                  <p class="top-tip-text">请完善信息,我们将以邮件的形式发送数据样例
+                  <p class="top-tip-text">请完善以下信息,以便为您找到最符合需求的数据样例。
                   </p>
               </div>
-              <div class="form-card-group">
+              <div class="form-card-group" v-if = "ajaxParams.source != 'structedData'">
                   <div class="form-title">基本信息</div>
                   <div class="form-content-card">
                       <van-field v-model.trim="infoMap.name" label="姓名" @focus="infoCheckMap.name = ''" @blur="getCheckMap('name')"
@@ -68,10 +68,10 @@
                         </template>
                       </van-field>
                       <van-field v-model.trim="infoMap.email" label="邮箱" @focus="infoCheckMap.email = ''" @blur="getCheckMap('email')"
-                                 :error-message="infoCheckMap.email" required placeholder="请输入邮箱"></van-field>
+                                 :error-message="infoCheckMap.email" required placeholder="请输入邮箱,用于接收数据样例"></van-field>
                   </div>
               </div>
-              <div class="form-card-group">
+              <div class="form-card-group" v-if = "ajaxParams.source != 'structedData'">
                   <div class="form-title">公司信息</div>
                   <div class="form-content-card">
                       <div class="associate-ent-group" v-show="isAssociateShow">
@@ -88,6 +88,25 @@
                       <van-field v-if="showBranch" :error-message="infoCheckMap.branch" v-model="infoMap.branch"  @blur="getCheckMap('branch')" required label="部门" @click="openPop('部门')" readonly is-link placeholder="请选择部门"></van-field>
                   </div>
               </div>
+              <div class="form-card-group" v-if = "ajaxParams.source == 'structedData'">
+                <div class="form-title"></div>
+                <div class="form-content-card">
+                  <van-field v-model.trim="infoMap.name" label="姓名" @focus="infoCheckMap.name = ''" @blur="getCheckMap('name')"
+                  :error-message="infoCheckMap.name" required placeholder="请输入姓名"></van-field>
+                  <van-field @input="getInputPhone" v-model.trim="infoMap.phone" label="手机号" @focus="infoCheckMap.phone = ''"
+                  @blur="getCheckMap('phone')" :error-message="infoCheckMap.phone" required
+                  placeholder="请输入准确的手机号"></van-field>
+                  <div class="associate-ent-group" v-show="isAssociateShow">
+                        <div class="associate-ent-item" @click="selectEnt(item)" v-for="(item, i) in searchList" v-bind:key="i" v-html="highlightText(item, infoMap.company)"></div>
+                    </div>
+                  <van-field @input="entOnChange('input')" @blur="getCheckMap('company')" @focus="infoCheckMap.company = ''"
+                               :error-message="infoCheckMap.company" required v-model.trim="infoMap.company" label="公司名称" placeholder="请输入准确的公司名称"></van-field>
+                  <van-field v-model.trim="infoMap.email" label="邮箱" @focus="infoCheckMap.email = ''" @blur="getCheckMap('email')"
+                               :error-message="infoCheckMap.email" required placeholder="请输入邮箱,用于接收数据样例"></van-field>
+                  <van-field  maxlength="200" v-model="infoMap.data_requirement" label="数据需求" rows="2"
+                               type="textarea" placeholder="请描述下您需要的数据"></van-field>
+                </div>
+            </div>
               <div class="warm-prompt">
                 <span class="icon-warning"></span>
                 <span class="warm-text">温馨提示:请提供准确的信息,我们将为您推荐更准确、更个性化的商机和服务</span>
@@ -183,7 +202,8 @@
         companyType: '',
         position: '',
         position_other: '',
-        branch: ''
+        branch: '',
+        data_requirement:''
       },
       infoCheckMap: {
         name: '',
@@ -318,7 +338,8 @@
           return false
         }
         var namereg = /^[\u4E00-\u9FA5A-Za-z\s]+(·[\u4E00-\u9FA5A-Za-z]+)*$/;//中英文或加.的少数民族名字
-        return namereg.test(this.infoMap.name)
+        // return namereg.test(this.infoMap.name)
+        return this.infoMap.name
       },
       checkPhone () {
         return /^1[3-9]\d{9}$/.test(this.infoMap.phone)
@@ -364,7 +385,11 @@
         }
       },
       isSubmitDisabled () {
+        if(this.ajaxParams.source == 'structedData'){
+        return !this.checkName || !this.checkPhone || !this.checkEmail  
+       }else{
         return !this.checkName || !this.checkPhone || !this.checkEmail || !this.checkEntName || !this.checkEntType || !this.vercodecor|| this.checkBranch || !this.checkPosition
+       }
       },
       isNextDisabled () {
         var type = this.popInfo.label
@@ -566,6 +591,9 @@
         if (data.branch) {
           this.setCheckForData('branch', 'branch', data.branch, '部门')
         }
+        if (data.data_requirement) {
+          this.setCheckForData('data_requirement', 'data_requirement', data.data_requirement)
+        }
       },
       setCheckForData (aKey, iKey, cKey, label) {
         this.ajaxParams[aKey] = cKey
@@ -720,6 +748,7 @@
         this.ajaxParams.company = this.infoMap.company
         this.ajaxParams.companyType = this.infoMap.companyType
         this.ajaxParams.position = this.infoMap.position
+        this.ajaxParams.data_requirement=this.infoMap.data_requirement
         if(this.setcodeShow) {
           this.ajaxParams.code = this.infoMap.vercode
         }
@@ -727,6 +756,9 @@
           this.ajaxParams.position = '其他/' + this.infoMap.position_other
         }
         this.ajaxParams.branch = this.infoMap.branch.indexOf('总裁') > -1 || this.infoMap.branch.indexOf('总经理') > -1 ?  '' : this.infoMap.branch
+        if(this.ajaxParams.source == 'structedData'){
+          this.ajaxParams.source_desc = '数据定制导出-获取数据样例' 
+        }
         var _this = this
         var loading = _this.showLoading()
         $.ajax({

+ 7 - 2
src/web/templates/pc/dataExport_sieve.html

@@ -1585,8 +1585,13 @@
     var $progress = document.getElementById('progress_')
     $progress.scrollIntoView()
     sessionStorage.setItem('refresh', '1')
-    let redirectUrl = '/front/dataExport/toCreateOrderPage/' + dataNode._data.dataInfo._id
-    window.location.href = redirectUrl + "?from=" + GetQueryString("from")+ "&type=" + dataNode.dataType +  "&source=" +GetQueryString("source")
+    var redirectUrl = '/front/dataExport/toCreateOrderPage/' + dataNode._data.dataInfo._id
+    var goHref = location.origin + redirectUrl + "?from=" + GetQueryString("from")+ "&type=" + dataNode.dataType +  "&source=" +GetQueryString("source")
+    if (goTemplateData.inIframe) {
+      window.parent.location.href = goHref
+    } else {
+      window.location.href = goHref
+    }
   })
 	function isIE(){
 		if(!!window.ActiveXObject || "ActiveXObject" in window){

+ 24 - 0
src/web/templates/pc/dataSmt/detail.html

@@ -82,12 +82,28 @@
     </div>
     <h2 class="title">数据示例</h2>
     <div class="table_content">
+      <p class="additional-remarks">
+        <img src='{{Msg "seo" "cdn"}}/images/dataSmt/icon-tips.png?v={{Msg "seo" "version"}}' width="18" height="18" alt="">
+        <span>
+          以下数据示例仅为部分字段,如需更多行业字段,如资金来源、报价方式、企业资质、人员资质、业绩资格、企业信用、建设规模等字段,您可<em class="light-text" id="detail_industry_fields">申请数据定制></em>
+        </span> 
+      </p>
       <p class="tableDescriptions">{{.T.data.describe}}</p>
       <div class="table_img" id="galley">
         <!-- 表格图片 -->
         <img data-original="{{.T.data.dataExample}}?v={{Msg "seo" "version"}}" src="{{.T.data.dataExample}}?v={{Msg "seo" "version"}}" alt="表格">
       </div>
     </div>
+    {{if .T.data.application}}
+    <div style="padding: 64px 0 36px;">
+      <h2 class="title">数据应用</h2>
+      <div class="table_content">
+        <div class="table_img" id="data_application">
+          <img data-original="{{.T.data.application}}?v={{Msg "seo" "version"}}" src="{{.T.data.application}}?v={{Msg "seo" "version"}}">
+        </div>
+      </div>
+    </div>
+    {{end}}
   </section>
   <!-- 底部广告位 -->
   <footer class="foot_">
@@ -136,6 +152,14 @@
     $('.dataMart_detail .dataCustomization a').on('click',function(){ // 数据定制
       needSubmitHandle('pc_supermarket_details_customization', {{.T.data.name}}) // 此处第二个参数添加模板变量产品名称
     })
+    // 数据示例模块-行字字段说明申请定制留资
+    $('#detail_industry_fields').on('click', function() {
+      needSubmitHandle('pc_supermarket_details_IndustryFields', {{.T.data.name}}) 
+    })
+    // 数据应用模块-免费获取更多行业客户案例留资
+    $('#data_application img').on('click', function() {
+      needSubmitHandle('pc_supermarket_details_AnalysisCase') 
+    })
     $('.dataMart_detail .consult').on('click',function(){
        if (!loginflag) {
         return openLoginDig()

+ 10 - 1
src/web/templates/pc/dataSmt/list.html

@@ -18,7 +18,7 @@
   <link href='{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}' rel="stylesheet" type="text/css" />
   <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"}}/css/dataSmt/dataMart.css?v={{Msg "seo" "version"}}' rel="stylesheet" type="text/css" />
+  <link href='{{Msg "seo" "cdn"}}/css/dataSmt/dataMart.css?v={{Msg "seo" "version"}}11' rel="stylesheet" type="text/css" />
   <style>
   </style>
 </head>
@@ -116,6 +116,12 @@
   <div class="content">
     <img src="{{Msg "seo" "cdn"}}/images/dataSmt/close.png?v={{Msg "seo" "version"}}" alt="close" class="close_">
     <h4>包含字段说明</h4>
+    <p class="additional-remarks">
+      <img src='{{Msg "seo" "cdn"}}/images/dataSmt/icon-tips.png?v={{Msg "seo" "version"}}' width="18" height="18" alt="">
+      <span>
+        以下数据示例仅为部分字段,如需更多行业字段,如资金来源、报价方式、企业资质、人员资质、业绩资格、企业信用、建设规模等字段,您可<em class="light-text" id="dataSupermarket_industry_fields">申请数据定制></em>
+      </span> 
+    </p>
     <div class="table_box">
       <table>
         <thead>
@@ -170,6 +176,9 @@
     $('.dataMart  .advertising_close').on('click',function(){
       $('.dataMart .dataMart_advertising').hide()
     })
+    $('#dataSupermarket_industry_fields').on('click',function(){
+      needSubmitHandle('pc_DataSupermarket_IndustryFields')
+    })
   })
   function initAdvertising(){
     var windowHeight = $(window).height(); // 可视窗口的高度

+ 8 - 0
src/web/templates/pc/supsearch.html

@@ -195,6 +195,10 @@
           $(".pagination").hide();
           $(".working").hide();
           $(".hasNoData").show();
+          $('#right-export').css({
+            'opacity': '0.5',
+            'cursor': 'not-allowed'
+          })
           if(isLimit==-1){
             $("#hasNoData_tiptext>font:eq(0)").hide();
             $("#hasNoData_tiptext>font:eq(1)").show();
@@ -222,6 +226,10 @@
           $(".pagination").hide();
           $(".working").hide();
           $(".hasNoData").show();
+          $('#right-export').css({
+            'opacity': '0.5',
+            'cursor': 'not-allowed'
+          })
           if(isLimit==-1){
             $("#hasNoData_tiptext>font:eq(0)").hide();
             $("#hasNoData_tiptext>font:eq(1)").show();

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно