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

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

@@ -55,7 +55,7 @@ func (this *OrderListDetails) GetOrderPayAllMsg() {
 			"order_code": orderCode,
 			//"order_status": 1,
 		}
-		oData := util.Mysql.FindOne(tableName_order, query, "prepay_time,pay_time,pay_way,original_price,applybill_status,out_trade_no,filter,product_type,order_status,applybill_type,applybill_taxnum,applybill_company,vip_starttime,vip_endtime", "")
+		oData := util.Mysql.FindOne(tableName_order, query, "prepay_time,create_time,pay_time,pay_way,original_price,applybill_status,out_trade_no,filter,product_type,order_status,applybill_type,applybill_taxnum,applybill_company,vip_starttime,vip_endtime", "")
 		log.Println("odata:", oData)
 		//查询订单信息
 		if oData == nil || len(*oData) == 0 {

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

@@ -4,11 +4,12 @@ import (
 	"encoding/json"
 	"entity"
 	"errors"
+	"pay"
+	"regexp"
+
 	"github.com/dchest/captcha"
 	"github.com/go-xweb/httpsession"
 	"gopkg.in/mgo.v2/bson"
-	"pay"
-	"regexp"
 
 	"log"
 
@@ -38,6 +39,7 @@ var (
 	phoneReg = regexp.MustCompile("^[1][3-9][0-9]{9}$")
 	nameReg  = regexp.MustCompile("^[\u4E00-\u9FA5A-Za-z\\s]+(·[\u4E00-\u9FA5A-Za-z]+)*$")
 )
+
 //首页试用弹框是否展示
 func (t *TrialOrder) ShowTrailTip() {
 	userId := qutil.ObjToString(t.GetSession("userId"))
@@ -59,7 +61,7 @@ func (t *TrialOrder) CloseTrailTip() {
 	ok := false
 	if util.MQFW.UpdateById("user", userId,
 		bson.M{"$set": bson.M{
-			"o_vipjy.i_trial": 2,}}) {
+			"o_vipjy.i_trial": 2}}) {
 		ok = true
 	} //已激活试用
 	t.ServeJson(map[string]interface{}{
@@ -188,7 +190,7 @@ func (t *TrialOrder) SubmitApply() {
 			if res != nil && len(*res) > 0 && ok {
 				o_vipjy := qutil.ObjToMap((*res)["o_vipjy"])
 				i_trial, ok := (*o_vipjy)["i_trial"]
-				if !ok || qutil.IntAll(i_trial) == 2 {  //2为不提示状态
+				if !ok || qutil.IntAll(i_trial) == 2 { //2为不提示状态
 					if !util.MQFW.UpdateById("user", userId, bson.M{"$set": bson.M{"o_vipjy.i_trial": 1}}) {
 						log.Println("更新使用状态出错", userId)
 					}
@@ -287,7 +289,14 @@ func (this *TrialOrder) TrialPay() {
 			0,
 		}
 		filterStr, _ := json.Marshal(filter)
-		endTime := now.AddDate(0, 0, 7)
+		//结束日期 按照 自然周 算 （例:11.11开通 11.17 23.59.59结束）
+		//endTime := now.AddDate(0, 0, 7)
+		endTime_format := now.AddDate(0, 0, 7).Format(qutil.Date_Short_Layout)
+		stamp, _ := time.ParseInLocation(qutil.Date_Short_Layout, endTime_format, time.Local)
+		stamp_time := stamp.Unix() - 1 //23.59.59
+		endt := time.Unix(stamp_time, 0).Format(qutil.Date_Full_Layout)
+		endTime, _ := time.ParseInLocation(qutil.Date_Full_Layout, endt, time.Local)
+
 		orderid := util.Mysql.Insert("dataexport_order", map[string]interface{}{
 			"order_money":    totalfee,
 			"order_status":   1,

src/web/templates/weixin/dataExport/dataExport_toMyOrder.html

@@ -551,13 +551,23 @@
 			                                   					 var self = $(obj).parent(".card-footer").prev(".card-content").prev(".card-header").children(".notpay");
 			                                   					 self.text("已取消");
 			                                   					 self.css("color","black");
-			                                   					 $(obj).parent(".card-footer").html('<a  onclick="onceMore(this)" class="btn cancle">再次购买</a>')
+			                                   					 var isVipOrder =$(obj).parent(".card-footer").prev(".card-content").children(".media").attr("isvipOrder");
+			                                   					 console.log(isVipOrder)
+			                                   					 //vip订单取消了没有再次购买
+			                                   					 if (isVipOrder!="true"){
+			                                   					 	 $(obj).parent(".card-footer").html('<a  onclick="onceMore(this)" class="btn cancle">再次购买</a>')
+			                                   					 }else{
+			                                   					 	$(obj).parent().parent().remove();
+																	$(".card_lists").empty();
+			                                   					 	queryOrder($("ul .active").index());
+			                                   					 }
+			                                   					
 			                                                }
 			                                            }
 			                                        }
 			                                    });
 			                                }else{
-			                                    alertS("删除失败，请联系管理员！");
+			                                    alertS("取消失败，请联系管理员！");
 			                                }
 		                            });
 			                    }
@@ -844,14 +854,6 @@
 	                        var region_vip=""
 	                        var province_length=0;
 	                        var city_length=0;
-//	                        for( i in region_vipArr){
-//	                        	var region_vipArr_i =region_vipArr[i];
-//                      		if(region_vipArr_i.count==undefined){
-//                      			province_length++;
-//                      		}else{
-//                      			city_length+=region_vipArr_i.count;
-//                      		}
-//	                        }
 							if(JSON.stringify(region_vipArr) != JSON.stringify({})){
 								for(i in region_vipArr){
 									if(region_vipArr[i].length==0){
@@ -1031,7 +1033,7 @@
 															+'</div>'
 															+'<div class="media-info">'
 																+'<p class="item-ifo ellipsis">区域：'+ region_vip+'</p>'
-																+'<p class="item-ifo ellipsis">行业：'+ industry_vip +'个行业</p>'
+																+'<p class="item-ifo ellipsis">行业：'+ industry_vip +'行业</p>'
 																+'<p class="item-ifo ellipsis">订阅周期：'+effectiveduration_vip+'</p>'
 																+'<p class="item-ifo ellipsis">有效日期：'+effectivetime_vip+'</p>'
 															+'</div>'

src/web/templates/weixin/email/bind_email.html

@@ -77,7 +77,10 @@
 								promptbox(data.errMsg);
 							}
 						});
-						//验证码校验
						$('.code_input').bind('input propertychange',()=>{
+
					}
				})
+				
+										//验证码校验
+						$('.code_input').bind('input propertychange',()=>{
 							var verity=$(".code_input").val();
 							var email=$(".email_input").val().replace(/\s*/g,"");
 							if(verity.length==6){
@@ -96,7 +99,8 @@
 										promptbox("邮箱验证码错误");
 									}
 								});
-							}
						}).on("blur",()=>{
+							}
+						}).on("blur",()=>{
 							var code_input_len=$(".code_input").val().length
 							if((code_input_len!=6)&&(code_input_len!=0)){
 								$(".code_true").hide();
@@ -118,14 +122,14 @@
 									}else{
 										sessionStorage.removeItem("send_myemail_"+{{.T.userId}});
 										if((param="invoice")&&(orderCode!=null)){
-											window.location.replace("/jyapp/front/myorder/setSuccess?name=invoice&orderCode="+orderCode); 
+											window.location.replace("/front/wxMyOrder/setSuccess?name=invoice&orderCode="+orderCode); 
 										}else{
-											window.location.replace("/jyapp/front/myorder/setSuccess?name=bindEmail"); 
+											window.location.replace("/front/wxMyOrder/setSuccess?name=bindEmail"); 
 										}
 									}
 								}
 							})
-						})
					}
				})
			})
+						})
			})
 			
 			//提示框
 			function promptbox(str){

src/web/templates/weixin/email/bind_success.html

@@ -27,8 +27,7 @@
 				
 				let param = getParam('name');//获取url传来的参数 判断显示成功的字幕
 				var orderCode=getParam("orderCode"); //开发票的订单
-				console.log(param)
-				var time = 6;
+				var time = 3;
 				function countDown(){
 					if(time == 0){
 						$('.time').html('');
@@ -66,7 +65,7 @@
 				}
 				/* 返回 */
 				$('.back').on('click',() =>{
-					if((param="invoice")&&(orderCode!="")){
+					if((param=="invoice")&&(orderCode!=null)){
 							window.location.replace('/weixin/pay/toOrderDetailPage?orderCode='+orderCode);
 						}else{
 							window.location.replace('/front/wxMyOrder/myEmail');

src/web/templates/weixin/my.html

@@ -35,7 +35,7 @@
 				margin-right: 5px;
 			}
 			.myorderDiv{
-				font:16px/43px "微软雅黑" ;
+				font:16px/50px "微软雅黑" ;
 				background-color:#FFFFFF ;
 			}
 			.fl{
@@ -65,11 +65,11 @@
 			}
 			.vip{
 				margin-bottom: 10px;
-				font:16px/43px "微软雅黑" ;
+				font:16px/50px "微软雅黑" ;
 				background-color:#FFFFFF ;
 			}
 			.email{
-				border-top: 1px #F5F4F9 solid;
+				border-top:0px #F5F4F9 solid;
 			}
 			.setEmail{
 				float:right;
@@ -146,38 +146,54 @@
 	<body>
 		<div id="" class="vip lineTop">
 			<img src="/images/wx/vip.svg"/>
-			VIP订阅
-			<i class="iconfont fr rightIcon">&#xe642;</i>
+			<div style="width:87%;display:inline-block;">
+				VIP订阅
+				<i class="iconfont fr rightIcon">&#xe642;</i>
+			</div>
 		</div>
 		
 		<div class="myorderDiv myorder">
 			<i class="iconfont myorderIcon myorder_margin">&#xe60f;</i>
-			我的订单
-			<i class="iconfont fr rightIcon">&#xe642;</i>
+			<div style="width:87%;display:inline-block;" class="lineBottom">
+				我的订单
+				<i class="iconfont fr rightIcon">&#xe642;</i>
+			</div>
 		</div>
 		<div class="myorderDiv email">
 			<img src="/images/wx/email.svg"/>
-			邮箱地址
-			<i class="iconfont fr rightIcon">&#xe642;</i>
-			<span class="setEmail"></span>
+			<div style="width:87%;display:inline-block;">
+				邮箱地址
+				<i class="iconfont fr rightIcon">&#xe642;</i>
+				<span class="setEmail"></span>
+			</div>
 		</div>
 		
-		<div class="myorderDiv lineBottom lineTop feedback">
-			<i class="iconfont threeIcon">&#xe613;</i>
-			意见反馈
-			<i class="iconfont fr rightIcon">&#xe642;</i>
+		<div class="myorderDiv  lineTop feedback" >
+			<i class="iconfont threeIcon" style="">&#xe613;</i>
+			<div style="width:87%;display:inline-block;" class="lineBottom">
+				<div style="display:inline-block;">
+					意见反馈
+				</div>
+				<i class="iconfont fr rightIcon ">&#xe642;</i>
+			</div>
 		</div>
 		
-		<div class="myorderDiv lineBottom useHelp">
+		<div class="myorderDiv  useHelp">
 			<i class="iconfont threeIcon ">&#xe60c;</i>
-			使用帮助
-			<i class="iconfont fr rightIcon">&#xe642;</i>
+			<div style="width:87%;display:inline-block;" class="lineBottom">
+				<div style="display:inline-block;">
+					使用帮助
+				</div>
+				<i class="iconfont fr rightIcon ">&#xe642;</i>
+			</div>
 		</div>
 		
-		<div class="myorderDiv lineBottom aboutJy">
+		<div class="myorderDiv  aboutJy">
 			<i class="iconfont threeIcon">&#xe601;</i>
-			关于剑鱼标讯
-			<i class="iconfont fr rightIcon">&#xe642;</i>
+			<div style="width:87%;display:inline-block;">
+				关于剑鱼标讯
+				<i class="iconfont fr rightIcon">&#xe642;</i>
+			</div>
 		</div>
 
 <!--百度统计end-->

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

@@ -362,7 +362,7 @@
         </div>
         <div class="tips_btn">
             <div class="tips_discount">
-                <div class="tips_d_money" style="display: block">&yen;38</div>
+                <!--<div class="tips_d_money" style="display: block">&yen;38</div>-->
                 <div class="tips_d_text citys">已选择4个市，建议购买“全省”更划算哦~</div>
                 <div class="tips_d_text all">已选择10个省，建议购买“全国”更划算哦~</div>
             </div>
@@ -558,6 +558,10 @@
                       children:cityArr
                   })
               }
+              if(activeLeng > 0){
+              	$(".tips_btn .btns .reset-btn").removeAttr("disabled");
+              	$(".tips_btn .btns .save-btn").removeAttr("disabled");
+              }
           })
           //数组对象去重
           let obj = {};
@@ -646,16 +650,18 @@
           })
           // 如果循环结束仍为true说明 没有全部都被选中
           if (_f) {
-              $('.other').prop('checked', true);
+//            $('.other').prop('checked', true);
+				$(".tips_btn .btns .reset-btn").attr("disabled","disabled");
+        		$(".tips_btn .btns .save-btn").attr("disabled","disabled");
           }
         },
         getNationwide:function(){/*默认选中全国 */
-          $('.other').prop('checked', true);
-          $('.tab_content').slideUp(500)
-          $('.tab span i').css({
-              "display":"inline-block",
-              "transform":"rotate(0)"
-          });
+//        $('.other').prop('checked', true);
+//        $('.tab_content').slideUp(500)
+//        $('.tab span i').css({
+//            "display":"inline-block",
+//            "transform":"rotate(0)"
+//        });
         },
         isOpen:function(){
           let pHeight = $('.result_text').height()
@@ -780,6 +786,7 @@
                 $(".other").trigger("click");
               }
             })
+            //
         },
         reset:function(){
            var checked = $(".other").is(':checked');
@@ -840,6 +847,15 @@
 		    return false;
 		}
 	    //
+	    if($(".result_name").text()===""){
+	    	$(".tips_btn .btns .reset-btn").attr("disabled","disabled");
+        	$(".tips_btn .btns .save-btn").attr("disabled","disabled");
+	    }
+	    
+	    if(sessionStorage.vipSubSelectArea!==undefined && sessionStorage.vipSubSelectArea!==""){
+	    	$(".tips_btn .btns .reset-btn").removeAttr("disabled");
+            $(".tips_btn .btns .save-btn").removeAttr("disabled");
+	    }
 
     </script>
 </body>

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

@@ -34,7 +34,7 @@
                         <li class="list_item" id="all">
                             <div class="item_label"></div>
                             <div class="item_industry_list">
-                                <button class="industry_item active">全部行业</button>
+                                <button class="industry_item">全部行业</button>
                             </div>
                         </li>
                         <li class="list_item" id="A">
@@ -241,7 +241,7 @@
             </div>
             <div class="tips_btn">
                 <div class="tips_discount">
-                    <div class="tips_d_money" style="display: block">&yen;38</div>
+                    <!--<div class="tips_d_money" style="display: block">&yen;38</div>-->
                     <div class="tips_d_text">已选择4个行业，建议购买“全部行业”更划算哦~</div>
                 </div>
                 <div class="btns">
@@ -251,7 +251,7 @@
             </div>
         </main>
         <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-        <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
+        <!--<script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>-->
         <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
         <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
         <script>
@@ -303,9 +303,11 @@
                 $('.result .result_name').text(selectedStr)
 
                 if (selectedArr.length === 0) {
-                    var allButton = $('#all button')
-                    allButton.trigger('click')
-                    $('.result .result_name').text(allButton.text())
+//                  var allButton = $('#all button')
+//                  allButton.trigger('click')
+//                  $('.result .result_name').text(allButton.text())
+					$(".tips_btn .btns .save-btn").attr("disabled","disabled");
+					$(".tips_btn .btns .reset-btn").attr("disabled","disabled");
                 }
                 if (selectedArr.length === buttons.length - 1) {
                     // 除全部行业外所有按钮都被选中了
@@ -320,7 +322,9 @@
                 $($('.industry_item')).each(function (index, dom) {
                 	if(canclick){
                 		if (v!="全部行业"){
-	                      $('#all').children().children('button').removeClass('active');
+	                      	$('#all').children().children('button').removeClass('active');
+	                      	$(".tips_btn .btns .save-btn").removeAttr("disabled","disabled");
+							$(".tips_btn .btns .reset-btn").removeAttr("disabled","disabled");
 	                    }
                 		if (v == $(dom).text()) {
 	                       $(dom).addClass("active").attr({"disabled":!canclick})

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

@@ -55,7 +55,7 @@
             </div>
 		</div>
 		<script src="/vipsubscribe/js/jquery-2.1.4.js"></script>
-    	<script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
+    	<!--<script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>-->
     	<script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     	<script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
 		<script type="text/javascript">
@@ -85,10 +85,10 @@
 			    			}
 			    		}
 			    	}
+			    	areaHtml = areaArr.toString().replace(/,/g, "、");
 			    	if(checkObj(area)){
 						areaHtml = "全国";
 					}
-			    	areaHtml = areaArr.toString().replace(/,/g, "、");
 			    	$('.area-list').text(areaHtml);
 			    }
 			    if(buyerclass !== "" && buyerclass !== undefined){

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

@@ -69,7 +69,7 @@
                     <a href="javascript:;">
                         <span class="label">支付方式</span>
                         <span class="info choose_way">微信支付</span>
-                        <i class="iconfont icon-arrow choose_way"></i>
+                        <!--<i class="iconfont icon-arrow choose_way"></i>-->
                     </a>
                 </div>
             </div>

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

@@ -80,6 +80,10 @@
   margin-right: .3rem;
   background-color: #BFBFC3;
 }
+.cancel_time{
+	font-size: 16px;
+	margin-left: 20px;
+}
 </style>
 <body>
     <div class="vip_order_detail">
@@ -157,7 +161,7 @@
         </main>
         <!-- 当状态为待付款时显示去支付按钮 -->
         <!--当状态为已取消时显示再次购买按钮-->
-        <a href="#" class="button align" style="display:none">去支付</a>
+        <a href="#" class="button align" style="display:none">去支付<span class="cancel_time"></span></a>
     </div>
 </body>
 <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
@@ -209,6 +213,7 @@ try{
     $(".orderCode").text(orderCode);
     $DoPost("/subscribepay/orderListDetails/getOrderPayAllMsg",{"orderCode":orderCode},function(r){
       if(r.success){
+      	
         //下单时间
         if(r.data.order.prepay_time) {
         	$(".prepayTime").text(r.data.order.prepay_time.replace("-",".").replace("-","."));
@@ -288,6 +293,8 @@ try{
 	    		$(".cyclecount").text(year+"年");
 	    	}else if(year === 0&& month !==0){
 	    		$(".cyclecount").text(month+"个月");
+	    	}else {
+	    		$(".cyclecount").text("7天");
 	    	}
        }else{
        		//未支付
@@ -300,7 +307,7 @@ try{
 	      }
        }
         
-        if(r.data.order.order_status==0){
+        if(r.data.order.order_status==0){       	
           //未支付
           $("#pageTitle").text("待付款");
           $(".invoice").css("display","none");//隐藏开发票
@@ -388,8 +395,18 @@ try{
 //         		$(".align").css("display","").html("再次购买");
 //        	}
         }
-                
+       
       }
+      
+    	//倒计时 未购买
+		var create_time=r.data.order.create_time;
+		//create_time="2019-11-09 11:17:55";
+		var clock_end = +new Date(create_time) + 172800000;
+		setTimeFunc(clock_end); 
+		setInterval(function(){
+			setTimeFunc(clock_end);
+		},1000)
+		
       //调用微信支付接口
   		function onBridgeReady(res,ordercode){
   		   	WeixinJSBridge.invoke('getBrandWCPayRequest',{
@@ -457,6 +474,28 @@ try{
 	        ]
 	    });
 	}
+
+
+	// 参数为结束时间戳
+	function setTimeFunc (endtime){
+  		var t = endtime - +new Date();
+  		if (t <= 0) {
+  			$(".button").hide();
+  			$(".cancel_time").hide();
+  			$("#pageTitle").html("已取消");
+  		}
+  		//天时分秒
+		var days = parseInt(t / 1000 / 60 / 60 / 24 , 10).toString().padStart(2, '0'); //计算剩余的天数 
+		var hours = parseInt(t / 1000 / 60 / 60 % 24 , 10).toString().padStart(2, '0');; //计算剩余的小时 
+		var minutes = parseInt(t / 1000 / 60 % 60, 10).toString().padStart(2, '0');;//计算剩余的分钟 
+		var seconds = parseInt(t / 1000 % 60, 10).toString().padStart(2, '0');;//计算剩余的秒数
+		//时分秒
+		var days_ = parseInt(t / 1000 / 60 / 60   , 10).toString().padStart(2, '0'); //计算剩余的天数 
+		var minutes_ = parseInt(t / 1000 / 60 % 60, 10).toString().padStart(2, '0');;//计算剩余的分钟 
+		
+		//$(".cancel_time").text("（"+days+"天" + hours+"小时" + minutes+"分"+seconds+"秒）");
+		$(".cancel_time").text("剩余"+days_+":" + minutes_+":"+seconds+" ");
+	  }
   })
       
 </script>

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

@@ -75,7 +75,7 @@
                     <a href="javascript:;">
                         <span class="label">支付方式</span>
                         <span class="info choose_way">微信支付</span>
-                        <i class="iconfont icon-arrow choose_way"></i>
+                        <!--<i class="iconfont icon-arrow choose_way"></i>-->
                     </a>
                 </div>
                 <div class="vip_rules">
@@ -743,20 +743,6 @@
 //	    	$("#payType").text(payHtml);
 //	    }
 
-//	    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(sessionStorage.upgrade_cyclecount!==undefined&&sessionStorage.upgrade_cycleunit!==undefined){
 	 		var cycleunit = sessionStorage.upgrade_cycleunit;
 	 		var cyclecount = sessionStorage.upgrade_cyclecount;
@@ -786,12 +772,7 @@
 	 		$('.choose_item.lengthen .info').text("不延长");
 	 		$(".computed_price").hide();
 	 	}
-	 	if(sessionStorage.upgrade_price!==""&&sessionStorage.upgrade_price!==undefined){
-	 		$(".computed_price").html(sessionStorage.upgrade_price);
-	 	}
-	 	if(sessionStorage.upgrade_finally_price!==""&&sessionStorage.upgrade_finally_price!==undefined){
-	    	$(".finally_price").html(sessionStorage.renew_finally_price);
-	 	}
+	 	
 //	 	if(sessionStorage.vipSubSelectArea!==""&&sessionStorage.vipSubSelectArea!==undefined&&)
 	 	
 	 	//
@@ -949,6 +930,16 @@
 			    	}
 			    }
 			}
+			
+			for (var x = 0; x < industrysArr.length; x++) {
+	            for (var j =x+1; j <industrysArr.length; ) {
+	                if (industrysArr[x] === industrysArr[j]){
+	                    industrysArr.splice(j, 1);
+	                }
+	                else j++;
+	            }
+	       	}
+			
 			console.log("industrysArr",industrysArr);
 			if(sessionStorage.effectiveDate !== ""&&sessionStorage.effectiveDate!==undefined){
 				let eff = sessionStorage.effectiveDate;
@@ -1001,9 +992,16 @@
 			if(nowUpgrade == 0){
 				nowUpgrade = 1;
 			}
+			if(sessionStorage.upgrade_cyclecount !== undefined && sessionStorage.upgrade_cycleunit !== undefined){
+				if(sessionStorage.upgrade_cycleunit === "1"){
+					nowUpgrade = nowUpgrade + 12*Number(sessionStorage.upgrade_cyclecount);
+				}else if(sessionStorage.upgrade_cycleunit === "2"){
+					nowUpgrade = nowUpgrade + Number(sessionStorage.upgrade_cyclecount);
+				}
+			}
 			//
 			var nowUpgradeYear = 0;
-			if(nowUpgrade >= 12){
+			if(nowUpgrade >= 12 && nowUpgrade < 24){
 				nowUpgradeYear = Math.floor(nowUpgrade / 12);
 				nowUpgrade = nowUpgrade - 12;
 			}else if(nowUpgrade >= 24){
@@ -1064,6 +1062,17 @@
 			}
 			console.log("completeMonth",completeMonth)
 			console.log("completeYear",completeYear)
+			if(sessionStorage.upgrade_cyclecount !== undefined && sessionStorage.upgrade_cycleunit !== undefined){
+				if(sessionStorage.upgrade_cycleunit === "1"){
+					let price = (Number(sessionStorage.upgrade_cyclecount)*completeYear).toFixed(1);
+					sessionStorage.upgrade_price = "￥"+price;
+					sessionStorage.proPrice = price;
+				}else if(sessionStorage.upgrade_cycleunit === "2"){
+					let price = (Number(sessionStorage.upgrade_cyclecount)*completeMonth).toFixed(1);
+					sessionStorage.upgrade_price = "￥"+price;
+					sessionStorage.proPrice = price;
+				}
+			}
 			var cPrice = 0;
   			if(price>0){
   				var cPrice = (price - oldPrice).toFixed(1);
@@ -1074,12 +1083,22 @@
 				console.log("proprice",proPrice);
 				cPrice = (Number(cPrice) + Number(proPrice)).toFixed(1);
 			}
+			if(cPrice < 0){
+				cPrice = 0;
+			}
 			$(".finally_price").html("￥"+cPrice);
 			if (cPrice>0){
 				$(".save_upgrade").removeAttr('disabled');
 			}
         }
         FinallyPrice();
+        //
+        if(sessionStorage.upgrade_price!==""&&sessionStorage.upgrade_price!==undefined){
+	 		$(".computed_price").html(sessionStorage.upgrade_price);
+	 	}
+	 	if(sessionStorage.upgrade_finally_price!==""&&sessionStorage.upgrade_finally_price!==undefined){
+	    	$(".finally_price").html(sessionStorage.renew_finally_price);
+	 	}
         
         //
         $(".save_upgrade").on("click", function(){