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

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

@@ -43,7 +43,8 @@ func (this *vipSubscribeStruct) PayCallBack(param *CallBackParam) bool {
 		"order_money":  param.TotalFee,
 	}, "id,filter,order_code,order_status,user_id,vip_starttime,vip_endtime", "")
 	pay_time := qutil.FormatDate(&now, qutil.Date_Full_Layout)
-	if orderdata != nil {
+	if orderdata == nil {
+		log.Println("未找到订单")
 		return false //未找到订单
 	}
 	userid := qutil.ObjToString((*orderdata)["user_id"])

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

@@ -134,7 +134,11 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 		now := time.Now()
 		//数据校验
 		if len(industry) == 1 { //去掉[""]
-			industry = []string{}
+			for _, i := range industry {
+				if i == "" {
+					industry = []string{}
+				}
+			}
 		}
 		if !(pay_source == "Renew" || pay_source == "Upgrade") {
 			return &entity.FuncResult{false, errors.New("未知操作"), nil}
@@ -156,7 +160,7 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 		}
 
 		start := qutil.Int64All((*res)["l_vip_starttime"])
-		end := qutil.Int64All((*res)["l_vip_starttime"])
+		end := qutil.Int64All((*res)["l_vip_endtime"])
 		if start == 0 || end == 0 {
 			return &entity.FuncResult{false, errors.New("数据异常"), nil}
 		}
@@ -164,7 +168,7 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 		endTime := time.Unix(end, 0)
 		orderType := 0
 		if pay_source == "Upgrade" { //计算升级时间
-			if effect == "Now" { //立即生效
+			if effect == "now" { //立即生效
 				orderType = 3
 				startTime = time.Now()
 			} else { //下月生效

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

@@ -92,7 +92,7 @@
             <div class="price">
                 <label></label>
                 <p>
-                    <span class="old_price">&yen;610.80</span>
+                    <!--<span class="old_price">&yen;610.80</span>-->
                     <strong class="finally_price">&yen;0.00</strong>
                 </p> 
             </div>
@@ -511,20 +511,24 @@
 			    	}
 			    	$(".item_industry .label_for").text(buyerclassHtml);
 			    }
-			    if(cycleunit !== "" && cycleunit !== undefined){
-			    	if(cycleunit === 1){
-			    		dateName = cyclecount + " 年";
-			    	}else if(cycleunit === 2){
-			    		dateName = cyclecount + " 个月";
-			    	}
-			    	$(".item_cycle .label_for").text(dateName);
-			    }
+//			    if(cycleunit !== "" && cycleunit !== undefined){
+//			    	if(cycleunit === 1){
+//			    		dateName = cyclecount + " 年";
+//			    	}else if(cycleunit === 2){
+//			    		dateName = cyclecount + " 个月";
+//			    	}
+//			    	$(".item_cycle .label_for").text(dateName);
+//			    }
 			    if(startTime !== "" && endTime !== ""){
 			    	var start = startTime.replace(/-/g, ".");
 			    	var end = endTime.replace(/-/g, ".");
 			    	dateHtml = start + " - " + end;
 			    	$(".item_validity .label_for").text(dateHtml);
 			    }
+			    if(starts !== "" && ends !== ""){
+			    	let end = new Date(ends).toLocaleDateString();
+			    	console.log(end)
+			    }
 			    var val = monthPrice * 6
 			    $(".computed_price").html("￥"+val.toFixed(1))
 			 	//
@@ -638,7 +642,7 @@
 		        })
 		        return
 	    	}
-	        
+	        $(".save_renew").attr("disabled","disabled");
 	    	var param = {
 	    		"area": JSON.stringify(area),
 	    		"industry": buyerclass.toString(),
@@ -653,6 +657,7 @@
                     clearSessionStorage();
                     onBridgeReady(JSON.parse(r.data.res),r.data.code);
                 }
+                $(".save_renew").removeAttr("disabled");
             })
 	    });
 	    

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

@@ -141,7 +141,7 @@
             <div class="price">
                 <label>需补差价：</label>
                 <p>
-                    <span class="old_price">&yen;610.80</span>
+                    <!--<span class="old_price">&yen;610.80</span>-->
                     <strong class="finally_price">&yen;0.00</strong>
                 </p> 
             </div>
@@ -973,6 +973,9 @@
 			if(effect === "notnow"){
 				nowUpgrade = nowUpgrade -1;
 			}
+			if(nowUpgrade == 0){
+				nowUpgrade = 1;
+			}
 			//
 			var nowUpgradeYear = 0;
 			if(nowUpgrade >= 12){
@@ -988,6 +991,8 @@
 			}
 			console.log("year",nowUpgradeYear)
 			console.log("month",nowUpgrade)
+			console.log("oldYearPrice",oldYearPrice)
+			console.log("oldMonthPrice",oldMonthPrice)
 			$DoPost("/subscribepay/renewUpgrade/getRenewUpgradePrice", {"nowUpgradeYear":nowUpgradeYear,"nowUpgrade":nowUpgrade}, function (r) {
 				if(r){
 					oldPrice = r.oldprice;
@@ -995,8 +1000,6 @@
 					oldMonthPrice = r.oldmonthprice;
 				}
 			},false);
-			console.log("oldYearPrice",oldYearPrice)
-			console.log("oldMonthPrice",oldMonthPrice)
 			if(nowUpgradeYear >= 1){
 				let yearprice = getsubVipOrderPrice(areasArr,industrysArr,[nowUpgradeYear,1]);
 				let monthprice = getsubVipOrderPrice(areasArr,industrysArr,[nowUpgrade,2]);
@@ -1042,6 +1045,7 @@
         
         //
         $(".save_upgrade").on("click", function(){
+        	$(".save_upgrade").attr("disabled","disabled")
         	let effective = $("#effect_date_name").text();
         	var effect = "now";
         	if(effective !== "立即生效，需支付当月费用差价"){
@@ -1087,7 +1091,7 @@
                     clearSessionStorage();
                     onBridgeReady(JSON.parse(r.data.res),r.data.code);
                 }
-                $("#payHandle").removeAttr("disabled");
+                $(".save_upgrade").removeAttr("disabled");
             })
 	    });