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

src/jfw/front/swordfish.go

@@ -1536,7 +1536,7 @@ func (m *Front) AjaxReq() error {
 					if mongodb.Update("user", bson.M{"s_m_openid": openid.(string)},
 						bson.M{
 							"$push": bson.M{"o_jy.a_key": bson.M{"key": keysArray}},
-							"$set":  bson.M{"o_jy.l_modifydate": time.Now().Unix()},
+							"$set":  bson.M{"i_ts_guide": 1, "o_jy.l_modifydate": time.Now().Unix()},
 						}, false, false) {
 						flag = "y"
 					}

src/jfw/modules/app/src/web/staticres/jyapp/css/wxsearch.css

@@ -1045,7 +1045,7 @@ form{
 	border-radius: 3px;
 	font-weight: 600;
 }
-.jytype-dialog,.jydq-dialog{
+.industry-dialog,.jytype-dialog,.jydq-dialog{
 	margin-bottom: 30px;
 }
 .jy_rssetbj{
@@ -1587,17 +1587,6 @@ form{
 	top: 18px !important;
 	left:106% !important;
 }
-.industry-dialog{
-	display: flex;
-	justify-content: space-between;
-	width: 100%;
-	min-height: 10rem;
-	font-size: 14px;
-	color: #1d1d1d;
-	position: absolute;
-	z-index: 999;
-	margin-bottom: 30px;
-}
 .jypt-dialog .btn,.money-dialog .btn{
 	padding: 5px 0px;
 	background-color: #F4F4F9;

src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js

@@ -1713,11 +1713,11 @@ var SuperSearch = {
 			buttons: [ 
 			    'set',
 			    { 
-				text: '选择时间',
+					text: '选择时间',
 					cssClass: 'dwb title',
-				handler: function(event,inst){ 
+					handler: function(event,inst){ 
 				    
-				}
+					}
 			    },
 				'clear'
 			],
@@ -1766,7 +1766,7 @@ var SuperSearch = {
 					localStorage.removeItem("search_starttime");
 				}
 				SuperSearch.afterOnClear();
-		}
+			}
 	    });
 		$("#supersearchPage #endtime").mobiscroll().date({
 			minDate: starttime,
@@ -1792,7 +1792,7 @@ var SuperSearch = {
 					localStorage.removeItem("search_endtime");
 				}
 				SuperSearch.afterOnClear();
-		}
+			}
 	    });
 	},
 	afterSelect: function(){
@@ -1802,7 +1802,9 @@ var SuperSearch = {
 	afterOnClear: function(){
 		if($("#supersearchPage #starttime").attr("data-value") == "" && $("#supersearchPage #endtime").attr("data-value") == ""){
 			$("#supersearchPage .jypt-timeinputs").removeClass("jypt-timeinputs-active");
-			$("#supersearchPage .jypt-pt>button:first").addClass("jypt-active");
+			if($("#supersearchPage .jypt-pt>button.jypt-active").length == 0){
+				$("#supersearchPage .jypt-pt>button:first").addClass("jypt-active");
+			}
 		}
 	},
 	setPublishtime: function(){

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -1096,7 +1096,7 @@ $(function(){
 						sessionStorage.followSetReload = "1";
 					}
 					followId = r.followId;
-					EasyAlert.show("已关注，可从“发现-<br>关注的项目”查看<br>或设置提醒日期",{"text-align":"left","width":"195px"});
+					EasyAlert.show("已关注，可从“我的-<br>关注的项目”查看<br>或设置提醒日期",{"text-align":"left","width":"195px"});
 					followFlag = true;
 					jumpFlag = true;
 					$(".follow").html('<i class="glyphicon yiguanzhu"></i>已关注');

src/web/staticres/css/wxsearch.css

@@ -1034,7 +1034,7 @@ form{
 	border-radius: 3px;
 	font-weight: 600;
 }
-.jytype-dialog,.jydq-dialog{
+.industry-dialog,.jytype-dialog,.jydq-dialog{
 	margin-bottom: 30px;
 }
 .jy_rssetbj{
@@ -1576,17 +1576,6 @@ form{
 	top: 18px !important;
 	left:106% !important;
 }
-.industry-dialog{
-	display: flex;
-	justify-content: space-between;
-	width: 100%;
-	min-height: 10rem;
-	font-size: 14px;
-	color: #1d1d1d;
-	position: absolute;
-	z-index: 999;
-	margin-bottom: 30px;
-}
 .jypt-dialog .btn,.money-dialog .btn{
 	padding: 5px 0px;
 	background-color: #F4F4F9;

src/web/staticres/js/wxSupersearch.js

@@ -1641,11 +1641,11 @@ var SuperSearch = {
 			buttons: [ 
 			    'set',
 			    { 
-				text: '选择时间',
+					text: '选择时间',
 					cssClass: 'dwb title',
-				handler: function(event,inst){ 
-				    
-				}
+					handler: function(event,inst){ 
+					    
+					}
 			    },
 				'clear'
 			],
@@ -1694,7 +1694,7 @@ var SuperSearch = {
 					localStorage.removeItem("search_starttime");
 				}
 				SuperSearch.afterOnClear();
-		}
+			}
 	    });
 		$("#supersearchPage #endtime").mobiscroll().date({
 			minDate: starttime,
@@ -1720,7 +1720,7 @@ var SuperSearch = {
 					localStorage.removeItem("search_endtime");
 				}
 				SuperSearch.afterOnClear();
-		}
+			}
 	    });
 	},
 	afterSelect: function(){
@@ -1730,7 +1730,9 @@ var SuperSearch = {
 	afterOnClear: function(){
 		if($("#supersearchPage #starttime").attr("data-value") == "" && $("#supersearchPage #endtime").attr("data-value") == ""){
 			$("#supersearchPage .jypt-timeinputs").removeClass("jypt-timeinputs-active");
-			$("#supersearchPage .jypt-pt>button:first").addClass("jypt-active");
+			if($("#supersearchPage .jypt-pt>button.jypt-active").length == 0){
+				$("#supersearchPage .jypt-pt>button:first").addClass("jypt-active");
+			}
 		}
 	},
 	setPublishtime: function(){