Merge branch 'dev2.8' of http://192.168.3.207:10080/qmx/jy into dev2.8

src/jfw/front/ws_dataExport.go

@@ -11,6 +11,7 @@ import (
 	"log"
 	"net/url"
 	"qfw/util"
+	"qfw/util/jy"
 	"qfw/util/redis"
 	"strconv"
 	"strings"
@@ -314,7 +315,7 @@ func (w *WsDataExport) SearchExport() error {
 		if selectType == "all" {
 			isIntercept = true
 		}
-		_, _, keywords = public.InterceptSearchKW(keywords, isIntercept, len(industrySave) == 0)
+		_, _, keywords = jy.InterceptSearchKW(keywords, isIntercept, len(industrySave) == 0)
 		KeyWordSave = append(KeyWordSave, public.KeyWord{Keyword: keywords})
 	}
 	//时间

src/jfw/modules/app/src/app/front/ws_dataExport.go

@@ -8,6 +8,7 @@ import (
 	"jfw/public"
 	"log"
 	"qfw/util"
+	"qfw/util/jy"
 	"qfw/util/redis"
 	"regexp"
 	"strconv"
@@ -321,7 +322,7 @@ func (w *WsDataExport) SearchExport() error {
 		if selectType == "all" {
 			isIntercept = true
 		}
-		_, _, keywords = public.InterceptSearchKW(keywords, isIntercept, len(industrySave) == 0)
+		_, _, keywords = jy.InterceptSearchKW(keywords, isIntercept, len(industrySave) == 0)
 		KeyWordSave = append(KeyWordSave, public.KeyWord{Keyword: keywords})
 	}
 	//时间

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/previewData.css

@@ -0,0 +1,190 @@
+body{
+	padding: 0;
+	margin:0;
+}
+.d_bz,.d_gj{
+	border-top: #DCE1E4 1px solid;
+	border-right: #DCE1E4 1px solid;
+	display:block;
+}
+.d_bz tr:not(:first-child),.d_gj tr:not(:first-child){
+	font-family: MyNewFont,'微软雅黑';
+}
+.d_bz tr td,.d_gj tr td{
+	border-left: #DCE1E4 1px solid;
+	border-bottom: #DCE1E4 1px solid;
+	text-align: center;
+	font-size: 12px;
+	padding: 5px;
+}
+.d_bz tr:nth-child(1) td,.d_gj tr:nth-child(1) td{
+	color: #565f66;
+	background-color: #e9f6ff;
+	height: 35px;
+    white-space: nowrap;
+}
+.d_bz tr:nth-child(odd),.d_gj tr:nth-child(odd){
+	background-color: #f9f9f9;
+}
+.d_bz tr:nth-child(even),.d_gj tr:nth-child(even){
+	background-color: #ffffff;
+}
+
+.d_bz{
+	min-width:2000px;
+}
+.d_bz td:nth-child(1){
+	width: 2%;
+}
+.d_bz td:nth-child(2){
+	width: 13%;
+}
+.d_bz td:nth-child(3){
+	width: 24%;
+}
+.d_bz td:nth-child(4){
+	width: 10%;
+	word-break: break-all;
+}
+.d_bz td:nth-child(5){
+	width: 3%;
+	white-space: nowrap;
+}
+.d_bz td:nth-child(6){
+	width: 3%;
+	white-space: nowrap;
+
+}
+.d_bz td:nth-child(7){
+	width: 4%;
+	white-space: nowrap;
+}
+.d_bz td:nth-child(8){
+	width: 13%;
+}
+.d_bz td:nth-child(9){
+	width: 10%;
+}
+.d_bz td:nth-child(10){
+	width: 10%;
+}
+.d_bz td:nth-child(11){
+	width: 2%;
+}
+.d_bz td:nth-child(12){
+	width: 3%;
+	white-space: nowrap;
+}
+.d_bz td:nth-child(13){
+	width: 3%;
+}
+
+.d_gj{
+	min-width:2800px;
+}
+
+.d_gj td:nth-child(1){
+	width: 1.5%;
+}
+.d_gj td:nth-child(2){
+	width: 9%;
+}
+.d_gj td:nth-child(3){
+	width: 12%;
+}
+.d_gj td:nth-child(4){
+	width: 8%;
+	word-break: break-all;
+}
+.d_gj td:nth-child(5){
+	width: 8%;
+	word-break: break-all;
+}
+.d_gj td:nth-child(6){
+	width: 2%;
+}
+.d_gj td:nth-child(7){
+	width: 2%;
+}
+.d_gj td:nth-child(8){
+	width: 3%;
+	white-space: nowrap;
+}
+.d_gj td:nth-child(9){
+	width: 7%;
+}
+.d_gj td:nth-child(10){
+	width: 5%;
+}
+.d_gj td:nth-child(11){
+	width: 6%;
+}
+.d_gj td:nth-child(12){
+	width: 3%;
+}
+.d_gj td:nth-child(13){
+	width: 4%;
+}
+.d_gj td:nth-child(14){
+	width: 2%;
+}
+.d_gj td:nth-child(15){
+	width: 3%;
+	white-space: nowrap;
+}
+.d_gj td:nth-child(16){
+	width: 6%;
+}
+.d_gj td:nth-child(17){
+	width: 2%;
+}
+.d_gj td:nth-child(18){
+	width: 6%;
+}
+.d_gj td:nth-child(19){
+	width: 8%;
+}
+.d_gj td:nth-child(20){
+	width: 2%;
+	white-space: nowrap;
+}
+.d_gj td:nth-child(21){
+	width: 1.5%;
+}
+.floatBtn{
+    border-radius: 5px;
+    padding-top: 15px;
+    position: fixed;
+    background: #e9f6ffd6;
+    text-align: center;
+    width: 80px;
+    display: flex;
+    flex-direction: column;
+    height: 88px;
+    right: 20px;
+    bottom: 20px;
+    color: #2cb7ca;
+    font-size: 13px;
+	font-weight: bold;
+	text-decoration:none;
+	cursor: pointer;
+}
+.floatBtn img{
+	margin:0 auto;
+	width:50px;
+	height:50px;
+	margin-bottom:5px;
+}
+.sy{
+    background: url("/dataExport/image/sy.png");
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    opacity: 0.5;
+}
+.fimg{
+	opacity: 0;
+	position: absolute;	
+	top: 0px;
+    left: 0px;
+}

src/jfw/modules/app/src/web/staticres/jyapp/me/css/header.css

@@ -1,7 +1,7 @@
 #header {
   width: 100%;
   height: 180px;
-  background: url(/jyapp/me/images/banner_03.png);
+  background: url(/jyapp/me/images/banner_031.png);
   background-size: 100%;
   padding-top: 30px;
 }

src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html

@@ -12,6 +12,16 @@
         <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery-3.2.1.min.js"></script>
         <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js"></script>
 		{{include "/common/js.html"}}
+		<style>
+		#pay_order{
+		    position: absolute;
+		    top: 20px;
+		    overflow-y: auto;
+		    bottom: 0px;
+		    left: 0px;
+		    right: 0px;
+		}
+		</style>
 	</head>
   <body>
 	<div class="loading_" style="display:none;">

src/jfw/modules/app/src/web/templates/dataExport/dataExport_previewData.html

@@ -19,6 +19,9 @@
 			iframe{
 				border: 0px !important;
 			}
+			.app-layout-header{
+				position:fixed;
+			}
 		</style>
 	</head>
 	<body>
@@ -44,7 +47,7 @@
 				</div>
 			</main>
 		</div>
-		<script src="{{Msg "seo" "cdn"}}/dataExport/js/zepto.js"></script>
+		<script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js"></script>
 		<script>
 			$(function() {
 				$(".buttons-tab .tab-link").each(function() {
@@ -57,6 +60,10 @@
 					})
 
 				})
+				//
+				$(".app-layout-header .app-back").click(function(){
+					window.history.back();
+				})
 			})
 		</script>
 <!--百度统计end-->

src/jfw/modules/app/src/web/templates/me/login.html

@@ -5,7 +5,7 @@
 	<link rel="stylesheet" type="text/css" href="/jyapp/me/css/reset.css?v={{Msg "seo" "version"}}" />
 	<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}"/>
 	<link rel="stylesheet" type="text/css" href="/jyapp/me/css/login.css?v={{Msg "seo" "version"}}"/>
-	<link rel="stylesheet" type="text/css" href="/jyapp/me/css/header.css?v={{Msg "seo" "version"}}"/>
+	<link rel="stylesheet" type="text/css" href="/jyapp/me/css/header.css?v={{Msg "seo" "version"}}1"/>
 	<script src="/jyapp/js/jquery.js?v={{Msg "seo" "version"}}" type="text/javascript" charset="utf-8"></script>
 	{{include "/common/js.html"}}
 	<title>登录</title>

src/jfw/modules/weixin/src/github.com/wizjin/weixin/weixin.go

@@ -671,6 +671,9 @@ func (wx *Weixin) GetUserInfo(openid string) (*UserInfo, error) {
 	if err := json.Unmarshal(reply, &result); err != nil {
 		return nil, err
 	}
+	if result.UnionId == "" {
+		result.UnionId = result.OpenId
+	}
 	return &result, nil
 }