Merge branch 'dev2.8.5' of ssh://192.168.3.207:10022/qmx/jy into dev2.8.5

src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -144,7 +144,7 @@ func (this *vipSubscribeStruct) RenewSubVip(userId, endtime string) bool {
 		log.Println("%s格式化日期出错%s\n", userId, endtime)
 		return false
 	}
-	return util.MQFW.UpdateById("user", userId, bson.M{"$set": bson.M{"l_vip_endtime": prepayTime.Unix()}})
+	return util.MQFW.UpdateById("user", userId, bson.M{"$set": bson.M{"l_vip_endtime": prepayTime.Unix(), "i_vip_expire_tip": 0}})
 }
 
 //升级
@@ -168,11 +168,13 @@ func (this *vipSubscribeStruct) UpgradeSubVip(userId string, vmsg VipSimpleMsg,
 				"o_vipjy.o_buyset":     buyset,
 				"l_vip_endtime":        endTime.Unix(),
 				"i_vip_status":         2,
+				"i_vip_expire_tip":     0,
 			}})
 	} else {
 		if !util.MQFW.UpdateById("user", userId,
 			bson.M{"$set": bson.M{
-				"l_vip_endtime": endTime.Unix(),
+				"l_vip_endtime":    endTime.Unix(),
+				"i_vip_expire_tip": 0,
 			}}) {
 			log.Printf("%s更新结束%d日期出错\n", userId, endTime.Unix())
 			return false

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

@@ -118,16 +118,14 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 			if effect == "now" { //立即生效
 				orderType = 3
 				//				startTime = time.Now()
-				startTime = time.Unix(start, 0)
 			} else { //下月生效
 				orderType = 4
 				//				startTime = time.Date(time.Now().Year(), time.Now().Month()+1, 1, 0, 0, 0, 0, time.Local)
-				startTime = time.Unix(start, 0)
 			}
 
 		} else { //续费时间
 			orderType = 2 //续费操作
-			startTime = endTime
+			//			startTime = endTime
 		}
 		//		if date_unit == 1 { ///延长时间
 		//			endTime = endTime.AddDate(date_count, 0, 0)

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

@@ -291,7 +291,8 @@
                 
                 // 显示隐藏优惠tips
                 if (selectedArr.length >= 4 && !vipSubisTrial) {
-                    $('.tips_btn .tips_d_text').slideDown()
+                	$('.tips_btn .tips_d_text').text("已选择"+selectedArr.length+"个行业，建议购买“全部行业”更划算哦~");
+                    $('.tips_btn .tips_d_text').slideDown();
                 } else {
                     $('.tips_btn .tips_d_text').slideUp()
                 }

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

@@ -540,7 +540,8 @@
 //			    	}
 //			    	$(".item_cycle .label_for").text(dateName);
 //			    }
-			    if(startTime !== "" && endTime !== ""){
+			    if(startTime !== "" && endTime !== "" && startTime !== undefined && endTime !== undefined){
+			    	console.log(startTime)
 			    	var start = startTime.replace(/-/g, ".");
 			    	var end = endTime.replace(/-/g, ".");
 			    	dateHtml = start + " - " + end;