feat: 订单明细相关修改-数据流量包

src/web/templates/pc/myOrder.html

@@ -251,9 +251,9 @@
                                 </div>
                                 <div class="fl shop_main" v-if="item.product_type === '数据流量包'">
                                     <p>产品类型：数据流量包</p>
-                                    <p>充值条数：@#item.data_count#@条</p>
-                                    <p>使用有效期：@#item.year#@</p>
-                                    <p>数据规格：@#item.data_spec#@</p>
+                                    <p>充值条数：@#item.filter.pNum#@条</p>
+                                    <p>使用有效期：@#item.filter.validYear#@年</p>
+                                    <p>数据规格：@#item.filter.pType == '1' ? '标准' : '高级'#@字段包</p>
                                 </div>
                                 <div class="fl shop_main" v-if="item.product_type === '中标必听课'">
                                     <p>课程名称：@#item.filter.s_name#@</p>

src/web/templates/pc/packDetail.html

@@ -81,10 +81,10 @@
                 </div>
                 <div class="clearfix list_tbody">
                     <div class="filter_data">
-                        <p><span class="dq_text">产品类型</span>：<span class="dq"></span></p>
-                        <p><span class="hy_text">充值条数</span>：<span class="hysl"></span></p>
-                        <p><span class="zq_text">使用有效期</span>：<span class="dyzq"></span></p>
-                        <p><span class="zq_text">数据规格</span>：<span class="level"></span></p>
+                        <p><span class="dq_text">产品类型</span>：<span class="dq">数据流量包</span></p>
+                        <p><span class="hy_text">充值条数</span>：<span class="hysl"></span>条</p>
+                        <p><span class="zq_text">使用有效期</span>：<span class="dyzq"></span>年</p>
+                        <p><span class="zq_text">数据规格</span>：<span class="level"></span>字段包</p>
                     </div>
                 </div>
             </div>
@@ -211,168 +211,10 @@
                         $(".payOrder").show();
                     }
 
-                    //订阅条件
-                    if (!$.isEmptyObject(filterObj.newBuyset)) {	//p1版本
-                        var newbuyset = filterObj.newBuyset;
-                        if (newbuyset.areacount == -1) {
-                            $(".dq").text("全国");
-                        } else {
-                            var newcitys = newbuyset.newcitys;
-                            var scatter = newcitys.length;//分布
-                            var citynum = 0;
-                            for (var k in newcitys) {
-                                citynum += newcitys[k];
-                            }
-                            if (newbuyset.areacount > 0) {
-                                areaText = newbuyset.areacount + "个省级区域";
-                                if (citynum != 0) {
-                                    if (scatter > 1) {
-                                        areaText += "、" + citynum + "个地市（分布在" + scatter + "省内)";
-                                    } else {
-                                        areaText += "、" + citynum + "个地市";
-                                    }
-                                }
-                            } else {
-                                if (scatter > 1) {
-                                    areaText = citynum + "个地市（分布在" + scatter + "省内)";
-                                } else {
-                                    areaText = citynum + "个地市";
-                                }
-                            }
-                            $(".dq").text(areaText);
-                        }
-                        if (newbuyset.buyerclasscount != -1) {
-                            var hysl = newbuyset.buyerclasscount + "个行业";
-                            $(".hysl").html(hysl);
-                        } else {
-                            $(".hysl").html("全行业");
-                        }
-                    } else {	//老版本
-                        var region_vipArr = filterObj.area;
-                        var province_length = 0;
-                        var city_length = 0;
-                        if (JSON.stringify(region_vipArr) != JSON.stringify({})) {
-                            for (i in region_vipArr) {
-                                if (region_vipArr[i].length == 0) {
-                                    province_length++;
-                                } else {
-                                    city_length += region_vipArr[i].length;
-                                }
-                            }
-                        } else {
-                            region_vip = "全国";
-                        }
-                        if ((province_length != 0) && (city_length != 0)) {
-                            region_vip = province_length + "个省级区域、" + city_length + "个地市";
-                        } else if ((province_length == 0) && (city_length != 0)) {
-                            region_vip = city_length + "个地市";
-                        } else if ((province_length != 0) && (city_length == 0)) {
-                            region_vip = province_length + "个省级区域";
-                        }
-                        //行业
-                        var industry_vip = filterObj.industry.length;	//数组
-                        if (industry_vip == 0) {
-                            industry_vip = "全行业";
-                        } else {
-                            industry_vip = industry_vip + "个行业";
-                        }
-                        $(".dq").html(region_vip);
-                        $(".hysl").html(industry_vip);
-                    }
-                    //周期
-                    if ((r.data.order.vip_starttime != undefined) && (r.data.order.vip_endtime != undefined)) {
-                        var start_time_vip = r.data.order.vip_starttime;
-                        var end_time_vip = r.data.order.vip_endtime;
-                        var start_time_arr = start_time_vip.split(" ")[0].split("-")
-                        var end_time_arr = end_time_vip.split(" ")[0].split("-")
-                        var start_year = start_time_arr[0];
-                        var start_month = start_time_arr[1];
-                        var end_year = end_time_arr[0];
-                        var end_month = end_time_arr[1];
-                        var year = 0;
-                        var month = 0;
-                        if (end_year > start_year) {
-                            if (end_month > start_month) {
-                                year = end_year - start_year;
-                                month = end_month - start_month;
-                            } else {
-                                year = end_year - start_year - 1;
-                                month = 12 + Number(end_month) - start_month;
-                                if (month == 12) {
-                                    year = Number(year) + 1;
-                                    month = 0;
-                                }
-                            }
-                        } else if (end_year === start_year) {
-                            month = end_month - start_month;
-                        }
-
-                        if (year != 0 && month != 0) {
-                            $(".dyzq").text(year + "年" + month + "个月");
-                        } else if (year !== 0 && month === 0) {
-                            $(".dyzq").text(year + "年");
-                        } else if (year === 0 && month !== 0) {
-                            $(".dyzq").text(month + "个月");
-                        }
-                        if (filterObj.cycleunit == 1) {
-                            $(".dyzq").text(filterObj.cyclecount + "年")
-                        } else if (filterObj.cycleunit == 2) {
-                            $(".dyzq").text(filterObj.cyclecount + "个月")
-                        } else if (filterObj.cycleunit == 3) {
-                            $(".dyzq").text(filterObj.cyclecount + "天")
-                        } else if (filterObj.cycleunit == 4) {
-                            $(".dyzq").text(filterObj.cyclecount + "季")
-                        }
-                    } else {
-                        //未支付
-                        if (filterObj.cycleunit == 1) {
-                            $(".dyzq").text(filterObj.cyclecount + "年")
-                        } else if (filterObj.cycleunit == 2) {
-                            $(".dyzq").text(filterObj.cyclecount + "个月")
-                        } else if (filterObj.cycleunit == 3) {
-                            $(".dyzq").text(filterObj.cyclecount + "天")
-                        } else if (filterObj.cycleunit == 4) {
-                            $(".dyzq").text(filterObj.cyclecount + "季")
-                        }
-                    }
-                    if (r.data.order.order_status == 1) {
-                        //有效周期
-                        $(".yxrq_p").css("display", "");
-                        //有效日期
-                        if (r.data.time.vip_starttime && r.data.time.vip_endtime) {
-                            var vip_starttime = r.data.time.vip_starttime + "";
-                            var vip_endtime = r.data.time.vip_endtime + "";
-                            vip_starttime = vip_starttime.split(" ")[0].replace(/-/g, ".");
-                            vip_endtime = vip_endtime.split(" ")[0].replace(/-/g, ".");
-                            var serviceTime = vip_starttime + " - " + vip_endtime;
-                            $(".yxrq").text(serviceTime)
-                        }
-                    }
-                    //判断是升级或续费
-                    if (r.data.order.vip_type == 1) {
-                        $(".vip_type").text("（续费）");
-                        $(".dq_text").text("续费区域");
-                        $(".hy_text").text("续费采购单位行业");
-                        $(".zq_text").text("续费周期");
-                    } else if (r.data.order.vip_type == 2) {
-                        $(".vip_type").text("（升级）");
-                        if (filterObj.cycleunit == 1) {
-                            $(".dyzq").text(filterObj.cyclecount + "年")
-                        } else if (filterObj.cycleunit == 2) {
-                            $(".dyzq").text(filterObj.cyclecount + "个月")
-                        } else if (filterObj.cycleunit == 3) {
-                            $(".dyzq").text(filterObj.cyclecount + "天")
-                        } else if (filterObj.cycleunit == -1) {
-                            $(".dyzq").text("不延期");
-                        }
-                        //续费升级逻辑修改后判断是否不延期
-                        if (filterObj.cycleunit == 0 && filterObj.cyclecount == 0) {
-                            $(".dyzq").text("不延期");
-                        }
-                        $(".dq_text").text("升级区域");
-                        $(".hy_text").text("升级采购单位行业");
-                        $(".zq_text").text("延长周期");
-                    }
+                    // 展示字段
+                    $('.filter_data .level').text(filterObj.pType == '1' ? '标准' : '高级')
+                    $('.filter_data .dyzq').text(filterObj.validYear)
+                    $('.filter_data .hysl').text(filterObj.pNum)
 
                     //计价清单
                     var filterObj = JSON.parse(r.data.order.filter);