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

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 = ""

src/web/templates/pc/dataExport_sieve.html

@@ -1586,7 +1586,7 @@
     $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")
+    window.location.href = location.origin + redirectUrl + "?from=" + GetQueryString("from")+ "&type=" + dataNode.dataType +  "&source=" +GetQueryString("source")
   })
 	function isIE(){
 		if(!!window.ActiveXObject || "ActiveXObject" in window){