Merge branch 'dev2.8.5' of http://192.168.3.207:10080/qmx/jy into dev2.8.5

src/jfw/modules/subscribepay/src/service/afterPay.go

@@ -65,7 +65,11 @@ func (a *AfterPay) SetUserInfo() error {
 	var flag = false
 	if userId != "" {
 		saveData := make(map[string]interface{})
-		if a.GetString("pageType") == "infoType" {
+		//项目匹配
+		if a.GetString("pageType") == "projectMatch" {
+			pmindex, _ := a.GetInteger("pmindex")
+			saveData["o_vipjy.i_projectmatch"] = pmindex
+		} else if a.GetString("pageType") == "infoType" {
 			infoTypeArr := a.GetString("infoTypeArr")
 			if infoTypeArr != "" {
 				saveData["o_vipjy.a_infotype"] = strings.Split(infoTypeArr, ",")
@@ -166,14 +170,15 @@ var oneRemind = int64(1 * 24 * 60 * 60)
 
 //
 func (a *AfterPay) GetUserInfo() error {
+	log.Println(GetDATE(1, 1548864000))
 	defer qutil.Catch()
 	userId, _ := a.GetSession("userId").(string)
 	var userData *map[string]interface{}
 	if userId != "" {
-		go util.MergeKws(userId)
 		userData, _ = util.MQFW.FindById("user", userId, `{"o_vipjy":1,"i_vip_status":1,"l_vip_starttime":1,"l_vip_endtime":1}`)
-		if *userData != nil {
+		if *userData != nil && (qutil.IntAll((*userData)["i_vip_status"]) == 1 || qutil.IntAll((*userData)["i_vip_status"]) == 2) {
 			data := qutil.ObjToMap((*userData)["o_vipjy"])
+			i_vip_status := qutil.IntAll((*userData)["i_vip_status"])
 			//区域
 			_area := qutil.ObjToMap((*data)["o_area"].(interface{}))
 			var area = ""
@@ -208,15 +213,24 @@ func (a *AfterPay) GetUserInfo() error {
 			var _endtime = (*userData)["l_vip_endtime"]
 			(*userData)["l_vip_endtime"] = strings.Replace(qutil.FormatDateWithObj(&_endtime, qutil.Date_Short_Layout), "-", ".", -1)
 			//订阅周期
-			var _cycleunit = qutil.IntAll((*data)["i_cycleunit"])
-			var _cyclecount = qutil.IntAll((*data)["i_cyclecount"])
-			if _cycleunit == 1 {
-				(*data)["cycle"] = strconv.Itoa(_cyclecount) + "年"
-			} else if _cycleunit == 2 {
-				(*data)["cycle"] = strconv.Itoa(_cyclecount) + "月"
+			var cycle = ""
+			if i_vip_status == 1 {
+				cycle = "7天"
 			} else {
-				(*data)["cycle"] = strconv.Itoa(_cyclecount) + "天"
+				var _start = strings.Split(qutil.FormatDateWithObj(&_starttime, qutil.Date_Short_Layout), "-")
+				var _end = strings.Split(qutil.FormatDateWithObj(&_endtime, qutil.Date_Short_Layout), "-")
+				start_y, _ := strconv.Atoi(_start[0])
+				start_m, _ := strconv.Atoi(_start[1])
+				end_y, _ := strconv.Atoi(_end[0])
+				end_m, _ := strconv.Atoi(_end[1])
+				end_m_count := end_y*12 + end_m
+				start_m_count := start_y*12 + start_m
+				cycle = strconv.Itoa((end_m_count-start_m_count)/12) + "年"
+				if (end_m_count-start_m_count)%12 > 0 {
+					cycle += strconv.Itoa((end_m_count-start_m_count)%12) + "月"
+				}
 			}
+			(*data)["cycle"] = cycle
 			//是否到期
 			if qutil.Int64All(_endtime)-time.Now().Unix() < threeRemind && qutil.Int64All(_endtime)-time.Now().Unix() >= twoRemind {
 				(*data)["expRemind"] = "3" //即将到期
@@ -241,9 +255,9 @@ func (a *AfterPay) GetUserInfo() error {
 
 		}
 		log.Println("userId:", userId)
+		a.ServeJson(map[string]interface{}{
+			"userData": userData,
+		})
 	}
-	a.ServeJson(map[string]interface{}{
-		"userData": userData,
-	})
 	return nil
 }

src/jfw/modules/subscribepay/src/util/vrew.go

@@ -262,5 +262,36 @@ func MergeKws(userId string) {
 			}
 		}
 	}
+}
 
+//m 月 超过一年传12+n月 如14 endtime 当前周期结束时间戳 int64
+func GetDATE(val int, m int, endtime int64) (_endtime int64) {
+	if val == 1 {
+		m = m * 12
+	}
+	endFormat := qutil.FormatDateByInt64(&endtime, qutil.Date_Short_Layout)
+	date_y, _ := strconv.Atoi(strings.Split(endFormat, "-")[0])
+	date_m, _ := strconv.Atoi(strings.Split(endFormat, "-")[1])
+	date_d, _ := strconv.Atoi(strings.Split(endFormat, "-")[2])
+	if date_m+m > 12 {
+		date_y = date_y + (date_m+m)/12
+		date_m = date_m + m - 12*(date_m+m)/12
+	} else {
+		date_m = date_m + m
+	}
+	mstr := strconv.Itoa(date_m)
+	if date_m < 10 {
+		mstr = "0" + mstr
+	}
+	_date := strconv.Itoa(date_y) + "-" + mstr + "-01"
+	p, _ := time.ParseInLocation(qutil.Date_Short_Layout, _date, time.Local)
+	date := time.Unix(p.Unix(), 0).AddDate(0, 1, -1)
+	thisD, _ := strconv.Atoi(strings.Split(qutil.FormatDate(&date, qutil.Date_Short_Layout), "-")[2])
+	if thisD < date_d {
+		_date = strconv.Itoa(date_y) + "-" + mstr + "-" + strconv.Itoa(thisD)
+	} else {
+		_date = strconv.Itoa(date_y) + "-" + mstr + "-" + strconv.Itoa(date_d)
+	}
+	lastDate, _ := time.ParseInLocation(qutil.Date_Short_Layout, _date, time.Local)
+	return lastDate.Unix()
 }

src/jfw/public/historypush.go

@@ -314,6 +314,7 @@ func (h *historyPush) getJyPushs(datas []map[string]interface{}) (pushCas []*jy.
 			City:       util.ObjToString(v["city"]),
 			Buyerclass: util.ObjToString(v["buyerclass"]),
 			Keys:       strings.Split(keys, " "),
+			Type:       util.IntAll(v["type"]),
 		})
 		//		if len(pushCas) == 4000 {
 		//			return

src/web/staticres/vipsubscribe/css/vip_index.css

@@ -720,3 +720,9 @@
   border: 1px solid white;
   border-radius: .32rem;
 }
+i.icon-wenhao{
+	font-size: .32rem;
+    color: #2CB7CA;
+    padding-top: .05rem;
+    margin-left: .2rem;
+}

src/web/templates/weixin/vipsubscribe/messageType.html

@@ -162,7 +162,7 @@
             })
             //
             $(".sure").on("click",function(){
-                //获取用户设置信息类型
+                //用户设置信息类型
                 var _infoType =   hasActive();
                 $.post("/subscribepay/afterPay/setUserInfo",{pageType:"infoType",infoTypeArr:_infoType},function(r){
                      if(r.flag){

src/web/templates/weixin/vipsubscribe/vip_index.html

@@ -94,6 +94,7 @@
                         <div class="media_left">
                             <img src="/vipsubscribe/image/frame.png?v={{Msg "seo" "version"}}" alt="">
                             <span>项目匹配</span>
+							<i class="iconfont icon-wenhao "></i>
                         </div>
                         <div class="media_switch">
                             <div class="weui-cell__ft">
@@ -128,15 +129,14 @@
                 <a href="/weixin/pay/renewPayPage" class="renew_btn">续费</a>
             </div>
         </div>
-        <!-- 自动续费关闭提醒 -->
+        <!-- 项目匹配提醒 -->
         <div class="custom-dialog" style="display: none;">
             <div class="weui-mask weui-animate-fade-in"></div>
             <div class="weui-dialog weui-animate-fade-in">
-                <div class="weui-dialog__hd"><strong class="weui-dialog__title">提示信息</strong></div>
-                <div class="weui-dialog__bd">请您确定是否关闭自动续费</div>
-                <div class="weui-dialog__ft"> 
-                    <a href="javascript:;" class="weui-dialog__btn weui-dialog__btn_primary">确定</a> 
-                    <a href="javascript:;" class="weui-dialog__btn weui-dialog__btn_default">取消</a> 
+                <div class="weui-dialog__hd"><strong class="weui-dialog__title" style="font-weight: bold;">项目匹配</strong></div>
+                <div class="weui-dialog__bd" style="line-height: .4rem;padding: .37rem .3rem;font-size: 14px;text-align: left;color: #686868;">开启后，系统将根据你订阅的关键词自动匹配出相关联的项目，并将相关联项目的后续动态在VIP订阅内一并推送。</div>
+                <div class="weui-dialog__ft" style="border-top: 1px solid #eee;padding-bottom: .2rem;padding-top: .2rem;"> 
+                    <a href="javascript:;" class="weui-dialog__btn weui-dialog__btn_primary" style="background: #fff;color: #2CB7CA;text-align: center;margin-right: unset;">我知道了</a>
                 </div>
             </div>
         </div>
@@ -148,90 +148,105 @@
 	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}11"></script>
     <script>
 		initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
+		var checkedflag = true;
         $(function () {
+			//
+			let isChecked = false; //默认是否开通自动续费
             //获取用户信息
-           $.post("/subscribepay/afterPay/getUserInfo",{},function(r){
-                if(r.userData){
-                   var _userData = r.userData;
-                   var _vipData = _userData["o_vipjy"];
-                   var _vipstatus = _userData["i_vip_status"];
-                   // console.log(_userData)
-                   if(_vipstatus&&_vipstatus=="1"){
-                        $('.free7days_pic').append("<style>.free7days_pic::after{display:inline-block}</style>");
-                   }else{
-                        $('.free7days_pic').append("<style>.free7days_pic::after{display:none}</style>");
+			$.ajax({  
+             	type: "POST",  
+             	url: "/subscribepay/afterPay/getUserInfo",   
+             	data: {},  
+             	dataType: "json",  
+				async:false,
+             	success: function(r){
+                	if(r.userData){
+                   		var _userData = r.userData;
+                   		var _vipData = _userData["o_vipjy"];
+                   		var _vipstatus = _userData["i_vip_status"];
+                   		// console.log(_userData)
+	                   if(_vipstatus&&_vipstatus=="1"){
+	                        $('.free7days_pic').append("<style>.free7days_pic::after{display:inline-block}</style>");
+	                   }else{
+	                        $('.free7days_pic').append("<style>.free7days_pic::after{display:none}</style>");
+	                   }
+	                   if(_vipData){
+	                   		if(Number(_vipData["i_projectmatch"])==1){
+								isChecked = true;
+							}
+	                        $("._area").text(_vipData["o_area"]);
+	                        $("._buyerClass").text(_vipData["a_buyerclass"]);
+	                        $("._cycleCount").text(_vipData["cycle"]);
+	                        $("._activeDate").text(_userData["l_vip_starttime"]+" - "+_userData["l_vip_endtime"]);
+	                        if(parseInt(_vipData["expRemind"])>0){
+	                            $(".to_expired").show();
+	                            $(".renew_day").text(parseInt(_vipData["expRemind"]))
+	                            $(".renew_toast").show();
+	                        }else{
+	                            $(".to_expired").hide();
+	                        }
+	                        if(_vipData["a_infotype"]==""){
+	                            _vipData["a_infotype"]="全部类型"
+	                        }
+	                        $("#infoType").text(_vipData["a_infotype"]);
+	                        var pushText = "实时推送"
+	                        if(_vipData["i_ratemode"]=="4"){
+	                            pushText = "每月推送"
+	                        }else if(_vipData["i_ratemode"]=="3"){
+	                            pushText = "每周推送"
+	                        }else if(_vipData["i_ratemode"]=="2"){
+	                            pushText = "每日推送"
+	                        }
+	                        $("#pushSet").text(pushText);
+	                        var a_items = _vipData["a_items"]
+	                        var s_items = ""
+	                        if (a_items!=undefined &&a_items.length>0){
+	                            for (var i = 0; a_items.length - 1 >= i ; i++) {
+	                                if(s_items!=""){
+	                                    s_items += "、"
+	                                }
+	                                s_items  += a_items[i]["s_item"]
+	                            }
+	                        }
+	                        $("#keywords").text(s_items);
                    }
-                   if(_vipData){
-                        $("._area").text(_vipData["o_area"]);
-                        $("._buyerClass").text(_vipData["a_buyerclass"]);
-                        $("._cycleCount").text(_vipData["cycle"]);
-                        $("._activeDate").text(_userData["l_vip_starttime"]+" - "+_userData["l_vip_endtime"]);
-                        if(parseInt(_vipData["expRemind"])>0){
-                            $(".to_expired").show();
-                            $(".renew_day").text(parseInt(_vipData["expRemind"]))
-                            $(".renew_toast").show();
-                        }else{
-                            $(".to_expired").hide();
-                        }
-                        if(_vipData["a_infotype"]==""){
-                            _vipData["a_infotype"]="全部类型"
-                        }
-                        $("#infoType").text(_vipData["a_infotype"]);
-                        var pushText = "实时推送"
-                        if(_vipData["i_ratemode"]=="4"){
-                            pushText = "每月推送"
-                        }else if(_vipData["i_ratemode"]=="3"){
-                            pushText = "每周推送"
-                        }else if(_vipData["i_ratemode"]=="2"){
-                            pushText = "每日推送"
-                        }
-                        $("#pushSet").text(pushText);
-                        var a_items = _vipData["a_items"]
-                        var s_items = ""
-                        if (a_items!=undefined &&a_items.length>0){
-                            for (var i = 0; a_items.length - 1 >= i ; i++) {
-                                if(s_items!=""){
-                                    s_items += "、"
-                                }
-                                s_items  += a_items[i]["s_item"]
-                            }
-                        }
-                        $("#keywords").text(s_items);
-                   }
-                }
+                	}
+				}
            })
-            let isChecked = true; //默认是否开通自动续费
+            //
+			$("i.icon-wenhao").on("click",function(){
+                $('.custom-dialog').show()
+                $('.weui-dialog__btn_primary').on('click', function () {
+                    $('.custom-dialog').hide()
+                })
+			})
             if (isChecked === true) {
                 $('.switch').addClass('checked')
-                $('.switch').removeAttr('disabled','disabled')
             } else {
                 $('.switch').removeClass('checked')
-                $('.switch').attr('disabled','disabled')
             }
-            $('.switch:not(:disabled)').on('click', function (e) {
-                
+            $('.switch').on('click', function (e) {
                 console.log($(this).hasClass('checked'))
                 let that = this;
                 let hasChecked = $(this).hasClass('checked');
                 if (hasChecked == false) {
                     isChecked = true;
                     $(that).addClass('checked');
-                } else {
-                    $('.custom-dialog').show()
-                    $('.weui-dialog__btn_primary').on('click', function () {
-                        isChecked = false;
-                        $(that).removeClass('checked');
-                        $('.custom-dialog').hide()
-                        // $('#auto_renew').hide(500);
-                        weui.toast('自动续费已关闭',{
-                            duration: 3000,
-                            className: 'custom-toast',
-                        })
-                        $('.switch').attr('disabled','disabled')
+                    weui.toast('项目匹配已开启',{
+                        duration: 3000,
+                        className: 'custom-toast',
                     })
-                    $('.weui-dialog__btn_default').on('click',function() {
-                        $('.custom-dialog').hide()
+					setprojectmatch(1);
+                } else {
+                    isChecked = false;
+                    $(that).removeClass('checked');
+                    $('.custom-dialog').hide()
+                    // $('#auto_renew').hide(500);
+                    weui.toast('项目匹配已关闭',{
+                        duration: 3000,
+                        className: 'custom-toast',
                     })
+					setprojectmatch(0);
                 }
             })
             
@@ -239,6 +254,18 @@
                 $('.renew_toast').hide()
             })
         })
+		//
+		function setprojectmatch(index){
+			if(checkedflag){
+				checkedflag = false;
+				$.post("/subscribepay/afterPay/setUserInfo",{pageType:"projectMatch",pmindex:index},function(r){
+	                if(r.flag){
+						checkedflag=true;
+	                   console.log("保存成功")
+	               }
+	            })
+			}
+		}
     </script>
 	{{include "/common/baiducc.html"}}
 </body>