xiugai

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_index_new.js

@@ -106,6 +106,7 @@ $(function () {
             sessionStorage.setItem('vip_index_read', true);
             globalState = JSON.parse(globalStateStr);
             sessionStorage.removeItem("vip_change_time");
+            reqData = JSON.parse(globalStateStr);
             init(res.data)
         })
     }
@@ -240,9 +241,9 @@ $(function () {
     })
     // 其他采购单位行业问号点击事件
     $('.other .icon-bangzhu').on('click', function () {
-        var str = '每条信息的采购单位行业属性由机器自动识别，会存在少数无法识别的情况，此时将归类为“其他”。'
+        var str = '每条信息的采购单位行业属性由机器自动识别，会存在少数无法识别的情况，此时将归类为“其它”。'
         weui.alert(str, {
-            title: '“其他”采购单位',
+            title: '“其它”采购单位',
             className: 'jy-alert',
             buttons: [{
                 label: '我知道了'
@@ -308,7 +309,7 @@ $(function () {
         } else {
             $this.removeClass('checked');
             setotherbuyerclass(0);
-            weui.toast('“其他”采购单位已关闭', {
+            weui.toast('“其它”采购单位已关闭', {
                 duration: 1500,
                 className: 'jy-toast other-buyerclass',
                 callback: function () {

src/jfw/modules/app/src/web/templates/me/set.html

@@ -151,7 +151,6 @@
           $.post("/subscribepay/vipsubscribe/getSubBuyMsg",{},function(r){
 					if (r.success){
 						var ratemode=r.data.ratemode;
-            alert(ratemode)
 						$('#pushMsgSet .push-setting-text').text(pushSettingMap[ratemode]);
 					}
 				})

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_index_new.html

@@ -197,7 +197,7 @@
                         <span class="item-l">
                             <span class="leading_ jy-icon-othter-match"></span>
                             <span class="item-label-other">
-                                <span class="label-text">“其他”采购单位</span>
+                                <span class="label-text">“其它”采购单位</span>
                                 <i class="iconfont icon-bangzhu"></i>
                             </span>
                         </span>
@@ -422,7 +422,7 @@
     <script src="/jyapp/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script src="/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
     <script src="/jyapp/vipsubscribe/js/UpgradePrice.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/jyapp/vipsubscribe/js/vip_index_new.js?v={{Msg "seo" "version"}}1"></script>
+    <script src="/jyapp/vipsubscribe/js/vip_index_new.js?v={{Msg "seo" "version"}}5"></script>
     <script src="/jyapp/js/common.js?v={{Msg "seo" "version"}}"></script>
 </div>
 </body>

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_seniorset.html

@@ -176,7 +176,7 @@
 				window.history.go(-1);
 			});
 			//
-			sessionStorage.setItem('index_read_cache','6');
+			//sessionStorage.setItem('index_read_cache','6');
 		});
 		//
 		function emailtipOn(){

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

@@ -1447,7 +1447,7 @@
             border-radius: .4rem;
         }
        .jy-alert-other  .weui-dialog__btn {
-            color: #0987ff !important;
+            color: #2CB7CA !important;
         }
         .jy-alert-other .weui-dialog__title {
             font-size: 16 !important;
@@ -1668,7 +1668,7 @@
     </div>
 </div>
 <!--弹窗 其他采购单位-->
-<div class="jy-alert jy-alert-other" style="display:none"> <div class="weui-mask weui-animate-fade-in"></div> <div class="weui-dialog weui-animate-fade-in">  <div class="weui-dialog__hd"><strong class="weui-dialog__title">提 示</strong></div>  <div class="weui-dialog__bd">每条信息的采购单位行业属性由机器自动识别，会存在少数无法识别的情况，此时将归类为“其他”。如无需订阅，可在VIP订阅设置内手动关闭。</div> <div class="weui-dialog__ft">  <a href="javascript:;" onclick="close_other()" class="weui-dialog__btn weui-dialog__btn_">我知道了</a>  </div> </div> </div>
+<div class="jy-alert jy-alert-other" style="display:none"> <div class="weui-mask weui-animate-fade-in"></div> <div class="weui-dialog weui-animate-fade-in">  <div class="weui-dialog__hd"><strong class="weui-dialog__title">提 示</strong></div>  <div class="weui-dialog__bd">每条信息的采购单位行业属性由机器自动识别，会存在少数无法识别的情况，此时将归类为“其它”。如无需订阅，可在VIP订阅设置内手动关闭。</div> <div class="weui-dialog__ft">  <a href="javascript:;" onclick="close_other()" class="weui-dialog__btn weui-dialog__btn_">我知道了</a>  </div> </div> </div>
 <!--	<img src="/jyapp/images/gotosetpage.png" id="gotosetpage">-->
 {{include "/common/baiducc.html"}}
 

src/web/staticres/vipsubscribe/js/vip_index_new.js

@@ -22,6 +22,8 @@ $(function () {
             $.post("/subscribepay/afterPay/setUserInfo", {pageType: "other_buyerclass", other: index}, function (r) {
                 if (r.flag) {
                     checkedflag_other = true;
+                    console.log("index:"+index)
+                    console.log(reqData)
                     reqData.otherbuyerclass = index;
                     sessionStorage.setItem('sub_vip_state', JSON.stringify(reqData))
                 }
@@ -107,6 +109,7 @@ $(function () {
             sessionStorage.setItem('sub_vip_state', globalStateStr);
             sessionStorage.setItem('vip_index_read', true);
             globalState = JSON.parse(globalStateStr);
+            reqData = JSON.parse(globalStateStr);
             init(res.data)
         })
     }
@@ -242,9 +245,9 @@ $(function () {
     
     // 其他采购单位行业问号点击事件
     $('.other .icon-bangzhu').on('click', function () {
-        var str = '每条信息的采购单位行业属性由机器自动识别，会存在少数无法识别的情况，此时将归类为“其他”。'
+        var str = '每条信息的采购单位行业属性由机器自动识别，会存在少数无法识别的情况，此时将归类为“其它”。'
         weui.alert(str, {
-            title: '“其他”采购单位',
+            title: '“其它”采购单位',
             className: 'jy-alert',
             buttons: [{
                 label: '我知道了'
@@ -311,7 +314,7 @@ $(function () {
         } else {
             $this.removeClass('checked');
             setotherbuyerclass(0);
-            weui.toast('“其他”采购单位已关闭', {
+            weui.toast('“其它”采购单位已关闭', {
                 duration: 1500,
                 className: 'jy-toast other-buyerclass',
                 callback: function () {
@@ -600,7 +603,7 @@ $(function () {
     var selectTime = "";
 
     function init(state) {
-    	console.log(state.ohterbuyerclass)
+    	console.log(state)
         // init 已选择的区域和行业
         var selectedAreaAndInd = getBuySet(state.area, state.industry);
         setSelectedAreaAndInd(selectedAreaAndInd);
@@ -650,6 +653,7 @@ $(function () {
         }
         
          // 初始化“其他"开关
+        console.log(state.otherbuyerclass)
         if (state.otherbuyerclass==1||state.otherbuyerclass==null) {
             $('.switch_other').addClass('checked')
         } else {

src/web/templates/weixin/historypush.html

@@ -1022,7 +1022,7 @@
             border-radius: .4rem;
         }
         .jy-alert-other  .weui-dialog__btn {
-            color: #0987ff !important;
+            color: #2CB7CA !important;
         }
         .jy-alert-other .weui-dialog__title {
             font-size: 16 !important;
@@ -1195,7 +1195,7 @@
       </div>
   </div>
 </div><!--弹窗 其他采购单位-->
-<div class="jy-alert jy-alert-other" style="display:none"> <div class="weui-mask weui-animate-fade-in"></div> <div class="weui-dialog weui-animate-fade-in">  <div class="weui-dialog__hd"><strong class="weui-dialog__title">提 示</strong></div>  <div class="weui-dialog__bd">每条信息的采购单位行业属性由机器自动识别，会存在少数无法识别的情况，此时将归类为“其他”。如无需订阅，可在VIP订阅设置内手动关闭。</div> <div class="weui-dialog__ft">  <a href="javascript:;" onclick="close_other()" class="weui-dialog__btn weui-dialog__btn_">我知道了</a>  </div> </div> </div>
+<div class="jy-alert jy-alert-other" style="display:none"> <div class="weui-mask weui-animate-fade-in"></div> <div class="weui-dialog weui-animate-fade-in">  <div class="weui-dialog__hd"><strong class="weui-dialog__title">提 示</strong></div>  <div class="weui-dialog__bd">每条信息的采购单位行业属性由机器自动识别，会存在少数无法识别的情况，此时将归类为“其它”。如无需订阅，可在VIP订阅设置内手动关闭。</div> <div class="weui-dialog__ft">  <a href="javascript:;" onclick="close_other()" class="weui-dialog__btn weui-dialog__btn_">我知道了</a>  </div> </div> </div>
 <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/mapArea.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" charset="UTF-8">

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

@@ -199,7 +199,7 @@
                         <span class="item-l">
                             <span class="leading_ jy-icon-othter-match"></span>
                             <span class="item-label-other">
-                                <span class="label-text">“其他”采购单位</span>
+                                <span class="label-text">“其它”采购单位</span>
                                 <i class="iconfont icon-bangzhu"></i>
                             </span>
                         </span>
@@ -424,7 +424,7 @@
 <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/UpgradePrice.js?v={{Msg "seo" "version"}}"></script>
-<script src="/vipsubscribe/js/vip_index_new.js?v=15{{Msg "seo" "version"}}2"></script>
+<script src="/vipsubscribe/js/vip_index_new.js?v=15{{Msg "seo" "version"}}5"></script>
 {{include "/common/weixin.html"}}
 </body>
 <script>