Переглянути джерело

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

wangkaiyue 5 роки тому
батько
коміт
e084d0ba0e
35 змінених файлів з 1059 додано та 834 видалено
  1. 4 2
      src/jfw/modules/app/src/web/staticres/jyapp/js/common.js
  2. 165 0
      src/jfw/modules/app/src/web/staticres/jyapp/me/css/personal.css
  3. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_arrow_right.png
  4. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_data_export.png
  5. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_head.png
  6. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_list_1.png
  7. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_list_2.png
  8. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_list_3.png
  9. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_list_4.png
  10. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_list_5.png
  11. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_list_6.png
  12. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_message.png
  13. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_order_1.png
  14. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_order_2.png
  15. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_order_3.png
  16. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_order_4.png
  17. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_set.png
  18. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_vip.png
  19. 442 332
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html
  20. 283 409
      src/jfw/modules/app/src/web/templates/me/index.html
  21. 1 1
      src/jfw/modules/pushsubscribe/src/match/job/matchjob.go
  22. 5 13
      src/jfw/modules/subscribepay/src/entity/subscribeVip.go
  23. 4 1
      src/jfw/modules/subscribepay/src/service/orderListDetails.go
  24. 3 2
      src/jfw/modules/subscribepay/src/service/vipRenewUpgrade.go
  25. 15 8
      src/jfw/modules/weixin/src/wx/wx.go
  26. 12 9
      src/web/staticres/css/wx/treasure_box.css
  27. 1 0
      src/web/staticres/vipsubscribe/css/subscribe_list.css
  28. 8 6
      src/web/staticres/vipsubscribe/js/common.js
  29. 62 27
      src/web/templates/weixin/email/bind_email.html
  30. 12 0
      src/web/templates/weixin/email/bind_success.html
  31. 11 0
      src/web/templates/weixin/email/unbind_email.html
  32. 10 8
      src/web/templates/weixin/historypush.html
  33. 5 5
      src/web/templates/weixin/treasure_box.html
  34. 2 1
      src/web/templates/weixin/vipsubscribe/keyWord.html
  35. 14 10
      src/web/templates/weixin/vipsubscribe/vip_index.html

+ 4 - 2
src/jfw/modules/app/src/web/staticres/jyapp/js/common.js

@@ -416,9 +416,11 @@ function redSpotOnMenu(){
 			//JyObj.getUnReadMessageCount("");
 		//}catch(e){}
 		if(noticeCount > 0){
-			$("#notice .redspot").show();
+			//$("#notice .redspot").show();	//2.8.5 我的页面 改
+			$(".dot").show();
 		}else{
-			$("#notice .redspot").hide();
+			//$("#notice .redspot").hide();
+			$(".dot").hide();
 		}
 		if(r.follow_project > 0){
 			$(".listOne .redspot").show();

+ 165 - 0
src/jfw/modules/app/src/web/staticres/jyapp/me/css/personal.css

@@ -0,0 +1,165 @@
+.personal {
+  padding-top: .88rem;
+}
+
+.personal .navbar {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: .88rem;
+  padding: 0 .32rem;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background: #fff;
+  z-index: 999;
+}
+
+.personal .navbar .navbar_left {
+  font-size: .4rem;
+  font-weight: bold;
+  color: #1D1D1D;
+}
+
+.personal .navbar .navbar_right {
+  display: flex;
+  align-items: center;
+}
+
+.personal .navbar .navbar_right img {
+  width: .48rem;
+  height: .48rem;
+  margin-left: .4rem;
+}
+
+.personal .user {
+  display: flex;
+  align-items: center;
+  padding: .4rem .42rem .56rem;
+  background: #fff;
+}
+
+.personal .user .user_img {
+  width: 1.2rem;
+  height: 1.2rem;
+  margin-right: .32rem;
+  border-radius: 50%;
+  border: 1px solid #2FC4D9;
+  overflow: hidden;
+  opacity: 0.8;
+}
+
+.personal .user .user_img img {
+  width: 100%;
+  height: 100%;
+}
+
+.personal .user .user_info {
+  display: flex;
+  flex-direction: column;
+}
+
+.personal .user .user_info .user_name {
+  font-size: .32rem;
+  color: #1D1D1D;
+}
+
+.personal .user .user_info .set_email, .personal .user .user_info .user_email {
+  width: auto;
+  height: .48rem;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 0 .2rem;
+  margin-top: .22rem;
+  background: #F5F4F9;
+  color: #686868;
+  font-size: .26rem;
+  border-radius: .24rem;
+  box-sizing: border-box;
+}
+
+.personal .user .user_info .set_email .icon-arrow, .personal .user .user_info .user_email .icon-arrow {
+  margin-left: .2rem;
+  color: #686868;
+  font-size: .14rem;
+}
+
+.personal .order {
+  padding: 0 .32rem;
+  background: #fff;
+}
+
+.personal .order .order_tab {
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.personal .order .order_tab .tab_list {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: .32rem 0;
+}
+
+.personal .order .order_tab .tab_list img {
+  width: .72rem;
+  height: .72rem;
+}
+
+.personal .order .order_tab .tab_list span {
+  margin-top: 0.08rem;
+  font-size: .26rem;
+  color: #686868;
+}
+
+.personal .order .order_tab:before {
+  position: absolute;
+  content: '';
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 1px;
+  background-color: #E0E0E0;
+  transform-origin: 0 0;
+  transform: scaleY(0.5);
+}
+
+.personal .mgTop20 {
+  margin-top: .2rem;
+}
+
+.personal .menu {
+  margin-top: .2rem;
+}
+
+.personal .menu .menu_list {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 1.1rem;
+  padding: 0 .2rem 0 .32rem;
+  background: #fff;
+}
+
+.personal .menu .menu_list .menu_list_left {
+  display: flex;
+  align-items: center;
+  font-size: .32rem;
+  color: #1D1D1D;
+}
+
+.personal .menu .menu_list .menu_list_left img {
+  width: .48rem;
+  height: .48rem;
+  margin-right: .32rem;
+}
+
+.personal .menu .menu_list .arrow_right {
+  width: .48rem;
+  height: .48rem;
+}

BIN
src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_arrow_right.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_data_export.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_head.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_list_1.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_list_2.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_list_3.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_list_4.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_list_5.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_list_6.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_message.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_order_1.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_order_2.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_order_3.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_order_4.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_set.png


BIN
src/jfw/modules/app/src/web/staticres/jyapp/me/images/my_vip.png


+ 442 - 332
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html

@@ -466,9 +466,9 @@
 			}
 			
 			function setSessionStorage(){
-				if(sessionStorage){
-					sessionStorage.orderTabActive=$("ul .active").index();
-				}
+				sessionStorage.orderTabActive=$("ul .active").index();
+				sessionStorage.orderScrollTop=$(".main")[0].scrollTop;
+				sessionStorage.orderPageNum=parseInt(pageIndex)-1;
 			}
 			
 			function onceMore(e){
@@ -476,8 +476,22 @@
 				var orderCode = $(e).parent(".card-footer").prev(".card-content").find("a").attr("eid");
 				window.location.href="/jyapp/front/dataExport/toSieve?orderCode="+orderCode;;
 			}
-
-
+			
+			//1续费 2再次购买
+			function renewalOrBuyAgain(pattern,e){
+				setSessionStorage();
+				var orderCode = $(e).parent(".card-footer").prev(".card-content").find("a").attr("eid");
+				if (pattern==1){
+					/*var checkOrder_bl=checkOrder()
+					if (checkOrder_bl){
+						return;
+					}*/
+					window.location.href="/jyapp/vipsubscribe/renewPayPage?orderCode="+orderCode;   
+				}else if (pattern==2){
+					window.location.href="/jyapp/vipsubscribe/vipsubscribe_new?orderCode="+orderCode;
+				}
+			}
+			
 			//删除订单
 			function deleteOrder(id,obj,cancel) {
 			        $.confirm({
@@ -706,7 +720,7 @@
 																}else {
 																	$(obj).parent().parent().remove();
 																	$(".card_lists").empty();
-			                                   					 	queryOrder($("ul .active").index());
+			                                   					 	queryOrder($("ul .active").index(),10);
 																}
 			                                   					 
 			                                                }
@@ -762,7 +776,7 @@
 						$(".tabs>.tab").eq(index).show().siblings().hide();
 						$(".card_lists").empty();
 						$("body").scrollTop(0);
-						queryOrder(index)
+						queryOrder(index,10)
 					})
 				})
 				
@@ -793,11 +807,12 @@
 					let isvip_order=$(".media").attr("isviporder");
 					//vip支付;
 					if (isvip_order=="true"){
-						var orderCode =$(".media").attr("orderCode");
+						var orderCode =$(".media").attr("eid");
 						if(!canpay)return  
 		            	canpay=false;
-			            $.post("/subscribepay/vipsubscribe/orderToPay",{"orderCode":orderCode},function(r){
+			            $.post("/subscribepay/vipsubscribe/orderToPay",{"orderCode":orderCode,"pay_way":pay_way},function(r){
 			            	if(r.success){
+								alert( JSON.stringify(r))
 			            		  if(pay_way=="wx_app"){
 					                  JyObj.wxPay(r.data.res);
 					                }else{
@@ -886,13 +901,47 @@
 					$(".loading_").hide();
 				}	
 				
-		        
+				function getParam(pname) {
+				    var params = location.search.substr(1);
+				    var ArrParam = params.split('&');
+				    if (ArrParam.length == 1) { 
+				        return params.split('=')[1];
+				    }
+				    else {
+				        //多个参数参数的情况
+				        for (var i = 0; i < ArrParam.length; i++) {
+				            if (ArrParam[i].split('=')[0] == pname) {
+				                return ArrParam[i].split('=')[1];
+				            }
+				        }
+				    }
+				}
 				if(sessionStorage.orderTabActive){
 					$(".buttons-tab .tab-link").eq(sessionStorage.orderTabActive).addClass("active").siblings().removeClass("active");
-					queryOrder(sessionStorage.orderTabActive);
+					var orderPageNum=parseInt(sessionStorage.orderPageNum);
+					queryOrder(sessionStorage.orderTabActive,orderPageNum*10);
+					sessionStorage.removeItem("orderPageNum");
 					sessionStorage.removeItem("orderTabActive");
+					if(sessionStorage.orderScrollTop){
+						setTimeout(function(){
+							$(".main")[0].scrollTop=parseInt(sessionStorage.orderScrollTop);
+						},500)
+						setTimeout(function(){
+							sessionStorage.removeItem("orderScrollTop");
+						},2000)
+						
+					}
 				}else{
-					queryOrder();
+					//后续版本用
+					var active=getParam("active");
+					if (active){
+						$(".buttons-tab .tab-link").eq(active).addClass("active").siblings().removeClass("active");
+						$(".tabs>.tab").eq(active).show().siblings().hide();
+						$(".card_lists").empty();
+						queryOrder(active,10);
+					}else{
+						queryOrder(0,10);
+					}
 				}
 				
 			})
@@ -901,13 +950,14 @@
 			/*------------------------------------------------------------------*/	
 				//查询订单ajax
 				//typ  0全部 1未支付 2已支付3已取消
-				function queryOrder(typ){
+				function queryOrder(typ,page_size){
 					var result = true;
 					$.ajax({
 						type:"post",
 						url:"/subscribepay/orderListDetails/myOrder",
 						data:{
-							"type":typ
+							"type":typ,
+							"page_size":page_size
 						},
 						async:false,
 						dataType: 'json',
@@ -915,7 +965,11 @@
 							$(".loading_").hide();
 							var list=data.res;
 							dataCache =data.res;
-							pageIndex=2;
+							if(page_size!=10){
+								pageIndex=parseInt(page_size/10)+1;
+							}else{
+								pageIndex=2;
+							}
 						    hasNextPage=data.hasNextPage;
 							if (data.res&&data.res.length>0){
 								structureHtml(data.res);	
@@ -1019,8 +1073,6 @@
 				pay_way="wx_app";
 				this_e=e;
 			}
-			
-
 		
 			//提示框
 			var EasyAlert = {
@@ -1071,338 +1123,396 @@
 				function structureHtml(object){
 						var listhtml='';
 						for(var index in object){
-					    var obj=object[index];
-						if(obj.product_type=="历史数据"){
-					    	count++;
-							var id = obj.id;
-							//订单编号
-	                        var orderCode = obj.order_code;
-	                        //创建时间
-	                        var createTime=obj.create_time;
-	                    	createTime=createTime.replace(/-/g,".")
-	                        //选择时间
-	                        var publishTime = obj.filter_publishtime;
-	                        if(!publishTime){
-	                            publishTime = "全部";
-	                        }else{
-	                        	 if(publishTime.length==11){
-	                        	 	if(publishTime.slice(0,1)!="_"){
-	                        	 		var publishtime_=publishTime.slice(0,10);
-	                        	 		publishTime=timestampToTime(publishtime_);
-	                        	 		publishTime=publishTime+"-";
-	                        	 	}else{
-	                        	 		var publishtime_=publishTime.slice(1,11);
-	                        	 		publishTime=timestampToTime(publishtime_);
-	                        	 		publishTime=publishTime+"前全部";
-	                        	 	}
-	                        	 }else{
-	                        	 	 //publishTime= publishTime.replace(/\./g,"/")
-	                        	 }
-	                        }
-	                        //订单金额
-	                        var orderMoney = obj.order_money;
-	                        //金额格式化 小数点前 1,000
-	                        orderMoney=orderMoney+"";
-	       	             	orderMoney_1=toThousands(orderMoney.split(".")[0]);
-							orderMoney_2=orderMoney.split(".")[1];
-	       	             	if(orderMoney_2){
-	       	             		orderMoney=orderMoney_1+"."+orderMoney_2;
-	       	             	}else{
-	       	             		orderMoney=orderMoney_1;
-	       	             	}
-	                        //1标准字段包 2高级字段包
-	                        var spec = obj.data_spec;
-	                        if(spec=="标准字段包"){
-	                        	spec_=1;
-	                        }else if(spec =="高级字段包"){
-	                        	spec_=2;
-	                        }
-	                        var filter_id =obj.filter_id;
+					   		var obj=object[index];
+							if(obj.product_type=="历史数据"){
+					    		count++;
+								var id = obj.id;
+								//订单编号
+	                       		var orderCode = obj.order_code;
+	                        	//创建时间
+	                        	var createTime=obj.create_time;
+	                    		createTime=createTime.replace(/-/g,".")
+	                        	//选择时间
+	                        	var publishTime = obj.filter_publishtime;
+	                        	if(!publishTime){
+	                           		publishTime = "全部";
+	                        	}else{
+	                        		if(publishTime.length==11){
+	                        	 		if(publishTime.slice(0,1)!="_"){
+	                        	 			var publishtime_=publishTime.slice(0,10);
+	                        	 			publishTime=timestampToTime(publishtime_);
+	                        	 			publishTime=publishTime+"-";
+		                        	 	}else{
+		                        	 		var publishtime_=publishTime.slice(1,11);
+		                        	 		publishTime=timestampToTime(publishtime_);
+		                        	 		publishTime=publishTime+"前全部";
+		                        	 	}
+		                        	 }else{
+		                        	 	 //publishTime= publishTime.replace(/\./g,"/")
+		                        	 }
+	                        	}
+		                        //订单金额
+		                        var orderMoney = obj.order_money;
+		                        //金额格式化 小数点前 1,000
+		                        orderMoney=orderMoney+"";
+		       	             	orderMoney_1=toThousands(orderMoney.split(".")[0]);
+								orderMoney_2=orderMoney.split(".")[1];
+		       	             	if(orderMoney_2){
+		       	             		orderMoney=orderMoney_1+"."+orderMoney_2;
+		       	             	}else{
+		       	             		orderMoney=orderMoney_1;
+		       	             	}
+		                        //1标准字段包 2高级字段包
+		                        var spec = obj.data_spec;
+		                        if(spec=="标准字段包"){
+		                        	spec_=1;
+		                        }else if(spec =="高级字段包"){
+		                        	spec_=2;
+		                        }
+		                        var filter_id =obj.filter_id;
 	                        
-	                        //订单状态 0待支付 1已完成 -1删除
-	                        //+'<span class="status notpay">'+orderStatus+'</span>'
-	                        var orderStatus = obj.order_status;
-	                        if(orderStatus==0){
-	                        	orderHtml=""
-	                        	orderStatus="待付款"
-	                        	orderHtml+='<span class="status notpay">'+orderStatus+'</span>'
-	                        	orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id +",this)\"></a>";
-	                        	iconHtml=""
-	                        	iconHtml+='<div class="card-footer">'
-											+'<a  class="btn cancle" onclick="cancelOrder('+id+',this)">取消订单</a>'
-											+'<a  class="btn pay_" onclick="choosePayWay(\''+orderMoney+'\','+spec_+',&quot;'+obj.filter_id+'&quot;,this)" >去支付</a>'
-										+'</div>'
-	                        }else if(orderStatus==1){
-	                        	orderStatus="已完成";
-	                        	orderHtml=""
-	                        	orderHtml+='<span class="status">'+orderStatus+'</span>'
-	                        	orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id +",this)\"></a>";
-	                        	iconHtml=""
-	                        	iconHtml+='<div class="card-footer">'
-											+'<a onclick="onceMore(this)" class="btn cancle">再次购买</a>'
-										+'</div>'
-	                        }else if(orderStatus==-2){
-	                        	orderStatus="已取消";
-	                        	orderHtml="";
-	                        	orderHtml+='<span class="status">'+orderStatus+'</span>'
-	                        	orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id +",this)\"></a>";
-	                        	iconHtml="";
-	                        	iconHtml+='<div class="card-footer">'
-											+'<a onclick="onceMore(this)" class="btn cancle">再次购买</a>'
-										+'</div>'
-	                        }
-	                        //订单总数
-	                        var data_count=obj.data_count;
-	                        //
-	                        var token = obj.token;
-	                        //关键词
-							if(obj.filter_keys && obj.filter_keys.split(",").length>0){
-								var keysHtml="";
-		                        var keysArr = obj.filter_keys.split(",");
-		                        var keysLen = keysArr.length;for(var j=0;j<keysLen;j++){
-		                            keysHtml += "<span>" + keysArr[j] + "&nbsp</span>";
+		                        //订单状态 0待支付 1已完成 -1删除
+		                        //+'<span class="status notpay">'+orderStatus+'</span>'
+		                        var orderStatus = obj.order_status;
+		                        if(orderStatus==0){
+		                        	orderHtml=""
+		                        	orderStatus="待付款"
+		                        	orderHtml+='<span class="status notpay">'+orderStatus+'</span>'
+		                        	orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id +",this)\"></a>";
+		                        	iconHtml=""
+		                        	iconHtml+='<div class="card-footer">'
+												+'<a  class="btn cancle" onclick="cancelOrder('+id+',this)">取消订单</a>'
+												+'<a  class="btn pay_" onclick="choosePayWay(\''+orderMoney+'\','+spec_+',&quot;'+obj.filter_id+'&quot;,this)" >去支付</a>'
+											+'</div>'
+		                        }else if(orderStatus==1){
+		                        	orderStatus="已完成";
+		                        	orderHtml=""
+		                        	orderHtml+='<span class="status">'+orderStatus+'</span>'
+		                        	orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id +",this)\"></a>";
+		                        	iconHtml=""
+		                        	iconHtml+='<div class="card-footer">'
+												+'<a onclick="onceMore(this)" class="btn cancle">再次购买</a>'
+											+'</div>'
+		                        }else if(orderStatus==-2){
+		                        	orderStatus="已取消";
+		                        	orderHtml="";
+		                        	orderHtml+='<span class="status">'+orderStatus+'</span>'
+		                        	orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id +",this)\"></a>";
+		                        	iconHtml="";
+		                        	iconHtml+='<div class="card-footer">'
+												+'<a onclick="onceMore(this)" class="btn cancle">再次购买</a>'
+											+'</div>'
 		                        }
-		                 	}else{
-		                 		keysHtml=""
-		                 	}
+		                        //订单总数
+		                        var data_count=obj.data_count;
+		                        //
+		                        var token = obj.token;
+		                        //关键词
+								if(obj.filter_keys && obj.filter_keys.split(",").length>0){
+									var keysHtml="";
+			                        var keysArr = obj.filter_keys.split(",");
+			                        var keysLen = keysArr.length;for(var j=0;j<keysLen;j++){
+			                            keysHtml += "<span>" + keysArr[j] + "&nbsp</span>";
+			                        }
+			                 	}else{
+			                 		keysHtml=""
+			                 	}
 							
-							listhtml+='<div class="card">'
-											+'<div class="card-header">'
-												+'<span class="time">'+createTime+'</span>'
-												+orderHtml
-											+'</div>'
-											+'<div class="card-content">'
-													+'<a  eid='+orderCode+' class="media" id="'+orderCode+'">'
-													+'<div class="media-img">'
-														+'<img src="/jyapp/images/myorder/historical_data.png">'
-													+'</div>'
-													+'<div class="media-info">'
-														+'<p class="item-ifo ellipsis">关键词:'+ keysHtml+'</p>'
-														+'<p class="item-ifo ellipsis">数据量:'+ data_count +'条</p>'
-														+'<p class="item-ifo ellipsis">数据规格:'+spec+'</p>'
-														+'<p class="item-ifo ellipsis">筛选日期:'+publishTime+'</p>'
+								listhtml+='<div class="card">'
+												+'<div class="card-header">'
+													+'<span class="time">'+createTime+'</span>'
+													+orderHtml
+												+'</div>'
+												+'<div class="card-content">'
+														+'<a  eid='+orderCode+' class="media" id="'+orderCode+'">'
+														+'<div class="media-img">'
+															+'<img src="/jyapp/images/myorder/historical_data.png">'
+														+'</div>'
+														+'<div class="media-info">'
+															+'<p class="item-ifo ellipsis">关键词:'+ keysHtml+'</p>'
+															+'<p class="item-ifo ellipsis">数据量:'+ data_count +'条</p>'
+															+'<p class="item-ifo ellipsis">数据规格:'+spec+'</p>'
+															+'<p class="item-ifo ellipsis">筛选日期:'+publishTime+'</p>'
+														+'</div>'
+													+'</a>'
+													+'<div class="price">'
+														+'<strong class="current">¥'+orderMoney+'</strong>'
 													+'</div>'
-												+'</a>'
-												+'<div class="price">'
-													+'<strong class="current">¥'+orderMoney+'</strong>'
 												+'</div>'
+												+iconHtml
 											+'</div>'
-											+iconHtml
-										+'</div>'
 							
-						}else if(obj.product_type=="VIP订阅"){
+							}else if(obj.product_type=="VIP订阅"){
 								count++;
-							var id_vip = obj.id;
-							//订单编号
-	                        var orderCode_vip = obj.order_code;
-	                        //创建时间
-	                        var createTime_vip=obj.create_time;
-	                        createTime_vip =createTime_vip.replace(/-/g,".")
-	                        //筛选条件
-	                        var filter_vip = JSON.parse(obj.filter);
-	                        //地区
-							var region_vipArr = filter_vip.area;
-	                        var region_vip=""
-	                        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++;
+								var id_vip = obj.id;
+								//订单编号
+		                        var orderCode_vip = obj.order_code;
+		                        //创建时间
+		                        var createTime_vip=obj.create_time;
+		                        createTime_vip =createTime_vip.replace(/-/g,".")
+		                        //筛选条件
+		                        var filter_vip = JSON.parse(obj.filter);
+		                        //地区
+								var region_vipArr = filter_vip.area;
+		                        var region_vip=""
+		                        var province_length=0;
+		                        var city_length=0;
+								var vip_type=obj.vip_type;
+								if (vip_type!=2){
+									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{
-										city_length+=region_vipArr[i].length;
+										region_vip="全国";
 									}
-								}
-							}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 = filter_vip.industry.length;	//数组
-	                        if(industry_vip==0){
-	                        	industry_vip="全";
-	                        }else{
-	                        	industry_vip=industry_vip+"个";
-	                        }
-	                        var cyclecount_vip = filter_vip.cyclecount;	//时长
-	                        var cycleunit_vip = filter_vip.cycleunit;//单位 1:年 2:月 3:天
-	                        //订阅周期
-	                        var effectiveduration_vip=""
-	                        if((obj.vip_starttime!=undefined)&&(obj.vip_endtime!=undefined)){
-					       		var start_time_vip = obj.vip_starttime;
-					       		var end_time_vip = obj.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){
-						    		effectiveduration_vip=year+"年"+month+"个月";
-						    	}else if(year !== 0&& month ===0){
-						    		effectiveduration_vip=year+"年";
-						    	}else if(year === 0&& month !==0){
-						    		effectiveduration_vip=month+"个月";
-						    	}
-						    	if(cycleunit_vip==3){
-						    		effectiveduration_vip=cyclecount_vip+"天";	 
-						    	}
-					      	}else{
-						       	if(cycleunit_vip==1){
-		                        	effectiveduration_vip=cyclecount_vip+"年";
-		                        }else if(cycleunit_vip==2){
-		                        	effectiveduration_vip=cyclecount_vip+"个月"
-		                        }else if(cycleunit_vip==3){
-		                        	effectiveduration_vip=cyclecount_vip+"天";	                    
-		                        }
-						    }
-	                        
-	                        var vip_status =obj.i_vip_status;	// 1:试用 2:正式 -1:试用到期 -2:正式到期
-	                        //订单状态 0待支付 1已完成 -1删除  
-	                        var orderStatus_vip =  obj.order_status;
-	                        var token_vip = obj.token;
-	                        if(sessionStorage&&sessionStorage.getItem("paySuccess_"+obj.order_code)!=null){
-								orderStatus = sessionStorage.getItem("paySuccess_"+obj.order_code);
-								if (orderTabActive==1&&orderStatus==1){
-									gopayIndex = index;
-									psss=obj.order_code;
-									continue;
+									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 = filter_vip.industry.length;	//数组
+			                        if(industry_vip==0){
+			                        	industry_vip="全行业";
+			                        }else{
+			                        	industry_vip=industry_vip+"个行业";
+			                        }
+			                        var cyclecount_vip = filter_vip.cyclecount;	//时长
+			                        var cycleunit_vip = filter_vip.cycleunit;//单位 1:年 2:月 3:天
+			                        //订阅周期
+			                        var effectiveduration_vip=""
+			                        if((obj.vip_starttime!=undefined)&&(obj.vip_endtime!=undefined)){
+							       		var start_time_vip = obj.vip_starttime;
+							       		var end_time_vip = obj.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){
+								    		effectiveduration_vip=year+"年"+month+"个月";
+								    	}else if(year !== 0&& month ===0){
+								    		effectiveduration_vip=year+"年";
+								    	}else if(year === 0&& month !==0){
+								    		effectiveduration_vip=month+"个月";
+								    	}
+								    	if(cycleunit_vip==3){
+								    		effectiveduration_vip=cyclecount_vip+"天";	 
+								    	}
+							      	}else{
+								       	if(cycleunit_vip==1){
+				                        	effectiveduration_vip=cyclecount_vip+"年";
+				                        }else if(cycleunit_vip==2){
+				                        	effectiveduration_vip=cyclecount_vip+"个月"
+				                        }else if(cycleunit_vip==3){
+				                        	effectiveduration_vip=cyclecount_vip+"天";	                    
+				                        }
+								    }
 								}else{
-									sessionStorage.removeItem("paySuccess_"+obj.order_code);
+									//区域
+		                       		var filterObj =filter_vip;
+		                       		var region_vip ="";
+		                       		//升级订单 单独处理
+						         	if(!$.isEmptyObject(filterObj.addarea)){
+						              	var cityNum_u=0;
+						              	var provinceNum_u=0;
+							         	for(var i in filterObj.addarea) {
+							                let citys_u=filterObj.addarea[i];
+							                if (citys_u=="no"){
+							                	 region_vip="无"
+							                }else{
+							                	if (citys_u.length>0){
+								                	cityNum_u+=citys_u.length;
+								                }else{
+								                	provinceNum_u++;
+								                }
+							                }
+						                }
+						                if(provinceNum_u>0) region_vip= region_vip + provinceNum_u+"个省级区域";
+						                if(cityNum_u>0){
+						                	if(provinceNum_u>0) region_vip= region_vip+"、"
+						                	region_vip = region_vip+ cityNum_u+"个地市";
+						                }
+						         	}else {
+						         		region_vip="全国";
+						         	}
+						         	//行业
+						         	var industry_vip="";
+						         	if(!$.isEmptyObject(filterObj.addindustry)) {
+						         		if(filterObj.addindustry[0]=="no"){
+							         		industry_vip="无";
+							         	}else{
+							         		if(filterObj.addindustry.length==0){
+							         			industry_vip="全行业";
+							         		}else{
+							         			industry_vip=filterObj.addindustry.length+"个行业";
+							         		}
+							         	}
+						         	}else{
+					         			industry_vip="全行业";
+						         	}
+						         	//延长周期
+						         	var effectiveduration_vip="";
+						        	if(filterObj.cycleunit==1){
+								       effectiveduration_vip=filterObj.cyclecount+"年";
+								    }else if(filterObj.cycleunit==2){
+								       effectiveduration_vip=filterObj.cyclecount+"个月";
+								    }else if(filterObj.cycleunit==3){
+								       effectiveduration_vip=filterObj.cyclecount+"天";
+								    }else if (filterObj.cycleunit==-1){
+								        effectiveduration_vip="不延期";
+								    }
 								}
-							}
-	                         //订单金额
-	                        var orderMoney_vip = obj.order_money;
-	                        //金额格式化 小数点前 1,000
-	                        orderMoney_vip=orderMoney_vip+"";
-	       	             	orderMoney_vip1=toThousands(orderMoney_vip.split(".")[0]);
-							orderMoney_vip2=orderMoney_vip.split(".")[1];
-	       	             	if(orderMoney_vip2){
-	       	             		orderMoney_vip=orderMoney_vip1+"."+orderMoney_vip2;
-	       	             	}else{
-	       	             		orderMoney_vip=orderMoney_vip1;
-	       	             	}
-								console.log(orderMoney_vip)
-	                        if(orderStatus_vip==0){
-	                        	orderStatus_vip="待付款"
-	                        	orderHtml=""
-	                        	orderHtml+='<span class="status notpay">'+orderStatus_vip+'</span>'
-	                    		orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id_vip +",this)\"></a>";
-	                        	iconHtml=""
-	                        	iconHtml+='<div class="card-footer">'
-											+'<a  class="btn cancle" onclick="cancelOrder('+id_vip+',this)">取消订单</a>'
-											+'<a href="javascript:void(0)" onclick="choosePayWay_vip(\''+orderMoney_vip+'\','+orderMoney+',&quot;'+orderMoney+'&quot;,this)" class="gopay_btn pay" filterid="'+obj.filter_id+'" token="'+token_vip+'" id="'+id_vip+'" orderCode='+orderCode_vip+'>去支付</a>'
-										+'</div>'
-	                        }else if(orderStatus_vip==1){
-	                        	orderStatus_vip="已完成";
-	                        	orderHtml=""
-	                        	orderHtml+='<span class="status">'+orderStatus_vip+'</span>'
-	                    		orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id_vip +",this)\"></a>";
-	                        	iconHtml=""
-	                        	//最后一次购买完 1:试用 2:正式 -1:试用到期 -2:正式到期
-	                        	console.log(obj.lastbuy_code)
-	                        	if((vip_status=="-2")&&(obj.lastbuy_code!=undefined)){
-	                        		iconHtml+='<div class="card-footer">'
-											+'<a  onclick="renewalOrBuyAgain(2,this)" class="btn cancle">再次购买</a>'
-										+'</div>'
-	                        	}else if((vip_status=="2")&&(obj.lastbuy_code!=undefined)){
-	                        		iconHtml+='<div class="card-footer">'
-											+'<a  onclick="renewalOrBuyAgain(1,this)" class="btn cancle">续费</a>'
-										+'</div>'
-	                        	}
-	                        }else if(orderStatus_vip==-2){
-	                        	orderStatus_vip="已取消";
-	                        	orderHtml="";
-	                        	orderHtml+='<span class="status">'+orderStatus_vip+'</span>'
-	                        	orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id_vip +",this)\"></a>";
-	                        	iconHtml="";
-	                        	iconHtml+='<div class="card-footer">'
-										+'</div>'
-	                        }
-	                        //vip状态 0不是vip 1试用 2正式
-	                        if (orderStatus_vip!="已完成"){
-	                        //未支付 或 已取消
-	                        	listhtml+='<div class="card">'
-											+'<div class="card-header">'
-												+'<span class="time" style="color:#888888">'+createTime_vip+'</span>'
-												+orderHtml
+								
+		                        
+		                        var vip_status =obj.i_vip_status;	// 1:试用 2:正式 -1:试用到期 -2:正式到期
+		                        //订单状态 0待支付 1已完成 -1删除  
+		                        var orderStatus_vip =  obj.order_status;
+		                        var token_vip = obj.token;
+		                        if(sessionStorage&&sessionStorage.getItem("paySuccess_"+obj.order_code)!=null){
+									orderStatus = sessionStorage.getItem("paySuccess_"+obj.order_code);
+									if (orderTabActive==1&&orderStatus==1){
+										gopayIndex = index;
+										psss=obj.order_code;
+										continue;
+									}else{
+										sessionStorage.removeItem("paySuccess_"+obj.order_code);
+									}
+								}
+		                         //订单金额
+		                        var orderMoney_vip = obj.order_money;
+		                        //金额格式化 小数点前 1,000
+		                        orderMoney_vip=orderMoney_vip+"";
+		       	             	orderMoney_vip1=toThousands(orderMoney_vip.split(".")[0]);
+								orderMoney_vip2=orderMoney_vip.split(".")[1];
+		       	             	if(orderMoney_vip2){
+		       	             		orderMoney_vip=orderMoney_vip1+"."+orderMoney_vip2;
+		       	             	}else{
+		       	             		orderMoney_vip=orderMoney_vip1;
+		       	             	}
+									console.log(orderMoney_vip)
+		                        if(orderStatus_vip==0){
+		                        	orderStatus_vip="待付款"
+		                        	orderHtml=""
+		                        	orderHtml+='<span class="status notpay">'+orderStatus_vip+'</span>'
+		                    		orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id_vip +",this)\"></a>";
+		                        	iconHtml=""
+		                        	iconHtml+='<div class="card-footer">'
+												+'<a  class="btn cancle" onclick="cancelOrder('+id_vip+',this)">取消订单</a>'
+												+'<a href="javascript:void(0)" onclick="choosePayWay_vip(\''+orderMoney_vip+'\','+orderMoney+',&quot;'+orderMoney+'&quot;,this)" class="gopay_btn pay" filterid="'+obj.filter_id+'" token="'+token_vip+'" id="'+id_vip+'" orderCode='+orderCode_vip+'>去支付</a>'
 											+'</div>'
-											+'<div class="card-content">'
-												+'<a  eid='+orderCode_vip+' class="media" isvipOrder="true">'
-													+'<div class="media-img">'
-														+'<img src="/vipsubscribe/image/vip_order.png">'
-													+'</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">订阅周期:'+effectiveduration_vip+'</p>'
-													+'</div>'
-												+'</a>'
-												+'<div class="price">'
-													+'<strong class="current">¥'+orderMoney_vip+'</strong>'
-												+'</div>'
+		                        }else if(orderStatus_vip==1){
+		                        	orderStatus_vip="已完成";
+		                        	orderHtml=""
+		                        	orderHtml+='<span class="status">'+orderStatus_vip+'</span>'
+		                    		orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id_vip +",this)\"></a>";
+		                        	iconHtml=""
+		                        	//最后一次购买完 1:试用 2:正式 -1:试用到期 -2:正式到期
+		                        	console.log(obj.lastbuy_code)
+		                        	if((vip_status=="-2")&&(obj.lastbuy_code!=undefined)){
+		                        		iconHtml+='<div class="card-footer">'
+												+'<a  onclick="renewalOrBuyAgain(2,this)" class="btn cancle">再次购买</a>'
+											+'</div>'
+		                        	}else if((vip_status=="2")&&(obj.lastbuy_code!=undefined)){
+		                        		iconHtml+='<div class="card-footer">'
+												+'<a  onclick="renewalOrBuyAgain(1,this)" class="btn cancle">续费</a>'
 											+'</div>'
-											+iconHtml
-									+'</div>'
-	                        }else{
-			                       //有效时间
-			                       var starttime_vip= obj.vip_starttime+"";
-			                       var endtime_vip= obj.vip_endtime+"";
-			                       starttime_vip= starttime_vip.split(" ")[0].replace(/-/g,".")
-			                       endtime_vip= endtime_vip.split(" ")[0].replace(/-/g,".")
-			                       var effectivetime_vip =starttime_vip+"-"+endtime_vip;
-			                        //已完成
-			                        	listhtml+='<div class="card">'
-													+'<div class="card-header">'
-														+'<span class="time" style="color:#888888">'+createTime_vip+'</span>'
-														+orderHtml
+		                        	}
+		                        }else if(orderStatus_vip==-2){
+		                        	orderStatus_vip="已取消";
+		                        	orderHtml="";
+		                        	orderHtml+='<span class="status">'+orderStatus_vip+'</span>'
+		                        	orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id_vip +",this)\"></a>";
+		                        	iconHtml="";
+		                        	iconHtml+='<div class="card-footer">'
+											+'</div>'
+		                        }
+		                        //vip状态 0不是vip 1试用 2正式
+		                        if (orderStatus_vip!="已完成"){
+		                        //未支付 或 已取消
+		                        	listhtml+='<div class="card">'
+												+'<div class="card-header">'
+													+'<span class="time" style="color:#888888">'+createTime_vip+'</span>'
+													+orderHtml
+												+'</div>'
+												+'<div class="card-content">'
+													+'<a  eid='+orderCode_vip+' class="media" isvipOrder="true">'
+														+'<div class="media-img">'
+															+'<img src="/vipsubscribe/image/vip_order.png">'
+														+'</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">订阅周期:'+effectiveduration_vip+'</p>'
+														+'</div>'
+													+'</a>'
+													+'<div class="price">'
+														+'<strong class="current">¥'+orderMoney_vip+'</strong>'
 													+'</div>'
-													+'<div class="card-content">'
-														+'<a  eid='+orderCode_vip+' class="media" isvipOrder="true">'
-															+'<div class="media-img">'
-																+'<img src="/vipsubscribe/image/vip_order.png">'
-															+'</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">订阅周期:'+effectiveduration_vip+'</p>'
-																+'<p class="item-ifo ellipsis">有效日期:'+effectivetime_vip+'</p>'
+												+'</div>'
+												+iconHtml
+										+'</div>'
+		                        }else{
+				                       //有效时间
+				                       var starttime_vip= obj.vip_starttime+"";
+				                       var endtime_vip= obj.vip_endtime+"";
+				                       starttime_vip= starttime_vip.split(" ")[0].replace(/-/g,".")
+				                       endtime_vip= endtime_vip.split(" ")[0].replace(/-/g,".")
+				                       var effectivetime_vip =starttime_vip+"-"+endtime_vip;
+				                        //已完成
+				                        	listhtml+='<div class="card">'
+														+'<div class="card-header">'
+															+'<span class="time" style="color:#888888">'+createTime_vip+'</span>'
+															+orderHtml
+														+'</div>'
+														+'<div class="card-content">'
+															+'<a  eid='+orderCode_vip+' class="media" isvipOrder="true">'
+																+'<div class="media-img">'
+																	+'<img src="/vipsubscribe/image/vip_order.png">'
+																+'</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">订阅周期:'+effectiveduration_vip+'</p>'
+																	+'<p class="item-ifo ellipsis">有效日期:'+effectivetime_vip+'</p>'
+																+'</div>'
+															+'</a>'
+															+'<div class="price">'
+																+'<strong class="current">¥'+orderMoney_vip+'</strong>'
 															+'</div>'
-														+'</a>'
-														+'<div class="price">'
-															+'<strong class="current">¥'+orderMoney_vip+'</strong>'
 														+'</div>'
-													+'</div>'
-													+iconHtml
-											+'</div>'
-	                        }
-						} //else if  ..end
-					}
+														+iconHtml
+												+'</div>'
+		                        }
+							} //else if  ..end
+					} //for  ..end
 					
 					appendList($(listhtml));
 				}

+ 283 - 409
src/jfw/modules/app/src/web/templates/me/index.html

@@ -5,6 +5,7 @@
 	<link rel="stylesheet" type="text/css" href="/jyapp/me/css/reset.css?v={{Msg "seo" "version"}}" />
 	<link rel="stylesheet" type="text/css" href="/jyapp/me/css/index.css?v={{Msg "seo" "version"}}1" />
 	<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
+	<link rel="stylesheet" href="/jyapp/me/css/personal.css?v=1">
 	<script src="/jyapp/js/jquery.js?v={{Msg "seo" "version"}}" type="text/javascript" charset="utf-8"></script>
 	<script src="/jyapp/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
 	{{include "/common/js.html"}}
@@ -12,425 +13,310 @@
 </head>
 <body>
 <style>
-			@font-face {
-			  font-family: 'iconfont';  /* project id 687854 */
-			  src: url('//at.alicdn.com/t/font_687854_s317iriqswc.eot');
-			  src: url('//at.alicdn.com/t/font_687854_s317iriqswc.eot?#iefix') format('embedded-opentype'),
-			  url('//at.alicdn.com/t/font_687854_s317iriqswc.woff2') format('woff2'),
-			  url('//at.alicdn.com/t/font_687854_s317iriqswc.woff') format('woff'),
-			  url('//at.alicdn.com/t/font_687854_s317iriqswc.ttf') format('truetype'),
-			  url('//at.alicdn.com/t/font_687854_s317iriqswc.svg#iconfont') format('svg');
-			}
-			.iconfont{
-			    font-family:"iconfont" !important;
-			    font-size:18px;font-style:normal;
-			    -webkit-font-smoothing: antialiased;
-			    -webkit-text-stroke-width: 0.2px;
-			    -moz-osx-font-smoothing: grayscale;
-			}
-			.myorderIcon{
-				color: #FFB901;
-			}
-			
-			#main .order ul li {
-			    padding-left: 50px;
-			    padding-right: 15px;
-			    line-height: 55px;
-			    height: 55px;
-			    position: relative;
-			    font-size: 15px;
-			    border-top: 1px solid #E6E6E6;
-			}
-			#main .vip ul li{
-			    padding-right: 15px;
-			    line-height: 55px;
-			    height: 55px;
-			    position: relative;
-			    font-size: 15px;
-			    border-top: 1px solid #E6E6E6;
-			}
-			#main .order, #main .vip {
-			    margin-top: 13px;
-			    background: #fff;
-			    border-bottom: 1px solid #E6E6E6;
-			}
-			#main .order i.jyapp-icon,#main .vip i .jyapp-icon {
-			    top: 2px;
-			}
-			#main .notice i.jyapp-icon, #main .follow i.jyapp-icon , #main .order i.jyapp-icon, #main .vip i.jyapp-icon{
-			    font-size: 13px;
-			    color: #C2C2C2;
-			    position: absolute;
-			    right: 15px;
-			    bottom: 0px;
-			    margin: auto;
-			    line-height: inherit;
-			}
 
-			#main .order .redspot,#main .vip .redspot {
-			    right: 35px;
-			}
-			#main .order ul li span,#main .vip ul li span {
-			    font-size: 24px;
-			    color: #ffba00;
-			    position: absolute;
-			    left: 15px;
-			}
-			.modifyPass {
-			  margin-top: 13px;
-			  height: 55px;
-			  line-height: 55px;
-			  border-bottom: 1px solid #E6E6E6;
-			  overflow: hidden;
-			  display: block;
-			  position: relative;
-			}
+.personal .navbar .navbar_left {
+    font-size: 18px;
+    font-weight: 200;
+    color: #444444;
+}
+.personal .navbar{
+	padding-top: 0.66rem;
+	height:auto;
+}
+.personal .navbar .navbar_right .message {
+  	position: relative;
+}
 
-			.modifyPass strong {
-			  font-size: 15px;
-			  padding-left: 15px;
-			}
-			
-			.modifyPass i {
-			  font-size: 20px;
-			  color: #2FB8CB;
-		      margin-right:9px;
-			  top: 4px;
-			  margin-left: 15px;
-			}
-			
-			.modifyPass span {
-			    font-size: 13px;
-			    color: #C2C2C2;
-			    position: absolute;
-			    right: 15px;
-			    top: 4px;
-			    bottom: 0px;
-			    margin: auto;
-			    line-height: inherit;
-			}
-			
-			.installList {
-			  margin-top: 13px;
-			  border-top: 1px solid #E6E6E6;
-			  border-bottom: 1px solid #E6E6E6;
-			  background-color: #fff;
-			}
-			.installList li{
-			  height: 55px;
-			  line-height: 55px;
-			}
-			.installList li .modifyPass {
-			  display: block;
-			  margin-top: 0;
-			}
-			.installList li:last-child .modifyPass {
-				border-bottom: none;
-			}
-			.installList li .modifyPass strong{
-			  padding-left: 0px;
-			}
+.personal .navbar .navbar_right .message .dot {
+  	position: absolute;
+  	top: 1px;
+  	right: 3px;
+  	display: inline-block;
+  	width: .16rem;
+  	height: .16rem;
+  	background: #F24718;
+ 	border-radius: 50%;
+	display:none;
+}
 
-			#myhead{
-			    width: 100%;
-			    position: fixed;
-			    z-index: 99999999;
-			}
-			
-			#main{
-				position: relative;
-    			top: 165px;
-			}
-			.vipimg{
-				width:28px;
-				margin-left:15px;
-				margin-top:12px;
-			}
-			.vipa{
-				display: block;
-				margin-top: -63px;
-				margin-left: 50px;
-			}
-			.emailimg{
-				width:28px;
-				margin-left: -37px;
-				margin-top:12px;
-			}
-			.emaila{
-				display: block;
-				margin-top: -63px;
-			}
-			.setEmail{
-				margin-left: 5.75rem !important;
-			    font-size: 14px !important;
-			    color: #686868 !important;
-			}
-			
+.shadow{
+	-webkit-tap-highlight-color: transparent;
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    user-select:none;
+}
+.redspot {
+    position: absolute;
+    width: 8px;
+    height: 8px;
+    background: 
+    #f12c20;
+    border-radius: 100%;
+	right: 0.8rem;
+	display:none;
+}
 </style>
-	<div id="myhead">
-		<div class="app-layout-header fiexmy">
-		我的
-	</div>
-<!--个人中心start-->
-	<div class="core">
-		<div>
-			<div class="coreLeft">
-				<img id="headimage" src="" onerror="this.src='/jyapp/me/images/core_1.png'"/>
-			</div>
-			<div class="coreRight">
-			{{if session "userId"}}
-			{{else}}
-				<!--<a href="/jyapp/free/login">登录/注册</a>-->
-			{{end}}
-			</div>
-			<div class="clearfix"></div>
-		</div>
-	</div>
-	</div>
-	<!--个人中心end-->
-	<div id="main">
-		<!--通知start-->
-		<div class="notice" id="notice">
-			<span class="jyapp-icon jyapp-icon-tongzhi"></span>
-			<a>
-				<strong>通知</strong>
-				<i class="redspot"></i>
-			</a>
-			<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
-		</div>
-		<!--通知end-->
-		
-		<!--vip订阅开始-->
-		<div class="vip">
-			<ul>
-				<li class="vip_">
-				<img src="/jyapp/me/images/vip.svg" class="vipimg"/>
-					<a class="vipa">VIP订阅</a>
-					<i class="redspot"></i>
-					<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
-				</li>			
-			</ul>
-		</div>
-		
-		<!--vip订阅结束-->
-		
-		<!--我的订单-->
-		{{if .T.pullnew}}
-		<div class="notice pullnew" id="pullnew">
-			<img src="/jyapp/active/pullnew/images/pullnew.png">
-			<a>
-				<strong>邀请活动</strong>
-				<i src="/jyapp/active/pullnew/pullnew.png">资料包限时免费领</i>
-			</a>
-			<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
-		</div>
-		{{end}}
-		<!--我的订单-->
+    <div class="personal">
+        <div class="navbar">
+		<div style="height:1px;width:1.76rem"></div>
+            <div class="navbar_left">我的</div>
+            <div class="navbar_right">
+				<div class="message">
+               		<img src="/jyapp/me/images/my_set.png" class="install shadow"/>
+				</div>
+				<div class="message">
+	                <img src="/jyapp/me/images/my_message.png" class="notice" id="notice">
+					<span class="dot"></span>
+				</div>
+            </div>
+        </div>
+        <!-- 账号信息 -->
+		<div class="user">
+            <div class="user_img">
+                <img id="head_img" src="" onerror="this.src='/images/wx/persional/my_head.png?v=2'" >
+            </div>
+            <div class="user_info">
+                <span class="user_name" ></span>
+                <!-- 无绑定邮箱显示邮箱设置 -->
+                 <a class="set_email" style="display:none">
+                    <span>邮箱设置</span>
+                    <i class="iconfont icon-arrow"></i>
+                </a> 
+                <a class="user_email" style="display:none">
+                    <span></span>
+                    <i class="iconfont icon-arrow"></i>
+                </a>
+            </div>
+        </div>
+        <!-- 订单 -->
 		<div class="order">
-			<ul>
-				<li class="myOrder">
-					<span class="iconfont myorderIcon">&#xe60f;</span>
-					<a>我的订单</a>
-					<i class="redspot"></i>
-					<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
-				</li>	
-				<li class="myEmail">
-					<img src="/jyapp/me/images/email.svg" class="emailimg"/>
-					<a class="emaila">邮箱地址 <span class="setEmail"></span></a>
-					<i class="redspot"></i>
-					<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
-				</li>			
-			</ul>
-		</div>
-		<!--我的关注start-->
-		<div class="follow">
-			<ul>
-				<li class="listOne">
-					<span class="jyapp-icon jyapp-icon-guanzhuxiangmu"></span>
-					<a>我关注的项目</a>
-					<i class="redspot"></i>
-					<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
-				</li>
-				<li class="listTwo">
-					<span class="jyapp-icon jyapp-icon-guanzhuqiye"></span>
-					<a>我关注的企业</a>
-					<i class="redspot"></i>
-					<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
-				</li>
-			</ul>
-		</div>
-		<!--我的关注end-->
-		<!--设置里的-->
-			<div class="installList">
-				<ul>
-					<li class="shareOne">
-						<a class="modifyPass">
-							<i class="glyphicon qimingxing qmx-icon-fenxiang"></i>
-							<strong>分享给好友</strong>
-							<span class="jyapp-icon jyapp-icon-youjiantou"></span>
-						</a>
-					</li>
+            <div class="order_tab">
+                <a href="/jyapp/front/myOrder/toMyOrder?active=1" class="tab_list">
+                    <img src="/jyapp/me/images/my_order_1.png" alt="">
+                    <span>待付款</span>
+                </a>
+                <a href="/jyapp/front/myOrder/toMyOrder?active=2" class="tab_list">
+                    <img src="/jyapp/me/images/my_order_2.png" alt="">
+                    <span>已完成</span>
+                </a>
+                <a href="/jyapp/front/myOrder/toMyOrder?active=3" class="tab_list">
+                    <img src="/jyapp/me/images/my_order_3.png" alt="">
+                    <span>已取消</span>
+                </a>
+                <a href="/jyapp/front/myOrder/toMyOrder?active=0" class="tab_list">
+                    <img src="/jyapp/me/images/my_order_4.png" alt="">
+                    <span>全部订单</span>
+                </a>
+            </div>
+        </div>
+        <div class="menu">
+            <a class="menu_list vip">
+                <div class="menu_list_left ">
+                    <img src="/jyapp/me/images/my_vip.png" alt="">
+                    <span>VIP订阅</span>
+                </div>
+                <img class="arrow_right" src="/jyapp/me/images/my_arrow_right.png" alt="">
+            </a> 
+            <a class="menu_list toSieve" >
+                <div class="menu_list_left">
+                    <img src="/jyapp/me/images/my_data_export.png" alt="">
+                    <span>数据导出</span>
+                </div>
+                <img class="arrow_right" src="/jyapp/me/images/my_arrow_right.png" alt="">
+            </a>
+        </div>
+        <!-- 微信端无项目关注、企业关注 -->
+        <div class="menu">
+			<div class="follow">
+	            <a class="menu_list">
+	                <div class="menu_list_left listOne">
+	                    <img src="/jyapp/me/images/my_list_1.png" alt="">
+	                    <span>项目关注</span>
+						<i class="redspot"></i>
+	                </div>
+	                <img class="arrow_right" src="/jyapp/me/images/my_arrow_right.png" alt="">
+	            </a>
+	            <a class="menu_list">
+	                <div class="menu_list_left listTwo">
+	                    <img src="/jyapp/me/images/my_list_2.png" alt="">
+	                    <span>企业关注</span>
+						<i class="redspot"></i>
+	                </div>
+	                <img class="arrow_right" src="/jyapp/me/images/my_arrow_right.png" alt="">
+	            </a>
+			</div>
+        </div>
+        <div class="menu">
+            <!-- 微信端无分享好友 -->
+            <a class="menu_list shareOne">
+                <div class="menu_list_left">
+                    <img src="/jyapp/me/images/my_list_3.png" alt="">
+                    <span>分享好友</span>
+                </div>
+                <img class="arrow_right" src="/jyapp/me/images/my_arrow_right.png" alt="">
+            </a>
+            <a href="#" class="menu_list useHelp">
+                <div class="menu_list_left">
+                    <img src="/jyapp/me/images/my_list_4.png" alt="">
+                    <span>使用帮助</span>
+                </div>
+                <img class="arrow_right" src="/jyapp/me/images/my_arrow_right.png" alt="">
+            </a>
+            <a href="#" class="menu_list aboutJy">
+                <div class="menu_list_left">
+                    <img src="/jyapp/me/images/my_list_5.png" alt="">
+                    <span>关于剑鱼标讯</span>
+                </div>
+                <img class="arrow_right" src="/jyapp/me/images/my_arrow_right.png" alt="">
+            </a>
+            <a href="#" class="menu_list feedback">
+                <div class="menu_list_left">
+                    <img src="/jyapp/me/images/my_list_6.png" alt="">
+                    <span>意见反馈</span>
+                </div>
+                <img class="arrow_right" src="/jyapp/me/images/my_arrow_right.png" alt="">
+            </a>
+        </div>
+	
+		<!--分享好友弹窗-->
+		<div class="share">
+			<div class="shareMain">
+				<ul class="clearfix">
 					<li>
-						<a class="modifyPass">
-							<i class="iconfont threeIcon">&#xe613;</i>
-							<strong>意见反馈</strong>
-							<span class="jyapp-icon jyapp-icon-youjiantou"></span>
+						<a href="javascript:;">
+							<span class="jyapp-icon jyapp-icon-weixin"></span>
+							<p>微信好友</p>
 						</a>
 					</li>
 					<li>
-						<a class="modifyPass">
-							<i class="iconfont threeIcon ">&#xe60c;</i>
-							<strong>使用帮助</strong>
-							<span class="jyapp-icon jyapp-icon-youjiantou"></span>
+						<a href="javascript:;">
+							<span class="jyapp-icon jyapp-icon-qq"></span>
+							<p>QQ好友</p>
 						</a>
 					</li>
 					<li>
-						<a class="modifyPass">
-							<i class="iconfont threeIcon">&#xe601;</i>
-							<strong>关于剑鱼标讯</strong>
-							<span class="jyapp-icon jyapp-icon-youjiantou"></span>
+						<a href="javascript:;">
+							<span class="jyapp-icon jyapp-icon-pengyouquan"></span>
+							<p>朋友圈</p>
 						</a>
 					</li>
-					
 				</ul>
+				<a href="javascript:;" class="shareQx">取消</a>
 			</div>
-		<!--设置里的-->
-		<!--分享好友弹窗-->
-			<div class="share">
-				<div class="shareMain">
-					<ul class="clearfix">
-						<li>
-							<a href="javascript:;">
-								<span class="jyapp-icon jyapp-icon-weixin"></span>
-								<p>微信好友</p>
-							</a>
-						</li>
-						<li>
-							<a href="javascript:;">
-								<span class="jyapp-icon jyapp-icon-qq"></span>
-								<p>QQ好友</p>
-							</a>
-						</li>
-						<li>
-							<a href="javascript:;">
-								<span class="jyapp-icon jyapp-icon-pengyouquan"></span>
-								<p>朋友圈</p>
-							</a>
-						</li>
-					</ul>
-					<a href="javascript:;" class="shareQx">取消</a>
-				</div>
-				
-			</div>
-
-		<!--历史推送纪录start-->
-		<!--<div class="notice history">
-			<a href="javascript:void(0);" onclick="autoLogin('/jyapp/swordfish/historypush')">历史推送记录 </a>
-		</div>-->
-		<!--历史推送记录end-->
-
-		<!--设置start-->
-		<div class="notice install">
-			<span class="jyapp-icon jyapp-icon-shezhi" style="color: #aebeff;"></span>
-			<a>设置</a>
-			<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
 		</div>
-		<!--设置end-->
-	</div>
-<!--	{{include "/common/footer.html"}}-->
-	<script type="text/javascript">
+		<!--分享好友弹窗 end-->
+		
+    </div>
+    <script src="/jyapp/js/jquery-3.2.1.min.js"></script>
+    <script>
 		var nowTimestamp= (new Date()).valueOf();
 		var userId = {{session "userId"}};
 		var headimageurl = {{session "s_headimageurl"}};
 		headimageurl = headimageurl.replace(/^http:\/\//,"https://");
 		$("#navbar-me").addClass("active");
 		new FastClick(document.body);
-		$("#notice").click(function(){
-			setLiActive(this);
-			autoLogin('/jyapp/free/notice');
-		});
-		{{if .T.pullnew}}
-		$("#pullnew").click(function(){
-			setLiActive(this);
-			autoLogin('/jyapp/active/pullnew/index');
-		});
-		{{end}}
-		$(".install").click(function(){
-			//setTimeout(function(){
-			//	JyObj.backUrl("H");
-			//},100);
-			setLiActive(this);
-			autoLogin('/jyapp/free/set');
-		});
-		$(".follow li").click(function(){
-			setLiActive(this);
-			var index = $(this).index();
-			if(index == 0){
-				autoLogin('/jyapp/follow/list');
-			}else if(index == 1){
-				autoLogin('/jyapp/followent/entList');
-			}
-		});
 		
-		$(".myOrder").click(function(){
-			window.location.href = "/jyapp/front/myOrder/toMyOrder";
-		})
-		
-		//邮箱设置
-		$(".myEmail").click(function(){
-			window.location.href = "/jyapp/front/myorder/myEmail";
-		})
-		//vip订阅入口
-		$(".vip_").click(function(){
-			$.post("/subscribepay/orderListDetails/isVip?v="+nowTimestamp,{},function(data){
-				if (data.isvip){
-					window.location.href="/jyapp/vipsubscribe/toSetPage";		//vip订阅入口  试用或正式vip
-				}else{
-					window.location.href="/jyapp/vipsubscribe/introducePage";		//vip订阅入口  非vip
+        $(function () {
+			var nowTimestamp= (new Date()).valueOf();
+			//vip订阅
+			$(".vip").on("click",function(){
+				$.post("/subscribepay/orderListDetails/isVip?v="+nowTimestamp,{},function(data){
+					if (data.isvip){
+						window.location.href="/jyapp/vipsubscribe/toSetPage";		//vip订阅入口  试用或正式vip
+					}else{
+						window.location.href="/jyapp/vipsubscribe/introducePage";		//vip订阅入口  非vip
+					}
+				})
+	        })
+			//数据导出
+			$(".toSieve").on("click",function(){
+				window.location.href="/jyapp/front/dataExport/toSieve";
+			})
+			//项目关注
+			$(".follow a").click(function(){
+				setLiActive(this);
+				var index = $(this).index();
+				if(index == 0){
+					autoLogin('/jyapp/follow/list');
+				}else if(index == 1){
+					autoLogin('/jyapp/followent/entList');
+				}
+			});
+			//分享给好友
+			$(".share").click(function(e){
+				$(".share").hide();
+			});
+			$(".shareMain").click(function(e){
+				e.stopPropagation();
+			});
+			//分享好友
+			$(".shareOne").click(function(){
+				$(".share").show();
+			});
+			$(".shareQx").click(function(){
+				$(".share").hide();
+			});
+			$(".share li").click(function(){
+				var shareType = $(this).index() + 1;
+				var title =  "您的好友";
+				if(shareType !=2 && {{session "i_type"}} == 2){
+					title += {{session "s_nickname"}};	
+				}
+				title += "向您推荐了剑鱼标讯";
+				var content = "全国招标信息免费看,不遮挡";
+				if(shareType == 3){
+					title = getShareText();
 				}
+				JyObj.share(shareType,title,content,"{{Msg "seo" "ZBADDRESS"}}/swordfish/about?source=app_setshare");
+			});
+			$(".quit").click(function(){
+				setLiActive(this);
+				appQuit(false);
+			})
+			//使用帮助
+			$(".useHelp").on("click",function(){
+				JyObj.openExternalLink('http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect','使用帮助');
 			})
-		})
-		$(".installList li").click(function(){
-			setLiActive(this);
-			var index = $(this).index();
-			if(index == 3){
+			//关于剑鱼标讯
+			$(".aboutJy").on("click",function(){
 				window.location.href = "/jyapp/free/swordfish/about";
-			}else if(index == 1){
+			})
+			//意见反馈
+			$(".feedback").on("click",function(){
 				autoLogin('/jyapp/swordfish/feedback');
-			}else if(index == 2){
-				JyObj.openExternalLink('http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect','使用帮助');
-			}
-		});
-		$(".share").click(function(e){
-			$(".share").hide();
-		});
-		$(".shareMain").click(function(e){
-			e.stopPropagation();
-		});
-		//分享好友
-		$(".shareOne").click(function(){
-			$(".share").show();
-		});
-		$(".shareQx").click(function(){
-			$(".share").hide();
-		});
-		$(".share li").click(function(){
-			var shareType = $(this).index() + 1;
-			var title =  "您的好友";
-			if(shareType !=2 && {{session "i_type"}} == 2){
-				title += {{session "s_nickname"}};	
-			}
-			title += "向您推荐了剑鱼标讯";
-			var content = "全国招标信息免费看,不遮挡";
-			if(shareType == 3){
-				title = getShareText();
-			}
-			JyObj.share(shareType,title,content,"{{Msg "seo" "ZBADDRESS"}}/swordfish/about?source=app_setshare");
-		});
-		$(".quit").click(function(){
-			setLiActive(this);
-			appQuit(false);
-		})
+			})
+			//邮箱显示
+			$.post("/subscribepay/orderListDetails/emailOperation?v="+nowTimestamp,{},function(r){
+				if (r.success){
+					$(".set_email").show();
+					$(".user_email").hide();
+				}else{
+					$(".set_email").hide();
+					$(".user_email").show();
+					$(".user_email span").html(r.mail);
+				}
+			})
+			//邮箱设置
+			$(".set_email").on("click",function(){
+				window.location.href="/jyapp/front/myorder/myEmail";
+			})
+			$(".user_email").on("click",function(){
+				window.location.href="/jyapp/front/myorder/myEmail";
+			})
+			$("#notice").click(function(){
+				setLiActive(this);
+				autoLogin('/jyapp/free/notice');
+			});
+			//
+			$(".install").click(function(){
+				//setTimeout(function(){
+				//	JyObj.backUrl("H");
+				//},100);
+				setLiActive(this);
+				autoLogin('/jyapp/free/set');
+			});
+        })
+		
 		//JyObj初始化完成,回调
 		function afterJyObjInit(){
 			autoLogin(null,function(userInfo){
@@ -438,39 +324,27 @@
 					userId = userInfo.userid;
 					if(userInfo.headimageurl != null){
 						userInfo.headimageurl = userInfo.headimageurl.replace(/^http:\/\//,"https://");
-						$("#headimage").attr("src",userInfo.headimageurl);
+						$("#head_img").attr("src",userInfo.headimageurl);
 					}
 					//编辑个人信息
-					$(".coreRight").append(userInfo.nickname);
-					//$(".coreRight").append('<div style="font-size:12px;margin-top:-2.8em" onclick="person_infor()"> 编辑个人信息 <i class="jyapp-icon jyapp-icon-youjiantou" style="top:1.5px;margin-left:3px "> </i></div>')
+					$(".user_name").append(userInfo.nickname);
 				}
 				redSpotOnMenu();
 			});
 		}
+		
 		//接收到新的推送
 		function afterReceivePushMessage(type,url){
 			if(type=="feedback"||type=="message"){
-				$("#notice .redspot").show();
+				$(".dot").show();
 			}else if(type=="project"){
 				$(".listOne .redspot").show();
 			}else if(type=="entname"){
 				$(".listTwo .redspot").show();
 			}
 		}
-		//编辑个人信息
-		function person_infor(){
-			window.location.href="#";
-		}
-		$(function(){
-			$.post("/subscribepay/orderListDetails/emailOperation?v="+nowTimestamp,{},function(r){
-				if (r.success){
-					$(".setEmail").html("未设置");
-				}else{
-					$(".setEmail").html("");
-				}
-			})
-		})
-	</script>
+		
+    </script>
 <!--百度统计end-->
 {{include "/common/baiducc.html"}}
 </body>

+ 1 - 1
src/jfw/modules/pushsubscribe/src/match/job/matchjob.go

@@ -192,7 +192,7 @@ func (m *MatchJob) OnceUserBatch(batchIndex int, lastUserId *string) (int, *VipU
 	logger.Info("开始加载第", batchIndex, "批用户", q)
 	session := mongodb.GetMgoConn()
 	defer mongodb.DestoryMongoConn(session)
-	query := session.DB(DbName).C(User).Find(&q).Select(public.UserCollFields).Iter()
+	query := session.DB(DbName).C(User).Find(&q).Select(public.UserCollFields).Sort("_id").Iter()
 	n := 0
 	freeUser := NewFreeUser() //免费所有用户
 	vipUser := NewVipUser()   //vip所有用户

+ 5 - 13
src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -535,30 +535,22 @@ func PayCancel(userId string) bool {
 		"product_type": "VIP订阅",
 	}
 	i, order_len := 0, 0
-	order := util.Mysql.Find("dataexport_order", queryMap, "order_code,pay_way,out_trade_no,prepay_time,order_status", "create_time desc", -1, 0)
+	order := util.Mysql.Find("dataexport_order", queryMap, "id,pay_way,out_trade_no,prepay_time,order_status", "create_time desc", -1, 0)
 	if order != nil {
 		order_len = len(*order)
 		//遍历未支付订单
 		for _, v := range *order {
-			flag := false
-			if qutil.Int64All(v["order_status"]) == 0 {
-				//关闭未支付订单
-				flag = pay.CloseDataExportOrder(qutil.ObjToString(v["pay_way"]), qutil.ObjToString(v["out_trade_no"]), qutil.ObjToString(v["prepay_time"]))
-
-			} else {
-				flag = true
-			}
+			//关闭未支付订单
+			flag := pay.CloseDataExportOrder(qutil.ObjToString(v["pay_way"]), qutil.ObjToString(v["out_trade_no"]), qutil.ObjToString(v["prepay_time"]))
 			if flag {
 				//更改未支付订单状态 -2  逐个取消订单
 				bl := util.Mysql.Update("dataexport_order", bson.M{
-					"user_id":      userId,
-					"product_type": "VIP订阅",
-					"order_status": 0,
-					"order_code":   v["order_code"],
+					"id": v["id"],
 				}, bson.M{
 					"order_status": -2,
 				})
 				if bl {
+					util.MsgRemind.Delete(qutil.IntAll(v["id"]))
 					i++
 				}
 			}

+ 4 - 1
src/jfw/modules/subscribepay/src/service/orderListDetails.go

@@ -212,7 +212,7 @@ func (o *OrderListDetails) DeleteOrder() error {
 		var boo = false
 		var flag = false
 		//删除 取消前 先关闭订单
-		order := util.Mysql.FindOne(tableName_order, queryMap, "pay_way,out_trade_no,prepay_time,order_status", "")
+		order := util.Mysql.FindOne(tableName_order, queryMap, "id,pay_way,out_trade_no,prepay_time,order_status", "")
 		if order != nil {
 			if qutil.IntAll((*order)["order_status"]) == 0 { //未支付状态下 删除订单需要先关闭订单
 				flag = pay.CloseDataExportOrder(qutil.ObjToString((*order)["pay_way"]), qutil.ObjToString((*order)["out_trade_no"]), qutil.ObjToString((*order)["prepay_time"]))
@@ -228,6 +228,9 @@ func (o *OrderListDetails) DeleteOrder() error {
 				//删除订单
 				boo = util.Mysql.Update(tableName_order, queryMap, map[string]interface{}{"order_status": -1})
 			}
+			if boo {
+				util.MsgRemind.Delete(qutil.IntAll((*order)["id"]))
+			}
 		}
 
 		o.ServeJson(map[string]interface{}{

+ 3 - 2
src/jfw/modules/subscribepay/src/service/vipRenewUpgrade.go

@@ -180,9 +180,10 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 		}
 		filter := entity.VipSimpleMsg{}
 		if pay_source == "Renew" {
+			log.Println("industrys", industrys)
 			filter = entity.VipSimpleMsg{
-				areas,
-				industrys,
+				area,
+				industry,
 				nil,
 				nil,
 				nil,

+ 15 - 8
src/jfw/modules/weixin/src/wx/wx.go

@@ -989,7 +989,7 @@ func ScanHandler(w ResponseWriter, r *Request) {
 					subkey = util.ObjToString(redis.Get("sso", "pc_subscribe_"+shareid))
 					if subkey != "" {
 						resNum := 0
-						resNum, subkey, _ = vipFastSubscribe(m, subkey, openid)
+						resNum, subkey, _ = vipFastSubscribe(m, subkey, openid, "1")
 						if resNum == -2 {
 							pcresult = "repeat"
 						} else if resNum == -3 {
@@ -1553,7 +1553,7 @@ func updateIsPush(openid string, status int) {
 }
 
 //
-func vipFastSubscribe(user *map[string]interface{}, keyWord, openId string) (returnValue int, content string, hasOldKey bool) {
+func vipFastSubscribe(user *map[string]interface{}, keyWord, openId, m string) (returnValue int, content string, hasOldKey bool) {
 	if keyWord == "" {
 		return
 	}
@@ -1604,11 +1604,18 @@ func vipFastSubscribe(user *map[string]interface{}, keyWord, openId string) (ret
 			return -3, strings.Replace(keyWord, "+", " ", -1), hasOldKey
 		}
 	}
-	var _key = make(map[string]interface{})
-	var a_key = make([]map[string]interface{}, 1)
+	var a_key []map[string]interface{}
 	classify_name := "未分类"
-	_key["key"] = keysFilter
-	a_key[0] = _key
+	if m == "1" {
+		for _, v := range keysFilter {
+			tmp := map[string]interface{}{"key": strings.Split(v, " ")}
+			a_key = append(a_key, tmp)
+		}
+	} else {
+		a_key = append(a_key, map[string]interface{}{
+			"key": keysFilter,
+		})
+	}
 	if len(a_key) > 0 {
 		flag = tools.MQFW.Update("user", `{"s_m_openid":"`+openId+`"}`, bson.M{
 			"$push": bson.M{
@@ -1623,7 +1630,7 @@ func vipFastSubscribe(user *map[string]interface{}, keyWord, openId string) (ret
 		}, false, false)
 	}
 	if flag {
-		return 1, strings.Replace(strings.Join(keysFilter, " "), "+", " ", -1), hasOldKey
+		return 1, strings.Replace(keyWord, "+", " ", -1), hasOldKey
 	}
 	return
 }
@@ -1641,7 +1648,7 @@ func fastSubscribe(content, openId string) (int, string, bool) {
 		o_jy, _ := (*user)["o_jy"].(map[string]interface{})
 		i_vip_status := util.IntAll((*user)["i_vip_status"])
 		if (*user)["i_vip_status"] != nil && i_vip_status > 0 && keyWord != "" {
-			return vipFastSubscribe(user, keyWord, openId)
+			return vipFastSubscribe(user, keyWord, openId, "2")
 		} else {
 			if o_jy == nil {
 				o_jy = make(map[string]interface{})

+ 12 - 9
src/web/staticres/css/wx/treasure_box.css

@@ -51,22 +51,24 @@
   width: 100%;
 }
 
-.treasure .vip_subscribe .title a h4, .treasure .data_export .title a h4 {
-  font-size: .32rem;
-  color: #1D1D1D;
+.treasure .vip_subscribe .title a h7, .treasure .data_export .title a h7 {
+ 	font-size: .34rem;
+    font-weight: 600;
+    color: #1D1D1D;
+    font-family: 微软雅黑;
 }
 
 .treasure .vip_subscribe .title a p, .treasure .data_export .title a p {
-  padding-top: 0.04rem;
-  color: #888888;
-  font-size: .26rem;
+  padding-top: 0.06rem;
+  color: #686868;
+  font-size: .28rem;
 }
 
 .treasure .vip_subscribe .title a:after, .treasure .data_export .title a:after {
   content: "";
   display: inline-block;
-  height: 6px;
-  width: 6px;
+  height: 8px;
+  width: 8px;
   border-width: 1px 1px 0 0;
   border-color: #C5C5C5;
   border-style: solid;
@@ -104,7 +106,8 @@
 }
 
 .treasure .vip_subscribe .info .info_list .info_list_right, .treasure .data_export .info .info_list .info_list_right {
-  font-size: .2rem;
+  font-size: .24rem;
+  color:#9E9E9E;
 }
 
 .treasure .data_export {

+ 1 - 0
src/web/staticres/vipsubscribe/css/subscribe_list.css

@@ -467,6 +467,7 @@ text-decoration: none;
   background: transparent;
   border: 1px solid white;
   border-radius: .32rem;
+    text-decoration: none;
 }
 
 .set_keyword > div {

+ 8 - 6
src/web/staticres/vipsubscribe/js/common.js

@@ -199,7 +199,7 @@ function getSetMealPrice(c,iCount,u,price){
 }
 
 //查看用户是否有未执行的订单
-function checkOrder(){
+function checkOrder(wz){
 	var flag = false;
 	$.ajax({
 		type: 'post',
@@ -210,11 +210,13 @@ function checkOrder(){
 		success: function(r){
 			flag = r.flag;
 			if(r.flag){
-				weui.toast('订单尚未到期', {
-	                duration: 3000,
-	                className: 'custom-toast',
-	                callback: function () { console.log('close') }
-	            });
+				if(wz!=1){
+					weui.toast('订单尚未到期', {
+		                duration: 3000,
+		                className: 'custom-toast',
+		                callback: function () { console.log('close') }
+		            });
+				}
 			}
 		}
 	});

+ 62 - 27
src/web/templates/weixin/email/bind_email.html

@@ -2,11 +2,16 @@
 <html>
 	<head>
 		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
		{{if .T.text_email}}
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		{{if .T.text_email}}
 		<title>更换邮箱</title>
 		{{else}}
 		<title>我的邮箱</title>
-		{{end}}
		<meta name="Keywords" content="绑定邮箱"/>
		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/reset.css?v={{Msg "seo" "version"}}">
		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/common.css?v={{Msg "seo" "version"}}">
		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/mine.css?v={{Msg "seo" "version"}}"/>        
+		{{end}}
+		<meta name="Keywords" content="绑定邮箱"/>
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/reset.css?v={{Msg "seo" "version"}}">
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/common.css?v={{Msg "seo" "version"}}">
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/mine.css?v={{Msg "seo" "version"}}"/>        
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
 
 		{{include "/common/weixin.html"}}
@@ -74,9 +79,22 @@
 		<div class="loading_">
 		    <p><span></span></p>
 		</div>
-		<div class="bind_email">
			<div class="input mgT26">
				<input type="email" placeholder="输入邮箱" name="" id="" value="" class="email_input" />
				<input type="text" placeholder="输入验证码" name="" id="" value="" class="code_input" />
				<button class="sendcode" >获取验证码</button>
+		<div class="bind_email">
+			<div class="input mgT26">
+				<input type="email" placeholder="输入邮箱" name="" id="" value="" class="email_input" />
+				<input type="text" placeholder="输入验证码" name="" id="" value="" class="code_input" />
+				<button class="sendcode" >获取验证码</button>
 				<button class="code_true"><i class="icon iconfont email_check_ok" style="display: inline;"></i></button>
-				<!--<i class="icon iconfont email_check_ok" style="display: inline;color:#2cb7ca"></i>-->
			</div>
			<button type="button" disabled="disabled" class="common_btn btn" id="bindBtn">绑定</button>
			<div class="toast" style="display: none;">
				<div class="toast_content"></div>
			</div>
		</div>
		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js//zepto.js?v={{Msg "seo" "version"}}"></script>
		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/public.js?v={{Msg "seo" "version"}}1"></script>
		<script>
+				<!--<i class="icon iconfont email_check_ok" style="display: inline;color:#2cb7ca"></i>-->
+			</div>
+			<button type="button" disabled="disabled" class="common_btn btn" id="bindBtn">绑定</button>
+			<div class="toast" style="display: none;">
+				<div class="toast_content"></div>
+			</div>
+		</div>
+		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js//zepto.js?v={{Msg "seo" "version"}}"></script>
+		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/public.js?v={{Msg "seo" "version"}}1"></script>
+		<script>
 			$(function () {    
 				var isPageHide = false;   
 				window.addEventListener('pageshow', function () {      
@@ -102,22 +120,25 @@
 				}else{
 					$("body").css({"visibility":""});
 				}
-			}
			$(function(){
-//				var initflag = true;
-//				$(window).bind("pageshow", function(event){
-//					initflag = false;
-//					if (initflag){
-//						initpage();
-//					}
-//				});
-//				if (initflag){
-//					initflag = false;
-//					initpage();
+			}
+			$(function(){
+//				var initflag = true;
+//				$(window).bind("pageshow", function(event){
+//					initflag = false;
+//					if (initflag){
+//						initpage();
+//					}
+//				});
+//				if (initflag){
+//					initflag = false;
+//					initpage();
 //				}
 				$("body").css({"visibility":""});
 				$(".loading_").hide();
-				initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
				var emailVal,code;
-				var userId={{.T.userId}}
				var reg = /^[a-zA-Z0-9]+([._-]*[a-zA-Z0-9]*)*@[a-zA-Z0-9]+.[a-zA-Z0-9{2,5}$]/;
+				initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
+				var emailVal,code;
+				var userId={{.T.userId}}
+				var reg = /^[a-zA-Z0-9]+([._-]*[a-zA-Z0-9]*)*@[a-zA-Z0-9]+.[a-zA-Z0-9{2,5}$]/;
 				//判断是否是更改邮箱;
 				if (param=="change"){
 					$(".email_input").attr("placeholder","输入新邮箱");
@@ -127,32 +148,43 @@
 					promptbox("解绑成功");
 				}
 				
-				//
				$('.sendcode').on('click',function(){
-					var that =this;
					emailVal = $('.email_input').val();
					let isEmail = reg.test(emailVal);//正则验证邮箱号
					if($.trim(emailVal) === ''){
-						promptbox('邮箱号不能为空');
					}else if(isEmail === false){
						promptbox('邮箱格式不正确');
					}else{
+				//
+				$('.sendcode').on('click',function(){
+					var that =this;
+					emailVal = $('.email_input').val();
+					let isEmail = reg.test(emailVal);//正则验证邮箱号
+					if($.trim(emailVal) === ''){
+						promptbox('邮箱号不能为空');
+					}else if(isEmail === false){
+						promptbox('邮箱格式不正确');
+					}else{
 						$.post("/subscribepay/orderListDetails/setEmail",{"email":emailVal},function(data){
 							userId=data.userId;
-							//发送成功
+							//发送成功
 							if(data.success){
 								sendCode(that,300);
 								$(".sendCode").prop("disabled","disabled");
 								$(".email_input").prop("readonly",true);
+								$(".email_input").attr("unselectable","on");
+								$(".email_input").attr("onfocus","this.blur()");
+								$(".email_input").css("-webkit-user-select","none");
 								sessionStorage.setItem("send_mycode_"+userId, Date.parse(new Date())/1000);
 								//发送验证码后 sessionStorage邮箱 
 								sessionStorage.setItem("send_myemail_"+userId, $(".email_input").val().replace(/\s*/g,""));
 							}else{	
 								//发送失败
 								if(data.errCode==2){
-									console.log(data.time)
 									sendCode(that,data.time);
 									$(".email_input").attr("readonly",true);
 									//发送验证码后 sessionStorage邮箱 
 								sessionStorage.setItem("send_myemail_"+userId, $(".email_input").val().replace(/\s*/g,""));
 								}
 								promptbox(data.errMsg);
-							}
+							}
 						});
-
					}
				})
+
+					}
+				})
 				
 				//验证码校验
 				$('.code_input').bind('input propertychange',()=>{
@@ -216,7 +248,8 @@
 							}
 						}
 					})
-				})
			})
+				})
+			})
 			
 			//提示框
 			function promptbox(str){
@@ -227,7 +260,9 @@
 				},1500)
 			}
 			
-
		</script>
+
+		</script>
 		
-	{{include "/common/baiducc.html"}}
	</body>
+	{{include "/common/baiducc.html"}}
+	</body>
 </html>

+ 12 - 0
src/web/templates/weixin/email/bind_success.html

@@ -21,6 +21,18 @@
 		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/zepto.js"></script>
 		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/public.js"></script>
 		<script>
+			$(function () {    
+				var isPageHide = false;   
+				window.addEventListener('pageshow', function () {      
+				    if (isPageHide) {
+		                location.reload();
+				    }    
+				});    
+				window.addEventListener('pagehide', function () {
+				    isPageHide = true;
+				});  
+			});
+		
 			$(function(){
 				//分享
 				initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});

+ 11 - 0
src/web/templates/weixin/email/unbind_email.html

@@ -50,6 +50,17 @@
 		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/zepto.js"></script>
 		<script>
 			initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
+			$(function () {    
+				var isPageHide = false;   
+				window.addEventListener('pageshow', function () {      
+				    if (isPageHide) {
+		                location.reload();
+				    }    
+				});    
+				window.addEventListener('pagehide', function () {
+				    isPageHide = true;
+				});  
+			});
 			$(function(){
 				/* 更换邮箱 */
 				$('.choose_email').on('click',() =>{

+ 10 - 8
src/web/templates/weixin/historypush.html

@@ -24,7 +24,7 @@
 	<link rel="stylesheet" href="/vipsubscribe/iconfont/iconfont.css" />
 	<link rel="stylesheet" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
 	<link rel="stylesheet" href="/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
-	<link rel="stylesheet" href="/vipsubscribe/css/subscribe_list.css?v={{Msg "seo" "version"}}">
+	<link rel="stylesheet" href="/vipsubscribe/css/subscribe_list.css?v={{Msg "seo" "version"}}1">
 	<script>
 		var zbadd = {{Msg "seo" "ZBADDRESS"}};
 		var firstPage = null;
@@ -277,13 +277,15 @@
 				}
 				if(parseInt(isOnTail)!=1){
 					$('.free7days_pic').append("<style>.free7days_pic:after{display:none}</style>");
-					if(parseInt(isExpire)>1){
-						$(".renew_toast .isExpire").text(parseInt(isExpire));
-						$(".renew_toast").show();
-					}else if (parseInt(isExpire)>0){
-						$(".renew_toast").find(".other").hide();
-						$(".renew_toast").find(".today").show();
-						$(".renew_toast").show();
+					if(!checkOrder(1)){
+						if(parseInt(isExpire)>1){
+							$(".renew_toast .isExpire").text(parseInt(isExpire));
+							$(".renew_toast").show();
+						}else if (parseInt(isExpire)>0){
+							$(".renew_toast").find(".other").hide();
+							$(".renew_toast").find(".today").show();
+							$(".renew_toast").show();
+						}
 					}
 				}else{
 					if(parseInt(isExpire)>1){

+ 5 - 5
src/web/templates/weixin/treasure_box.html

@@ -9,7 +9,7 @@
     <title>百宝箱</title>
     <script src="/js/rem.js"></script>
     <link rel="stylesheet" type="text/css" href="/css/wx/base.css" />
-    <link rel="stylesheet" href="/css/wx/treasure_box.css">
+    <link rel="stylesheet" href="/css/wx/treasure_box.css?v=03">
 </head>
 
 <body>
@@ -23,14 +23,14 @@
                 <div class="title vip">
                     <img src="/images/syzindex/treasure_vip.png" alt="">
                     <a>
-                        <h4>VIP订阅</h4>
+                        <h7>VIP订阅</h7>
                         <p>更多招标信息,重要项目不遗漏</p>
                     </a>
                 </div>
                 <div class="info">
                     <div class="info_list">
                         <div class="info_list_left">项目匹配</div>
-                        <div class="info_list_right">根据你的订阅,为你推送所匹配项目后续的全面动态;</div>
+                        <div class="info_list_right">根据订阅,为你推送所匹配项目后续的全面动态;</div>
                     </div>
                     <div class="info_list">
                         <div class="info_list_left">行业订阅</div>
@@ -54,7 +54,7 @@
                 <div class="title toSieve">
                     <img src="/images/syzindex/treasure_data.png" alt="">
                     <a>
-                        <h4>数据导出</h4>
+                        <h7>数据导出</h7>
                         <p>导出任意条件的招标数据,按条数付费</p>
                     </a>
                 </div>
@@ -69,7 +69,7 @@
                     </div>
                     <div class="info_list">
                         <div class="info_list_left">私家专属</div>
-                        <div class="info_list_right">多种筛选细度,丝丝合束,成就你的专属分析数据。</div>
+                        <div class="info_list_right">多种筛选细度,丝丝合束,成就你的专属数据。</div>
                     </div>
                 </div>
             </div>

+ 2 - 1
src/web/templates/weixin/vipsubscribe/keyWord.html

@@ -138,7 +138,7 @@
                     <strong class="weui-dialog__title">快速导入</strong>
                 </div>
                 <div class="weui-dialog__bd">
-                    快速导入可将免费版招标订阅内所设置的关键词及其排除词一并导入至“未分类"关键词分类内,无需再次手动输入,简化您的订阅过程。
+                    快速导入可将免费版招标订阅内所设置的关键词及其排除词一并导入至“<span class="fastICName">未分类</span>"关键词分类内,无需再次手动输入,简化您的订阅过程。
 					<p style="color:#888;">注:地区与行业分类以VIP订阅设置内为准,不做导入。</p>
                 </div>
                 <div class="weui-dialog__ft">
@@ -717,6 +717,7 @@
 		}
 		//
 		function modalTwo(){
+			$(".fastICName").text($(".classify-detail").text());
 		    // 如果是苹果手机,打开时候要设置top
 		    var agent = navigator.userAgent.toLowerCase();
 		    var dialog = $('.classify-fast-pop .weui-dialog')

+ 14 - 10
src/web/templates/weixin/vipsubscribe/vip_index.html

@@ -281,16 +281,20 @@
 							$('.free7days_pic').text("VIP订阅服务");
 	                        $('.free7days_pic').append("<style>.free7days_pic::after{display:inline-block}</style>");
 	                   }else{
-							if(parseInt(_vipData["expRemind"])>1){
-	                            $(".to_expired").show();
-	                            $(".renew_day").text(parseInt(_vipData["expRemind"]))
-	                            $(".renew_toast").show();
-	                        }else if(parseInt(_vipData["expRemind"])>0){
-	                            $(".to_expired").show();
-								$(".renew_toast").find(".other").hide();
-								$(".renew_toast").find(".today").show();
-	                            $(".renew_toast").show();
-	                        }else{
+							if(!checkOrder(1)){
+								if(parseInt(_vipData["expRemind"])>1){
+		                            $(".to_expired").show();
+		                            $(".renew_day").text(parseInt(_vipData["expRemind"]))
+		                            $(".renew_toast").show();
+		                        }else if(parseInt(_vipData["expRemind"])>0){
+		                            $(".to_expired").show();
+									$(".renew_toast").find(".other").hide();
+									$(".renew_toast").find(".today").show();
+		                            $(".renew_toast").show();
+		                        }else{
+		                            $(".to_expired").hide();
+		                        }
+							}else{
 	                            $(".to_expired").hide();
 	                        }
 							$(".tabbar").html('<a onclick="upgrade()" class="update_btn">升级</a><a onclick="rebuy()" class="renew_btn">续费</a>')