vip 升级续费 提交

src/jfw/front/vipsubscribe.go

@@ -15,20 +15,27 @@ import (
 
 type Subscribepay struct {
 	*xweb.Action
-	introduce         xweb.Mapper `xweb:"/front/vipsubscribe/introducePage"`     //订阅收费介绍页
-	trialInfo         xweb.Mapper `xweb:"/front/vipsubscribe/trialInfo"`         //vip订阅服务-用户信息录入页面
-	toPurchasePage    xweb.Mapper `xweb:"/weixin/pay/vipsubscribe_(.*)"`         //订阅收费购买页面(试用用户)
-	toChooseArea      xweb.Mapper `xweb:"/front/vipsubscribe/toChooseArea"`      //订阅收费地区筛选
-	toChooseIndustry  xweb.Mapper `xweb:"/front/vipsubscribe/toChooseIndustry"`  //订阅收费行业筛选
-	toPaySuccessPage  xweb.Mapper `xweb:"/front/vipsubscribe/toPaySuccessPage"`  //订阅支付完成页面
-	toOrderDetailPage xweb.Mapper `xweb:"/weixin/pay/toOrderDetailPage"`         //订阅收费支付订单详情页面
-	toSetKeyWordPage  xweb.Mapper `xweb:"/front/vipsubscribe/toSetKeyWordPage"`  //订阅收费设置关键词
-	toSetPage         xweb.Mapper `xweb:"/front/vipsubscribe/toSetPage"`         //订阅收费设置
+	introduce         xweb.Mapper `xweb:"/front/vipsubscribe/introducePage"`    //订阅收费介绍页
+	trialInfo         xweb.Mapper `xweb:"/front/vipsubscribe/trialInfo"`        //vip订阅服务-用户信息录入页面
+	toPurchasePage    xweb.Mapper `xweb:"/weixin/pay/vipsubscribe_(.*)"`        //订阅收费购买页面(试用用户)
+	toChooseArea      xweb.Mapper `xweb:"/front/vipsubscribe/toChooseArea"`     //订阅收费地区筛选
+	toChooseIndustry  xweb.Mapper `xweb:"/front/vipsubscribe/toChooseIndustry"` //订阅收费行业筛选
+	toPaySuccessPage  xweb.Mapper `xweb:"/front/vipsubscribe/toPaySuccessPage"` //订阅支付完成页面
+	toOrderDetailPage xweb.Mapper `xweb:"/weixin/pay/toOrderDetailPage"`        //订阅收费支付订单详情页面
+	toSetKeyWordPage  xweb.Mapper `xweb:"/front/vipsubscribe/toSetKeyWordPage"` //订阅收费设置关键词
+
+	toSetPageOld      xweb.Mapper `xweb:"/front/vipsubscribe/toSetPageOld"`      //订阅收费设置
 	toSetInfoTypePage xweb.Mapper `xweb:"/front/vipsubscribe/toSetInfoTypePage"` //订阅收费设置信息类型
-	toSetPushSetPage  xweb.Mapper `xweb:"/front/vipsubscribe/toSetPushSetPage"`  //订阅收费推送设置
 	toSetOtherKwsPage xweb.Mapper `xweb:"/front/vipsubscribe/toSet(.*)Page"`     //订阅收费附加词和排除词设置
 	toVIPViewPage     xweb.Mapper `xweb:"/front/vipsubscribe/toVIPViewPage"`     //订阅收费预览
 
+	//修改升级
+	toSetPage        xweb.Mapper `xweb:"/front/vipsubscribe/toSetPage"`        //订阅收费设置
+	toChangeArea     xweb.Mapper `xweb:"/front/vipsubscribe/toChangeArea"`     //修改区域
+	toChangeIndustry xweb.Mapper `xweb:"/front/vipsubscribe/toChangeIndustry"` //修改行业
+	toChangeTime     xweb.Mapper `xweb:"/front/vipsubscribe/toChangeTime"`     //修改时间
+	toSetPushSetPage xweb.Mapper `xweb:"/front/vipsubscribe/toSetPushSetPage"` //订阅收费推送设置
+
 	//修改
 	toEditSubPage       xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubPage"`       //订阅收费修改页面
 	toEditSubAreaPage   xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubAreaPage"`   //订阅收费修改地区
@@ -105,6 +112,17 @@ func (s *Subscribepay) ToSetInfoTypePage() {
 
 //订阅设置
 func (s *Subscribepay) ToSetPage() {
+	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
+	mynickname, _ := s.Session().Get("s_nickname").(string)
+	myavatar, _ := s.Session().Get("s_avatar").(string)
+	s.T["nickname"] = mynickname
+	s.T["avatar"] = myavatar
+	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url())
+	s.T["openid"] = se.EncodeString(myopenid)
+	s.Render("/weixin/vipsubscribe/vip_index_new.html")
+}
+
+func (s *Subscribepay) ToSetPageOld() {
 	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
 	mynickname, _ := s.Session().Get("s_nickname").(string)
 	myavatar, _ := s.Session().Get("s_avatar").(string)
@@ -115,6 +133,21 @@ func (s *Subscribepay) ToSetPage() {
 	s.Render("/weixin/vipsubscribe/vip_index.html")
 }
 
+//修改升级 选择地区
+func (s *Subscribepay) ToChangeArea() {
+	s.Render("/weixin/vipsubscribe/change_area.html")
+}
+
+//修改升级 选择行业
+func (s *Subscribepay) ToChangeIndustry() {
+	s.Render("/weixin/vipsubscribe/change_industry.html")
+}
+
+//修改升级 选择时间
+func (s *Subscribepay) ToChangeTime() {
+	s.Render("/weixin/vipsubscribe/change_time.html")
+}
+
 //vip订阅介绍页
 func (s *Subscribepay) Introduce() error {
 	userId := util.ObjToString(s.GetSession("userId"))

src/jfw/modules/subscribepay/src/service/vipSubscribeChange.go

@@ -42,11 +42,17 @@ func (this *SubscribeChange) GetSubBuyMsg() {
 			renewList, _ = util.MQFW.Find("vip_upgrade", &bson.M{"s_userid": userId, "i_isvalid": 0}, `{"l_validtime":"1"}`, `{"o_buyset":1,"l_validtime":1}`, false, -1, -1)
 		}
 		return &entity.FuncResult{true, nil, map[string]interface{}{
-			"isTrial":   vipStatus == 1,
-			"area":      (*o_vipjy)["o_area"],
-			"industry":  (*o_vipjy)["a_buyerclass"],
-			"buyset":    buyset,
-			"renewList": renewList,
+			"isTrial":      vipStatus == 1,
+			"area":         (*o_vipjy)["o_area"],
+			"industry":     (*o_vipjy)["a_buyerclass"],
+			"buyset":       buyset,
+			"renewList":    renewList,
+			"infotype":     (*o_vipjy)["a_infotype"],
+			"items":        (*o_vipjy)["a_items"],
+			"projectmatch": (*o_vipjy)["i_projectmatch"],
+			"ratemode":     (*o_vipjy)["i_ratemode"],
+			"startTime":    (*rData)["l_vip_starttime"],
+			"endTime":      (*rData)["l_vip_endtime"],
 		}}
 	}()
 	if r.Err != nil {
@@ -62,11 +68,13 @@ func (this *SubscribeChange) SaveChange() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	timeRenew := this.GetString("time")
 	payWay := this.GetString("payWay")
+	req_price, _ := this.GetInteger("price")
 	openId := qutil.ObjToString(this.GetSession("s_m_openid"))
 	r := func() *entity.FuncResult {
 		if len(industry) == 1 && industry[0] == "" { //去掉[""]
 			industry = []string{}
 		}
+		log.Println("req", area, industry)
 		rData, oldBuyset, isVip := entity.JyVipSubStruct.GetVipDetail(userId)
 		if !isVip {
 			return &entity.FuncResult{false, errors.New("请求异常，非vip状态"), nil}
@@ -151,7 +159,12 @@ func (this *SubscribeChange) SaveChange() {
 			}
 		}
 		log.Printf("是否需要升级%v,是否需要续费%v\n", needUpgrade, needRenew)
-		log.Printf("price: %d \n filter:%+v\n", final_price, filter)
+		log.Printf("price: %d \n req_price:%d filter:%+v\n", final_price, req_price, filter)
+		if (req_price != final_price) {
+			return &entity.FuncResult{false, errors.New("金额校验异常"), nil}
+		}
+
+		//return &entity.FuncResult{true, nil, map[string]interface{}{"price": final_price}}
 		//创建订单
 		filterStr, err := json.Marshal(filter)
 		if err != nil {

src/jfw/modules/subscribepay/src/util/vrew.go

@@ -251,7 +251,7 @@ func MergeKws(userId string) {
 	}
 }
 
-//m 月 超过一年传12+n月 如14; endtime 当前周期结束时间戳 int64 ;val -1:年 2:月
+//m 月 超过一年传12+n月 如14; endtime 当前周期结束时间戳 int64 ;val -   1:年 2:月
 func GetDATE(val int, m int, endtime int64) (_endtime time.Time) {
 	if val == 1 {
 		m = m * 12

src/web/staticres/vipsubscribe/css/base2.css

@@ -0,0 +1,102 @@
+* {
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    -webkit-overflow-scrolling: touch;
+    -webkit-tap-highlight-color:rgba(0,0,0,0);
+    -webkit-tap-highlight-color:transparent;
+}
+body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, textarea, p, blockquote, th, td, hr, button, article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, sumary {
+    margin: 0;
+    padding: 0;
+}
+html,body {
+    /* max-width: 750px; */
+    -webkit-text-size-adjust: 100%;
+    margin: 0 auto;
+    height: 100%;
+    overflow-x: hidden;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    font-size: .24rem;
+    background:rgba(245,244,249,1);;
+    color: #3d3d3d;
+    font-family:  "Microsoft YaHei","Helvetica Neue", "Roboto", "Segoe UI", "PingFang SC", "Hiragino Sans GB", sans-serif;
+}
+
+ul,ol {
+    list-style: none;
+}
+/*清除输入框内阴影*/
+input,textarea,select,button{
+    outline: none;
+    border: 0;
+    -webkit-appearance: none;
+    appearance:none;
+}
+button,span,div{
+    -webkit-tap-highlight-color:rgba(0,0,0,0);
+	/* -webkit-user-modify:read-only; */
+}
+img {
+    border: 0;
+    vertical-align: middle;
+    max-width: 100%;
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+a {
+    text-decoration: none;
+    color: #3d3d3d;
+	-webkit-tap-highlight-color: rgba(255, 255, 255, 0);
+	-webkit-user-select: none;
+	-moz-user-focus: none;
+	-moz-user-select: none;
+}
+/*禁用长按页面时的弹出菜单(iOS下有效) ,img和a标签都要加*/
+img,a{
+    -webkit-touch-callout:none;
+}
+em,i{
+	font-style: normal;
+}
+/*兼容ios调取h5页面的头部*/
+.ios-head {
+    display: none;
+    position: fixed;
+    top: 0;
+    padding-top: 15px;
+    background: #18974b;
+    width: 100%;
+    z-index: 100;
+}
+/*base*/
+.clearfix{
+    zoom: 1;
+}
+.clearfix:after{
+    clear: both;
+    height: 0;
+    overflow: hidden;
+    display: block;
+    visibility: hidden;
+    content: "";
+}
+
+.left {
+    float: left;
+}
+
+.right {
+    float: right;
+}
+.ellipsis {
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+}
+.show{
+	display: block;
+}
+.hide{
+	display: none;
+}

src/web/staticres/vipsubscribe/css/change_industry.css

@@ -0,0 +1,556 @@
+@charset "UTF-8";
+.main {
+  width: 100%;
+  overflow: scroll;
+}
+
+.main::-webkit-scrollbar {
+  display: none;
+}
+
+.layout_top-bottom {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  height: 100%;
+}
+
+.layout_top-bottom .layou_top {
+  flex: 1;
+  overflow: scroll;
+}
+
+.bottom_button {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  height: .94rem;
+}
+
+.bottom_button .left_btn,
+.bottom_button .right_btn {
+  flex: 1;
+  height: 100%;
+  font-size: .34rem;
+}
+
+.bottom_button .left_btn {
+  color: #2cb7ca;
+  background-color: #fff;
+  border-top: 1px solid #e0e0e0;
+}
+
+.bottom_button .right_btn {
+  color: #fff;
+  background-color: #2cb7ca;
+  border-top: 1px solid #2cb7ca;
+}
+
+.bottom_button button[disabled] {
+  opacity: .5;
+}
+
+.public_btn {
+  width: 100%;
+  height: .94rem;
+  line-height: .94rem;
+  text-align: center;
+  background: #2CB7CA;
+  color: #fff;
+  border-radius: 0.06rem;
+  font-size: .34rem;
+}
+
+.tips_btn {
+  display: flex;
+  position: relative;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.tips_btn .tips_discount {
+  width: 100%;
+}
+
+.tips_btn .tips_discount .tips_d_money {
+  display: none;
+  position: absolute;
+  left: 50%;
+  top: -.2rem;
+  padding: 0 .4rem;
+  height: .64rem;
+  line-height: .64rem;
+  color: #2CB7CA;
+  font-size: .32rem;
+  background-color: #fff;
+  border-radius: .32rem;
+  transform: translate(-50%, -100%);
+  box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
+}
+
+.tips_btn .tips_discount .tips_d_text {
+  display: none;
+  height: .72rem;
+  line-height: .72rem;
+  color: #fff;
+  font-size: .28rem;
+  text-align: center;
+  background-color: #FFB901;
+}
+
+.tips_btn .btns {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  height: .94rem;
+  line-height: .94rem;
+  color: #fff;
+  font-size: .34rem;
+}
+
+.tips_btn .btns .save-btn,
+.tips_btn .btns .reset-btn {
+  flex: 1;
+  width: 50%;
+  text-align: center;
+  height: 100%;
+  font-size: .34rem;
+}
+
+.tips_btn .btns .reset-btn {
+  background: #fff;
+  color: #2cb7ca;
+  border-top: 1px solid #e0e0e0;
+}
+
+.tips_btn .btns .save-btn {
+  background: #2cb7ca;
+  color: #fff;
+  border-top: 1px solid #2cb7ca;
+}
+
+.tips_btn .btns button[disabled] {
+  opacity: .5;
+}
+
+.jy_icon {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+
+.jy_icon.decrease:before,
+.jy_icon.increase:before,
+.jy_icon.increase:after {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  content: '';
+  width: 0.4rem;
+  height: 0.04rem;
+  background-color: #686868;
+  transform: translate(-50%, -50%);
+}
+
+.jy_icon.increase:after {
+  transform: translate(-50%, -50%) rotate(90deg);
+}
+
+/*禁止长按复制 加给body*/
+.no-touch {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+/* 弹性盒子布局 */
+.flex_alginC {
+  display: flex;
+  align-items: center;
+}
+
+.flex_alginC_justB {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.flex_alginC_justC {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.flex_column {
+  display: flex;
+  flex-direction: column;
+}
+
+.flex_column_alignC {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+/* 自定义弹窗*/
+@-webkit-keyframes c {
+  0% {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
+@keyframes c {
+  0% {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
+.custom-dialog .weui-animate-fade-in {
+  -webkit-animation: c ease 0s forwards;
+  animation: c ease 0s forwards;
+}
+
+@-webkit-keyframes d {
+  0% {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+
+@keyframes d {
+  0% {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+
+.custom-dialog .weui-animate-fade-out {
+  -webkit-animation: d ease 0s forwards;
+  animation: d ease 0s forwards;
+}
+
+.custom-dialog .weui-dialog__hd {
+  background: #F5F4F9;
+  padding: .17rem 0;
+  color: #000;
+  font-size: .34rem;
+  text-align: center;
+}
+
+.custom-dialog .weui-dialog__bd {
+  padding: .37rem 0;
+  color: #1D1D1D;
+  font-size: .32rem;
+  text-align: center;
+}
+
+.custom-dialog .weui-dialog__ft:after {
+  border: 0;
+}
+
+.custom-dialog .weui-dialog__btn:after {
+  border: 0;
+}
+
+.custom-dialog .weui-dialog__ft {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding-bottom: .38rem;
+  box-sizing: border-box;
+  text-align: center;
+}
+
+.custom-dialog .weui-dialog__btn {
+  display: block;
+  width: 1.72rem;
+  height: .72rem;
+  line-height: .72rem;
+  color: #fff;
+  padding: 0;
+  flex: none;
+  text-align: center;
+  border-radius: 3px;
+}
+
+.custom-dialog .weui-dialog__btn_primary {
+  background-color: #2CB7CA;
+  margin-right: 1rem;
+}
+
+.custom-dialog .weui-dialog__btn_default {
+  background-color: #BFBFC3;
+}
+
+/* 自定义switch按钮 */
+.custom-switch {
+  position: relative;
+  width: 52px;
+  height: 32px;
+  border: 1px solid #dfdfdf;
+  outline: 0;
+  border-radius: 16px;
+  box-sizing: border-box;
+  background-color: #dfdfdf;
+  -webkit-transition: background-color .1s,border .1s;
+  transition: background-color .1s,border .1s;
+  -webkit-appearance: none;
+}
+
+.custom-switch:before {
+  content: " ";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 50px;
+  height: 30px;
+  border-radius: 15px;
+  background-color: #fdfdfd;
+  -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1), -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+}
+
+.custom-switch:after {
+  content: " ";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 30px;
+  height: 30px;
+  border-radius: 15px;
+  background-color: #fff;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+  -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35), -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+}
+
+.custom-switch.checked {
+  border-color: #04be02;
+  background-color: #04be02;
+}
+
+.custom-switch.checked:before {
+  transform: scale(0);
+}
+
+.custom-switch.checked:after {
+  transform: translateX(20px);
+}
+
+.custom-toast .weui-toast {
+  font-size: .3rem;
+  padding: 0.2rem;
+  width: auto;
+  max-width: 6rem;
+  min-height: 0;
+  height: auto;
+  top: 50%;
+  left: 50%;
+  margin-left: 0;
+  margin-top: -0.47rem;
+  transform: translateX(-50%) translateY(-50%);
+}
+
+.custom-toast .weui-icon_toast {
+  display: none;
+}
+
+.custom-toast .weui-toast__content {
+  margin: 0;
+}
+
+.jymobile-tab-triangle {
+  position: relative;
+}
+
+.jymobile-tab-triangle:after {
+  content: '';
+  position: absolute;
+  top: 50%;
+  right: 0;
+  width: 0;
+  height: 0;
+  font-size: 0;
+  line-height: 0;
+  border-style: solid;
+  border-width: .1rem;
+  border-color: #aaa transparent transparent transparent;
+  transform: translate(140%, -30%);
+}
+
+.jymobile-tab-triangle.active:after {
+  border-color: transparent transparent #2cb7ca transparent;
+  transform: translate(140%, -70%);
+}
+
+.jymobile-tab-triangle.current {
+  color: #2cb7ca;
+}
+
+.jymobile-tab-triangle.current:after {
+  border-color: #2cb7ca transparent transparent transparent;
+}
+
+.choose_industry {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  height: 100%;
+}
+
+.choose_industry .optional_count {
+  background: #fff;
+  height: .88rem;
+  line-height: .88rem;
+  padding: 0 .3rem;
+  font-size: .3rem;
+  color: #1d1d1d;
+}
+
+.choose_industry .optional_count em {
+  color: #2cb7ca;
+}
+
+.choose_industry .result {
+  padding: .2rem .3rem;
+  background-color: #fff;
+  margin-bottom: 0.2rem;
+}
+
+.choose_industry .result .label {
+  color: #1d1d1d;
+  font-size: .26rem;
+}
+
+.choose_industry .result .result_name, .choose_industry .result .result_count {
+  color: #888888;
+  font-size: .26rem;
+}
+
+.choose_industry .result .update_tips {
+  display: none;
+  padding-left: 1rem;
+  color: #FE737A;
+}
+
+.choose_industry .form {
+  flex: 1;
+  overflow: scroll;
+}
+
+.choose_industry .slide {
+  position: absolute;
+  top: 50%;
+  right: 0;
+  display: flex;
+  flex-direction: column;
+  width: 0.3rem;
+  transform: translateY(-50%);
+}
+
+.choose_industry .slide a {
+  display: inline-block;
+  width: 100%;
+}
+
+.choose_industry .select-area-box {
+  padding-bottom: .94rem;
+  background-color: #fff;
+  min-height: 100%;
+}
+
+.choose_industry .list {
+  padding: 0 .3rem;
+}
+
+.choose_industry .list .wenhao {
+  display: inline-block;
+  padding: 0 0.1rem;
+  height: .7rem;
+  line-height: .7rem;
+}
+
+.choose_industry .list .show_tips {
+  color: #2cb7ca;
+  font-size: .34rem;
+}
+
+.choose_industry .list .tips_detail {
+  width: 6.4rem;
+  padding: .2rem;
+  margin-top: -0.1rem;
+  margin-bottom: .25rem;
+  display: none;
+  box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.16);
+  text-align: justify;
+  font-size: .26rem;
+  color: #1d1d1d;
+  line-height: .4rem;
+  border-radius: 2px;
+}
+
+.choose_industry .list .list_item {
+  display: flex;
+  align-items: baseline;
+  border-bottom: 1px solid #e0e0e0;
+}
+
+.choose_industry .list .list_item:last-of-type {
+  border-bottom: none;
+}
+
+.choose_industry .list .list_item .item_label {
+  width: .2rem;
+  text-align: left;
+}
+
+.choose_industry .list .list_item .item_industry_list {
+  display: flex;
+  flex: 1;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  padding-top: .25rem;
+}
+
+.choose_industry .list .list_item .item_industry_list .industry_item {
+  margin: 0 .08rem;
+  margin-bottom: .25rem;
+  padding: 0 .3rem;
+  height: .7rem;
+  line-height: .7rem;
+  font-size: .28rem;
+  color: #1d1d1d;
+  background-color: #f5f4f9;
+  border-radius: .03rem;
+}
+
+.choose_industry .list .list_item .item_industry_list .industry_item.active {
+  color: #fff;
+  background-color: #2cb7ca;
+}
+
+.choose_industry .list .list_item .item_industry_list .industry_item[disabled] {
+  color: #fff;
+  background-color: #bfbfc3;
+}

src/web/staticres/vipsubscribe/css/change_time.css

@@ -0,0 +1,618 @@
+@charset "UTF-8";
+.main {
+  width: 100%;
+  overflow: scroll;
+}
+
+.main::-webkit-scrollbar {
+  display: none;
+}
+
+.layout_top-bottom {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  height: 100%;
+}
+
+.layout_top-bottom .layou_top {
+  flex: 1;
+  overflow: scroll;
+}
+
+.bottom_button {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  height: .94rem;
+}
+
+.bottom_button .left_btn,
+.bottom_button .right_btn {
+  flex: 1;
+  height: 100%;
+  font-size: .34rem;
+}
+
+.bottom_button .left_btn {
+  color: #2cb7ca;
+  background-color: #fff;
+  border-top: 1px solid #e0e0e0;
+}
+
+.bottom_button .right_btn {
+  color: #fff;
+  background-color: #2cb7ca;
+  border-top: 1px solid #2cb7ca;
+}
+
+.bottom_button button[disabled] {
+  opacity: .5;
+}
+
+.public_btn {
+  width: 100%;
+  height: .94rem;
+  line-height: .94rem;
+  text-align: center;
+  background: #2CB7CA;
+  color: #fff;
+  border-radius: 0.06rem;
+  font-size: .34rem;
+}
+
+.tips_btn {
+  display: flex;
+  position: relative;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.tips_btn .tips_discount {
+  width: 100%;
+}
+
+.tips_btn .tips_discount .tips_d_money {
+  display: none;
+  position: absolute;
+  left: 50%;
+  top: -.2rem;
+  padding: 0 .4rem;
+  height: .64rem;
+  line-height: .64rem;
+  color: #2CB7CA;
+  font-size: .32rem;
+  background-color: #fff;
+  border-radius: .32rem;
+  transform: translate(-50%, -100%);
+  box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
+}
+
+.tips_btn .tips_discount .tips_d_text {
+  display: none;
+  height: .72rem;
+  line-height: .72rem;
+  color: #fff;
+  font-size: .28rem;
+  text-align: center;
+  background-color: #FFB901;
+}
+
+.tips_btn .btns {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  height: .94rem;
+  line-height: .94rem;
+  color: #fff;
+  font-size: .34rem;
+}
+
+.tips_btn .btns .save-btn,
+.tips_btn .btns .reset-btn {
+  flex: 1;
+  width: 50%;
+  text-align: center;
+  height: 100%;
+  font-size: .34rem;
+}
+
+.tips_btn .btns .reset-btn {
+  background: #fff;
+  color: #2cb7ca;
+  border-top: 1px solid #e0e0e0;
+}
+
+.tips_btn .btns .save-btn {
+  background: #2cb7ca;
+  color: #fff;
+  border-top: 1px solid #2cb7ca;
+}
+
+.tips_btn .btns button[disabled] {
+  opacity: .5;
+}
+
+.jy_icon {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+
+.jy_icon.decrease:before,
+.jy_icon.increase:before,
+.jy_icon.increase:after {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  content: '';
+  width: 0.4rem;
+  height: 0.04rem;
+  background-color: #686868;
+  transform: translate(-50%, -50%);
+}
+
+.jy_icon.increase:after {
+  transform: translate(-50%, -50%) rotate(90deg);
+}
+
+/*禁止长按复制 加给body*/
+.no-touch {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+/* 弹性盒子布局 */
+.flex_alginC {
+  display: flex;
+  align-items: center;
+}
+
+.flex_alginC_justB {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.flex_alginC_justC {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.flex_column {
+  display: flex;
+  flex-direction: column;
+}
+
+.flex_column_alignC {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+/* 自定义弹窗*/
+@-webkit-keyframes c {
+  0% {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
+@keyframes c {
+  0% {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
+.custom-dialog .weui-animate-fade-in {
+  -webkit-animation: c ease 0s forwards;
+  animation: c ease 0s forwards;
+}
+
+@-webkit-keyframes d {
+  0% {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+
+@keyframes d {
+  0% {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+
+.custom-dialog .weui-animate-fade-out {
+  -webkit-animation: d ease 0s forwards;
+  animation: d ease 0s forwards;
+}
+
+.custom-dialog .weui-dialog__hd {
+  background: #F5F4F9;
+  padding: .17rem 0;
+  color: #000;
+  font-size: .34rem;
+  text-align: center;
+}
+
+.custom-dialog .weui-dialog__bd {
+  padding: .37rem 0;
+  color: #1D1D1D;
+  font-size: .32rem;
+  text-align: center;
+}
+
+.custom-dialog .weui-dialog__ft:after {
+  border: 0;
+}
+
+.custom-dialog .weui-dialog__btn:after {
+  border: 0;
+}
+
+.custom-dialog .weui-dialog__ft {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding-bottom: .38rem;
+  box-sizing: border-box;
+  text-align: center;
+}
+
+.custom-dialog .weui-dialog__btn {
+  display: block;
+  width: 1.72rem;
+  height: .72rem;
+  line-height: .72rem;
+  color: #fff;
+  padding: 0;
+  flex: none;
+  text-align: center;
+  border-radius: 3px;
+}
+
+.custom-dialog .weui-dialog__btn_primary {
+  background-color: #2CB7CA;
+  margin-right: 1rem;
+}
+
+.custom-dialog .weui-dialog__btn_default {
+  background-color: #BFBFC3;
+}
+
+/* 自定义switch按钮 */
+.custom-switch {
+  position: relative;
+  width: 52px;
+  height: 32px;
+  border: 1px solid #dfdfdf;
+  outline: 0;
+  border-radius: 16px;
+  box-sizing: border-box;
+  background-color: #dfdfdf;
+  -webkit-transition: background-color .1s,border .1s;
+  transition: background-color .1s,border .1s;
+  -webkit-appearance: none;
+}
+
+.custom-switch:before {
+  content: " ";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 50px;
+  height: 30px;
+  border-radius: 15px;
+  background-color: #fdfdfd;
+  -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1), -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+}
+
+.custom-switch:after {
+  content: " ";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 30px;
+  height: 30px;
+  border-radius: 15px;
+  background-color: #fff;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+  -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35), -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+}
+
+.custom-switch.checked {
+  border-color: #04be02;
+  background-color: #04be02;
+}
+
+.custom-switch.checked:before {
+  transform: scale(0);
+}
+
+.custom-switch.checked:after {
+  transform: translateX(20px);
+}
+
+.custom-toast .weui-toast {
+  font-size: .3rem;
+  padding: 0.2rem;
+  width: auto;
+  max-width: 6rem;
+  min-height: 0;
+  height: auto;
+  top: 50%;
+  left: 50%;
+  margin-left: 0;
+  margin-top: -0.47rem;
+  transform: translateX(-50%) translateY(-50%);
+}
+
+.custom-toast .weui-icon_toast {
+  display: none;
+}
+
+.custom-toast .weui-toast__content {
+  margin: 0;
+}
+
+.jymobile-tab-triangle {
+  position: relative;
+}
+
+.jymobile-tab-triangle:after {
+  content: '';
+  position: absolute;
+  top: 50%;
+  right: 0;
+  width: 0;
+  height: 0;
+  font-size: 0;
+  line-height: 0;
+  border-style: solid;
+  border-width: .1rem;
+  border-color: #aaa transparent transparent transparent;
+  transform: translate(140%, -30%);
+}
+
+.jymobile-tab-triangle.active:after {
+  border-color: transparent transparent #2cb7ca transparent;
+  transform: translate(140%, -70%);
+}
+
+.jymobile-tab-triangle.current {
+  color: #2cb7ca;
+}
+
+.jymobile-tab-triangle.current:after {
+  border-color: #2cb7ca transparent transparent transparent;
+}
+
+.vip_extend_cycle {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+}
+
+.vip_extend_cycle .extend_content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  overflow-y: scroll;
+}
+
+.vip_extend_cycle .extend_content .extend_item {
+  display: block;
+  position: relative;
+  background: #fff;
+  margin-top: .2rem;
+  padding: .32rem .3rem;
+  border-top: 1px solid #CECECE;
+}
+
+.vip_extend_cycle .extend_content .extend_item:after {
+  position: absolute;
+  content: '';
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  height: 1px;
+  background-color: #CECECE;
+  transform-origin: 0 0;
+  transform: scaleY(0.5);
+}
+
+.vip_extend_cycle .extend_content .extend_item .item_top {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.vip_extend_cycle .extend_content .extend_item .item_top .label {
+  font-size: .32rem;
+  color: #1d1d1d;
+}
+
+.vip_extend_cycle .extend_content .extend_item .item_top .value {
+  display: flex;
+  align-items: center;
+}
+
+.vip_extend_cycle .extend_content .extend_item .item_top .value span {
+  margin-right: .12rem;
+  font-size: .26rem;
+  color: #686868;
+}
+
+.vip_extend_cycle .extend_content .extend_item .item_top .value i {
+  font-size: .32rem;
+  color: #C2C2C2;
+}
+
+.vip_extend_cycle .extend_content .extend_item .item_bottom {
+  margin-top: .16rem;
+  color: #686868;
+  font-size: .26rem;
+  line-height: .4rem;
+}
+
+.vip_extend_cycle .extend_content .ul_box {
+  flex: 1;
+  margin-top: .2rem;
+  background-color: #fff;
+  padding: 0 .4rem;
+}
+
+.vip_extend_cycle .extend_content .ul_box .li_box {
+  padding: .48rem 0 .46rem;
+}
+
+.vip_extend_cycle .extend_content .ul_box .li_box:nth-child(1) {
+  border-bottom: 1px solid #E0E0E0;
+}
+
+.vip_extend_cycle .extend_content .ul_box .top {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.vip_extend_cycle .extend_content .ul_box .radio_parent {
+  display: flex;
+  align-items: center;
+  font-size: .32rem;
+  color: #1D1D1D;
+}
+
+.vip_extend_cycle .extend_content .ul_box .radio {
+  width: .4rem;
+  height: .4rem;
+  border: 1px solid #ddd;
+  border-radius: 50%;
+  margin-right: .2rem;
+  -webkit-appearance: none;
+  background: #fff;
+}
+
+.vip_extend_cycle .extend_content .ul_box .radio:checked {
+  border: 0;
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAACpElEQVRogc1asa2DMBBlhIyQMpKNxAiMwAiMwAhswAgZgQrOHSVwLhiBERghvwCSwMdgOzYG6aQUhLw7v3u+Z+J5Bq4g724U6pCUTeIznlGGHQHsKcOBAPbT544yntOiTSnUoYnf/Rm0X7YRAXxShgMFfCkH4zkBjE8HTos21QYtCJ/xzDpwAhgTwN4k8OWK4GBlRYK8u1HGc2vA/yfSPaC+GwFPoQ6tVn1vNQoMfgJPyiYxzXXl3ijbSA88YOwa/BzKfUEKDK4C/hOSe8cD6vv1wOOLMhykGvtUtVFPotunDmDsHORBCPth1PoLUmeDStvUKdrUObgxqinE9xRt+q/6TjarZWW79cZFGXaiVQjy7va+0S/byDX4LYUhZZOIvrPoBafKw7BbVFOW1ozn7pt3B/xe9ed4QH33KNSho+pXv4CngC9SNon0zVcDTwFHNTqb/wTwqcX5TQry3KNHmmswfMYzEXif8Uz5mQwHT1r/55MGC+AJ4FPruVIJrJwRhToUbjA74LeATxuoHvg5gSMJFf24bO9YAy+7AgTwuQVAirfrmeULvBHxYDhINTEpm0SYhGgMsQ1+LG4v3f17B09rCyqa2Y0fzzCeq8pXJUpiPB/F6jTwc1GVJ1GNQ6dp3lJSLqkEyjbSG+YYDrKnBA+o77a8xruQunK219yeN/aGNaM0j9NTAvpmXqA2VsHDSigMWMrFdDnt1vY8xtpSep4hUz+qTGXbIG1K+iWMvW7137x1Y27UQtBzHyqd6A80qi/00AsqXfKETuWFh0OjLwSv/KLjSkkcbZjXTYLhoA3eeRI6tBFd86h8Inhzr1m/L+v7xESZQ6m8XCJnARckoketca+paNGmVuiievllG032tKKjtezf1f36u43PeEYAY1PV/gMeU6lGAhyHxgAAAABJRU5ErkJggg==) no-repeat center center;
+  background-size: 100% 100%;
+}
+
+.vip_extend_cycle .extend_content .ul_box .switch_box {
+  display: none;
+}
+
+.vip_extend_cycle .extend_content .ul_box .date_tab {
+  width: 1.6rem;
+  height: .48rem;
+  line-height: .48rem;
+  text-align: center;
+  display: flex;
+  align-items: center;
+  font-size: .28rem;
+  border-radius: 4px;
+  background-color: #F5F4F9;
+  color: #686868;
+  overflow: hidden;
+}
+
+.vip_extend_cycle .extend_content .ul_box .date_tab .date_tab_item {
+  flex: 1;
+}
+
+.vip_extend_cycle .extend_content .ul_box .date_tab .active {
+  background-color: #2CB7CA;
+  color: #fff;
+}
+
+.vip_extend_cycle .extend_content .ul_box .bottom {
+  display: none;
+}
+
+.vip_extend_cycle .extend_content .ul_box .month {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 6.7rem;
+  height: .8rem;
+  margin: .44rem auto;
+  border: 1px solid #F5F4F9;
+  border-radius: 4px;
+  overflow: hidden;
+}
+
+.vip_extend_cycle .extend_content .ul_box .month .minus, .vip_extend_cycle .extend_content .ul_box .month .add {
+  width: 1.6rem;
+  height: .8rem;
+  line-height: 0.8rem;
+  text-align: center;
+  border-radius: 0;
+  background: #F5F4F9;
+  border-radius: 4px;
+  border: 0;
+}
+
+.vip_extend_cycle .extend_content .ul_box .month .month_number {
+  flex: 1;
+  height: .8rem;
+  line-height: .8rem;
+  background-color: #fff;
+  font-size: .4rem;
+}
+
+.vip_extend_cycle .extend_content .ul_box .month button:disabled {
+  opacity: 0.4;
+}
+
+.vip_extend_cycle .extend_content .ul_box .year {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: .44rem 0;
+}
+
+.vip_extend_cycle .extend_content .ul_box .year span {
+  display: inline-block;
+  width: 2.02rem;
+  height: .8rem;
+  margin: 0 .16rem;
+  line-height: .8rem;
+  text-align: center;
+  background-color: #F5F4F9;
+  border: 1px solid #E0E0E0;
+  color: #1D1D1D;
+  font-size: .32rem;
+  border-radius: 4px;
+}
+
+.vip_extend_cycle .extend_content .ul_box .year .on {
+  background-color: #2CB7CA;
+  color: #fff;
+}

src/web/staticres/vipsubscribe/css/choose_industry.css

@@ -1,486 +1,512 @@
 @charset "UTF-8";
 .main {
-  width: 100%;
+    width: 100%;
 }
 
 .main::-webkit-scrollbar {
-  display: none;
+    display: none;
 }
 
 .layout_top-bottom {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: 100%;
 }
 
 .layout_top-bottom .layou_top {
-  flex: 1;
-  overflow: scroll;
+    flex: 1;
+    overflow: scroll;
 }
 
 .bottom_button {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  width: 100%;
-  height: .94rem;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 100%;
+    height: .94rem;
 }
 
 .bottom_button .left_btn,
 .bottom_button .right_btn {
-  flex: 1;
-  height: 100%;
-  font-size: .34rem;
+    flex: 1;
+    height: 100%;
+    font-size: .34rem;
 }
 
 .bottom_button .left_btn {
-  color: #2cb7ca;
-  background-color: #fff;
-  border-top: 1px solid #e0e0e0;
+    color: #2cb7ca;
+    background-color: #fff;
+    border-top: 1px solid #e0e0e0;
 }
 
 .bottom_button .right_btn {
-  color: #fff;
-  background-color: #2cb7ca;
-  border-top: 1px solid #2cb7ca;
+    color: #fff;
+    background-color: #2cb7ca;
+    border-top: 1px solid #2cb7ca;
 }
 
 .bottom_button button[disabled] {
-  opacity: .5;
+    opacity: .5;
 }
 
 .public_btn {
-  width: 100%;
-  height: .94rem;
-  line-height: .94rem;
-  text-align: center;
-  background: #2CB7CA;
-  color: #fff;
-  border-radius: 0.06rem;
-  font-size: .34rem;
+    width: 100%;
+    height: .94rem;
+    line-height: .94rem;
+    text-align: center;
+    background: #2CB7CA;
+    color: #fff;
+    border-radius: 0.06rem;
+    font-size: .34rem;
 }
 
 .tips_btn {
-  display: flex;
-  position: fixed;
-  bottom: 0;
-  flex-direction: column;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
+    display: flex;
+    position: fixed;
+    bottom: 0;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
 }
 
 .tips_btn .tips_discount {
-  width: 100%;
+    width: 100%;
 }
 
 .tips_btn .tips_discount .tips_d_money {
-  display: none;
-  position: absolute;
-  left: 50%;
-  top: -.2rem;
-  padding: 0 .4rem;
-  height: .64rem;
-  line-height: .64rem;
-  color: #2CB7CA;
-  font-size: .32rem;
-  background-color: #fff;
-  border-radius: .32rem;
-  transform: translate(-50%, -100%);
-  box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
+    display: none;
+    position: absolute;
+    left: 50%;
+    top: -.2rem;
+    padding: 0 .4rem;
+    height: .64rem;
+    line-height: .64rem;
+    color: #2CB7CA;
+    font-size: .32rem;
+    background-color: #fff;
+    border-radius: .32rem;
+    transform: translate(-50%, -100%);
+    box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
 }
 
 .tips_btn .tips_discount .tips_d_text {
-  display: none;
-  height: .72rem;
-  line-height: .72rem;
-  color: #fff;
-  font-size: .28rem;
-  text-align: center;
-  background-color: #FFB901;
+    display: none;
+    height: .72rem;
+    line-height: .72rem;
+    color: #fff;
+    font-size: .28rem;
+    text-align: center;
+    background-color: #FFB901;
 }
 
 .tips_btn .btns {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-  height: .94rem;
-  line-height: .94rem;
-  color: #fff;
-  font-size: .34rem;
-  background-color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    height: .94rem;
+    line-height: .94rem;
+    color: #fff;
+    font-size: .34rem;
+    background-color: #fff;
 }
 
 .tips_btn .btns .save-btn,
 .tips_btn .btns .reset-btn {
-  flex: 1;
-  width: 50%;
-  text-align: center;
-  height: 100%;
-  font-size: .34rem;
+    flex: 1;
+    width: 50%;
+    text-align: center;
+    height: 100%;
+    font-size: .34rem;
 }
 
 .tips_btn .btns .reset-btn {
-  background: #fff;
-  color: #2cb7ca;
-  border-top: 1px solid #e0e0e0;
+    background: #fff;
+    color: #2cb7ca;
+    border-top: 1px solid #e0e0e0;
 }
 
 .tips_btn .btns .save-btn {
-  background: #2cb7ca;
-  color: #fff;
-  border-top: 1px solid #2cb7ca;
+    background: #2cb7ca;
+    color: #fff;
+    border-top: 1px solid #2cb7ca;
 }
 
 .tips_btn .btns button[disabled] {
-  opacity: .5;
+    opacity: .5;
 }
 
 .jy_icon {
-  position: relative;
-  width: 100%;
-  height: 100%;
+    position: relative;
+    width: 100%;
+    height: 100%;
 }
 
 .jy_icon.decrease:before,
 .jy_icon.increase:before,
 .jy_icon.increase:after {
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  content: '';
-  width: 0.4rem;
-  height: 0.04rem;
-  background-color: #686868;
-  transform: translate(-50%, -50%);
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    content: '';
+    width: 0.4rem;
+    height: 0.04rem;
+    background-color: #686868;
+    transform: translate(-50%, -50%);
 }
 
 .jy_icon.increase:after {
-  transform: translate(-50%, -50%) rotate(90deg);
+    transform: translate(-50%, -50%) rotate(90deg);
 }
 
 /*禁止长按复制 加给body*/
 .no-touch {
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
 }
 
 /* 弹性盒子布局 */
 .flex_alginC {
-  display: flex;
-  align-items: center;
+    display: flex;
+    align-items: center;
 }
 
 .flex_alginC_justB {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
 }
 
 .flex_alginC_justC {
-  display: flex;
-  align-items: center;
-  justify-content: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 
 .flex_column {
-  display: flex;
-  flex-direction: column;
+    display: flex;
+    flex-direction: column;
 }
 
 .flex_column_alignC {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
 }
 
 /* 自定义弹窗*/
 @-webkit-keyframes c {
-  0% {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
+    0% {
+        opacity: 0;
+    }
+    to {
+        opacity: 1;
+    }
 }
 
 @keyframes c {
-  0% {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
+    0% {
+        opacity: 0;
+    }
+    to {
+        opacity: 1;
+    }
 }
 
 .custom-dialog .weui-animate-fade-in {
-  -webkit-animation: c ease 0s forwards;
-  animation: c ease 0s forwards;
+    -webkit-animation: c ease 0s forwards;
+    animation: c ease 0s forwards;
 }
 
 @-webkit-keyframes d {
-  0% {
-    opacity: 1;
-  }
-  to {
-    opacity: 0;
-  }
+    0% {
+        opacity: 1;
+    }
+    to {
+        opacity: 0;
+    }
 }
 
 @keyframes d {
-  0% {
-    opacity: 1;
-  }
-  to {
-    opacity: 0;
-  }
+    0% {
+        opacity: 1;
+    }
+    to {
+        opacity: 0;
+    }
 }
 
 .custom-dialog .weui-animate-fade-out {
-  -webkit-animation: d ease 0s forwards;
-  animation: d ease 0s forwards;
+    -webkit-animation: d ease 0s forwards;
+    animation: d ease 0s forwards;
 }
 
 .custom-dialog .weui-dialog__hd {
-  background: #F5F4F9;
-  padding: .17rem 0;
-  color: #000;
-  font-size: .34rem;
-  text-align: center;
+    background: #F5F4F9;
+    padding: .17rem 0;
+    color: #000;
+    font-size: .34rem;
+    text-align: center;
 }
 
 .custom-dialog .weui-dialog__bd {
-  padding: .37rem 0;
-  color: #1D1D1D;
-  font-size: .32rem;
-  text-align: center;
+    padding: .37rem 0;
+    color: #1D1D1D;
+    font-size: .32rem;
+    text-align: center;
 }
 
 .custom-dialog .weui-dialog__ft:after {
-  border: 0;
+    border: 0;
 }
 
 .custom-dialog .weui-dialog__btn:after {
-  border: 0;
+    border: 0;
 }
 
 .custom-dialog .weui-dialog__ft {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding-bottom: .38rem;
-  box-sizing: border-box;
-  text-align: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding-bottom: .38rem;
+    box-sizing: border-box;
+    text-align: center;
 }
 
 .custom-dialog .weui-dialog__btn {
-  display: block;
-  width: 1.72rem;
-  height: .72rem;
-  line-height: .72rem;
-  color: #fff;
-  padding: 0;
-  flex: none;
-  text-align: center;
-  border-radius: 3px;
+    display: block;
+    width: 1.72rem;
+    height: .72rem;
+    line-height: .72rem;
+    color: #fff;
+    padding: 0;
+    flex: none;
+    text-align: center;
+    border-radius: 3px;
 }
 
 .custom-dialog .weui-dialog__btn_primary {
-  background-color: #2CB7CA;
-  margin-right: 1rem;
+    background-color: #2CB7CA;
+    margin-right: 1rem;
 }
 
 .custom-dialog .weui-dialog__btn_default {
-  background-color: #BFBFC3;
+    background-color: #BFBFC3;
 }
 
 /* 自定义switch按钮 */
 .custom-switch {
-  position: relative;
-  width: 52px;
-  height: 32px;
-  border: 1px solid #dfdfdf;
-  outline: 0;
-  border-radius: 16px;
-  box-sizing: border-box;
-  background-color: #dfdfdf;
-  -webkit-transition: background-color .1s,border .1s;
-  transition: background-color .1s,border .1s;
-  -webkit-appearance: none;
+    position: relative;
+    width: 52px;
+    height: 32px;
+    border: 1px solid #dfdfdf;
+    outline: 0;
+    border-radius: 16px;
+    box-sizing: border-box;
+    background-color: #dfdfdf;
+    -webkit-transition: background-color .1s, border .1s;
+    transition: background-color .1s, border .1s;
+    -webkit-appearance: none;
 }
 
 .custom-switch:before {
-  content: " ";
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 50px;
-  height: 30px;
-  border-radius: 15px;
-  background-color: #fdfdfd;
-  -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
-  transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
-  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
-  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1), -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+    content: " ";
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 50px;
+    height: 30px;
+    border-radius: 15px;
+    background-color: #fdfdfd;
+    -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+    transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+    transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+    transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1), -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
 }
 
 .custom-switch:after {
-  content: " ";
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 30px;
-  height: 30px;
-  border-radius: 15px;
-  background-color: #fff;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
-  -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
-  transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
-  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
-  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35), -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+    content: " ";
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 30px;
+    height: 30px;
+    border-radius: 15px;
+    background-color: #fff;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+    -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+    transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+    transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+    transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35), -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
 }
 
 .custom-switch.checked {
-  border-color: #04be02;
-  background-color: #04be02;
+    border-color: #04be02;
+    background-color: #04be02;
 }
 
 .custom-switch.checked:before {
-  transform: scale(0);
+    transform: scale(0);
 }
 
 .custom-switch.checked:after {
-  transform: translateX(20px);
+    transform: translateX(20px);
 }
 
 .custom-toast .weui-toast {
-  font-size: .3rem;
-  padding: 0.2rem;
-  width: auto;
-  max-width: 6rem;
-  min-height: 0;
-  height: auto;
-  top: 50%;
-  left: 50%;
-  margin-left: 0;
-  margin-top: -0.47rem;
-  transform: translateX(-50%) translateY(-50%);
+    font-size: .3rem;
+    padding: 0.2rem;
+    width: auto;
+    max-width: 6rem;
+    min-height: 0;
+    height: auto;
+    top: 50%;
+    left: 50%;
+    margin-left: 0;
+    margin-top: -0.47rem;
+    transform: translateX(-50%) translateY(-50%);
 }
 
 .custom-toast .weui-icon_toast {
-  display: none;
+    display: none;
 }
 
 .custom-toast .weui-toast__content {
-  margin: 0;
+    margin: 0;
 }
 
 .choose_industry {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: 100%;
 }
 
 .choose_industry .optional_count {
-  background: #fff;
-  height: .88rem;
-  line-height: .88rem;
-  padding: 0 .3rem;
-  font-size: .3rem;
-  color: #1d1d1d;
+    background: #fff;
+    height: .88rem;
+    line-height: .88rem;
+    padding: 0 .3rem;
+    font-size: .3rem;
+    color: #1d1d1d;
 }
 
 .choose_industry .optional_count em {
-  color: #2cb7ca;
+    color: #2cb7ca;
 }
 
 .choose_industry .result {
-  padding: .2rem .3rem;
-  background:rgba(245,244,249,1);
-  z-index:999;
-  position: fixed;
-  width:100%;	 
+    padding: .2rem .3rem;
+    background: rgba(245, 244, 249, 1);
+    z-index: 999;
+    position: fixed;
+    width: 100%;
 }
 
 .choose_industry .form {
-  flex: 1;
-  overflow: scroll;
+    flex: 1;
+    overflow: scroll;
 }
 
 .choose_industry .slide {
-  position: fixed;
-  top: 50%;
-  right: 0;
-  display: flex;
-  flex-direction: column;
-  width: 0.3rem;
-  transform: translateY(-50%);
-  z-index:9999;
+    position: fixed;
+    top: 50%;
+    right: 0;
+    display: flex;
+    flex-direction: column;
+    width: 0.3rem;
+    transform: translateY(-50%);
+    z-index: 9999;
 }
 
 .choose_industry .slide a {
-  display: inline-block;
-  width: 100%;
+    display: inline-block;
+    width: 100%;
 }
 
 .choose_industry .select-area-box {
-  padding-bottom: 1.44rem;
-  background-color: #fff;
-  min-height: 100%;
+    padding-bottom: 1.44rem;
+    background-color: #fff;
+    min-height: 100%;
 }
 
 .choose_industry .list {
-  padding: 0 .3rem;
+    padding: 0 .3rem;
 }
 
 .choose_industry .list .list_item {
-  display: flex;
-  align-items: baseline;
-  border-bottom: 1px solid #e0e0e0;
+    display: flex;
+    align-items: baseline;
+    border-bottom: 1px solid #e0e0e0;
 }
 
 .choose_industry .list .list_item:last-of-type {
-  border-bottom: none;
+    border-bottom: none;
 }
 
 .choose_industry .list .list_item .item_label {
-  width: .2rem;
-  text-align: left;
+    width: .2rem;
+    text-align: left;
 }
 
 .choose_industry .list .list_item .item_industry_list {
-  display: flex;
-  flex: 1;
-  flex-wrap: wrap;
-  justify-content: flex-start;
-  padding-top: .25rem;
+    display: flex;
+    flex: 1;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    padding-top: .25rem;
 }
 
 .choose_industry .list .list_item .item_industry_list .industry_item {
-  margin: 0 .08rem;
-  margin-bottom: .25rem;
-  padding: 0 .3rem;
-  height: .7rem;
-  line-height: .7rem;
-  font-size: .28rem;
-  color: #1d1d1d;
-  background-color: #f5f4f9;
-  border-radius: .03rem;
+    margin: 0 .08rem;
+    margin-bottom: .25rem;
+    padding: 0 .3rem;
+    height: .7rem;
+    line-height: .7rem;
+    font-size: .28rem;
+    color: #1d1d1d;
+    background-color: #f5f4f9;
+    border-radius: .03rem;
 }
 
 .choose_industry .list .list_item .item_industry_list .industry_item.active {
-  color: #fff;
-  background-color: #2cb7ca;
+    color: #fff;
+    background-color: #2cb7ca;
 }
 
 .choose_industry .list .list_item .item_industry_list .industry_item[disabled] {
-  color: #fff;
-  background-color: #bfbfc3;
-}
+    color: #fff;
+    background-color: #bfbfc3;
+}
+
+.choose_industry .list .tips_detail {
+    width: 6.4rem;
+    padding: .2rem;
+    margin-top: -0.1rem;
+    margin-bottom: .25rem;
+    display: none;
+    box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.16);
+    text-align: justify;
+    font-size: .26rem;
+    color: #1d1d1d;
+    line-height: .4rem;
+    border-radius: 2px;
+}
+
+.choose_industry .list .wenhao {
+    display: inline-block;
+    padding: 0 0.1rem;
+    height: .7rem;
+    line-height: .7rem;
+}
+
+.choose_industry .list .show_tips {
+    color: #2cb7ca;
+    font-size: .34rem;
+}

src/web/staticres/vipsubscribe/css/vip_purchase.css

@@ -1,395 +1,395 @@
 @charset "UTF-8";
 .main {
-  width: 100%;
-  overflow: scroll;
+    width: 100%;
+    overflow: scroll;
 }
 
 .main::-webkit-scrollbar {
-  display: none;
+    display: none;
 }
 
 .layout_top-bottom {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: 100%;
 }
 
 .layout_top-bottom .layou_top {
-  flex: 1;
-  overflow: scroll;
+    flex: 1;
+    overflow: scroll;
 }
 
 .bottom_button {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  width: 100%;
-  height: .94rem;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 100%;
+    height: .94rem;
 }
 
 .bottom_button .left_btn,
 .bottom_button .right_btn {
-  flex: 1;
-  height: 100%;
-  font-size: .34rem;
+    flex: 1;
+    height: 100%;
+    font-size: .34rem;
 }
 
 .bottom_button .left_btn {
-  color: #2cb7ca;
-  background-color: #fff;
-  border-top: 1px solid #e0e0e0;
+    color: #2cb7ca;
+    background-color: #fff;
+    border-top: 1px solid #e0e0e0;
 }
 
 .bottom_button .right_btn {
-  color: #fff;
-  background-color: #2cb7ca;
-  border-top: 1px solid #2cb7ca;
+    color: #fff;
+    background-color: #2cb7ca;
+    border-top: 1px solid #2cb7ca;
 }
 
 .bottom_button button[disabled] {
-  opacity: .5;
+    opacity: .5;
 }
 
 .public_btn {
-  width: 100%;
-  height: .94rem;
-  line-height: .94rem;
-  text-align: center;
-  background: #2CB7CA;
-  color: #fff;
-  border-radius: 0.06rem;
-  font-size: .34rem;
+    width: 100%;
+    height: .94rem;
+    line-height: .94rem;
+    text-align: center;
+    background: #2CB7CA;
+    color: #fff;
+    border-radius: 0.06rem;
+    font-size: .34rem;
 }
 
 .tips_btn {
-  display: flex;
-  position: relative;
-  flex-direction: column;
-  align-items: center;
-  justify-content: space-between;
+    display: flex;
+    position: relative;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-between;
 }
 
 .tips_btn .tips_discount {
-  width: 100%;
+    width: 100%;
 }
 
 .tips_btn .tips_discount .tips_d_money {
-  display: none;
-  position: absolute;
-  left: 50%;
-  top: -.2rem;
-  padding: 0 .4rem;
-  height: .64rem;
-  line-height: .64rem;
-  color: #2CB7CA;
-  font-size: .32rem;
-  background-color: #fff;
-  border-radius: .32rem;
-  transform: translate(-50%, -100%);
-  box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
+    display: none;
+    position: absolute;
+    left: 50%;
+    top: -.2rem;
+    padding: 0 .4rem;
+    height: .64rem;
+    line-height: .64rem;
+    color: #2CB7CA;
+    font-size: .32rem;
+    background-color: #fff;
+    border-radius: .32rem;
+    transform: translate(-50%, -100%);
+    box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
 }
 
 .tips_btn .tips_discount .tips_d_text {
-  display: none;
-  height: .72rem;
-  line-height: .72rem;
-  color: #fff;
-  font-size: .28rem;
-  text-align: center;
-  background-color: #FFB901;
+    display: none;
+    height: .72rem;
+    line-height: .72rem;
+    color: #fff;
+    font-size: .28rem;
+    text-align: center;
+    background-color: #FFB901;
 }
 
 .tips_btn .btns {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-  height: .94rem;
-  line-height: .94rem;
-  color: #fff;
-  font-size: .34rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    height: .94rem;
+    line-height: .94rem;
+    color: #fff;
+    font-size: .34rem;
 }
 
 .tips_btn .btns .save-btn,
 .tips_btn .btns .reset-btn {
-  flex: 1;
-  width: 50%;
-  text-align: center;
-  height: 100%;
-  font-size: .34rem;
+    flex: 1;
+    width: 50%;
+    text-align: center;
+    height: 100%;
+    font-size: .34rem;
 }
 
 .tips_btn .btns .reset-btn {
-  background: #fff;
-  color: #2cb7ca;
-  border-top: 1px solid #e0e0e0;
+    background: #fff;
+    color: #2cb7ca;
+    border-top: 1px solid #e0e0e0;
 }
 
 .tips_btn .btns .save-btn {
-  background: #2cb7ca;
-  color: #fff;
-  border-top: 1px solid #2cb7ca;
+    background: #2cb7ca;
+    color: #fff;
+    border-top: 1px solid #2cb7ca;
 }
 
 .tips_btn .btns button[disabled] {
-  opacity: .5;
+    opacity: .5;
 }
 
 .jy_icon {
-  position: relative;
-  width: 100%;
-  height: 100%;
+    position: relative;
+    width: 100%;
+    height: 100%;
 }
 
 .jy_icon.decrease:before,
 .jy_icon.increase:before,
 .jy_icon.increase:after {
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  content: '';
-  width: 0.4rem;
-  height: 0.04rem;
-  background-color: #686868;
-  transform: translate(-50%, -50%);
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    content: '';
+    width: 0.4rem;
+    height: 0.04rem;
+    background-color: #686868;
+    transform: translate(-50%, -50%);
 }
 
 .jy_icon.increase:after {
-  transform: translate(-50%, -50%) rotate(90deg);
+    transform: translate(-50%, -50%) rotate(90deg);
 }
 
 /*禁止长按复制 加给body*/
 .no-touch {
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
 }
 
 /* 弹性盒子布局 */
 .flex_alginC {
-  display: flex;
-  align-items: center;
+    display: flex;
+    align-items: center;
 }
 
 .flex_alginC_justB {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
 }
 
 .flex_alginC_justC {
-  display: flex;
-  align-items: center;
-  justify-content: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 
 .flex_column {
-  display: flex;
-  flex-direction: column;
+    display: flex;
+    flex-direction: column;
 }
 
 .flex_column_alignC {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
 }
 
 /* 自定义弹窗*/
 @-webkit-keyframes c {
-  0% {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
+    0% {
+        opacity: 0;
+    }
+    to {
+        opacity: 1;
+    }
 }
 
 @keyframes c {
-  0% {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
+    0% {
+        opacity: 0;
+    }
+    to {
+        opacity: 1;
+    }
 }
 
 .custom-dialog .weui-animate-fade-in {
-  -webkit-animation: c ease 0s forwards;
-  animation: c ease 0s forwards;
+    -webkit-animation: c ease 0s forwards;
+    animation: c ease 0s forwards;
 }
 
 @-webkit-keyframes d {
-  0% {
-    opacity: 1;
-  }
-  to {
-    opacity: 0;
-  }
+    0% {
+        opacity: 1;
+    }
+    to {
+        opacity: 0;
+    }
 }
 
 @keyframes d {
-  0% {
-    opacity: 1;
-  }
-  to {
-    opacity: 0;
-  }
+    0% {
+        opacity: 1;
+    }
+    to {
+        opacity: 0;
+    }
 }
 
 .custom-dialog .weui-animate-fade-out {
-  -webkit-animation: d ease 0s forwards;
-  animation: d ease 0s forwards;
+    -webkit-animation: d ease 0s forwards;
+    animation: d ease 0s forwards;
 }
 
 .custom-dialog .weui-dialog__hd {
-  background: #F5F4F9;
-  padding: .17rem 0;
-  color: #000;
-  font-size: .34rem;
-  text-align: center;
+    background: #F5F4F9;
+    padding: .17rem 0;
+    color: #000;
+    font-size: .34rem;
+    text-align: center;
 }
 
 .custom-dialog .weui-dialog__bd {
-  padding: .37rem 0;
-  color: #1D1D1D;
-  font-size: .32rem;
-  text-align: center;
+    padding: .37rem 0;
+    color: #1D1D1D;
+    font-size: .32rem;
+    text-align: center;
 }
 
 .custom-dialog .weui-dialog__ft:after {
-  border: 0;
+    border: 0;
 }
 
 .custom-dialog .weui-dialog__btn:after {
-  border: 0;
+    border: 0;
 }
 
 .custom-dialog .weui-dialog__ft {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding-bottom: .38rem;
-  box-sizing: border-box;
-  text-align: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding-bottom: .38rem;
+    box-sizing: border-box;
+    text-align: center;
 }
 
 .custom-dialog .weui-dialog__btn {
-  display: block;
-  width: 1.72rem;
-  height: .72rem;
-  line-height: .72rem;
-  color: #fff;
-  padding: 0;
-  flex: none;
-  text-align: center;
-  border-radius: 3px;
+    display: block;
+    width: 1.72rem;
+    height: .72rem;
+    line-height: .72rem;
+    color: #fff;
+    padding: 0;
+    flex: none;
+    text-align: center;
+    border-radius: 3px;
 }
 
 .custom-dialog .weui-dialog__btn_primary {
-  background-color: #2CB7CA;
-  margin-right: 1rem;
+    background-color: #2CB7CA;
+    margin-right: 1rem;
 }
 
 .custom-dialog .weui-dialog__btn_default {
-  background-color: #BFBFC3;
+    background-color: #BFBFC3;
 }
 
 /* 自定义switch按钮 */
 .custom-switch {
-  position: relative;
-  width: 52px;
-  height: 32px;
-  border: 1px solid #dfdfdf;
-  outline: 0;
-  border-radius: 16px;
-  box-sizing: border-box;
-  background-color: #dfdfdf;
-  -webkit-transition: background-color .1s,border .1s;
-  transition: background-color .1s,border .1s;
-  -webkit-appearance: none;
+    position: relative;
+    width: 52px;
+    height: 32px;
+    border: 1px solid #dfdfdf;
+    outline: 0;
+    border-radius: 16px;
+    box-sizing: border-box;
+    background-color: #dfdfdf;
+    -webkit-transition: background-color .1s, border .1s;
+    transition: background-color .1s, border .1s;
+    -webkit-appearance: none;
 }
 
 .custom-switch:before {
-  content: " ";
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 50px;
-  height: 30px;
-  border-radius: 15px;
-  background-color: #fdfdfd;
-  -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
-  transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
-  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
-  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1), -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+    content: " ";
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 50px;
+    height: 30px;
+    border-radius: 15px;
+    background-color: #fdfdfd;
+    -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+    transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+    transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+    transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1), -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
 }
 
 .custom-switch:after {
-  content: " ";
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 30px;
-  height: 30px;
-  border-radius: 15px;
-  background-color: #fff;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
-  -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
-  transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
-  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
-  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35), -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+    content: " ";
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 30px;
+    height: 30px;
+    border-radius: 15px;
+    background-color: #fff;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+    -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+    transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+    transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+    transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35), -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
 }
 
 .custom-switch.checked {
-  border-color: #04be02;
-  background-color: #04be02;
+    border-color: #04be02;
+    background-color: #04be02;
 }
 
 .custom-switch.checked:before {
-  transform: scale(0);
+    transform: scale(0);
 }
 
 .custom-switch.checked:after {
-  transform: translateX(20px);
+    transform: translateX(20px);
 }
 
 .custom-toast .weui-toast {
-  font-size: .3rem;
-  padding: 0.2rem;
-  width: auto;
-  max-width: 6rem;
-  min-height: 0;
-  height: auto;
-  top: 50%;
-  left: 50%;
-  margin-left: 0;
-  margin-top: -0.47rem;
-  transform: translateX(-50%) translateY(-50%);
+    font-size: .3rem;
+    padding: 0.2rem;
+    width: auto;
+    max-width: 6rem;
+    min-height: 0;
+    height: auto;
+    top: 50%;
+    left: 50%;
+    margin-left: 0;
+    margin-top: -0.47rem;
+    transform: translateX(-50%) translateY(-50%);
 }
 
 .custom-toast .weui-icon_toast {
-  display: none;
+    display: none;
 }
 
 .custom-toast .weui-toast__content {
-  margin: 0;
+    margin: 0;
 }
 
 .radio-form {
-  margin: 0;
-  padding: .17rem .05rem;
-  font-size: .26rem;
-  background: transparent;
-  border-top: 1px solid #e0e0e0;
-  border-bottom: 1px solid #e0e0e0;
+    margin: 0;
+    padding: .17rem .05rem;
+    font-size: .26rem;
+    background: transparent;
+    border-top: 1px solid #e0e0e0;
+    border-bottom: 1px solid #e0e0e0;
 }
 
 .radio-form .weui-cell {
-  padding: 0;
+    padding: 0;
 }
 
 /* .radio-form .weui-cell__hd {
@@ -397,400 +397,408 @@
 } */
 
 .radio-form .read {
-  font-size: .26rem;
+    font-size: .26rem;
 }
 
 .radio-form .read a {
-  color: #2cb7ca;
+    color: #2cb7ca;
 }
 
 .radio-form .weui-check + .weui-icon-checked:before {
-  font-size: 16px;
-  margin-top: -3px;
+    font-size: 16px;
+    margin-top: -3px;
 }
 
 .radio-form .weui-check:checked + .weui-icon-checked:before {
-  color: #2cb7ca;
+    color: #2cb7ca;
 }
 
 .vip_purchase {
-  display: flex;
-  height: 100%;
-  flex-direction: column;
-  justify-content: space-between;
-  padding-bottom: 2.5rem;
+    display: flex;
+    height: 100%;
+    flex-direction: column;
+    justify-content: space-between;
+    padding-bottom: 2.5rem;
 }
 
 .vip_purchase .choose_condition::-webkit-scrollbar {
-  display: none;
+    display: none;
 }
 
 .vip_purchase .choose_condition {
-  padding-bottom: .4rem;
-  flex: 1;
-  overflow: scroll;
-  border-top: 1px solid transparent;
+    padding-bottom: .4rem;
+    flex: 1;
+    overflow: scroll;
+    border-top: 1px solid transparent;
 }
 
 .vip_purchase .choose_condition .chooseList .choose_item,
 .vip_purchase .choose_condition .pay_mode .choose_item {
-  padding: .32rem 0;
-  box-sizing: border-box;
-  background: #fff;
-  font-size: 0.3rem;
-  color: #1d1d1d;
-  border-top: 1px solid #e0e0e0;
+    padding: .32rem 0;
+    box-sizing: border-box;
+    background: #fff;
+    font-size: 0.3rem;
+    color: #1d1d1d;
+    border-top: 1px solid #e0e0e0;
 }
 
 .vip_purchase .choose_condition .chooseList .choose_item:last-of-type, .vip_purchase .choose_condition .chooseList .choose_item.select_payment,
 .vip_purchase .choose_condition .pay_mode .choose_item:last-of-type,
 .vip_purchase .choose_condition .pay_mode .choose_item.select_payment {
-  border-bottom: 1px solid #e0e0e0;
+    border-bottom: 1px solid #e0e0e0;
 }
 
 .vip_purchase .choose_condition .chooseList .choose_item a,
 .vip_purchase .choose_condition .pay_mode .choose_item a {
-  display: flex;
-  align-items: center;
-  padding: 0 0.3rem;
-  height: 100%;
+    display: flex;
+    align-items: center;
+    padding: 0 0.3rem;
+    height: 100%;
 }
 
 .vip_purchase .choose_condition .chooseList .choose_item a .label,
 .vip_purchase .choose_condition .pay_mode .choose_item a .label {
-  float: left;
-  width: 1.5rem;
-  color: #1d1d1d;
-  font-size: .32rem;
+    float: left;
+    width: 1.5rem;
+    color: #1d1d1d;
+    font-size: .32rem;
 }
 
 .vip_purchase .choose_condition .chooseList .choose_item a .info,
 .vip_purchase .choose_condition .pay_mode .choose_item a .info {
-  width: 5rem;
-  height: 100%;
-  color: #000;
-  font-size: 0.28rem;
-  text-align: right;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  background: transparent;
-  padding-right: .2rem;
+    width: 5rem;
+    height: 100%;
+    color: #000;
+    font-size: 0.28rem;
+    text-align: right;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    background: transparent;
+    padding-right: .2rem;
 }
 
 .vip_purchase .choose_condition .chooseList .choose_item a .info::placeholder,
 .vip_purchase .choose_condition .pay_mode .choose_item a .info::placeholder {
-  color: #000;
+    color: #000;
 }
 
-.choose_item input:disabled, .choose_item input[disabled]{
-  opacity: 1;
+.choose_item input:disabled, .choose_item input[disabled] {
+    opacity: 1;
 }
 
 .vip_purchase .choose_condition .chooseList .choose_item a i.iconfont,
 .vip_purchase .choose_condition .pay_mode .choose_item a i.iconfont {
-  float: right;
-  color: #707070;
+    float: right;
+    color: #707070;
 }
 
 .vip_purchase .choose_condition .chooseList .choose_item .add_tips,
 .vip_purchase .choose_condition .pay_mode .choose_item .add_tips {
-  padding: 0 .3rem;
-  color: #2CB7CA;
-  font-size: .26rem;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  white-space: nowrap;
+    padding: 0 .3rem;
+    color: #2CB7CA;
+    font-size: .26rem;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
 }
 
 .vip_purchase .choose_condition .chooseList .free-7day,
 .vip_purchase .choose_condition .pay_mode .free-7day {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 .3rem;
-  height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 .3rem;
+    height: 100%;
 }
 
 .vip_purchase .choose_condition .chooseList .free-7day .info,
 .vip_purchase .choose_condition .pay_mode .free-7day .info {
-  margin-right: .2rem;
-  color: #686868;
+    margin-right: .2rem;
+    color: #686868;
 }
 
 .vip_purchase .choose_condition .chooseList {
-  margin: .26rem 0;
+    margin: .26rem 0;
 }
 
 .vip_purchase .choose_condition .pay_mode {
-  font-size: .26rem;
-  color: #888;
+    font-size: .26rem;
+    color: #888;
 }
 
 .vip_purchase .choose_condition .pay_mode .auto_renew {
-  border: none;
+    border: none;
 }
 
 .vip_purchase .choose_condition .vip_rules .vip_prise_table {
-  padding: 0 .3rem;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  text-align: center;
+    padding: 0 .3rem;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    text-align: center;
 }
 
 .vip_purchase .choose_condition .vip_rules .vip_prise_table .table_title {
-  margin-bottom: .3rem;
-  margin-top: .3rem;
+    margin-bottom: .3rem;
+    margin-top: .3rem;
 }
 
 .vip_purchase .choose_condition .vip_rules .vip_prise_table table {
-  margin-bottom: .48rem;
-  width: 100%;
-  border-collapse: collapse;
+    margin-bottom: .48rem;
+    width: 100%;
+    border-collapse: collapse;
 }
 
 .vip_purchase .choose_condition .vip_rules .vip_prise_table table td {
-  height: .72rem;
-  width: 50%;
-  border: 1px solid #ccc;
+    height: .72rem;
+    width: 50%;
+    border: 1px solid #ccc;
 }
 
 .vip_purchase .choose_condition .vip_rules .vip_prise_table .tips {
-  text-align: left;
+    text-align: left;
 }
 
 .vip_purchase .choose_condition .vip_rules .vip_prise_table .tips dt {
-  margin-bottom: .08rem;
+    margin-bottom: .08rem;
 }
 
 .vip_purchase .fixed-bottom-box {
-  width: 100%;	
-  background-color: #fff;
-  position: fixed;
-  bottom: 0;
+    width: 100%;
+    background-color: #fff;
+    position: fixed;
+    bottom: 0;
 }
+
 .weui-check__label:active {
     background-color: #fff !important;
 }
+
 .vip_purchase .fixed-bottom-box .price {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  padding: .12rem .12rem;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    padding: .12rem .12rem;
 }
 
 .vip_purchase .fixed-bottom-box .price span {
-  text-decoration: line-through;
-  font-size: .26rem;
-  color: #888;
-  margin-right: .18rem;
+    text-decoration: line-through;
+    font-size: .26rem;
+    color: #888;
+    margin-right: .18rem;
 }
 
 .vip_purchase .fixed-bottom-box .price strong {
-  font-size: .4rem;
-  color: #1d1d1d;
+    font-size: .4rem;
+    color: #1d1d1d;
 }
 
 .vip_purchase .form-btn {
-  display: flex;
-  align-items: center;
+    display: flex;
+    align-items: center;
 }
 
 .vip_purchase .form-btn .btn {
-  flex: 1;
-  height: .94rem;
-  line-height: .94rem;
-  text-align: center;
-  font-size: .36rem;
+    flex: 1;
+    height: .94rem;
+    line-height: .94rem;
+    text-align: center;
+    font-size: .36rem;
 }
 
 .vip_purchase .form-btn .prew {
-  background: #fff;
-  color: #2cb7ca;
+    background: #fff;
+    color: #2cb7ca;
 }
 
 .vip_purchase .form-btn .enter {
-  background: #2cb7ca;
-  color: #fff;
+    background: #2cb7ca;
+    color: #fff;
 }
 
 .vip_purchase .form-btn .enter[disabled] {
-  opacity: .5;
+    opacity: .5;
 }
 
 .vip_purchase .js_dialog .box {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  height: 4.8rem;
-  background: #fff;
-  z-index: 9999;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 4.8rem;
+    background: #fff;
+    z-index: 9999;
 }
 
 .vip_purchase .js_dialog .box .box_hd {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 0 .4rem;
-  height: .88rem;
-  line-height: .88rem;
-  background: #F4F4F9;
-  border-bottom: 1px solid #eee;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 .4rem;
+    height: .88rem;
+    line-height: .88rem;
+    background: #F4F4F9;
+    border-bottom: 1px solid #eee;
 }
 
 .vip_purchase .js_dialog .box .box_hd h3 {
-  color: #1D1D1D;
-  font-size: .32rem;
-  font-weight: normal;
+    color: #1D1D1D;
+    font-size: .32rem;
+    font-weight: normal;
 }
 
 .vip_purchase .js_dialog .box .box_hd .cancel {
-  color: #2cb7ca;
-  font-size: .32rem;
+    color: #2cb7ca;
+    font-size: .32rem;
 }
 
 .vip_purchase .js_dialog .box .box_bd .weui-cells:after {
-  border: 0;
+    border: 0;
 }
 
 .vip_purchase .js_dialog .box .box_bd .weui-cells:before {
-  border: 0;
+    border: 0;
 }
 
 .vip_purchase .js_dialog .box .box_bd .weui-cell:before {
-  border: 0;
+    border: 0;
 }
 
 .vip_purchase .js_dialog .box .box_bd .choose-form {
-  margin: 0;
+    margin: 0;
 }
 
 .vip_purchase .js_dialog .box .box_bd p {
-  font-size: .32rem;
+    font-size: .32rem;
 }
 
 .vip_purchase .js_dialog .box .box_bd .weui-check:checked + .weui-icon-checked:before {
-  color: #2cb7ca;
+    color: #2cb7ca;
 }
 
 .vip_purchase .pay_way .box_bd .wx_label,
 .vip_purchase .pay_way .box_bd .zfb_label {
-  margin-top: .68rem;
-  padding: 0 .3rem;
+    margin-top: .68rem;
+    padding: 0 .3rem;
 }
 
 .vip_purchase .pay_way .box_bd img {
-  margin-right: .3rem;
-  width: .8rem;
-  height: .8rem;
+    margin-right: .3rem;
+    width: .8rem;
+    height: .8rem;
 }
 
 .vip_purchase .time_cycle .box {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  height: auto;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: auto;
 }
 
 .vip_purchase .time_cycle .box .tips {
-  height: .64rem;
-  line-height: .64rem;
-  font-size: .26rem;
-  color: #fff;
-  background-color: #FFB901;
-  text-align: center;
+    height: .64rem;
+    line-height: .64rem;
+    font-size: .26rem;
+    color: #fff;
+    background-color: #FFB901;
+    text-align: center;
 }
 
 .vip_purchase .time_cycle .box_bd {
-  width: 100%;
+    width: 100%;
 }
 
 .vip_purchase .time_cycle .box_bd .monthly_label,
 .vip_purchase .time_cycle .box_bd .yearly_label {
-  padding: 0;
+    padding: 0;
 }
 
 .vip_purchase .time_cycle .box_bd .computed_price {
-  padding: .4rem .36rem .24rem;
-  font-size: .4rem;
-  border-bottom: 1px solid #E0E0E0;
+    padding: .4rem .36rem .24rem;
+    font-size: .4rem;
+    border-bottom: 1px solid #E0E0E0;
 }
 
 .vip_purchase .time_cycle .box_bd .bd_select {
-  padding: .62rem .4rem .64rem;
+    padding: .62rem .4rem .64rem;
 }
 
 .vip_purchase .time_cycle .box_bd .bd_select .choose-form {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    box-sizing: border-box;
 }
 
 .vip_purchase .time_cycle .box_bd .bd_select .choose-form .number_box {
-  margin-top: .3rem;
+    margin-top: .3rem;
 }
 
 .vip_purchase .time_cycle .box_bd .bd_select .choose-form:nth-child(2) {
-  padding-top: .56rem;
+    padding-top: .56rem;
 }
 
 .vip_purchase .time_cycle .number_box {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  height: 0.8rem;
-  border: 1px solid #F5F4F9;
-  text-align: center;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    height: 0.8rem;
+    border: 1px solid #F5F4F9;
+    text-align: center;
 }
 
 .vip_purchase .time_cycle .number_box.active {
-  color: #2cb7ca;
+    color: #2cb7ca;
 }
 
 .vip_purchase .time_cycle .number_box.active .jy_icon.decrease:before,
 .vip_purchase .time_cycle .number_box.active .jy_icon.increase:before,
 .vip_purchase .time_cycle .number_box.active .jy_icon.increase:after {
-  background-color: #2cb7ca;
+    background-color: #2cb7ca;
 }
 
 .vip_purchase .time_cycle .number_box button[disabled] {
-  opacity: .2;
+    opacity: .2;
 }
 
 .vip_purchase .time_cycle .number_box .weui-btn_plain-default {
-  width: 1.6rem;
-  height: 100%;
-  line-height: normal;
-  border-color: transparent;
-  border-radius: 0;
-  background-color: #F5F4F9;
+    width: 1.6rem;
+    height: 100%;
+    line-height: normal;
+    border-color: transparent;
+    border-radius: 0;
+    background-color: #F5F4F9;
 }
 
 .vip_purchase .time_cycle .number_box span.month_number {
-  flex: 1;
-  font-size: .4rem;
+    flex: 1;
+    font-size: .4rem;
 }
 
 .vip_purchase .time_cycle .number_box span.year_number {
-  width: 2rem;
-  height: .8rem;
-  line-height: .8rem;
-  background-color: #F5F4F9;
-  border: 1px solid #e0e0e0;
+    width: 2rem;
+    height: .8rem;
+    line-height: .8rem;
+    background-color: #F5F4F9;
+    border: 1px solid #e0e0e0;
 }
 
 .vip_purchase .time_cycle .number_box span.year_number.active {
-  color: #fff;
-  background-color: #2cb7ca;
+    color: #fff;
+    background-color: #2cb7ca;
+}
+
+.choose_item .show_time {
+    display: block;
+    width: 5rem;
+    text-align: right;
+    padding-right: .2rem;
+    color: #000;
 }
 
-.choose_item .show_time{
-	display:block;
-	width: 5rem;
-	text-align: right;
-	padding-right: .2rem;
-	color: #000;
+.choose_item .add_tips.area_warn,
+.choose_item .add_tips.industry_warn {
+    color: #fe737a !important;
+    display: block;
 }

src/web/staticres/vipsubscribe/js/UpgradePrice.js

@@ -52,12 +52,11 @@ var req = {
 
 //判断是否需要升级 不需要升级返回nil 需要则返回升级后的buyset
 function needUpgrade(newBuyset, oldBuyset) {
-    console.log(newBuyset, oldBuyset);
     var BuyerclassUpgrade = AreaNeedUpgrade = false;
     var UpgradeBuyset = {
         areacount: oldBuyset.areacount,
-        buyerclasscount: oldBuyset.buyerclasscount,
-        citys: newBuyset.citys
+        citys: oldBuyset.citys,
+        buyerclasscount: newBuyset.buyerclasscount
     };
     //比较行业
     if (oldBuyset.buyerclasscount != -1) {
@@ -187,33 +186,38 @@ function needUpgrade(newBuyset, oldBuyset) {
 
         }
     }
-    console.log(BuyerclassUpgrade, AreaNeedUpgrade)
     if (BuyerclassUpgrade || AreaNeedUpgrade) {
-        return UpgradeBuyset
+        return [UpgradeBuyset, AreaNeedUpgrade, BuyerclassUpgrade]
     } else {
-        return -1
+        return [-1, AreaNeedUpgrade, BuyerclassUpgrade]
     }
 }
 
 //获取支付价格
 //-1 不用升级 -2 不能升级
 function getUpgradeFinalStatus(newBuyset, oldBuyset, t, endUnix, renewList) {
-    var Upgrade = needUpgrade(newBuyset, oldBuyset);
+    var Upgradestatus = needUpgrade(newBuyset, oldBuyset);
+    var Upgrade = Upgradestatus[0];
+    console.log("Upgrade", Upgrade, Upgradestatus);
     if (Upgrade === -1) {
         if (t.length == 0) {
-            return -1   //订阅修改
+            return [-1, false, false]   //订阅修改
         }
         return getsubVipOrderPriceBybuyset(oldBuyset, t)//续费
     }
     var final_price = 0;
     var nowEndTime = endUnix;
     //续费升级价格
-    for (var i = renewList.length; i > 0; i--) {
+    for (var i = renewList.length - 1; i >= 0; i--) {
         var thisBuyset = renewList[i].o_buyset;
         var thisStartTime = renewList[i].l_validtime;
-        var this_price = getSubPrice(thisBuyset, Upgrade, thisStartTime, nowEndTime);
+        var this_price = getSubPrice({
+            "areacount": thisBuyset.areacount,  //省份数量
+            "buyerclasscount": thisBuyset.buyerclasscount,
+            "citys": thisBuyset.newcitys //购买省份中城市数量
+        }, Upgrade, thisStartTime, nowEndTime);
         if (this_price < 0) {
-            return -2
+            return [-2, false, false]
         }
         final_price += this_price;
         nowEndTime = thisStartTime;
@@ -221,18 +225,19 @@ function getUpgradeFinalStatus(newBuyset, oldBuyset, t, endUnix, renewList) {
     //现在使用升级价格
     var now_price = getSubPrice(oldBuyset, Upgrade, new Date().getTime() / 1000, nowEndTime);
     if (now_price < 0) {
-        return -2
+        return [-2, false, false]
     }
     final_price += now_price;
     //新增续费升级价格
     if (t.length != 0) {
         var this_price = getsubVipOrderPriceBybuyset(Upgrade, t);
         if (this_price < 0) {
-            return -2
+            return [-2, false, false]
         }
+        console.log(Upgrade, t, "额外升级费用", this_price);
         final_price += this_price;
     }
-    return final_price
+    return [final_price, Upgradestatus[1], Upgradestatus[2]]
 }
 
 // var buyset = {
@@ -252,17 +257,18 @@ function getSubPrice(oldBuyset, newBuyset, start, end) {
     var beforePrice = 0;
     var newPrice = 0;
     var t = getDateSub(start, end);
+    console.log("getSubPrice==", start, end, t);
     if (t[1] != 0) {//月
-        beforePrice += getsubVipOrderPriceBybuyset(oldBuyset, [2, t[1]]);
-        newPrice += getsubVipOrderPriceBybuyset(newBuyset, [2, t[1]]);
+        beforePrice += getsubVipOrderPriceBybuyset(oldBuyset, [t[1], 2]);
+        newPrice += getsubVipOrderPriceBybuyset(newBuyset, [t[1], 2]);
     }
     if (t[0] != 0) {//年
-        beforePrice += getsubVipOrderPriceBybuyset(oldBuyset, [1, t[0]]);
-        newPrice += getsubVipOrderPriceBybuyset(newBuyset, [1, t[0]]);
+        beforePrice += getsubVipOrderPriceBybuyset(oldBuyset, [t[0], 1]);
+        newPrice += getsubVipOrderPriceBybuyset(newBuyset, [t[0], 1]);
     }
     //
-    console.log("old ", oldBuyset, " \n new ", newBuyset, " \n 相差", t[0], "年 ", t[1], "个月\n price:", newPrice, "-", beforePrice, "=", newPrice - beforePrice);
-    return newPrice - beforePrice
+    console.log("old ", oldBuyset, " \n new ", newBuyset, " \n 相差", t[0], "年 ", t[1], "个月\n price:", newPrice, "-", beforePrice, "=", (newPrice * 100 - beforePrice * 100) / 100);
+    return (newPrice * 100 - beforePrice * 100) / 100
 }
 
 //计算时间间隔差
@@ -316,8 +322,8 @@ function getDateSub(start, end) {
         if (finalYearNum > 0) {
             finalMonthNum = finalMonthNum - finalYearNum * 12
         }
-        return [finalYearNum, finalMonthNum]
     }
+    return [finalYearNum, finalMonthNum]
 }
 
 

src/web/staticres/vipsubscribe/js/change_area.js

@@ -0,0 +1,436 @@
+$(function () {
+    // 后端数据结构
+    var areaData = {
+        'data': {
+            // 选择的数量
+            'area': {
+                '北京': [],
+                '河南': [
+                    '洛阳市',
+                    '驻马店市',
+                    '周口市',
+                    '郑州市'
+                ],
+                '湖南': ['长沙市'],
+                '澳门': [],
+                '甘肃': []
+            },
+            'buyset': {
+                // 购买的全省的数量(不带市)
+                'areacount': 5,
+                'buyerclasscount': 11,
+                // 购买的城市
+                'newcitys': []
+            }
+        },
+        'errMsg': '',
+        'success': true
+    };
+
+    // 已经购买过的城市数量
+    var alreadyBuy = {
+        country: 0,
+        province: 0,
+        city: {
+            // 一共买了多少个城市
+            totalCount: 0,
+            // 分布在几个省份
+            pCount: 0
+        }
+    }
+
+    // ----------------- 以下定义功能函数 ----------------------------
+    function createMoreCity(arr) {
+        var tempHtml = arr.map(function (v) {
+            return '<button class="city">' + v.name + '</button>'
+        }).join('')
+        return tempHtml
+    }
+
+    // 数组求和
+    function arrSum(arr) {
+        var sum = 0
+        arr.forEach(function(item, i) {
+            sum += item
+        })
+        return sum
+    }
+
+    // 是否锁定按钮
+    function isLockedTipButtons(f) {
+        $('.tips_btn button.save-btn').prop('disabled', f)
+    }
+
+    // 省下拉市事件
+    var isAnimating = false
+    function slideFunc() {
+        if (isAnimating) return
+        isAnimating = true
+        if ($(this).next('.tab_content:not(:animated)').css("display") == "block") {
+            $(this).children().children('i').removeClass('rotate-arrow')
+        } else {
+            $(this).children().children('i').addClass('rotate-arrow')
+        }
+        $(this).toggleClass('selected').next('.tab_content:not(:animated)').slideToggle(500)
+        $(this).parent().siblings().children('.tab').removeClass('selected');
+        setTimeout(function() {
+            isAnimating = false
+        }, 500)
+    }
+
+    // 新增求值 ---- 统计数量，不做视图操作
+    function getResult() {
+        var selectedCount = {
+            country: 0,
+            province: 0,
+            city: {
+                // 一共选了多少个城市
+                totalCount: 0,
+                // 分布在几个省份
+                pCount: 0
+            }
+        }
+        // 获取所有点亮的城市的值
+        var selected = getActiveCityDetail()
+        if (Object.keys(selected).length === 0) {
+            isLockedTipButtons(true)
+        } else {
+            isLockedTipButtons(false)
+        }
+
+
+        for (var p in selected) {
+            if (p === '全国') {
+                selectedCount = {
+                    country: -1,
+                    province: 0,
+                    city: {
+                        totalCount: 0,
+                        pCount: 0
+                    }
+                }
+                return setDataInResult(selectedCount);
+            }
+
+            if (selected[p].length === 0) {
+                selectedCount.province ++
+            } else {
+                selectedCount.city.pCount ++
+                selected[p].forEach(function(item, index) {
+                    selectedCount.city.totalCount ++
+                })
+            }
+        }
+        setDataInResult(selectedCount);
+    }
+
+    function setDataInResult(selected) {
+        // 已选择数量数据渲染
+        if (selected.country === -1) {
+            $('.result-selected .result-info .info-overview').text('全国')
+            return
+        } else {
+            // 已选择数量
+            var count = {
+                p: selected.province + '个省',
+                c: selected.city.totalCount + '个市',
+                s: '分布在' + selected.city.pCount + '个省内'
+            }
+            if (selected.province === 0) {
+                $('.result-selected .result-info .info-overview').text(count.c + '(' + count.s + ')')
+            } else if (selected.city.totalCount === 0) {
+                $('.result-selected .result-info .info-overview').text(count.p)
+            } else {
+                $('.result-selected .result-info .info-overview').text(count.p + '、' + count.c + '(' + count.s + ')')
+            }
+        }
+    }
+
+    // 点亮的城市数量详情(需要省和城市名称)
+    function getActiveCityDetail() {
+        var isWholeCountry = $('.tab.whole input').is(':checked')
+        if (isWholeCountry) {
+            // 选择全国
+            var str = $('.area-list li .tab.whole .province').text().replace(/\s+ | [\r\n]/g, '')
+            var obj = {}
+            obj[str] = []
+            return obj
+        } else {
+            var arr = []
+            $('.area-list li:not(.index)').each(function (i, dom) {
+                var $dom = $(dom)
+                if ($dom.children('.tab').hasClass('whole')) return
+                var isMunicipality = $dom.find('.tab').hasClass('municipality')
+                var pName = $dom.find('.province').text().replace(/\s+ | [\r\n]/g, '')
+                var selectedObj = {
+                    name: pName,
+                    children: []
+                }
+
+                // 是否是直辖市或自治区
+                if (isMunicipality) {
+                    if ($dom.find('input:not([disabled])').is(':checked')) {
+                        arr.push(selectedObj)
+
+                    }
+                } else {
+                    var allCitylength = $dom.find('button').length
+
+                    if ($dom.find('button.active').length === allCitylength) {
+                        arr.push(selectedObj)
+                    } else {
+                        $dom.find('button.active').each(function (c, buttonDOM) {
+                            var cName = $(buttonDOM).text().replace(/\s+ | [\r\n]/g, '')
+                            selectedObj.children.push(cName)
+                        })
+                        if (selectedObj.children.length) {
+                            arr.push(selectedObj)
+                        }
+                    }
+                }
+            })
+
+            // 处理arr
+            // [
+            //     {
+            //         name: '安徽',
+            //         children: ["合肥市", "蚌埠市", "阜阳市"]
+            //     },
+            //     {
+            //         name: '海南',
+            //         children: ["三亚市", "文昌市"]
+            //     },
+            //     {
+            //         name: '河南',
+            //         children: ["郑州市", "信阳市"]
+            //     }
+            // ]
+            var selectedCityDetail = {}
+            arr.forEach(function (item, i) {
+                selectedCityDetail[item.name] = item.children
+            })
+            return selectedCityDetail
+        }
+    }
+
+    // 初始选择的城市恢复，根据传入的p恢复为Active蓝色按钮
+    // 需要放到init之后
+    function renderSelectedCityActive(p = {}) {
+        for (const k in p) {
+            if (k === '全国') {
+                $('.area-list li:not(.index):eq(0)').find('input').trigger('click')
+                return
+            }
+
+            if (p[k].length == 0) {
+                // 购买的省份
+                $('.province').each(function () {
+                    var t = $(this).text().trim();
+                    if (k == t && p[k].length == 0) {
+                        var li = $(this).parents('li')
+                        // 改变按钮状态
+                        li.find('.city').addClass('active')
+                        // 改变input的状态
+                        li.find('input.checkbox').prop('checked', true)
+                    }
+                })
+            } else {
+                $('.city').each(function () {
+                    var t = $(this).text().trim();
+                    p[k].forEach(v => {
+                        if (v !== t) return
+                        // 改变按钮状态
+                        $this = $(this)
+                        $this.addClass('active')
+                        // 改变input的样式
+                        $this.parents('li').find('input.checkbox').addClass('opt')
+                    })
+                })
+            }
+        }
+    }
+
+    function resetButtonLock(f) {
+        $('#cancel').prop('disabled', f)
+    }
+
+
+    // 根据数据进行求总数 --- 上方已购买数据信息的初始化
+    function initAlreadyBuy(buyset, citys) {
+        if (buyset.areacount === -1) {
+            $('.result-purchased .result-info .buy-set-info').text('全国')
+            alreadyBuy = {
+                country: -1,
+                province: 0,
+                city: {
+                    totalCount: 0,
+                    pCount: 0
+                }
+            }
+            return
+        } else {
+            // 购买的全省的数量（不包含市）
+            alreadyBuy.province = buyset.areacount;
+            // 购买的城市总数量
+            alreadyBuy.city.pCount = citys.length
+            alreadyBuy.city.totalCount = arrSum(citys)
+
+            var buySetInfo = {
+                p: alreadyBuy.province + '个省',
+                c: alreadyBuy.city.totalCount + '个市',
+                s: '分布在' + alreadyBuy.city.pCount + '个省内'
+            }
+
+            if (alreadyBuy.province === 0) {
+                $('.result-purchased .result-info .buy-set-info').text(buySetInfo.c + '(' + buySetInfo.s + ')')
+            } else if (alreadyBuy.city.totalCount === 0) {
+                $('.result-purchased .result-info .buy-set-info').text(buySetInfo.p)
+            } else {
+                $('.result-purchased .result-info .buy-set-info').text(buySetInfo.p + '、' + buySetInfo.c + '(' + buySetInfo.s + ')')
+            }
+        }
+    }
+
+    // 初始化方法
+    function init() {
+        var data = areaData.data
+        var buyset = data.buyset;
+        var citys = buyset.newcitys;
+        initAlreadyBuy(buyset, citys)
+        // 根据返回数据进行渲染(默认选中已选择的)
+        renderSelectedCityActive(data.area)
+        getResult()
+    }
+
+    // ----------------- 以下绑定事件 ----------------------------
+    // 0.渲染城市列表
+    $(".select-area-box ul li:not('.index')").each(function () {
+        var text = $(this).find(".province").text().trim()
+        var data = null
+        chinaMapJSON.some(function (v) {
+            data = v
+            return v.name.indexOf(text) !== -1
+        })
+        var box = $(this).find('div.tab_content')
+        var html = createMoreCity(data.city)
+        box.html(html)
+    })
+    // fastClick初始化: https://github.com/ftlabs/fastclick
+    FastClick.attach(document.body)
+    // 1.省下拉市
+    $(".select-area-box .tab:not(.municipality)").on('click', slideFunc)
+    // 2.点击全国按钮onchange事件；
+    $('.checkbox.other').on('change', function () {
+        var isChecked = $(this).is(':checked')
+        if (isChecked) {
+            $(this).prop('checked', true);
+            $('.checkbox:not(.other):not([disabled])').prop('checked', false).removeClass('opt');
+            $('.city:not([disabled])').removeClass('active');
+            $('.tab_content').slideUp();
+        }
+        getResult()
+    })
+    // 3.点击非全国按钮onchange事件
+    $('.checkbox:not(.other)').on('change', function () {
+        $('.checkbox.other').prop('checked', false);
+        var isChecked = $(this).is(':checked');
+        if (isChecked) {
+            $(this).prop('checked', true).removeClass('opt');
+            $(this).parents('li').find('.city').addClass('active');
+            // 控制点击checkbox时候是否展开下方的城市列表
+            // $(this).parent().parent('.tab:not(.municipality)').siblings('.tab_content').slideDown();
+        } else {
+            $(this).prop('checked', false);
+            $(this).parents('li').find('.city').removeClass('active');
+        }
+        getResult();
+    })
+    // 4.点击城市按钮触发的事件
+    $('.tab_content').on('click', '.city', function () {
+        // 全国取消选中
+        $('.checkbox.other').prop('checked', false);
+        $(this).toggleClass('active')
+        // 省下所有选中的地市数量
+        var activeCityLength = $(this).parent().find('.city.active').length;
+        // 省下一共有几个城市
+        var cityLength = $(this).parent().find('.city').length;
+        var oInput = $(this).parents('li').find('input.checkbox')
+
+        if (activeCityLength === cityLength) {//当选中的城市数量等于该省下所有城市总数时，即为全选
+            if ($(this).siblings('.city[disabled]').length === 0) {
+                oInput.removeClass('opt').prop('checked', true)
+            }
+        } else if (activeCityLength === 0) {
+            oInput.prop('checked', false).removeClass('opt')
+        } else {//半选
+            oInput.prop("checked", false).addClass('opt')
+        }
+        getResult();
+    })
+    // 5. 重置按钮点击事件
+    $('.reset-btn').on('click', function () {
+        alreadyBuy = {
+            country: 0,
+            province: 0,
+            city: {
+                // 一共买了多少个城市
+                totalCount: 0,
+                // 分布在几个省份
+                pCount: 0
+            }
+        }
+        $('.checkbox').prop('checked', false).removeAttr('disabled');
+        $('.city').removeClass('active');
+        $('input').removeClass('opt')
+        $('.tab_content').slideUp();
+        $('.tab .iconfont').removeClass('rotate-arrow')
+        init();
+    })
+
+    // 6.锚点跳转
+    $("body").on('click', '.slide a', function () {
+        var s = $(this).html()
+        if (s == '#') {
+            return;
+        }
+        document.querySelector('#' + s).scrollIntoView({
+            block: 'center'
+        });
+    })
+    // 阻止input checkbox选中取消 触发父元素下拉事件
+    $('.checkbox').click(function (e) {
+        e.stopPropagation();
+    })
+
+    // ----------------------- 以下数据交互 ------------------
+    function getDataWitXHR() {
+        $DoPost('/subscribepay/vipsubscribe/getSubBuyMsg', {}, function (res) {
+            if (!res.success) return
+            areaData.data = res.data
+            sessionStorage.setItem('sub_vip_state', JSON.stringify(res.data))
+            init()
+        })
+    }
+
+    var subVipState =  sessionStorage.getItem('sub_vip_state')
+    if (subVipState) {
+        areaData.data = JSON.parse(subVipState)
+        init()
+    } else {
+        getDataWitXHR()
+    }
+
+    // 确认按钮事件
+    $('.save-btn').on('click', function () {
+        // 获取点亮的城市详情
+        areaData.data.area = getActiveCityDetail()
+        sessionStorage.setItem('sub_vip_state', JSON.stringify(areaData.data))
+        history.back()
+    })
+
+    // 获取点亮的城市的列表详情（带省名和城市名）
+    // getActiveCityDetail()
+
+    // 回显为蓝色激活样式
+    // renderSelectedCityActive()
+})

src/web/staticres/vipsubscribe/js/change_industry.js

@@ -0,0 +1,152 @@
+// 模拟数据
+var data = {
+    "data": {
+        "area": {
+            "安徽": [],
+            "福建": ['福州市', '莆田市'],
+            "广东": [],
+        },
+        "buyset": {
+            "areacount": 1,
+            "buyerclasscount": 3,
+            "citys": {
+                "贵州": 2,
+                "广东": 2,
+                "广西": 2,
+                "福建": 1,
+            }
+        },
+        "industry": [
+            "安监",
+            // "保监"
+        ],
+        "isTrial": false
+    },
+    "errMsg": "",
+    "success": true
+}
+var buyCount = data.data.buyset.buyerclasscount;//已购买的行业数量  -1是全部行业，正数为购买的行业数量
+var array = data.data.industry;//已选择的行业（数组）
+var result = [];//声明一个空数组为选择结果
+// 初始化行业数据，渲染到页面
+function initData() {
+    buyCount = data.data.buyset.buyerclasscount;//已购买的行业数量  -1是全部行业，正数为购买的行业数量
+    array = data.data.industry;//已选择的行业（数组）
+    /* 已购买过的行业 */
+    if (buyCount == -1) {
+        $('.result_name').html('全部行业')
+    } else {
+        $('.result_name').html(buyCount + '个行业')
+    }
+    /* 已选择的行业 数组为空时即选择的全部行业 不为空时对应选择的结果 */
+    if (array.length == 0) {
+        $('.result_count').html('全部行业');
+        $('.industry_item.whole').addClass('active')
+    } else {
+        $('.result_count').html(array.length + '个行业');
+        $('.industry_item:not(.whole)').each(function () {
+            var text = $(this).text().trim()
+            for (var i = 0; i < array.length; i++) {
+                var element = array[i];
+                if (element == text) {
+                    $(this).addClass('active')
+                }
+            }
+        })
+    }
+}
+// 实时改变选择结果
+function resultCount() {
+    $('.result_count').empty();
+    var count = $('.list').find('.industry_item.active:not(.whole)').length;
+    if ($('.industry_item.whole').hasClass('active')) {
+        $('.result_count').html('全部行业');
+        result = [];
+        if (buyCount != -1) {
+            $('.update_tips').show();
+        } else {
+            $('.update_tips').hide();
+        }
+    } else {
+        var buttons = $('.select-area-box .list button:not(.whole)');
+        var canChangeArr = [];
+        buttons.each(function () {
+            if ($(this).hasClass('active')) {
+                canChangeArr.push($(this).text())
+            }
+        })
+        if (count > buyCount) {
+            $('.update_tips').show();
+        } else {
+            $('.update_tips').hide();
+        }
+        $('.result_count').html(count + '个行业');
+
+        if ($('.list').find('.industry_item.active:not(.whole)').length === 0) {
+            $('.save-btn').prop('disabled', true)
+        } else {
+            $('.save-btn').prop('disabled', false)
+        }
+        result = canChangeArr;
+    }
+}
+$(function () {
+    
+    // 公共资源交易介绍提示框
+    $('#showTips').click(function (e) {
+        e.stopPropagation();
+        $('.tips_detail').slideToggle()
+    });
+    // 点击导航跳转
+    $("body").on('click', '.slide a', function () {
+        var s = $(this).html()
+        if (s == '#') {
+            return;
+        }
+        document.querySelector('#' + s).scrollIntoView({
+            block: 'center'
+        });
+    })
+    // 选择全部行业
+    $('.industry_item.whole').on('click', function () {
+        $(this).addClass('active').parents('.list').find('.industry_item:not(.whole)').removeClass('active');
+        resultCount();
+    })
+    // 选择非全部行业
+    $('.industry_item:not(.whole)').on('click', function () {
+        $('.industry_item.whole').removeClass('active');
+        $(this).toggleClass('active');
+        resultCount();
+    })
+
+    // 重置按钮事件
+    $('.reset-btn').on('click', function () {
+        $('.list').find('.industry_item').removeClass('active');
+        $('.update_tips').hide();
+        initData();
+    })
+    // 确认按钮事件
+    $('.save-btn').on('click', function () {
+        data.data.industry = result
+        sessionStorage.setItem('sub_vip_state', JSON.stringify(data.data))
+        history.back()
+    })
+
+
+    function getDataWitXHR() {
+        $DoPost('/subscribepay/vipsubscribe/getSubBuyMsg', {}, function (res) {
+            if (!res.success) return
+            data.data = res.data
+            sessionStorage.setItem('sub_vip_state', JSON.stringify(res.data))
+            initData();
+        })
+    }
+
+    var subVipState =  sessionStorage.getItem('sub_vip_state')
+    if (subVipState) {
+        data.data = JSON.parse(subVipState)
+        initData();
+    } else {
+        getDataWitXHR()
+    }
+})

src/web/staticres/vipsubscribe/js/common.js

@@ -80,8 +80,40 @@ function SortArr(arr) {
     return arr
 }
 
-//购买设置
+//获取选择
+function getSelectBuyset(area, industry) {
+    if (industry[0] === "全部行业") industry = [];
+    if (area["全国"]) area = {};
+    //计算地区数量
+    var buyset = {
+        "areacount": -1,  //省份数量
+        "buyerclasscount": -1,
+        "citys": [] //购买省份中城市数量
+    };
+    //行业
+    if (industry.length != 0) {
+        buyset.buyerclasscount = industry.length
+    }
+    //地区
+    if (!$.isEmptyObject(area)) {
+        buyset.areacount = 0;
+        for (var i in area) {
+            var citys = area[i];
+            var thisLen = citys.length;
+            if (thisLen === 0) {
+                buyset.areacount++
+            } else {
+                buyset.citys.push(thisLen)
+            }
+        }
+    }
+    return buyset
+}
+
+
+//购买设置 area map
 function getBuySet(area, industry, price) {
+    price = checkPrice(price);
     if (industry[0] === "全部行业") industry = [];
     if (area["全国"]) area = {};
     //计算地区数量
@@ -91,7 +123,7 @@ function getBuySet(area, industry, price) {
         "citys": [] //购买省份中城市数量
     };
     //行业
-    if (industry.length != 0 && industry.length < price.buyerClassMaxCount) {
+    if (industry.length != 0 && industry.length <= price.buyerClassMaxCount) {
         buyset.buyerclasscount = industry.length
     }
     //地区
@@ -155,24 +187,6 @@ function checkPrice(price) {
 function getsubVipOrderPriceBybuyset(buyset, t, price) {
     price = checkPrice(price);
     var vipbuyset = JSON.parse(JSON.stringify(buyset));
-
-    // if (!$.isEmptyObject(vipbuyset.citys)) {
-    //     //     for (var i in vipbuyset.citys) {
-    //     //         if (vipbuyset.citys[i] > price.cityMaxCount) {
-    //     //             vipbuyset.areacount++
-    //     //             delete vipbuyset.citys[i]
-    //     //         }
-    //     //     }
-    //     // }
-
-    //当省份数量大于price.ProvinceMaxCount 按照全国计算
-    // if (vipbuyset.areacount > price.provinceMaxCount) {
-    //     vipbuyset.areacount = -1
-    // }
-    //当行业数量大于price.buyerClassMaxCount按照全行业
-    // if (vipbuyset.buyerclasscount > price.buyerClassMaxCount) {
-    //     vipbuyset.buyerclasscount = -1
-    // }
     if (t[0] > price.monthMaxCount && t[1] === 2) t[0] = 10;//月份十个月以上价格一样
 
     if (vipbuyset.areacount === -1) {//计算全国套餐价格
@@ -209,7 +223,7 @@ function getsubVipOrderPriceBybuyset(buyset, t, price) {
         }
         final_price += thisPrice;
     }
-    final_price += vipbuyset.areacount * getSetMealPrice(1, vipbuyset.buyerclasscount, t[1], price) * t[0]
+    final_price += vipbuyset.areacount * getSetMealPrice(1, vipbuyset.buyerclasscount, t[1], price) * t[0];
     return final_price / 100
 }
 
@@ -272,4 +286,67 @@ function checkOrder(wz) {
         }
     });
     return flag
+}
+
+// 时间格式化
+Date.prototype.pattern = function (fmt) {
+    var o = {
+        "y+": this.getFullYear(),
+        "M+": this.getMonth() + 1, //月份
+        "d+": this.getDate(), //日
+        "h+": this.getHours() % 12 == 0 ? 12 : this.getHours() % 12, //小时
+        "H+": this.getHours(), //小时
+        "m+": this.getMinutes(), //分
+        "s+": this.getSeconds(), //秒
+        "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+        "S": this.getMilliseconds() //毫秒
+    };
+    var week = {
+        "0": "日",
+        "1": "一",
+        "2": "二",
+        "3": "三",
+        "4": "四",
+        "5": "五",
+        "6": "六"
+    };
+    if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    }
+    if (/(E+)/.test(fmt)) {
+        fmt = fmt.replace(RegExp.$1, ((RegExp.$1.length > 1) ? (RegExp.$1.length > 2 ? "星期" : "周") : "") + week[this.getDay() + ""]);
+    }
+    for (var k in o) {
+        if (new RegExp("(" + k + ")").test(fmt)) {
+            fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+        }
+    }
+    return fmt;
+}
+
+//value ;flag 1:年 2:月 endtime 结束时间
+function getVipEndDate(flag, value, endtime) {
+    var EndTime = new Date(endtime * 1000);
+    var startDay = EndTime.getDate();
+    var yearNum = EndTime.getFullYear();
+    var monthNum = EndTime.getMonth();
+    if (flag === 1) {//将年转换成月
+        //年
+        yearNum += value;
+    } else {
+        //月
+        if (monthNum + value > 11) {
+            monthNum = monthNum + value - 12;
+            yearNum++
+        } else {
+            monthNum += value
+        }
+    }
+    //获取当月最后一天
+    var lastDay = new Date(yearNum, monthNum+1, 0).getDate();
+    if (startDay < lastDay) {
+        return new Date(yearNum, monthNum, startDay, 23, 59, 59).getTime() / 1000;
+    } else {
+        return new Date(yearNum, monthNum, lastDay, 23, 59, 59).getTime() / 1000;
+    }
 }

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

@@ -0,0 +1,595 @@
+$(function () {
+    // 格式化金钱的函数
+    // s: 金额(number) 必传
+    // n: 保留小数的位数(int:0-100)
+    function formatMoney(s, n) {
+        if (n === undefined) {
+            n = -1
+        } else {
+            n = n > 0 && n <= 20 ? n : 2;
+        }
+        var intS = parseInt(s)
+        var point = '.'
+        var left;
+        var right;
+        s = parseFloat((s + '').replace(/[^\d\.-]/g, ''))
+        // 没传n，默认(如果为整数，则不保留小数。如果为浮点数，则保留两位小数)
+        if (n === -1) {
+            if (s === intS) {
+                n = 0
+                right = ''
+                point = ''
+            } else {
+                n = 2
+                s = s.toFixed(n);
+                right = s.split('.')[1];
+            }
+            s = s + ''
+            left = s.split('.')[0].split("").reverse();
+        } else {
+            s = parseFloat((s + '').replace(/[^\d\.-]/g, '')).toFixed(n) + '';
+            left = s.split('.')[0].split('').reverse();
+            right = s.split('.')[1];
+        }
+
+        t = "";
+        for (i = 0; i < left.length; i++) {
+            t += left[i] + ((i + 1) % 3 == 0 && (i + 1) != left.length ? ',' : '');
+        }
+
+        var money = t.split('').reverse().join('') + point + right;
+        return money;
+    }
+
+
+    //项目匹配开关
+    var checkedflag = true;
+
+    function setprojectmatch(index) {
+        if (checkedflag) {
+            checkedflag = false;
+            $.post("/subscribepay/afterPay/setUserInfo", {pageType: "projectMatch", pmindex: index}, function (r) {
+                if (r.flag) {
+                    checkedflag = true;
+                    reqData.projectmatch = index;
+                    sessionStorage.setItem('sub_vip_state', JSON.stringify(reqData))
+                }
+            })
+        }
+    }
+
+    function getDataWitXHR() {
+        $DoPost('/subscribepay/vipsubscribe/getSubBuyMsg', {}, function (res) {
+            if (!res.success) return
+            var globalStateStr = JSON.stringify(res.data)
+            sessionStorage.setItem('sub_vip_state', globalStateStr)
+            globalState = JSON.parse(globalStateStr)
+            init(res.data)
+        })
+    }
+
+    //获取选择
+    function getCount(area, industry) {
+        if (industry[0] === "全部行业") industry = [];
+        if (area["全国"]) area = {};
+        //计算地区数量
+        var count = {
+            "areacount": -1,  //省份数量
+            "buyerclasscount": -1,
+            "citys": [] //购买省份中城市数量
+        };
+        //行业
+        if (industry.length != 0) {
+            count.buyerclasscount = industry.length
+        }
+        //地区
+        if (!$.isEmptyObject(area)) {
+            count.areacount = 0;
+            for (var i in area) {
+                var citys = area[i];
+                var thisLen = citys.length;
+                if (thisLen === 0) {
+                    count.areacount++
+                } else {
+                    count.citys.push(thisLen)
+                }
+            }
+        }
+        return count
+    }
+
+    // 设置已选择的区域和行业
+    /**
+     * selected = {
+     *      areacount: 2,
+     *      buyerclasscount: 2,
+     *      citys: [1, 2, 3]
+     *  }
+     */
+    function setSelectedAreaAndInd(selected) {
+        // selected = {
+        //     areacount: 2,
+        //     buyerclasscount: 2,
+        //     citys: [1, 2, 3]
+        // }
+
+        // 设置已选择区域
+        var citySum = arrSum(selected.citys)
+        var text = {
+            p: selected.areacount + '个省',
+            c: citySum + '个市',
+            s: '分布在' + selected.citys.length + '个省内'
+        }
+
+        if (selected.areacount === -1) {
+            $('.vip-body .area .selected-area').text('全国')
+        } else {
+            if (selected.areacount === 0) {
+                $('.vip-body .area .selected-area').text(text.c + '(' + text.s + ')')
+            } else if (selected.citys.length === 0) {
+                $('.vip-body .area .selected-area').text(text.p)
+            } else {
+                $('.vip-body .area .selected-area').text(text.p + '、' + text.c + '(' + text.s + ')')
+            }
+        }
+
+        // 设置已选择行业
+        if (selected.buyerclasscount === -1) {
+            $('.vip-body .industry .selected-industry').text('全行业')
+        } else {
+            $('.vip-body .industry .selected-industry').text(selected.buyerclasscount + '个行业')
+        }
+    }
+
+
+    // 设置已购买的区域和行业
+    /**
+     * buyset = {
+     *      areacount: 2,
+     *      buyerclasscount: 2,
+     *      newcitys: [1, 2, 3]
+     *  }
+     */
+    function setBuyAreaAndInd(buySet) {
+        // 设置已购买区域
+        var buySetCitySum = arrSum(buySet.newcitys)
+        var text = {
+            p: buySet.areacount + '个省',
+            c: buySetCitySum + '个市',
+            s: '分布在' + buySet.newcitys.length + '个省内'
+        }
+
+        if (buySet.areacount === -1) {
+            $('.vip-body .area .buy-set-area').text('全国')
+        } else {
+            if (buySet.areacount === 0) {
+                $('.vip-body .area .buy-set-area').text(text.c + '(' + text.s + ')')
+            } else if (buySet.newcitys.length === 0) {
+                $('.vip-body .area .buy-set-area').text(text.p)
+            } else {
+                $('.vip-body .area .buy-set-area').text(text.p + '、' + text.c + '(' + text.s + ')')
+            }
+        }
+
+        // 设置已选择行业
+        if (buySet.buyerclasscount === -1) {
+            $('.vip-body .industry .buy-set-industry').text('全行业')
+        } else {
+            $('.vip-body .industry .buy-set-industry').text(buySet.buyerclasscount + '个行业')
+        }
+    }
+
+    function clearSession() {
+        sessionStorage.removeItem("vip_index_read");
+        sessionStorage.removeItem('sub_vip_state');
+    }
+
+    function arrSum(arr) {
+        var sum = 0
+        arr.forEach(function (item, i) {
+            sum += item
+        })
+        return sum
+    }
+
+    // picker的显示隐藏
+    function pickerShow(selector, f) {
+        if (f) {
+            // 添加进场动画，并显示
+            $(selector).find('.weui-mask').removeClass('weui-animate-fade-out').addClass('weui-animate-fade-in')
+            $(selector).find('.weui-picker').removeClass('weui-animate-slide-down').addClass('weui-animate-slide-up')
+            $(selector).show(300);
+        } else {
+            // 添加离场动画，并隐藏
+            $(selector).find('.weui-mask').removeClass('weui-animate-fade-in').addClass('weui-animate-fade-out')
+            $(selector).find('.weui-picker').removeClass('weui-animate-slide-up').addClass('weui-animate-slide-down')
+            $(selector).hide(300);
+        }
+    }
+
+    // 项目匹配问号点击事件
+    $('.project-match .icon-bangzhu').on('click', function () {
+        var str = '开启后，系统将根据你订阅的关键词自动匹配出相关联的项目，并将相关联项目的后续动态在VIP订阅内一并推送。'
+        weui.alert(str, {
+            title: '项目匹配',
+            className: 'jy-alert',
+            buttons: [{
+                label: '我知道了'
+            }]
+        });
+    })
+
+    // 计算标准点击事件
+    $('.billing-list-btn').on('click', function () {
+        pickerShow('.billing-list-container', true)
+    })
+    // 计算标准隐藏
+    $('.billing-list-container .dialog_hd__close').on('click', function () {
+        pickerShow('.billing-list-container', false)
+    })
+    $('.weui-mask').on('click', function () {
+        pickerShow('.billing-list-container', false)
+    })
+
+    // 阅读并接受协议前的模拟checkbox点击事件
+    if (sessionStorage.getItem("vip_index_read") == "1") {
+        $('.checkbox').addClass("checked")
+        $('.vip-footer.upgrade .confirm').prop('disabled', false);
+    }
+    $('.checkbox').on('click', function () {
+        $(this).toggleClass('checked');
+        var state = $(this).hasClass('checked');
+        $('.vip-footer.upgrade .confirm').prop('disabled', !state);
+        sessionStorage.setItem("vip_index_read", state ? "1" : "0");
+    });
+
+
+    // switch点击切换
+    $('.switch').on('click', function (e) {
+        var $this = $(this);
+        var hasChecked = $this.hasClass('checked');
+
+        if (!hasChecked) {
+            $this.addClass('checked');
+            setprojectmatch(1);
+        } else {
+            $this.removeClass('checked');
+            setprojectmatch(0);
+            weui.toast('项目匹配已关闭', {
+                duration: 1500,
+                className: 'jy-toast',
+                callback: function () {
+                    console.log('close')
+                }
+            });
+        }
+    })
+
+    //保存取消提示 module 1 修改 2升级
+    function cancelTip(module) {
+        weui.dialog({
+            title: '提示信息',
+            content: module == 1 ? '所选订阅设置已做修改，返回后修改的设置将不做保存。' : '所选订阅设置已超出购买范围，升级后方才生效，返回后修改的设置将不做保存。',
+            className: 'jy-dialog',
+            buttons: [
+                {
+                    label: module == 1 ? '保存修改' : '立即升级',
+                    type: 'primary',
+                    onClick: function () {
+                        doSubmit();
+                    }
+                },
+                {
+                    label: '取消',
+                    type: 'default',
+                    onClick: function () {
+                        clearSession()
+                        window.history.go(-1);
+                    }
+                }
+            ]
+        });
+    }
+
+    function initCycleSelector() {
+        $('.vip-body .body-item.cycle').on('click', function () {
+            pickerShow('#time_cycle', true)
+        })
+        // 打开dialog
+        $('#time_cycle .weui-mask').on('click', function () {
+            pickerShow('#time_cycle', false)
+        })
+        // 关闭dialog
+        $('#time_cycle .box_hd .cancel').on('click', function () {
+            pickerShow('#time_cycle', false)
+        })
+
+        // 选择完成（确定）按钮的点击事件
+        $('#enter_period').on('click', function () {
+            var checkedValue = $('#time_cycle input:radio[name="time"]:checked').val();
+            var result = null
+            if (checkedValue == 'month') {
+                result = $('#number_box_month .month_number').text() + '个月'
+            } else if (checkedValue == 'year') {
+                result = $('#number_box_year span.active').attr('data-id') + '年'
+            }
+            console.log(result)
+            $('.vip-body .extend-cycle').show().text('延长订阅周期' + result)
+            pickerShow('#time_cycle', false)
+        })
+
+
+        // 1. 对订阅时间选择的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')) {
+                // 点的+
+                // 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)
+            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').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) {
+            $('#number_box_month').removeClass('active');
+            console.log(e.target.dataset.id)
+            var id = e.target.dataset.id;
+            $('.profit_tips').hide()
+            $(this).addClass('active').siblings().removeClass('active')
+            $('#yearly').prop('checked', true);
+            $("#monthly").prop('checked', false);
+            // 渲染结果 保留一位小数
+            var result = (Number(id) * 58).toFixed(1);
+            $('.computed_price').html('￥' + result)
+        })
+
+        /* -------- 选择按月订阅  radio触发的事件------- */
+        $('#monthly').on('change', function (e) {
+            var isChecked = $(this).is(':checked')
+            var val = $('.month_number').text();
+            if (val >= 10) {
+                $('.profit_tips').show()
+            }
+            if (!isChecked) {
+                $('#number_box_month button').attr('disabled', true)
+            } else {
+                $('#number_box_month button').removeAttr('disabled')
+            }
+
+            if (val == 1) {
+                $('#number_box_month button:eq(0)').prop('disabled', true)
+            }
+            if (val == 12) {
+                $('#number_box_month button:eq(1)').prop('disabled', true)
+            }
+
+            var result = (Number(val) * 5.8).toFixed(1);
+            $('.computed_price').html('￥' + result)
+
+        })
+
+        /* -------- 选择按年订阅  radio触发的事件------- */
+        $('#yearly').on('change', function (e) {
+            $('.profit_tips').hide()
+            // console.log($(this).is(':checked'))
+            var isChecked = $(this).is(':checked')
+            // 按年订阅默认选择1年 
+            var val = 1;
+            $('.computed_price').html('￥' + Number(val) * 58)
+            if (isChecked) {
+                $('#number_box_year span:eq(0)').addClass('active').siblings().removeClass('active')
+            }
+        })
+    }
+
+    // 以下数据交互 -------------------
+    // 定义全部变量state
+    var globalState = {}
+    var changeTime = [];
+    var submitPrice = 0;
+
+    function init(state) {
+        // init 已选择的区域和行业
+        var selectedAreaAndInd = getCount(state.area, state.industry)
+        setSelectedAreaAndInd(selectedAreaAndInd)
+        // 初始化，已购买的城市和行业
+        setBuyAreaAndInd(state.buyset)
+
+        // 初始化订阅周期
+        var dStart = new Date(state.startTime * 1000).pattern('yyyy年MM月dd日')
+        var dEnd
+        var change = sessionStorage.getItem("vip_change_time");
+        if (change) {
+            var afterEndTime
+            if (change.indexOf("月") > -1) {
+                var monthNum = parseInt(change.replace("个月", ""));
+                afterEndTime = getVipEndDate(2, monthNum, state.endTime)
+                changeTime = [monthNum, 2]
+            } else {
+                var yearNum = parseInt(change.replace("年", ""));
+                afterEndTime = getVipEndDate(1, yearNum, state.endTime)
+                changeTime = [yearNum, 1]
+            }
+            dEnd = new Date(afterEndTime * 1000).pattern('yyyy年MM月dd日');
+            $(".body-item.cycle .tip").show();
+        } else {
+            dEnd = new Date(state.endTime * 1000).pattern('yyyy年MM月dd日')
+        }
+
+        var sDuration = dStart + ' - ' + dEnd
+        $('.body-item.cycle .buy-cycle').text(sDuration)
+
+        // 初始化关键词
+        if (state.items.lenght === 0) {
+            $('.body-item.keywords .keywords-text').text('未分类')
+        } else {
+            var arr = []
+            state.items.forEach(function (item, index) {
+                arr.push(item['s_item'])
+            })
+            $('.body-item.keywords .keywords-text').text(arr.join('、'))
+        }
+
+        // 初始化信息类型
+        if (state.infotype.length === 0) {
+            $('.body-item.info-type .info-type-text').text('全部类型')
+        } else {
+            $('.body-item.info-type .info-type-text').text(state.infotype.join('、'))
+        }
+
+        // 推送设置初始化
+        var pushSettingMap = {
+            1: '实时推送',
+            2: '每日推送',
+            3: '每周推送',
+            4: '每月推送',
+        }
+        $('.body-item.push-setting .push-setting-text').text(pushSettingMap[state.ratemode])
+
+        // 初始化项目匹配
+        if (state.projectmatch) {
+            $('.switch').addClass('checked')
+        } else {
+            $('.switch').removeClass('checked')
+        }
+    }
+
+    // 给订阅周期栏目绑定点击事件（订阅周期选择框显示与隐藏等各种操作）
+    //initCycleSelector()
+
+    var subVipState = sessionStorage.getItem('sub_vip_state');
+    var reqData = JSON.parse(subVipState)
+    if (subVipState) {
+        init(reqData);
+        //判断是否需要升级
+        var status = getUpgradeFinalStatus(getBuySet(reqData.area, reqData.industry), {
+            "areacount": reqData.buyset.areacount,
+            "buyerclasscount": reqData.buyset.buyerclasscount,
+            "citys": reqData.buyset.newcitys
+        }, changeTime, reqData.endTime, reqData.renewList);
+
+        if (status[0] === -2) {
+            alert("出错");
+            return
+        }
+
+        if (status[0] === -1) {
+            //直接修改
+            $(".vip-footer.modify").show();
+
+            $('.vip-footer .button-l.reset').on("click", function () {
+                cancelTip(1);
+            })
+            return
+        }
+
+        if (status[0] > 0) {
+            //需要付钱
+            $(".vip-footer.upgrade").show();
+            //价格展示
+            $(".vip-footer.upgrade .billing-price").text("￥" + formatMoney(status[0]))
+            submitPrice = status[0] * 100
+        }
+        //区域需要升级
+        if (status[1]) {
+            $(".body-item.area .tip-need-upgrade").show();
+        }
+        //行业需要升级
+        if (status[2]) {
+            $(".body-item.industry .tip-need-upgrade").show()
+        }
+        $('.vip-footer .button-l.reset').on("click", function () {
+            cancelTip(2);
+        })
+    } else {
+        getDataWitXHR()
+
+    }
+
+    //提交请求
+    $('.vip-footer .button-r.confirm').on('click', function () {
+        $(this).attr("disabled", "disabled");
+        doSubmit();
+        $(this).removeAttr("disabled");
+    })
+
+
+
+    //保存 or 升级
+    function doSubmit() {
+        $DoPost('/subscribepay/vipsubscribe/saveChange', {
+            "area": reqData.area["全国"] ? '{}' : JSON.stringify(reqData.area),
+            "industry": reqData.industry.join(","),
+            "payWay": "wx_js",
+            "time": sessionStorage.getItem("vip_change_time"),
+            "price": submitPrice
+        }, function (res) {
+            console.log(res)
+        }, false);
+    }
+
+});

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

@@ -0,0 +1,405 @@
+<!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="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base2.css?v={{Msg "seo" "version"}}" />
+    <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
+    <link rel="stylesheet" href="/vipsubscribe/css/change_area.css?v={{Msg "seo" "version"}}">
+    <style>
+        #choose_area .select-area-box .tab .province .checkbox[disabled]{
+            background-color: #E0E0E0;
+        }
+        #choose_area .result {
+            padding: 0;
+            border-bottom: 1px solid #e5e5e5;
+        }
+    </style>
+</head>
+
+<body>
+<div id="choose_area">
+    <div class="result">
+        <div class="result-purchased result-item">
+            <span class="result-label">区域</span>
+            <span class="result-info">
+                    <p class="buy-set-info ellipsis">9个省、3个市(分布在2个省内)</p>
+                </span>
+        </div>
+        <div class="result-selected result-item">
+            <span class="result-label">已选择</span>
+            <span class="result-info">
+                    <p class="info-overview ellipsis">9个省、3个市(分布在2个省内)</p>
+                    <p class="info-tip ellipsis">已超出现订单购买范围，需升级</p>
+                </span>
+        </div>
+    </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>
+<script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
+<script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
+<script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+<script src="/vipsubscribe/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
+<script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
+<script src="/vipsubscribe/js/change_area.js?v={{Msg "seo" "version"}}"></script>
+</body>
+
+</html>

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

@@ -0,0 +1,268 @@
+<!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="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}"/>
+    <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
+    <link rel="stylesheet" href="/vipsubscribe/css/change_industry.css?v={{Msg "seo" "version"}}">
+    <style>
+        html, body, main {
+            height: 100%;
+        }
+    </style>
+</head>
+
+<body>
+<main class="choose_industry main">
+    <div class="result">
+        <span class="label">采购单位行业：</span>
+        <span class="result_name">全部行业</span>
+    </div>
+    <div class="result">
+        <span class="label">已选择：</span>
+        <span class="result_count"></span>
+        <p class="update_tips">已超出现订单购买范围，需升级</p>
+    </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 whole">全部行业</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>
+                        <span class="wenhao">
+                                <i id="showTips" class="iconfont icon-wenhao show_tips"></i>
+                         </span>
+                        <div class="tips_detail" style="display: none;">
+                            订阅采购单位行业“公共资源交易”意味着订阅公共资源交易中心本单位采购的信息，并非所有单位通过公共资源交易中心发布的采购信息，敬请注意。
+                        </div>
+                    </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:;">E</a>
+        <a href="javascript:;">F</a>
+        <a href="javascript:;">G</a>
+        <a href="javascript:;">H</a>
+        <a href="javascript:;">I</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:;">O</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:;">U</a>
+        <a href="javascript:;">V</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="btns">
+            <button class="reset-btn">重置</button>
+            <button class="save-btn">确认</button>
+        </div>
+    </div>
+</main>
+<script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
+<script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
+<script src="/vipsubscribe/js/change_industry.js?v={{Msg "seo" "version"}}"></script>
+<script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
+</body>
+
+</html>

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

@@ -0,0 +1,245 @@
+<!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>升级订阅周期</title>
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <script src="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}"/>
+    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base2.css?v={{Msg "seo" "version"}}"/>
+    <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
+    <link rel="stylesheet" href="/vipsubscribe/css/change_time.css?v={{Msg "seo" "version"}}">
+</head>
+
+<body>
+<div class="vip_extend_cycle">
+    <div class="extend_content">
+        <!-- 订阅周期 -->
+        <div class="extend_item">
+            <div class="item_top">
+                <div class="label">订阅周期</div>
+                <div class="value">
+                    <span>3个月</span>
+                </div>
+            </div>
+            <div class="item_bottom">有效日期：<span>2019年8月1日-2019年8月7日</span></div>
+        </div>
+        <!-- 修改订阅周期 -->
+        <ul class="ul_box">
+            <li class="li_box">
+                <label class="radio_parent not_extend_label" for="notExtend">
+                    <input class="radio" type="radio" name="cycle" id="notExtend" value="不延长周期" checked>不延长周期
+                </label>
+            </li>
+            <li class="li_box">
+                <div class="top">
+                    <label class="radio_parent is_extend_label" for="isExtend">
+                        <input class="radio" type="radio" name="cycle" value="延长周期" id="isExtend">延长周期
+                    </label>
+                    <div class="switch_box">
+                        <div class="date_tab">
+                            <span class="date_tab_item active">月</span>
+                            <span class="date_tab_item">年</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="bottom">
+                    <div class="con">
+                        <div class="month">
+                            <button class="weui-btn weui-btn_plain-default minus" type="button">
+                                <div class="jy_icon decrease"></div>
+                            </button>
+                            <button class="month_number">1</button>
+                            <button class="weui-btn weui-btn_plain-default add" type="button">
+                                <div class="jy_icon increase"></div>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="con" style="display: none;">
+                        <div class="year">
+                            <span class="year_number on" 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>
+
+            </li>
+        </ul>
+    </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>
+<script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
+<script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
+<script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+<script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
+<script>
+    $(function () {
+        function initButton() {
+            if ($('.month_number').text().trim() == 1) {
+                $('.minus').attr('disabled', true)
+            } else if ($('.month_number').text().trim() == 12) {
+                $('.add').attr('disabled', true)
+            }
+        }
+
+        var saveEntTime
+
+        function flushShowTime(start, end, flag, value) {
+            if (flag && value) {
+                end = getVipEndDate(flag, value, end);
+                var showValue = flag === 1 ? value + "年" : value + "个月";
+                $(".item_top .value span").show().text(showValue);
+                saveEntTime = end;
+            } else {
+                $(".item_top .value span").hide();
+            }
+            var dStart = new Date(start * 1000).pattern('yyyy年MM月dd日');
+            var dEnd = new Date(end * 1000).pattern('yyyy年MM月dd日');
+            var sDuration = dStart + ' - ' + dEnd;
+            $('.extend_item .item_bottom span').text(sDuration);
+        }
+
+        initButton();
+        var startTime = 0;
+        var endTime = 0;
+
+        var subVipState = sessionStorage.getItem('sub_vip_state');
+        var reqData = JSON.parse(subVipState);
+        startTime = reqData.startTime;
+        endTime = reqData.endTime;
+
+        // 切换年月
+        $('.date_tab').on('click', '.date_tab_item', function () {
+            var i = $(this).index();
+            $(this).addClass('active').siblings().removeClass('active');
+            $('.bottom .con').eq(i).show().siblings().hide()
+            if (i === 0) {
+                flushShowTime(startTime, endTime, 2, parseInt($('.month_number').text().trim()));
+            } else {
+                flushShowTime(startTime, endTime, 1, parseInt($('.year_number.on').text().trim()));
+            }
+        });
+        // 选择不延长周期
+        $('.not_extend_label').on('change', '#notExtend', function () {
+            $('.switch_box').hide();
+            $('.bottom').hide();
+            $(".item_top .value span").hide();
+            flushShowTime(startTime, endTime);
+        });
+        // 选择延长周期
+        $('.is_extend_label').on('change', '#isExtend', function () {
+            $('.switch_box').show();
+            $('.bottom').show();
+            if ($(".switch_box .active").index() === 0) {
+                flushShowTime(startTime, endTime, 2, parseInt($('.month_number').text().trim()));
+            } else {
+                flushShowTime(startTime, endTime, 1, parseInt($('.year_number.on').text().trim()));
+            }
+        });
+        // 减法计算
+        $('.minus').click(function () {
+            var monthNumber = Number($('.month_number').text().trim());
+            $('.add').removeAttr('disabled');
+            monthNumber--;
+            $('.month_number').html(monthNumber)
+            if (monthNumber <= 1) {
+                monthNumber = 1;
+                $('.month_number').html(monthNumber)
+                $(this).attr('disabled', true)
+            }
+            flushShowTime(startTime, endTime, 2, parseInt($('.month_number').text().trim()));
+        })
+        // 加法计算
+        $('.add').click(function () {
+            var monthNumber = Number($('.month_number').text().trim());
+            $('.minus').removeAttr('disabled');
+            monthNumber++;
+            $('.month_number').html(monthNumber);
+            if (monthNumber >= 11) {
+                monthNumber = 11;
+                $('.month_number').html(monthNumber);
+                $(this).attr('disabled', true)
+            }
+            flushShowTime(startTime, endTime, 2, parseInt($('.month_number').text().trim()));
+        });
+        // 年份切换
+        $('.year').on('click', '.year_number', function () {
+            $(this).addClass('on').siblings().removeClass('on');
+            flushShowTime(startTime, endTime, 1, parseInt($('.year_number.on').text().trim()));
+        });
+
+        $("#cancel").click(function () {
+            window.history.go(-1);
+        });
+
+        // 提交修改
+        $('#enter').click(function () {
+            var isExtend = $('input[name="cycle"]:checked').val();
+            var monthParent = $('.month').parent('.con');
+            var yearParent = $('.year').parent('.con');
+            var monthNum = $('.month_number').text().trim();
+            var yearNum = $('.year_number.on').text().trim();
+            if (isExtend === "不延长周期") {
+                console.log("提交的内容为：" + isExtend);
+                sessionStorage.removeItem("vip_change_time");
+            } else {
+                if (!monthParent.is(':hidden')) {
+                    console.log("提交的内容为：" + isExtend + monthNum + '个月');
+                    sessionStorage.setItem("vip_change_time", monthNum + '个月');
+                }
+                if (!yearParent.is(':hidden')) {
+                    console.log("提交的内容为：" + isExtend + yearNum);
+                    sessionStorage.setItem("vip_change_time", yearNum);
+                }
+            }
+            window.history.go(-1);
+        });
+
+
+        //铺数据
+        var change = sessionStorage.getItem("vip_change_time");
+        //回显
+        if (!change) {
+            console.log("不延长");
+            //不延长
+            flushShowTime(startTime, endTime);
+            $("#notExtend").trigger("click");
+        } else {
+            $("#isExtend").trigger("click");
+            //延长
+            if (change.indexOf("月") > -1) {
+                $(".date_tab span:eq(0)").trigger("click");
+                var monthNum = parseInt(change.replace("个月", ""));
+                $(".month_number").text(monthNum);
+                if (monthNum === 1) {
+                    $('.minus').attr("disabled", "disabled");
+                }
+                if (monthNum === 11) {
+                    $('.add').attr("disabled", "disabled");
+                }
+                flushShowTime(startTime, endTime, 2, monthNum);
+            } else {
+                $(".date_tab span:eq(1)").trigger("click");
+                var yearNum = parseInt(change.replace("年", ""));
+                $(".year_number:eq(" + (yearNum - 1) + ")").trigger("click");
+                flushShowTime(startTime, endTime, 1, yearNum);
+            }
+        }
+
+
+    })
+</script>
+</body>
+
+</html>

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

@@ -9,7 +9,7 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <script src="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <link rel="stylesheet" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}"/>
+    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base2.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" href="/vipsubscribe/css/choose_industry.css?v={{Msg "seo" "version"}}">
 </head>
@@ -75,6 +75,12 @@
                         <button class="industry_item">公安</button>
                         <button class="industry_item">国资委</button>
                         <button class="industry_item">公共资源交易</button>
+                        <span class="wenhao">
+                                <i id="showTips" class="iconfont icon-wenhao show_tips"></i>
+                         </span>
+                        <div class="tips_detail" style="display: none;">
+                            订阅采购单位行业“公共资源交易”意味着订阅公共资源交易中心本单位采购的信息，并非所有单位通过公共资源交易中心发布的采购信息，敬请注意。
+                        </div>
                     </div>
                 </li>
                 <li class="list_item" id="H">
@@ -293,7 +299,7 @@
             $(".save-btn").removeAttr("disabled");
             flushPrice()//刷新价格
         } else {
-            $(".save-btn").attr("disabled","disabled");
+            $(".save-btn").attr("disabled", "disabled");
             flushPrice(-1)//刷新价格
         }
 
@@ -356,6 +362,11 @@
         findSelectedIndustry()
     })
 
+    $('#showTips').click(function (e) {
+        e.stopPropagation();
+        $('.tips_detail').slideToggle()
+    });
+
     // 重置按钮事件
     $('.reset-btn').on('click', function () {
         //$("#all .industry_item").trigger("click");

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

@@ -3,7 +3,8 @@
 
 <head>
     <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>关键词</title>
     <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
@@ -16,861 +17,899 @@
 </head>
 
 <body>
-    <div class="keyWord">
-        <section class="add-keyword-container" style="display: none;">
-            <div>
-                <div class="classify">
-                    <span class="classify-l">关键词分类</span>
-                    <span class="classify-r">
+<div class="keyWord">
+    <section class="add-keyword-container" style="display: none;">
+        <div>
+            <div class="classify">
+                <span class="classify-l">关键词分类</span>
+                <span class="classify-r">
                         <span class="classify-detail">未分类</span>
                         <span class="iconfont icon-arrow"></span>
                     </span>
-                </div>
-                <p class="classify-tips">
-                    关键词分类便于对同类别关键词做整合管理
-                </p>
-                <p class="classify-fast" style="display:none;">
-                    快速导入
-                </p>
             </div>
-            <section class="content">
-                <!-- 添加关键词 -->
-                <div class="enter addkeyWord" style="display: none;">
-                    <input type="text" class="enterOne" placeholder="请输入关键词" maxlength="20" />
-                    <!-- <textarea style="resize:none;" rows="1"  class="enterOne" name="" id=""  placeholder="请输入关键词" maxlength="100"></textarea> -->
-                    <div class="btnChoose" style="display:none;">
-                        <button onclick="toappendkey(this)">添加 附加词</button>
-                        <button onclick="tonotkey(this)">添加 排除词</button>
-                    </div>
-                    <div class="btn">
-                        <button onclick="Cancel()" style="width:49%;background:#fff;color:#2cb7ca;opacity: 1;">取消</button>
-                        <button disabled>确认</button>
-                    </div>
+            <p class="classify-tips">
+                关键词分类便于对同类别关键词做整合管理
+            </p>
+            <p class="classify-fast" style="display:none;">
+                快速导入
+            </p>
+        </div>
+        <section class="content">
+            <!-- 添加关键词 -->
+            <div class="enter addkeyWord" style="display: none;">
+                <input type="text" class="enterOne" placeholder="请输入关键词" maxlength="20"/>
+                <!-- <textarea style="resize:none;" rows="1"  class="enterOne" name="" id=""  placeholder="请输入关键词" maxlength="100"></textarea> -->
+                <div class="btnChoose" style="display:none;">
+                    <button onclick="toappendkey(this)">添加 附加词</button>
+                    <button onclick="tonotkey(this)">添加 排除词</button>
                 </div>
-
-                <!-- 添加关键词显示列表 -->
-                <div class="showKeyWord">
-                    <ul>
-                    </ul>
+                <div class="btn">
+                    <button onclick="Cancel()" style="width:49%;background:#fff;color:#2cb7ca;opacity: 1;">取消</button>
+                    <button disabled>确认</button>
                 </div>
+            </div>
 
-                <div class="problem">
-                    疑问解答 <i class="iconfont icon-wenhao"></i>
-                </div>
-            </section>
+            <!-- 添加关键词显示列表 -->
+            <div class="showKeyWord">
+                <ul>
+                </ul>
+            </div>
 
-            <div class="addKeyWord addNewKeyword">
-                <i class="iconfont icon-tianjia"  style="display:none;"></i>
-                <p> 关键词添加数量：<em style="color: #2cb7ca;" class="kws_count">0 </em>/ 300</p>
+            <div class="problem">
+                疑问解答 <i class="iconfont icon-wenhao"></i>
             </div>
         </section>
-        <section class="all-classify-column" style="display: none;">
-            <div class="keysexplain"><p> 关键词添加数量：<em style="color: #2cb7ca;" class="kws_count">0 </em> / 300</p></div>
-            <ul class="classify-list">
-                
-            </ul>
 
-            <div class="addKeyWord addNewKeyword"><div class="addClassify">新增关键词分类</div></div>
-        </section>
+        <div class="addKeyWord addNewKeyword">
+            <i class="iconfont icon-tianjia" style="display:none;"></i>
+            <p> 关键词添加数量：<em style="color: #2cb7ca;" class="kws_count">0 </em>/ 300</p>
+        </div>
+    </section>
+    <section class="all-classify-column" style="display: none;">
+        <div class="keysexplain"><p> 关键词添加数量：<em style="color: #2cb7ca;" class="kws_count">0 </em> / 300</p></div>
+        <ul class="classify-list">
 
-        <!-- 疑难问题弹窗 -->
-        <div class="problemPop dialog-container">
-            <div class="problemPopContent">
-                <h3>疑问解答</h3>
-                <ul>
-                    <li>
-                        <p>例：某公司主营业务为软件系统开发</p>
-                    </li>
-                    <li>
-                        <h4>关键词:</h4>
-                        <p>目标信息中的关键性词语，如“软件系统”</p>
-                    </li>
-                    <li>
-                        <h4>附加词:</h4>
-                        <p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
-                    </li>
-                    <li>
-                        <h4>排除词:</h4>
-                        <p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
-                    </li>
-                </ul>
-                <button class="knowBtn">我知道了</button>
-            </div>
+        </ul>
+
+        <div class="addKeyWord addNewKeyword">
+            <div class="addClassify">新增关键词分类</div>
         </div>
-        <!-- 关键词分类弹框 -->
-        <div class="classify-edit-pop dialog-container">
-            <!-- <div class="weui-mask weui-animate-fade-in"></div> -->
-            <div class="weui-dialog weui-animate-fade-in">
-                <div class="weui-dialog__hd">
-                    <strong class="weui-dialog__title">关键词分类</strong>
-                </div>
-                <div class="weui-dialog__bd">
-                    <input type="text" class="classify-keyword" maxlength="20" placeholder="输入分类名称">
-                </div>
-                <div class="weui-dialog__ft">
-                    <a href="javascript:;" class="dialog__btn dialog__btn_confirm opacity6">确定</a> 
-                    <a href="javascript:;" class="dialog__btn dialog__btn_cancel">取消</a>
-                </div>
+    </section>
+
+    <!-- 疑难问题弹窗 -->
+    <div class="problemPop dialog-container">
+        <div class="problemPopContent">
+            <h3>疑问解答</h3>
+            <ul>
+                <li>
+                    <p>例：某公司主营业务为软件系统开发</p>
+                </li>
+                <li>
+                    <h4>关键词:</h4>
+                    <p>目标信息中的关键性词语，如“软件系统”</p>
+                </li>
+                <li>
+                    <h4>附加词:</h4>
+                    <p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
+                </li>
+                <li>
+                    <h4>排除词:</h4>
+                    <p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
+                </li>
+            </ul>
+            <button class="knowBtn">我知道了</button>
+        </div>
+    </div>
+    <!-- 关键词分类弹框 -->
+    <div class="classify-edit-pop dialog-container">
+        <!-- <div class="weui-mask weui-animate-fade-in"></div> -->
+        <div class="weui-dialog weui-animate-fade-in">
+            <div class="weui-dialog__hd">
+                <strong class="weui-dialog__title">关键词分类</strong>
+            </div>
+            <div class="weui-dialog__bd">
+                <input type="text" class="classify-keyword" maxlength="20" placeholder="输入分类名称">
+            </div>
+            <div class="weui-dialog__ft">
+                <a href="javascript:;" class="dialog__btn dialog__btn_confirm opacity6">确定</a>
+                <a href="javascript:;" class="dialog__btn dialog__btn_cancel">取消</a>
             </div>
         </div>
+    </div>
 
-        <!-- 关键词分类说明 -->
-        <div class="classify-show-pop dialog-container">
-            <!-- <div class="weui-mask weui-animate-fade-in"></div> -->
-            <div class="weui-dialog weui-animate-fade-in">
-                <div class="weui-dialog__hd">
-                    <strong class="weui-dialog__title">提示信息</strong>
-                </div>
-                <div class="weui-dialog__bd">
-                    关键词分类有利于关键词做整合管理<br>工作更为高效！
-                </div>
-                <div class="weui-dialog__ft">
-                    <a href="javascript:;" class="dialog__btn dialog__btn_confirm">去设置</a> 
-                    <a href="javascript:;" class="dialog__btn dialog__btn_cancel">取消</a>
-                </div>
+    <!-- 关键词分类说明 -->
+    <div class="classify-show-pop dialog-container">
+        <!-- <div class="weui-mask weui-animate-fade-in"></div> -->
+        <div class="weui-dialog weui-animate-fade-in">
+            <div class="weui-dialog__hd">
+                <strong class="weui-dialog__title">提示信息</strong>
+            </div>
+            <div class="weui-dialog__bd">
+                关键词分类有利于关键词做整合管理<br>工作更为高效！
+            </div>
+            <div class="weui-dialog__ft">
+                <a href="javascript:;" class="dialog__btn dialog__btn_confirm">去设置</a>
+                <a href="javascript:;" class="dialog__btn dialog__btn_cancel">取消</a>
             </div>
         </div>
-        <!-- 快速导入说明 -->
-        <div class="classify-fast-pop dialog-container">
-            <!-- <div class="weui-mask weui-animate-fade-in"></div> -->
-            <div class="weui-dialog weui-animate-fade-in">
-                <div class="weui-dialog__hd">
-                    <strong class="weui-dialog__title">快速导入</strong>
-                </div>
-                <div class="weui-dialog__bd">
-                    快速导入可将免费版招标订阅内所设置的关键词及其排除词一并导入至“<span class="fastICName">未分类</span>”关键词分类内,无需再次手动输入，简化您的订阅过程。
-					<p style="color:#888;">注：地区与行业分类以VIP订阅设置内为准,不做导入。</p>
-                </div>
-                <div class="weui-dialog__ft">
-                    <a href="javascript:;" class="dialog__btn dialog__btn_confirm">确定</a> 
-                    <a href="javascript:;" class="dialog__btn dialog__btn_cancel">取消</a>
-                </div>
+    </div>
+    <!-- 快速导入说明 -->
+    <div class="classify-fast-pop dialog-container">
+        <!-- <div class="weui-mask weui-animate-fade-in"></div> -->
+        <div class="weui-dialog weui-animate-fade-in">
+            <div class="weui-dialog__hd">
+                <strong class="weui-dialog__title">快速导入</strong>
+            </div>
+            <div class="weui-dialog__bd">
+                快速导入可将免费版招标订阅内所设置的关键词及其排除词一并导入至“<span class="fastICName">未分类</span>”关键词分类内,无需再次手动输入，简化您的订阅过程。
+                <p style="color:#888;">注：地区与行业分类以VIP订阅设置内为准,不做导入。</p>
+            </div>
+            <div class="weui-dialog__ft">
+                <a href="javascript:;" class="dialog__btn dialog__btn_confirm">确定</a>
+                <a href="javascript:;" class="dialog__btn dialog__btn_cancel">取消</a>
             </div>
         </div>
     </div>
-    
-    <script src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/js/jquery.cookie.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-	{{include "/common/weixin.html"}}
-	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-    <script>
-		initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-        
-        var a_items = [];//全部数据
-        var a_items_m = [];//全部数据
-		var a_items_str = "";//关键词字符串
-        var classify_name = "";//分类名称
-        var classify_index = 0;//分类索引
-        var kws_name = "";//分类关键词内容
-        var kws_index = 0;//分类关键词索引
-        var kws_count = 0;//关键词个数
-        var modifyFlag = false;//附加词 排除词变动
-        var addition_kws = []; //附加词
-        var not_kws = []; //排除词
-        var classify_arr = [];//分类对象
-        var kws_arr = {};//所有关键词对象
-        var kws_tips = 0;
-		var fastimport = 0;//快速导入功能
-        // 页面状态
-        var pageState = {
-            //是否第一次设置关键词
-            isFirstSetKeyword: true
+</div>
+
+<script src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}"></script>
+<script src="{{Msg "seo" "cdn"}}/js/jquery.cookie.js?v={{Msg "seo" "version"}}"></script>
+<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+{{include "/common/weixin.html"}}
+<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+<script>
+    initShare({{.T.signature}},{{.T.openid}}, 2, "jy_extend",{{.T.nickname}},{{.T.avatar}});
+
+    var a_items = [];//全部数据
+    var a_items_m = [];//全部数据
+    var a_items_str = "";//关键词字符串
+    var classify_name = "";//分类名称
+    var classify_index = 0;//分类索引
+    var kws_name = "";//分类关键词内容
+    var kws_index = 0;//分类关键词索引
+    var kws_count = 0;//关键词个数
+    var modifyFlag = false;//附加词 排除词变动
+    var addition_kws = []; //附加词
+    var not_kws = []; //排除词
+    var classify_arr = [];//分类对象
+    var kws_arr = {};//所有关键词对象
+    var kws_tips = 0;
+    var fastimport = 0;//快速导入功能
+    // 页面状态
+    var pageState = {
+        //是否第一次设置关键词
+        isFirstSetKeyword: true
+    }
+
+    //
+    function Cancel() {
+        if ($(".showKeyWord li").length == 0) {
+            window.history.go(-1)
+        } else {
+            $(".content .addkeyWord").hide();
+            $(".add-keyword-container .addNewKeyword i").show();
         }
-		//
-		function Cancel(){
-			if($(".showKeyWord li").length==0){
-				window.history.go(-1)
-			}else{
-				$(".content .addkeyWord").hide();
-                $(".add-keyword-container .addNewKeyword i").show();
-			}
-		}
-		//
-		function initSess(){
-			weui.loading();
-	        setTimeout(function(){
-	            weui.loading().hide();
-	            if(window.location.search.indexOf("page=2")>-1){
-					history.replaceState("{id:1}","","/front/vipsubscribe/toSetKeyWordPage")
-	            }else if(history.state){
-	                window.history.go(-1)
-				}
-	        },500)
-		}
-		//
-        $(function(){
-			var isinitpage = false;
-			$(window).bind("pageshow", function(event){
-				if(event.originalEvent.persisted){
-					initpage();
-					isinitpage = true;
-					initSess();
-					reloadFunc();
-				}
-			});
-			if(!isinitpage) {
-				initpage();
-				initSess();
-				reloadFunc();
-			}
-			window.addEventListener('popstate', function(event){
-				if(!isinitpage){
-					if(a_items.length==0){
-		                window.history.go(-1)
-		            }
-		            var loading = weui.loading('', {
-		                className: 'custom-classname'
-		            })
-		            $('.classify-show-pop').hide();
-		            $('.classify-edit-pop').hide();
-		            //重新加载数据
-		            initpage();
-		            // 用定时器模拟请求耗时
-		            setTimeout(function () {
-		                loading.hide(function() {
-		                    console.log('loading has been hidden');
-		                })
-		                // 判断是否是第一次(没有关键词进入)
-		                // 隐藏关键词列表section，显示分类列表section
-		                var isClassifyColumnShow = $('.add-keyword-container').is(':hidden')
-		                if (!isClassifyColumnShow) {
-		                    $('.add-keyword-container').hide()
-		                    $('.all-classify-column').show()
-		                }
-		            }, 500)
-				}
-				isinitpage = false
-			})
-            // 关键词分类 - 去设置按钮点击事件
-            $('.classify-show-pop .dialog__btn_confirm').on('click', function() {
-                $('.classify-show-pop').hide();
-                setTimeout(function(){
-                    modalOne();
-                },200)
-            })
-            // 关键词分类 - 取消按钮点击事件
-            $('.classify-show-pop .dialog__btn_cancel').on('click', function() {
-				$('.enterOne').focus();
-                $('.classify-show-pop').hide();
-            })
-        })
-        //获取数据
-        function initpage(){
-            if(sessionStorage&&sessionStorage.kwspage){
-                if(sessionStorage.addition_kws!=undefined){
-                    addition_kws = JSON.parse(sessionStorage.addition_kws);
-                }
-                if(sessionStorage.not_kws!=undefined){
-                    not_kws = JSON.parse(sessionStorage.not_kws);
+    }
+
+    //
+    function initSess() {
+        weui.loading();
+        setTimeout(function () {
+            weui.loading().hide();
+            if (window.location.search.indexOf("page=2") > -1) {
+                history.replaceState("{id:1}", "", "/front/vipsubscribe/toSetKeyWordPage")
+            } else if (history.state) {
+                window.history.go(-1)
+            }
+        }, 500)
+    }
+
+    //
+    $(function () {
+        var isinitpage = false;
+        $(window).bind("pageshow", function (event) {
+            if (event.originalEvent.persisted) {
+                initpage();
+                isinitpage = true;
+                initSess();
+                reloadFunc();
+            }
+        });
+        if (!isinitpage) {
+            initpage();
+            initSess();
+            reloadFunc();
+        }
+        window.addEventListener('popstate', function (event) {
+            if (!isinitpage) {
+                if (a_items.length == 0) {
+                    window.history.go(-1)
                 }
-                showKorshowC(sessionStorage.kwspage);
-                a_items = JSON.parse(sessionStorage.a_items);
-				a_items_m = JSON.parse(sessionStorage.a_items);
-				a_items_str = sessionStorage.a_items_str;
-				console.log("a_items_str:"+a_items_str)
-                kws_arr = JSON.parse(sessionStorage.kws_arr);
-                classify_name = sessionStorage.classify_name;
-                classify_index = sessionStorage.classify_index;
-                kws_name = sessionStorage.kws_name;
-                kws_index = sessionStorage.kws_index;
-                modifyFlag = true;
-                kws_count = sessionStorage.kws_count;
-				fastimport = parseInt(sessionStorage.fastimport);
-				if(fastimport==0){
-					$(".classify-fast").show();
-				}else{
-					$(".classify-fast").hide();
-				}
-                $(".kws_count").text(kws_count);
-               $(".add-keyword-container .addNewKeyword i").hide();
-                toSetKws();
-            }else{
-                //获取用户设置信息类型
-                $.post("/subscribepay/afterPay/getUserInfo",{},function(r){
-                    if(r.userData){
-                        var _userData = r.userData;
-                        var _vipData = _userData["o_vipjy"];
-						var ordinarykc = parseInt(_userData["ordinarykc"])
-						fastimport = parseInt(_userData["i_vip_fastimport"]);
-						if(fastimport==0&&ordinarykc>0){
-							sessionStorage.fastimport = fastimport;
-							$(".classify-fast").show();
-						}else{
-							sessionStorage.fastimport = 1;
-							$(".classify-fast").hide();
-						}
-                        modifyFlag = false;
-                        if (_vipData["a_items"]!=undefined&&_vipData["a_items"].length>0){
-                            a_items = _vipData["a_items"]
-							a_items_m = _vipData["a_items"]
-                            pageState.isFirstSetKeyword = false;
-                            appendHtml(a_items);
-                        }else{
-                            pageState.isFirstSetKeyword = true;
-                        }
-						if(sessionStorage.a_items_str==undefined){
-							a_items_str = items_str(a_items_m);
-           					sessionStorage.a_items_str = a_items_str;//当前数据string
-						}else{
-							a_items_str = sessionStorage.a_items_str;
-						}
-                        hasWords();
-                    }else{
-                        pageState.isFirstSetKeyword = true;
-                    }
-                    showKorshowC(pageState.isFirstSetKeyword);
+                var loading = weui.loading('', {
+                    className: 'custom-classname'
                 })
+                $('.classify-show-pop').hide();
+                $('.classify-edit-pop').hide();
+                //重新加载数据
+                initpage();
+                // 用定时器模拟请求耗时
+                setTimeout(function () {
+                    loading.hide(function () {
+                        console.log('loading has been hidden');
+                    })
+                    // 判断是否是第一次(没有关键词进入)
+                    // 隐藏关键词列表section，显示分类列表section
+                    var isClassifyColumnShow = $('.add-keyword-container').is(':hidden')
+                    if (!isClassifyColumnShow) {
+                        $('.add-keyword-container').hide()
+                        $('.all-classify-column').show()
+                    }
+                }, 500)
             }
-        }
-		//
-		function items_str(_items){
-			if(_items.length==0){
-				return ""
-			}
-			var items_str = "";
-			for (var a = 0;  a < _items.length; a++) {
-                items_str += _items[a]["s_item"]
-                var a_key = _items[a]["a_key"]
-                for(var b=0;b<a_key.length;b++){
-					items_str += a_key[b]["key"].join('');
-					if(a_key[b]["appendkey"]!=undefined&&a_key[b]["appendkey"]!=""){
-						items_str += a_key[b]["appendkey"].join('');
-					}
-					if(a_key[b]["notkey"]!=undefined&&a_key[b]["notkey"]!=""){
-						items_str += a_key[b]["notkey"].join('');
-					}
-				}
-			}
-			return items_str
-		}
-        //强制弹出 提示信息
-        function showMeg(){
-            // 如果是苹果手机，打开时候要设置top
-            var agent = navigator.userAgent.toLowerCase();
-            var dialog = $('.classify-show-pop .weui-dialog')
-            if( /iphone|ipod|ipad|ios/.test(agent) ){
-                dialog.css({ 'top': '30%' })
+            isinitpage = false
+        })
+        // 关键词分类 - 去设置按钮点击事件
+        $('.classify-show-pop .dialog__btn_confirm').on('click', function () {
+            $('.classify-show-pop').hide();
+            setTimeout(function () {
+                modalOne();
+            }, 200)
+        })
+        // 关键词分类 - 取消按钮点击事件
+        $('.classify-show-pop .dialog__btn_cancel').on('click', function () {
+            $('.enterOne').focus();
+            $('.classify-show-pop').hide();
+        })
+    })
+
+    //获取数据
+    function initpage() {
+        if (sessionStorage && sessionStorage.kwspage) {
+            if (sessionStorage.addition_kws != undefined) {
+                addition_kws = JSON.parse(sessionStorage.addition_kws);
+            }
+            if (sessionStorage.not_kws != undefined) {
+                not_kws = JSON.parse(sessionStorage.not_kws);
+            }
+            showKorshowC(sessionStorage.kwspage);
+            a_items = JSON.parse(sessionStorage.a_items);
+            a_items_m = JSON.parse(sessionStorage.a_items);
+            a_items_str = sessionStorage.a_items_str;
+            console.log("a_items_str:" + a_items_str)
+            kws_arr = JSON.parse(sessionStorage.kws_arr);
+            classify_name = sessionStorage.classify_name;
+            classify_index = sessionStorage.classify_index;
+            kws_name = sessionStorage.kws_name;
+            kws_index = sessionStorage.kws_index;
+            modifyFlag = true;
+            kws_count = sessionStorage.kws_count;
+            fastimport = parseInt(sessionStorage.fastimport);
+            if (fastimport == 0) {
+                $(".classify-fast").show();
             } else {
-                dialog.css({ 'top': '50%' })
+                $(".classify-fast").hide();
             }
-            $('.classify-show-pop').show()
+            $(".kws_count").text(kws_count);
+            $(".add-keyword-container .addNewKeyword i").hide();
+            toSetKws();
+        } else {
+            //获取用户设置信息类型
+            $.post("/subscribepay/afterPay/getUserInfo", {}, function (r) {
+                if (r.userData) {
+                    var _userData = r.userData;
+                    var _vipData = _userData["o_vipjy"];
+                    var ordinarykc = parseInt(_userData["ordinarykc"])
+                    fastimport = parseInt(_userData["i_vip_fastimport"]);
+                    if (fastimport == 0 && ordinarykc > 0) {
+                        sessionStorage.fastimport = fastimport;
+                        $(".classify-fast").show();
+                    } else {
+                        sessionStorage.fastimport = 1;
+                        $(".classify-fast").hide();
+                    }
+                    modifyFlag = false;
+                    if (_vipData["a_items"] != undefined && _vipData["a_items"].length > 0) {
+                        a_items = _vipData["a_items"]
+                        a_items_m = _vipData["a_items"]
+                        pageState.isFirstSetKeyword = false;
+                        appendHtml(a_items);
+                    } else {
+                        pageState.isFirstSetKeyword = true;
+                    }
+                    if (sessionStorage.a_items_str == undefined) {
+                        a_items_str = items_str(a_items_m);
+                        sessionStorage.a_items_str = a_items_str;//当前数据string
+                    } else {
+                        a_items_str = sessionStorage.a_items_str;
+                    }
+                    hasWords();
+                } else {
+                    pageState.isFirstSetKeyword = true;
+                }
+                showKorshowC(pageState.isFirstSetKeyword);
+            })
         }
-        //关键词和分类列表切换
-        function showKorshowC(state){
-            if (state) {
-                $('.add-keyword-container').show()
-                $('.all-classify-column').hide()
-            	$(".addClassify").hide();
-            } else {
-                $('.add-keyword-container').hide()
-                $('.all-classify-column').show()
-            	$(".addClassify").show();
-                $(".add-keyword-container .addNewKeyword i").hide();
+    }
+
+    //
+    function items_str(_items) {
+        if (_items.length == 0) {
+            return ""
+        }
+        var items_str = "";
+        for (var a = 0; a < _items.length; a++) {
+            items_str += _items[a]["s_item"]
+            var a_key = _items[a]["a_key"]
+            for (var b = 0; b < a_key.length; b++) {
+                items_str += a_key[b]["key"].join('');
+                if (a_key[b]["appendkey"] != undefined && a_key[b]["appendkey"] != "") {
+                    items_str += a_key[b]["appendkey"].join('');
+                }
+                if (a_key[b]["notkey"] != undefined && a_key[b]["notkey"] != "") {
+                    items_str += a_key[b]["notkey"].join('');
+                }
             }
         }
-        //分类列表
-        function appendHtml(kwsdata){
-            kws_count = 0;
-            var classifyHtml = '';
-            classify_arr = [];//每次初始化分类对象
-			kws_arr = {};//每次初始化关键词对象
-            for (var i = 0;  i < kwsdata.length; i++) {
-                var s_item = kwsdata[i]["s_item"]
-                if(s_item==""){
-                    s_item = "未分类"
+        return items_str
+    }
+
+    //强制弹出 提示信息
+    function showMeg() {
+        // 如果是苹果手机，打开时候要设置top
+        var agent = navigator.userAgent.toLowerCase();
+        var dialog = $('.classify-show-pop .weui-dialog')
+        if (/iphone|ipod|ipad|ios/.test(agent)) {
+            dialog.css({'top': '30%'})
+        } else {
+            dialog.css({'top': '50%'})
+        }
+        $('.classify-show-pop').show()
+    }
+
+    //关键词和分类列表切换
+    function showKorshowC(state) {
+        if (state) {
+            $('.add-keyword-container').show()
+            $('.all-classify-column').hide()
+            $(".addClassify").hide();
+        } else {
+            $('.add-keyword-container').hide()
+            $('.all-classify-column').show()
+            $(".addClassify").show();
+            $(".add-keyword-container .addNewKeyword i").hide();
+        }
+    }
+
+    //分类列表
+    function appendHtml(kwsdata) {
+        kws_count = 0;
+        var classifyHtml = '';
+        classify_arr = [];//每次初始化分类对象
+        kws_arr = {};//每次初始化关键词对象
+        for (var i = 0; i < kwsdata.length; i++) {
+            var s_item = kwsdata[i]["s_item"]
+            if (s_item == "") {
+                s_item = "未分类"
+            }
+            classify_arr.push(s_item);
+            var a_key = kwsdata[i]["a_key"]
+            kws_count += a_key.length;
+            var keystr = '';
+            for (var j = 0; j < a_key.length; j++) {
+                if (keystr != "") {
+                    keystr += "、"
                 }
-                classify_arr.push(s_item);
-                var a_key = kwsdata[i]["a_key"]
-                kws_count += a_key.length;
-                var keystr = '';
-                for(var j=0;j<a_key.length;j++){
-                    if(keystr!=""){
-                        keystr += "、"
-                    }
-                    keystr += a_key[j]["key"].join(' ');
-					kws_arr[a_key[j]["key"].join(' ')]=j+"-"+i
-                } 
-                classifyHtml +='<li class="classify-item">'
-                            +'<div><span class="classify-item-l">'+s_item+'</span>'
-                            +'<span class="classify-item-r">'
-                            +'<span class="classify-item-detail">关键词'+a_key.length+'个</span>'
-                            +'<span class="iconfont icon-arrow"></span>'
-                            +'</span></div>'
-                            +'<div class="classifyKeysShow">'+keystr+'</div>'
-                            +'</li>'
+                keystr += a_key[j]["key"].join(' ');
+                kws_arr[a_key[j]["key"].join(' ')] = j + "-" + i
+            }
+            classifyHtml += '<li class="classify-item">'
+                + '<div><span class="classify-item-l">' + s_item + '</span>'
+                + '<span class="classify-item-r">'
+                + '<span class="classify-item-detail">关键词' + a_key.length + '个</span>'
+                + '<span class="iconfont icon-arrow"></span>'
+                + '</span></div>'
+                + '<div class="classifyKeysShow">' + keystr + '</div>'
+                + '</li>'
+
+        }
+        if (classifyHtml != "") {
+            $(".classify-list").html(classifyHtml);
+        }
+        $(".kws_count").text(kws_count);
+    }
 
+    //是否有关键词
+    function hasWords() {
+        var showKeyWordLength = $(".showKeyWord ul").find('li').length;
+        var modifyShow = false
+        $(".showKeyWord li").each(function () {
+            if (!$(this).find(".modify").is(":hidden")) {
+                modifyShow = true
+                return false;
             }
-            if(classifyHtml!=""){
-                $(".classify-list").html(classifyHtml);
+        })
+        if (showKeyWordLength === 0) {
+            $(".content .addkeyWord").show();
+            $(".add-keyword-container .addNewKeyword i").hide();
+        } else {
+            $(".content .addkeyWord").hide();
+            if (!modifyShow) {
+                $(".add-keyword-container .addNewKeyword i").show();
             }
-            $(".kws_count").text(kws_count);
         }
-        //是否有关键词
-        function hasWords() {
-            var showKeyWordLength = $(".showKeyWord ul").find('li').length;
-			var modifyShow = false
-			$(".showKeyWord li").each(function(){
-				if(!$(this).find(".modify").is(":hidden")){
-					modifyShow = true
-					return false;
-				}
-			})
-            if (showKeyWordLength === 0) {
-                $(".content .addkeyWord").show();
-				$(".add-keyword-container .addNewKeyword i").hide();
+    }
+
+    //修改关键词内容
+    function toSetKws() {
+        //分类列表进入
+        if (kws_index == -1) {
+            var edhtml = '<input type="text" class="enterOne" placeholder="请输入关键词" maxlength="20">'
+                + '<div class="btnChoose">'
+            if (addition_kws.length > 0) {
+                edhtml += '<button onclick="toappendkey(this)">编辑 附加词<i>(' + addition_kws.length + ')</i></button>'
             } else {
-                $(".content .addkeyWord").hide();
-				if(!modifyShow){
-					$(".add-keyword-container .addNewKeyword i").show();
-				}
+                edhtml += '<button onclick="toappendkey(this)">添加 附加词</button>'
             }
+            if (not_kws.length > 0) {
+                edhtml += '<button onclick="tonotkey(this)">编辑 排除词<i>(' + not_kws.length + ')</i></button>'
+            } else {
+                edhtml += '<button onclick="tonotkey(this)">添加 排除词</button>'
+            }
+            edhtml += '</div>'
+                + '<div class="btn">'
+                + '<button onclick="Cancel()" style="width:49%;background:#fff;color:#2cb7ca;opacity: 1;">取消</button>'
+                + '<button style="opacity: 1;">确认</button>'
+                + '</div>'
+            $(".enter.addkeyWord").html(edhtml);
+            setTimeout(function () {
+                $(".enter.addkeyWord").find("input").val(kws_name)
+                $(".enter.addkeyWord").show();
+            }, 200)
+        }
+        if (classify_name == "") {
+            $(".classify-detail").text("未分类");
+        } else {
+            $(".classify-detail").text(classify_name);
         }
-        //修改关键词内容
-        function toSetKws(){
-            //分类列表进入
-            if(kws_index==-1){
-                var edhtml = '<input type="text" class="enterOne" placeholder="请输入关键词" maxlength="20">'
-                            +'<div class="btnChoose">'
-                if(addition_kws.length>0){
-                    edhtml +='<button onclick="toappendkey(this)">编辑 附加词<i>('+addition_kws.length+')</i></button>'
-                }else{
-                    edhtml +='<button onclick="toappendkey(this)">添加 附加词</button>'
+        var kwsHtml = '';
+        if (a_items[classify_index] != undefined) {
+            var _keyArr = a_items[classify_index]["a_key"];
+            //未分类 关键词强制提醒标识
+            kws_tips = a_items[classify_index]["i_tips"];
+            if (kws_tips == undefined) {
+                kws_tips = 0;
+            }
+            if (kws_tips == 0 && classify_name.indexOf("未分类") > -1 && window.location.search.indexOf("page=2") < 0) {
+                //第一次进来分类提示
+                showMeg();
+                var param = {};
+                param.classify_index = classify_index;
+                param.kws_tips = 1;
+                $.post("/subscribepay/afterPay/updateUserTips", param, function (r) {
+                    if (r.flag) {
+                        kws_tips = param.kws_tips;
+                        $(".classify").attr("tips", kws_tips);
+                    }
+                })
+            }
+            for (var i = _keyArr.length - 1; i >= 0; i--) {
+                var ak_showClass = 'hide';//是否显示附加词个数
+                var nk_showClass = 'hide';//是否显示排除词个数
+                var ak_remark = '添加';
+                var nk_remark = '添加';
+                var appendkeylth = 0;
+                var notkeylth = 0;
+                kwsHtml += '<li>'
+                if (modifyFlag && i == kws_index) {
+                    kwsHtml += '<div class="one" style="display:none;">'
+                    _keyArr[i]["appendkey"] = addition_kws;
+                    _keyArr[i]["notkey"] = not_kws;
+                } else {
+                    kwsHtml += '<div class="one" style="">'
+                }
+                kwsHtml += '<div>'
+                    + '<span><strong> 关键词：</strong>'
+                    + '<p class="key">' + _keyArr[i]["key"].join(" ") + '</p></span>'
+                if (_keyArr[i]["appendkey"] != undefined && _keyArr[i]["appendkey"].length > 0) {
+                    ak_showClass = "";
+                    ak_remark = '编辑';
+                    appendkeylth = _keyArr[i]["appendkey"].length;
+                    kwsHtml += '<span>'
+                        + '<strong> 附加词：</strong>'
+                        + '<p class="addition">' + _keyArr[i]["appendkey"].join(" ") + '</p>'
+                        + '</span>'
                 }
-                if(not_kws.length>0){
-                    edhtml +='<button onclick="tonotkey(this)">编辑 排除词<i>('+not_kws.length+')</i></button>'
-                }else{
-                    edhtml +='<button onclick="tonotkey(this)">添加 排除词</button>'
+                if (_keyArr[i]["notkey"] != undefined && _keyArr[i]["notkey"].length > 0) {
+                    nk_showClass = "";
+                    nk_remark = '编辑';
+                    notkeylth = _keyArr[i]["notkey"].length;
+                    kwsHtml += '<span>'
+                        + '<strong> 排除词：</strong>'
+                        + '<p class="notkey">' + _keyArr[i]["notkey"].join(" ") + '</p>'
+                        + '</span>'
                 }
-                edhtml +='</div>'
-                        +'<div class="btn">'
-						+'<button onclick="Cancel()" style="width:49%;background:#fff;color:#2cb7ca;opacity: 1;">取消</button>'
-                        +'<button style="opacity: 1;">确认</button>'
-                        +'</div>'
-                $(".enter.addkeyWord").html(edhtml);
-                setTimeout(function(){
-                    $(".enter.addkeyWord").find("input").val(kws_name)
-                    $(".enter.addkeyWord").show();
-                },200)
+                var p = kws_arr[_keyArr[i]["key"].join(" ")].split("-")[0]
+                kwsHtml += '</div>'
+                    + '<button class="editKeyWord" dataIndex="' + p + '"><i class="iconfont icon-xiugai"></i> 修改</button>'
+                    + '</div>'
+
+                if (modifyFlag && i == kws_index) {
+                    kwsHtml += '<div class="modify" style="display:block;">'
+                    if (addition_kws.length > 0) {
+                        appendkeylth = addition_kws.length;
+                    }
+                    if (not_kws.length > 0) {
+                        notkeylth = not_kws.length;
+                    }
+                } else {
+                    kwsHtml += '<div class="modify" style="display: none;">'
+                }
+                kwsHtml += '<textarea name="" rows="1" placeholder="" maxlength="20">' + _keyArr[i]["key"].join(" ") + '</textarea>'
+                    + '<button class="addAdjunctWord" onclick="toappendkey(this)">' + ak_remark + ' 附加词 <i class="appendkey ' + ak_showClass + '">(' + appendkeylth + ')</i></button>'
+                    + '<button class="addExclusion" onclick="tonotkey(this)">' + nk_remark + ' 排除词 <i class="notkey ' + nk_showClass + '">(' + notkeylth + ')</i></button>'
+                    + '<button class="deleteKey">删除</button>'
+                    + '<button class="ascertainKey" dataIndex="' + p + '" onclick="saveK(this)">确定</button>'
+                    + '</div>'
+                    + '</li>'
             }
-            if(classify_name==""){
-                $(".classify-detail").text("未分类");
-            }else{
-                $(".classify-detail").text(classify_name);
+            $(".showKeyWord ul").html(kwsHtml);
+        }
+        hasWords();
+        // 发送请求刷新数据，在ajax回调中执行
+        $('.add-keyword-container').show();
+        $('.all-classify-column').hide();
+        clearSesstion();
+    }
+
+    //跳转附加词
+    function toappendkey(th) {
+        if (!$('.enter.addkeyWord').is(':hidden')) {
+            if ($.trim($('.addkeyWord input.enterOne').val()) == "") {
+                return
             }
-            var kwsHtml = '';
-            if( a_items[classify_index]!=undefined){
-                var _keyArr = a_items[classify_index]["a_key"];
-                //未分类 关键词强制提醒标识
-                kws_tips = a_items[classify_index]["i_tips"];
-                if(kws_tips==undefined){
-                    kws_tips = 0;
-                }
-				if (kws_tips==0&&classify_name.indexOf("未分类")>-1&&window.location.search.indexOf("page=2")<0){
-	                //第一次进来分类提示
-	                showMeg();
-					var param = {};
-                    param.classify_index = classify_index;
-                    param.kws_tips = 1;
-                    $.post("/subscribepay/afterPay/updateUserTips",param,function(r){
-                        if(r.flag){
-                            kws_tips = param.kws_tips;
-                            $(".classify").attr("tips",kws_tips);
-                        }
-                    })
-				}
-                for (var i = _keyArr.length - 1; i >= 0; i--) {
-                    var ak_showClass = 'hide';//是否显示附加词个数
-                    var nk_showClass = 'hide';//是否显示排除词个数
-                    var ak_remark = '添加';
-                    var nk_remark = '添加';
-                    var appendkeylth = 0;
-                    var notkeylth = 0;
-                    kwsHtml +='<li>'
-                    if(modifyFlag&&i==kws_index){
-                        kwsHtml +='<div class="one" style="display:none;">'
-                        _keyArr[i]["appendkey"] = addition_kws;
-                        _keyArr[i]["notkey"] = not_kws;
-                    }else{
-                        kwsHtml +='<div class="one" style="">'
+            kws_index = -1
+            kws_name = $.trim($('.addkeyWord input.enterOne').val());
+        } else {
+            if ($.trim($(th).parent(".modify").find("textarea").val()) == "") {
+                return
+            }
+            kws_name = $.trim($(th).parent(".modify").find("textarea").val());
+        }
+        history.replaceState("", "", "/front/vipsubscribe/toSetKeyWordPage?page=243")
+        setSesstion();
+        window.location.href = "/front/vipsubscribe/toSetadditionPage";
+    }
+
+    //
+    function tonotkey(th) {
+        if (!$('.enter.addkeyWord').is(':hidden')) {
+            if ($.trim($('.addkeyWord input.enterOne').val()) == "") {
+                return
+            }
+            kws_index = -1
+            kws_name = $.trim($('.addkeyWord input.enterOne').val());
+        } else {
+            if ($.trim($(th).parent(".modify").find("textarea").val()) == "") {
+                return
+            }
+            kws_name = $.trim($(th).parent(".modify").find("textarea").val());
+        }
+        history.replaceState("", "", "/front/vipsubscribe/toSetKeyWordPage?page=243")
+        setSesstion();
+        window.location.href = '/front/vipsubscribe/toSetexclusivePage';
+    }
+
+    //保存缓存
+    function setSesstion() {
+        sessionStorage.kwspage = true;//关键词页面标识
+        sessionStorage.kws_name = kws_name;//当前关键词
+        sessionStorage.classify_name = classify_name;//当前分类
+        sessionStorage.kws_index = kws_index;//当前关键词索引
+        sessionStorage.classify_index = classify_index;//当前分类索引
+        sessionStorage.a_items = JSON.stringify(a_items);//当前数据
+        sessionStorage.addition_kws = JSON.stringify(addition_kws);//当前编辑关键词附加词
+        sessionStorage.not_kws = JSON.stringify(not_kws);//当前编辑关键词排除词
+        sessionStorage.kws_arr = JSON.stringify(kws_arr);//当前所有关键词排
+
+        sessionStorage.kws_count = kws_count;//关键词个数
+    }
+
+    //
+    function clearSesstion() {
+        if (!sessionStorage) {
+            return;
+        }
+        sessionStorage.removeItem("kwspage");
+        sessionStorage.removeItem("kws_name");
+        sessionStorage.removeItem("classify_name");
+        sessionStorage.removeItem("kws_index");
+        sessionStorage.removeItem("classify_index");
+        sessionStorage.removeItem("a_items");
+        sessionStorage.removeItem("addition_kws");
+        sessionStorage.removeItem("not_kws");
+        sessionStorage.removeItem("kws_count");
+        sessionStorage.removeItem("kws_arr");
+    }
+
+    //保存关键词
+    function saveK(th) {
+        setTimeout(function () {
+            var $this = $(th);
+            kws_name = $.trim($(th).siblings('textarea').val());
+            if (kws_name == "") {
+                weui.toast('您设置的关键词不能为空，请调整后再添加。', {
+                    duration: 2000,
+                    className: 'custom-toast',
+                    callback: function () {
+                        console.log('close')
                     }
-                    kwsHtml +='<div>'
-                                +'<span><strong> 关键词：</strong>'
-                                +'<p class="key">'+_keyArr[i]["key"].join(" ")+'</p></span>'
-                    if (_keyArr[i]["appendkey"]!=undefined&&_keyArr[i]["appendkey"].length>0){
-                        ak_showClass = "";
-                        ak_remark = '编辑';
-                        appendkeylth = _keyArr[i]["appendkey"].length;
-                        kwsHtml +='<span>'
-                                    +'<strong> 附加词：</strong>'
-                                    +'<p class="addition">'+_keyArr[i]["appendkey"].join(" ")+'</p>'
-                                    +'</span>'
+                });
+                return
+            }
+            var _index = Number($this.attr("dataindex"));
+            if (kws_arr[kws_name] != undefined && kws_arr[kws_name] != (_index + "-" + classify_index)) {
+                weui.toast('您设置的关键词已存在，请调整后再添加。', {
+                    duration: 2000,
+                    className: 'custom-toast',
+                    callback: function () {
+                        console.log('close')
                     }
-                    if (_keyArr[i]["notkey"]!=undefined&&_keyArr[i]["notkey"].length>0){
-                        nk_showClass = "";
-                        nk_remark = '编辑';
-                        notkeylth = _keyArr[i]["notkey"].length;
-                        kwsHtml +='<span>'
-                                    +'<strong> 排除词：</strong>'
-                                    +'<p class="notkey">'+_keyArr[i]["notkey"].join(" ")+'</p>'
-                                    +'</span>'
+                });
+                return
+            }
+            if (kws_name.length > 20) {
+                weui.toast('关键词不能超过20字', {
+                    duration: 2000,
+                    className: 'custom-toast',
+                    callback: function () {
+                        console.log('close')
                     }
-					var p = kws_arr[_keyArr[i]["key"].join(" ")].split("-")[0]
-                    kwsHtml +='</div>'
-                                +'<button class="editKeyWord" dataIndex="'+p+'"><i class="iconfont icon-xiugai"></i> 修改</button>'
-                                +'</div>'
-                     
-                    if(modifyFlag&&i==kws_index){
-                        kwsHtml +='<div class="modify" style="display:block;">'
-                        if(addition_kws.length>0){
-                            appendkeylth = addition_kws.length;
-                        }
-                        if(not_kws.length>0){
-                            notkeylth = not_kws.length;
+                });
+            } else {
+                if (saveData('SK')) {
+                    //$this.attr("dataindex",kws_index);
+                    $this.parent().siblings().find('.key').text(kws_name)
+                    $this.parent().hide().siblings().show()
+                    $(".add-keyword-container .addNewKeyword i").show();
+                    //
+                    doSessionData("", _index);
+                    //把kws_name,kws_index,addition_kws,not_kws初始化
+                    kws_index = 0;
+                    kws_name = "";
+                    addition_kws = [];
+                    not_kws = [];
+                } else {
+                    weui.toast('保存出错，稍后再试', {
+                        duration: 2000,
+                        className: 'custom-toast',
+                        callback: function () {
+                            console.log('close')
                         }
-                    }else{
-                        kwsHtml +='<div class="modify" style="display: none;">'
-                    }
-                    kwsHtml +='<textarea name="" rows="1" placeholder="" maxlength="20">'+_keyArr[i]["key"].join(" ")+'</textarea>'
-                                +'<button class="addAdjunctWord" onclick="toappendkey(this)">'+ak_remark+' 附加词 <i class="appendkey '+ak_showClass+'">('+appendkeylth+')</i></button>'
-                                +'<button class="addExclusion" onclick="tonotkey(this)">'+nk_remark+' 排除词 <i class="notkey '+nk_showClass+'">('+notkeylth+')</i></button>'
-                                +'<button class="deleteKey">删除</button>'
-                                +'<button class="ascertainKey" dataIndex="'+p+'" onclick="saveK(this)">确定</button>'
-                                +'</div>'
-                                +'</li>'
+                    });
                 }
-                $(".showKeyWord ul").html(kwsHtml);
             }
-            hasWords();
-            // 发送请求刷新数据，在ajax回调中执行
-            $('.add-keyword-container').show();
-            $('.all-classify-column').hide();
-            clearSesstion();
-        }
-        //跳转附加词
-        function toappendkey(th){
-            if(!$('.enter.addkeyWord').is(':hidden')){
-                if($.trim($('.addkeyWord input.enterOne').val())==""){
-                    return
+        }, 150)
+    }
+
+    //保存数据
+    function saveData(actionType) {
+        var _flag = false;
+        var param = {};
+        param.pageType = "keyWords";
+        param.classify_index = classify_index;
+        param.classify_name = classify_name;
+        param.kws_index = kws_index;
+        param.kws_name = kws_name;
+        param.actionType = actionType;
+        param.addition_kws = addition_kws;
+        param.not_kws = not_kws;
+        param.kwscount = $(".content .showKeyWord li").length;
+        $.ajax({
+            type: "POST",
+            url: "/subscribepay/afterPay/setUserInfo",
+            data: param,
+            dataType: "json",
+            async: false,
+            traditional: true,
+            success: function (r) {
+                if (r.flag) {
+                    console.log("保存成功")
+                    _flag = r.flag;
                 }
-                kws_index = -1
-                kws_name = $.trim($('.addkeyWord input.enterOne').val());
-            }else{
-               if($.trim($(th).parent(".modify").find("textarea").val())==""){
-                 return
-               }
-                kws_name = $.trim($(th).parent(".modify").find("textarea").val());
             }
-			history.replaceState("","","/front/vipsubscribe/toSetKeyWordPage?page=243")
-            setSesstion();
-            window.location.href="/front/vipsubscribe/toSetadditionPage";
-        }
-        //
-        function tonotkey(th){
-            if(!$('.enter.addkeyWord').is(':hidden')){
-                if($.trim($('.addkeyWord input.enterOne').val())==""){
-                    return
+        });
+        return _flag
+    }
+
+    //处理缓存数据  根据新索引和原索引操作----
+    function doSessionData(t, index) {
+        //删除关键词
+        if (t != "DK") {
+            if ($(".showKeyWord li:first").find(".editKeyWord").attr("dataIndex") != undefined && index <= Number($(".showKeyWord li:first").find(".editKeyWord").attr("dataIndex"))) {
+                var akws = a_items[classify_index]["a_key"];
+                for (var n in akws) {
+                    var ky = akws[n]["key"].join(" ");
+                    var sy = index + "-" + classify_index
+                    if (kws_arr[ky] == sy) {
+                        delete kws_arr[ky];
+                        break;
+                    }
+                }
+                a_items[classify_index]["a_key"][kws_index]["key"] = kws_name.split(' ')
+                a_items[classify_index]["a_key"][kws_index]["appendkey"] = addition_kws
+                a_items[classify_index]["a_key"][kws_index]["notkey"] = not_kws
+            } else {
+                //新加
+                var karr = {"key": kws_name.split(" "), "appendkey": addition_kws, "notkey": not_kws}
+                if (index == 0) {
+                    var keyM = [];
+                    keyM.push(karr);
+                    var classifyArr = {"s_item": classify_name, "a_key": keyM}
+                    a_items.push(classifyArr);
+                } else {
+                    a_items[classify_index]["a_key"].push(karr);
                 }
-                kws_index = -1
-                kws_name = $.trim($('.addkeyWord input.enterOne').val());
-            }else{
-               if($.trim($(th).parent(".modify").find("textarea").val())==""){
-                 return
-               }
-                kws_name = $.trim($(th).parent(".modify").find("textarea").val());
             }
-			history.replaceState("","","/front/vipsubscribe/toSetKeyWordPage?page=243")
-            setSesstion();
-            window.location.href='/front/vipsubscribe/toSetexclusivePage';
+            kws_arr[kws_name] = index + "-" + classify_index
+        } else {
+            var akws = a_items[classify_index]["a_key"];
+            for (var n in akws) {
+                var ky = akws[n]["key"].join(" ");
+                var sy = index + "-" + classify_index
+                if (kws_arr[ky] == sy) {
+                    delete kws_arr[ky];
+                    break;
+                }
+            }
+            if (a_items[classify_index]["a_key"].length == 1) {
+                a_items.splice(classify_index, 1);
+            } else {
+                a_items[classify_index]["a_key"].splice(kws_index, 1);
+            }
         }
-        //保存缓存
-        function setSesstion(){
-            sessionStorage.kwspage = true;//关键词页面标识
-            sessionStorage.kws_name = kws_name;//当前关键词
-            sessionStorage.classify_name = classify_name;//当前分类
-            sessionStorage.kws_index = kws_index;//当前关键词索引
-            sessionStorage.classify_index = classify_index;//当前分类索引
-            sessionStorage.a_items = JSON.stringify(a_items);//当前数据
-            sessionStorage.addition_kws =  JSON.stringify(addition_kws);//当前编辑关键词附加词
-            sessionStorage.not_kws =  JSON.stringify(not_kws);//当前编辑关键词排除词
-            sessionStorage.kws_arr =  JSON.stringify(kws_arr);//当前所有关键词排
-
-            sessionStorage.kws_count=kws_count;//关键词个数
+        a_items_m = a_items
+        //更新vip首页数据
+        var subVipState = sessionStorage.getItem('sub_vip_state')
+        if (subVipState != "") {
+            var reqData = JSON.parse(subVipState);
+            reqData.items = a_items_m;
+            sessionStorage.setItem('sub_vip_state', JSON.stringify(reqData))
         }
-        //
-        function clearSesstion(){
-            if(!sessionStorage){
-                return;
-            }
-            sessionStorage.removeItem("kwspage");
-            sessionStorage.removeItem("kws_name");
-            sessionStorage.removeItem("classify_name");
-            sessionStorage.removeItem("kws_index");
-            sessionStorage.removeItem("classify_index");
-            sessionStorage.removeItem("a_items");
-            sessionStorage.removeItem("addition_kws");
-            sessionStorage.removeItem("not_kws");
-            sessionStorage.removeItem("kws_count");
-            sessionStorage.removeItem("kws_arr");
+    }
+
+    //
+    function modalOne() {
+        // 如果是苹果手机，打开时候要设置top
+        var agent = navigator.userAgent.toLowerCase();
+        var dialog = $('.classify-edit-pop .weui-dialog')
+        if (/iphone|ipod|ipad|ios/.test(agent)) {
+            dialog.css({'top': '30%'})
+        } else {
+            dialog.css({'top': '50%'})
         }
-        //保存关键词
-        function saveK(th){
-			setTimeout(function(){
-	            var $this = $(th);
-	            kws_name =  $.trim($(th).siblings('textarea').val());
-				if(kws_name==""){
-	                weui.toast('您设置的关键词不能为空，请调整后再添加。', {
-	                    duration: 2000,
-	                    className: 'custom-toast',
-	                    callback: function () { console.log('close') }
-	                });
-					return
-				}
-				var _index =  Number($this.attr("dataindex"));
-				if(kws_arr[kws_name]!=undefined&&kws_arr[kws_name]!=(_index+"-"+classify_index)){
-	                weui.toast('您设置的关键词已存在，请调整后再添加。', {
-	                    duration: 2000,
-	                    className: 'custom-toast',
-	                    callback: function () { console.log('close') }
-	                });
-					return
-				}
-	            if(kws_name.length > 20){
-	                weui.toast('关键词不能超过20字', {
-	                    duration: 2000,
-	                    className: 'custom-toast',
-	                    callback: function () { console.log('close') }
-	                });
-	            }else{
-	                if(saveData('SK')){
-						//$this.attr("dataindex",kws_index);
-	                    $this.parent().siblings().find('.key').text(kws_name)
-	                    $this.parent().hide().siblings().show()
-	                	$(".add-keyword-container .addNewKeyword i").show();
-	                    //
-	                    doSessionData("",_index);
-			            //把kws_name,kws_index,addition_kws,not_kws初始化
-			            kws_index = 0;
-			            kws_name = "";
-			            addition_kws = [];
-			            not_kws = [];
-	                }else{
-			            weui.toast('保存出错，稍后再试', {
-			                duration: 2000,
-			                className: 'custom-toast',
-			                callback: function () { console.log('close') }
-			            });
-	                }
-	            }
-			},150)
+        $('.classify-edit-pop').show()
+        var currentClassifyName = $(".classify").find('.classify-detail').text()
+        if (currentClassifyName.indexOf("未分类") > -1) {
+            currentClassifyName = ""
         }
-        //保存数据
-        function saveData(actionType){
-            var _flag = false;
-            var param = {};
-            param.pageType = "keyWords";
-            param.classify_index = classify_index;
-            param.classify_name = classify_name;
-            param.kws_index = kws_index;
-            param.kws_name = kws_name;
-            param.actionType = actionType;
-            param.addition_kws = addition_kws;
-            param.not_kws = not_kws;
-			 param.kwscount = $(".content .showKeyWord li").length;
-            $.ajax({
-                type: "POST",
-                url: "/subscribepay/afterPay/setUserInfo",
-                data: param,
-                dataType: "json",
-                async: false,
-                traditional: true,
-                success: function(r){
-                    if(r.flag){
-                        console.log("保存成功")
-                        _flag = r.flag;
-                    }
+        $('input.classify-keyword').val(currentClassifyName).focus()
+    }
+
+    //
+    function modalTwo() {
+        $(".fastICName").text($(".classify-detail").text());
+        // 如果是苹果手机，打开时候要设置top
+        var agent = navigator.userAgent.toLowerCase();
+        var dialog = $('.classify-fast-pop .weui-dialog')
+        if (/iphone|ipod|ipad|ios/.test(agent)) {
+            dialog.css({'top': '40%'})
+        } else {
+            dialog.css({'top': '50%'})
+        }
+        $('.classify-fast-pop').show();
+    }
+</script>
+<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/keyWord.js?v={{Msg "seo" "version"}}23"></script>
+<script>
+    window.onunload = function () {//离开页面保存关键词修改
+        if (items_str(a_items_m) != a_items_str) {
+            sessionStorage.removeItem("a_items_str");
+            $.post("/subscribepay/afterPay/modification ", {}, function (r) {
+                if (r && r.mflag) {
+                    console.log("保存成功")
                 }
-            });
-            return _flag
+            })
         }
-        //处理缓存数据  根据新索引和原索引操作----
-        function doSessionData(t,index){
-            //删除关键词
-            if(t!="DK"){
-                if($(".showKeyWord li:first").find(".editKeyWord").attr("dataIndex")!=undefined&&index <= Number($(".showKeyWord li:first").find(".editKeyWord").attr("dataIndex"))){
-					var akws = a_items[classify_index]["a_key"];
-					for (var n in akws){
-						var ky = akws[n]["key"].join(" ");
-						var sy = index+"-"+classify_index
-						if(kws_arr[ky]==sy){
-							delete kws_arr[ky];
-							break;
-						}
-					}
-                    a_items[classify_index]["a_key"][kws_index]["key"]= kws_name.split(' ')
-                    a_items[classify_index]["a_key"][kws_index]["appendkey"]= addition_kws
-                    a_items[classify_index]["a_key"][kws_index]["notkey"]= not_kws
-                }else{
-					//新加
-                    var karr = {"key":kws_name.split(" "),"appendkey":addition_kws,"notkey":not_kws}
-                    if (index==0){
-                    	var keyM = [];
-                    	keyM.push(karr);
-                    	var classifyArr = {"s_item":classify_name,"a_key":keyM}
-                        a_items.push(classifyArr);
-                    }else{
-                        a_items[classify_index]["a_key"].push(karr);
+    }
+
+    // 设置一条空记录，用户第一次进入添加关键词点击确定时候调用
+    function setEmptyHistory() {
+        if (pageState.isFirstSetKeyword) {
+            history.pushState({id: 1}, "", "")
+            pageState.isFirstSetKeyword = false
+        }
+    }
+
+    //
+    $(function () {
+        $(".addNewKeyword div").on('click', function () {
+            history.pushState({id: 1}, "", "");
+            classify_index = $(".classify-list li").length;
+            var noNameIndex = -1;
+            var noName = "未分类"
+            for (var i = classify_arr.length - 1; i >= 0; i--) {
+                if (classify_arr[i].indexOf("未分类") > -1) {
+                    if (noNameIndex < Number(classify_arr[i].split("未分类")[1])) {
+                        noNameIndex = Number(classify_arr[i].split("未分类")[1])
                     }
-                }
-				kws_arr[kws_name] = index+"-"+classify_index
-            }else{
-				var akws = a_items[classify_index]["a_key"];
-				for (var n in akws){
-					var ky = akws[n]["key"].join(" ");
-					var sy = index+"-"+classify_index
-					if(kws_arr[ky]==sy){
-                        delete kws_arr[ky];
-						break;
-					}
-				}
-                if (a_items[classify_index]["a_key"].length==1){
-                    a_items.splice(classify_index,1);
-                }else{
-                    a_items[classify_index]["a_key"].splice(kws_index,1);
                 }
             }
-			a_items_m = a_items
-        }
-		//
-		function modalOne(){
-		    // 如果是苹果手机，打开时候要设置top
-		    var agent = navigator.userAgent.toLowerCase();
-		    var dialog = $('.classify-edit-pop .weui-dialog')
-		    if( /iphone|ipod|ipad|ios/.test(agent) ){
-		        dialog.css({ 'top': '30%' })
-		    } else {
-		        dialog.css({ 'top': '50%' })
-		    }
-		    $('.classify-edit-pop').show()
-		    var currentClassifyName = $(".classify").find('.classify-detail').text()
-		    if(currentClassifyName.indexOf("未分类")>-1){
-		        currentClassifyName = ""
-		    }
-		    $('input.classify-keyword').val(currentClassifyName).focus()
-		}
-		//
-		function modalTwo(){
-			$(".fastICName").text($(".classify-detail").text());
-		    // 如果是苹果手机，打开时候要设置top
-		    var agent = navigator.userAgent.toLowerCase();
-		    var dialog = $('.classify-fast-pop .weui-dialog')
-		    if( /iphone|ipod|ipad|ios/.test(agent) ){
-		        dialog.css({ 'top': '40%' })
-		    } else {
-		        dialog.css({ 'top': '50%' })
-		    }
-		    $('.classify-fast-pop').show();
-		}
-    </script>
-    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/keyWord.js?v={{Msg "seo" "version"}}23"></script>
-    <script>
-		window.onunload = function() {//离开页面保存关键词修改
-			if(items_str(a_items_m)!=a_items_str){
-				sessionStorage.removeItem("a_items_str");
-		       	$.post("/subscribepay/afterPay/modification ",{},function(r){
-					if(r&&r.mflag){
-						console.log("保存成功")
-					}
-				})
-			}
-		}
-        // 设置一条空记录，用户第一次进入添加关键词点击确定时候调用
-        function setEmptyHistory() {
-            if (pageState.isFirstSetKeyword) {
-                history.pushState({id:1}, "","")
-                pageState.isFirstSetKeyword = false
+            if (noNameIndex != -1) {
+                noNameIndex = noNameIndex + parseInt(1)
+                noName = noName + noNameIndex
             }
-        }
-        //
-        $(function(){
-            $(".addNewKeyword div").on('click', function () {
-                history.pushState({id:1}, "","");
+            classify_name = noName;
+            // 还原有数据
+            $('.classify .classify-detail').text(noName);
+            $('.add-keyword-container .showKeyWord ul').html('');
+
+            $('.add-keyword-container').show();
+            $('.all-classify-column').hide();
+
+            // 显示添加关键词的输入框
+            $(".enter.addkeyWord").find(".btnChoose button").eq(0).html('添加 附加词');
+            $(".enter.addkeyWord").find(".btnChoose button").eq(1).html('添加 附加词');
+            $(".enter.addkeyWord").find("input").val("");
+            $(".enter.addkeyWord").show();
+            $(".add-keyword-container .addNewKeyword i").hide();
+            setTimeout(function () {
+                modalOne();
+            }, 200)
+        })
+        // 通过判断是那个隐藏来判断是添加关键词还是添加新分类
+        $(".addNewKeyword i").on('click', function () {
+            // 如果是在分类列表点击添加（此时关键词列表是隐藏的）
+            // isClassifyColumnShow = true说明是添加新分类
+            var isClassifyColumnShow = $('.add-keyword-container').is(':hidden');
+            if (isClassifyColumnShow) {
+                history.pushState({}, "", "");
                 classify_index = $(".classify-list li").length;
-                var noNameIndex = -1;
-                var noName = "未分类"
-                for (var i = classify_arr.length - 1; i >= 0; i--) {
-                    if(classify_arr[i].indexOf("未分类")>-1){
-                       if (noNameIndex < Number(classify_arr[i].split("未分类")[1])){
-                            noNameIndex = Number(classify_arr[i].split("未分类")[1])
-                       }
-                    }
-                }
-                if(noNameIndex!=-1){
-                    noNameIndex = noNameIndex + parseInt(1)
-                    noName = noName + noNameIndex
-                }
-                classify_name = noName;
                 // 还原有数据
-                $('.classify .classify-detail').text(noName);
+                $('.classify .classify-detail').text('未分类');
                 $('.add-keyword-container .showKeyWord ul').html('');
+            }
+            $(".add-keyword-container .addNewKeyword i").hide();
+            $('.add-keyword-container').show();
+            $('.all-classify-column').hide();
+            //
+            kws_index = 0;
+            modifyFlag = false;
+            addition_kws = [];
+            not_kws = [];
+            // 显示添加关键词的输入框
+            $(".enter.addkeyWord").find(".btnChoose button").eq(0).html('添加 附加词');
+            $(".enter.addkeyWord").find(".btnChoose button").eq(1).html('添加 排除词');
+            $(".enter.addkeyWord").find(".btn button").eq(1).css({"opacity": ".5"});
+            $(".enter.addkeyWord").find(".btn button").eq(1).attr("disabled", true);
+            $(".enter.addkeyWord").find("input").val("");
+            $(".enter.addkeyWord").show();
+            $('.enterOne').focus();
+        })
 
-                $('.add-keyword-container').show();
-                $('.all-classify-column').hide();
-
-                // 显示添加关键词的输入框
-                $(".enter.addkeyWord").find(".btnChoose button").eq(0).html('添加 附加词');
-                $(".enter.addkeyWord").find(".btnChoose button").eq(1).html('添加 附加词');
-                $(".enter.addkeyWord").find("input").val("");
-                $(".enter.addkeyWord").show();
-                $(".add-keyword-container .addNewKeyword i").hide();
-                setTimeout(function(){
-                    modalOne();
-                },200)
-            })
-            // 通过判断是那个隐藏来判断是添加关键词还是添加新分类
-            $(".addNewKeyword i").on('click', function () {
-                // 如果是在分类列表点击添加（此时关键词列表是隐藏的）
-                // isClassifyColumnShow = true说明是添加新分类
-                var isClassifyColumnShow = $('.add-keyword-container').is(':hidden');
-                if (isClassifyColumnShow) {
-                    history.pushState({}, "","");
-                    classify_index = $(".classify-list li").length;
-                    // 还原有数据
-                    $('.classify .classify-detail').text('未分类');
-                    $('.add-keyword-container .showKeyWord ul').html('');
-                }
-                $(".add-keyword-container .addNewKeyword i").hide();
-                $('.add-keyword-container').show();
-                $('.all-classify-column').hide();
-                //
-				kws_index = 0;
-				modifyFlag = false;
-				addition_kws = [];
-				not_kws = [];
-                // 显示添加关键词的输入框
-                $(".enter.addkeyWord").find(".btnChoose button").eq(0).html('添加 附加词');
-                $(".enter.addkeyWord").find(".btnChoose button").eq(1).html('添加 排除词');
-            	$(".enter.addkeyWord").find(".btn button").eq(1).css({"opacity":".5"});
-            	$(".enter.addkeyWord").find(".btn button").eq(1).attr("disabled", true);
-                $(".enter.addkeyWord").find("input").val("");
-                $(".enter.addkeyWord").show();
-                $('.enterOne').focus();
-            })
-
-            // 点击分类目录的每一项，进入对应列表
-            $('.classify-list').on('click', '.classify-item', function() {
-                // 添加一条空历史记录
-                history.pushState({id:1}, "","");
-                classify_name = $.trim($(this).find('.classify-item-l').text());
-                classify_index = $(this).index();
-				kws_index = 0;
-                //展示此关键词信息
-				$(".add-keyword-container .addNewKeyword i").show();
-                toSetKws();
-            })
+        // 点击分类目录的每一项，进入对应列表
+        $('.classify-list').on('click', '.classify-item', function () {
+            // 添加一条空历史记录
+            history.pushState({id: 1}, "", "");
+            classify_name = $.trim($(this).find('.classify-item-l').text());
+            classify_index = $(this).index();
+            kws_index = 0;
+            //展示此关键词信息
+            $(".add-keyword-container .addNewKeyword i").show();
+            toSetKws();
         })
-    </script>
-	{{include "/common/baiducc.html"}}
+    })
+</script>
+{{include "/common/baiducc.html"}}
 </body>
 
 </html>

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

@@ -7,349 +7,363 @@
     <title>信息类型</title>
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/messageType.css?v={{Msg "seo" "version"}}">    
-	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/messageType.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/common.css?v={{Msg "seo" "version"}}">
     <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
-	{{include "/common/weixin.html"}}
+    {{include "/common/weixin.html"}}
     <style type="text/css">
-        body .industry .resetOne{
+        body .industry .resetOne {
             position: fixed;
             bottom: 0px;
         }
-        body .industry{
+
+        body .industry {
             margin-bottom: 1rem;
             height: auto;
         }
-        body #nijianTip{
+
+        body #nijianTip {
             display: none;
         }
     </style>
 </head>
 <body>
-	<div class="result">
-        <p class="result_text line_two" style="color: #888888;">
-          已选择：<span class="result_name"></span>
-        </p>
-    </div>
-    <div class="easypopup" id="nijianTip">
-        <div class="easypopup-alert">
-            <div class="easypopup-content">
-                “拟建项目”是指那些处于前期立项、审批阶段的项目。供应商应在立项阶段掌握项目信息，做到早介入，稳拿单。
-            </div>
-            <div class="easypopup-footer">
-                <span onclick="njTipEasyPopup.hide();">我知道了</span>
-            </div>
+<div class="result">
+    <p class="result_text line_two" style="color: #888888;">
+        已选择：<span class="result_name"></span>
+    </p>
+</div>
+<div class="easypopup" id="nijianTip">
+    <div class="easypopup-alert">
+        <div class="easypopup-content">
+            “拟建项目”是指那些处于前期立项、审批阶段的项目。供应商应在立项阶段掌握项目信息，做到早介入，稳拿单。
         </div>
-    </div>
-    <div class="industry">
-        <div class="all"><span>全部</span> </div>
-        <div class="list">
-            <ul>
-                <li>
-                    <dl>
-                        <dt class="question" dataValue="拟建">拟建项目</dt><i class="iconfont icon-wenhao "></i>
-                    </dl>
-                </li>
-                <li>
-                    <dl>
-                        <dt dataValue="预告">招标预告</dt>
-                    </dl>
-                </li>
-                <li>
-                    <dl>
-                        <dt>招标公告</dt>
-                        <dd>招标</dd>
-                        <dd>邀标</dd>
-                        <dd>询价</dd>
-                        <dd>竞谈</dd>
-                        <dd>单一</dd>
-                        <dd>竞价</dd>
-                        <dd>变更</dd>
-                        <dd>其它</dd>
-                    </dl>
-                </li>
-                <li>
-                    <dl>
-                        <dt>招标结果</dt>
-                        <dd>中标</dd>
-                        <dd>成交</dd>
-                        <dd>废标</dd>
-                        <dd>流标</dd>
-                    </dl>
-                </li>
-                <li style="border-bottom: 0px;">
-                    <dl>
-                        <dt style="width:2rem;">招标信用信息</dt>
-                        <dd>合同</dd>
-                        <dd>验收</dd>
-                        <dd>违规</dd>
-                    </dl>
-                </li>
-            </ul>
-        </div>
-        
-        <div class="resetOne">
-            <button class="reset">重置</button>
-            <button class="sure">确认</button>
+        <div class="easypopup-footer">
+            <span onclick="njTipEasyPopup.hide();">我知道了</span>
         </div>
+    </div>
+</div>
+<div class="industry">
+    <div class="all"><span>全部</span></div>
+    <div class="list">
+        <ul>
+            <li>
+                <dl>
+                    <dt class="question" dataValue="拟建">拟建项目</dt>
+                    <i class="iconfont icon-wenhao "></i>
+                </dl>
+            </li>
+            <li>
+                <dl>
+                    <dt dataValue="预告">招标预告</dt>
+                </dl>
+            </li>
+            <li>
+                <dl>
+                    <dt>招标公告</dt>
+                    <dd>招标</dd>
+                    <dd>邀标</dd>
+                    <dd>询价</dd>
+                    <dd>竞谈</dd>
+                    <dd>单一</dd>
+                    <dd>竞价</dd>
+                    <dd>变更</dd>
+                    <dd>其它</dd>
+                </dl>
+            </li>
+            <li>
+                <dl>
+                    <dt>招标结果</dt>
+                    <dd>中标</dd>
+                    <dd>成交</dd>
+                    <dd>废标</dd>
+                    <dd>流标</dd>
+                </dl>
+            </li>
+            <li style="border-bottom: 0px;">
+                <dl>
+                    <dt style="width:2rem;">招标信用信息</dt>
+                    <dd>合同</dd>
+                    <dd>验收</dd>
+                    <dd>违规</dd>
+                </dl>
+            </li>
+        </ul>
+    </div>
 
+    <div class="resetOne">
+        <button class="reset">重置</button>
+        <button class="sure">确认</button>
     </div>
-    <script src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js?v=1412"></script>
-    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
-	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}1"></script>
-    <script>
-		initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-		var hasZBGG = ""
-		var hasZBJG = ""
-		var hasZBXYXX = ""
-		var hasStr = ""     
-        function hasActive(){
-            var arr = "";
-			hasZBGG = ""
-			hasZBJG = ""
-			hasZBXYXX = ""
-			hasStr = ""  
-            $(".list ul li dl dd").each(function(index){
-                if($(this).hasClass('active')){
-                    arr = arr + "," + $(this).text()
-					if($(this).prevAll("dt").text()=="招标公告"){
-						if(hasZBGG!=""){
-							hasZBGG+="、"
-						}
-						hasZBGG += $(this).text()
-					}
-					if($(this).prevAll("dt").text()=="招标结果"){
-						if(hasZBJG!=""){
-							hasZBJG+="、"
-						}
-						hasZBJG += $(this).text()
-					}
-					if($(this).prevAll("dt").text()=="招标信用信息"){
-						if(hasZBXYXX!=""){
-							hasZBXYXX+="、"
-						}
-						hasZBXYXX += $(this).text()
-					}
-                }
-            })
-            $(".list ul li dl dt").each(function(index){
-                if($(this).hasClass('active')&&($(this).text()=="招标预告"||$(this).text()=="拟建项目")){
-                    arr = arr + "," + $(this).attr("dataValue")
-					if($(this).text()=="招标预告"||$(this).text()=="拟建项目"){
-						if (hasStr!=""){
-							hasStr += "、"
-						}
-						hasStr += $(this).text();
-					}
+
+</div>
+<script src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js?v=1412"></script>
+<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+<script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
+<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}1"></script>
+<script>
+    initShare({{.T.signature}},{{.T.openid}}, 2, "jy_extend",{{.T.nickname}},{{.T.avatar}});
+    var hasZBGG = ""
+    var hasZBJG = ""
+    var hasZBXYXX = ""
+    var hasStr = ""
+
+    function hasActive() {
+        var arr = "";
+        hasZBGG = ""
+        hasZBJG = ""
+        hasZBXYXX = ""
+        hasStr = ""
+        $(".list ul li dl dd").each(function (index) {
+            if ($(this).hasClass('active')) {
+                arr = arr + "," + $(this).text()
+                if ($(this).prevAll("dt").text() == "招标公告") {
+                    if (hasZBGG != "") {
+                        hasZBGG += "、"
+                    }
+                    hasZBGG += $(this).text()
                 }
-            })
-            return arr.substr(1)
-        }
-        //
-        function inputHtml(infoTypeData){
-            for (var i = infoTypeData.length - 1; i >= 0; i--) {
-                $(".list ul li dl dd").each(function(index){
-                    if($(this).text()==infoTypeData[i]){
-                        $(this).addClass("active");
-                        isDtSelected (this);
-                        isAllSelected ();
-                        $('.all span').removeClass('active');
+                if ($(this).prevAll("dt").text() == "招标结果") {
+                    if (hasZBJG != "") {
+                        hasZBJG += "、"
                     }
-                })
-                $(".list ul li dl dt").each(function(index){
-                    if($(this).attr("dataValue")==infoTypeData[i]){
-                        $(this).addClass("active");
-                        $(this).parent().find('dd').addClass('active');
-                        isAllSelected ();
-                        $('.all span').removeClass('active');
+                    hasZBJG += $(this).text()
+                }
+                if ($(this).prevAll("dt").text() == "招标信用信息") {
+                    if (hasZBXYXX != "") {
+                        hasZBXYXX += "、"
                     }
-                })
-            }
-        }
-		//
-		function getChecked(){
-			hasActive();
-			if (hasZBGG!=""||hasZBJG!=""|hasZBXYXX!=""){
-				if(hasZBGG!=""){
-					if(hasStr != ""){
-						hasStr +="、"
-					}
-					hasStr+="招标公告 ("+hasZBGG+")"
-				}
-				if(hasZBJG!=""){
-					if(hasStr != ""){
-						hasStr +="、"
-					}
-					hasStr+="招标结果 ("+hasZBJG+")"
-				}
-				if(hasZBXYXX!=""){
-					if(hasStr != ""){
-						hasStr +="、"
-					}
-					hasStr+="招标信用信息 ("+hasZBXYXX+")"
-				}
-			}
-			if(hasStr!=""){
-				$(".result_name").text(hasStr);
-			}else{
-				$(".result_name").text("全部");
-			}
-			
-			$(".result").css("visibility","");
-          	$(".industry").css("margin-top",$('.result_text').height()+25);
-			$(".industry").css("visibility","");
-		}
-        //
-        isLockButton (false);
-        // 传入false为锁定确认按钮
-        function isLockButton (flag) {
-            var button = $('.reset').siblings()[0]
-            if (flag) {
-                // true，解锁button
-                $(button).css({"background": "#2cb7ca"}).removeAttr('disabled')
-            } else {
-                // false, 锁定button
-                $(button).css({"background": "#95DBE4"}).attr('disabled', true)
+                    hasZBXYXX += $(this).text()
+                }
             }
-        }
-        //
-        var njTipEasyPopup = null;
-        //是否 修改
-        $(function(){
-	        weui.loading();
-			$(".result").css("visibility","hidden");
-			$(".industry").css("visibility","hidden");
-            //获取用户设置信息类型
-            $.post("/subscribepay/afterPay/getUserInfo",{},function(r){
-                if(r.userData){
-                    var _userData = r.userData;
-                    var _vipData = _userData["o_vipjy"];
-                    var a_infotype = _vipData["a_infotype"]
-                    if (a_infotype!=undefined&&a_infotype.split("、").length>0&&a_infotype!=""){
-                        inputHtml(a_infotype.split("、"));
-                        isLockButton (true);
-                    }else{
-                        $('.all span').addClass('active');
+        })
+        $(".list ul li dl dt").each(function (index) {
+            if ($(this).hasClass('active') && ($(this).text() == "招标预告" || $(this).text() == "拟建项目")) {
+                arr = arr + "," + $(this).attr("dataValue")
+                if ($(this).text() == "招标预告" || $(this).text() == "拟建项目") {
+                    if (hasStr != "") {
+                        hasStr += "、"
                     }
-                }else{
-                    $('.all span').addClass('active');
+                    hasStr += $(this).text();
                 }
-				getChecked();
-	        	weui.loading().hide();
-            })
-            //
-            $(".sure").on("click",function(){
-                //用户设置信息类型
-                var _infoType =   hasActive();
-                $.post("/subscribepay/afterPay/setUserInfo",{pageType:"infoType",infoTypeArr:_infoType},function(r){
-                     if(r.flag){
-                        console.log("保存成功")
-                        window.history.go(-1);
-                    }
-                 })
-            })
-            //
-            njTipEasyPopup = new EasyPopup("nijianTip");
-            $(".icon-wenhao").on("click",function(){
-                njTipEasyPopup.show();
-            })
-            $('.all span').on('click',function(e){
-                if (!$(this).hasClass('active')) {
-                    isLockButton (true);
-                    $(this).addClass('active')
-                    $('.list ul li dl dt').removeClass('active')
-                    $('.list ul li dl dd').removeClass('active')
+            }
+        })
+        return arr.substr(1)
+    }
+
+    //
+    function inputHtml(infoTypeData) {
+        for (var i = infoTypeData.length - 1; i >= 0; i--) {
+            $(".list ul li dl dd").each(function (index) {
+                if ($(this).text() == infoTypeData[i]) {
+                    $(this).addClass("active");
+                    isDtSelected(this);
+                    isAllSelected();
+                    $('.all span').removeClass('active');
                 }
-				getChecked();
             })
-            $(".list ul li dl dt").on("click", function(){
-                isLockButton (true);
-                if($(this).hasClass('active')){
-                    $(this).parent().find('dd').removeClass('active');
-                    $(this).removeClass('active');
-                }else{
+            $(".list ul li dl dt").each(function (index) {
+                if ($(this).attr("dataValue") == infoTypeData[i]) {
+                    $(this).addClass("active");
                     $(this).parent().find('dd').addClass('active');
-                    $(this).addClass('active');
-                    $('.all span').removeClass('active')
+                    isAllSelected();
+                    $('.all span').removeClass('active');
                 }
-                isAllSelected ()
-				getChecked();
             })
-            $(".list ul li dl dd").on('click',function(){
-                isLockButton (true);
-                // 点击切换是否被选中
-                if($(this).hasClass('active')){
-                    $(this).removeClass('active');
-                }else{
-                    $(this).addClass('active');
-                    $('.all span').removeClass('active')
+        }
+    }
+
+    //
+    function getChecked() {
+        hasActive();
+        if (hasZBGG != "" || hasZBJG != "" | hasZBXYXX != "") {
+            if (hasZBGG != "") {
+                if (hasStr != "") {
+                    hasStr += "、"
+                }
+                hasStr += "招标公告 (" + hasZBGG + ")"
+            }
+            if (hasZBJG != "") {
+                if (hasStr != "") {
+                    hasStr += "、"
                 }
+                hasStr += "招标结果 (" + hasZBJG + ")"
+            }
+            if (hasZBXYXX != "") {
+                if (hasStr != "") {
+                    hasStr += "、"
+                }
+                hasStr += "招标信用信息 (" + hasZBXYXX + ")"
+            }
+        }
+        if (hasStr != "") {
+            $(".result_name").text(hasStr);
+        } else {
+            $(".result_name").text("全部");
+        }
 
-                // 决定dt是否被选中
-                isDtSelected (this)
-                isAllSelected ()
-				getChecked();
-            })
+        $(".result").css("visibility", "");
+        $(".industry").css("margin-top", $('.result_text').height() + 25);
+        $(".industry").css("visibility", "");
+    }
 
-            $('.reset').on('click',function(){
-                isLockButton (true);
-                $('.all span').addClass('active')
-                $('.list ul li dl dt').removeClass('active')
-                $('.list ul li dl dd').removeClass('active')
-				getChecked();
-            })
-        })
+    //
+    isLockButton(false);
 
-        // 判断dd是否被全部选中  -----> 操作二级标题
-        function isDtSelected (_this) {
-            // 如果全部dd选中 dt就选中，dd有一个没选中 dt就不选中
-            var _f = false
-            $(_this).parent().find('dd').each(function(index,dom){
-                // 如果有一个dd被选中，就设置标记为true
-                if (!$(dom).hasClass('active')) {
-                    _f = true
-                    return false
+    // 传入false为锁定确认按钮
+    function isLockButton(flag) {
+        var button = $('.reset').siblings()[0]
+        if (flag) {
+            // true，解锁button
+            $(button).css({"background": "#2cb7ca"}).removeAttr('disabled')
+        } else {
+            // false, 锁定button
+            $(button).css({"background": "#95DBE4"}).attr('disabled', true)
+        }
+    }
+
+    //
+    var njTipEasyPopup = null;
+    //是否 修改
+    $(function () {
+        weui.loading();
+        $(".result").css("visibility", "hidden");
+        $(".industry").css("visibility", "hidden");
+        //获取用户设置信息类型
+        $.post("/subscribepay/afterPay/getUserInfo", {}, function (r) {
+            if (r.userData) {
+                var _userData = r.userData;
+                var _vipData = _userData["o_vipjy"];
+                var a_infotype = _vipData["a_infotype"]
+                if (a_infotype != undefined && a_infotype.split("、").length > 0 && a_infotype != "") {
+                    inputHtml(a_infotype.split("、"));
+                    isLockButton(true);
                 } else {
-                    _f = false
+                    $('.all span').addClass('active');
+                }
+            } else {
+                $('.all span').addClass('active');
+            }
+            getChecked();
+            weui.loading().hide();
+        })
+        //
+        $(".sure").on("click", function () {
+            //用户设置信息类型
+            var _infoType = hasActive();
+            $.post("/subscribepay/afterPay/setUserInfo", {pageType: "infoType", infoTypeArr: _infoType}, function (r) {
+                if (r.flag) {
+                    console.log("保存成功")
+                    var subVipState = sessionStorage.getItem('sub_vip_state')
+                    if (subVipState != "") {
+                        var reqData = JSON.parse(subVipState);
+                        reqData.infotype = _infoType == "" ? [] : _infoType.split(",");
+                        sessionStorage.setItem('sub_vip_state', JSON.stringify(reqData))
+                    }
+                    window.history.go(-1);
                 }
             })
-            // 如果循环结束仍为false说明 dd全部被选中
-            if (_f) {
-                $(_this).parent().find('dt').removeClass('active')
+        })
+        //
+        njTipEasyPopup = new EasyPopup("nijianTip");
+        $(".icon-wenhao").on("click", function () {
+            njTipEasyPopup.show();
+        })
+        $('.all span').on('click', function (e) {
+            if (!$(this).hasClass('active')) {
+                isLockButton(true);
+                $(this).addClass('active')
+                $('.list ul li dl dt').removeClass('active')
+                $('.list ul li dl dd').removeClass('active')
+            }
+            getChecked();
+        })
+        $(".list ul li dl dt").on("click", function () {
+            isLockButton(true);
+            if ($(this).hasClass('active')) {
+                $(this).parent().find('dd').removeClass('active');
+                $(this).removeClass('active');
             } else {
-                $(_this).parent().find('dt').addClass('active')
+                $(this).parent().find('dd').addClass('active');
+                $(this).addClass('active');
+                $('.all span').removeClass('active')
+            }
+            isAllSelected()
+            getChecked();
+        })
+        $(".list ul li dl dd").on('click', function () {
+            isLockButton(true);
+            // 点击切换是否被选中
+            if ($(this).hasClass('active')) {
+                $(this).removeClass('active');
+            } else {
+                $(this).addClass('active');
+                $('.all span').removeClass('active')
             }
-        }
 
+            // 决定dt是否被选中
+            isDtSelected(this)
+            isAllSelected()
+            getChecked();
+        })
 
+        $('.reset').on('click', function () {
+            isLockButton(true);
+            $('.all span').addClass('active')
+            $('.list ul li dl dt').removeClass('active')
+            $('.list ul li dl dd').removeClass('active')
+            getChecked();
+        })
+    })
 
-        // 判断dd是否被全部选中  ----> 操作.all全部按钮
-        function isAllSelected () {
-            // 所有dd不选中.all就选中
-            var _f = true
-            $('.list ul li dd').each(function(index,dom){
-                // 如果有所有dd被选中，就设置标记为true
-                // 也就是说，有一个dd没被选中，就设置标记为false
-                if ($(dom).hasClass('active')) {
-                    _f = false
-                } 
-            })
-            $('.list ul li dt').each(function(index,dom){
-                // 如果有所有dd被选中，就设置标记为true
-                // 也就是说，有一个dd没被选中，就设置标记为false
-                if ($(dom).hasClass('active')) {
-                    _f = false
-                } 
-            })
-            // 如果循环结束仍为true说明 dd没有全部都被选中
-            if (_f) {
-                $('.all span').addClass('active')
-                $('.list ul li dl dt').removeClass('active')
-                $('.list ul li dl dd').removeClass('active')
+    // 判断dd是否被全部选中  -----> 操作二级标题
+    function isDtSelected(_this) {
+        // 如果全部dd选中 dt就选中，dd有一个没选中 dt就不选中
+        var _f = false
+        $(_this).parent().find('dd').each(function (index, dom) {
+            // 如果有一个dd被选中，就设置标记为true
+            if (!$(dom).hasClass('active')) {
+                _f = true
+                return false
+            } else {
+                _f = false
+            }
+        })
+        // 如果循环结束仍为false说明 dd全部被选中
+        if (_f) {
+            $(_this).parent().find('dt').removeClass('active')
+        } else {
+            $(_this).parent().find('dt').addClass('active')
+        }
+    }
+
+
+    // 判断dd是否被全部选中  ----> 操作.all全部按钮
+    function isAllSelected() {
+        // 所有dd不选中.all就选中
+        var _f = true
+        $('.list ul li dd').each(function (index, dom) {
+            // 如果有所有dd被选中，就设置标记为true
+            // 也就是说，有一个dd没被选中，就设置标记为false
+            if ($(dom).hasClass('active')) {
+                _f = false
             }
+        })
+        $('.list ul li dt').each(function (index, dom) {
+            // 如果有所有dd被选中，就设置标记为true
+            // 也就是说，有一个dd没被选中，就设置标记为false
+            if ($(dom).hasClass('active')) {
+                _f = false
+            }
+        })
+        // 如果循环结束仍为true说明 dd没有全部都被选中
+        if (_f) {
+            $('.all span').addClass('active')
+            $('.list ul li dl dt').removeClass('active')
+            $('.list ul li dl dd').removeClass('active')
         }
-    </script>
+    }
+</script>
 </body>
 </html>

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

@@ -12,6 +12,7 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/UpgradePrice.js?v={{Msg "seo" "version"}}"></script>
     <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />

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

@@ -0,0 +1,326 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0,minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>升级或续费 - VIP订阅</title>
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <script src="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}"/>
+    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base2.css?v={{Msg "seo" "version"}}"/>
+    <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
+    <link rel="stylesheet" href="/vipsubscribe/css/vip_index_new.css?v={{Msg "seo" "version"}}">
+</head>
+
+<body class="no-touch">
+<div class="vip-upgrade">
+    <div class="vip-header">
+        <!-- <div class="header-renew">
+            <div class="renew-l">
+                <div class="vip-logo"></div>
+                <div class="vip-text free7days">VIP订阅服务</div>
+            </div>
+            <a href="vip_purchase.html" class="renew-r">去购买</a>
+        </div> -->
+        <div class="header-renew">
+            <div class="renew-l">
+                <div class="vip-logo"></div>
+                <div class="vip-text">VIP订阅服务</div>
+            </div>
+            <a href="vip_renew.html" class="renew-r">续费</a>
+        </div>
+        <!-- 到期提醒 -->
+        <!-- <div class="expire-remind">
+            <i class="icon iconfont icon-guanbi close-expire-remind"></i>
+            <span class="remind-text">VIP订阅服务试用即将过期，请及时购买！</span>
+            <a class="remind-link"></a>
+        </div> -->
+    </div>
+    <ul class="vip-body">
+        <li class="body-item area">
+            <a class="item-container" href="/front/vipsubscribe/toChangeArea">
+                <div class="item">
+                        <span class="item-l">
+                            <span class="item-label">区域</span>
+                        </span>
+                    <span class="item-r">
+                            <span class="buy-set-area text ellipsis">0个省、0个市(分布在0个省内)</span>
+                            <span class="iconfont icon-arrow"></span>
+                        </span>
+                </div>
+                <div class="sub-item">
+                    <span class="sub-l">已选择：</span>
+                    <span class="sub-r">
+                            <span class="text selected-area">0个省、0个市(分布在0个省内)</span>
+                            <span class="tip-need-upgrade tip">需升级</span>
+                        </span>
+                </div>
+            </a>
+        </li>
+        <li class="body-item industry">
+            <a class="item-container" href="/front/vipsubscribe/toChangeIndustry">
+                <div class="item">
+                        <span class="item-l">
+                            <span class="item-label">采购单位行业</span>
+                        </span>
+                    <span class="item-r">
+                            <span class="buy-set-industry industry-text ellipsis">0个行业</span>
+                            <span class="iconfont icon-arrow"></span>
+                        </span>
+                </div>
+                <div class="sub-item">
+                    <span class="sub-l">已选择：</span>
+                    <span class="sub-r">
+                            <span class="text selected-industry">0个行业</span>
+                            <span class="tip-need-upgrade tip">需升级</span>
+                        </span>
+                </div>
+            </a>
+        </li>
+        <li class="body-item cycle">
+            <a class="item-container" href="/front/vipsubscribe/toChangeTime">
+                <div class="item">
+                        <span class="item-l">
+                            <span class="item-label">订阅周期</span>
+                        </span>
+                    <span class="item-r">
+                            <span class="buy-cycle text ellipsis">0</span>
+                            <span class="iconfont icon-arrow"></span>
+                        </span>
+                </div>
+                <div class="sub-item">
+                    <!-- 此处空span占位 -->
+                    <span class="sub-l"></span>
+                    <span class="sub-r">
+                            <span class=""></span>
+                            <span class="extend-cycle tip">延长订阅周期</span>
+                        </span>
+                </div>
+            </a>
+        </li>
+        <li class="body-item keywords">
+            <a class="item-container" href="/front/vipsubscribe/toSetKeyWordPage">
+                <div class="item">
+                        <span class="item-l">
+                            <span class="leading jy-icon-keywords"></span>
+                            <span class="item-label">关键词</span>
+                        </span>
+                    <span class="item-r">
+                            <span class="keywords-text ellipsis">未分类</span>
+                            <span class="iconfont icon-arrow"></span>
+                        </span>
+                </div>
+            </a>
+        </li>
+        <li class="body-item info-type">
+            <a class="item-container" href="/front/vipsubscribe/toSetInfoTypePage">
+                <div class="item">
+                        <span class="item-l">
+                            <span class="leading jy-icon-info-type"></span>
+                            <span class="item-label">信息类型</span>
+                        </span>
+                    <span class="item-r">
+                            <span class="info-type-text ellipsis">全部类型</span>
+                            <span class="iconfont icon-arrow"></span>
+                        </span>
+                </div>
+            </a>
+        </li>
+        <li class="body-item push-setting">
+            <a class="item-container" href="/front/vipsubscribe/toSetPushSetPage">
+                <div class="item">
+                        <span class="item-l">
+                            <span class="leading jy-icon-push-setting"></span>
+                            <span class="item-label">推送设置</span>
+                        </span>
+                    <span class="item-r">
+                            <span class="push-setting-text ellipsis">实时推送</span>
+                            <span class="iconfont icon-arrow"></span>
+                        </span>
+                </div>
+            </a>
+        </li>
+        <li class="body-item project-match">
+            <a class="item-container" href="javascript:;">
+                <div class="item">
+                        <span class="item-l">
+                            <span class="leading jy-icon-project-match"></span>
+                            <span class="item-label">
+                                <span class="label-text">项目匹配</span>
+                                <i class="iconfont icon-bangzhu"></i>
+                            </span>
+                        </span>
+                    <span class="item-r media_switch">
+                            <div class="weui-cell__ft">
+                                <button class="jy-switch switch checked"></button>
+                            </div>
+                        </span>
+                </div>
+            </a>
+        </li>
+    </ul>
+    <!-- 升级 -->
+    <div class="vip-footer upgrade">
+        <div class="footer-preview-container">
+            <div class="clause-box">
+                <span class="checkbox"></span>
+                <span class="clause-read">我已阅读，理解并接受<a href="abc.html">《剑鱼标讯线上购买与服务条款》</a></span>
+            </div>
+            <div class="price-preview">
+                <span class="preview-label">需补差价：</span>
+                <span class="preview-content">
+                        <span class="billing-list-btn">计费清单</span>
+                        <span class="billing-price">￥366.50</span>
+                    </span>
+            </div>
+        </div>
+        <div class="footer-button-group">
+            <button class="button-l reset">取消</button>
+            <button class="button-r confirm" disabled>立即升级</button>
+        </div>
+    </div>
+    <!-- 修改 -->
+    <div class="vip-footer modify">
+        <div class="footer-button-group">
+            <button class="button-l reset">取消</button>
+            <button class="button-r confirm">保存修改</button>
+        </div>
+    </div>
+</div>
+
+<!-- 计费清单picker -->
+<div class="billing-list-container" style="display: none;">
+    <div class="weui-mask weui-animate-fade-in"></div>
+    <div class="weui-half-screen-dialog weui-picker weui-animate-slide-up">
+        <div class="weui-half-screen-dialog__hd">
+            <div class="dialog_hd__l"></div>
+            <div class="dialog_hd__title">计算标准</div>
+            <div class="dialog_hd__close iconfont icon-guanbi"></div>
+        </div>
+        <div class="weui-half-screen-dialog__bd">
+            <div class="vip_prise_table">
+                <table class="monthly">
+                    <div class="table_title">
+                        <div class="line"></div>
+                        <div class="title">VIP订阅价格</div>
+                        <div class="line"></div>
+                    </div>
+                    <tr>
+                        <td colspan="2">按月购买</td>
+                    </tr>
+                    <tr>
+                        <td>5.8元 月/市/行业</td>
+                        <td>18元 月/市/全行业</td>
+                    </tr>
+                    <tr>
+                        <td>11.8元 月/省/行业</td>
+                        <td>38元 月/省/全行业</td>
+                    </tr>
+                    <tr>
+                        <td>118元 月/全国/行业</td>
+                        <td>388元 月/全国/全行业</td>
+                    </tr>
+                </table>
+                <table class="yearly">
+                    <tr>
+                        <td colspan="2">按年购买</td>
+                    </tr>
+                    <tr>
+                        <td>58元 年/市/行业</td>
+                        <td>180元 年/市/全行业</td>
+                    </tr>
+                    <tr>
+                        <td>118元 年/省/行业</td>
+                        <td>380元 年/省/全行业</td>
+                    </tr>
+                    <tr>
+                        <td>1180元 年/全国/行业</td>
+                        <td>3880元 年/全国/全行业</td>
+                    </tr>
+                </table>
+                <div class="tips">
+                    <dt>购买须知：</dt>
+                    <dd>套餐周期内，不支持套餐降级，续费可降级；</dd>
+                    <dd>用户最多购买/续费3年套餐；</dd>
+                    <dd>支持套餐升级，补差价（按月进行补差价，不足一个月按一个月计算)。</dd>
+                </div>
+            </div>
+        </div>
+        <div class="weui-half-screen-dialog__ft"></div>
+    </div>
+</div>
+<!-- 选择订阅周期picker -->
+<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"
+                                   checked/>
+                            <i class="weui-icon-checked"></i>
+                        </div>
+                        <div class="weui-cell__bd">
+                            <p>按月订阅</p>
+                        </div>
+                    </label>
+                    <div class="number_box active" 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"/>
+                            <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>
+<script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
+<script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+<script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
+<script src="/vipsubscribe/js/UpgradePrice.js?v={{Msg "seo" "version"}}"></script>
+<script src="/vipsubscribe/js/vip_index_new.js?v={{Msg "seo" "version"}}"></script>
+</body>
+
+</html>

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

@@ -28,6 +28,7 @@
                         {{end}}
                         <i class="iconfont icon-arrow"></i>
                     </a>
+                    <p class="add_tips area_warn" style="display: none;">请选择区域</p>
                     <!-- 无选择时不显示 -->
                     <p class="add_tips area" style="display:none">已选择 0 个省级区域、0 个地市</p>
                 </li>
@@ -43,6 +44,7 @@
                         <i class="iconfont icon-arrow"></i>
                     </a>
                     <!-- 无选择时不显示 -->
+                    <p class="add_tips industry_warn" style="display: none;">请选择行业</p>
                     <p class="add_tips industry" style="display:none">已选择 0 个行业</p>
                 </li>
                 <li class="choose_item select_cycle">
@@ -418,26 +420,24 @@
             showArea: function () {
                 var cityArr = [];//城市
                 var provinceArr = [];//省份
+                var cityProvinceCount = 0;
                 var data = this.areaSelect;
                 for (var i in data) {
                     var citys = data[i];
                     if (citys.length > 0) {
                         cityArr = cityArr.concat(citys);
+                        cityProvinceCount++;
                     } 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 (provinceArr.length > 0) tipTxt += provinceArr.length + " 个省";
                     if (cityArr.length > 0) {
                         if (provinceArr.length > 0) tipTxt += "、";
-                        tipTxt += cityArr.length + " 个地市";
+                        tipTxt += cityArr.length + " 个市(分布在" + cityProvinceCount + "个省内)";
                     }
                     $(".choose_area").val(tipTxt);
                     //$(".add_tips.area").text(tipTxt).css("display", "");
@@ -445,6 +445,10 @@
                     $(".choose_area").val("全国");
                 } else {
                     $(".choose_area").val("");
+                    //是否勾选已阅读
+                    if (sessionStorage.getItem("vipSub_read") == "true") {
+                        $(".area_warn").css("display", "");
+                    }
                 }
             },
             showPrice: function () {
@@ -464,9 +468,6 @@
             },
             showIndustry: function () {
                 var 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 + " 个行业");
@@ -474,6 +475,10 @@
                     $(".choose_industry").val("全部行业");
                 } else {
                     $(".choose_industry").val("");
+                    //是否勾选已阅读
+                    if (sessionStorage.getItem("vipSub_read") == "true") {
+                        $(".industry_warn").css("display", "");
+                    }
                 }
             },
             showTime: function () {
@@ -763,7 +768,21 @@
                     'disabled': 'true'
                 });
             }
+            if (checked) {
+                if (area === '') {
+                    $(".area_warn").css("display", "block");
+                }
+                if (industry === "") {
+                    $(".industry_warn").css("display", "block");
+                }
+            }
+            // else {
+            //     $(".area_warn").css("display", "");
+            //     $(".industry_warn").css("display", "");
+            // }
+
             sessionStorage.setItem("vipSub_read", checked)
+
         }
 
         function clearSessionStorage() {

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

@@ -1,344 +1,360 @@
 <html>
 <head>
-	<title>推送设置</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-	<link href="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.css" rel="stylesheet">
-	<link href="{{Msg "seo" "cdn"}}/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-	<link href="{{Msg "seo" "cdn"}}/css/wxkeyset.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-	{{include "/common/weixin.html"}}
-	<script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
-	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-	<script src="{{Msg "seo" "cdn"}}/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
-	<script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
-	<script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js"></script>
-	<script src="{{Msg "seo" "cdn"}}/js/rem.js"></script>
+    <title>推送设置</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <link href="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.css" rel="stylesheet">
+    <link href="{{Msg "seo" "cdn"}}/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+    <link href="{{Msg "seo" "cdn"}}/css/wxkeyset.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+    {{include "/common/weixin.html"}}
+    <script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
+    <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js"></script>
+    <script src="{{Msg "seo" "cdn"}}/js/rem.js"></script>
 
-	<style>
-		#pushway ul>li:nth-child(n+2) {
-			/*padding: 8px 0px;*/
-		}
-		#matchType ul>li:nth-child(n+2) {
-			line-height: normal;
-			padding: 14px 0px;
-			color: #1d1d1d;
-		}
-		#matchType ul>li:nth-child(2) {
-			padding-top: 16px;
-			line-height: 55px;
-		}
-		#matchType ul>li>span {
-			display: block;
-			margin-top: 6px;
-			font-size: 14px;
-			color: #686868;
-		}
-		.easypopup>div{
-			position: relative !important;
-		}
-	</style>
-	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}1"></script>
+    <style>
+        #pushway ul > li:nth-child(n+2) {
+            /*padding: 8px 0px;*/
+        }
+
+        #matchType ul > li:nth-child(n+2) {
+            line-height: normal;
+            padding: 14px 0px;
+            color: #1d1d1d;
+        }
+
+        #matchType ul > li:nth-child(2) {
+            padding-top: 16px;
+            line-height: 55px;
+        }
+
+        #matchType ul > li > span {
+            display: block;
+            margin-top: 6px;
+            font-size: 14px;
+            color: #686868;
+        }
+
+        .easypopup > div {
+            position: relative !important;
+        }
+    </style>
+    <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}1"></script>
     <script>
-		initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-		var s_email = "";
-		var keepOneTipWayMsg = "请保留一种推送方式，<br>剑鱼标讯还要推送信息给您";
-		var emailSetModal = null;
-		var clickDelayed = false;
-		setTimeout(function(){
-			clickDelayed = true;
-		},500);
-		$(function(){
-			new FastClick(document.body);
-			emailSetModal = new EasyPopup("emailSetModal");
-			$(window).bind("pageshow", function(event){
-				if(event.originalEvent.persisted){
-					window.location.reload(true);
-				}
-			});
-			//获取用户设置信息类型
-             $.post("/subscribepay/afterPay/getUserInfo",{},function(r){
-                 if(r.userData){
+        initShare({{.T.signature}},{{.T.openid}}, 2, "jy_extend",{{.T.nickname}},{{.T.avatar}});
+        var s_email = "";
+        var keepOneTipWayMsg = "请保留一种推送方式，<br>剑鱼标讯还要推送信息给您";
+        var emailSetModal = null;
+        var clickDelayed = false;
+        setTimeout(function () {
+            clickDelayed = true;
+        }, 500);
+        $(function () {
+            new FastClick(document.body);
+            emailSetModal = new EasyPopup("emailSetModal");
+            $(window).bind("pageshow", function (event) {
+                if (event.originalEvent.persisted) {
+                    window.location.reload(true);
+                }
+            });
+            //获取用户设置信息类型
+            $.post("/subscribepay/afterPay/getUserInfo", {}, function (r) {
+                if (r.userData) {
                     var _userData = r.userData;
                     var _vipData = _userData["o_vipjy"];
                     var i_ratemode = _vipData["i_ratemode"]
-                    if (i_ratemode!=undefined){
+                    if (i_ratemode != undefined) {
                         $("#pushfrequency li").eq(parseInt(i_ratemode)).addClass("checked");
-                    }else{
-                         $("#pushfrequency li").eq(1).addClass("checked");
+                    } else {
+                        $("#pushfrequency li").eq(1).addClass("checked");
                     }
                     var i_wxpush = _vipData["i_wxpush"]
-                    if (i_wxpush!=undefined&&i_wxpush=="1"){
-						$("#wxtip").addClass("on");
-                     	$("#wxtip .turn-on").show();
-                     	$("#wxtip .turn-off").hide();
-                    }else{
-                     	$("#wxtip .turn-off").show();
-                     	$("#wxtip .turn-on").hide();
+                    if (i_wxpush != undefined && i_wxpush == "1") {
+                        $("#wxtip").addClass("on");
+                        $("#wxtip .turn-on").show();
+                        $("#wxtip .turn-off").hide();
+                    } else {
+                        $("#wxtip .turn-off").show();
+                        $("#wxtip .turn-on").hide();
                     }
                     var i_mailpush = _vipData["i_mailpush"]
-					if(_vipData["s_email"]!=undefined){
-                    	s_email = _vipData["s_email"]
-					}
+                    if (_vipData["s_email"] != undefined) {
+                        s_email = _vipData["s_email"]
+                    }
                     $("#email").val(s_email);
-					$(".emailset>span").css("max-width",$("#emailtip").width()-80).text(s_email);
-                    if (i_mailpush!=undefined&&i_mailpush=="1"){
-                     	$("#emailtip .turn-on").show();
-                     	$("#emailtip .turn-off").hide();
-						$("#emailtip").addClass("on");
-						$(".emailset").show();
-                    }else{
-                     	$("#emailtip .turn-off").show();
-                     	$("#emailtip .turn-on").hide();
+                    $(".emailset>span").css("max-width", $("#emailtip").width() - 80).text(s_email);
+                    if (i_mailpush != undefined && i_mailpush == "1") {
+                        $("#emailtip .turn-on").show();
+                        $("#emailtip .turn-off").hide();
+                        $("#emailtip").addClass("on");
+                        $(".emailset").show();
+                    } else {
+                        $("#emailtip .turn-off").show();
+                        $("#emailtip .turn-on").hide();
                     }
                     var i_matchway = _vipData["i_matchway"]
-                    if (i_matchway!=undefined){
+                    if (i_matchway != undefined) {
                         $("#matchType li").eq(i_matchway).addClass("checked");
-                    }else{
+                    } else {
                         $("#matchType li").eq(1).addClass("checked");
                     }
-                }else{
-                     $("#pushfrequency li").eq(1).addClass("checked");
-                     $("#wxtip .turn-on").show();
-                     $("#emailtip .turn-off").show();
+                } else {
+                    $("#pushfrequency li").eq(1).addClass("checked");
+                    $("#wxtip .turn-on").show();
+                    $("#emailtip .turn-off").show();
+                }
+            })
+            ////////////////////////////////
+            $(".modal-dialog").css("margin-top", $(window).height() * 0.25);
+            //推送结果预览
+            $("#resultpreview").click(function () {
+                if (!clickDelayed) {
+                    return;
+                }
+                window.location.href = "/front/vipsubscribe/toVIPViewPage";
+            });
+
+            //微信提醒
+            $("#wxtip>img").click(function () {
+                var parentLi = $(this).parent();
+                if ($(this).hasClass("turn-on")) {
+                    if (!$("#emailtip").hasClass("on")) {
+                        EasyAlert.show(keepOneTipWayMsg);
+                        return;
+                    }
+                    parentLi.removeClass("on");
+                    parentLi.children(".turn-off").show();
+                    parentLi.children(".turn-on").hide();
+                } else {
+                    parentLi.addClass("on");
+                    parentLi.children(".turn-on").show();
+                    parentLi.children(".turn-off").hide();
+                }
+                saveData();
+            });
+            //邮件提醒
+            $("#emailtip>img").click(function () {
+                var parentLi = $(this).parent();
+                if ($(this).hasClass("turn-on")) {
+                    if (!$("#wxtip").hasClass("on")) {
+                        EasyAlert.show(keepOneTipWayMsg);
+                        return;
+                    }
+                    $(".emailset").hide();
+                    parentLi.removeClass("on");
+                    parentLi.children(".turn-off").show();
+                    parentLi.children(".turn-on").hide();
+                } else {
+                    if (s_email == "" || s_email == undefined) {
+                        $(".easypopup-content #email").focus();
+                        emailSetModalShow();
+                        return;
+                    } else {
+                        emailtipOn();
+                        $(".emailset").show();
+                    }
+                }
+                saveData();
+            });
+            $(".emailset>img").click(function () {
+                $("input#email").focus();
+                emailSetModalShow();
+            });
+            $("#sure").click(function () {
+                var thisValue = $.trim($("#email").val());
+                if (thisValue == "") {
+                    return
+                }
+                var szReg = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.|-|\-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
+                if (!szReg.test(thisValue)) {
+                    $(".error").removeClass("hide");
+                    return;
+                } else {
+                    $(".error").addClass("hide");
+                }
+                emailtipOn();
+                $(".emailset").show();
+                $(".emailset>span").text(thisValue);
+                emailSetModal.hide();
+                $("#setSuccess").hide().show();
+                setTimeout(function () {
+                    $("#setSuccess").hide();
+                }, EasyAlert.waitTime);
+                s_email = thisValue;
+                saveData();
+            });
+            $(".complate").click(function () {
+                if (!clickDelayed) {
+                    return;
+                }
+                window.history.go(-1);
+            });
+            //
+        });
+
+        //
+        function emailtipOn() {
+            $("#emailtip").addClass("on");
+            $("#emailtip").children(".turn-on").show();
+            $("#emailtip").children(".turn-off").hide();
+        }
+
+        //
+        function emailSetModalShow() {
+            $("#email").val(s_email);
+            $(".error").addClass("hide");
+            emailSetModal.show();
+        }
+
+        function saveData() {
+            var param = {
+                "pageType": "saveSeniorset",
+                "ratemode": 1,
+                "wxpush": 0,
+                "mailpush": 0,
+                "matchtype": 1,
+                "email": $("#email").val(),
+            };
+            s_email = $("#email").val();
+            if ($("#matchType li:eq(2)").hasClass("checked")) {
+                param["matchtype"] = 2;
+            }
+            $("#pushfrequency li").each(function () {
+                if ($(this).hasClass("checked")) {
+                    param["ratemode"] = $(this).attr("dataid");
                 }
             })
-			////////////////////////////////
-			$(".modal-dialog").css("margin-top",$(window).height()*0.25);
-			//推送结果预览
-			$("#resultpreview").click(function(){
-				if(!clickDelayed){
-					return;
-				}
-				window.location.href = "/front/vipsubscribe/toVIPViewPage";
-			});
-			
-			//微信提醒
-			$("#wxtip>img").click(function(){
-				var parentLi = $(this).parent();
-				if($(this).hasClass("turn-on")){
-					if(!$("#emailtip").hasClass("on")){
-						EasyAlert.show(keepOneTipWayMsg);
-						return;
-					}
-					parentLi.removeClass("on");
-					parentLi.children(".turn-off").show();
-					parentLi.children(".turn-on").hide();
-				}else{
-					parentLi.addClass("on");
-					parentLi.children(".turn-on").show();
-					parentLi.children(".turn-off").hide();
-				}
-				saveData();
-			});
-			//邮件提醒
-			$("#emailtip>img").click(function(){
-				var parentLi = $(this).parent();
-				if($(this).hasClass("turn-on")){
-					if(!$("#wxtip").hasClass("on")){
-						EasyAlert.show(keepOneTipWayMsg);
-						return;
-					}
-					$(".emailset").hide();
-					parentLi.removeClass("on");
-					parentLi.children(".turn-off").show();
-					parentLi.children(".turn-on").hide();
-				}else{
-					if(s_email == ""||s_email==undefined){
-						$(".easypopup-content #email").focus();
-						emailSetModalShow();
-						return;
-					}else{
-						emailtipOn();
-						$(".emailset").show();
-					}
-				}
-				saveData();
-			});
-			$(".emailset>img").click(function(){
-				$("input#email").focus();
-				emailSetModalShow();
-			});
-			$("#sure").click(function(){
-				var thisValue = $.trim($("#email").val());
-				if(thisValue==""){
-					return
-				}
-				var szReg=/^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.|-|\-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/; 
-				if(!szReg.test(thisValue)){
-					$(".error").removeClass("hide");
-					return;
-				}else{
-					$(".error").addClass("hide");
-				}
-				emailtipOn();
-				$(".emailset").show();
-				$(".emailset>span").text(thisValue);
-				emailSetModal.hide();
-				$("#setSuccess").hide().show();
-				setTimeout(function(){
-					$("#setSuccess").hide();
-				},EasyAlert.waitTime);
-				s_email = thisValue;
-				saveData();
-			});
-			$(".complate").click(function(){
-				if(!clickDelayed){
-					return;
-				}
-				window.history.go(-1);
-			});
-			//
-		});
-		//
-		function emailtipOn(){
-			$("#emailtip").addClass("on");
-			$("#emailtip").children(".turn-on").show();
-			$("#emailtip").children(".turn-off").hide();
-		}
-		//
-		function emailSetModalShow(){
-			$("#email").val(s_email);
-			$(".error").addClass("hide");
-			emailSetModal.show();
-		}
-		function saveData(){
-			var param = {
-				"pageType": "saveSeniorset",
-				"ratemode": 1,
-				"wxpush":0,
-				"mailpush":0,
-				"matchtype":1,
-				"email": $("#email").val(),
-			};
-			s_email = $("#email").val();
-			if($("#matchType li:eq(2)").hasClass("checked")){
-				param["matchtype"] = 2;
-			}
-			$("#pushfrequency li").each(function(){
-				if ($(this).hasClass("checked")){
-					param["ratemode"] = $(this).attr("dataid");
-				}
-			})
-			//
-			if($("#wxtip").hasClass("on")){
-				param["wxpush"] = 1;
-			}
-			if($("#emailtip").hasClass("on")){
-				param["mailpush"] = 1;
-			}
-			$.post("/subscribepay/afterPay/setUserInfo",param,function(r){
-				console.log(r)
-			});
-		}
-		//
-		function docheck(n,th){
-			if(parseInt(n)<5){
-				console.log("++++++++++++")
-				$("#pushfrequency li").each(function(){
-					var linum = $(this).attr("dataid");
-					$(this).removeClass("checked");
-					if(linum==n){
-						$(this).addClass("checked");
-					}
-				})
-			}else {
-				$("#matchType li").each(function(){
-					var linum = $(this).attr("dataid");
-					$(this).removeClass("checked");
-					if(linum==n){
-						$(this).addClass("checked");
-					}
-				})
-			}
-			saveData();
-		}
-	</script>
+            //
+            if ($("#wxtip").hasClass("on")) {
+                param["wxpush"] = 1;
+            }
+            if ($("#emailtip").hasClass("on")) {
+                param["mailpush"] = 1;
+            }
+            $.post("/subscribepay/afterPay/setUserInfo", param, function (r) {
+                if (r.flag) {
+                    var subVipState = sessionStorage.getItem('sub_vip_state')
+                    if (subVipState != "") {
+                        var reqData = JSON.parse(subVipState);
+                        reqData.ratemode = param.ratemode;
+                        sessionStorage.setItem('sub_vip_state', JSON.stringify(reqData))
+                    }
+                }
+                console.log(r)
+            });
+        }
+
+        //
+        function docheck(n, th) {
+            if (parseInt(n) < 5) {
+                console.log("++++++++++++")
+                $("#pushfrequency li").each(function () {
+                    var linum = $(this).attr("dataid");
+                    $(this).removeClass("checked");
+                    if (linum == n) {
+                        $(this).addClass("checked");
+                    }
+                })
+            } else {
+                $("#matchType li").each(function () {
+                    var linum = $(this).attr("dataid");
+                    $(this).removeClass("checked");
+                    if (linum == n) {
+                        $(this).addClass("checked");
+                    }
+                })
+            }
+            saveData();
+        }
+    </script>
 </head>
 <body class="seniorsetpage">
-	<div class="header">
-		推送设置<span class="complate">完成</span>
-	</div>
+<div class="header">
+    推送设置<span class="complate">完成</span>
+</div>
 
-	<div class="content">
-		<div id="pushfrequency">
-			<ul class="navchoose">
-				<li><img src="{{Msg "seo" "cdn"}}/images/wxkeyset/pushfrequency.png">推送时间</li>
-				<li onclick="docheck('1',this)" dataid="1">
-					实时推送
-					<img src="{{Msg "seo" "cdn"}}/images/wxkeyset/checked.png" class="checked-img">
-					<span>8点-20点实时推送</span>
-				</li>
-				<li onclick="docheck('2',this)" dataid="2">
-					每日推送
-					<img src="{{Msg "seo" "cdn"}}/images/wxkeyset/checked.png" class="checked-img">
-					<span>上午9点推送一次</span>
-				</li>
-				<li onclick="docheck('3',this)" dataid="3">
-					每周推送
-					<img src="{{Msg "seo" "cdn"}}/images/wxkeyset/checked.png" class="checked-img">
-					<span>每周五上午9点推送一次</span>
-				</li>
-				<li onclick="docheck('4',this)" dataid="4">
-					每月推送
-					<img src="{{Msg "seo" "cdn"}}/images/wxkeyset/checked.png" class="checked-img">
-					<span>每月28日上午9点推送一次</span>
-				</li>
-			</ul>
-		</div>
-		<div id="pushway">
-			<ul class="navchoose">
-				<li><img src="{{Msg "seo" "cdn"}}/images/wxkeyset/pushway.png">推送方式</li>
-				<li id="wxtip">
-					微信提醒
-					<img src="{{Msg "seo" "cdn"}}/images/wxkeyset/turn-on.png" class="turn-on">
-					<img src="{{Msg "seo" "cdn"}}/images/wxkeyset/turn-off.png" class="turn-off">
-				</li>
-				<li id="emailtip">
-					邮件提醒
-					<img src="{{Msg "seo" "cdn"}}/images/wxkeyset/turn-on.png" class="turn-on">
-					<img src="{{Msg "seo" "cdn"}}/images/wxkeyset/turn-off.png" class="turn-off">
-					<div class="emailset">
-						<span></span>
-						<img src="{{Msg "seo" "cdn"}}/images/wx/editemail.png">
-					</div>
-				</li>
-			</ul>
-		</div>
-		<div id="matchType">
-			<ul class="navchoose">
-				<li><img src="{{Msg "seo" "cdn"}}/vipsubscribe/image/matchType.png">关键词匹配方式</li>
-				<li onclick="docheck('5',this)" dataid="5">
-					按标题匹配
-					<img src="{{Msg "seo" "cdn"}}/images/wxkeyset/checked.png" class="checked-img">
-				</li>
-				<li onclick="docheck('6',this)" dataid="6">
-					按全文匹配
-					<img src="{{Msg "seo" "cdn"}}/images/wxkeyset/checked.png" class="checked-img">
-					<span>会产生无效信息，请根据需要选择</span>
-				</li>
-			</ul>
-		</div>
-		<div class="onenavbar" id="resultpreview">
-			<img src="{{Msg "seo" "cdn"}}/images/wxkeyset/resultpreview.png" class="img-left">
-			推送结果预览
-			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/right.png" class="img-right">
-		</div>
-	</div>
-	<div class="easypopup" id="emailSetModal">
-		<div class="easypopup-edit">
-			<div class="easypopup-header">设置邮件地址</div>
-			<div class="easypopup-content">
-				<input type="text" id="email" placeholder="邮件地址" class="form-control"/>
-				<div class="error hide">您输入的邮箱不正确，请重新输入</div>
-			</div>
-			<div class="easypopup-footer">
-				<span onclick="emailSetModal.hide();">取消</span>
-				<span id="sure">确定</span>
-			</div>
-		</div>
-	</div>
-	<div class="easyalert easyalert-icon" id="setSuccess">
-		<img src='{{Msg "seo" "cdn"}}/images/set-right.png' style='width: 49px;margin-bottom: 15px;margin-top: 25px;'><br>设置成功
-	</div>
-	{{include "/common/baiducc.html"}}
+<div class="content">
+    <div id="pushfrequency">
+        <ul class="navchoose">
+            <li><img src="{{Msg "seo" "cdn"}}/images/wxkeyset/pushfrequency.png">推送时间</li>
+            <li onclick="docheck('1',this)" dataid="1">
+                实时推送
+                <img src="{{Msg "seo" "cdn"}}/images/wxkeyset/checked.png" class="checked-img">
+                <span>8点-20点实时推送</span>
+            </li>
+            <li onclick="docheck('2',this)" dataid="2">
+                每日推送
+                <img src="{{Msg "seo" "cdn"}}/images/wxkeyset/checked.png" class="checked-img">
+                <span>上午9点推送一次</span>
+            </li>
+            <li onclick="docheck('3',this)" dataid="3">
+                每周推送
+                <img src="{{Msg "seo" "cdn"}}/images/wxkeyset/checked.png" class="checked-img">
+                <span>每周五上午9点推送一次</span>
+            </li>
+            <li onclick="docheck('4',this)" dataid="4">
+                每月推送
+                <img src="{{Msg "seo" "cdn"}}/images/wxkeyset/checked.png" class="checked-img">
+                <span>每月28日上午9点推送一次</span>
+            </li>
+        </ul>
+    </div>
+    <div id="pushway">
+        <ul class="navchoose">
+            <li><img src="{{Msg "seo" "cdn"}}/images/wxkeyset/pushway.png">推送方式</li>
+            <li id="wxtip">
+                微信提醒
+                <img src="{{Msg "seo" "cdn"}}/images/wxkeyset/turn-on.png" class="turn-on">
+                <img src="{{Msg "seo" "cdn"}}/images/wxkeyset/turn-off.png" class="turn-off">
+            </li>
+            <li id="emailtip">
+                邮件提醒
+                <img src="{{Msg "seo" "cdn"}}/images/wxkeyset/turn-on.png" class="turn-on">
+                <img src="{{Msg "seo" "cdn"}}/images/wxkeyset/turn-off.png" class="turn-off">
+                <div class="emailset">
+                    <span></span>
+                    <img src="{{Msg "seo" "cdn"}}/images/wx/editemail.png">
+                </div>
+            </li>
+        </ul>
+    </div>
+    <div id="matchType">
+        <ul class="navchoose">
+            <li><img src="{{Msg "seo" "cdn"}}/vipsubscribe/image/matchType.png">关键词匹配方式</li>
+            <li onclick="docheck('5',this)" dataid="5">
+                按标题匹配
+                <img src="{{Msg "seo" "cdn"}}/images/wxkeyset/checked.png" class="checked-img">
+            </li>
+            <li onclick="docheck('6',this)" dataid="6">
+                按全文匹配
+                <img src="{{Msg "seo" "cdn"}}/images/wxkeyset/checked.png" class="checked-img">
+                <span>会产生无效信息，请根据需要选择</span>
+            </li>
+        </ul>
+    </div>
+    <div class="onenavbar" id="resultpreview">
+        <img src="{{Msg "seo" "cdn"}}/images/wxkeyset/resultpreview.png" class="img-left">
+        推送结果预览
+        <img src="{{Msg "seo" "cdn"}}/wxswordfish/images/right.png" class="img-right">
+    </div>
+</div>
+<div class="easypopup" id="emailSetModal">
+    <div class="easypopup-edit">
+        <div class="easypopup-header">设置邮件地址</div>
+        <div class="easypopup-content">
+            <input type="text" id="email" placeholder="邮件地址" class="form-control"/>
+            <div class="error hide">您输入的邮箱不正确，请重新输入</div>
+        </div>
+        <div class="easypopup-footer">
+            <span onclick="emailSetModal.hide();">取消</span>
+            <span id="sure">确定</span>
+        </div>
+    </div>
+</div>
+<div class="easyalert easyalert-icon" id="setSuccess">
+    <img src='{{Msg "seo" "cdn"}}/images/set-right.png' style='width: 49px;margin-bottom: 15px;margin-top: 25px;'><br>设置成功
+</div>
+{{include "/common/baiducc.html"}}
 </body>
 </html>