wangkaiyue 5 年之前
父节点
当前提交
7214e9cec6

+ 1 - 2
src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -132,8 +132,7 @@ func (this *vipSubscribeStruct) PayCallBack(param *CallBackParam) bool {
 	} else if vmsg.OrderType == 3 { //立即升级
 	} else if vmsg.OrderType == 3 { //立即升级
 		flag = JyVipSubStruct.UpgradeSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_endtime"]))
 		flag = JyVipSubStruct.UpgradeSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_endtime"]))
 	} else if vmsg.OrderType == 5 { //续费(可升降级)
 	} else if vmsg.OrderType == 5 { //续费(可升降级)
-		flag = JyVipSubStruct.RenewSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_endtime"]), qutil.ObjToString((*orderdata)["vip_endtime"]))
-		//flag = JyVipSubStruct.UpgradeSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_starttime"]), qutil.ObjToString((*orderdata)["vip_endtime"]), false)
+		flag = JyVipSubStruct.RenewSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_starttime"]), qutil.ObjToString((*orderdata)["vip_endtime"]))
 	}
 	}
 	//else if vmsg.OrderType == 2 { //续费
 	//else if vmsg.OrderType == 2 { //续费
 	//	flag = JyVipSubStruct.RenewSubVip(userid, qutil.ObjToString((*orderdata)["vip_endtime"]))
 	//	flag = JyVipSubStruct.RenewSubVip(userid, qutil.ObjToString((*orderdata)["vip_endtime"]))

+ 13 - 5
src/jfw/modules/subscribepay/src/service/vipSubscribeChange.go

@@ -74,7 +74,6 @@ func (this *SubscribeChange) SaveChange() {
 		if len(industry) == 1 && industry[0] == "" { //去掉[""]
 		if len(industry) == 1 && industry[0] == "" { //去掉[""]
 			industry = []string{}
 			industry = []string{}
 		}
 		}
-		log.Println("req", area, industry)
 		rData, oldBuyset, isVip := entity.JyVipSubStruct.GetVipDetail(userId)
 		rData, oldBuyset, isVip := entity.JyVipSubStruct.GetVipDetail(userId)
 		if !isVip {
 		if !isVip {
 			return &entity.FuncResult{false, errors.New("请求异常,非vip状态"), nil}
 			return &entity.FuncResult{false, errors.New("请求异常,非vip状态"), nil}
@@ -126,13 +125,15 @@ func (this *SubscribeChange) SaveChange() {
 
 
 		var startTime, endTime time.Time
 		var startTime, endTime time.Time
 		now := time.Now()
 		now := time.Now()
-
-		if !needUpgrade && needRenew { //只续费,不升级
+		if qutil.IntAll((*rData)["i_vip_status"]) == 1 { //试用用户购买
+			filter.OrderType = 1
+			filter.NewBuyset = newBuyset
+			final_price = entity.JyVipSubStruct.GetSubVipPriceByBuySet(newBuyset.NewCitys, newBuyset.AreaCount, newBuyset.BuyerclassCount, date_count, date_unit, true)
+		} else if !needUpgrade && needRenew { //只续费,不升级
 			final_price = entity.JyVipSubStruct.GetSubVipPriceByBuySet(oldBuyset.NewCitys, oldBuyset.AreaCount, oldBuyset.BuyerclassCount, date_count, date_unit, true)
 			final_price = entity.JyVipSubStruct.GetSubVipPriceByBuySet(oldBuyset.NewCitys, oldBuyset.AreaCount, oldBuyset.BuyerclassCount, date_count, date_unit, true)
 			filter.OrderType = 5
 			filter.OrderType = 5
 			filter.NewBuyset = oldBuyset
 			filter.NewBuyset = oldBuyset
 			log.Println("续费", final_price)
 			log.Println("续费", final_price)
-
 			//生效时间
 			//生效时间
 			startTime = time.Unix(endUnix, 0)
 			startTime = time.Unix(endUnix, 0)
 			endTime = util.GetDATE(filter.Cycleunit, filter.Cyclecount, endUnix)
 			endTime = util.GetDATE(filter.Cycleunit, filter.Cyclecount, endUnix)
@@ -162,7 +163,9 @@ func (this *SubscribeChange) SaveChange() {
 		}
 		}
 		log.Printf("是否需要升级%v,是否需要续费%v\n", needUpgrade, needRenew)
 		log.Printf("是否需要升级%v,是否需要续费%v\n", needUpgrade, needRenew)
 		log.Printf("price: %d \n req_price:%d filter:%+v\n", final_price, req_price, filter)
 		log.Printf("price: %d \n req_price:%d filter:%+v\n", final_price, req_price, filter)
+
 		if (req_price != final_price) {
 		if (req_price != final_price) {
+			log.Println(userId+" 前台计算", req_price, "后台计算", final_price)
 			return &entity.FuncResult{false, errors.New("金额校验异常"), nil}
 			return &entity.FuncResult{false, errors.New("金额校验异常"), nil}
 		}
 		}
 
 
@@ -231,7 +234,12 @@ func (this *SubscribeChange) SaveChange() {
 			"filter":         string(filterStr), //筛选
 			"filter":         string(filterStr), //筛选
 			"vip_endtime":    qutil.FormatDate(&endTime, qutil.Date_Full_Layout),
 			"vip_endtime":    qutil.FormatDate(&endTime, qutil.Date_Full_Layout),
 			"vip_starttime":  qutil.FormatDate(&startTime, qutil.Date_Full_Layout),
 			"vip_starttime":  qutil.FormatDate(&startTime, qutil.Date_Full_Layout),
-			"vip_type":       qutil.If(filter.OrderType == 5, 1, 2), //1:续费 2:升级
+			//"vip_type":       qutil.If(filter.OrderType == 5, 1, 2), //1:续费 2:升级
+		}
+		if filter.OrderType == 5 {
+			insertMap["vip_type"] = 1
+		} else if filter.OrderType == 3 {
+			insertMap["vip_type"] = 2
 		}
 		}
 		orderid := util.Mysql.Insert("dataexport_order", insertMap)
 		orderid := util.Mysql.Insert("dataexport_order", insertMap)
 		if orderid == -1 {
 		if orderid == -1 {

+ 132 - 0
src/web/staticres/vipsubscribe/css/vip_index_new.css

@@ -334,6 +334,10 @@
   background-color: #fff;
   background-color: #fff;
 }
 }
 
 
+.billing-list-container .weui-half-screen-dialog .weui-half-screen-dialog__bd {
+  height: 100%;
+}
+
 .billing-list-container .weui-half-screen-dialog .weui-half-screen-dialog__hd {
 .billing-list-container .weui-half-screen-dialog .weui-half-screen-dialog__hd {
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
@@ -566,6 +570,134 @@
   color: #2cb7ca;
   color: #2cb7ca;
 }
 }
 
 
+.valuation_list {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+.valuation_list .va-list-container {
+  flex: 1;
+  overflow-y: scroll;
+}
+
+.valuation_list .va-total-container {
+  height: 0.94rem;
+  background-color: #fff;
+}
+
+.va-list-container .text-title {
+  color: #1d1d1d;
+  font-size: 0.32rem;
+}
+
+.va-list-container .list-item {
+  margin-bottom: 0.2rem;
+  font-size: 0.26rem;
+  color: #686868;
+  background-color: #fff;
+}
+
+.va-list-container .list-item .item-top {
+  padding: 0 0.3rem;
+}
+
+.va-list-container .list-item .item-header {
+  display: flex;
+  align-items: center;
+  height: 0.79rem;
+  border-bottom: 1px solid #e0e0e0;
+}
+
+.va-list-container .list-item .item-header .header-content {
+  flex: 1;
+}
+
+.va-list-container .list-item .item-body {
+  position: relative;
+  padding: 0.14rem 0;
+}
+
+.va-list-container .list-item .item-body.vp-oneline {
+  padding: 0.38rem 0;
+}
+
+.va-list-container .list-item .item-body.vp-oneline .b-item .body-area-sub,
+.va-list-container .list-item .item-body.vp-oneline .b-item .body-industry-sub {
+  margin-top: 0.1rem;
+}
+
+.va-list-container .list-item .item-body .b-item {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+  padding: 0.1rem 0;
+}
+
+.va-list-container .list-item .item-body .body-area-sub,
+.va-list-container .list-item .item-body .body-industry-sub {
+  margin-top: 0.08rem;
+}
+
+.va-list-container .list-item .item-body .vp-type {
+  position: absolute;
+  top: 50%;
+  right: 0;
+  width: 1.4rem;
+  height: 1.4rem;
+  background-color: transparent;
+  transform: translateY(-50%);
+  opacity: 0.5;
+  z-index: 1;
+}
+
+.va-list-container .list-item .item-body .vp-type .vp-type-text {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+  color: #e6bd90;
+  font-size: 0.38rem;
+  border: 1px solid #e6bd90;
+  border-radius: 50%;
+  transform: rotate(-30deg);
+}
+
+.va-list-container .list-item .item-footer {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 0.3rem;
+  height: 0.84rem;
+  border-top: 1px solid #e0e0e0;
+}
+
+.va-total-container {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 0.3rem;
+  font-size: 0.26rem;
+  color: #686868;
+}
+
+.va-total-container .total-price {
+  font-weight: 700;
+  font-size: 0.32rem;
+  color: #fe737a;
+}
+
+.valuation_list {
+  max-height: 9.23rem;
+  background-color: #f5f4f9;
+}
+
+.va-total-container {
+  height: .94rem;
+  border-top: 1px solid #e0e0e0;
+}
+
 .jy-toast .weui-toast {
 .jy-toast .weui-toast {
   font-size: 0.3rem;
   font-size: 0.3rem;
   padding: 0.26rem 0.5rem;
   padding: 0.26rem 0.5rem;

+ 42 - 10
src/web/staticres/vipsubscribe/js/UpgradePrice.js

@@ -195,32 +195,48 @@ function needUpgrade(newBuyset, oldBuyset) {
 
 
 //获取支付价格
 //获取支付价格
 //-1 不用升级 -2 不能升级
 //-1 不用升级 -2 不能升级
-function getUpgradeFinalStatus(newBuyset, oldBuyset, t, endUnix, renewList) {
+function getUpgradeFinalStatus(newBuyset, oldBuyset, t, endUnix, renewList, isTrail) {
+    if (isTrail) {
+        var trailPay = getsubVipOrderPriceBybuyset(newBuyset, t);//试用用户购买
+        return [trailPay, true, true, []]
+    }
     var Upgradestatus = needUpgrade(newBuyset, oldBuyset);
     var Upgradestatus = needUpgrade(newBuyset, oldBuyset);
     var Upgrade = Upgradestatus[0];
     var Upgrade = Upgradestatus[0];
     console.log("Upgrade", Upgrade, Upgradestatus);
     console.log("Upgrade", Upgrade, Upgradestatus);
     if (Upgrade === -1) {
     if (Upgrade === -1) {
         if (t.length === 0) {
         if (t.length === 0) {
-            return [-1, false, false]   //订阅修改
+            return [-1, false, false, []]   //订阅修改
         }
         }
         var renewPrice = getsubVipOrderPriceBybuyset(oldBuyset, t);//续费
         var renewPrice = getsubVipOrderPriceBybuyset(oldBuyset, t);//续费
-        return [renewPrice, false, false]
+        return [renewPrice, false, false, []]
     }
     }
     var final_price = 0;
     var final_price = 0;
     var nowEndTime = endUnix;
     var nowEndTime = endUnix;
+
+    var subtotail = [];
     //续费升级价格
     //续费升级价格
     if (renewList) {
     if (renewList) {
         for (var i = renewList.length - 1; i >= 0; i--) {
         for (var i = renewList.length - 1; i >= 0; i--) {
             var thisBuyset = renewList[i].o_buyset;
             var thisBuyset = renewList[i].o_buyset;
             var thisStartTime = renewList[i].l_validtime;
             var thisStartTime = renewList[i].l_validtime;
-            var this_price = getSubPrice({
+            var old = {
                 "areacount": thisBuyset.areacount,  //省份数量
                 "areacount": thisBuyset.areacount,  //省份数量
                 "buyerclasscount": thisBuyset.buyerclasscount,
                 "buyerclasscount": thisBuyset.buyerclasscount,
                 "citys": thisBuyset.newcitys //购买省份中城市数量
                 "citys": thisBuyset.newcitys //购买省份中城市数量
-            }, Upgrade, thisStartTime, nowEndTime);
+            }
+            var this_price = getSubPrice(old, Upgrade, thisStartTime, nowEndTime);
             if (this_price < 0) {
             if (this_price < 0) {
-                return [-2, false, false]
+                return [-2, false, false, []]
             }
             }
+            //清单数组
+            subtotail.push({
+                "buyset": old,
+                "startTime": thisStartTime,
+                "endTime": nowEndTime,
+                "price": this_price,
+                "type": 1
+            });
+
             final_price += this_price;
             final_price += this_price;
             nowEndTime = thisStartTime;
             nowEndTime = thisStartTime;
         }
         }
@@ -228,19 +244,35 @@ function getUpgradeFinalStatus(newBuyset, oldBuyset, t, endUnix, renewList) {
     //现在使用升级价格
     //现在使用升级价格
     var now_price = getSubPrice(oldBuyset, Upgrade, new Date().getTime() / 1000, nowEndTime);
     var now_price = getSubPrice(oldBuyset, Upgrade, new Date().getTime() / 1000, nowEndTime);
     if (now_price < 0) {
     if (now_price < 0) {
-        return [-2, false, false]
+        return [-2, false, false, []]
     }
     }
+    //清单数组
+    subtotail.push({
+        "buyset": oldBuyset,
+        "startTime": endUnix,
+        "endTime": nowEndTime,
+        "price": now_price,
+        "type": 0
+    });
     final_price += now_price;
     final_price += now_price;
     //新增续费升级价格
     //新增续费升级价格
     if (t.length != 0) {
     if (t.length != 0) {
-        var this_price = getsubVipOrderPriceBybuyset(oldBuyset, t);
+        var this_price = getsubVipOrderPriceBybuyset(newBuyset, t);
         if (this_price < 0) {
         if (this_price < 0) {
-            return [-2, false, false]
+            return [-2, false, false, []]
         }
         }
         console.log(Upgrade, t, "额外升级费用", this_price);
         console.log(Upgrade, t, "额外升级费用", this_price);
         final_price += this_price;
         final_price += this_price;
+        //清单数组
+        subtotail.push({
+            "buyset": newBuyset,
+            "startTime": endUnix,//xxx
+            "endTime": getVipEndDate(t[1], t[0], endUnix),//xxx
+            "price": this_price,
+            "type": 2
+        });
     }
     }
-    return [final_price, Upgradestatus[1], Upgradestatus[2]]
+    return [final_price, Upgradestatus[1], Upgradestatus[2], subtotail]
 }
 }
 
 
 // var buyset = {
 // var buyset = {

+ 114 - 19
src/web/staticres/vipsubscribe/js/vip_index_new.js

@@ -58,6 +58,67 @@ $(function () {
         }
         }
     }
     }
 
 
+    function flushSubtotal(list) {
+        var returnHtml = "";
+        for (var i = 0; i < list.length; i++) {
+            var showTime = new Date(list[i].startTime * 1000).pattern('yyyy年MM月dd日') + "-" + new Date(list[i].endTime * 1000).pattern('yyyy年MM月dd日');
+            var typeName = "";
+            if (list[i].type === 1) {
+                typeName = "续费"
+            } else if (list[i].type === 0) {
+                typeName = "升级"
+            }
+            var showArea = "";
+            if (list[i].buyset.areacount === -1) {
+                showArea = "全国"
+            } else {
+                showArea = list[i].buyset.areacount + "个省";
+                if (list[i].buyset.citys.length > 0) {
+                    var cityCount = 0;
+                    for (var j = 0; j < list[i].buyset.citys.length; j++) {
+                        cityCount += list[i].buyset.citys[j];
+                    }
+                    showArea += "、" + 3 + "个市(分布在" + list[i].buyset.citys.length + "个省内)";
+                }
+            }
+            var industryShow = "";
+            if (list[i].buyset.buyerclasscount === -1) {
+                industryShow = "全行业"
+            } else {
+                industryShow = list[i].buyset.buyerclasscount + "个行业";
+            }
+            returnHtml += "<li class=\"list-item\">"
+                + "<div class=\"item-top\">"
+                + "<div class=\"item-header\">"
+                + "<span class=\"header-label\">有效日期:</span>"
+                + "<span class=\"header-content ellipsis\">" + showTime + "</span>"
+                + "</div>"
+                + "<div class=\"item-body\">"
+                + "<div class=\"b-item body-area\">"
+                + "<div class=\"body-area-title text-title\">区域</div>"
+                + "<div class=\"body-area-sub\">" + showArea + "</div>"
+                + "</div>"
+                + "<div class=\"b-item body-industry\">"
+                + "<div class=\"body-industry-title text-title\">采购单位行业</div>"
+                + "<div class=\"body-industry-sub\">" + industryShow + "</div>"
+                + "</div>";
+            if (typeName != "") {
+                returnHtml += "<div class=\"vp-type\">"
+                    + "<div class=\"vp-type-text\">" + typeName + "</div>"
+                    + "</div>"
+            }
+
+            returnHtml += "</div>"
+                + "</div>"
+                + "<div class=\"item-footer\">"
+                + "<span class=\"footer-label\">小计:</span>"
+                + "<span class=\"footer-content text-title\">¥" + formatMoney(list[i].price) + "</span>"
+                + "</div>"
+                + "</li>"
+        }
+        $(".list-content").html(returnHtml);
+    }
+
     function getDataWitXHR() {
     function getDataWitXHR() {
         $DoPost('/subscribepay/vipsubscribe/getSubBuyMsg', {}, function (res) {
         $DoPost('/subscribepay/vipsubscribe/getSubBuyMsg', {}, function (res) {
             if (!res.success) return;
             if (!res.success) return;
@@ -456,34 +517,41 @@ $(function () {
 
 
     function init(state) {
     function init(state) {
         // init 已选择的区域和行业
         // init 已选择的区域和行业
-        var selectedAreaAndInd = getCount(state.area, state.industry)
-        setSelectedAreaAndInd(selectedAreaAndInd)
+        var selectedAreaAndInd = getCount(state.area, state.industry);
+        setSelectedAreaAndInd(selectedAreaAndInd);
         // 初始化,已购买的城市和行业
         // 初始化,已购买的城市和行业
-        setBuyAreaAndInd(state.buyset)
+        setBuyAreaAndInd(state.buyset);
 
 
-        // 初始化订阅周期
-        var dStart = new Date(state.startTime * 1000).pattern('yyyy年MM月dd日')
-        var dEnd
+        var dEnd;
         var change = sessionStorage.getItem("vip_change_time");
         var change = sessionStorage.getItem("vip_change_time");
+        var endflag = state.endTime;
+        var stratFlag = state.startTime;
+        if (state.isTrial) {
+            // 初始化订阅周期
+            endflag = new Date().getTime() / 1000;
+            stratFlag = new Date().getTime() / 1000;
+        }
         if (change) {
         if (change) {
-            var afterEndTime
+            var afterEndTime;
+            if (state.isTrial) $(".body-item.cycle .tip").text(change);
+
+            $(".body-item.cycle .tip").show();
             if (change.indexOf("月") > -1) {
             if (change.indexOf("月") > -1) {
                 var monthNum = parseInt(change.replace("个月", ""));
                 var monthNum = parseInt(change.replace("个月", ""));
-                afterEndTime = getVipEndDate(2, monthNum, state.endTime)
+                afterEndTime = getVipEndDate(2, monthNum, endflag);
                 changeTime = [monthNum, 2]
                 changeTime = [monthNum, 2]
             } else {
             } else {
                 var yearNum = parseInt(change.replace("年", ""));
                 var yearNum = parseInt(change.replace("年", ""));
-                afterEndTime = getVipEndDate(1, yearNum, state.endTime)
+                afterEndTime = getVipEndDate(1, yearNum, endflag);
                 changeTime = [yearNum, 1]
                 changeTime = [yearNum, 1]
             }
             }
             dEnd = new Date(afterEndTime * 1000).pattern('yyyy年MM月dd日');
             dEnd = new Date(afterEndTime * 1000).pattern('yyyy年MM月dd日');
-            $(".body-item.cycle .tip").show();
         } else {
         } else {
-            dEnd = new Date(state.endTime * 1000).pattern('yyyy年MM月dd日')
+            dEnd = new Date(endflag * 1000).pattern('yyyy年MM月dd日')
         }
         }
-
-        var sDuration = dStart + ' - ' + dEnd
-        $('.body-item.cycle .buy-cycle').text(sDuration)
+        var dStart = new Date(stratFlag * 1000).pattern('yyyy年MM月dd日');
+        var sDuration = dStart + ' - ' + dEnd;
+        $('.body-item.cycle .buy-cycle').text(sDuration);
 
 
         // 初始化关键词
         // 初始化关键词
         if (state.items.lenght === 0) {
         if (state.items.lenght === 0) {
@@ -518,8 +586,15 @@ $(function () {
         } else {
         } else {
             $('.switch').removeClass('checked')
             $('.switch').removeClass('checked')
         }
         }
+
+        //试用不展示续费
+        if (!state.isTrial) {
+            $(".vip-header").show();
+        }
+
     }
     }
 
 
+
     // 给订阅周期栏目绑定点击事件(订阅周期选择框显示与隐藏等各种操作)
     // 给订阅周期栏目绑定点击事件(订阅周期选择框显示与隐藏等各种操作)
     //initCycleSelector()
     //initCycleSelector()
 
 
@@ -541,10 +616,13 @@ $(function () {
             "areacount": reqData.buyset.areacount,
             "areacount": reqData.buyset.areacount,
             "buyerclasscount": reqData.buyset.buyerclasscount,
             "buyerclasscount": reqData.buyset.buyerclasscount,
             "citys": reqData.buyset.newcitys
             "citys": reqData.buyset.newcitys
-        }, changeTime, reqData.endTime, reqData.renewList);
+        }, changeTime, reqData.endTime, reqData.renewList, reqData.isTrial);
 
 
         if (status[0] === -2) {
         if (status[0] === -2) {
-            alert("出错");
+            weui.toast('订单冲突', {
+                duration: 3000,
+                className: 'jy-toast',
+            });
             return
             return
         }
         }
 
 
@@ -554,7 +632,7 @@ $(function () {
 
 
             $('.vip-footer .button-l.reset').on("click", function () {
             $('.vip-footer .button-l.reset').on("click", function () {
                 cancelTip(1);
                 cancelTip(1);
-            })
+            });
             return
             return
         }
         }
 
 
@@ -562,22 +640,39 @@ $(function () {
             //需要付钱
             //需要付钱
             $(".vip-footer.upgrade").show();
             $(".vip-footer.upgrade").show();
             //价格展示
             //价格展示
-            $(".vip-footer.upgrade .billing-price").text("¥" + formatMoney(status[0]))
-            submitPrice = status[0] * 100
+            $(".vip-footer.upgrade .billing-price").text("¥" + formatMoney(status[0]));
+            submitPrice = status[0] * 10000 / 100
         }
         }
         //区域需要升级
         //区域需要升级
         if (status[1]) {
         if (status[1]) {
+            if (reqData.isTrial) {
+                $(".body-item.area .tip").text("需购买");
+            }
             $(".body-item.area .tip-need-upgrade").show();
             $(".body-item.area .tip-need-upgrade").show();
         }
         }
         //行业需要升级
         //行业需要升级
         if (status[2]) {
         if (status[2]) {
+            if (reqData.isTrial) {
+                $(".body-item.industry .tip").text("需购买");
+            }
             $(".body-item.industry .tip-need-upgrade").show()
             $(".body-item.industry .tip-need-upgrade").show()
         }
         }
 
 
         if (!status[1] && !status[2]) {
         if (!status[1] && !status[2]) {
             $(".vip-footer.upgrade .confirm").text("立即续费");
             $(".vip-footer.upgrade .confirm").text("立即续费");
+        } else {
+            //升级展示计价清单
+            if (!reqData.isTrial) {
+                $(".preview-label").text("需补差价:");
+                $(".billing-list-btn").text("计费清单");
+                $(".va-total-container .total-price").text("¥" + formatMoney(status[0]));
+                flushSubtotal(status[3]);
+                console.log("subtotail", status[3])
+            }
         }
         }
 
 
+        if (reqData.isTrial) $(".vip-footer.upgrade .confirm").text("立即购买");
+
         $('.vip-footer .button-l.reset').on("click", function () {
         $('.vip-footer .button-l.reset').on("click", function () {
             cancelTip(2);
             cancelTip(2);
         })
         })

+ 108 - 53
src/web/templates/weixin/vipsubscribe/vip_index_new.html

@@ -18,7 +18,7 @@
 
 
 <body class="no-touch">
 <body class="no-touch">
 <div class="vip-upgrade">
 <div class="vip-upgrade">
-    <div class="vip-header">
+    <div class="vip-header" style="display: none">
         <!-- <div class="header-renew">
         <!-- <div class="header-renew">
             <div class="renew-l">
             <div class="renew-l">
                 <div class="vip-logo"></div>
                 <div class="vip-logo"></div>
@@ -168,12 +168,12 @@
         <div class="footer-preview-container">
         <div class="footer-preview-container">
             <div class="clause-box">
             <div class="clause-box">
                 <span class="checkbox"></span>
                 <span class="checkbox"></span>
-                <span class="clause-read">我已阅读,理解并接受<a href="abc.html">《剑鱼标讯线上购买与服务条款》</a></span>
+                <span class="clause-read" style="flex: 1">我已阅读,理解并接受<a href="/front/staticPage/wx-serviceterms.html">《剑鱼标讯线上购买与服务条款》</a></span>
             </div>
             </div>
             <div class="price-preview">
             <div class="price-preview">
-                <span class="preview-label">需补差价:</span>
+                <span class="preview-label">价:</span>
                 <span class="preview-content">
                 <span class="preview-content">
-                        <span class="billing-list-btn">计费清单</span>
+                        <span class="billing-list-btn"></span>
                         <span class="billing-price">¥366.50</span>
                         <span class="billing-price">¥366.50</span>
                     </span>
                     </span>
             </div>
             </div>
@@ -192,65 +192,120 @@
     </div>
     </div>
 </div>
 </div>
 
 
+<!-- 计费清单picker -->
 <!-- 计费清单picker -->
 <!-- 计费清单picker -->
 <div class="billing-list-container" style="display: none;">
 <div class="billing-list-container" style="display: none;">
     <div class="weui-mask weui-animate-fade-in"></div>
     <div class="weui-mask weui-animate-fade-in"></div>
     <div class="weui-half-screen-dialog weui-picker weui-animate-slide-up">
     <div class="weui-half-screen-dialog weui-picker weui-animate-slide-up">
         <div class="weui-half-screen-dialog__hd">
         <div class="weui-half-screen-dialog__hd">
             <div class="dialog_hd__l"></div>
             <div class="dialog_hd__l"></div>
-            <div class="dialog_hd__title">计算标准</div>
+            <div class="dialog_hd__title">计费清单</div>
             <div class="dialog_hd__close iconfont icon-guanbi"></div>
             <div class="dialog_hd__close iconfont icon-guanbi"></div>
         </div>
         </div>
-        <div class="weui-half-screen-dialog__bd">
-            <div class="vip_prise_table">
-                <table class="monthly">
-                    <div class="table_title">
-                        <div class="line"></div>
-                        <div class="title">VIP订阅价格</div>
-                        <div class="line"></div>
-                    </div>
-                    <tr>
-                        <td colspan="2">按月购买</td>
-                    </tr>
-                    <tr>
-                        <td>5.8元 月/市/行业</td>
-                        <td>18元 月/市/全行业</td>
-                    </tr>
-                    <tr>
-                        <td>11.8元 月/省/行业</td>
-                        <td>38元 月/省/全行业</td>
-                    </tr>
-                    <tr>
-                        <td>118元 月/全国/行业</td>
-                        <td>388元 月/全国/全行业</td>
-                    </tr>
-                </table>
-                <table class="yearly">
-                    <tr>
-                        <td colspan="2">按年购买</td>
-                    </tr>
-                    <tr>
-                        <td>58元 年/市/行业</td>
-                        <td>180元 年/市/全行业</td>
-                    </tr>
-                    <tr>
-                        <td>118元 年/省/行业</td>
-                        <td>380元 年/省/全行业</td>
-                    </tr>
-                    <tr>
-                        <td>1180元 年/全国/行业</td>
-                        <td>3880元 年/全国/全行业</td>
-                    </tr>
-                </table>
-                <div class="tips">
-                    <dt>购买须知:</dt>
-                    <dd>套餐周期内,不支持套餐降级,续费可降级;</dd>
-                    <dd>用户最多购买/续费3年套餐;</dd>
-                    <dd>支持套餐升级,补差价(按月进行补差价,不足一个月按一个月计算)。</dd>
-                </div>
+        <div class="weui-half-screen-dialog__bd valuation_list">
+            <div class="va-list-container">
+                <ul class="list-content">
+                    <!--<li class="list-item">
+                        <div class="item-top">
+                            <div class="item-header">
+                                <span class="header-label">有效日期:</span>
+                                <span class="header-content ellipsis">(1个月)2019年12月1日-2019年12月31日</span>
+                            </div>
+                            <div class="item-body">
+                                <div class="b-item body-area">
+                                    <div class="body-area-title text-title">区域</div>
+                                    <div class="body-area-sub">1个省、3个市(分布在2个省内)</div>
+                                </div>
+                                <div class="b-item body-industry">
+                                    <div class="body-industry-title text-title">采购单位行业</div>
+                                    <div class="body-industry-sub">3个行业</div>
+                                </div>
+                                <div class="vp-type">
+                                    <div class="vp-type-text">升级</div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="item-footer">
+                            <span class="footer-label">小计:</span>
+                            <span class="footer-content text-title">¥223.8</span>
+                        </div>
+                    </li>
+                    <li class="list-item">
+                        <div class="item-top">
+                            <div class="item-header">
+                                <span class="header-label">有效日期:</span>
+                                <span class="header-content ellipsis">(1个月)2019年12月1日-2019年12月31日</span>
+                            </div>
+                            <div class="item-body vp-oneline">
+                                <div class="b-item body-area">
+                                    <div class="body-area-title text-title">区域</div>
+                                    <div class="body-area-sub">1个省、3个市(分布在2个省内)</div>
+                                </div>
+                                <div class="vp-type">
+                                    <div class="vp-type-text">续续费</div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="item-footer">
+                            <span class="footer-label">小计:</span>
+                            <span class="footer-content text-title">¥223.8</span>
+                        </div>
+                    </li>
+                    <li class="list-item">
+                        <div class="item-top">
+                            <div class="item-header">
+                                <span class="header-label">有效日期:</span>
+                                <span class="header-content ellipsis">(1个月)2019年12月1日-2019年12月31日</span>
+                            </div>
+                            <div class="item-body">
+                                <div class="b-item body-area">
+                                    <div class="body-area-title text-title">区域</div>
+                                    <div class="body-area-sub">1个省、3个市(分布在2个省内)</div>
+                                </div>
+                                <div class="b-item body-industry">
+                                    <div class="body-industry-title text-title">采购单位行业</div>
+                                    <div class="body-industry-sub">3个行业</div>
+                                </div>
+                                <div class="vp-type">
+                                    <div class="vp-type-text">升级</div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="item-footer">
+                            <span class="footer-label">小计:</span>
+                            <span class="footer-content text-title">¥223.8</span>
+                        </div>
+                    </li>
+                    <li class="list-item">
+                        <div class="item-top">
+                            <div class="item-header">
+                                <span class="header-label">有效日期:</span>
+                                <span class="header-content ellipsis">(1个月)2019年12月1日-2019年12月31日</span>
+                            </div>
+                            <div class="item-body vp-oneline">
+                                <div class="b-item body-industry">
+                                    <div class="body-industry-title text-title">采购单位行业</div>
+                                    <div class="body-industry-sub">3个行业</div>
+                                </div>
+                                <div class="vp-type">
+                                    <div class="vp-type-text">升级</div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="item-footer">
+                            <span class="footer-label">小计:</span>
+                            <span class="footer-content text-title">¥223.8</span>
+                        </div>
+                    </li>-->
+                </ul>
+            </div>
+        </div>
+        <div class="weui-half-screen-dialog__ft">
+            <div class="va-total-container">
+                <span class="total-label">共计:</span>
+                <span class="total-price">¥223.8</span>
             </div>
             </div>
         </div>
         </div>
-        <div class="weui-half-screen-dialog__ft"></div>
     </div>
     </div>
 </div>
 </div>
 <!-- 选择订阅周期picker -->
 <!-- 选择订阅周期picker -->

+ 2 - 2
src/web/templates/weixin/vipsubscribe/vip_renew.html

@@ -90,9 +90,9 @@
                 <span class="clause-read">我已阅读,理解并接受<a href="/front/staticPage/wx-serviceterms.html">《剑鱼标讯线上购买与服务条款》</a></span>
                 <span class="clause-read">我已阅读,理解并接受<a href="/front/staticPage/wx-serviceterms.html">《剑鱼标讯线上购买与服务条款》</a></span>
             </div>
             </div>
             <div class="price-preview">
             <div class="price-preview">
-                <span class="preview-label">需补差价:</span>
+                <span class="preview-label">价:</span>
                 <span class="preview-content">
                 <span class="preview-content">
-                        <span class="billing-list-btn">计费清单</span>
+                        <span class="billing-list-btn"></span>
                         <span class="billing-price">¥366.50</span>
                         <span class="billing-price">¥366.50</span>
                     </span>
                     </span>
             </div>
             </div>