wangchuanjin пре 9 година
родитељ
комит
4cd72d4d03

+ 0 - 3
core/src/qfw/mobile/wxmenu.go

@@ -31,11 +31,8 @@ func (m *Mobile) Guide(sign string) error {
 	m.T["signature"] = GetSignature(m.Action)
 	m.T["shareid"] = cutil.FindMyShareId("topjy", m.Session().Get("s_m_openid").(string))
 	m.T["sign"] = sign
-	log.Println("----------------")
-	log.Println(sign)
 	if sign == "other" {
 		userInfo := mongodb.FindById("user", m.GetSession("userId").(string), `{"o_msgset":1}`)
-		log.Println(userInfo)
 		m.T["msgset"] = (*userInfo)["o_msgset"]
 	}
 	if sign == "share" {

+ 1 - 1
core/src/web/staticres/css/dev-qfw.css

@@ -2382,6 +2382,7 @@ style="color:#D03102;margin-right:5px;"
 	padding-right: 5px;
 	position: relative;
 	cursor: pointer;
+	margin-right: -5px;
 }
 .b-head .b-logined:hover{
 	background-color: #F7F9FB;
@@ -2413,7 +2414,6 @@ style="color:#D03102;margin-right:5px;"
 .b-head .head-hideMenu ul{
 	background-color: #F7F9FB;
 	box-shadow: 0 5px 10px rgba(0,0,0,.2);
-	margin-top: 1px;
 	float: left;
 }
 .b-head .head-hideMenu li{

+ 6 - 0
core/src/web/templates/common/centerhead.html

@@ -17,6 +17,12 @@
 body{
 	background-color:#f0f0f0;
 }
+.b-round-dot {
+    background-color: rgb(255, 90, 95);
+}
+.index-new-head .head-hidemenu i {
+    color: rgb(255, 90, 95);
+}
 </style>
 <!---->
 <div class="index-new-head b-head">

+ 1 - 1
core/src/web/templates/common/memberleft.html

@@ -20,7 +20,7 @@
 }
 .member-loginName{
 	display: inline-block;
-	max-width: 110px;
+	max-width: 240px;
 	text-overflow:ellipsis;
 	overflow:hidden;
 	white-space:nowrap;

+ 2 - 1
core/src/web/templates/member/accountset/index.html

@@ -161,7 +161,8 @@ function editInfoComplate(obj,type){
 	$.post("/member/show/editInfo",{type:type,value:obj.value},function(result){
 		if(result.status == true){
 			if(type == "s_nickname"){
-				$("#topNickName,.member-loginName").text(obj.value);//修改顶部和用户中心左边导航条昵称
+				$("#b-loginStatus>span:eq(1)").text(obj.value);//修改顶部昵称
+				$(".member-loginName").text(obj.value);//修改户中心左边导航条昵称
 			}
 			$(obj).prev().children("font").text(obj.value);//修改显示的值
 		}

+ 3 - 3
core/src/web/templates/member/credit/mycredit.html

@@ -161,7 +161,7 @@ a.mycredit{
 								<td width="30%" style="padding:110px"></td>
 								{{else}}
 								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
-								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/search/enterprise/ent.html')">企业社区</span>查询</td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/front/entCommunity.html')">企业社区</span>查询</td>
 								{{end}}
 							</tr>
 							<tr class="rowone">
@@ -201,7 +201,7 @@ a.mycredit{
 								<td width="30%" style="padding:110px"></td>
 								{{else}}
 								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
-								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/search/enterprise/ent.html')">企业社区</span>查看</td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/front/entCommunity.html')">企业社区</span>查看</td>
 								{{end}}
 							</tr>
 							<tr class="rowone">
@@ -263,7 +263,7 @@ a.mycredit{
 								<td width="30%" style="padding:110px"></td>
 								{{else}}
 								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span><span style="padding:0 13px">{{.T.B_QYCX.B}}/{{.T.B_QYCX.C}}</span></td>
-								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/search/enterprise/ent.html')">企业社区</span>完成</td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/front/entCommunity.html')">企业社区</span>完成</td>
 								{{end}}
 							</tr>
 							<tr class="rowone">

+ 4 - 4
core/src/web/templates/swordfish/infolist.html

@@ -72,7 +72,7 @@ $(function(){
 					return v
 				});
 				//关键词高亮
-				var html = $(this).html();
+				var html = $(this).find("a").text();
 				for(var i=0;i<s_words.length;i++){
 					if(s_words[i] != ""){
 						var wordsArray = s_words[i].split("+");
@@ -95,7 +95,7 @@ $(function(){
 						}
 					}
 				}
-				$(this).html(html);
+				$(this).find("a").html(html);
 				//已访问过的灰色
 				var xh = $(this).children(".xh").text();
 				if(typeof(a_visitedindex)!= "undefined"){
@@ -205,7 +205,7 @@ function loadMore(){
 					return n+1
 				});
 				//关键词高亮
-				var html = $(this).html();
+				var html = $(this).find("a").text();
 				for(var i=0;i<s_words.length;i++){
 					if(s_words[i] != ""){
 						var wordsArray = s_words[i].split("+");
@@ -228,7 +228,7 @@ function loadMore(){
 						}
 					}
 				}
-				$(this).html(html);
+				$(this).find("a").html(html);
 				//已访问过的灰色
 				var xh = $(this).children(".xh").text();
 				

+ 2 - 2
core/src/web/templates/swordfish/searchinfolist.html

@@ -41,7 +41,7 @@ $(function(){
 				return v
 			});
 			//关键词高亮
-			var html = $(this).html();
+			var html = $(this).find("a").text();
 				if(s_words != ""){
 					var wordsArray = s_words.split("+");
 					for(var si=0;si<wordsArray.length;si++){
@@ -53,7 +53,7 @@ $(function(){
 				}
 			
 			
-			$(this).html(html);
+			$(this).find("a").html(html);
 			//已访问过的灰色
 			var xh = $(this).children(".xh").text();
 			if(typeof(a_visitedindex)!= "undefined"){

+ 2 - 2
core/src/web/templates/swordfish/wxpush.html

@@ -40,7 +40,7 @@ $(function(){
 		});
 		//关键词高亮
 		if(typeof(s_words) != "undefined"){
-			var html = $(this).html();
+			var html = $(this).find("a").text();
 			for(var i=0;i<s_words.length;i++){
 				if(s_words[i] != ""){
 					var wordsArray = s_words[i].split("+");
@@ -52,7 +52,7 @@ $(function(){
 					}
 				}
 			}
-			$(this).html(html);
+			$(this).find("a").html(html);
 		}
 		//已访问过的灰色
 		if(typeof(a_visitedindex) != "undefined"){

+ 2 - 2
core/src/web/templates/swordfish/wxsearchlist.html

@@ -41,7 +41,7 @@ $(function(){
 			});
 			$(this).children(".xh").wrap('<div class="resnumb"><div class="one"></div></div>');
 			//关键词高亮
-			var html = $(this).html();
+			var html = $(this).find("a").text();
 				if(s_words != ""){
 					var wordsArray = s_words.split("+");
 					for(var si=0;si<wordsArray.length;si++){
@@ -53,7 +53,7 @@ $(function(){
 				}
 			
 			
-			$(this).html(html);
+			$(this).find("a").html(html);
 			//已访问过的灰色
 			var xh = $(this).find("span.xh").text();
 			if(typeof(a_visitedindex)!= "undefined"){