wangkaiyue 5 ani în urmă
părinte
comite
c5d4e5fd2a

+ 32 - 50
src/jfw/modules/app/src/app/front/vipsubscribe.go

@@ -2,7 +2,6 @@ package front
 
 import (
 	"jfw/public"
-	"jfw/wx"
 	"qfw/util"
 	"time"
 
@@ -19,26 +18,24 @@ type Subscribepay struct {
 	toPaySuccessPage  xweb.Mapper `xweb:"/jyapp/vipsubscribe/toPaySuccessPage"`  //订阅支付完成页面
 	toOrderDetailPage xweb.Mapper `xweb:"/jyapp/vipsubscribe/toOrderDetailPage"` //订阅收费支付订单详情页面
 	toSetKeyWordPage  xweb.Mapper `xweb:"/jyapp/vipsubscribe/toSetKeyWordPage"`  //订阅收费设置关键词
-	toSetPage         xweb.Mapper `xweb:"/jyapp/vipsubscribe/toSetPage"`         //订阅收费设置
+
+
+	//toSetPageOld         xweb.Mapper `xweb:"/jyapp/vipsubscribe/toSetPage"`         //订阅收费设置
 	toSetInfoTypePage xweb.Mapper `xweb:"/jyapp/vipsubscribe/toSetInfoTypePage"` //订阅收费设置信息类型
-	toSetPushSetPage  xweb.Mapper `xweb:"/jyapp/vipsubscribe/toSetPushSetPage"`  //订阅收费推送设置
 	toSetOtherKwsPage xweb.Mapper `xweb:"/jyapp/vipsubscribe/toSet(.*)Page"`     //订阅收费附加词和排除词设置
 	toVIPViewPage     xweb.Mapper `xweb:"/jyapp/vipsubscribe/toVIPViewPage"`     //订阅收费预览
 
-	//修改
-	toEditSubPage       xweb.Mapper `xweb:"/jyapp/vipsubscribe/toEditSubPage"`       //订阅收费修改页面
-	toEditSubAreaPage   xweb.Mapper `xweb:"/jyapp/vipsubscribe/toEditSubAreaPage"`   //订阅收费修改地区
-	toEditSubInduPage   xweb.Mapper `xweb:"/jyapp/vipsubscribe/toEditSubInduPage"`   //订阅收费修改行业
-	submitEditSubFinish xweb.Mapper `xweb:"/jyapp/vipsubscribe/submitEditSubFinish"` //订阅收费修改成功
 
-	//升级
-	toUpgradePage xweb.Mapper `xweb:"/jyapp/vipsubscribe/toUpgradePage"`           //订阅收费升级服务页面
-	addArea       xweb.Mapper `xweb:"/jyapp/vipsubscribe/toChooseAreaUpgrade"`     //订阅收费升级新增区域页面
-	addIndustry   xweb.Mapper `xweb:"/jyapp/vipsubscribe/toChooseIndustryUpgrade"` //订阅收费升级新增行业页面
+	//修改升级
+	toSetPage        xweb.Mapper `xweb:"/jyapp/vipsubscribe/toSubVipSetPage"`          //订阅收费设置
+	toChangeArea     xweb.Mapper `xweb:"/jyapp/vipsubscribe/toChangeArea"`     //修改区域
+	toChangeIndustry xweb.Mapper `xweb:"/jyapp/vipsubscribe/toChangeIndustry"` //修改行业
+	toChangeTime     xweb.Mapper `xweb:"/jyapp/vipsubscribe/toChangeTime"`     //修改时间
+	toSetPushSetPage xweb.Mapper `xweb:"/jyapp/vipsubscribe/toSetPushSetPage"` //订阅收费推送设置
 
 	//续费
 	renewPage    xweb.Mapper `xweb:"/jyapp/vipsubscribe/renewPage/(.*)"` //订阅到期(will:即将到期,exprie:已到期)
-	renewPayPage xweb.Mapper `xweb:"/jyapp/vipsubscribe/renewPayPage"`   //订阅到期续费
+	//renewPayPage xweb.Mapper `xweb:"/jyapp/vipsubscribe/renewPayPage"`   //订阅到期续费
 
 	//发票
 	openInvoice xweb.Mapper `xweb:"/jyapp/vipsubscribe/openInvoice/(\\w+)"` //开发票
@@ -70,9 +67,26 @@ func (s *Subscribepay) ToSetInfoTypePage() {
 
 //订阅设置
 func (s *Subscribepay) ToSetPage() {
-	s.Render("/vipsubscribe/vip_index.html")
+	s.Render("/vipsubscribe/vip_index_new.html")
+}
+
+//修改升级 选择地区
+func (s *Subscribepay) ToChangeArea() {
+	s.Render("/vipsubscribe/change_area.html")
 }
 
+//修改升级 选择行业
+func (s *Subscribepay) ToChangeIndustry() {
+	s.Render("/vipsubscribe/change_industry.html")
+}
+
+//修改升级 选择时间
+func (s *Subscribepay) ToChangeTime() {
+	s.Render("/vipsubscribe/change_time.html")
+}
+
+
+
 //vip订阅介绍页
 func (s *Subscribepay) Introduce() error {
 	userId := util.ObjToString(s.GetSession("userId"))
@@ -112,6 +126,10 @@ func (s *Subscribepay) ToPurchasePage(flag string) {
 		s.T["isTrial"] = true
 		s.T["orderType"] = -1
 	} else { //付费
+		if flag == "renew" {
+			s.Render("/vipsubscribe/vip_renew.html")
+			return
+		}
 		if flag == "willExpire" {
 			s.T["orderType"] = 5
 			s.T["orderType"] = 5
@@ -152,42 +170,6 @@ func (s *Subscribepay) ToSetKeyWordPage() {
 	s.Render("/vipsubscribe/keyWord.html")
 }
 
-//修改订阅页面
-func (s *Subscribepay) ToEditSubPage() {
-	s.Render("/vipsubscribe/edit_subscribe.html")
-}
-
-//合并后修改地区
-func (s *Subscribepay) ToEditSubAreaPage() {
-	s.Render("/vipsubscribe/edit_city_new.html")
-}
-
-//修改订阅行业
-func (s *Subscribepay) ToEditSubInduPage() {
-	s.Render("/vipsubscribe/edit_subscribe_industry.html")
-}
-
-//提交订阅修改
-func (s *Subscribepay) SubmitEditSubFinish() {
-	s.Render("/vipsubscribe/edit_subscribe_success.html")
-}
-
-//升级订阅服务
-func (s *Subscribepay) ToUpgradePage() {
-	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url()) //微信支付准备参数
-	s.Render("/vipsubscribe/vip_upgrade.html")
-}
-
-//升级订阅新增区域
-func (s *Subscribepay) AddArea() {
-	s.Render("/vipsubscribe/choose_area_upgrade.html")
-}
-
-//升级订阅新增行业
-func (s *Subscribepay) AddIndustry() {
-	s.Render("/vipsubscribe/choose_industry_upgrade.html")
-}
-
 //服务续费(will:即将到期,exprie:已到期)
 func (s *Subscribepay) RenewPage(sign string) {
 	startTime := util.Int64All(s.GetString("startTime"))

+ 0 - 406
src/jfw/modules/app/src/web/templates/vipsubscribe/choose_area_upgrade.html

@@ -1,406 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>区域选择</title>
-    <meta name="viewport" content="initial-scale=1, maximum-scale=1">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <script src="/jyapp/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
-    <link rel="stylesheet" href="/jyapp/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" type="text/css" href="/jyapp/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
-    <link rel="stylesheet" type="text/css" href="/jyapp/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
-    <link rel="stylesheet" href="/jyapp/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/vipsubscribe/css/choose_area.css?v={{Msg "seo" "version"}}">
-	<link rel="stylesheet" type="text/css" href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}"/>
-	<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}"/>
-</head>
-<style type="text/css">
-	body,html {
-		height: 100%;
-	}
-	#choose_area .select-area-box .tab .province .checkbox.half[disabled]{
-        border: 0!important;
-        background: url(/jyapp/vipsubscribe/image/banxuan_disabled.png) no-repeat center center!important;
-        background-size:cover!important;
-    }
-</style>
-<body>
-	<div class="app-layout-header">
-	        <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-	        行业选择
-	    </div>
-	<div class="app-layout-content-b">
-    <div id="choose_area" >
-        <div class="result">
-            <!-- 首次购买 显示"已选择" -----  升级订阅显示"已新增" -->
-            <p class="result_text already"><span>已购买:</span><span class="buy-set-info"></span></p>
-            <p class="result_text add_new"><span>升级新增:</span><span class="added-info"></span></p>
-        </div>
-        <div class="form">
-            <div class="select-area-box">
-                <ul class="area-list">
-                    <li>
-                        <div class="tab whole">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox other">全国
-                            </div>
-                        </div>
-                    </li>
-                    <li class="index" id="A">A</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">安徽
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">澳门
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="B">B</li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">北京
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="C">C</li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">重庆
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="F">F</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">福建
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="G">G</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">广东
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">广西
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">贵州
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">甘肃
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="H">H</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">河北
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">湖北
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">黑龙江
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">海南
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">河南
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">湖南
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <p class="index" id="J">J</p>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">吉林
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">江苏
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">江西
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="L">L</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">辽宁
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="N">N</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">内蒙古
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">宁夏
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="Q">Q</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">青海
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="S">S</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">山西
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">陕西
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">上海
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">山东
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">四川
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="T">T</li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">天津
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">台湾
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="X">X</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">西藏
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">新疆
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">香港
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="Y">Y</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">云南
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="Z">Z</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">浙江
-                            </div>
-                            <span class="down-icon"><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                </ul>
-                
-            </div>
-        </div>
-        <div class="tips_btn">
-            <div class="tips_discount">
-                <!--<div class="tips_d_money" style="display: block">&yen;1</div>-->
-                <div class="tips_d_text">已选择3个市,建议购买“全省”</div>
-            </div>
-            <div class="btns">
-                <button class="reset-btn" disabled>重置</button>
-                <button class="save-btn" disabled>确认</button>
-            </div>
-        </div>
-        <div class="slide">
-            <a href="javascript:;">#</a>
-            <a href="javascript:;">A</a>
-            <a href="javascript:;">B</a>
-            <a href="javascript:;">C</a>
-            <a href="javascript:;">F</a>
-            <a href="javascript:;">G</a>
-            <a href="javascript:;">H</a>
-            <a href="javascript:;">J</a>
-            <a href="javascript:;">L</a>
-            <a href="javascript:;">N</a>
-            <a href="javascript:;">Q</a>
-            <a href="javascript:;">S</a>
-            <a href="javascript:;">T</a>
-            <a href="javascript:;">X</a>
-            <a href="javascript:;">Y</a>
-            <a href="javascript:;">Z</a>
-        </div>
-    </div>
-    </div>
-    <script src="/jyapp/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/jyapp/vipsubscribe/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/jyapp/js/common.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/jyapp/vipsubscribe/js/updateArea.js?v={{Msg "seo" "version"}}14"></script>
-</body>
-
-</html>

+ 0 - 529
src/jfw/modules/app/src/web/templates/vipsubscribe/choose_industry_upgrade.html

@@ -1,529 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <title>行业选择</title>
-        <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
-        <meta name="apple-mobile-web-app-capable" content="yes">
-        <meta name="apple-mobile-web-app-status-bar-style" content="black">
-        <script src="/jyapp/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
-        <link rel="stylesheet" href="/jyapp/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
-        <link rel="stylesheet" type="text/css" href="/jyapp/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
-        <link rel="stylesheet" type="text/css" href="/jyapp/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
-        <link rel="stylesheet" href="/jyapp/vipsubscribe/css/choose_industry.css?v={{Msg "seo" "version"}}3">
-		<link rel="stylesheet" type="text/css" href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}"/>
-	    <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}"/>
-    </head>
-    <style type="text/css">
-    	body,html {
-			height: 100%;
-		}
-    </style>
-    <body>
-    	<div class="app-layout-header">
-	        <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-	        行业选择
-	    </div>
-	    <div class="app-layout-content-b">
-        <main class="choose_industry main">
-            <div class="result">
-                <span class="label buyset">已购买:2/3个行业</span><br>
-                <span style="display: none;" class="label addUpgrade">升级新增:2个行业</span>
-            </div>
-            <div class="form">
-                <div class="select-area-box">
-                    <ul class="list">
-                        <li class="list_item" id="all">
-                            <div class="item_label"></div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">全部行业</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="A">
-                            <div class="item_label">A</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">安监</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="B">
-                            <div class="item_label">B</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">保监</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="C">
-                            <div class="item_label">C</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">财政</button>
-                                <button class="industry_item">传媒</button>
-                                <button class="industry_item">城管</button>
-                                <button class="industry_item">采矿业</button>
-                                <button class="industry_item">出版广电</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="D">
-                            <div class="item_label">D</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">档案</button>
-                                <button class="industry_item">地震</button>
-                                <button class="industry_item">党委办</button>
-                                <button class="industry_item">电信行业</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="F">
-                            <div class="item_label">F</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">法院</button>
-                                <button class="industry_item">发改</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="G">
-                            <div class="item_label">G</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">工商</button>
-                                <button class="industry_item">工信</button>
-                                <button class="industry_item">国土</button>
-                                <button class="industry_item">公安</button>
-                                <button class="industry_item">国资委</button>
-                                <button class="industry_item">公共资源交易</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="H">
-                            <div class="item_label">H</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">环保</button>
-                                <button class="industry_item">海关</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="J">
-                            <div class="item_label">J</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">教育</button>
-                                <button class="industry_item">军队</button>
-                                <button class="industry_item">交通</button>
-                                <button class="industry_item">纪委</button>
-                                <button class="industry_item">金融业</button>
-                                <button class="industry_item">建筑业</button>
-                                <button class="industry_item">检察院</button>
-                                <button class="industry_item">机关事务</button>
-                            </div>
-                        </li>
-                        <li class="list_item"  id="K">
-                            <div class="item_label">K</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">科技</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="L">
-                            <div class="item_label">L</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">林业</button>
-                                <button class="industry_item">旅游</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="M">
-                            <div class="item_label">M</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">民政</button>
-                                <button class="industry_item">民宗</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="N">
-                            <div class="item_label">N</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">农业</button>
-                                <button class="industry_item">能源化工</button>
-                                <button class="industry_item">农林牧渔</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="P">
-                            <div class="item_label">P</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">批发零售</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="Q">
-                            <div class="item_label">Q</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">气象</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="R">
-                            <div class="item_label">R</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">人行</button>
-                                <button class="industry_item">人社</button>
-                                <button class="industry_item">人大</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="S">
-                            <div class="item_label">S</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">食药</button>
-                                <button class="industry_item">税务</button>
-                                <button class="industry_item">水利</button>
-                                <button class="industry_item">市政</button>
-                                <button class="industry_item">审计</button>
-                                <button class="industry_item">商务</button>
-                                <button class="industry_item">司法</button>
-                                <button class="industry_item">社会团体</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="T">
-                            <div class="item_label">T</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">统计</button>
-                                <button class="industry_item">统战</button>
-                                <button class="industry_item">体育</button>
-                            </div>
-                        </li>                    
-                        <li class="list_item" id="W">
-                            <div class="item_label">W</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">文化</button>
-                                <button class="industry_item">卫生</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="X">
-                            <div class="item_label">X</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">学校</button>
-                                <button class="industry_item">宣传</button>
-                                <button class="industry_item">信息技术</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="Y">
-                            <div class="item_label">Y</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">医疗</button>
-                                <button class="industry_item">银监</button>
-                                <button class="industry_item">运输物流</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="Z">
-                            <div class="item_label">Z</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">质监</button>
-                                <button class="industry_item">组织</button>
-                                <button class="industry_item">政协</button>
-                                <button class="industry_item">住建</button>
-                                <button class="industry_item">证监</button>
-                                <button class="industry_item">政府办</button>
-                                <button class="industry_item">制造业</button>
-                                <button class="industry_item">政务中心</button>
-                                <button class="industry_item">住宿餐饮</button>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-            <div class="slide">
-                <a href="javascript:;">#</a>
-                <a href="javascript:;">A</a>
-                <a href="javascript:;">B</a>
-                <a href="javascript:;">C</a>
-                <a href="javascript:;">D</a>
-                <a href="javascript:;">F</a>
-                <a href="javascript:;">G</a>
-                <a href="javascript:;">H</a>
-                <a href="javascript:;">J</a>
-                <a href="javascript:;">K</a>
-                <a href="javascript:;">L</a>
-                <a href="javascript:;">M</a>
-                <a href="javascript:;">N</a>
-                <a href="javascript:;">P</a>
-                <a href="javascript:;">Q</a>
-                <a href="javascript:;">R</a>
-                <a href="javascript:;">S</a>
-                <a href="javascript:;">T</a>
-                <a href="javascript:;">W</a>
-                <a href="javascript:;">X</a>
-                <a href="javascript:;">Y</a>
-                <a href="javascript:;">Z</a>
-            </div>
-            <div class="tips_btn">
-                <div class="tips_discount">
-                    <!--<div class="tips_d_money" style="display: block">&yen;38</div>-->
-                    <div class="tips_d_text">已选择4个行业,建议购买“全部行业”更划算哦~</div>
-                </div>
-                <div class="btns">
-                    <button class="reset-btn">重置</button>
-                    <button class="save-btn">确认</button>
-                </div>
-            </div>
-        </main>
-        </div>
-        <script src="/jyapp/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-        <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/js/common.js?v={{Msg "seo" "version"}}"></script>
-		<script>
-		   //
-		   // 点击导航跳转
-			$("body").on('click','.slide a',function(){
-				var s = $(this).html()
-				if(s == '#'){
-					return;
-				}
-				document.querySelector('#' + s).scrollIntoView({block:'center'});
-			})
-			
-			function insertIndustryItem (letter, industryArr = []) {
-				if (!letter) return
-				var query = `#${letter[0].toUpperCase()} .item_industry_list`
-				var industryItemContainer = $(query)
-				var buttonArr = []
-
-				for (var i = 0; i < industryArr.length; i++) {
-					buttonArr.push(`<button class="industry_item" ${industryArr[i].disabled ? 'disabled': ''}>${industryArr[i].name}</button>`)
-				}
-				industryItemContainer.html(buttonArr.join(''))
-			}
-			
-			function findSelectedIndustry () {
-				var buttons = $('.select-area-box .list button')
-				// 找到已选择的数组(有active类的数组)
-				var selectedArr = []
-				buttons.each(function(){
-					if ($(this).hasClass('active')) {
-						if($(this).attr("disabled")!="disabled"){
-							if($(this).text() === "全部行业"){
-								
-							}
-							selectedArr.push($(this).text())
-						}
-					}
-				})
-				if(selectedArr.length > 0){
-					let adds = selectedArr.length+buyIndustryLen
-					if(buyset !== "全部行业"){
-						if(adds <= buyset){
-							$(".addUpgrade").hide();
-							buyLen = adds;
-							$(".buyset").text("已购买:"+buyLen+"/"+buyset+"个行业");
-							$(".tips_btn .btns .save-btn").attr("disabled","disabled");
-							$(".tips_btn .btns .reset-btn").attr("disabled","disabled");
-						}else{
-							let add = adds - buyset;
-							$(".addUpgrade").text("已新增:"+add+"个行业");
-							$(".addUpgrade").show();
-							$(".tips_btn .btns .save-btn").removeAttr("disabled");
-							$(".tips_btn .btns .reset-btn").removeAttr("disabled");
-						}
-					}else{
-						if(selectedArr[0] === "全部行业"){
-							$(".buyset").text("已购买:全部行业");
-						}else{
-							let adds = buyIndustry.length + selectedArr.length
-							$(".buyset").text("已购买:"+buyset);
-						}
-					}
-					// 显示隐藏优惠tips
-					let disabledCount = $("ul.list li.list_item .item_industry_list").find(".industry_item[disabled]").length;
-					let showCount = buyset - disabledCount;
-					let showCounts = selectedArr.length - showCount;
-					let countShow = showCounts + buyset
-					if (countShow > 3) {
-						$('.tips_btn .tips_d_text').text("已选择"+countShow+"个行业,建议购买“全部行业”");
-						$('.tips_btn .tips_d_text').slideDown();
-					} else {
-						$('.tips_btn .tips_d_text').slideUp()
-					}
-				}else{
-					if(buyset !== "全部行业"){
-						$(".buyset").text("已购买:"+buyIndustryLen+"/"+buyset+"个行业")
-					}else{
-						$(".buyset").text("已购买:"+buyset)
-					}
-					$('.tips_btn .tips_d_text').slideUp()
-				}
-				for(var i in selectedArr){
-					if(selectedArr[i] === "全部行业"){
-						if(buyset !== "全部行业"){
-							$(".buyset").text("已购买:"+buyIndustry.length+"/"+buyset+"个行业");
-							$(".addUpgrade").text("已新增:全部行业");
-							$(".addUpgrade").show();
-							$(".tips_btn .btns .save-btn").removeAttr("disabled");
-							$(".tips_btn .btns .reset-btn").removeAttr("disabled");
-						}
-					}
-				}
-		  
-				selectedIndustryArr = selectedArr
-				
-				var selectedStr = selectedArr.join('、')
-				$('.result .result_name').text(selectedStr)
-
-				if (selectedArr.length === 0) {
-//                  var allButton = $('#all button')
-//                  allButton.trigger('click')
-//                  $('.result .result_name').text(allButton.text())
-					$(".addUpgrade").hide();
-					$(".tips_btn .btns .save-btn").attr("disabled","disabled");
-					$(".tips_btn .btns .reset-btn").attr("disabled","disabled");
-				}
-				if (selectedArr.length === buttons.length - 1) {
-					// 除全部行业外所有按钮都被选中了
-					$('#all button').trigger('click');
-				}
-				$(".select-area-box .list").css("margin-top",$(".result").height()+20);
-			}
-					  
-			function showSelect(arr,canclick){
-			  if(!arr)return
-			  arr.forEach(v => {
-				$($('.industry_item')).each(function (index, dom) {
-					if(canclick){
-						if (v!="全部行业"){
-							$('#all').children().children('button').removeClass('active');
-							$(".tips_btn .btns .save-btn").removeAttr("disabled","disabled");
-							$(".tips_btn .btns .reset-btn").removeAttr("disabled","disabled");
-						}
-						if (v == $(dom).text()) {
-						   $(dom).addClass("active").attr({"disabled":!canclick})
-						}
-					}else{
-						if (v == $(dom).text()) {
-						   $(dom).attr({"disabled":!canclick});
-						}
-						if(v == "全部行业"){
-							$(".industry_item").each(function(){
-								$(this).attr({"disabled":!canclick});
-							});
-							$(".tips_d_money").hide();
-						}
-					}
-				})
-			  })
-			}
-			
-			function flushPrice(){
-			  if(vipSubisTrial){
-				$('.tips_d_money').css("display","none");
-			  }else{
-				var price=getsubVipOrderPrice(selectedAreaObj,selectedIndustryArr,timeSelect);
-				$('.tips_d_money').text('¥'+price);
-			  }
-			}
-			
-			// 每个button的点击事件
-			$('.select-area-box .list').on('click', 'button', function (e) {
-
-				$(this).toggleClass('active')
-				// 如果点击全部行业,则其他所有按钮都取消active
-				if ($(this).parents('li')[0].id === 'all') {
-					$('.select-area-box .list button').removeClass('active')
-					$('#all button').addClass('active')
-				} else {
-					$('#all button').removeClass('active')
-				}
-				
-				findSelectedIndustry()
-				flushPrice()
-			})
-			// 重置按钮事件
-			$('.reset-btn').on('click', function () {
-//            $("#all .industry_item").trigger("click");
-				$('.select-area-box .list button').removeClass('active');
-				showSelect(buyIndustry,false);
-				findSelectedIndustry();
-				//sessionStorage.removeItem("vipSubSelectIndustryAdd");
-				//sessionStorage.removeItem("vipSubSelectIndustryUpgrade");
-				$('.tips_btn .btns button').removeAttr('disabled');
-			})
-		   
-			//=======================
-			 
-
-			 // 确认按钮事件
-			$('.save-btn').on('click', function () {
-				var selectedIndustrysArr = ["全部行业"];
-				if(selectedIndustryArr[0] !== "全部行业"){
-					let reduce = buyset - buyIndustry.length
-					if(reduce > 0){
-						selectedIndustrysArr = selectedIndustryArr.slice(0, -reduce);
-					}else{
-						selectedIndustrysArr = selectedIndustryArr;
-					}
-				}
-				sessionStorage.buyIndustry = $(".buyset").html();
-				sessionStorage.addIndustry = $(".addUpgrade").html();
-				sessionStorage.setItem("vipSubSelectIndustryAdd",JSON.stringify(selectedIndustrysArr));
-				sessionStorage.setItem("vipSubSelectIndustryUpgrade",JSON.stringify(selectedIndustryArr));
-				history.go(-1);
-			})
-					   
-			var selectedIndustryArr //已选择行业
-			var selectedAreaObj = {"一个省":["一个市"]} //计算价格临时变量
-			var timeSelect = [1,2]//计算价格临时变量 timeSelect[0]时长  timeSelect[1] 1:年 2:月
-			var vipSubisTrial = false;
-			var buyIndustry = "";//已购买
-			var buyIndustryLen = 0;
-			var buyset = "";
-			var buyLen = 0;
-			$(function(){
-			  try{
-				if(sessionStorage.getItem("vipSubSelectIndustryUpgrade")){
-				  selectedIndustryArr=JSON.parse(sessionStorage.getItem("vipSubSelectIndustryUpgrade"));
-				}else{
-				  selectedIndustryArr=[];
-				}
-				if(sessionStorage.getItem("vipSubSelectAreaUpgrade")){
-				  selectedAreaObj=JSON.parse(sessionStorage.getItem("vipSubSelectAreaUpgrade"));
-				}
-				if(sessionStorage.getItem("vipSubSelectTime")){
-				  this.timeSelect=JSON.parse(sessionStorage.getItem("vipSubSelectTime"));
-				}
-				//已购买行业
-				$DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
-					if(data.success){
-						buyIndustry = data.data.buyerclass;
-						buyLen = buyIndustry.length
-						buyIndustryLen = buyIndustry.length;
-						buyset = Number(data.data.buyset.buyerclasscount);
-						if(sessionStorage.buyIndustry !== undefined){
-							$(".buyset").text(sessionStorage.buyIndustry);
-						}else{
-							if(buyset === -1){
-								buyset = "全部行业";
-								$(".buyset").text("已购买:/"+buyset);
-							}else{
-								$(".buyset").text("已购买:"+buyLen+"/"+buyset+"个行业");
-							}
-						}
-						if(sessionStorage.addIndustry !== undefined){
-							$(".addUpgrade").text(sessionStorage.addIndustry);
-						}
-					}
-				},false);
-				if(checkObj(buyIndustry)){
-					buyIndustry = ["全部行业"]
-				}
-				//是否试用界面
-				if(sessionStorage.getItem("vipSubisTrial")) vipSubisTrial=true;
-			  }catch(e){
-				console.log(e)
-			  }
-			  //已选择
-			  showSelect(selectedIndustryArr,true);
-			  showSelect(buyIndustry,false);
-			  findSelectedIndustry();
-			  flushPrice();
-			})
-			
-			//
-			function checkObj(obj) {
-				//检验数组
-				if (Array.prototype.isPrototypeOf(obj) && obj.length === 0) {
-					return true;
-				}
-				//检验对象
-				if (Object.prototype.isPrototypeOf(obj) && Object.keys(obj).length === 0) {
-					return true;
-				}
-				return false;
-			}
-		
-		</script>
-    </body>
-</html>

+ 0 - 405
src/jfw/modules/app/src/web/templates/vipsubscribe/edit_city_new.html

@@ -1,405 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>区域修改</title>
-    <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">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <script src="/jyapp/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
-    <link rel="stylesheet" href="/jyapp/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" type="text/css" href="/jyapp/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}"/>
-    <link rel="stylesheet" type="text/css" href="/jyapp/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
-    <!-- <link rel="stylesheet" href="/jyapp/vipsubscribe/css/public.css"> -->
-    <link rel="stylesheet" href="/jyapp/vipsubscribe/css/choose_area_new.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" type="text/css" href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}"/>
-    <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}"/>
-    <style>
-        html, body {
-            height: 100%;
-        }
-
-        .checkbox[disabled] {
-            background: none no-repeat center center #E0E0E0 !important;
-        }
-    </style>
-</head>
-
-<body>
-<div class="app-layout-header">
-    <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-    区域修改
-</div>
-<div class="app-layout-content-b">
-    <div id="choose_area">
-        <!--<p class="all_area" style="display: none;"> 可选择全部区域</p>-->
-        <p class="optional_count"> 可选择省数量:<em class="count"></em> / <span class="total"></span></p>
-        <!--<div class="result">
-            <p>已选择:<span class="result_name"></span></p>
-        </div>-->
-        <div class="form">
-            <div class="select-area-box" style="padding-bottom: 0;">
-                <ul class="area-list">
-                    <li>
-                        <div class="tab whole">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox other">全国
-                            </div>
-                        </div>
-                    </li>
-                    <li class="index" id="A">A</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">安徽
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">澳门
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="B">B</li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">北京
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="C">C</li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">重庆
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="F">F</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">福建
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="G">G</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">广东
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">广西
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">贵州
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">甘肃
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="H">H</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">河北
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">湖北
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">黑龙江
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">海南
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">河南
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">湖南
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <p class="index" id="J">J</p>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">吉林
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">江苏
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">江西
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="L">L</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">辽宁
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="N">N</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">内蒙古
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">宁夏
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="Q">Q</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">青海
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="S">S</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">山西
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">陕西
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">上海
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">山东
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">四川
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="T">T</li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">天津
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">台湾
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="X">X</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">西藏
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">新疆
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">香港
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="Y">Y</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">云南
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="Z">Z</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">浙江
-                            </div>
-                            <span class="down-icon"><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                </ul>
-            </div>
-        </div>
-        <div class="tips_btn">
-            <div class="btns">
-                <button class="reset-btn" id="cancel">重置</button>
-                <button class="save-btn" id="enter">确认修改</button>
-            </div>
-        </div>
-        <div class="slide">
-            <a href="javascript:;">#</a>
-            <a href="javascript:;">A</a>
-            <a href="javascript:;">B</a>
-            <a href="javascript:;">C</a>
-            <a href="javascript:;">F</a>
-            <a href="javascript:;">G</a>
-            <a href="javascript:;">H</a>
-            <a href="javascript:;">J</a>
-            <a href="javascript:;">L</a>
-            <a href="javascript:;">N</a>
-            <a href="javascript:;">Q</a>
-            <a href="javascript:;">S</a>
-            <a href="javascript:;">T</a>
-            <a href="javascript:;">X</a>
-            <a href="javascript:;">Y</a>
-            <a href="javascript:;">Z</a>
-        </div>
-    </div>
-</div>
-<script src="/jyapp/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-<script src="/jyapp/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
-<script src="/jyapp/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-<script src="/jyapp/vipsubscribe/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
-<script src="/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
-<script src="/jyapp/vipsubscribe/js/editArea.js?v={{Msg "seo" "version"}}"></script>
-<script src="/jyapp/js/common.js?v={{Msg "seo" "version"}}"></script>
-</body>
-
-</html>

+ 0 - 130
src/jfw/modules/app/src/web/templates/vipsubscribe/edit_subscribe.html

@@ -1,130 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<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>VIP订阅修改</title>
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <script src="/jyapp/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
-    <link rel="stylesheet" type="text/css" href="/jyapp/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}"/>
-    <link rel="stylesheet" type="text/css" href="/jyapp/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}"/>
-    <link rel="stylesheet" type="text/css" href="/jyapp/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
-    <link rel="stylesheet" href="/jyapp/vipsubscribe/css/vip_subscribe_edit.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" type="text/css" href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}"/>
-    <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}"/>
-</head>
-<body>
-<div class="app-layout-header">
-    <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-    VIP订阅修改
-</div>
-<div class="app-layout-content-b">
-    <div class="vip_subscribe_edit">
-        <div class="edit_content">
-            <!-- 购买的全国则不显示可修改区域 -->
-            <div class="title"></div>
-            <a data_href="/jyapp/vipsubscribe/toEditSubAreaPage" class="edit_item area">
-                <div class="item_top">
-                    <span>区域</span>
-                    <div class="item_bottom"></div>
-                    <i class="iconfont icon-arrow"></i>
-                </div>
-            </a>
-            <!-- 购买的全行业则不显示可修改行业 -->
-            <div class="title"></div>
-            <a data_href="/jyapp/vipsubscribe/toEditSubInduPage" class="edit_item industry">
-                <div class="item_top">
-                    <span>行业</span>
-                    <div class="item_bottom"></div>
-                    <i class="iconfont icon-arrow"></i>
-                </div>
-            </a>
-        </div>
-        <!--
-         <div class="edit_tips">
-             <div class="edit_count">总共可修改次数:<em>3</em> / 3</div>
-         </div>-->
-    </div>
-</div>
-<script src="/jyapp/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-<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/js/common.js?v={{Msg "seo" "version"}}"></script>
-<script>
-    $(window).bind("pageshow", function (event) {
-        if (event.originalEvent.persisted) {
-            window.location.reload();
-        }
-    });
-    var EditSub = {
-        reqData: {},
-        init: function () {
-            this.getData();
-            this.showData();//初始化页面展示
-            this.initClick();//初始化点击事件
-        },
-        getData: function () {
-            //加载数据
-            $DoPost("/subscribepay/editSub/getSubBuyMsg", {}, function (r) {
-                if (r.success) {
-                    EditSub.reqData = r.data;
-                }
-            }, false)
-        },
-        showData: function () {
-            //判断是否可编辑
-            if (this.reqData.buyset.areacount === -1) { //显示编辑全国
-                $(".edit_item.area .item_bottom").text("已购买全国");
-            } else {
-                //展示已选择省份 和 城市
-                let cityCount = 0;
-                if (!$.isEmptyObject(this.reqData.buyset.citys)) { //显示编辑市
-                    for (var i in this.reqData.buyset.citys) {
-                        cityCount += this.reqData.buyset.citys[i]
-                    }
-                    $(".city").css("display", "");
-                    $(".edit_item.city span").text(cityCount + "个市");
-                }
-                let descText = "已购买";
-                if (this.reqData.buyset.areacount > 0) {
-                    descText += this.reqData.buyset.areacount + "个省级区域"
-                }
-                if (cityCount > 0) {
-                    if (this.reqData.buyset.areacount > 0) {
-                        descText += "、"
-                    }
-                    descText += cityCount + "个地市"
-                }
-                $(".edit_item.area .item_bottom").text(descText);
-            }
-
-            //行业展示                 
-            if (this.reqData.buyset.buyerclasscount === -1) {
-                $(".edit_item.industry .item_bottom").text("已购买全行业");
-            } else {
-                $(".edit_item.industry .item_bottom").text("已购买" + this.reqData.buyset.buyerclasscount + "个行业");
-            }
-
-        },
-        initClick: function () {
-            $(".edit_item").on("click", function () {
-                window.location.href = $(this).attr("data_href");
-            });
-            //提交
-        },
-        showTip: function (msg) {
-            weui.toast(msg, {
-                duration: 2000,
-                className: 'custom-toast',
-            });
-        }
-    };
-    $(function () {
-        EditSub.init();
-    });
-</script>
-</body>
-</html>

+ 0 - 426
src/jfw/modules/app/src/web/templates/vipsubscribe/edit_subscribe_industry.html

@@ -1,426 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>行业选择</title>
-    <meta name="viewport"
-          content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <script src="/jyapp/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
-    <link rel="stylesheet" href="/jyapp/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" type="text/css" href="/jyapp/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}"/>
-    <link rel="stylesheet" type="text/css" href="/jyapp/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
-    <link rel="stylesheet" href="/jyapp/vipsubscribe/css/choose_industry.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" type="text/css" href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}"/>
-    <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}"/>
-</head>
-<body>
-<div class="app-layout-header">
-    <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-    行业选择
-</div>
-<div class="app-layout-content-b">
-    <main class="choose_industry main">
-        <p class="optional_count" style="background: rgba(245,244,249,1);"> 可选择行业数量: <em class="count"></em> / <span
-                    class="total"></span></p>
-        <!--<div class="result" style="display: block;">
-            <span class="label">已选择:</span>
-            <span class="result_name">全部行业</span>
-        </div>-->
-        <div class="form">
-            <div class="select-area-box">
-                <ul class="list">
-                    <li class="list_item" id="all" style="display:none">
-                        <div class="item_label"></div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">全部行业</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="A">
-                        <div class="item_label">A</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">安监</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="B">
-                        <div class="item_label">B</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">保监</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="C">
-                        <div class="item_label">C</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">财政</button>
-                            <button class="industry_item">传媒</button>
-                            <button class="industry_item">城管</button>
-                            <button class="industry_item">采矿业</button>
-                            <button class="industry_item">出版广电</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="D">
-                        <div class="item_label">D</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">档案</button>
-                            <button class="industry_item">地震</button>
-                            <button class="industry_item">党委办</button>
-                            <button class="industry_item">电信行业</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="F">
-                        <div class="item_label">F</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">法院</button>
-                            <button class="industry_item">发改</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="G">
-                        <div class="item_label">G</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">工商</button>
-                            <button class="industry_item">工信</button>
-                            <button class="industry_item">国土</button>
-                            <button class="industry_item">公安</button>
-                            <button class="industry_item">国资委</button>
-                            <button class="industry_item">公共资源交易</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="H">
-                        <div class="item_label">H</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">环保</button>
-                            <button class="industry_item">海关</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="J">
-                        <div class="item_label">J</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">教育</button>
-                            <button class="industry_item">军队</button>
-                            <button class="industry_item">交通</button>
-                            <button class="industry_item">纪委</button>
-                            <button class="industry_item">金融业</button>
-                            <button class="industry_item">建筑业</button>
-                            <button class="industry_item">检察院</button>
-                            <button class="industry_item">机关事务</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="K">
-                        <div class="item_label">K</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">科技</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="L">
-                        <div class="item_label">L</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">林业</button>
-                            <button class="industry_item">旅游</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="M">
-                        <div class="item_label">M</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">民政</button>
-                            <button class="industry_item">民宗</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="N">
-                        <div class="item_label">N</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">农业</button>
-                            <button class="industry_item">能源化工</button>
-                            <button class="industry_item">农林牧渔</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="P">
-                        <div class="item_label">P</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">批发零售</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="Q">
-                        <div class="item_label">Q</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">气象</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="R">
-                        <div class="item_label">R</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">人行</button>
-                            <button class="industry_item">人社</button>
-                            <button class="industry_item">人大</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="S">
-                        <div class="item_label">S</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">食药</button>
-                            <button class="industry_item">税务</button>
-                            <button class="industry_item">水利</button>
-                            <button class="industry_item">市政</button>
-                            <button class="industry_item">审计</button>
-                            <button class="industry_item">商务</button>
-                            <button class="industry_item">司法</button>
-                            <button class="industry_item">社会团体</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="T">
-                        <div class="item_label">T</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">统计</button>
-                            <button class="industry_item">统战</button>
-                            <button class="industry_item">体育</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="W">
-                        <div class="item_label">W</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">文化</button>
-                            <button class="industry_item">卫生</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="X">
-                        <div class="item_label">X</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">学校</button>
-                            <button class="industry_item">宣传</button>
-                            <button class="industry_item">信息技术</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="Y">
-                        <div class="item_label">Y</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">医疗</button>
-                            <button class="industry_item">银监</button>
-                            <button class="industry_item">运输物流</button>
-                        </div>
-                    </li>
-                    <li class="list_item" id="Z">
-                        <div class="item_label">Z</div>
-                        <div class="item_industry_list">
-                            <button class="industry_item">质监</button>
-                            <button class="industry_item">组织</button>
-                            <button class="industry_item">政协</button>
-                            <button class="industry_item">住建</button>
-                            <button class="industry_item">证监</button>
-                            <button class="industry_item">政府办</button>
-                            <button class="industry_item">制造业</button>
-                            <button class="industry_item">政务中心</button>
-                            <button class="industry_item">住宿餐饮</button>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-        </div>
-        <div class="slide">
-            <a href="javascript:;">#</a>
-            <a href="javascript:;">A</a>
-            <a href="javascript:;">B</a>
-            <a href="javascript:;">C</a>
-            <a href="javascript:;">D</a>
-            <a href="javascript:;">F</a>
-            <a href="javascript:;">G</a>
-            <a href="javascript:;">H</a>
-            <a href="javascript:;">J</a>
-            <a href="javascript:;">K</a>
-            <a href="javascript:;">L</a>
-            <a href="javascript:;">M</a>
-            <a href="javascript:;">N</a>
-            <a href="javascript:;">P</a>
-            <a href="javascript:;">Q</a>
-            <a href="javascript:;">R</a>
-            <a href="javascript:;">S</a>
-            <a href="javascript:;">T</a>
-            <a href="javascript:;">W</a>
-            <a href="javascript:;">X</a>
-            <a href="javascript:;">Y</a>
-            <a href="javascript:;">Z</a>
-        </div>
-        <!-- <div class="bottom_button">
-            <button class="reset-btn left_btn" disabled>重置</button>
-            <button class="save-btn right_btn" disabled>确认</button>
-        </div> -->
-        <div class="tips_btn">
-            <div class="btns">
-                <button class="reset-btn" id="cancel">取消</button>
-                <button disabled class="save-btn" id="enter">确认修改</button>
-            </div>
-        </div>
-    </main>
-</div>
-<script src="/jyapp/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-<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/js/common.js?v={{Msg "seo" "version"}}"></script>
-<script>
-    //加载数据
-    var EditIndustry = {
-        reqData: {},
-        selectlast: [],
-        init: function () {
-            this.getData();
-            this.showData();//初始化页面展示
-            this.initClick();//初始化点击事件
-        },
-        getData: function () {
-            //加载数据
-            $DoPost("/subscribepay/editSub/getSubBuyMsg", {}, function (r) {
-                if (r.success) {
-                    EditIndustry.reqData = r.data;
-                }
-            }, false)
-            if (this.reqData.industry.length == 0 && this.reqData.buyset.buyerclasscount == -1) {
-                this.reqData.industry = ["全部行业"]
-            }
-        },
-        showData: function () {
-            this.selectlast = this.reqData.industry;
-
-            //$('.result .result_name').html(this.reqData.industry.join('、'));
-
-            $('.industry_item').each(function () {
-                let text = $(this).text();
-                EditIndustry.reqData.industry.forEach(v => {
-                    if (v.trim() == text.trim()) {
-                        $(this).addClass('active')
-                    }
-                })
-            });
-
-            if (this.reqData.buyset.buyerclasscount != -1) { //非全部行业 展示数量
-                $('.total').html(this.reqData.buyset.buyerclasscount);
-                $('.count').html(this.reqData.industry.length);
-                //$('.optional_count').css({"width": "100%", "position": "fixed", "top": 0, "z-index": 9999});
-                $('.result').css({"top": $('.optional_count').height()});
-                //$('.select-area-box').css({"padding-top": $('.optional_count').height()});
-                if (this.reqData.industry.length >= this.reqData.buyset[2]) {
-                    $('.industry_item:not(.active)').attr('disabled', true);
-                }
-            } else {
-                $("#all").css("display", "");
-                $(".optional_count").css("display", "none");
-            }
-            EditIndustry.findSelectedIndustry(true);
-        },
-        initClick: function () {
-            // 点击导航跳转
-            $("body").on('click', '.slide a', function () {
-                var s = $(this).html()
-                if (s == '#') {
-                    return;
-                }
-                document.querySelector('#' + s).scrollIntoView({block: 'center'});
-            })
-            // 每个button的点击事件
-            $('.select-area-box .list').on('click', 'button', function (e) {
-                if ($(this).text() == "全部行业") {
-                    if ($(this).hasClass('active')) {
-                        return
-                    }
-                    if (EditIndustry.reqData.buyset.buyerclasscount != -1) { //购买不是全部行业 不能点击
-                        if (EditIndustry.reqData.isTrial) {
-                            EditIndustry.showTip(`<span style="white-space: nowrap;">您只选择试用了${EditIndustry.reqData.buyset.buyerclasscount}个行业</span>,<br><span style="white-space: nowrap;">如需更多,请前往VIP订阅进行购买</span>`);
-                        } else {
-                            EditIndustry.showTip(`<span style="white-space: nowrap;">您只购买了${EditIndustry.reqData.buyset.buyerclasscount}个行业,如需更多请升级<span></p>`);
-                        }
-                        return
-                    }
-                    $('.select-area-box .list button').removeClass('active');
-                    $('#all button').addClass('active');
-                    $('#enter').removeAttr('disabled');
-                } else {
-                    $(this).toggleClass('active')
-                    if ($(".industry_item.active").length == 0) {//如果没有行业被选中 则选中全部行业
-                        if (EditIndustry.reqData.buyset.buyerclasscount == -1) {
-                            $('#all button').addClass('active');
-                        } else {
-                            $('#enter').attr('disabled', 'disabled');//选择空不能提交
-                        }
-                    } else {
-                        $('#all button').removeClass('active');
-                        $('#enter').removeAttr('disabled');
-                    }
-                }
-
-                EditIndustry.findSelectedIndustry(false);
-            })
-            // 取消按钮事件 返回上一页
-            $('#cancel').click(function () {
-                window.history.go(-1);
-            })
-            // 确定修改事件
-            $('#enter').click(function () {
-                $("#enter").attr("disabled", "disabled");
-                //更新对象
-                if (EditIndustry.reqData.buyset.buyerclasscount == -1 && EditIndustry.reqData.industry[0] == "全部行业") {
-                    EditIndustry.reqData.industry = [];
-                }
-                console.log("final select ", EditIndustry.reqData)
-                $DoPost("/subscribepay/editSub/submit", {
-                    "type": "industry",
-                    "value": JSON.stringify(EditIndustry.reqData.industry)
-                }, function (r) {
-                    if (r.success) {
-                        window.location.replace('/front/vipsubscribe/submitEditSubFinish');
-                    }
-                }, false)
-                $("#enter").removeAttr("disabled");
-            })
-        },
-        showTip: function (msg) {
-            weui.toast(msg, {
-                duration: 2000,
-                className: 'custom-toast',
-            });
-        },
-        findSelectedIndustry: function (isInit) {
-            var buttons = $('.select-area-box .list button')
-            // 找到已选择的数组(有active类的数组)
-            var selectedArr = []
-            buttons.each(function () {
-                if ($(this).hasClass('active')) {
-                    selectedArr.push($(this).text())
-                }
-            })
-            if (selectedArr.length == $('.select-area-box .list button').length - 1) {//选中了全部行业
-                $('#all button').trigger('click');
-                return
-            }
-            var selectCount = selectedArr.length
-            $('.count').html(selectCount);
-            // 显示隐藏优惠tips
-            if (selectedArr.length >= EditIndustry.reqData.buyset.buyerclasscount && EditIndustry.reqData.buyset.buyerclasscount != -1) {
-                if (!isInit) {
-                    if (EditIndustry.reqData.isTrial) {
-                        EditIndustry.showTip(`<span style="white-space: nowrap;">您只选择试用了${EditIndustry.reqData.buyset.buyerclasscount}个行业</span>,<br><span style="white-space: nowrap;">如需更多,请前往VIP订阅进行购买</span>`);
-                    } else {
-                        EditIndustry.showTip(`<span style="white-space: nowrap;">您只购买了${EditIndustry.reqData.buyset.buyerclasscount}个行业,如需更多请升级<span></p>`);
-                    }
-                }
-                $('.industry_item:not(.active)').attr('disabled', 'disabled');
-            } else {
-                $('.industry_item:not(.active)').removeAttr('disabled')
-            }
-            this.reqData.industry = selectedArr;
-            var selectedStr = selectedArr.join('、')
-            //$('.result .result_name').text(selectedStr)
-            if (this.noChange(this.reqData.industry, EditIndustry.selectlast) || this.reqData.industry.length == 0) {
-                $('#enter').attr('disabled', 'disabled');
-            } else {
-                $('#enter').removeAttr('disabled');
-            }
-        },
-        noChange: function (arr1, arr2) {
-            return JSON.stringify(arr1.sort()) === JSON.stringify(arr2.sort());
-        }
-    }
-    $(function () {
-        EditIndustry.init();
-    })
-
-</script>
-</body>
-</html>

+ 0 - 70
src/jfw/modules/app/src/web/templates/vipsubscribe/edit_subscribe_success.html

@@ -1,70 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>VIP订阅修改</title>
-    <meta name="viewport"
-          content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <script src="/jyapp/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
-    <link rel="stylesheet" type="text/css" href="/jyapp/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}"/>
-    <link rel="stylesheet" type="text/css" href="/jyapp/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
-    <link rel="stylesheet" href="/jyapp/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/vipsubscribe/css/edit_success.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" type="text/css" href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}"/>
-    <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}"/>
-</head>
-<body>
-<div class="app-layout-header">
-    <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-    VIP订阅修改
-</div>
-<div class="app-layout-content-b">
-    <div class="edit_success">
-        <div><i class="icon iconfont success">&#xe612;</i></div>
-        <p>修改成功</p>
-        <button class="public_btn" id="back">返回<em class="time"></em></button>
-    </div>
-</div>
-<script src="/jyapp/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-<script src="/jyapp/js/common.js?v={{Msg "seo" "version"}}"></script>
-<script>
-
-    $(function () {
-//              timer($('.time'),()=>{
-//                  window.history.go(-1); 
-//              })
-        countDown();
-        $('#back').click(function () {
-            window.history.go(-1);
-        })
-    })
-    var time = 3;
-
-    function countDown() {
-        if (time == 0) {
-            $('.time').html('');
-            window.history.go(-1);
-        } else {
-            $('.time').html('(' + time + ')');
-            time--;
-            setTimeout(() => {
-                countDown()
-            }, 1000)
-        }
-    }
-
-    function timer(obj, callback) {
-        let t = 3;
-        let timer = setInterval(() => {
-            t--;
-            obj.html(t)
-            if (t == 1) {
-                callback()
-            }
-        }, 1000);
-    }
-</script>
-</body>
-</html>

+ 0 - 766
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_purchase.html

@@ -1,766 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport"
-          content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
-    <title>VIP订阅</title>
-    <script src="/jyapp/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
-    <link rel="stylesheet" type="text/css" href="/jyapp/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}"/>
-    <link rel="stylesheet" href="/jyapp/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/vipsubscribe/css/vip_purchase.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" type="text/css" href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}"/>
-    <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}"/>
-</head>
-<body>
-<div class="app-layout-header">
-    <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-    VIP订阅
-</div>
-<div class="app-layout-content-b">
-    <div class="vip_purchase">
-        <div class="choose_condition">
-            <ul class="chooseList">
-                <li class="choose_item">
-                    <a href="/jyapp/vipsubscribe/toChooseArea">
-                        <span class="label">区域</span>
-                        {{if not .T.isTrial }}
-                            <input type="text" disabled value="" placeholder="1个市" class="info choose_area">
-                        {{else}}
-                            <input type="text" disabled value="" placeholder="选择全国、省份、地市" class="info choose_area">
-                        {{end}}
-                        <i class="iconfont icon-arrow"></i>
-                    </a>
-                    <!-- 无选择时不显示 -->
-                    <p class="add_tips area" style="display:none">已选择 0 个省级区域、0 个地市</p>
-                </li>
-                <li class="choose_item">
-                    <a href="/jyapp/vipsubscribe/toChooseIndustry">
-                        <span class="label">行业</span>
-                        {{if not .T.isTrial }}
-                            <input type="text" disabled value="" placeholder="1个行业" class="info choose_industry">
-                        {{else}}
-                            <input type="text" disabled value="" placeholder="选择采购单位行业" class="info choose_industry">
-                        {{end}}
-                        <i class="iconfont icon-arrow"></i>
-                    </a>
-                    <!-- 无选择时不显示 -->
-                    <p class="add_tips industry" style="display:none">已选择 0 个行业</p>
-                </li>
-                <li class="choose_item select_cycle">
-                    <!-- 需要选择订阅周期就用a标签,div.class="free-7day"隐藏 opacity: 1 !important; -->
-                    <!-- 需要选择试用就用div标签,a标签隐藏 -->
-                    {{if not .T.isTrial }}
-                        <a href="javascript:;">
-                            <span class="label">订阅周期</span>
-                            <span class="show_time">一个月</span>
-                            <input type="text" readonly="readonly" disabled style="display:none;" value="1个月"
-                                   class="info choose_time">
-                            <i class="iconfont icon-arrow"></i>
-                        </a>
-                    {{else}}
-                        <div class="free-7day">
-                            <span class="label">订阅周期</span>
-                            <i class="info">免费试用7天</i>
-                        </div>
-                    {{end}}
-
-                </li>
-            </ul>
-            <div class="pay_mode">
-                {{if not .T.isTrial }}
-                    <div class="select_payment choose_item">
-                        <a href="javascript:;">
-                            <span class="label">支付方式</span>
-                            <span class="info choose_way">微信支付</span>
-                            <i class="iconfont icon-arrow"></i>
-                        </a>
-                    </div>
-                {{end}}
-                <div class="vip_rules">
-                    <!--
-                      <div class="auto_renew weui-cells_checkbox radio-form">
-                          <label class="weui-cell weui-check__label" for="auto-renew">
-                              <div class="weui-cell__hd">
-                                  <input type="checkbox" class="weui-check" name="autoRenewService" id="auto-renew" />
-                                  <i class="weui-icon-checked"></i>
-                              </div>
-                              <div class="weui-cell__bd read">
-                                  <p>开通自动续费,根据当前订阅条件,服务到期时系统将为您自动续费</p>
-                              </div>
-                          </label>
-                      </div>
-                    -->
-                    <div class="vip_prise_table">
-                        <table class="monthly">
-                            <caption class="table_title">- VIP订阅价格 -</caption>
-                            <tr>
-                                <td colspan="2">按月购买</td>
-                            </tr>
-                            <tr>
-                                <td><span>5.8</span>元 月/市/行业</td>
-                                <td><span>18</span>元 月/市/全行业</td>
-                            </tr>
-                            <tr>
-                                <td><span>11.8</span>元 月/省/行业</td>
-                                <td><span>38</span>元 月/省/全行业</td>
-                            </tr>
-                            <tr>
-                                <td><span>118</span>元 月/全国/行业</td>
-                                <td><span>388</span>元 月/全国/全行业</td>
-                            </tr>
-                        </table>
-                        <table class="yearly">
-                            <tr>
-                                <td colspan="2">按年购买</td>
-                            </tr>
-                            <tr>
-                                <td><span>58</span>元 年/市/行业</td>
-                                <td><span>180</span>元 年/市/全行业</td>
-                            </tr>
-                            <tr>
-                                <td><span>118</span>元 年/省/行业</td>
-                                <td><span>380</span>元 年/省/全行业</td>
-                            </tr>
-                            <tr>
-                                <td><span>1180</span>元 年/全国/行业</td>
-                                <td><span>3880</span>元 年/全国/全行业</td>
-                            </tr>
-                        </table>
-                        <dl class="tips">
-                            <dt>购买须知:</dt>
-                            <dd>套餐周期内,不支持套餐降级,即将到期时续费可降级;</dd>
-                            <dd>支持套餐升级,补差价(按月进行补差价,不足一个月按一个月计算)。</dd>
-                        </dl>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="fixed-bottom-box">
-            <div class="weui-cells weui-cells_checkbox radio-form">
-                <label class="weui-cell weui-check__label" for="buy">
-                    <div class="weui-cell__hd">
-                        <input type="checkbox" class="weui-check" name="buyService" id="buy"/>
-                        <i class="weui-icon-checked"></i>
-                    </div>
-                    <div class="weui-cell__bd read">
-                        <p>
-                            我已阅读,理解并接受
-                            <a href="/jyapp/front/staticPage/wx-serviceterms.html">
-                                《剑鱼标讯线上购买与服务条款》
-                            </a>
-                        </p>
-                    </div>
-                </label>
-            </div>
-            <div class="price">
-                <!-- <strong>&yen;1,300.00</strong> -->
-                <strong>&yen;5.80</strong>
-            </div>
-            <div class="form-btn">
-                <button class="btn enter" disabled id="payHandle">去支付</button>
-            </div>
-        </div>
-
-        <!-- 选择行业 -->
-        <div class="js_dialog time_cycle" id="time_cycle" style="display: none;">
-            <div class="weui-mask"></div>
-            <div class="box">
-                <div class="box_hd">
-                    <h3>订阅周期</h3>
-                    <span class="cancel">取消</span>
-                </div>
-                <div class="box_bd">
-                    <!-- <div class="tips monthly_tips" style="display: none">
-                            3-6个月6折,大于6个月5折
-                        </div>
-                        <div class="tips yearly_tips" style="display: none">
-                            1-2年5折,3年4折
-                        </div> -->
-                    <div class="tips profit_tips" style="display: none">已选择10个月,建议“按年订阅”</div>
-                    <div class="computed_price">¥58.0</div>
-                    <div class="bd_select">
-                        <div class="weui-cells weui-cells_checkbox choose-form">
-                            <label class="weui-cell weui-check__label monthly_label" for="monthly">
-                                <div class="weui-cell__hd">
-                                    <input type="radio" class="weui-check monthly" name="time" value="month"
-                                           id="monthly"/>
-                                    <i class="weui-icon-checked"></i>
-                                </div>
-                                <div class="weui-cell__bd">
-                                    <p>按月订阅</p>
-                                </div>
-                            </label>
-                            <div class="number_box" id="number_box_month" data-numbox-step="1" data-numbox-min="1"
-                                 data-numbox-max="12">
-                                <button class="weui-btn weui-btn_plain-default" type="button" disabled>
-                                    <div class="jy_icon decrease"></div>
-                                </button>
-                                <span class="month_number">1</span>
-                                <button class="weui-btn weui-btn_plain-default add" type="button">
-                                    <div class="jy_icon increase"></div>
-                                </button>
-                            </div>
-                        </div>
-                        <div class="weui-cells weui-cells_checkbox choose-form">
-                            <label class="weui-cell weui-check__label yearly_label" for="yearly">
-                                <div class="weui-cell__hd">
-                                    <input type="radio" class="weui-check yearly" name="time" value="year"
-                                           id="yearly" checked/>
-                                    <i class="weui-icon-checked"></i>
-                                </div>
-                                <div class="weui-cell__bd">
-                                    <p>按年订阅</p>
-                                </div>
-                            </label>
-                            <div class="number_box" id="number_box_year" style="border: 0;">
-                                <span class="year_number" data-id="1">1年</span>
-                                <span class="year_number" data-id="2">2年</span>
-                                <span class="year_number" data-id="3">3年</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="form-btn">
-                    <button class="btn enter" id="enter_period">确认</button>
-                </div>
-            </div>
-        </div>
-        <!-- 选择支付方式 -->
-        <div class="js_dialog pay_way" id="pay_way" style="display: none;">
-            <div class="weui-mask"></div>
-            <div class="box">
-                <div class="box_hd">
-                    <span></span>
-                    <h3>支付方式</h3>
-                    <span class="cancel">取消</span>
-                </div>
-                <div class="box_bd">
-                    <div class="weui-cells weui-cells_checkbox choose-form">
-                        <label class="weui-cell weui-check__label wx_label" for="wx">
-                            <div class="weui-cell__bd read">
-                                <p><img src="/jyapp/vipsubscribe/image/weixin.png?v={{Msg "seo" "version"}}">微信支付</p>
-                            </div>
-                            <div class="weui-cell__hd">
-                                <input type="radio" class="weui-check" name="way" value="微信支付" id="wx" checked/>
-                                <i class="weui-icon-checked"></i>
-                            </div>
-                        </label>
-                        <label class="weui-cell weui-check__label zfb_label" for="zfb">
-                            <div class="weui-cell__bd read">
-                                <p><img src="/jyapp/vipsubscribe/image/zhifubao.png?v={{Msg "seo" "version"}}">支付宝支付</p>
-                            </div>
-                            <div class="weui-cell__hd">
-                                <input type="radio" class="weui-check" name="way" value="支付宝支付" id="zfb"/>
-                                <i class="weui-icon-checked"></i>
-                            </div>
-                        </label>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="/jyapp/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-<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/js/common.js?v={{Msg "seo" "version"}}"></script>
-<script>
-    $(window).bind("pageshow", function (event) {
-        if (event.originalEvent.persisted) {
-            window.location.reload();
-        }
-    });
-    {{if not .T.isTrial }}
-    sessionStorage.removeItem("vipSubisTrial");//非试用界面
-    {{else}}
-    sessionStorage.setItem("vipSubisTrial", "1");//试用界面
-    //试用用户
-    {{end}}
-    var purchase = {
-        areaSelect: {"一个省": ["一个市"]},//已选择地区 {"一个省":["一个市"]}计算价格临时变量
-        industrySelect: ["一个行业"],// 已选择行业 一个行业(计算价格临时变量)
-        timeSelect: [1, 2],//已选择时间 timeSelect[0]时长  timeSelect[1] 1:年 2:月
-        price: {}, //价格
-        payWay: "",
-        vipSubisTrial: false,
-        initData: function () {
-            //已选择
-            try {
-                if (sessionStorage.getItem("vipSubSelectArea")) {
-                    this.areaSelect = JSON.parse(sessionStorage.getItem("vipSubSelectArea"));
-                }
-                if (sessionStorage.getItem("vipSubSelectIndustry")) {
-                    this.industrySelect = JSON.parse(sessionStorage.getItem("vipSubSelectIndustry"));
-                }
-                {{if .T.again}}    //再次购买回显
-                {{if eq .T.again 1 }}
-                var orderCode = getParam("orderCode")
-                if (!sessionStorage.getItem("vipSubSelectArea") || !sessionStorage.getItem("vipSubSelectIndustry")) {
-                    $DoPost("/subscribepay/orderListDetails/getVipOrderInfo", {"orderCode": orderCode}, function (r) {
-                        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 = ["全部行业"]
-                        }
-//                          if (r.timeSelect!=undefined&&r.company!=undefined){
-//                         		purchase.timeSelect=[r.timeSelect,r.company];
-//                          }
-                        $(".weui-icon-checked").click();
-                        sessionStorage.setItem("vipSubSelectArea", JSON.stringify(purchase.areaSelect));
-                        sessionStorage.setItem("vipSubSelectIndustry", JSON.stringify(purchase.industrySelect));
-                        //sessionStorage.setItem("vipSubSelectTime", JSON.stringify(purchase.timeSelect));
-
-                    }, false)
-                }
-                {{end}}
-                {{end}}
-                if (sessionStorage.getItem("vipSubSelectTime")) {
-                    this.timeSelect = JSON.parse(sessionStorage.getItem("vipSubSelectTime"));
-                }
-                //是否已经点击已读
-                if (sessionStorage.getItem("vipSub_read") == "true") $("#buy").prop("checked", true);
-                //是否试用界面
-                if (sessionStorage.getItem("vipSubisTrial")) this.vipSubisTrial = true;
-                //支付方式
-                if (sessionStorage.getItem("vipSubPayWay")) this.payWay = sessionStorage.getItem("vipSubPayWay");
-
-                //加载价格
-                $DoPost("/subscribepay/vipsubscribe/getPrice", {}, function (r) {
-                    if (r) {
-                        purchase.price = r;
-                    }
-                }, false)
-
-            } catch (e) {
-                console.log(e)
-            }
-        },
-        showArea: function () {
-            let cityArr = [];//城市
-            let provinceArr = [];//省份
-            let data = this.areaSelect;
-            for (var i in data) {
-                let citys = data[i];
-                if (citys.length > 0) {
-                    cityArr = cityArr.concat(citys);
-                } else {
-                    provinceArr.push(i)
-                }
-            }
-
-            /*if (!$.isEmptyObject(data) && !this.areaSelect["一个省"]) {
-                $(".choose_area").val(provinceArr.join(" ") + " " + cityArr.join(" "));
-            }*/
-
-            if (!$.isEmptyObject(this.areaSelect) && !this.areaSelect["全国"] && !this.areaSelect["一个省"]) { //选择有行业信息 且不是全国
-                var tipTxt = "已选择 ";
-                if (provinceArr.length > 0) tipTxt += provinceArr.length + " 个省级区域";
-                if (cityArr.length > 0) {
-                    if (provinceArr.length > 0) tipTxt += "、";
-                    tipTxt += cityArr.length + " 个地市";
-                }
-                $(".choose_area").val(tipTxt);
-                //$(".add_tips.area").text(tipTxt).css("display", "");
-            } else if (!$.isEmptyObject(this.areaSelect) && this.areaSelect["全国"]) {
-                $(".choose_area").val("全国");
-            } else {
-                $(".choose_area").val("");
-            }
-        },
-        showPrice: function () {
-            //回显支付方式
-            if (this.payWay == "ali_app") {
-                $('#zfb').prop('checked', true);
-                $('.info.choose_way').text("支付宝支付");
-            }
-            $('.monthly span:eq(0)').text(purchase.price.month.oneCity_oneBuyerClass / 100);
-            $('.monthly span:eq(1)').text(purchase.price.month.oneCity_allBuyerClass / 100);
-            $('.monthly span:eq(2)').text(purchase.price.month.oneProvince_oneBuyerClass / 100);
-            $('.monthly span:eq(3)').text(purchase.price.month.oneProvince_allBuyerClass / 100);
-            $('.monthly span:eq(4)').text(purchase.price.month.allProvince_oneBuyerClass / 100);
-            $('.monthly span:eq(5)').text(purchase.price.month.allProvince_allBuyerClass / 100);
-
-            $('.yearly span:eq(0)').text(purchase.price.year.oneCity_oneBuyerClass / 100);
-            $('.yearly span:eq(1)').text(purchase.price.year.oneCity_allBuyerClass / 100);
-            $('.yearly span:eq(2)').text(purchase.price.year.oneProvince_oneBuyerClass / 100);
-            $('.yearly span:eq(3)').text(purchase.price.year.oneProvince_allBuyerClass / 100);
-            $('.yearly span:eq(4)').text(purchase.price.year.allProvince_oneBuyerClass / 100);
-            $('.yearly span:eq(5)').text(purchase.price.year.allProvince_allBuyerClass / 100);
-        },
-        showIndustry: function () {
-            let data = this.industrySelect;
-            /*if (data.length > 0 && data[0] != "一个行业") {
-                $(".choose_industry").val(data.join(" "));
-            }*/
-            if (this.industrySelect.length > 0 && this.industrySelect[0] != "全部行业" && this.industrySelect[0] != "一个行业") { //选择有行业信息
-                var tipTxt = "已选择 ";
-                $(".choose_industry").val(tipTxt + this.industrySelect.length + " 个行业");
-            } else if (this.industrySelect.length > 0 && this.industrySelect[0] == "全部行业") {
-                $(".choose_industry").val("全部行业");
-            } else {
-                $(".choose_industry").val("");
-            }
-        },
-        showTime: function () {
-            let tmp = this.timeSelect[0];
-            if (this.timeSelect[1] == 1) {
-                tmp += "年";
-                $("#yearly").prop('checked', true);
-                $('.year_number:eq(' + (this.timeSelect[0] - 1) + ')').addClass("active");
-                //$(".number_box:eq(1)").addClass("active");
-            } else {
-                tmp += "个月";
-                $("#monthly").prop('checked', true);
-                $(".number_box:eq(0)").addClass("active");
-                $("#number_box_month .month_number").text(this.timeSelect[0]);
-                if (this.timeSelect[0] >= 10) {
-                    $('.profit_tips').text("已选择" + this.timeSelect[0] + "个月,建议“按年订阅”").show();
-                }
-                if (this.timeSelect[0] == 1) {
-                    $('#number_box_month button:eq(0)').attr("disabled", "disabled");
-                } else {
-                    $('#number_box_month button:eq(0)').removeAttr("disabled");
-                }
-            }
-            $(".choose_item .show_time").text(tmp);
-            $(".info.choose_time").val(tmp);
-        },
-        flushPrice: function (time, flag) {
-            if (this.vipSubisTrial) {
-                $('.price strong').text('¥0.00');
-            } else {
-                var price = getsubVipOrderPrice(this.areaSelect, this.industrySelect, time, this.price);
-                if (flag === 1) {
-                    $('.price strong').text('¥' + price);
-                } else if (flag === 2) {
-                    $('.computed_price').html('¥' + price);
-                } else {
-                    $('.price strong').text('¥' + price);
-                    $('.computed_price').html('¥' + price);
-                }
-
-            }
-        }
-    };
-
-
-    $(function () {
-        purchase.initData();
-        purchase.showArea();
-        purchase.showIndustry();
-        purchase.showPrice();
-        purchase.showTime();
-        purchase.flushPrice(purchase.timeSelect);
-        checkOk();
-        var time_limit;//定义一个周期变量
-        /*------ 关闭弹窗事件  点击取消或遮罩层 -----*/
-        $('.weui-mask').click(hideDialog);
-        $('.cancel').click(hideDialog);
-
-        /* -----  订阅周期、支付方式弹窗弹出事件 -------*/
-        // 选择订阅周期
-        $('.select_cycle a').click(function (e) {
-            $('#time_cycle').show(200);
-        });
-        // 选择支付方式
-        $('.select_payment .choose_way').click(function () {
-            $('#pay_way').show(200);
-        });
-
-        /* -----  选择完支付方式、订阅周期 回显到页面 -------*/
-        // 对支付方式选择的input绑定点击事件
-        $('#pay_way input:radio[name="way"]').click(function () {
-            var checkValue = $('input:radio[name="way"]:checked').val();
-            $('.pay_way').hide(200);
-            $('.pay_mode .select_payment .choose_way.info').html(checkValue);
-            if (checkValue === "微信支付") {
-                sessionStorage.setItem("vipSubPayWay", "wx_app");
-            } else {
-                sessionStorage.setItem("vipSubPayWay", "ali_app");
-            }
-        });
-        // 对订阅时间选择的input绑定点击事件
-        $('#time_cycle input:radio[name="time"]').on('click', function (e) {
-            // 解除确认按钮的锁定
-            $('#time_cycle .form-btn button').removeAttr('disabled');
-            if ($(e.target).hasClass('monthly')) {
-                // 按月订阅
-                $('#number_box_month').addClass('active');
-                $('#number_box_year span').removeClass('active');
-            } else {
-                // 按年订阅
-                $('#number_box_month').removeClass('active');
-                // $('#number_box_year span:eq(0)').addClass('active').siblings().removeClass('active');
-            }
-        });
-
-        /* --------控制月份number_box的事件  点击加减号触发的事件------- */
-        $('#number_box_month').on('click', 'button', function (e) {
-            // 点击加减号让input radio选中
-            $('#monthly').prop('checked', true);
-            $('#yearly').prop('checked', false);
-            $('.number_box span').removeClass('active');
-            $('#number_box_month').addClass('active');
-
-            var $number = $('#number_box_month span.month_number');
-            var $monthlyInput = $('#monthly');
-            // 未整理的data数组,里面的值都是字符串
-            var preData = e.delegateTarget.dataset;
-            var currentNum = parseInt($number.text());
-            var data = {};
-            // 把字符串转换成数字
-            for (var i in preData) {
-                data[i] = preData[i] - 0
-            }
-
-            if (!$monthlyInput.prop('checked')) {
-                return
-            }
-            // 判断是点击的是+ 还是-
-            if ($(e.target).hasClass('add')) {
-                if (currentNum == 11) { //12个月自动跳转1年
-                    $("#number_box_year .year_number:eq(0)").trigger("click");
-                    return
-                }
-                // 点的+
-                // currentNum = currentNum >= 12 ? 12 : currentNum + 1;
-                currentNum = currentNum >= data.numboxMax ? data.numboxMax : currentNum + data
-                    .numboxStep;
-            } else {
-                // 点的-
-                // currentNum = currentNum <= 1 ? 1 : currentNum - 1;
-                currentNum = currentNum <= data.numboxMin ? data.numboxMin : currentNum - data
-                    .numboxStep;
-            }
-            $number.text(currentNum);
-            purchase.timeSelect_tmp = [Number(currentNum), 2];
-            purchase.flushPrice(purchase.timeSelect_tmp, 2);
-            //var price = (5.8 * currentNum).toFixed(1);
-            //$('.computed_price').html('¥' + price)
-            var firstButton = $('#number_box_month button:first');
-            var lastButton = $('#number_box_month button:last');
-            if (currentNum >= 10) {
-                $('.profit_tips').text("已选择" + currentNum + "个月,建议“按年订阅”").show();
-            } else {
-                $('.profit_tips').hide();
-            }
-            // 如果为操作后的结果为1,则锁定减号按钮
-            if (currentNum === data.numboxMin) {
-                firstButton.attr('disabled', true)
-            } else {
-                firstButton.removeAttr('disabled')
-            }
-            // 如果为操作后的结果为12,则锁定加号按钮
-            if (currentNum === data.numboxMax) {
-                lastButton.attr('disabled', true)
-            } else {
-                lastButton.removeAttr('disabled')
-            }
-        });
-
-        /* -------- 控制年份number_box的事件  点击1年 2年 3年触发的事件------- */
-        $('#number_box_year').on('click', 'span', function (e) {
-            console.log(e.target.dataset.id);
-            $('#number_box_month').removeClass('active');
-            let id = e.target.dataset.id;
-            $('.profit_tips').hide();
-            $(this).addClass('active').siblings().removeClass('active');
-            $('#yearly').prop('checked', true);
-            $("#monthly").prop('checked', false);
-
-            // 渲染结果 保留一位小数
-            //let result = (Number(id) * 58).toFixed(1);
-            //$('.computed_price').html('¥' + result)
-            purchase.timeSelect_tmp = [Number(id), 1]
-            purchase.flushPrice(purchase.timeSelect_tmp, 2);
-        });
-
-        /* -------- 选择按月订阅  radio触发的事件------- */
-        $('#monthly').on('change', function (e) {
-            let isChecked = $(this).is(':checked');
-            let val = $('.month_number').text();
-            if (val >= 10) {
-                $('.profit_tips').show()
-            }
-            if (!isChecked) {
-                $('#number_box_month button').attr('disabled', true)
-            }
-            //let result = (Number(val) * 5.8).toFixed(1);
-            //$('.computed_price').html('¥' + result);
-            purchase.timeSelect_tmp = [Number(val), 2];
-            purchase.flushPrice(purchase.timeSelect_tmp, 2);
-
-        });
-        /* -------- 选择按年订阅  radio触发的事件------- */
-        $('#yearly').on('change', function (e) {
-            $('.profit_tips').hide();
-            // console.log($(this).is(':checked'))
-            let isChecked = $(this).is(':checked');
-            // 按年订阅默认选择1年
-            let val = 1;
-            //$('.computed_price').html('¥' + Number(val) * 58)
-            if (isChecked) {
-                $('#number_box_year span:eq(0)').addClass('active').siblings().removeClass('active')
-            }
-            purchase.timeSelect_tmp = [Number(val), 1];
-            purchase.flushPrice(purchase.timeSelect_tmp, 2);
-        });
-
-        // 确认订阅周期
-        $('#enter_period').on('click', function () {
-            var val;
-            $('input[name="time"]').each(function (i, v) {
-                let isChecked = $(v).is(':checked');
-                if ($(v).is(':checked') === true && $('.year_number').hasClass('active')) {
-                    val = $('.active').html();
-                    $('#time_cycle').hide(function () {
-                        $('.choose_time').val(val)
-                        $('.show_time').text(val);
-                    });
-                    purchase.timeSelect_tmp = [parseInt(val[0]), 1]
-                } else if ($(v).is(':checked') === true) {
-                    val = $('.month_number').html();
-                    $('#time_cycle').hide(function () {
-                        $('.choose_time').val(val + '个月')
-                        $('.show_time').text(val + '个月');
-                    });
-                    purchase.timeSelect_tmp = [parseInt(val), 2]
-                }
-            });
-            purchase.timeSelect = purchase.timeSelect_tmp;
-            purchase.flushPrice(purchase.timeSelect, 1);
-            sessionStorage.setItem("vipSubSelectTime", JSON.stringify(purchase.timeSelect));
-        });
-        $("input").bind("input propertychange change", function (event) {
-            checkOk();
-        });
-
-        $('#payHandle').click(function () {
-            $("#payHandle").attr("disabled", "disabled");
-            //支付请求
-            var area = purchase.areaSelect;
-            var industry = purchase.industrySelect;
-            if (area["全国"]) {
-                area = {};
-            }
-            if (industry.length == 1 && industry[0] == "全部行业") {
-                industry = [];
-            }
-            {{if not .T.isTrial}}
-            //付费用户
-            let pay_way = "wx_app";
-            if ($('#zfb').is(':checked')) {
-                pay_way = "ali_app"
-            }
-            var param = {
-                "area": JSON.stringify(area),
-                "industry": industry.join(","),
-                "time": $(".info:eq(2)").val().trim(),
-                "payWay": pay_way,
-                "orderType":{{.T.orderType}},
-            };
-            $DoPost("/subscribepay/vipsubscribe/createOrder", param, function (r) {
-                if (r.success) {
-                    //唤起app支付
-                    try {
-                        if (pay_way == "wx_app") {
-                            JyObj.wxPay(r.data.res);
-                        } else {
-                            JyObj.aliPay(r.data.res)
-                        }
-                        //校验是否支付完成
-                        checkpay(r.data.code);
-                    } catch (e) {
-                        alert(e)
-                    }
-                } else {
-                    $("#payHandle").removeAttr("disabled")
-                }
-            });
-            {{else}}
-            //试用用户
-            $DoPost("/subscribepay/order/trialPay", {
-                "area": JSON.stringify(area),
-                "industry": industry.join(",")
-            }, function (r) {
-                if (r.success) {
-                    clearSessionStorage();
-                    $("#payHandle").attr("disabled", "disabled");
-                    window.location.replace("/jyapp/vipsubscribe/toPaySuccessPage?orderCode=" + r.data.code);
-                }
-            });
-            {{end}}
-        })
-
-    });
-    //校验是否支付
-    var interval;
-
-    function checkpay(orderid) {
-        setTimeout(function () {
-            $("#payHandle").removeAttr('disabled');
-        }, 1000);
-        if (interval) {
-            clearInterval(interval);
-        }
-        interval = setInterval(function () {
-            $.post("/jypay/isPaySuccess", {code: orderid}, function (r) {
-                if (r.success) {
-                    clearInterval(interval);
-                    clearSessionStorage();
-                    window.location.replace("/jyapp/vipsubscribe/toPaySuccessPage?orderCode=" + orderid);
-                }
-            });
-        }, 2000)
-    }
-
-    // 隐藏dialog选择框
-    function hideDialog() {
-        $('#pay_way').hide(200);
-        $('#time_cycle').hide(200);
-    }
-
-    //是否可点击
-    function checkOk() {
-        var area = $(".info:eq(0)").val().trim();
-        var industry = $(".info:eq(1)").val().trim();
-        var checked = $('#buy').prop('checked');
-        if (area != '' && industry != '' && checked == true) {
-            $("#payHandle").removeAttr('disabled');
-        } else {
-            $("#payHandle").attr({
-                'disabled': 'true'
-            });
-        }
-        sessionStorage.setItem("vipSub_read", checked)
-    }
-
-    function clearSessionStorage() {
-        sessionStorage.removeItem("vipSubSelectArea");
-        sessionStorage.removeItem("vipSubSelectIndustry");
-        sessionStorage.removeItem("vipSubSelectTime");
-        sessionStorage.removeItem("vipSub_read");
-        sessionStorage.removeItem("vipSubPayWay");
-        sessionStorage.removeItem("historypushDataCache");
-        sessionStorage.To_introducePage = 2;
-    }
-
-    //未安装微信or支付宝 客户端回调提示
-    function showToast(errTip) {
-        weui.toast(errTip, {
-            duration: 2000,
-            className: 'custom-toast',
-        });
-    }
-</script>
-</body>
-
-</html>

+ 2 - 1
src/web/staticres/vipsubscribe/js/UpgradePrice.js

@@ -102,7 +102,7 @@ function needUpgrade(newBuyset, oldBuyset) {
                 UpgradeBuyset.areacount = newBuyset.areacount
             }
 
-            if (p_Diff > 0 || p_Diff + c_2_diff > 0 || (p_Diff + c_2_diff === 0 && p_Diff > 1) || p_Diff + c_2_diff + c_1_diff > 0 || (p_Diff + c_2_diff + c_1_diff === 0 && c_2_diff > 1)) {//需要升级
+            if (p_Diff > 0 || p_Diff + c_2_diff > 0 || p_Diff + c_2_diff + c_1_diff > 0 ) {//需要升级
                 //有多余未使用名额保留
                 if (p_Diff + c_2_diff + c_1_diff < 0) {
                     if (c_1_diff < 0 && p_Diff + c_2_diff >= 0) {
@@ -271,6 +271,7 @@ function getUpgradeFinalStatus(newBuyset, oldBuyset, t, endUnix, renewList, isTr
     if (now_price < 0) {
         return [-2, false, false, []]
     }
+
     //清单数组
     subtotail.push({
         "buyset": oldBuyset,