Home Explore Help
Sign In
qmx
/
qfw
7
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

wangchuanjin 9 years ago
parent
46c01a2ea8 54a1c61208
commit
7ef5573678
17 changed files with 184 additions and 59 deletions
Split View Show Diff Stats
  1. 3 0
      common/src/qfw/util/encrypt_test.go
  2. 10 3
      core/src/qfw/search/wxsearchservice.go
  3. 1 1
      core/src/seo.json
  4. 1 1
      core/src/timetask.json
  5. 46 1
      core/src/web/staticres/css/index-new.css
  6. 2 1
      core/src/web/staticres/wxswordfish/style.css
  7. 3 0
      core/src/web/templates/common/swordfishhead.html
  8. 21 12
      core/src/web/templates/index.html
  9. 1 1
      core/src/web/templates/manage/webexpresscontent-new.html
  10. 2 3
      core/src/web/templates/manage/webmobindex.html
  11. 2 2
      core/src/web/templates/swordfish/searchinfolist.html
  12. 71 13
      core/src/web/templates/swordfish/wxsearch.html
  13. 4 5
      core/src/web/templates/swordfish/wxsearchlist.html
  14. 5 4
      core/src/web/templates/swordfish/wxtoolbar.html
  15. 8 8
      credit/src/config.json
  16. 3 3
      credit/src/main.go
  17. 1 1
      credit/src/qfw/creditrpc/creditrpc.go

File diff suppressed because it is too large
+ 3 - 0
common/src/qfw/util/encrypt_test.go


+ 10 - 3
core/src/qfw/search/wxsearchservice.go
View File 

@@ -505,15 +505,22 @@ func (n *Wxsearch) WxMingpian() error {
 
 			log.Println("picpath", ret[1])
 
 			res["on"] = ret[0]
 
 			names := coreutil.CardRecognition(ret[1])
 
-			for k, v := range names {
 
+			for _, v := range names {
 
 				name := fmt.Sprint(v)
 
 				if mpian_reg.MatchString(name) {
 
 					res["name"] = name
 
 					break
 
 				}
 
-				if k == len(names)-1 {
 
-					res["name"] = name
 
+			}
 
+			var name = ""
 
+			if res["name"] == "" {
 
+				for _, v := range names {
 
+					tmp := fmt.Sprint(v)
 
+					if len(name) < len(tmp) {
 
+						name = tmp
 
+					}
 
 				}
 
+				res["name"] = name
 
 			}
 
 		}
 
 	}

+ 1 - 1
core/src/seo.json
View File 

@@ -1,4 +1,4 @@
 
-{	"cdn":"//cdn.qmx.top:9000",
 
+{	"cdn":"",
 
     "qfw": {
 
         "enterprise": {
 
             "description": "提供企业信息查询，企业产品服务查询，企业关系网展示",

+ 1 - 1
core/src/timetask.json
View File 

@@ -1 +1 @@
 
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-03-22 11:15:00"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-03-22 11:15:00"}},"marketisstart":true,"marketrate":300}
 
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-03-23 15:15:05"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-03-23 15:15:05"}},"marketisstart":true,"marketrate":300}

+ 46 - 1
core/src/web/staticres/css/index-new.css
View File 

@@ -652,4 +652,49 @@ a:focus, a:hover{
 
 	width:22px;
 
 	margin-top: 110px;
 
     margin-left: 100px;
 
-}
 
+}
 
+.index-mob-wzjs{
 
+	background-color:#fff;
 
+	padding:20px;
 
+}
 
+.index-mobwz-title{
 
+	height:35px; 
+	border-bottom:1px solid #e5e6e9;
 
+	padding-bottom:15px;
 
+}
 
+.indexmob-tleft{
 
+	height:20px;
 
+	width:10px;
 
+	background-color:#FF5A5F;
 
+	float:left;
 
+}
 
+.indexmob-tright{
 
+	color:#FF5A5F;
 
+	float:left;
 
+	margin-left:15px;
 
+}
 
+.indexmob-cont{
 
+	margin-top:20px;
 
+}
 
+.indexmob-sjty{
 
+	background-color:#fff; 
+	margin-top:10px;
 
+	padding:20px;
 
+}
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+

+ 2 - 1
core/src/web/staticres/wxswordfish/style.css
View File 

@@ -131,11 +131,12 @@ img{
 
 	float: right;
 
 }
 
 .operation .child-node li>div:first-child{
 
-	color: #999;
 
+	
 }
 
 .operation .child-node .com-last{
 
 	font-size: 14px;
 
 	padding-top: 10px;
 
+	color: #999;
 
 }
 
 /*弹出框*/
 
 .dialog{

+ 3 - 0
core/src/web/templates/common/swordfishhead.html
View File 

@@ -41,6 +41,9 @@ function b_afterLogin(flag,result){
 
 		$("#experience").click(function(){
 
 			loginModalShow();
 
 		});
 
+		$("#goToSearch").click(function(){
 
+			loginModalShow();
 
+		});
 
 		$("#goToRssset").click(function(){
 
 			loginModalShow(10);
 
 		});

+ 21 - 12
core/src/web/templates/index.html
View File 

@@ -8,10 +8,18 @@
 
 <link href="{{Msg "seo" "cdn"}}/css/index-new.css" rel="stylesheet">
 
 <script src="{{Msg "seo" "cdn"}}/js/jquery.lazyload.min.js"></script>
 
 
+<script type="text/javascript">
 
+$(function(){
 
+	var wid = document.body.clientWidth;
 
+	if (wid < 760){
 
+		window.location.href = "/front/webindexcontent/56f24224af53745027000078.html";
 
+	} 
+});
 
+</script>
 
 </head>
 
 <body>
 
 
-<!---->
 
+<!--手机版首页 start-->
 
 <div class="index-new-head b-head visible-xs">
 
 	
 	<div class="b-nav index-new-nva text-center" style="height:69px;">
 
@@ -21,27 +29,28 @@
 
 {{$s:=(Ad "index-center-mob" 1)}}
 
 	{{range $k,$v := $s}}
 
 <div class="text-center visible-xs" style="margin-top:10px;">
 
-	<div style="background-color:#fff;padding:20px;">
 
-	<div style="height:35px; border-bottom:1px solid #e5e6e9;padding-bottom:15px;">
 
-	<div style="height:20px;width:10px;background-color:#FF5A5F;float:left;"></div>
 
-	<div style="color:#FF5A5F;float:left;margin-left:15px;">网站介绍</div>
 
+	<div class="index-mob-wzjs" >
 
+	<div class="index-mobwz-title" >
 
+	<div class="indexmob-tleft" ></div>
 
+	<div class="indexmob-tright" >网站介绍</div>
 
 	<div style="clear:both;"></div>
 
 	</div>
 
-	<div style="margin-top:20px;">
 
+	<div class="indexmob-cont" >
 
 	{{if $v.s_remark}}{{$v.s_remark}} {{end}}
 
 	</div>
 
 	</div>
 
-	<div  style="background-color:#fff; margin-top:10px;padding:20px;">
 
-	<div style="height:35px; border-bottom:1px solid #e5e6e9;padding-bottom:15px;">
 
-	<div style="height:20px;width:10px;background-color:#FF5A5F;float:left;"></div>
 
-	<div style="color:#FF5A5F;float:left;margin-left:15px;">手机体验</div>
 
+	<div class="indexmob-sjty" >
 
+	<div class="index-mobwz-title" >
 
+	<div class="indexmob-tleft" ></div>
 
+	<div class="indexmob-tright" >手机体验</div>
 
 	<div style="clear:both;"></div>
 
 	</div>
 
-	<div style="margin-top:20px;"><img src="{{if $v.s_pic}} {{$v.s_pic}} {{else}}/images/u109.png{{end}}"></div>
 
-	<div style="width:100%;margin-top: 20px;" class="text-center">微信关注企明星公众号qmx-cn，体验企明星的强大功能。</div>	
+	<div class="indexmob-cont" ><img src="{{if $v.s_pic}} {{$v.s_pic}} {{else}}/images/u109.png{{end}}"></div>
 
+	<div  class="indexmob-cont" style="width:100%;" class="text-center">微信关注企明星公众号qmx-cn，体验企明星的强大功能。</div>	
 	</div>
 
 </div>
 
 	{{end}}
 
+<!--手机版首页 end-->
 
 {{include "/common/indexhead.html"}}
 
 <div class="a-content a-index hidden-xs">	
 	<div class="a-index-head index-new-head">

+ 1 - 1
core/src/web/templates/manage/webexpresscontent-new.html
View File 

@@ -99,7 +99,7 @@ background-color:#F0F0F0;
 
 	margin-right:5px;
 
 }
 
 .lisecond{
 
-	width:210px;
 
+	width:190px;
 
     white-space: nowrap;
 
     overflow: hidden;
 
     text-overflow: ellipsis;

+ 2 - 3
core/src/web/templates/manage/webmobindex.html
View File 

@@ -34,7 +34,7 @@ body{
 
 <body>
 
 <div class="index-new-head b-head">
 
 	<div class="b-nav index-new-nva text-center">
 
-		<a href="/"><img src="/images/logo.png" class="logo"></a>
 
+		<a href="/"><img src="{{Msg "seo" "cdn"}}/images/logo.png" class="logo"></a>
 
 	</div>
 
 </div>
 
 <!-- 中间 -->
 
@@ -72,7 +72,6 @@ body{
 
 				<div style="margin-top:0px;" class="row-fluid">
 
 					<div class="span12">		
 							<div class="widget-content nopadding">
 
-								
 								<div style="width:98%; margin:auto; margin-bottom:10px;">
 
 	
 	<div style="margin-top: 40px;height:35px; border-bottom:1px solid #e5e6e9;">
 
@@ -81,7 +80,7 @@ body{
 
 	<div style="clear:both;"></div>
 
 	</div>
 
 	<div style="width:100%;    margin-top: 20px;" class="text-center"><img src="{{if .T.s_pic }}{{.T.s_pic}}{{else}}{{Msg "seo" "cdn"}}/images/u109.png{{end}}"/></div>	
-	<div style="width:100%;margin-top: 20px;" class="text-center">微信关注企明星公众号qmx-cn，体验企明星的强大功能。</div>						
+	<div style="width:100%;margin-top: 20px;" class="text-center">微信关注企明星公众号qmx-cn</br>体验企明星的强大功能</div>						
 		                        </div>
 
 							</div>
 
 					</div>

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

@@ -321,7 +321,7 @@ $(function(){
 
 <!-- 模态框（Modal） -->
 
 <div class="modal fade" id="myModal" tabindex="-1" role="dialog" 
    aria-labelledby="myModalLabel" aria-hidden="true">
 
-   <div class="modal-dialog">
 
+	<div class="modal-dialog">
 
       <div class="modal-content" style="height:500px;">
 
          <div class="modal-header">
 
             <button type="button" class="close" 
@@ -337,7 +337,7 @@ $(function(){
 
          </div>
 
          
       </div><!-- /.modal-content -->
 
-</div><!-- /.modal -->
 
+	</div><!-- /.modal -->
 
 </div>
 
 <!-- 底部 -->
 
 {{include "/common/bottom.html"}}

+ 71 - 13
core/src/web/templates/swordfish/wxsearch.html
View File 

@@ -98,17 +98,27 @@
 
 	border-top:1px solid #e5e6e9;
 
 	padding:10px 20px;
 
 }
 
+.wx-xhx{
 
+	border-top:1px solid #e5e6e9; 
+	width:100%;
 
+}
 
+.searchbs{
 
+	height:45px;
 
+	line-height:45px;
 
+	cursor:hand;
 
+}
 
 </style>
 
 </head>
 
 <body>
 
 
-<div class="wxhead"><span class="tubiao"><img src="/images/wxjss.png"/></span><input class="form-control searchname" name="searchnameshow" value="{{.T.keywords}}" placeholder="输入关键词查询"/>
 
-<span class="xiaochu"><img class="qcimg" src="/images/wxqc.png"/></span>
 
+<div class="wxhead"><span class="tubiao"><img src="{{Msg "seo" "cdn"}}/images/wxjss.png"/></span><input class="form-control searchname" name="searchnameshow" value="{{.T.keywords}}" placeholder="输入关键词查询"/>
 
+<span class="xiaochu"><img class="qcimg" src="{{Msg "seo" "cdn"}}/images/wxqc.png"/></span>
 
 </div>
 
 <div class="searchshow">
 
+		<!--招标 start-->
 
 	<form action="/member/wxswordfish/searchlist" name="searchone" method="post">
 
-		<div onClick="searchbiao(1)" style="height:45px;line-height:45px;cursor:hand;">
 
-		<div class="searchzhao1"><img src="/images/wxjs.png"/></div>
 
+		<div onClick="searchbiao(1)" class="searchbs" >
 
+		<div class="searchzhao1"><img src="{{Msg "seo" "cdn"}}/images/wxjs.png"/></div>
 
 		<div class="searchzhao2">查询招标公告：</div>
 
 		<div class="searchzhao3">
 
 		<span>{{.T.keywords}}</span>
 
@@ -119,10 +129,12 @@
 
 		<input name="s_name" id="sea_name1" value="" style="display:none;"/>
 
 		</div>
 
 	</form>
 
-		<div  style="border-top:1px solid #e5e6e9; width:100%;"></div>
 
+		<!--招标 end-->
 
+		<div class="wx-xhx" ></div>
 
+		<!--中标 start-->
 
 	<form action="/member/wxswordfish/searchlist" name="searchtwo" method="post">
 
-		<div onClick="searchbiao(2)" style="height:45px;line-height:45px;cursor:hand;">
 
-		<div class="searchzhong1"><img src="/images/wxjs.png"/></div>
 
+		<div onClick="searchbiao(2)"  class="searchbs" >
 
+		<div class="searchzhong1"><img src="{{Msg "seo" "cdn"}}/images/wxjs.png"/></div>
 
 		<div class="searchzhong2">查询中标公告：</div>
 
 		<div class="searchzhong3">
 
 		<span>{{.T.keywords}}</span>
 
@@ -133,11 +145,53 @@
 
 		<input name="s_name" id="sea_name2" value="" style="display:none;"/>
 
 		</div>
 
 	</form>
 
-		<div style="border-top:1px solid #e5e6e9; width:100%;"></div>
 
+		<!--中标 end-->
 
+		<div  class="wx-xhx"></div>
 
+		<!--企业情报 start-->
 
+	<form action="/member/wxswordfish/searchlist" name="searchthree" method="post">
 
+		<div onClick="searchbiao(3)"  class="searchbs" >
 
+		<div class="searchzhong1"><img src="{{Msg "seo" "cdn"}}/images/wxjs.png"/></div>
 
+		<div class="searchzhong2">查询企业情报：</div>
 
+		<div class="searchzhong3">
 
+		<span>{{.T.keywords}}</span>
 
+		</div>
 
+		<div style="clear:both"></div>
 
+		
+		</div>
 
+	</form>
 
+		<!--企业情报 end-->
 
+		<div  class="wx-xhx"></div>
 
 		<div id="myorder" class="text-center">
 
 		<div class="rsssetbtn" onClick="window.location.href='/swordfish/page';">进入我的信息订阅</div>
 
 		</div>
 
 </div>
 
+
 
+<!-- 按钮触发模态框 -->
 
+<button class="btn hidden kfing" data-toggle="modal" 
+   data-target="#myModal">
 
+</button>
 
+
 
+<!-- 模态框（Modal） -->
 
+<div class="modal fade" id="myModal" tabindex="-1" role="dialog" 
+   aria-labelledby="myModalLabel" aria-hidden="true">
 
+	<div class="modal-dialog">
 
+      <div class="modal-content" style="height:180px;">
 
+         <div class="modal-header">
 
+            <button type="button" class="close" 
+               data-dismiss="modal" aria-hidden="true">
 
+                  &times;
 
+            </button>
 
+            <h4 class="modal-title" id="myModalLabel">
 
+               企业情报
 
+            </h4>
 
+         </div>
 
+         <div class="modal-body text-center" style="margin-top:30px;">
 
+            开发中，敬请期待！
 
+         </div>
 
+         
+      </div><!-- /.modal-content -->
 
+	</div><!-- /.modal -->
 
+</div>
 
 {{include "/swordfish/wxtoolbar.html"}}
 
 <script type="text/javascript">
 
 	$(".searchname").keyup(function(){
 
@@ -151,14 +205,18 @@
 
 		$(".searchzhong3 span").html("");
 
 	});
 
 	function searchbiao(i){
 
-		var searchname = $(".searchname").val();
 
-		document.getElementById("searchname"+i).value = searchname;
 
-		searchname = searchname.replace(/^\s+|\s+$/g,"").replace(/\s+/g,"+");
 
-		document.getElementById("sea_name"+i).value = searchname;
 
+		if(i!=3){
 
+			var searchname = $(".searchname").val();
 
+			document.getElementById("searchname"+i).value = searchname;
 
+			searchname = searchname.replace(/^\s+|\s+$/g,"").replace(/\s+/g,"+");
 
+			document.getElementById("sea_name"+i).value = searchname;
 
+		}
 
 		if (i==1){
 
 			document.forms['searchone'].submit();
 
-		}else{
 
+		}else if (i==2){
 
 			document.forms['searchtwo'].submit();
 
+		}else if (i==3){
 
+			$(".kfing").click();
 
 		}
 
 		
 	}

+ 4 - 5
core/src/web/templates/swordfish/wxsearchlist.html
View File 

@@ -257,7 +257,6 @@ body{
 
 	padding:10px 20px;
 
 	background-color:#fff;
 
 	width:100%;
 
-	height:100%;
 
 }
 
 .tslist{
 
 	height:80px;
 
@@ -271,13 +270,13 @@ body{
 
 </head>
 
 <body>
 
 <div style="background-color:#fff;">
 
-<div class="wxhead"><span class="tubiao"><img src="/images/wxjss.png"/></span><input class="form-control searchname" name="searchname" value="{{.T.keywords}}" placeholder="输入关键词查询"/>
 
-<span class="xiaochu"><img class="qcimg" src="/images/wxqc.png"/></span>
 
+<div class="wxhead"><span class="tubiao"><img src="{{Msg "seo" "cdn"}}/images/wxjss.png"/></span><input class="form-control searchname" name="searchname" value="{{.T.keywords}}" placeholder="输入关键词查询"/>
 
+<span class="xiaochu"><img class="qcimg" src="{{Msg "seo" "cdn"}}/images/wxqc.png"/></span>
 
 </div>
 
 <div class="rescontent">
 
 	
 </div>
 
-
 
+<div style="height:40px;"></div>
 
 
 </div>
 
 <div class="resbm" >
 
@@ -291,7 +290,7 @@ body{
 
 
 <div class="nullcontent text-center  hidden">
 
 <div >
 
-<img style="width:137px;margin-top:160px;" src="/images/findnull.png">
 
+<img style="width:137px;margin-top:160px;" src="{{Msg "seo" "cdn"}}/images/findnull.png">
 
 </div>
 
 <div>没有找到和该关键词匹配的信息</div>
 
 </div>

+ 5 - 4
core/src/web/templates/swordfish/wxtoolbar.html
View File 

@@ -5,11 +5,12 @@
 
 	</li>
 
 	<li class="parent-node">
 
 		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/dingyue.png">
 
-		我得订阅
 
+		我的订阅
 
 	</li>
 
 	<li class="parent-node toolbar-list" id="toolbar-list">
 
 		<div class="toolbar-popover">
 
-			<ul class="popover-ul">
 
+			<ul class="popover-ul" style="padding-left: 10px;
 
+    text-align: left;">
 
 				<li>查看演示</li>
 
 				<li>分享</li>
 
 				<li>意见反馈</li>
 
@@ -85,9 +86,9 @@ var feedback = null;
 
 $(function(){
 
 	$(".bottom-toolbar>li").click(function(){
 
 		if($(this).index() == 0){
 
-			alert("搜索");
 
+			window.location.href = "/member/wxswordfish/search";
 
 		}else if($(this).index() == 1){
 
-			alert("我得订阅");
 
+			window.location.href = "/swordfish/page";
 
 		}else if($(this).index() == 2){
 
 			$(this).children(".toolbar-popover").show();
 
 		}

+ 8 - 8
credit/src/config.json
View File 

@@ -44,12 +44,12 @@
 
         "A2": -1000
 
     },
 
     "message": {
 
-        "swordfish_dueTitle": "剑鱼服务提醒",
 
-        "swordfish_due": "您的剑鱼服务%d天后到期，请及时续费。",
 
-        "swordfish_closeTitle": "剑鱼服务暂停提醒",
 
-        "swordfish_close": "您的剑鱼服务已经到期,已经暂停，请及时续费。",
 
-        "swordfish_payTitle": "剑鱼服务订单提醒",
 
-        "swordfish_pay": "您已成功订阅剑鱼，扣除%d积分，剩余%d积分，剑鱼服务时长到:%s",
 
+        "swordfish_dueTitle": "剑鱼%s信息服务提醒",
 
+        "swordfish_due": "您的剑鱼%s信息服务将于%d天后到期。您的积分余额为%d，如果继续使用，到期后系统将会自动扣除1000积分，如果积分余额不足服务将会中止。电脑登录qmx.top查看用户中心-积分，了解如何通过做任务赚取积分。",
 
+        "swordfish_closeTitle": "剑鱼%s信息服务暂停提醒",
 
+        "swordfish_close": "您的剑鱼%s信息服务已到期，由于积分余额不足，系统已停止推送。电脑登录qmx.top查看用户中心-积分，了解如何通过做任务赚取积分。",
 
+        "swordfish_payTitle": "剑鱼%s信息服务订单提醒",
 
+        "swordfish_pay": "您已成功订阅剑鱼%s信息服务，扣除%d积分，剩余%d积分，服务时间至:%s",
 
         "give": "转赠提醒",
 
         "give_pay": "转赠扣除提醒",
 
         "recharge": "充值成功提醒",
 
@@ -81,8 +81,8 @@
 
         "txt_c3": "邀请用户",
 
         "txt_d1": "微信充值",
 
         "txt_e1": "二维码转入",
 
-        "txt_A1": "剑鱼招标",
 
-        "txt_A2": "剑鱼中标",
 
+        "txt_A1": "招标",
 
+        "txt_A2": "中标",
 
         "txt_B1": "转赠"
 
     },
 
     "smtp": {

+ 3 - 3
credit/src/main.go
View File 

@@ -235,7 +235,7 @@ func TimerSwordFishFromUser() {
 
 									//提示
 
 									for _, v := range swordfish_tipBeforeDays {
 
 										if v == sub64 {
 
-											creditrpc.SendMsgWebAndWx(swordfish_dueTitle+"["+creditrpc.Message["txt_"+code]+"]", fmt.Sprintf(swordfish_due, v), util.BsonIdToSId(tmp["_id"]), tmp["s_m_openid"].(string))
 
+											creditrpc.SendMsgWebAndWx(fmt.Sprintf(swordfish_dueTitle, creditrpc.Message["txt_"+code]), fmt.Sprintf(swordfish_due, creditrpc.Message["txt_"+code], v, tmp["i_credit"]), util.BsonIdToSId(tmp["_id"]), tmp["s_m_openid"].(string))
 
 										}
 
 									}
 
 								}
 
@@ -283,7 +283,7 @@ func doSubCreditByUser(userId, umid, typeName, code string, next *time.Time, use
 
 			}
 
 			if creditlog.Save(creditDoc) {
 
 				//发送微信通知扣积分成功
 
-				creditrpc.SendMsgWebAndWx(swordfish_payTitle+"["+creditrpc.Message["txt_"+code]+"]", fmt.Sprintf(swordfish_pay, -codeNum, restNum, util.FormatDate(&newDate, util.Date_Full_Layout)), userId, umid)
 
+				creditrpc.SendMsgWebAndWx(fmt.Sprintf(swordfish_payTitle, creditrpc.Message["txt_"+code]), fmt.Sprintf(swordfish_pay, creditrpc.Message["txt_"+code], -codeNum, restNum, util.FormatDate(&newDate, util.Date_Full_Layout)), userId, umid)
 
 			}
 
 		} else { //暂停操作
 
 			//更新操作
 
@@ -294,7 +294,7 @@ func doSubCreditByUser(userId, umid, typeName, code string, next *time.Time, use
 
 				},
 
 			}, false, false) {
 
 				//暂停通知,因积分不够
 
-				creditrpc.SendMsgWebAndWx(swordfish_closeTitle+"["+creditrpc.Message["txt_"+code]+"]", swordfish_close, userId, umid)
 
+				creditrpc.SendMsgWebAndWx(fmt.Sprintf(swordfish_closeTitle, creditrpc.Message["txt_"+code]), fmt.Sprintf(swordfish_close, creditrpc.Message["txt_"+code]), userId, umid)
 
 			}
 
 		}
 
 	}, func(e interface{}) {

+ 1 - 1
credit/src/qfw/creditrpc/creditrpc.go
View File 

@@ -305,7 +305,7 @@ func (c *CreditRpc) OutCreadit(param *qrpc.CreditData, replay *int) error {
 
 			*replay = creditDoc["i_score"].(int)
 
 			//发送微信通知扣积分成功
 
 			if first == "A" {
 
-				go SendMsgWebAndWx(Message["swordfish_payTitle"]+"["+txt+"]", fmt.Sprintf(Message["swordfish_pay"], creditDoc["i_score"], creditDoc["i_scorenow"], util.FormatDate(&newDate, util.Date_Full_Layout)), param.Uid, param.Umid)
 
+				go SendMsgWebAndWx(fmt.Sprintf(Message["swordfish_payTitle"], txt), fmt.Sprintf(Message["swordfish_pay"], txt, creditDoc["i_score"], creditDoc["i_scorenow"], util.FormatDate(&newDate, util.Date_Full_Layout)), param.Uid, param.Umid)
 
 			}
 
 		}
 
 	}

Some files were not shown because too many files changed in this diff