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

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

@@ -342,6 +342,27 @@
             if(sessionStorage.getItem("vipSubSelectIndustry")){
               this.industrySelect=JSON.parse(sessionStorage.getItem("vipSubSelectIndustry"));
             }
+            {{if eq .T.orderType 5 }}
+              //即将到期 回显已购买
+              if(!sessionStorage.getItem("vipSubSelectArea")||!sessionStorage.getItem("vipSubSelectIndustry")){
+                $DoPost("/subscribepay/editSub/getSubBuyMsg",{},function(r){
+                  if(r.success){
+                    if(!$.isEmptyObject(r.data.area)){
+                      purchase.areaSelect=r.data.area
+                    }else{
+                      purchase.areaSelect={"全国":[]}
+                    }
+                    if(r.data.industry.length!=0){
+                      purchase.industrySelect=r.data.industry
+                    }else{
+                      purchase.industrySelect=["全部行业"]
+                    }
+                    sessionStorage.setItem("vipSubSelectArea",JSON.stringify(purchase.areaSelect));
+                    sessionStorage.setItem("vipSubSelectIndustry",JSON.stringify(purchase.industrySelect));
+                  }
+                },false)
+              }
+            {{end}}
             if(sessionStorage.getItem("vipSubSelectTime")){
               this.timeSelect=JSON.parse(sessionStorage.getItem("vipSubSelectTime"));
             }