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

feat: 超级订阅续费修改

cuiyalong 4 роки тому
батько
коміт
88cf0ed828

+ 9 - 0
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_renew.css

@@ -697,3 +697,12 @@
 .billing-price-container .yen {
   font-size: .32rem;
 }
+
+.area-industry .item-container .item {
+  justify-content: flex-start;
+}
+.area-industry .item-container .item .item-r {
+  width: unset;
+  flex: 1;
+  justify-content: flex-start;
+}

+ 6 - 7
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_renew.js

@@ -14,7 +14,6 @@ var purchase = {
         //已选择
         try {
             //即将到期 回显已购买
-            console.log(sessionStorage.getItem("pay_read_cache"))
             if (!sessionStorage.getItem("pay_read_cache")) {
                 $DoPost("/subscribepay/vipsubscribe/getSubBuyMsg", {}, function (r) {
                     if (r.success) {
@@ -96,7 +95,7 @@ var purchase = {
     showArea: function () {
         if (!$.isEmptyObject(this.areaSelect) && !this.areaSelect["一个省"]) { //有选择
             if (this.nowBuyset.areacount === -1) {
-                $(".selected-area").text("全国");
+                $(".area .item-r").text("全国");
             } else {
                 var tipTxt = "";
                 if (this.nowBuyset.areacount > 0) tipTxt += this.nowBuyset.areacount + " 个省";
@@ -109,10 +108,10 @@ var purchase = {
                     tipTxt += count + " 个市";
                     if (this.nowBuyset.citys.length > 1) tipTxt += "(分布在" + this.nowBuyset.citys.length + "个省内)"
                 }
-                $(".selected-area").text(tipTxt);
+                $(".area .item-r").text(tipTxt);
             }
         } else {
-            $(".selected-area").text("");
+            $(".area .item-r").text("");
         }
     },
     showPrice: function () {
@@ -133,13 +132,13 @@ var purchase = {
     showIndustry: function () {
         if (this.industrySelect.length > 0 && this.industrySelect[0] !== "一个行业") { //选择有行业信息
             if (this.nowBuyset.buyerclasscount === -1) {
-                $(".selected-industry-count").text("全部行业");
+                $(".industry .item-r").text("全部行业");
             } else {
                 var tipTxt = "";
-                $(".selected-industry-count").text(tipTxt + this.nowBuyset.buyerclasscount + " 个行业");
+                $(".industry .item-r").text(tipTxt + this.nowBuyset.buyerclasscount + " 个行业");
             }
         } else {
-            $(".selected-industry-count").text("");
+            $(".industry .item-r").text("");
         }
     },
     showTime: function () {

+ 58 - 0
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_UpgradeDetail.html

@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0,minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>超级订阅续费</title>
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/rem.js'></script>
+    <link rel="stylesheet" type="text/css" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.css'/>
+    <link rel="stylesheet" type="text/css" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/css/base2.css?v={{Msg "seo" "version"}}'/>
+    <link rel="stylesheet" type="text/css" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}'/>
+	<link rel="stylesheet" type="text/css" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/css/public_.css?v={{Msg "seo" "version"}}'/>
+    <link rel="stylesheet" type="text/css" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/layout.css'/>
+    <link rel="stylesheet" type="text/css" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/font.css?v={{Msg "seo" "version"}}'/>
+    <style>
+        .content {
+            height: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+    </style>
+</head>
+<body class="no-touch"  data-weui-theme="light">
+<div class="app-layout-header jy-app-header" style="z-index: 8;">
+    <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
+    <span>超级订阅升级</span>
+    <span></span>
+</div>
+<div class="app-layout-content-b">
+	<div class="j-container">
+        <div class="j-body">
+            <div class="content">超级订阅升级版介绍</div>
+        </div>
+        <div class="footer j-button-group">
+            <button class="j-button-confirm">升级</button>
+        </div>
+    </div>
+</div>
+<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}'></script>
+{{include "/common/iosJS.html"}}
+<script>
+$(function () {
+    $('.j-button-confirm').on('click', function () {
+        location.href = '/jyapp/vipsubscribe/upgradePage'
+    })
+})
+</script>
+{{include "/common/baiducc.html"}}
+</body>
+
+</html>

+ 12 - 54
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_renew.html

@@ -39,8 +39,9 @@
 <body class="no-touch"  data-weui-theme="light">
 <div class="app-layout-header jy-app-header" style="z-index: 8;">
     <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-    超级订阅续费
-<span></span></div>
+    <span>超级订阅续费</span>
+    <span></span>
+</div>
 <div class="app-layout-content-b">
 	{{if not .T.isLiveActive}}
 	<div class="vip-renew">
@@ -54,33 +55,17 @@
         <div class="vip-body">
             <div class="j-notice-bar bar-red vip-bar" style="text-align: center;">限时续费,3个月起,续多久送多久!</div>
             <ul style="padding: .16rem .24rem;">
-                <li class="body-item area">
-                    <a class="item-container" href="/jyapp/vipsubscribe/toChooseArea">
-                        <div class="item">
-                        <span class="item-l">
-                            <span class="item-label">区域</span>
-                        </span>
-                            <span class="item-r">
-                            <span class="selected-area-name ellipsis"></span>
-                            <span class="iconfont icon-arrow"></span>
-                        </span>
+                <li class="body-item area-industry">
+                    <div class="item-container">
+                        <div class="item area">
+                            <span class="item-l">区域:</span>
+                            <span class="item-r"></span>
                         </div>
-                        <div class="sub-item text selected-area"></div>
-                    </a>
-                </li>
-                <li class="body-item industry">
-                    <a class="item-container" href="/jyapp/vipsubscribe/toChooseIndustry">
-                        <div class="item">
-                        <span class="item-l">
-                            <span class="item-label">采购单位行业</span>
-                        </span>
-                            <span class="item-r">
-                            <span class="selected-industry-name industry-text ellipsis"></span>
-                            <span class="iconfont icon-arrow"></span>
-                        </span>
+                        <div class="item industry">
+                            <span class="item-l">行业:</span>
+                            <span class="item-r"></span>
                         </div>
-                        <div class="sub-item text selected-industry-count"></div>
-                    </a>
+                    </div>
                 </li>
                 <li class="body-item select_cycle">
                     <a class="item-container" href="javascript:;">
@@ -103,33 +88,6 @@
                         </div>
                     </a>
                 </li>
-                <!-- <li class="body-item pay-mode">
-                    <a class="item-container" href="javascript:;">
-                        <div class="item">
-                            <span class="item-l">
-                                <span class="leading"></span>
-                                <span class="item-label">支付方式</span>
-                            </span>
-                            <span class="item-r">
-                                <span class="pay-mode-text">微信支付</span>
-                                <span class="iconfont icon-arrow"></span>
-                            </span>
-                        </div>
-                    </a>
-                </li> -->
-                <!--			<li class="body-item coupon-code-tx" style="display: none">-->
-                <!--			    <a class="item-container" href="javascript:;">-->
-                <!--			        <div class="item">-->
-                <!--			            <span class="item-l">-->
-                <!--			                <span class="item-label">优惠码</span>-->
-                <!--			            </span>-->
-                <!--			            <span class="item-r">-->
-                <!--			                <span class="keywords-text">输入优惠码</span>-->
-                <!--			                <span class="iconfont icon-arrow"></span>-->
-                <!--			            </span>-->
-                <!--			        </div>-->
-                <!--			    </a>-->
-                <!--			</li>-->
             </ul>
             <ul style="padding: 0 .24rem;display: none;" id="giveTimeBox">
                 <li class="body-item select_cycle">

+ 9 - 0
src/web/staticres/vipsubscribe/css/vip_renew.css

@@ -707,3 +707,12 @@
 .origin-price .price-num {
   text-decoration: line-through;
 }
+
+.area-industry .item-container .item {
+  justify-content: flex-start;
+}
+.area-industry .item-container .item .item-r {
+  width: unset;
+  flex: 1;
+  justify-content: flex-start;
+}

+ 50 - 0
src/web/templates/weixin/vipsubscribe/vip_UpgradeDetail.html

@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0,minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>超级订阅续费</title>
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <script src="/vipsubscribe/js/rem.js"></script>
+    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}"/>
+    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base2.css?v={{Msg "seo" "version"}}"/>
+    <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
+	<link rel="stylesheet" href="/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" type="text/css" href='/local/layout.css'/>
+    <link rel="stylesheet" type="text/css" href='/css/font.css?v={{Msg "seo" "version"}}'/>
+    <style>
+        .content {
+            height: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+    </style>
+</head>
+<body class="no-touch"  data-weui-theme="light">
+    <div class="j-container">
+        <div class="j-body">
+            <div class="content">超级订阅升级版介绍</div>
+        </div>
+        <div class="footer j-button-group">
+            <button class="j-button-confirm">升级</button>
+        </div>
+    </div>
+<script src="/local/jquery.min.js"></script>
+<script src='/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}'></script>
+<script src='/js/common.js?v={{Msg "seo" "mod_version"}}'></script>
+<script>
+$(function () {
+    $('.j-button-confirm').on('click', function () {
+        location.href = '/front/vipsubscribe/upgradePage'
+    })
+})
+</script>
+{{include "/common/baiducc.html"}}
+</body>
+
+</html>

+ 39 - 55
src/web/templates/weixin/vipsubscribe/vip_renew.html

@@ -47,58 +47,42 @@
             <span class="header-right">您的超级订阅服务即将到期,为不影响您的使用。请立即续费</span>
         </div>
         <div class="vip-body">
-             <div class="j-notice-bar bar-red vip-bar" style="text-align: center;">限时续费,3个月起,续多久送多久!</div>
+            <div class="j-notice-bar bar-red vip-bar" style="text-align: center;">限时续费,3个月起,续多久送多久!</div>
             <ul style="padding: .16rem .24rem;">
-                <li class="body-item area">
-                    <a class="item-container" href="/front/vipsubscribe/toChooseArea">
-                        <div class="item">
-                        <span class="item-l">
-                            <span class="item-label">区域</span>
-                        </span>
-                        <span class="item-r">
-                            <span class="selected-area-name ellipsis"></span>
-                            <span class="iconfont icon-arrow"></span>
-                        </span>
-                    </div>
-                    <div class="sub-item text selected-area"></div>
-                </a>
-            </li>
-            <li class="body-item industry">
-                <a class="item-container" href="/front/vipsubscribe/toChooseIndustry">
-                    <div class="item">
-                        <span class="item-l">
-                            <span class="item-label">采购单位行业</span>
-                        </span>
-                        <span class="item-r">
-                            <span class="selected-industry-name industry-text ellipsis"></span>
-                            <span class="iconfont icon-arrow"></span>
-                        </span>
-                    </div>
-                    <div class="sub-item text selected-industry-count"></div>
-                </a>
-            </li>
-            <li class="body-item select_cycle">
-                <a class="item-container" href="javascript:;">
-                    <div class="item">
-                        <span class="item-l">
-                            <span class="item-label">延长订阅周期</span>
-                        </span>
-                        <span class="item-r">
-                            <span class="buy-cycle text ellipsis">6个月</span>
-                            <span class="iconfont icon-arrow"></span>
-                        </span>
+                <li class="body-item area-industry">
+                    <div class="item-container">
+                        <div class="item area">
+                            <span class="item-l">区域:</span>
+                            <span class="item-r"></span>
+                        </div>
+                        <div class="item industry">
+                            <span class="item-l">行业:</span>
+                            <span class="item-r"></span>
+                        </div>
                     </div>
-                    <div class="sub-item text">
-                        <span class="sub-l">有效日期:</span>
-                        <span class="sub-r">
-                            <span class="ellipsis">
-                                (<span class="month">3个月</span>)<span class="duration"></span>
+                </li>
+                <li class="body-item select_cycle">
+                    <a class="item-container" href="javascript:;">
+                        <div class="item">
+                            <span class="item-l">
+                                <span class="item-label">延长订阅周期</span>
                             </span>
-                        </span>
-                    </div>
-                </a>
-            </li>
-        </ul>
+                            <span class="item-r">
+                                <span class="buy-cycle text ellipsis">6个月</span>
+                                <span class="iconfont icon-arrow"></span>
+                            </span>
+                        </div>
+                        <div class="sub-item text">
+                            <span class="sub-l">有效日期:</span>
+                            <span class="sub-r">
+                                <span class="ellipsis">
+                                    (<span class="month">3个月</span>)<span class="duration"></span>
+                                </span>
+                            </span>
+                        </div>
+                    </a>
+                </li>
+            </ul>
         <ul style="padding: 0 .24rem;display: none;" id="giveTimeBox">
                 <li class="body-item select_cycle">
                     <div class="item-container" href="javascript:;">
@@ -547,7 +531,7 @@
             showArea: function () {
                 if (!$.isEmptyObject(this.areaSelect) && !this.areaSelect["一个省"]) { //有选择
                     if (this.nowBuyset.areacount === -1) {
-                        $(".selected-area").text("全国");
+                        $(".area .item-r").text("全国");
                     } else {
                         var tipTxt = "";
                         if (this.nowBuyset.areacount > 0) tipTxt += this.nowBuyset.areacount + " 个省";
@@ -560,10 +544,10 @@
                             tipTxt += count + " 个市";
                             if (this.nowBuyset.citys.length > 1) tipTxt += "(分布在" + this.nowBuyset.citys.length + "个省内)"
                         }
-                        $(".selected-area").text(tipTxt);
+                        $(".area .item-r").text(tipTxt);
                     }
                 } else {
-                    $(".selected-area").text("");
+                    $(".area .item-r").text("");
                 }
             },
             showPrice: function () {
@@ -584,13 +568,13 @@
             showIndustry: function () {
                 if (this.industrySelect.length > 0 && this.industrySelect[0] != "一个行业") { //选择有行业信息
                     if (this.nowBuyset.buyerclasscount == -1) {
-                        $(".selected-industry-count").text("全部行业");
+                        $(".industry .item-r").text("全部行业");
                     } else {
                         var tipTxt = "";
-                        $(".selected-industry-count").text(tipTxt + this.nowBuyset.buyerclasscount + " 个行业");
+                        $(".industry .item-r").text(tipTxt + this.nowBuyset.buyerclasscount + " 个行业");
                     }
                 } else {
-                    $(".selected-industry-count").text("");
+                    $(".industry .item-r").text("");
                 }
             },
             showTime: function () {