xg

src/web/staticres/vipsubscribe/css/vip_service_expire.css

@@ -232,11 +232,12 @@
   justify-content: space-between;
   align-items: center;
   padding: 0 .3rem;
-  padding-top: 1.3rem;
+  /*padding-top: 1.3rem;*/
 }
 
 .vip_service_expire .service_expire_tip {
   width: 100%;
+  padding-top: 1.3rem;
 }
 
 .vip_service_expire .service_expire_tip .tip_title_box {

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

@@ -24,6 +24,9 @@
 			    background: transparent;
 			    display: none;
 			}
+			.email_input,.code_input{
+				line-height: 20px !important;
+			}
 		</style>
 		<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>

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

@@ -8,7 +8,7 @@
 		<link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}"/>
 		<link rel="stylesheet" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
 		<link rel="stylesheet" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-		<link rel="stylesheet" href="/vipsubscribe/css/vip_service_expire.css?v={{Msg "seo" "version"}}">
+		<link rel="stylesheet" href="/vipsubscribe/css/vip_service_expire.css?v={{Msg "seo" "version"}}1">
 		{{include "/common/weixin.html"}}
 	</head>
 	<style type="text/css">

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

@@ -166,7 +166,7 @@
 </body>
 <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
-<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
+<!--<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>-->
 <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 <script>
 try{

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

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

src/web/templates/weixin/wxinfocontent.html

@@ -580,7 +580,7 @@ pre {
 					}
 			</script>
 		
-		{{if .T.obj.hasSession}}{{if or .T.obj.projectname .T.obj.projectcode}}<div class="follow_vip" >{{if .T.obj.followFlag}}<i class="glyphicon yiguanzhu"></i>已关注{{else}}<i class="glyphicon weiguanzhu"></i>关注项目{{end}}</div>{{end}}{{else}}<!--<a href="/swordfish/share/-1" style="text-decoration: none;color:#24C0D7;"><span class="follow"><i class="glyphicon weiguanzhu"></i></span>关注项目</a>-->{{end}}
+		{{if .T.obj.hasSession}}{{if or .T.obj.projectname .T.obj.projectcode}}<div class="follow" style="top:1px !important">{{if .T.obj.followFlag}}<i class="glyphicon yiguanzhu"></i>已关注{{else}}<i class="glyphicon weiguanzhu"></i>关注项目{{end}}</div>{{end}}{{else}}<!--<a href="/swordfish/share/-1" style="text-decoration: none;color:#24C0D7;"><span class="follow"><i class="glyphicon weiguanzhu"></i></span>关注项目</a>-->{{end}}
 		</div>
 		{{else}}
 		<!--非VIP-->