Merge branch 'master' into feature/v4.8.83

src/jfw/modules/subscribepay/src/util/dataExportExcel.go

@@ -60,7 +60,13 @@ func GetDataExportFileDataLen(path string) (int, error) {
 	if len(sheet1.Rows) == 0 {
 		return -1, fmt.Errorf("sheet1 hasn't Rows data ")
 	}
-	return sheet1.Rows[len(sheet1.Rows)-1].Cells[0].Int()
+	//避免最后一行为合并单元格数据
+	for l := len(sheet1.Rows) - 1; l > 0; l-- {
+		if sheet1.Rows[l].Cells[0].Value != "" {
+			return sheet1.Rows[l].Cells[0].Int()
+		}
+	}
+	return -1, fmt.Errorf("sheet1 get error")
 }
 
 // 生成数据导出excel

src/web/staticres/css/dev2/superSearch.css

@@ -24,6 +24,9 @@
 #searchInner #whole.active {
   background-color: transparent;
 }
+#searchInner .no-login-mask.active {
+  background: transparent;
+}
 #searchInner .active{
 	background-color: #2cb7ca;
 }