修改积分

common/src/qfw/util/encrypt_test.go

@@ -10,12 +10,9 @@ import (
 
 //加密解密测试
 func TestEncrypt(t *testing.T) {
-	se := &SimpleEncrypt{Key: "123456"}
-	tmp := []byte("这是一段测试文本")
-	se.Encode(&tmp)
-	log.Println(string(tmp))
-	se.Decode(&tmp)
-	log.Println(string(tmp))
+	se := &SimpleEncrypt{Key: "topnet"}
+
+	log.Println(se.EncodeString("oJULtwzXo6EFV1Ah-XeyRBimXGM8,ff,ff,swordfishaction"))
 }
 
 func Test_sim(t *testing.T) {

core/src/qfw/mobile/wxmenu.go

@@ -43,11 +43,13 @@ func (m *Mobile) Wxrssset() error {
 			}
 		}
 	}()
-	if m.Session().Get("userId") != nil {
+	userId := m.Session().Get("userId")
+	//userId = "55a39942af53740186000004"
+	if userId != nil {
 		m.T["signature"] = getSignature(m.Url())
-		userInfo := mongodb.FindById("user", m.GetSession("userId").(string), nil)
+		userInfo := mongodb.FindById("user", userId.(string), nil)
 		if i_m_guide := (*userInfo)["i_m_guide"]; util.IntAll(i_m_guide) == 0 {
-			mongodb.Update("user", `{"_id":"`+m.GetSession("userId").(string)+`"}`, map[string]interface{}{
+			mongodb.Update("user", `{"_id":"`+userId.(string)+`"}`, map[string]interface{}{
 				"$set": map[string]interface{}{
 					"i_m_guide": 1,
 				},
@@ -208,22 +210,20 @@ func (m *Mobile) AjaxReq() error {
 		if userId := m.GetSession("userId"); userId != nil {
 			msgset := make(map[string]interface{})
 			//投标公告
-			if flag, _ := m.GetBool("tender_flag"); flag {
-				tender := make(map[string]interface{})
-				tender["a_key"] = m.GetSlice("tender_keys")
-				tender["s_scope"] = m.GetString("tender_scope")
-				msgset["tender"] = tender
-			}
-			//中标公告
-			if flag, _ := m.GetBool("bid_flag"); flag {
-				bid := make(map[string]interface{})
-				bid["a_key"] = m.GetSlice("bid_keys")
-				bid["s_scope"] = m.GetString("bid_scope")
-				msgset["bid"] = bid
+			set := make(map[string]interface{})
+			for _, v := range []string{"tender", "bid"} {
+				if len(m.GetString(v+"_scope")) > 0 {
+					tmp := make(map[string]interface{})
+					tmp["a_key"] = m.GetSlice(v + "_keys")
+					tmp["s_scope"] = m.GetString(v + "_scope")
+					tmp["i_status"], _ = m.GetInteger(v + "_status")
+					tmp["l_modifydate"] = time.Now().Unix()
+					set["o_msgset."+v] = tmp
+				}
 			}
 			//更新数据库
 			msgset["l_modifydate"] = time.Now().Unix()
-			if mongodb.Update("user", `{"_id":"`+userId.(string)+`"}`, &map[string]interface{}{"$set": map[string]interface{}{"o_msgset": msgset}}, false, false) {
+			if mongodb.Update("user", `{"_id":"`+userId.(string)+`"}`, &map[string]interface{}{"$set": set}, false, false) {
 				flag = "y"
 			}
 		}

core/src/timetask.json

@@ -1,2 +1 @@
-{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-11 14:05:58"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-11 14:05:58"}},"marketisstart":true,"marketrate":300}
-
+{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-13 17:56:29"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-13 17:56:29"}},"marketisstart":true,"marketrate":300}

core/src/web/staticres/wxswordfish/main.js

@@ -1,5 +1,6 @@
 //招标公告
 var Tender = {
+	status:false,
 	keyWordDialog: null,
 	getKeyWordDialog: function(clickLi){
 		if(this.keyWordDialog == null){
@@ -17,6 +18,7 @@ var Tender = {
 };
 //中标公告
 var Bid = {
+	status:false,
 	keyWordDialog: null,
 	getKeyWordDialog: function(clickLi){
 		if(this.keyWordDialog == null){
@@ -55,7 +57,7 @@ function KeyWordDialog(type,clickLi){
 		KeyWordDialog.AppendNode(dialogObj);
 	});
 	dialogObj.find(".submit").click(function(){
-		commonAjaxReq(thisClass);
+		commonAjaxReq(thisClass,type);
 	});
 	if(dialogObj.find(".keyWordGroup").length == 0){
 		KeyWordDialog.AppendNode(dialogObj);
@@ -71,15 +73,17 @@ KeyWordDialog.AppendNode = function(dialogObj,value){
 		return '<div class="keyWordGroup">'
 					+'<lable>关键词<font>'+index+'</font></lable>'
 					+'<div><input type="text" value="'+(value?value:"")+'" placeholder="示例：综合布线 电话线 网线" maxlength="100"></div>'
-					+'<div><img src="/wxswordfish/images/delete.png" class="delete"></div>'
+					+'<div>'+(index==1?'':'<img src="/wxswordfish/images/delete.png" class="delete">')+'</div>'
 				+'</div>';
 	}
 	var count = dialogObj.find(".keyWordGroup").length;
-	if(count >= 5){
+	if(count >= 10){
 		return;
 	}
 	var obj = $(getHtml(count+1,value));
 	dialogObj.find(".addKeyWordArea").before(obj);
+	//自动滚动到底部
+	$("#a_end")[0].scrollIntoView();
 	obj.find(".delete").click(function(){
 		dialogObj.find(".addKeyWord").removeAttr("disabled");
 		$(this).parents(".keyWordGroup").remove();
@@ -90,7 +94,7 @@ KeyWordDialog.AppendNode = function(dialogObj,value){
 	if(typeof(value) == "undefined" || value == ""){
 		obj.find("[type='text']").focus();
 	}
-	if(count == 4){
+	if(count >= 9){
 		dialogObj.find(".addKeyWord").attr("disabled",true);
 	}
 }
@@ -121,14 +125,24 @@ function ScopeDialog(type,clickLi){
 		}
 	});
 	dialogObj.find(".submit").click(function(){
-		commonAjaxReq(thisClass);
+		commonAjaxReq(thisClass,type);
 	});
 }
-function commonAjaxReq(object){
+function commonAjaxReq(object,module){
+	if($("#"+module+"-on-off").hasClass("open")){
+		//开服务要校验
+		if(module=="tender"){
+			if(!Tender.status){
+				//提示扣积分
+				$(".creditTip-dialog").show()
+				$("html,body").addClass("overflow-hidden")
+				
+			}
+		}
+	}
+	//是关的不用处理
 	var dataObj = {
-		reqType: "other",
-		tender_flag: $("#tender-on-off").hasClass("open"),
-		bid_flag: $("#bid-on-off").hasClass("open")
+		reqType: "other"
 	};
 	var keysString = "",scopeString = "";
 	var thisClass = this;
@@ -191,22 +205,12 @@ function commonAjaxReq(object){
 		});
 		return tender_scope.join(",");
 	}
-	/*******************招标公告****************/
-	if(dataObj.tender_flag){
-		dataObj["tender_keys"] = this.setKeyWord("tender");
-		dataObj["tender_scope"] = this.setScope("tender");
-		if(dataObj.tender_keys.length > 0 && dataObj.tender_scope == ""){
-			dataObj["tender_scope"] = "A";
-		}
-	}
-	/*******************中标公告****************/
-	if(dataObj.bid_flag){
-		dataObj["bid_keys"] = this.setKeyWord("bid");
-		dataObj["bid_scope"] = this.setScope("bid");
-		if(dataObj.bid_keys.length > 0 && dataObj.bid_scope == ""){
-			dataObj["bid_scope"] = "A";
-		}
+	dataObj[module+"_keys"] = this.setKeyWord(module);
+	dataObj[module+"_scope"] = this.setScope(module);
+	if(dataObj[module+"_keys"].length > 0 && dataObj[module+"_scope"] == ""){
+		dataObj[module+"_scope"] = "A";
 	}
+	dataObj[module+"_status"] = $("#"+module+"-on-off").hasClass("open")?1:0
 	/*****************************************/
 	$.ajax({
 		type: "POST",
@@ -271,12 +275,18 @@ $(function(){
 	if(typeof(msgset.tender) != "undefined"){
 		setKeyWord("tender",msgset.tender.a_key);
 		setScope("tender",msgset.tender.s_scope);
-		turnOn($("#tender-on-off"));
+		if(msgset.tender.i_status){
+			turnOn($("#tender-on-off"));
+			Tender.status=true
+		}
 	}
 	if(typeof(msgset.bid) != "undefined"){
 		setKeyWord("bid",msgset.bid.a_key);
 		setScope("bid",msgset.bid.s_scope);
-		turnOn($("#bid-on-off"));
+		if(msgset.bid.i_status){
+			turnOn($("#bid-on-off"));
+			Bid.status=true
+		}
 	}
 	//开关
 	$(".on-off").click(function(){
@@ -291,7 +301,18 @@ $(function(){
 		}else{
 			turnOn($(this));
 		}
-		commonAjaxReq(null);
+		//判断是不是开，是开再判断是不是在有效期内，如果不在有效期内，则进行提示并存快照
+		
+		commonAjaxReq(null,$(this).attr("v"));
+	});
+	//收费规则
+	$(".rule").closest(".parent-node").click(function(){
+		$(".credit-dialog").show();
+		$("html,body").addClass("overflow-hidden");
+	})
+	$("#credit-dialog-back").click(function(){
+		$(".credit-dialog").hide();
+		$("html,body").removeClass("overflow-hidden");
 	});
 	//
 	$("#tender-content>li").click(function(){

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

@@ -63,8 +63,8 @@ img{
 }
 .operation>.parent-node{
 	width: 100%;
-	height: 60px;
-	line-height: 60px;
+	height: 54px;
+	line-height: 54px;
 	border-bottom: 1px solid #CCCCCC;
 	position: relative;
 	font-size: 16px;
@@ -96,6 +96,13 @@ img{
 	background-image: url("/wxswordfish/images/off.png");
 	background-size: 100% 100%;
 }
+.operation>.parent-node>.rule{
+	background: url("/wxswordfish/images/right.png") no-repeat 10px;
+	background-size: 30% 50%;
+}
+.rule-content div{
+	height:30px;
+}
 .operation .on-off.open{
 	background-image: url("/wxswordfish/images/on.png");
 }
@@ -512,4 +519,12 @@ img{
 	width: 34%;
 	border-left: 1px solid #CCCCCC;
 	border-right: 1px solid #CCCCCC;
+}
+
+.tip{
+	margin:1px;
+	padding:5px;
+	background-color:#FAF5DF;
+	height:130px;
+	border:1px solid #F5DC9A;
 }

core/src/web/templates/swordfish/wxrssset.html

@@ -18,7 +18,7 @@
 		<li class="parent-node">
 			<img src="/wxswordfish/images/zhaobiao.png">
 			招标公告
-			<span class="on-off" id="tender-on-off"></span>
+			<span class="on-off" id="tender-on-off" v="tender"></span>
 		</li>
 		<li class="child-node">
 			<ul id="tender-content">
@@ -33,7 +33,7 @@
 		<li class="parent-node">
 			<img src="/wxswordfish/images/zhongbiao.png">
 			中标公告
-			<span class="on-off" id="bid-on-off"></span>
+			<span class="on-off" id="bid-on-off" v="bid"></span>
 		</li>
 		<li class="child-node">
 			<ul id="bid-content">
@@ -50,20 +50,25 @@
 			企业情报
 			<span class="on-off" id="intelligence-on-off"></span>
 		</li>
+		<li class="parent-node">
+			<img src="/wxswordfish/images/qingbao.png">
+			收费规则
+			<span class="rule" id="rule"></span>
+		</li>
 	</ul>
 	
 	<!--关键词-->
 	<div class="dialog keyword-dialog" id="tender-keyword">
 		<div class="dialog-main">
 			<div class="dialog-head">
-				<div>订阅关键词<span>最多订阅5组关键词</span></div>
+				<div>订阅关键词<span>最多订阅10组关键词</span></div>
 				<div><span class="submit">确定</span></div>
 			</div>
 			<div class="dialog-content">
 				<div class="addKeyWordArea">
 					<lable></lable>
 					<div><button class="btn addKeyWord"><span class="icon">+</span>添加关键词</button></div>
-					<div></div>
+					<div id="a_end"></div>
 				</div>
 			</div>
 		</div>
@@ -80,23 +85,35 @@
 					<li>
 						<button class="btn active">全国</button>
 					</li>
+					<li>
+						<div>华北地区</div>
+						<button class="btn">北京</button>
+						<button class="btn">天津</button>
+						<button class="btn">河北</button>
+						<button class="btn">山西</button>
+						<button class="btn">内蒙古</button>
+					</li>
+					<li>
+						<div>东北地区</div>
+						<button class="btn">辽宁</button>
+						<button class="btn">吉林</button>
+						<button class="btn">黑龙江</button>
+					</li>
 					<li>
 						<div>华东地区</div>
 						<button class="btn">上海</button>
 						<button class="btn">江苏</button>
 						<button class="btn">浙江</button>
 						<button class="btn">安徽</button>
+						<button class="btn">福建</button>
 						<button class="btn">江西</button>
 						<button class="btn">山东</button>
-						<button class="btn">福建</button>
 					</li>
 					<li>
-						<div>华北地区</div>
-						<button class="btn">北京</button>
-						<button class="btn">天津</button>
-						<button class="btn">山西</button>
-						<button class="btn">河北</button>
-						<button class="btn">内蒙古</button>
+						<div>华南地区</div>
+						<button class="btn">广东</button>
+						<button class="btn">广西</button>
+						<button class="btn">海南</button>
 					</li>
 					<li>
 						<div>华中地区</div>
@@ -104,15 +121,6 @@
 						<button class="btn">湖北</button>
 						<button class="btn">湖南</button>
 					</li>
-					<li>
-						<div>华南地区</div>
-						<button class="btn">广东</button>
-						<button class="btn">广西</button>
-						<button class="btn">海南</button>
-						<button class="btn">香港</button>
-						<button class="btn">澳门</button>
-						<button class="btn">台湾</button>
-					</li>
 					<li>
 						<div>西南地区</div>
 						<button class="btn">重庆</button>
@@ -129,12 +137,7 @@
 						<button class="btn">宁夏</button>
 						<button class="btn">新疆</button>
 					</li>
-					<li>
-						<div>东北地区</div>
-						<button class="btn">黑龙江</button>
-						<button class="btn">吉林</button>
-						<button class="btn">辽宁</button>
-					</li>
+
 				</ul>
 			</div>
 		</div>

core/src/web/templates/swordfish/wxtoolbar.html

@@ -16,7 +16,7 @@
 	<div class="dialog-main">
 		<div class="dialog-head">
 			<div>如何分享</div>
-			<div><span id="share-dialog-back">返回</span></div>
+			<div><span id="share-dialog-back">确定</span></div>
 		</div>
 		<div class="dialog-content">
 			<div>
@@ -25,6 +25,32 @@
 		</div>
 	</div>
 </div>
+<div class="dialog credit-dialog">
+	<div class="dialog-main">
+		<div class="dialog-head">
+			<div>收费规则</div>
+			<div><span id="credit-dialog-back">确定</span></div>
+		</div>
+		<div class="dialog-content" style="height:115px;">
+			<div class="rule-content">
+				<div>剑鱼收费标准：</div>
+				<div>每个栏目、每月1000积分。。</div>
+				<div>积分按月扣除，到期后默认自动扣除下月积分，积分不足则停止服务。如果您不希望下月继续服务，可提前将服务关闭。</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="dialog creditTip-dialog">
+	<div class="tip">
+		<div>您添加了1个信息栏目（招标公告），确认后系统将每月扣除1000积分，您目前的积分余额是1500积分，扣除后将剩余500积分。</div>
+		<div class="float:right">
+		<button>提交</button>
+		<button>取消</button>
+		</div>
+	</div>
+</div>
+
 <!--意见反馈-->
 <div class="dialog feedback-dialog">
 	<div class="dialog-main">

credit/src/main.go

@@ -1,5 +1,5 @@
 /*
-信用积分
+积分等
 */
 
 package main
@@ -26,21 +26,14 @@ import (
 
 var SysConfig map[string]interface{}
 var swordfish_subHour int
-var swordfish_tipBeforeDays = make([]int, 0)
+var swordfish_tipBeforeDays []int
 var swordfish_dueTitle, swordfish_due, swordfish_closeTitle, swordfish_close, swordfish_payTitle, swordfish_pay string
 
 func init() {
 	util.ReadConfig(&SysConfig)
-	swordfish_subHour = util.IntAllDef(SysConfig["swordfish_subHour"], 18)
-	swordfish_dueTitle = SysConfig["swordfish_dueTitle"].(string)
-	swordfish_due = SysConfig["swordfish_due"].(string)
-	swordfish_closeTitle = SysConfig["swordfish_closeTitle"].(string)
-	swordfish_close = SysConfig["swordfish_close"].(string)
-	swordfish_payTitle = SysConfig["swordfish_payTitle"].(string)
-	swordfish_pay = SysConfig["swordfish_pay"].(string)
 	strDays := strings.Split(SysConfig["swordfish_tipBeforeDays"].(string), ",")
 	creditrpc.Rpcserver = SysConfig["weixinrpc"].(string)
-
+	swordfish_tipBeforeDays = make([]int, len(strDays))
 	for k, v := range strDays {
 		swordfish_tipBeforeDays[k], _ = strconv.Atoi(v)
 	}
@@ -61,6 +54,14 @@ func init() {
 		creditrpc.Message[k] = v.(string)
 	}
 
+	swordfish_subHour = util.IntAllDef(SysConfig["swordfish_subHour"], 18)
+	swordfish_dueTitle = creditrpc.Message["swordfish_dueTitle"]
+	swordfish_due = creditrpc.Message["swordfish_due"]
+	swordfish_closeTitle = creditrpc.Message["swordfish_closeTitle"]
+	swordfish_close = creditrpc.Message["swordfish_close"]
+	swordfish_payTitle = creditrpc.Message["swordfish_payTitle"]
+	swordfish_pay = creditrpc.Message["swordfish_pay"]
+
 	creditlog.Smtp = SysConfig["smtp"].(map[string]interface{})
 
 }