提交

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

@@ -355,11 +355,11 @@ func needUpgrade(newBuySet, oldBuySet *entity.SubvipBuySet) (bool, *entity.Subvi
 						if c_2_diff+p_Diff > 0 {
 							del_2_flag += -c_2_diff
 							c_2_diff = 0
-							p_Diff -= -c_2_diff;
+							//p_Diff -= -c_2_diff;
 						} else {
 							c_2_diff += p_Diff
 							del_2_flag += p_Diff
-							p_Diff = 0
+							//p_Diff = 0
 						}
 					}
 					if c_1_diff > 0 && c_2_diff < 0 { //转移给一个市使用
@@ -371,22 +371,22 @@ func needUpgrade(newBuySet, oldBuySet *entity.SubvipBuySet) (bool, *entity.Subvi
 						if c_1_diff+p_Diff > 0 {
 							del_1_flag += -c_1_diff
 							c_1_diff = 0
-							p_Diff -= -c_1_diff
+							//p_Diff -= -c_1_diff
 						} else {
 							c_1_diff += p_Diff
 							del_1_flag += p_Diff
-							p_Diff = 0
+							//p_Diff = 0
 						}
 					}
 					if c_2_diff > 0 && c_1_diff < 0 {
 						if c_1_diff+c_2_diff > 0 {
 							del_1_flag += -c_1_diff
 							c_1_diff = 0
-							c_2_diff -= -c_1_diff;
+							//c_2_diff -= -c_1_diff;
 						} else {
 							c_1_diff += c_2_diff
 							del_1_flag += c_2_diff
-							c_2_diff = 0
+							//c_2_diff = 0
 						}
 					}
 				}
@@ -406,7 +406,7 @@ func needUpgrade(newBuySet, oldBuySet *entity.SubvipBuySet) (bool, *entity.Subvi
 					}
 					index_flag++
 				}
-				log.Println("end", UpgradeBuyset.NewCitys)
+				log.Println("end", UpgradeBuyset.NewCitys, c_2_diff, c_1_diff)
 				//增加新增
 				for i := c_2_diff; i > 0; i-- { //添加购买两个市数量
 					UpgradeBuyset.NewCitys = append(UpgradeBuyset.NewCitys, 2)

src/web/staticres/vipsubscribe/js/UpgradePrice.js

@@ -183,7 +183,7 @@ function needUpgrade(newBuyset, oldBuyset) {
                     }
                     index_flag++;
                 }
-                console.log("end", UpgradeBuyset.citys);
+                console.log("end", UpgradeBuyset.citys, c_2_diff, c_1_diff);
                 //console.log("add-end", c_1_diff,c_2_diff)
                 //增加新增
                 for (var i = c_2_diff; i > 0; i--) { //添加购买两个市数量

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

@@ -387,6 +387,7 @@
                     }, false)
                 }
                 if (sessionStorage.getItem("vipSubSelectTime")) {
+                    console.log("ggggg", sessionStorage.getItem("vipSubSelectTime"))
                     this.timeSelect = JSON.parse(sessionStorage.getItem("vipSubSelectTime"));
                 }
 
@@ -453,10 +454,11 @@
         },
         showTime: function () {
             var tmp = this.timeSelect[0];
-            if (this.timeSelect[1] == 1) {
+            if (this.timeSelect[1] === 1) {
                 tmp += "年";
                 $("#yearly").prop('checked', true);
-                $('.year_number:eq(' + (this.timeSelect[0] - 1) + ')').addClass("active");
+                //$('.year_number:eq(' + (this.timeSelect[0] - 1) + ')').trigger("click");
+                $('.year_number:eq(' + (this.timeSelect[0] - 1) + ')').addClass("active")
                 //$(".number_box:eq(1)").addClass("active");
             } else {
                 tmp += "个月";
@@ -466,7 +468,7 @@
                 //if (this.timeSelect[0] >= 10) {
                 //    $('.profit_tips').text("已选择" + this.timeSelect[0] + "个月，建议“按年订阅”").show();
                 //}
-                if (this.timeSelect[0] == 1) {
+                if (this.timeSelect[0] === 1) {
                     $('#number_box_month button:eq(0)').attr("disabled", "disabled");
                 } else {
                     $('#number_box_month button:eq(0)').removeAttr("disabled");
@@ -667,7 +669,8 @@
             // 渲染结果 保留一位小数
             //var result = (Number(id) * 58).toFixed(1);
             //$('.computed_price').html('￥' + result)
-            purchase.timeSelect_tmp = [Number(id), 1]
+            console.log("xxxxxxxxx", Number(id));
+            purchase.timeSelect_tmp = [Number(id), 1];
             purchase.flushPrice(purchase.timeSelect_tmp, 2);
         });
 
@@ -726,24 +729,23 @@
         // 确认订阅周期
         $('#enter_period').on('click', function () {
             var val;
-            $('input[name="time"]').each(function (i, v) {
-                var isChecked = $(v).is(':checked');
-                if ($(v).is(':checked') === true && $('.year_number').hasClass('active')) {
-                    val = $('.active').html();
-                    purchase.timeSelect_tmp = [parseInt(val[0]), 1];
-                    $('#time_cycle').hide(function () {
-                        purchase.timeValue = val;
-                        purchase.flushSelectTime()
-                    });
-                } else if ($(v).is(':checked') === true) {
-                    val = $('.month_number').html();
-                    purchase.timeSelect_tmp = [parseInt(val), 2];
-                    $('#time_cycle').hide(function () {
-                        purchase.timeValue = val + "个月";
-                        purchase.flushSelectTime()
-                    });
-                }
-            });
+            var selectedDOM = $('#time_cycle input[name=time]:checked');
+            if (selectedDOM.val() === 'year') {
+                val = $('#number_box_year .year_number.active').attr('data-id');
+                purchase.timeSelect_tmp = [parseInt(val), 1];
+                $('#time_cycle').hide(function () {
+                    purchase.timeValue = val + "年";
+                    purchase.flushSelectTime()
+                });
+            } else if (selectedDOM.val() === 'month') {
+                val = $('#number_box_month .month_number').text();
+                purchase.timeSelect_tmp = [parseInt(val), 2];
+                $('#time_cycle').hide(function () {
+                    purchase.timeValue = val + "个月";
+                    purchase.flushSelectTime()
+                });
+            }
+
             purchase.timeSelect = purchase.timeSelect_tmp;
             purchase.flushPrice(purchase.timeSelect, 1);
             sessionStorage.setItem("vipSubSelectTime", JSON.stringify(purchase.timeSelect));