Merge branch 'dev4.5.5' of http://127.0.0.1:8080/qmx/jy into dev4.5.5

src/jfw/front/wxkeyset.go

@@ -246,7 +246,7 @@ func (m *Front) WxKeysetAjaxReq() {
 				}
 				if ojy["a_key"] != nil {
 					ak, _ := ojy["a_key"].([]interface{})
-					if len(ak) >= indexInt {
+					if len(ak) > indexInt {
 						if akmap, _ := ak[indexInt].(map[string]interface{}); akmap["from"] != nil {
 							saveKey["from"] = akmap["from"]
 						}

src/jfw/modules/app/src/app/front/wxkeyset.go

@@ -228,7 +228,7 @@ func (m *Front) WxKeysetAjaxReq() {
 				}
 				if ojy["a_key"] != nil {
 					ak, _ := ojy["a_key"].([]interface{})
-					if len(ak) >= indexInt {
+					if len(ak) > indexInt {
 						if akmap, _ := ak[indexInt].(map[string]interface{}); akmap["from"] != nil {
 							saveKey["from"] = akmap["from"]
 						}

src/jfw/modules/app/src/web/staticres/jyapp/css/subscribe.css

@@ -1583,11 +1583,7 @@ body .loading_ p span {
 }
 
 ._header {
-    /*position: fixed;
-    top: 1.3rem;*/
-    margin-top: 12px;
     width: 100%;
-    /* z-index: 999; */
 }
 
 .province_city p:last-child {

src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -64,10 +64,6 @@
             align-items: center;
             font-size: 12px;
         }
-        ._header .filter_tab{
-            /* height: .88rem; */
-            /* padding-left: 16px; */
-        }
         .app-layout-content-b .app-content::after{
             content: '';
             width: 100%;
@@ -96,7 +92,9 @@
 <div id="jyKeepComponent">
     <keep-component ref="vKeepComponent" @on-change-keep="changeKeepStatus"  :bid="nowOpenBid" :first="false"></keep-component>
 </div>
-<div class="app-layout-header">
+
+<div class="j-container">
+<div class="app-layout-header j-header" style="display: block;">
   <ul>
     <li>订阅</li>
     <li{{if or .T.isIosExam .T.isIosExamPhone}} style="visibility:hidden;"{{end}}>
@@ -116,11 +114,12 @@
   </ul>
 </div>
 {{include "/big-member/commonjs.html"}}
-<div class="app-layout-content-b j-container">
+<div class="j-main">
+  <div class="j-container">
     <div class="app-content j-header" style="background:#fff;border-top: 1px solid transparent;">
       {{if and (not .T.isIosExam) (not .T.isIosExamPhone)}}
-  		<div class="header_header" style="height: 60px;display:none;transition: all 0.1s;">
-  			<div class="only-personal" style="position: absolute;top: .35rem;left: 4%;background-image: url(/jyapp/vipsubscribe/image/entback.png?v=51430);background-size: 100%;background-repeat: no-repeat;border-radius: 8px;width: 92%;display: flex;align-items: center;justify-content: space-between;height: 44px;">
+  		<div class="header_header" style="height: 60px;display:none;transition: all 0.1s;position: relative;width: 100%;">
+  			<div class="only-personal" style="position: absolute;top: 50%;left: 50%;background-image: url(/jyapp/vipsubscribe/image/entback.png?v=51430);background-size: 100%;background-repeat: no-repeat;border-radius: 8px;width: 92%;display: flex;align-items: center;justify-content: space-between;height: 44px;transform: translate(-50%, -50%);">
   				<img style="width: 20px;height: 20px; margin-left: .3rem;" src="/jyapp/vipsubscribe/image/vip-icon.png?v=1">
   				<span  data-name="doubleEleven_title" style="padding: 0 .12rem;flex: 1;font-size: .26rem;font-weight: 700;color: #fff;">全国企业随手查，竞争实力尽展示！</span>
   				<span  data-name="doubleEleven_button" class="switch_ext" id="app-historypush-vipSub-banner" style="border-radius: 32px;display: flex;flex-direction: row;padding: 3px 12px;font-size: 12px;color: #FAE7CA;margin-right: .2rem;background: linear-gradient(to bottom, #F1D090 0%, #FAE7CA 100%);color: #33323A;font-family: PingFang SC;font-size: 12px;line-height: 18px;letter-spacing: 0px;text-align: center;white-space: nowrap;">立即使用</span>
@@ -268,6 +267,7 @@
             </div>
         </div>
     </div>
+</div>
 <div class="vip_report_tip">
     <div class="weui-mask weui-animate-fade-in"></div>
     <div class="weui-dialog weui-animate-fade-in">
@@ -294,6 +294,7 @@
         </div>
     </div>
 </div>
+</div>
 <!--	<img src="/jyapp/images/gotosetpage.png?v=51430" id="gotosetpage">-->
 {{include "/common/baiducc.html"}}
 {{if and (not .T.isIosExam) (not .T.isIosExamPhone)}}