Browse Source

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

wangshan 6 years ago
parent
commit
ee48e8f63a

+ 1 - 1
src/jfw/modules/weixin/src/config.json

@@ -11,7 +11,7 @@
     "weixinrpcport": "8083",
     "webrpcport": "127.0.0.1:8084",
     "jyop_webrpcport": "127.0.0.1:8012",
-    "webdomain": "http://webws.qmx.top",
+    "webdomain": "http://webzxl.qmx.top",
     "appid": "wx5b1c6e7cc4dac0e4",
     "apptoken": "top2015top2015",
     "appsecret": "b026103ffebd2291b3edb7a269612112",

+ 9 - 0
src/web/templates/pc/dataExport_sieve.html

@@ -332,6 +332,15 @@
 		    color: #1D1D1D;
 		    font-size: 14px;
 		}
+		.conditions-box .line-box.p20 {
+		    padding: 14px 0;
+		}
+		.conditions-box .line-box {
+		    width: 1140px;
+		    border-bottom: 1px solid #E0E0E0;
+		    padding-bottom: 15px;
+		    box-sizing: border-box;
+		}
     </style>
 </head>
 <body>