xiugai

src/jfw/front/wxkeyset.go

@@ -161,23 +161,10 @@ func (m *Front) WxKeysetAjaxReq() {
 			ratemode = 1
 		}
 		saveData["o_jy.i_ratemode"] = ratemode
-		//接收方式：i_mode 1--微信 2--邮件 3--微信+邮件 4--app 5--app+微信 6--app+邮件 7--微信+app+邮件
-		modes := m.GetString("mode")
-		mode := 1
-		if modes == "1" {
+		//接收方式：1微信  2邮箱 3信息+邮箱
+		mode, _ := m.GetInteger("mode")
+		if mode != 2 && mode != 3 {
 			mode = 1
-		} else if modes == "2" {
-			mode = 2
-		} else if modes == "4" {
-			mode = 4
-		} else if strings.Contains(modes, "1") && strings.Contains(modes, "2") && strings.Contains(modes, "4") {
-			mode = 7
-		} else if strings.Contains(modes, "1") && strings.Contains(modes, "2") {
-			mode = 3
-		} else if strings.Contains(modes, "1") && strings.Contains(modes, "4") {
-			mode = 5
-		} else if strings.Contains(modes, "2") && strings.Contains(modes, "4") {
-			mode = 6
 		}
 		if ratemode == 3 {
 			saveData["o_jy.i_rmstart"], _ = m.GetInteger("rmstart")

src/jfw/modules/app/src/jfw/front/login.go

@@ -42,7 +42,7 @@ type UserSign struct {
 	Type       int    `json:"type"`
 }
 
-//i_mode 1--微信 2--邮件 3--微信+邮件 4--app 5--app+微信 6--app+邮件 7--微信+app+邮件
+////接收方式：1--app 2--邮件 3--app+邮件
 //i_type 1--手机注册 2--微信注册
 //注册登录 手机号登录 微信注册并登录 微信登录 签名登录
 type Login struct {
@@ -233,7 +233,7 @@ func (l *Login) Register() error {
 				"s_jpushid":     rid,
 				"i_ts_guide":    2,
 				"o_jy": map[string]interface{}{
-					"i_mode":       4,
+					"i_mode":       1,
 					"i_ratemode":   1,
 					"l_modifydate": time.Now().Unix(),
 				},
@@ -285,20 +285,7 @@ func (l *Login) WxLogin() {
 			log.Println("微信注册签名错误！")
 			return -2
 		}
-		query := bson.M{"s_unionid": u.UnionId, "i_appid": 2}
-		user, ok := mongodb.FindOne("user", query)
-		if !ok {
-			return 0
-		}
-		rid := l.GetString("rid")
-		if user != nil && len(*user) > 0 {
-			//登录
-			returnSign = afterLogin(*user, query, l.Session(), u.OpenId, rid, qutil.IntAll((*user)["i_type"]))
-			return 1
-		} else {
-			return -3
-		}
-		/*query := bson.M{"s_m_openid": u.OpenId, "i_appid": 2}
+		query := bson.M{"s_m_openid": u.OpenId, "i_appid": 2}
 		user, ok := mongodb.FindOne("user", query)
 		if !ok {
 			return 0
@@ -338,7 +325,7 @@ func (l *Login) WxLogin() {
 				returnSign = afterLogin(newUser, nil, l.Session(), u.OpenId, rid, 2)
 				return 1
 			}
-		}*/
+		}
 		return 0
 	}()
 	//返回

src/jfw/modules/app/src/jfw/front/wxkeyset.go

@@ -156,23 +156,15 @@ func (m *Front) WxKeysetAjaxReq() {
 			ratemode = 1
 		}
 		saveData["o_jy.i_ratemode"] = ratemode
-		//接收方式：i_mode 1--微信 2--邮件 3--微信+邮件 4--app 5--app+微信 6--app+邮件 7--微信+app+邮件
+		//接收方式：i_mode 1--app 2--邮件 3--app+邮件
 		modes := m.GetString("mode")
 		mode := 1
 		if modes == "1" {
 			mode = 1
 		} else if modes == "2" {
 			mode = 2
-		} else if modes == "4" {
-			mode = 4
-		} else if strings.Contains(modes, "1") && strings.Contains(modes, "2") && strings.Contains(modes, "4") {
-			mode = 7
 		} else if strings.Contains(modes, "1") && strings.Contains(modes, "2") {
 			mode = 3
-		} else if strings.Contains(modes, "1") && strings.Contains(modes, "4") {
-			mode = 5
-		} else if strings.Contains(modes, "2") && strings.Contains(modes, "4") {
-			mode = 6
 		}
 		if ratemode == 3 {
 			saveData["o_jy.i_rmstart"], _ = m.GetInteger("rmstart")

src/jfw/modules/app/src/web/templates/me/login.html

@@ -125,8 +125,6 @@
 				success: function(r){
 					if(r.status == 1){
 						loginSuccess(r.sign);
-					}else if(r.status == -3){
-						EasyAlert.show("请先关注“剑鱼招标订阅”公众号",undefined,2000);
 					}else{
 						EasyAlert.show("登录失败");
 					}

src/jfw/modules/app/src/web/templates/weixin/wxkeyset/seniorset.html

@@ -132,23 +132,6 @@ $(function(){
 		}
 		saveData();
 	});
-	$("#wxtip>img").click(function(){
-		var parentLi = $(this).parent();
-		if($(this).hasClass("turn-on")){
-			if(!retainOneWay("wxtip")){
-				EasyAlert.show(keepOneTipWayMsg);
-				return;
-			}
-			parentLi.removeClass("on");
-			parentLi.children(".turn-off").show();
-			parentLi.children(".turn-on").hide();
-		}else{
-			parentLi.addClass("on");
-			parentLi.children(".turn-on").show();
-			parentLi.children(".turn-off").hide();
-		}
-		saveData();
-	});
 	//邮件提醒
 	$("#emailtip>img").click(function(){
 		var parentLi = $(this).parent();
@@ -198,7 +181,7 @@ $(function(){
 });
 //
 function retainOneWay(thisId){
-	var wayIds = ["emailtip","wxtip","apptip"];
+	var wayIds = ["emailtip","apptip"];
 	var offCount = 0;
 	for(var i=0;i<wayIds.length;i++){
 		if(wayIds[i]==thisId){
@@ -264,7 +247,7 @@ function numScroller(){
 //
 function init(r){
 	this.ratemode = 1;
-	this.mode = 4;
+	this.mode = 1;
 	if(r){
 		if(r["i_ratemode"]){
 			this.ratemode = r["i_ratemode"];
@@ -292,23 +275,16 @@ function init(r){
 		}
 	}
 	numScroller();
-	//接收方式：i_mode 1--微信 2--邮件 3--微信+邮件 4--app 5--app+微信 6--app+邮件 7--微信+app+邮件
+	//接收方式：i_mode 1--app 2--邮件 3--app+邮件
 	var hasOneOpen = false;
-	if(this.mode == 1 || this.mode == 3 || this.mode == 5 || this.mode == 7){
-		hasOneOpen = true
-		$("#wxtip").addClass("on");
-		$("#wxtip>img.turn-on").show();
-	}else{
-		$("#wxtip>img.turn-off").show();
-	}
-	if(this.mode == 4 || this.mode == 5 || this.mode == 6 || this.mode == 7){
+	if(this.mode == 1 || this.mode == 3){
 		hasOneOpen = true
 		$("#apptip").addClass("on");
 		$("#apptip>img.turn-on").show();
 	}else{
 		$("#apptip>img.turn-off").show();
 	}
-	if(this.mode == 2 || this.mode == 3 || this.mode == 6 || this.mode == 7){
+	if(this.mode == 2 || this.mode == 3){
 		hasOneOpen = true
 		if(email != ""){
 			$(".emailset").show();
@@ -320,6 +296,7 @@ function init(r){
 	}
 	if(!hasOneOpen){
 		$("#apptip").addClass("on");
+		$("#apptip>img.turn-off").hide();
 		$("#apptip>img.turn-on").show();
 	}
 	$("#email").val(email);
@@ -334,7 +311,7 @@ function saveData(){
 	var param = {
 		"reqType": "saveSeniorset",
 		"ratemode": 1,
-		"mode": 4,
+		"mode": 1,
 		"email": $("#email").val(),
 	};
 	if($("#pushfrequency li:eq(2)").hasClass("checked")){
@@ -348,9 +325,6 @@ function saveData(){
 	//
 	var modeArray = [];
 	if($("#apptip").hasClass("on")){
-		modeArray.push(4);
-	}
-	if($("#wxtip").hasClass("on")){
 		modeArray.push(1);
 	}
 	if($("#emailtip").hasClass("on")){
@@ -462,19 +436,12 @@ function docheck(n,th){
 					<img src="/jyapp/images/wxkeyset/turn-on.png" class="turn-on">
 					<img src="/jyapp/images/wxkeyset/turn-off.png" class="turn-off">
 				</li>
-				{{if eq (session "i_type") 2.0 0.0}}
-				<li id="wxtip">
-					微信提醒
-					<img src="/jyapp/images/wxkeyset/turn-on.png" class="turn-on">
-					<img src="/jyapp/images/wxkeyset/turn-off.png" class="turn-off">
-				</li>
-				{{end}}
 				<li id="emailtip">
 					邮件提醒
 					<img src="/jyapp/images/wxkeyset/turn-on.png" class="turn-on">
 					<img src="/jyapp/images/wxkeyset/turn-off.png" class="turn-off">
 					<div class="emailset">
-						<span>mulangshenjun@vip.qq.com</span>
+						<span></span>
 						<img src="/jyapp/images/wx/editemail.png">
 					</div>
 				</li>

src/jfw/modules/push/src/config.json

@@ -12,7 +12,7 @@
 	"mails": [{
 		"addr": "smtp.exmail.qq.com",
 		"port": 465,
-		"pwd": "RjF9fPHx4Fxmkc92",
+		"pwd": "ue9Rg9Sf4CVtdm5a",
 		"user": "public03@topnet.net.cn"
 	}],
 	"maxPushSize": 50,

src/jfw/modules/push/src/qfw/push/cache.go

@@ -31,6 +31,7 @@ type MemberInterest struct {
 	IsPush       int
 	InterestDate int64
 	PushMode     int //增加推送方式 11两位，分别代表邮箱、微信
+	Type         int
 	Ratemode     int
 	Smartset     int //智能订阅 1开启 0关闭
 	Rmstart      int

src/jfw/modules/push/src/qfw/push/dopush/dopush.go

@@ -31,7 +31,7 @@ func (s sortList) Swap(i, j int) {
 	s[i], s[j] = s[j], s[i]
 }
 
-//推送模式i_mode： 1--微信，2--邮件，3--微信+邮件，4--app，5--app+微信，6--app+邮件，7--微信+app+邮件
+//推送模式i_mode： 1--app 2--邮件 3--app+邮件
 func DealSend(k *push.MemberInterest, l *list.List, now time.Time, MaxPushSize int, ratemode int, infoTypeName string) {
 	defer util.Catch()
 	//没有需要推送的数据
@@ -45,8 +45,8 @@ func DealSend(k *push.MemberInterest, l *list.List, now time.Time, MaxPushSize i
 		sl = append(sl, &k2)
 	}
 	sort.Sort(sl)
-	bmail := false //邮箱推送2,3,6,7
-	if (k.PushMode == 2 || k.PushMode == 3 || k.PushMode == 6 || k.PushMode == 7) && len(k.Email) > 0 {
+	bmail := false //邮箱推送2,3
+	if (k.PushMode == 2 || k.PushMode == 3) && len(k.Email) > 0 {
 		bmail = true
 	}
 	str := fmt.Sprintf("<div>根据您设置的关键词（%s）,给您推送以下信息:</div>", strings.Join(k.Interest, ";"))
@@ -193,10 +193,10 @@ func DealSend(k *push.MemberInterest, l *list.List, now time.Time, MaxPushSize i
 		}
 	}
 
-	//发送微信:1,3,5,7
+	//发送微信:1,3
 	//wid := ""
 	bsavewx := false
-	if (k.PushMode == 1 || k.PushMode == 3 || k.PushMode == 5 || k.PushMode == 7) && len(k.Openid) > 0 && k.IsPush != 0 {
+	if k.Type == 0 && (k.PushMode == 1 || k.PushMode == 3) && len(k.Openid) > 0 && k.IsPush != 0 {
 		Tip1 := util.If(TmpTip == "", "", TmpTip+":\n").(string)
 		LastTip := ""
 		if i > 1 {
@@ -259,8 +259,8 @@ func DealSend(k *push.MemberInterest, l *list.List, now time.Time, MaxPushSize i
 			bsavewx = true
 		}
 	}
-	//app推送4,5,6,7
-	if k.Jpushid != "" && (k.PushMode == 4 || k.PushMode == 5 || k.PushMode == 6 || k.PushMode == 7) {
+	//app推送1,3
+	if (k.Type == 1 || k.Type == 2) && k.Jpushid != "" && (k.PushMode == 1 || k.PushMode == 3) {
 		if !bsavewx { //app,app+邮件，推送记录
 			pushid = push.SaveSendInfo(k, time.Now(), str, o_pushinfo, ratemode)
 		}

src/jfw/modules/push/src/qfw/push/dopush/dopushes.go

@@ -140,6 +140,7 @@ func PushNineUsers(MaxPushSize int) bool {
 		"s_m_openid":    1,
 		"s_jpushid":     1,
 		"i_ispush":      1,
+		"i_type":        1,
 		"i_dataexport":  1,
 		"i_smartset":    1,
 		"i_supersearch": 1,
@@ -168,6 +169,7 @@ func PushNineUsers(MaxPushSize int) bool {
 					Email:      util.ObjToString(o_msgset["s_email"]),
 					Openid:     util.ObjToString(tmp["s_m_openid"]),
 					IsPush:     util.IntAllDef(tmp["i_ispush"], 1),
+					Type:       util.IntAllDef(tmp["i_type"], 0),
 					Jpushid:    util.ObjToString(tmp["s_jpushid"]),
 					Ratemode:   util.IntAllDef(o_msgset["i_ratemode"], 1),
 					Rmstart:    util.IntAllDef(o_msgset["i_rmstart"], 1),
@@ -233,6 +235,7 @@ func InitUserCache() (*Pjob, *Pjob) {
 		"s_jpushid":     1,
 		"i_ispush":      1,
 		"i_dataexport":  1,
+		"i_type":        1,
 		"i_smartset":    1,
 		"i_supersearch": 1,
 	}).Iter()
@@ -331,6 +334,7 @@ func InitUserCache() (*Pjob, *Pjob) {
 					Openid:       util.ObjToString(tmp["s_m_openid"]),
 					Jpushid:      util.ObjToString(tmp["s_jpushid"]),
 					IsPush:       util.IntAllDef(o_msgset["i_ispush"], 1),
+					Type:         util.IntAllDef(tmp["i_type"], 0),
 					Ratemode:     util.IntAllDef(o_msgset["i_ratemode"], 1),
 					Rmstart:      util.IntAllDef(o_msgset["i_rmstart"], 1),
 					Rmend:        util.IntAllDef(o_msgset["i_rmend"], 1),

src/web/templates/weixin/wxkeyset/seniorset.html

@@ -121,29 +121,11 @@ $(function(){
 	//	$("#pushfrequency li:gt(0)").toggleClass("checked");
 	//	saveData();
 	//});
-	//
-	$("#apptip>img").click(function(){
-		var parentLi = $(this).parent();
-		if($(this).hasClass("turn-on")){
-			if(!retainOneWay("apptip")){
-				EasyAlert.show(keepOneTipWayMsg);
-				return;
-			}
-			parentLi.removeClass("on");
-			parentLi.children(".turn-off").show();
-			parentLi.children(".turn-on").hide();
-		}else{
-			parentLi.addClass("on");
-			parentLi.children(".turn-on").show();
-			parentLi.children(".turn-off").hide();
-		}
-		saveData();
-	});
 	//微信提醒
 	$("#wxtip>img").click(function(){
 		var parentLi = $(this).parent();
 		if($(this).hasClass("turn-on")){
-			if(!retainOneWay("wxtip")){
+			if(!$("#emailtip").hasClass("on")){
 				EasyAlert.show(keepOneTipWayMsg);
 				return;
 			}
@@ -161,7 +143,7 @@ $(function(){
 	$("#emailtip>img").click(function(){
 		var parentLi = $(this).parent();
 		if($(this).hasClass("turn-on")){
-			if(!retainOneWay("emailtip")){
+			if(!$("#wxtip").hasClass("on")){
 				EasyAlert.show(keepOneTipWayMsg);
 				return;
 			}
@@ -209,23 +191,6 @@ $(function(){
 	//
 });
 //
-function retainOneWay(thisId){
-	var wayIds = ["emailtip","wxtip","apptip"];
-	var offCount = 0;
-	for(var i=0;i<wayIds.length;i++){
-		if(wayIds[i]==thisId){
-			continue;
-		}
-		if(!$("#"+wayIds[i]).hasClass("on")){
-			offCount++;
-		}
-	}
-	if(offCount==2){
-		return false;
-	}
-	return true;
-}
-//
 function numScroller(){
 	$("#scroller").mobiscroll().scroller({
         theme: 'ios', 
@@ -304,36 +269,22 @@ function init(r){
 		}
 	}
 	numScroller();
-	//接收方式：i_mode 1--微信 2--邮件 3--微信+邮件 4--app 5--app+微信 6--app+邮件 7--微信+app+邮件
-	var hasOneOpen = false;
-	if(this.mode == 1 || this.mode == 3 || this.mode == 5 || this.mode == 7){
-		hasOneOpen = true
+	if(this.mode == 3){
 		$("#wxtip").addClass("on");
 		$("#wxtip>img.turn-on").show();
-	}else{
+	}else if(this.mode == 2){
 		$("#wxtip>img.turn-off").show();
-	}
-	if(this.mode == 4 || this.mode == 5 || this.mode == 6 || this.mode == 7){
-		hasOneOpen = true
-		$("#apptip").addClass("on");
-		$("#apptip>img.turn-on").show();
 	}else{
-		$("#apptip>img.turn-off").show();
+		$("#wxtip").addClass("on");
+		$("#wxtip>img.turn-on").show();
 	}
-	if(this.mode == 2 || this.mode == 3 || this.mode == 6 || this.mode == 7){
-		hasOneOpen = true
-		if(email != ""){
-			$(".emailset").show();
-		}
+	if(this.mode != 1 && email != ""){
+		$(".emailset").show();
 		$("#emailtip").addClass("on");
 		$("#emailtip>img.turn-on").show();
 	}else{
 		$("#emailtip>img.turn-off").show();
 	}
-	if(!hasOneOpen){
-		$("#wxtip").addClass("on");
-		$("#wxtip>img.turn-on").show();
-	}
 	$("#email").val(email);
 	$(".emailset>span").css("max-width",$("#emailtip").width()-80).text(email);
 }
@@ -358,17 +309,11 @@ function saveData(){
 		param["rmend"] = def2;
 	}
 	//
-	var modeArray = [];
-	if($("#apptip").hasClass("on")){
-		modeArray.push(4);
-	}
-	if($("#wxtip").hasClass("on")){
-		modeArray.push(1);
+	if($("#wxtip").hasClass("on") && $("#emailtip").hasClass("on")){
+		param["mode"] = 3;
+	}else if($("#emailtip").hasClass("on")){
+		param["mode"] = 2;
 	}
-	if($("#emailtip").hasClass("on")){
-		modeArray.push(2);
-	}
-	param["mode"] = modeArray.join(",");
 	$.post("/wxkeyset/ajaxReq",param,function(r){
 		
 	});
@@ -468,11 +413,6 @@ function docheck(n,th){
 		<div id="pushway">
 			<ul class="navchoose">
 				<li><img src="/images/wxkeyset/pushway.png">推送方式</li>
-				<li id="apptip">
-					APP提醒<font>（需要先下载APP）</font>
-					<img src="/images/wxkeyset/turn-on.png" class="turn-on">
-					<img src="/images/wxkeyset/turn-off.png" class="turn-off">
-				</li>
 				<li id="wxtip">
 					微信提醒
 					<img src="/images/wxkeyset/turn-on.png" class="turn-on">
@@ -483,7 +423,7 @@ function docheck(n,th){
 					<img src="/images/wxkeyset/turn-on.png" class="turn-on">
 					<img src="/images/wxkeyset/turn-off.png" class="turn-off">
 					<div class="emailset">
-						<span>mulangshenjun@vip.qq.com</span>
+						<span></span>
 						<img src="/images/wx/editemail.png">
 					</div>
 				</li>