Эх сурвалжийг харах

Merge branch 'dev2.8.5' of http://192.168.3.207:10080/qmx/jy into dev2.8.5

zhangxinlei1996 5 жил өмнө
parent
commit
e1e057ed62

+ 3 - 0
src/jfw/modules/pushsubscribe/src/match/job/matchjob.go

@@ -466,6 +466,7 @@ func (m *MatchJob) EachAllBidInfo(matcher Matcher, datas *[]map[string]interface
 		matchWaitGroup.Add(1)
 		go func(info map[string]interface{}) {
 			defer func() {
+				util.Catch()
 				matchWaitGroup.Done()
 				<-matchPool
 			}()
@@ -523,6 +524,7 @@ func (m *MatchJob) ToMatch(batchIndex int, matcher Matcher, datas *[]map[string]
 		saveWaitGroup.Add(1)
 		go func(user *UserInfo, infos *SortList) {
 			defer func() {
+				util.Catch()
 				<-savePool
 				saveWaitGroup.Done()
 			}()
@@ -639,6 +641,7 @@ func (m *MatchJob) ToRelationProject(projectUser *map[*UserInfo]*[]string, myMat
 		saveWaitGroup.Add(1)
 		go func(user *UserInfo, _ids *[]string) {
 			defer func() {
+				util.Catch()
 				<-savePool
 				saveWaitGroup.Done()
 			}()

BIN
src/jfw/modules/pushsubscribe/src/match/match


+ 2 - 0
src/jfw/modules/pushsubscribe/src/push/job/movejob.go

@@ -49,6 +49,7 @@ func (m *MoveJob) Execute() {
 		index++
 		go func(temp map[string]interface{}) {
 			defer func() {
+				util.Catch()
 				<-movePool
 				moveWait.Done()
 			}()
@@ -134,6 +135,7 @@ func (m *MoveJob) merge(number *int, nowUnix int64, moveUsers map[string]*MoveUs
 		mergeWait.Add(1)
 		go func(userId string, moveUser *MoveUser) {
 			defer func() {
+				util.Catch()
 				<-mergePool
 				mergeWait.Done()
 			}()

+ 2 - 0
src/jfw/modules/pushsubscribe/src/push/job/projectjob.go

@@ -41,6 +41,7 @@ func (p *ProjectPushJob) Execute() {
 			pushWait.Add(1)
 			go func(userId string, list []map[string]interface{}) {
 				defer func() {
+					util.Catch()
 					<-pushPool
 					pushWait.Done()
 				}()
@@ -269,6 +270,7 @@ func (p *ProjectPushJob) loadProject() *sync.Map {
 		loadWait.Add(1)
 		go func(data map[string]interface{}) {
 			defer func() {
+				util.Catch()
 				<-loadPool
 				loadWait.Done()
 			}()

+ 1 - 0
src/jfw/modules/pushsubscribe/src/push/job/pushjob.go

@@ -96,6 +96,7 @@ func (p *PushJob) StartPush(pusher Pusher, taskType int) {
 			pushWait.Add(1)
 			go func(v map[string]interface{}, take bool) {
 				defer func() {
+					util.Catch()
 					if take {
 						<-pushPool
 					}

BIN
src/jfw/modules/pushsubscribe/src/push/push


+ 2 - 2
src/web/templates/weixin/vipsubscribe/choose_area.html

@@ -564,10 +564,10 @@
             //提示
             if (!this.vipSubisTrial) {
                 if (selectCityMax > 2) {
-                    $('.tips_btn .tips_d_text').text("已选择" + selectCityMax + "个市,建议购买“全省”更划算哦~").slideDown();
+                    $('.tips_btn .tips_d_text').text("已选择" + selectCityMax + "个市,建议购买“全省”").slideDown();
                 } else {
                     if (selectProvince > 9) {
-                        $('.tips_btn .tips_d_text').text("已选择" + selectProvince + "个省,建议购买“全国”更划算哦~").slideDown()
+                        $('.tips_btn .tips_d_text').text("已选择" + selectProvince + "个省,建议购买“全国”").slideDown()
                     } else {
                         $(".tips_d_text").slideUp();
                     }

+ 381 - 381
src/web/templates/weixin/vipsubscribe/choose_industry.html

@@ -1,394 +1,394 @@
 <!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" 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/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
-        <link rel="stylesheet" href="/vipsubscribe/css/choose_industry.css?v={{Msg "seo" "version"}}">
-    </head>
-    <body>
-        <main class="choose_industry main">
-            <div class="result">
-                <span class="label">已选择:</span>
-                <span class="result_name">全部行业</span>
-            </div>
-            <div class="form">
-                <div class="select-area-box">
-                    <ul class="list">
-                        <li class="list_item" id="all">
-                            <div class="item_label"></div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">全部行业</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="A">
-                            <div class="item_label">A</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">安监</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="B">
-                            <div class="item_label">B</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">保监</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="C">
-                            <div class="item_label">C</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">财政</button>
-                                <button class="industry_item">传媒</button>
-                                <button class="industry_item">城管</button>
-                                <button class="industry_item">采矿业</button>
-                                <button class="industry_item">出版广电</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="D">
-                            <div class="item_label">D</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">档案</button>
-                                <button class="industry_item">地震</button>
-                                <button class="industry_item">党委办</button>
-                                <button class="industry_item">电信行业</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="F">
-                            <div class="item_label">F</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">法院</button>
-                                <button class="industry_item">发改</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="G">
-                            <div class="item_label">G</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">工商</button>
-                                <button class="industry_item">工信</button>
-                                <button class="industry_item">国土</button>
-                                <button class="industry_item">公安</button>
-                                <button class="industry_item">国资委</button>
-                                <button class="industry_item">公共资源交易</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="H">
-                            <div class="item_label">H</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">环保</button>
-                                <button class="industry_item">海关</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="J">
-                            <div class="item_label">J</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">教育</button>
-                                <button class="industry_item">军队</button>
-                                <button class="industry_item">交通</button>
-                                <button class="industry_item">纪委</button>
-                                <button class="industry_item">金融业</button>
-                                <button class="industry_item">建筑业</button>
-                                <button class="industry_item">检察院</button>
-                                <button class="industry_item">机关事务</button>
-                            </div>
-                        </li>
-                        <li class="list_item"  id="K">
-                            <div class="item_label">K</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">科技</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="L">
-                            <div class="item_label">L</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">林业</button>
-                                <button class="industry_item">旅游</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="M">
-                            <div class="item_label">M</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">民政</button>
-                                <button class="industry_item">民宗</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="N">
-                            <div class="item_label">N</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">农业</button>
-                                <button class="industry_item">能源化工</button>
-                                <button class="industry_item">农林牧渔</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="P">
-                            <div class="item_label">P</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">批发零售</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="Q">
-                            <div class="item_label">Q</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">气象</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="R">
-                            <div class="item_label">R</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">人行</button>
-                                <button class="industry_item">人社</button>
-                                <button class="industry_item">人大</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="S">
-                            <div class="item_label">S</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">食药</button>
-                                <button class="industry_item">税务</button>
-                                <button class="industry_item">水利</button>
-                                <button class="industry_item">市政</button>
-                                <button class="industry_item">审计</button>
-                                <button class="industry_item">商务</button>
-                                <button class="industry_item">司法</button>
-                                <button class="industry_item">社会团体</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="T">
-                            <div class="item_label">T</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">统计</button>
-                                <button class="industry_item">统战</button>
-                                <button class="industry_item">体育</button>
-                            </div>
-                        </li>                    
-                        <li class="list_item" id="W">
-                            <div class="item_label">W</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">文化</button>
-                                <button class="industry_item">卫生</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="X">
-                            <div class="item_label">X</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">学校</button>
-                                <button class="industry_item">宣传</button>
-                                <button class="industry_item">信息技术</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="Y">
-                            <div class="item_label">Y</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">医疗</button>
-                                <button class="industry_item">银监</button>
-                                <button class="industry_item">运输物流</button>
-                            </div>
-                        </li>
-                        <li class="list_item" id="Z">
-                            <div class="item_label">Z</div>
-                            <div class="item_industry_list">
-                                <button class="industry_item">质监</button>
-                                <button class="industry_item">组织</button>
-                                <button class="industry_item">政协</button>
-                                <button class="industry_item">住建</button>
-                                <button class="industry_item">证监</button>
-                                <button class="industry_item">政府办</button>
-                                <button class="industry_item">制造业</button>
-                                <button class="industry_item">政务中心</button>
-                                <button class="industry_item">住宿餐饮</button>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-            <div class="slide">
-                <a href="javascript:;">#</a>
-                <a href="javascript:;">A</a>
-                <a href="javascript:;">B</a>
-                <a href="javascript:;">C</a>
-                <a href="javascript:;">D</a>
-                <a href="javascript:;">F</a>
-                <a href="javascript:;">G</a>
-                <a href="javascript:;">H</a>
-                <a href="javascript:;">J</a>
-                <a href="javascript:;">K</a>
-                <a href="javascript:;">L</a>
-                <a href="javascript:;">M</a>
-                <a href="javascript:;">N</a>
-                <a href="javascript:;">P</a>
-                <a href="javascript:;">Q</a>
-                <a href="javascript:;">R</a>
-                <a href="javascript:;">S</a>
-                <a href="javascript:;">T</a>
-                <a href="javascript:;">W</a>
-                <a href="javascript:;">X</a>
-                <a href="javascript:;">Y</a>
-                <a href="javascript:;">Z</a>
-            </div>
-            <div class="tips_btn">
-                <div class="tips_discount">
-                    <div class="tips_d_money" style="display: none">&yen;38</div>
-                    <div class="tips_d_text">已选择4个行业,建议购买“全部行业”更划算哦~</div>
-                </div>
-                <div class="btns">
-                    <button class="reset-btn" disabled >重置</button>
-                    <button class="save-btn"  disabled >确认</button>
-                </div>
-            </div>
-        </main>
-        <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>
-              
-           // 点击导航跳转
-            $("body").on('click','.slide a',function(){
-                var s = $(this).html()
-                if(s == '#'){
-                    return;
-                }
-                document.querySelector('#' + s).scrollIntoView({block:'center'});
-            })
-            
-            function insertIndustryItem (letter, industryArr = []) {
-                if (!letter) return
-                var query = `#${letter[0].toUpperCase()} .item_industry_list`
-                var industryItemContainer = $(query)
-                var buttonArr = []
+<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" 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/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
+    <link rel="stylesheet" href="/vipsubscribe/css/choose_industry.css?v={{Msg "seo" "version"}}">
+</head>
+<body>
+<main class="choose_industry main">
+    <div class="result">
+        <span class="label">已选择:</span>
+        <span class="result_name">全部行业</span>
+    </div>
+    <div class="form">
+        <div class="select-area-box">
+            <ul class="list">
+                <li class="list_item" id="all">
+                    <div class="item_label"></div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">全部行业</button>
+                    </div>
+                </li>
+                <li class="list_item" id="A">
+                    <div class="item_label">A</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">安监</button>
+                    </div>
+                </li>
+                <li class="list_item" id="B">
+                    <div class="item_label">B</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">保监</button>
+                    </div>
+                </li>
+                <li class="list_item" id="C">
+                    <div class="item_label">C</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">财政</button>
+                        <button class="industry_item">传媒</button>
+                        <button class="industry_item">城管</button>
+                        <button class="industry_item">采矿业</button>
+                        <button class="industry_item">出版广电</button>
+                    </div>
+                </li>
+                <li class="list_item" id="D">
+                    <div class="item_label">D</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">档案</button>
+                        <button class="industry_item">地震</button>
+                        <button class="industry_item">党委办</button>
+                        <button class="industry_item">电信行业</button>
+                    </div>
+                </li>
+                <li class="list_item" id="F">
+                    <div class="item_label">F</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">法院</button>
+                        <button class="industry_item">发改</button>
+                    </div>
+                </li>
+                <li class="list_item" id="G">
+                    <div class="item_label">G</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">工商</button>
+                        <button class="industry_item">工信</button>
+                        <button class="industry_item">国土</button>
+                        <button class="industry_item">公安</button>
+                        <button class="industry_item">国资委</button>
+                        <button class="industry_item">公共资源交易</button>
+                    </div>
+                </li>
+                <li class="list_item" id="H">
+                    <div class="item_label">H</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">环保</button>
+                        <button class="industry_item">海关</button>
+                    </div>
+                </li>
+                <li class="list_item" id="J">
+                    <div class="item_label">J</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">教育</button>
+                        <button class="industry_item">军队</button>
+                        <button class="industry_item">交通</button>
+                        <button class="industry_item">纪委</button>
+                        <button class="industry_item">金融业</button>
+                        <button class="industry_item">建筑业</button>
+                        <button class="industry_item">检察院</button>
+                        <button class="industry_item">机关事务</button>
+                    </div>
+                </li>
+                <li class="list_item" id="K">
+                    <div class="item_label">K</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">科技</button>
+                    </div>
+                </li>
+                <li class="list_item" id="L">
+                    <div class="item_label">L</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">林业</button>
+                        <button class="industry_item">旅游</button>
+                    </div>
+                </li>
+                <li class="list_item" id="M">
+                    <div class="item_label">M</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">民政</button>
+                        <button class="industry_item">民宗</button>
+                    </div>
+                </li>
+                <li class="list_item" id="N">
+                    <div class="item_label">N</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">农业</button>
+                        <button class="industry_item">能源化工</button>
+                        <button class="industry_item">农林牧渔</button>
+                    </div>
+                </li>
+                <li class="list_item" id="P">
+                    <div class="item_label">P</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">批发零售</button>
+                    </div>
+                </li>
+                <li class="list_item" id="Q">
+                    <div class="item_label">Q</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">气象</button>
+                    </div>
+                </li>
+                <li class="list_item" id="R">
+                    <div class="item_label">R</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">人行</button>
+                        <button class="industry_item">人社</button>
+                        <button class="industry_item">人大</button>
+                    </div>
+                </li>
+                <li class="list_item" id="S">
+                    <div class="item_label">S</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">食药</button>
+                        <button class="industry_item">税务</button>
+                        <button class="industry_item">水利</button>
+                        <button class="industry_item">市政</button>
+                        <button class="industry_item">审计</button>
+                        <button class="industry_item">商务</button>
+                        <button class="industry_item">司法</button>
+                        <button class="industry_item">社会团体</button>
+                    </div>
+                </li>
+                <li class="list_item" id="T">
+                    <div class="item_label">T</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">统计</button>
+                        <button class="industry_item">统战</button>
+                        <button class="industry_item">体育</button>
+                    </div>
+                </li>
+                <li class="list_item" id="W">
+                    <div class="item_label">W</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">文化</button>
+                        <button class="industry_item">卫生</button>
+                    </div>
+                </li>
+                <li class="list_item" id="X">
+                    <div class="item_label">X</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">学校</button>
+                        <button class="industry_item">宣传</button>
+                        <button class="industry_item">信息技术</button>
+                    </div>
+                </li>
+                <li class="list_item" id="Y">
+                    <div class="item_label">Y</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">医疗</button>
+                        <button class="industry_item">银监</button>
+                        <button class="industry_item">运输物流</button>
+                    </div>
+                </li>
+                <li class="list_item" id="Z">
+                    <div class="item_label">Z</div>
+                    <div class="item_industry_list">
+                        <button class="industry_item">质监</button>
+                        <button class="industry_item">组织</button>
+                        <button class="industry_item">政协</button>
+                        <button class="industry_item">住建</button>
+                        <button class="industry_item">证监</button>
+                        <button class="industry_item">政府办</button>
+                        <button class="industry_item">制造业</button>
+                        <button class="industry_item">政务中心</button>
+                        <button class="industry_item">住宿餐饮</button>
+                    </div>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <div class="slide">
+        <a href="javascript:;">#</a>
+        <a href="javascript:;">A</a>
+        <a href="javascript:;">B</a>
+        <a href="javascript:;">C</a>
+        <a href="javascript:;">D</a>
+        <a href="javascript:;">F</a>
+        <a href="javascript:;">G</a>
+        <a href="javascript:;">H</a>
+        <a href="javascript:;">J</a>
+        <a href="javascript:;">K</a>
+        <a href="javascript:;">L</a>
+        <a href="javascript:;">M</a>
+        <a href="javascript:;">N</a>
+        <a href="javascript:;">P</a>
+        <a href="javascript:;">Q</a>
+        <a href="javascript:;">R</a>
+        <a href="javascript:;">S</a>
+        <a href="javascript:;">T</a>
+        <a href="javascript:;">W</a>
+        <a href="javascript:;">X</a>
+        <a href="javascript:;">Y</a>
+        <a href="javascript:;">Z</a>
+    </div>
+    <div class="tips_btn">
+        <div class="tips_discount">
+            <div class="tips_d_money" style="display: none">&yen;38</div>
+            <div class="tips_d_text">已选择4个行业,建议购买“全部行业”更划算哦~</div>
+        </div>
+        <div class="btns">
+            <button class="reset-btn" disabled>重置</button>
+            <button class="save-btn" disabled>确认</button>
+        </div>
+    </div>
+</main>
+<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>
 
-                for (var i = 0; i < industryArr.length; i++) {
-                    buttonArr.push(`<button class="industry_item" ${industryArr[i].disabled ? 'disabled': ''}>${industryArr[i].name}</button>`)
-                }
-                industryItemContainer.html(buttonArr.join(''))
-            }
-            
-            function findSelectedIndustry () {
-                var buttons = $('.select-area-box .list button')
-                // 找到已选择的数组(有active类的数组)
-                var selectedArr = []
-                buttons.each(function(){
-                    if ($(this).hasClass('active')) {
-                        if($(this).attr("disabled")!="disabled"){
-                          selectedArr.push($(this).text())
-                        }
-                    }
-                })
-                              
-                // 显示隐藏优惠tips
-                if (selectedArr.length >= 4 && !vipSubisTrial) {
-                    $('.tips_btn .tips_d_text').text("已选择"+selectedArr.length+"个行业,建议购买“全部行业”更划算哦~").slideDown()
-                } else {
-                    $('.tips_btn .tips_d_text').slideUp()
-                }
-          
-                if(selectedArr.length>0){//是否已选择
-                  selectedIndustryArr = selectedArr
-                  
-                  $(".reset-btn").removeAttr("disabled");
-                  $(".save-btn").removeAttr("disabled");
-                  flushPrice()//刷新价格
-                }
-          
-                
-                var selectedStr = selectedArr.join('、')
-                $('.result .result_name').text(selectedStr)
+    // 点击导航跳转
+    $("body").on('click', '.slide a', function () {
+        var s = $(this).html()
+        if (s == '#') {
+            return;
+        }
+        document.querySelector('#' + s).scrollIntoView({block: 'center'});
+    })
 
-                if (selectedArr.length === 0&&selectedIndustryArr[0]!="一个行业") {
-                    var allButton = $('#all button')
-                    allButton.trigger('click')
-                    $('.result .result_name').text(allButton.text())
-                }
-                if (selectedArr.length === buttons.length - 1) {
-                    // 除全部行业外所有按钮都被选中了
-                    $('#all button').trigger('click');
+    function insertIndustryItem(letter, industryArr = []) {
+        if (!letter) return
+        var query = `#${letter[0].toUpperCase()} .item_industry_list`
+        var industryItemContainer = $(query)
+        var buttonArr = []
+
+        for (var i = 0; i < industryArr.length; i++) {
+            buttonArr.push(`<button class="industry_item" ${industryArr[i].disabled ? 'disabled' : ''}>${industryArr[i].name}</button>`)
+        }
+        industryItemContainer.html(buttonArr.join(''))
+    }
+
+    function findSelectedIndustry(notShowTip) {
+        var buttons = $('.select-area-box .list button')
+        // 找到已选择的数组(有active类的数组)
+        var selectedArr = []
+        buttons.each(function () {
+            if ($(this).hasClass('active')) {
+                if ($(this).attr("disabled") != "disabled") {
+                    selectedArr.push($(this).text())
                 }
-                //调整高度
-                $(".select-area-box .list").css("margin-top",$(".result").height()+20);
-                
-                
-                               
             }
-                      
-            function showSelect(arr,canclick){
-              if(!arr)return
-              arr.forEach(v => {
-                $($('.industry_item')).each(function (index, dom) {
-                    if (canclick&&v!="全部行业"){
-                      $('#all').children().children('button').removeClass('active');
-                    } 
-                    if (v == $(dom).text()) {
-                      $(dom).addClass("active").attr({"disabled":!canclick})
-                    }
-                })
-              })
-            }
-            
-            function flushPrice(){
-              if(!vipSubisTrial){
-                var price=getsubVipOrderPrice(selectedAreaObj,selectedIndustryArr,timeSelect);
-                $('.tips_d_money').css("display","block").text('¥'+price);
-              }
-            }
-            
-            // 每个button的点击事件
-            $('.select-area-box .list').on('click', 'button', function (e) {
-                $('.tips_btn .btns button').removeAttr('disabled')
+        })
 
-                $(this).toggleClass('active')
-                // 如果点击全部行业,则其他所有按钮都取消active
-                if ($(this).parents('li')[0].id === 'all') {
-                    $('.select-area-box .list button').removeClass('active')
-                    $('#all button').addClass('active')
-                } else {
-                    $('#all button').removeClass('active')
-                }
-                
-                findSelectedIndustry()                
-            })
+        // 显示隐藏优惠tips
+        if (selectedArr.length >= 4 && !vipSubisTrial && !notShowTip) {
+            $('.tips_btn .tips_d_text').text("已选择" + selectedArr.length + "个行业,建议购买“全部行业”").slideDown()
+        } else {
+            $('.tips_btn .tips_d_text').slideUp()
+        }
 
-            // 重置按钮事件
-            $('.reset-btn').on('click', function () {
-              $("#all .industry_item").trigger("click");
-            })
-           
-            //=======================
-             
+        if (selectedArr.length > 0) {//是否已选择
+            selectedIndustryArr = selectedArr
 
-             // 确认按钮事件
-            $('.save-btn').on('click', function () {
-                console.log(selectedIndustryArr)
-                sessionStorage.setItem("vipSubSelectIndustry",JSON.stringify(selectedIndustryArr));
-                history.go(-1);
-            })
-                       
-            var selectedIndustryArr =["一个行业"] //已选择行业
-            var selectedAreaObj = {"一个省":["一个市"]} //计算价格临时变量
-            var timeSelect = [1,2]//计算价格临时变量 timeSelect[0]时长  timeSelect[1] 1:年 2:月
-            var vipSubisTrial = false;
-            $(function(){
-              try{
-                if(sessionStorage.getItem("vipSubSelectIndustry")){
-                  selectedIndustryArr=JSON.parse(sessionStorage.getItem("vipSubSelectIndustry"));
-                }
-                if(sessionStorage.getItem("vipSubSelectArea")){
-                  selectedAreaObj=JSON.parse(sessionStorage.getItem("vipSubSelectArea"));
+            $(".reset-btn").removeAttr("disabled");
+            $(".save-btn").removeAttr("disabled");
+            flushPrice()//刷新价格
+        }
+
+
+        var selectedStr = selectedArr.join('、')
+        $('.result .result_name').text(selectedStr)
+
+        if (selectedArr.length === 0 && selectedIndustryArr[0] != "一个行业") {
+            var allButton = $('#all button')
+            allButton.trigger('click')
+            $('.result .result_name').text(allButton.text())
+        }
+        if (selectedArr.length === buttons.length - 1) {
+            // 除全部行业外所有按钮都被选中了
+            $('#all button').trigger('click');
+        }
+        //调整高度
+        $(".select-area-box .list").css("margin-top", $(".result").height() + 20);
+
+
+    }
+
+    function showSelect(arr, canclick) {
+        if (!arr) return
+        arr.forEach(v => {
+            $($('.industry_item')).each(function (index, dom) {
+                if (canclick && v != "全部行业") {
+                    $('#all').children().children('button').removeClass('active');
                 }
-                if(sessionStorage.getItem("vipSubSelectTime")){
-                  timeSelect=JSON.parse(sessionStorage.getItem("vipSubSelectTime"));
+                if (v == $(dom).text()) {
+                    $(dom).addClass("active").attr({"disabled": !canclick})
                 }
-                //是否试用界面
-                if(sessionStorage.getItem("vipSubisTrial")) vipSubisTrial=true;
-              }catch(e){
-                console.log(e)
-              }
-              //已选择
-              showSelect(selectedIndustryArr,true);
-              findSelectedIndustry();
             })
-        </script>
-    </body>
+        })
+    }
+
+    function flushPrice() {
+        if (!vipSubisTrial) {
+            var price = getsubVipOrderPrice(selectedAreaObj, selectedIndustryArr, timeSelect);
+            $('.tips_d_money').css("display", "block").text('¥' + price);
+        }
+    }
+
+    // 每个button的点击事件
+    $('.select-area-box .list').on('click', 'button', function (e) {
+        $('.tips_btn .btns button').removeAttr('disabled')
+
+        $(this).toggleClass('active')
+        // 如果点击全部行业,则其他所有按钮都取消active
+        if ($(this).parents('li')[0].id === 'all') {
+            $('.select-area-box .list button').removeClass('active')
+            $('#all button').addClass('active')
+        } else {
+            $('#all button').removeClass('active')
+        }
+
+        findSelectedIndustry()
+    })
+
+    // 重置按钮事件
+    $('.reset-btn').on('click', function () {
+        $("#all .industry_item").trigger("click");
+    })
+
+    //=======================
+
+
+    // 确认按钮事件
+    $('.save-btn').on('click', function () {
+        console.log(selectedIndustryArr)
+        sessionStorage.setItem("vipSubSelectIndustry", JSON.stringify(selectedIndustryArr));
+        history.go(-1);
+    })
+
+    var selectedIndustryArr = ["一个行业"] //已选择行业
+    var selectedAreaObj = {"一个省": ["一个市"]} //计算价格临时变量
+    var timeSelect = [1, 2]//计算价格临时变量 timeSelect[0]时长  timeSelect[1] 1:年 2:月
+    var vipSubisTrial = false;
+    $(function () {
+        try {
+            if (sessionStorage.getItem("vipSubSelectIndustry")) {
+                selectedIndustryArr = JSON.parse(sessionStorage.getItem("vipSubSelectIndustry"));
+            }
+            if (sessionStorage.getItem("vipSubSelectArea")) {
+                selectedAreaObj = JSON.parse(sessionStorage.getItem("vipSubSelectArea"));
+            }
+            if (sessionStorage.getItem("vipSubSelectTime")) {
+                timeSelect = JSON.parse(sessionStorage.getItem("vipSubSelectTime"));
+            }
+            //是否试用界面
+            if (sessionStorage.getItem("vipSubisTrial")) vipSubisTrial = true;
+        } catch (e) {
+            console.log(e)
+        }
+        //已选择
+        showSelect(selectedIndustryArr, true);
+        findSelectedIndustry(true);
+    })
+</script>
+</body>
 </html>

+ 27 - 27
src/web/templates/weixin/vipsubscribe/vip_purchase.html

@@ -174,7 +174,7 @@
                         <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="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">
@@ -369,10 +369,10 @@
                     {{end}}
                     {{if .T.again}}    //再次购买回显
                     {{if eq .T.again 1 }}
-                    var orderCode=getParam("orderCode")
+                    var orderCode = getParam("orderCode")
                     if (!sessionStorage.getItem("vipSubSelectArea") || !sessionStorage.getItem("vipSubSelectIndustry")) {
-                      $DoPost("/subscribepay/orderListDetails/getVipOrderInfo", {"orderCode":orderCode}, function (r) {
-                           if (!$.isEmptyObject(r.data.area)) {
+                        $DoPost("/subscribepay/orderListDetails/getVipOrderInfo", {"orderCode": orderCode}, function (r) {
+                            if (!$.isEmptyObject(r.data.area)) {
                                 purchase.areaSelect = r.data.area
                             } else {
                                 purchase.areaSelect = {"全国": []}
@@ -389,7 +389,7 @@
                             sessionStorage.setItem("vipSubSelectArea", JSON.stringify(purchase.areaSelect));
                             sessionStorage.setItem("vipSubSelectIndustry", JSON.stringify(purchase.industrySelect));
                             //sessionStorage.setItem("vipSubSelectTime", JSON.stringify(purchase.timeSelect));
-                          
+
                         }, false)
                     }
                     {{end}}
@@ -479,7 +479,7 @@
                     $(".number_box:eq(0)").addClass("active");
                     $("#number_box_month .month_number").text(this.timeSelect[0]);
                     if (this.timeSelect[0] >= 10) {
-                        $('.profit_tips').text("已选择" + this.timeSelect[0] + "个月,建议“按年订阅”更换算哦~").show();
+                        $('.profit_tips').text("已选择" + this.timeSelect[0] + "个月,建议“按年订阅”").show();
                     }
                 }
                 $(".info.choose_time").val(tmp);
@@ -584,7 +584,7 @@
                 var firstButton = $('#number_box_month button:first');
                 var lastButton = $('#number_box_month button:last');
                 if (currentNum >= 10) {
-                    $('.profit_tips').text("已选择" + currentNum + "个月,建议“按年订阅”更换算哦~").show();
+                    $('.profit_tips').text("已选择" + currentNum + "个月,建议“按年订阅”").show();
                 } else {
                     $('.profit_tips').hide();
                 }
@@ -748,27 +748,27 @@
             sessionStorage.removeItem("vipSubSelectTime");
             sessionStorage.removeItem("vipSub_read");
         }
-        
+
         /******* 获取url参数(正则)********/
-		function getParam(name) {
-		    var search = document.location.search;
-		    // alert(search);
-		    var pattern = new RegExp("[?&]" + name + "\=([^&]+)", "g");
-		    var matcher = pattern.exec(search);
-		    var items = null;
-		    if (null != matcher) {
-		        try {
-		            items = decodeURIComponent(decodeURIComponent(matcher[1]));
-		        } catch (e) {
-		            try {
-		                items = decodeURIComponent(matcher[1]);
-		            } catch (e) {
-		                items = matcher[1];
-		            }
-		        }
-		    }
-		    return items;
-		};
+        function getParam(name) {
+            var search = document.location.search;
+            // alert(search);
+            var pattern = new RegExp("[?&]" + name + "\=([^&]+)", "g");
+            var matcher = pattern.exec(search);
+            var items = null;
+            if (null != matcher) {
+                try {
+                    items = decodeURIComponent(decodeURIComponent(matcher[1]));
+                } catch (e) {
+                    try {
+                        items = decodeURIComponent(matcher[1]);
+                    } catch (e) {
+                        items = matcher[1];
+                    }
+                }
+            }
+            return items;
+        };
 
     </script>
 </div>