modify swordfish css

core/src/web/staticres/wxswordfish/style.css

@@ -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{

credit/src/config.json

@@ -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": {

credit/src/main.go

@@ -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{}) {

credit/src/qfw/creditrpc/creditrpc.go

@@ -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)
 			}
 		}
 	}