Merge branch 'feature/v4.8.69' of https://jygit.jydev.jianyu360.cn/qmx/jy into dev/v4.8.69_wmh

src/jfw/modules/publicapply/src/oneclick/entity/entity.go

@@ -87,16 +87,20 @@ func (o *OneClickInfo) GetPhoneByToken() (map[string]interface{}, error) {
 				// 复制代码运行请自行打印 API 的返回值
 				_result, _err := client.GetPhoneWithTokenWithOptions(getPhoneWithTokenRequest, runtime)
 				if _err != nil {
-					log.Println("h5取号失败：", _err)
-					return fmt.Errorf("手机号填写错误"), ""
+					log.Println("GetPhoneWithTokenWithOptions：_err", _err, o.SpToken)
+					if _result.Body != nil {
+						log.Println("GetPhoneWithTokenWithOptions _result", _result.Body.Code, _result.Body.Message)
+					}
+					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 != "" {

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

@@ -838,7 +838,7 @@ var vm = new Vue({
       this.form.job = ''
       this.form.otherJob = ''
       this.form.code = ''
-      var needExportSource = ['structedData', 'pc_data_custom_export', 'pc_data_custom_data']
+      var needExportSource = ['structedData', 'pc_data_custom_export']
       if (needExportSource.indexOf(this.source) > -1) {
         this.showForm = false
         this.showExport = true

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%;
@@ -484,4 +484,9 @@ color: #1D1D1D;
   color: #2ABED1;
   text-decoration: underline;
   cursor: pointer;
- }
+ }
+@media screen and (max-height: 800px) {
+  .dataMart .dataMart_dialog .content .table_box{
+    height: 400px;
+  }
+}

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 = location.origin + 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){