提交

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

@@ -241,7 +241,7 @@ $(function () {
         $(".expire-remind").hide();
     });
     // 阅读并接受协议前的模拟checkbox点击事件
-    if (sessionStorage.getItem("vip_index_read")) {
+    if (sessionStorage.getItem("vip_index_read")==="true") {
         $('.checkbox').addClass("checked");
         $('.vip-footer.upgrade .confirm').prop('disabled', false);
     }
@@ -301,6 +301,8 @@ $(function () {
         }, false);
     }
 
+    var $dialog;
+
     //保存取消提示 module 1 修改 2升级 3续费 4购买
     function cancelTip(module) {
         var content = "";
@@ -319,7 +321,7 @@ $(function () {
             labName = "立即购买"
         }
 
-        weui.dialog({
+        $dialog = weui.dialog({
             title: '提示信息',
             content: content,
             className: 'jy-dialog',
@@ -708,6 +710,19 @@ $(function () {
             submited = false;
         }, 1000);
 
+        //校验是否点击阅读条款
+        if (submitPrice > 0) {
+            if (!$('.checkbox').hasClass("checked")) {
+                weui.toast('请勾选服务条款', {
+                    duration: 1500,
+                    className: 'jy-toast',
+                });
+                $dialog.hide(function () {
+                });
+                return
+            }
+        }
+
         $DoPost('/subscribepay/vipsubscribe/saveChange', {
             "area": reqData.area["全国"] ? '{}' : JSON.stringify(reqData.area),
             "industry": reqData.industry.join(","),

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

@@ -61,6 +61,7 @@
     <script src="/jyapp/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
     <script src="/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
     <script src="/jyapp/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/jyapp/js/common.js?v={{Msg "seo" "version"}}"></script>
     <script>
         $(function () {
             var ordercode = getParam("orderCode");

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

@@ -368,7 +368,7 @@
                             this.timeSelect = JSON.parse(sessionStorage.getItem("vipSubSelectTime"));
                         }
                         //是否已经点击已读
-                        if (sessionStorage.getItem("vipSub_read") == "true") $("#buy").prop("checked", true);
+                        if (sessionStorage.getItem("vipSub_read") === "true") $("#buy").prop("checked", true);
                         //是否试用界面
                         if (sessionStorage.getItem("vipSubisTrial")) this.vipSubisTrial = true;
 
@@ -405,7 +405,7 @@
                     } else {
                         $(".choose_area").val("");
                         //是否勾选已阅读
-                        if (sessionStorage.getItem("vipSub_read") == "true") {
+                        if (sessionStorage.getItem("vipSub_read") === "true") {
                             $(".area_warn").css("display", "");
                         }
                     }
@@ -436,7 +436,7 @@
                     } else {
                         $(".choose_industry").val("");
                         //是否勾选已阅读
-                        if (sessionStorage.getItem("vipSub_read") == "true") {
+                        if (sessionStorage.getItem("vipSub_read") === "true") {
                             $(".industry_warn").css("display", "");
                         }
                     }

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

@@ -501,7 +501,7 @@
                 }
             },
             flushSubmit() {//是否可提交
-                if (this.timeCheckOk && sessionStorage.getItem("vipSub_read")) {
+                if (this.timeCheckOk && sessionStorage.getItem("vipSub_read")==="true") {
                     $('.vip-footer.renew .confirm').prop('disabled', false)
                 } else {
                     $('.vip-footer.renew .confirm').prop('disabled', true)
@@ -675,7 +675,7 @@
                 //$('.vip-footer.renew .confirm').prop('disabled', !state)
             });
             //是否点击已读
-            if (sessionStorage.getItem("vipSub_read")) {
+            if (sessionStorage.getItem("vipSub_read")==="true") {
                 $('.checkbox').addClass("checked");
             }
 

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

@@ -931,11 +931,12 @@
     </p>
 </div>
 <div class="app-layout-header">
-    {{if .T.isVip}}
-        VIP订阅
-    {{else}}
-        标讯订阅
-    {{end}}
+    招标订阅
+    {{/*{{if .T.isVip}}*/}}
+        {{/*VIP订阅*/}}
+    {{/*{{else}}*/}}
+        {{/*标讯订阅*/}}
+    {{/*{{end}}*/}}
 </div>
 <div class="app-layout-content-b">
     <div class="app-content">

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

@@ -241,7 +241,7 @@ $(function () {
         $(".expire-remind").hide();
     });
     // 阅读并接受协议前的模拟checkbox点击事件
-    if (sessionStorage.getItem("vip_index_read")) {
+    if (sessionStorage.getItem("vip_index_read") === "true") {
         $('.checkbox').addClass("checked");
         $('.vip-footer.upgrade .confirm').prop('disabled', false);
     }
@@ -301,6 +301,8 @@ $(function () {
         }, false);
     }
 
+    var $dialog;
+
     //保存取消提示 module 1 修改 2升级 3续费 4购买
     function cancelTip(module) {
         var content = "";
@@ -319,7 +321,7 @@ $(function () {
             labName = "立即购买"
         }
 
-        weui.dialog({
+        $dialog = weui.dialog({
             title: '提示信息',
             content: content,
             className: 'jy-dialog',
@@ -528,7 +530,7 @@ $(function () {
             var isChecked = $(this).is(':checked')
             // 按年订阅默认选择1年 
             var val = 1;
-            $('.computed_price').html('￥' + Number(val) * 58)
+            $('.computed_price').html('￥' + Number(val) * 58);
             if (isChecked) {
                 $('#number_box_year span:eq(0)').addClass('active').siblings().removeClass('active')
             }
@@ -709,6 +711,19 @@ $(function () {
             submited = false;
         }, 1000);
 
+        //校验是否点击阅读条款
+        if (submitPrice > 0) {
+            if (!$('.checkbox').hasClass("checked")) {
+                weui.toast('请勾选服务条款', {
+                    duration: 1500,
+                    className: 'jy-toast',
+                });
+                $dialog.hide(function () {
+                });
+                return
+            }
+        }
+
         $DoPost('/subscribepay/vipsubscribe/saveChange', {
             "area": reqData.area["全国"] ? '{}' : JSON.stringify(reqData.area),
             "industry": reqData.industry.join(","),

src/web/templates/weixin/historypush.html

@@ -4,11 +4,12 @@
     <meta HTTP-EQUIV="pragma" CONTENT="no-cache">
     <meta HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
     <meta HTTP-EQUIV="expires" CONTENT="0">
-    {{if .T.isVip}}
-        <title>VIP订阅</title>
-    {{else}}
-        <title>标讯订阅</title>
-    {{end}}
+    {{/*{{if .T.isVip}}*/}}
+    {{/*<title>VIP订阅</title>*/}}
+    {{/*{{else}}*/}}
+    {{/*<title>标讯订阅</title>*/}}
+    {{/*{{end}}*/}}
+    <title>招标订阅</title>
     {{include "/common/inc.html"}}
     <link href="{{Msg "seo" "cdn"}}/css/dropload.css?v={{Msg "seo" "version"}}" rel="stylesheet">
     <link href="{{Msg "seo" "cdn"}}/css/wxlist.css?v={{Msg "seo" "version"}}" rel="stylesheet">

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

@@ -407,7 +407,7 @@
                         this.timeSelect = JSON.parse(sessionStorage.getItem("vipSubSelectTime"));
                     }
                     //是否已经点击已读
-                    if (sessionStorage.getItem("vipSub_read") == "true") $("#buy").prop("checked", true);
+                    if (sessionStorage.getItem("vipSub_read") === "true") $("#buy").prop("checked", true);
                     //是否试用界面
                     if (sessionStorage.getItem("vipSubisTrial")) this.vipSubisTrial = true;
 
@@ -444,7 +444,7 @@
                 } else {
                     $(".choose_area").val("");
                     //是否勾选已阅读
-                    if (sessionStorage.getItem("vipSub_read") == "true") {
+                    if (sessionStorage.getItem("vipSub_read") === "true") {
                         $(".area_warn").css("display", "");
                     }
                 }
@@ -475,7 +475,7 @@
                 } else {
                     $(".choose_industry").val("");
                     //是否勾选已阅读
-                    if (sessionStorage.getItem("vipSub_read") == "true") {
+                    if (sessionStorage.getItem("vipSub_read") === "true") {
                         $(".industry_warn").css("display", "");
                     }
                 }

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

@@ -544,7 +544,7 @@
             }
         },
         flushSubmit() {//是否可提交
-            if (this.timeCheckOk && sessionStorage.getItem("vipSub_read")) {
+            if (this.timeCheckOk && sessionStorage.getItem("vipSub_read") === "true") {
                 $('.vip-footer.renew .confirm').prop('disabled', false)
             } else {
                 $('.vip-footer.renew .confirm').prop('disabled', true)
@@ -710,14 +710,14 @@
         })
 
         $('.checkbox').on('click', function () {
-            $(this).toggleClass('checked')
+            $(this).toggleClass('checked');
             var state = $(this).hasClass('checked');
             sessionStorage.setItem("vipSub_read", state);
             purchase.flushSubmit();
             //$('.vip-footer.renew .confirm').prop('disabled', !state)
         });
         //是否点击已读
-        if (sessionStorage.getItem("vipSub_read")) {
+        if (sessionStorage.getItem("vipSub_read") === "true") {
             $('.checkbox').addClass("checked");
         }