弹框优化

src/jfw/front/swordfish.go

@@ -2400,6 +2400,7 @@ func (f *Front) HasPushHistory() {
 		}
 	}
 	userId := util.ObjToString(f.GetSession("userId"))
+	var industry_ = []string{}
 	if userId == "" {
 		return
 	}
@@ -2411,6 +2412,7 @@ func (f *Front) HasPushHistory() {
 	tedayNum := time.Unix(time.Now().Unix(), 1).Format("20060102")
 	isOnTail := 0
 	var o_jy map[string]interface{}
+	isread := false
 	var keys []string
 	otherFlag := false
 	if user != nil {
@@ -2430,7 +2432,11 @@ func (f *Front) HasPushHistory() {
 			var twoRemind = int64(2 * 24 * 60 * 60)
 			var oneRemind = int64(1 * 24 * 60 * 60)
 			var o_vipjy map[string]interface{}
+			if (*user)["isread"]!=nil{
+				isread = (*user)["isread"].(bool)
+			}
 			o_vipjy, _ = (*user)["o_vipjy"].(map[string]interface{})
+			industry_ = util.ObjArrToStringArr(o_vipjy["a_buyerclass"].([]interface{}))
 			if o_vipjy["a_items"] != nil {
 				a_itmes := util.ObjArrToMapArr(o_vipjy["a_items"].([]interface{}))
 				hasKeyFlag = len(a_itmes) > 0
@@ -2496,6 +2502,8 @@ func (f *Front) HasPushHistory() {
 		"userId":      util.EncodeArticleId(userId),
 		"keys":        keys,
 		"otherFlag":   otherFlag,
+		"industry":    industry_,
+		"isread":      isread,
 	})
 }
 
@@ -2529,6 +2537,7 @@ func (f *Front) Historypush() error {
 	f.T["openid"] = se.EncodeString(myopenid)
 	f.T["stime"] = times
 	f.T["isVip"] = util.IntAll((*data)["i_vip_status"]) > 0
+	f.T["isread"] = (*data)["isread"]
 	f.T["userId"] = userId
 	return f.Render("/weixin/historypush.html", &f.T)
 }

src/jfw/modules/app/src/app/front/swordfish.go

@@ -720,7 +720,7 @@ func (f *Front) Historypush() error {
 		f.T["selectTime"] = selectTime
 		vipSubtips := 1
 		// 打开推送
-		data, ok := mongodb.FindById("user", userId, `{"i_vip_subtips":1}`)
+		data, ok := mongodb.FindById("user", userId, `{"i_vip_subtips":1,"isread":1}`)
 		if ok && data != nil && len(*data) > 0 {
 			//VIP服务到期
 			i_vip_subtips := (*data)["i_vip_subtips"]
@@ -730,6 +730,7 @@ func (f *Front) Historypush() error {
 				}
 			}
 		}
+		f.T["isread"] = (*data)["isread"]
 		f.T["vipSubtips"] = vipSubtips
 		f.T["userId"] = userId
 	}

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

@@ -603,8 +603,7 @@ $(function () {
     var selectTime = "";
 
     function init(state) {
-    	console.log(state)
-        checkmerge(state.industry)
+        checkmerge(state.industry,state.isread)
         // init 已选择的区域和行业
         var selectedAreaAndInd = getBuySet(state.area, state.industry);
         setSelectedAreaAndInd(selectedAreaAndInd);
@@ -831,90 +830,109 @@ function toRead() {
 }
 
 var mergedlist = []
-function checkmerge(state) {
+function checkmerge(state,isread) {
     var tips = "<span style='font-size:15px;font-family:PingFang SC;font-weight:bold;color:rgba(29,29,29,1);opacity:1;'>随着政府机构改革和只能转变工作深入推进,部分采购单位行业与实现不一致,为了提高订阅推送数据的准确性,剑鱼标讯需要针对采购单位行业名称进行优化。</span><br><span style='font-size:13px;font-family:PingFang SC;font-weight:400;color:rgba(104,104,104,1);opacity:1;'>采购单位名称的调整不影响所购买的采购单位数量，您仍可按需调整<br><br>您订阅的：<br></span>"
-    var hasMerged = false
+    var hasMerged = isread
+    var s_count=h_count=m_count=p_count=cultural_count=CBRC_count=t_count = 0
     var merge_industry = ["国土","林业","环保","卫生","工商","质监","食药","安监","地震","公安","文化","旅游","银监","保监"]
-    var nature_source = [];
-    var health_commission = []
-    var market_supervision = []
-    var contingency_management = []
-    var cultural_tourism = []
-    var CBRC = []
-    var ecological_environment = []
+    var nature_source = ["国土","林业"];
+    var health_commission = ["卫生"]
+    var market_supervision = ["工商","质监","食药"]
+    var contingency_management = ["地震","安监","公安"]
+    var cultural_tourism = ["文化","旅游"]
+    var CBRC = ["银监","保监"]
+    var ecological_environment = ["环保"]
+
     state.forEach(function (item,index) {
         if (merge_industry.indexOf(item)>-1){
             if (item == "国土"||item == "林业"){
                 mergedlist.push("自然资源")
-                hasMerged = true
-                nature_source.push(item)
+                // hasMerged = true
+                nature_source = Highlight(item)
+                s_count++
             } else if (item == "环保"){
                 mergedlist.push("生态环境")
-                hasMerged = true
-                ecological_environment.push(item)
+                // hasMerged = true
+                ecological_environment = Highlight(ecological_environment,item)
+                h_count++
+
             } else if ( item == "卫生"){
                 mergedlist.push("卫健委")
-                hasMerged = true
-                health_commission.push(item)
+                // hasMerged = true
+                health_commission= Highlight(health_commission,item)
+                p_count++
             } else if (item == "工商"||item == "质监"||item == "食药"){
                 mergedlist.push("市场监管")
-                hasMerged = true
-                market_supervision.push(item)
+                // hasMerged = true
+
+                market_supervision =  Highlight(market_supervision,item)
+                m_count++
             } else if (item == "地震"||item=="安监"||item=="公安"){
-                mergedlist.push("应急管理")
-                hasMerged = true
-                contingency_management.push(item)
+                if (item !=="公安"){
+                    mergedlist.push("应急管理")
+                }else{
+                    mergedlist.push("公安")
+                }
+                // hasMerged = true
+                contingency_management = Highlight(contingency_management,item)
+                t_count++
             } else if (item=="文化"||item == "旅游"){
                 mergedlist.push("文旅")
-                hasMerged = true
-                cultural_tourism.push(item)
+                // hasMerged = true
+                cultural_tourism = Highlight(cultural_tourism,item)
+                cultural_count++
             } else if  (item == "银监"||item == "保监"){
                 mergedlist.push("银保监")
-                hasMerged = true
-                CBRC.push(item)
+                // hasMerged = true
+                CBRC= Highlight(CBRC,item)
+                CBRC_count++
             }
         }else{
             mergedlist.push(item)
         }
     })
-    if(nature_source.length>=1){
-        tips +=Highlight(nature_source).join('，')+" 合并为 【自然资源】<br>"
+    if(s_count>1){
+        tips +=nature_source.join('，')+" 合并为 【自然资源】<br>"
     }
-    if (ecological_environment.length>=1){
-        tips +=Highlight(ecological_environment).join('，')+" 合并为 【生态环境】<br>"
+    if (h_count>=1){
+        tips +=ecological_environment.join('、')+" 整合其他部门部分职能后更改为 【生态环境】<br>"
     }
-    if (health_commission.length>=1){
-        tips +=Highlight(health_commission).join('，')+" 合并为 【卫健委】<br>"
+    if (p_count>=1){
+        tips +=health_commission.join('、')+" 变更为 【卫健委】<br>"
     }
-    if (market_supervision.length>=1){
-        tips +=Highlight(market_supervision).join('，')+" 合并为 【市场监管】<br>"
+    if (m_count>=1){
+        tips +=market_supervision.join('、')+" 合并为 【市场监管】<br>"
     }
-    if (contingency_management.length>=1){
-        tips +=Highlight(contingency_management).join('，')+" 合并为 【应急管理】<br>"
+    if (t_count>=1){
+        tips +=contingency_management.join('、')+"中的消防 合并为 【应急管理】<br>"
     }
-    if (cultural_tourism.length>=1){
-        tips +=Highlight(cultural_tourism).join('，')+" 合并为 【文旅】<br>"
+    if (cultural_count>=1){
+        tips +=cultural_tourism.join('、')+" 合并为 【文旅】<br>"
     }
-    if (CBRC.length>=1){
-        tips +=Highlight(CBRC).join('，')+" 合并为 【银保监】<br>"
+    if (CBRC_count>=1){
+        tips +=CBRC.join('，')+" 合并为 【银保监】<br>"
     }
-    if (hasMerged){
+    if (!hasMerged){
         $("#merge_content").html(tips)
         $("#merge_dialog").show()
     }
 }
-function Highlight(key) {
-    var t = new Array()
-    key.forEach(function (item,index) {
-        var m = "<span style='color:red'>"+item+"</span>"
-        t.push(m)
+function Highlight(a_list,key) {
+    a_list.forEach(function (item,index) {
+        if (item == key){
+            var m = "<span style='color:red'>"+item+"</span>"
+            a_list[index] = m
+
+        }
     })
-    return t
+    return a_list
 }
 
+
+
 function acceptchange() {
     var q=removeDuplicatedItem(mergedlist)
-    $.post("/subscribepay/vipsubscribe/mergeIndustry",{"industry":q.toString()},function (r) {
+    $.post("/subscribepay/vipsubscribe/mergeIndustry",{"industry":q.toString(),"isread":true},function (r) {
         if (r.success){
             sessionStorage.removeItem("sub_vip_state")
             console.log("行业合并成功")

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

@@ -46,18 +46,6 @@
                             <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">
@@ -72,7 +60,6 @@
                         <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>
@@ -87,9 +74,7 @@
                     <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>
@@ -104,7 +89,6 @@
                     <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>
@@ -127,13 +111,6 @@
                             <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">
@@ -172,7 +149,6 @@
                     <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>
@@ -180,6 +156,8 @@
                             <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">
@@ -193,8 +171,8 @@
                     <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>
+                            <button class="industry_item">文旅</button>
+                            <button class="industry_item">卫健委</button>
                         </div>
                     </li>
                     <li class="list_item" id="X">
@@ -209,14 +187,14 @@
                         <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>
                             <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>
@@ -225,6 +203,7 @@
                             <button class="industry_item">制造业</button>
                             <button class="industry_item">政务中心</button>
                             <button class="industry_item">住宿餐饮</button>
+                            <button class="industry_item">自然资源</button>
                         </div>
                     </li>
                 </ul>

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

@@ -35,18 +35,6 @@
                             <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">
@@ -61,7 +49,6 @@
                         <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>
@@ -76,9 +63,7 @@
                     <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>
@@ -94,7 +79,6 @@
                     <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>
@@ -117,13 +101,6 @@
                             <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">
@@ -162,7 +139,6 @@
                     <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>
@@ -170,6 +146,8 @@
                             <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">
@@ -183,8 +161,8 @@
                     <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>
+                            <button class="industry_item">文旅</button>
+                            <button class="industry_item">卫健委</button>
                         </div>
                     </li>
                     <li class="list_item" id="X">
@@ -199,14 +177,14 @@
                         <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>
                             <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>
@@ -215,6 +193,7 @@
                             <button class="industry_item">制造业</button>
                             <button class="industry_item">政务中心</button>
                             <button class="industry_item">住宿餐饮</button>
+                            <button class="industry_item">自然资源</button>
                         </div>
                     </li>
                 </ul>

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

@@ -58,7 +58,7 @@
                         </div>
                         <div class="item_info item_industry">
                             <span class="label">已购买行业：</span>
-                            <span class="label_for">保监、城管保监</span>
+                            <span class="label_for">银保监、城管保监</span>
                         </div>
                         <div class="item_info item_cycle">
                             <span class="label">订阅周期：</span>

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

@@ -437,7 +437,7 @@
     <script src="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/js/UpgradePrice.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/js/vip_index_new.js?v={{Msg "seo" "version"}}1"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/js/vip_index_new.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/common.js?v={{Msg "seo" "version"}}"></script>
 </div>
 </body>

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

@@ -43,6 +43,8 @@
         var hasNextPage = false;
         var pageIndex = 1;
         var closeAdvert = false//是否关闭广告
+        var isread = {{.T.isread}}
+        alert(isread)
         //
         if (getUrlParam("f") == "push") {
             removeSessionStorage();
@@ -116,7 +118,6 @@
                 window.location.href = '/jyapp/wxkeyset/keyset/seniorset';
             });
             $(".listcontent").scroll(function () {
-				console.log(3333)
                 scrollTop = $(this).scrollTop();
             });
             this.isCanSwitch=true;
@@ -1433,72 +1434,87 @@
     var mergedlist = []
     function checkmerge(state) {
         var tips = "<span style='font-size:15px;font-family:PingFang SC;font-weight:bold;color:rgba(29,29,29,1);opacity:1;'>随着政府机构改革和只能转变工作深入推进,部分采购单位行业与实现不一致,为了提高订阅推送数据的准确性,剑鱼标讯需要针对采购单位行业名称进行优化。</span><br><span style='font-size:13px;font-family:PingFang SC;font-weight:400;color:rgba(104,104,104,1);opacity:1;'>采购单位名称的调整不影响所购买的采购单位数量，您仍可按需调整<br><br>您订阅的：<br></span>"
-        var hasMerged = false
+        var hasMerged = isread
+        var s_count=h_count=m_count=p_count=cultural_count=CBRC_count=t_count = 0
         var merge_industry = ["国土","林业","环保","卫生","工商","质监","食药","安监","地震","公安","文化","旅游","银监","保监"]
-        var nature_source = [];
-        var health_commission = []
-        var market_supervision = []
-        var contingency_management = []
-        var cultural_tourism = []
-        var CBRC = []
-        var ecological_environment = []
+        var nature_source = ["国土","林业"];
+        var health_commission = ["卫生"]
+        var market_supervision = ["工商","质监","食药"]
+        var contingency_management = ["地震","安监","公安"]
+        var cultural_tourism = ["文化","旅游"]
+        var CBRC = ["银监","保监"]
+        var ecological_environment = ["环保"]
+
         state.forEach(function (item,index) {
             if (merge_industry.indexOf(item)>-1){
                 if (item == "国土"||item == "林业"){
                     mergedlist.push("自然资源")
-                    hasMerged = true
-                    nature_source.push(item)
+                    // hasMerged = true
+                    nature_source = Highlight(item)
+                    s_count++
                 } else if (item == "环保"){
                     mergedlist.push("生态环境")
-                    hasMerged = true
-                    ecological_environment.push(item)
+                    // hasMerged = true
+                    ecological_environment = Highlight(ecological_environment,item)
+                    h_count++
+
                 } else if ( item == "卫生"){
                     mergedlist.push("卫健委")
-                    hasMerged = true
-                    health_commission.push(item)
+                    // hasMerged = true
+                    health_commission= Highlight(health_commission,item)
+                    p_count++
                 } else if (item == "工商"||item == "质监"||item == "食药"){
                     mergedlist.push("市场监管")
-                    hasMerged = true
-                    market_supervision.push(item)
+                    // hasMerged = true
+
+                    market_supervision =  Highlight(market_supervision,item)
+                    m_count++
                 } else if (item == "地震"||item=="安监"||item=="公安"){
-                    mergedlist.push("应急管理")
-                    hasMerged = true
-                    contingency_management.push(item)
+                    if (item !=="公安"){
+                        mergedlist.push("应急管理")
+                    }else{
+                        mergedlist.push("公安")
+                    }
+                    // hasMerged = true
+                    contingency_management = Highlight(contingency_management,item)
+                    t_count++
                 } else if (item=="文化"||item == "旅游"){
                     mergedlist.push("文旅")
-                    hasMerged = true
-                    cultural_tourism.push(item)
+                    // hasMerged = true
+                    cultural_tourism = Highlight(cultural_tourism,item)
+                    cultural_count++
                 } else if  (item == "银监"||item == "保监"){
                     mergedlist.push("银保监")
-                    hasMerged = true
-                    CBRC.push(item)
+                    // hasMerged = true
+                    CBRC= Highlight(CBRC,item)
+                    CBRC_count++
                 }
             }else{
                 mergedlist.push(item)
             }
         })
-        if(nature_source.length>=1){
-            tips +=Highlight(nature_source).join('，')+" 合并为 【自然资源】<br>"
+        if(s_count>1){
+            tips +=nature_source.join('，')+" 合并为 【自然资源】<br>"
         }
-        if (ecological_environment.length>=1){
-            tips +=Highlight(ecological_environment).join('，')+" 合并为 【生态环境】<br>"
+        if (h_count>=1){
+            tips +=ecological_environment.join('，')+" 整合其他部门部分职能后更改为 【生态环境】<br>"
         }
-        if (health_commission.length>=1){
-            tips +=Highlight(health_commission).join('，')+" 合并为 【卫健委】<br>"
+        if (p_count>=1){
+            tips +=health_commission.join('、')+" 变更为 【卫健委】<br>"
         }
-        if (market_supervision.length>=1){
-            tips +=Highlight(market_supervision).join('，')+" 合并为 【市场监管】<br>"
+        if (m_count>=1){
+            tips +=market_supervision.join('、')+" 合并为 【市场监管】<br>"
         }
-        if (contingency_management.length>=1){
-            tips +=Highlight(contingency_management).join('，')+" 合并为 【应急管理】<br>"
+        if (t_count>=1){
+            tips +=contingency_management.join('、')+"中的消防 合并为 【应急管理】<br>"
         }
-        if (cultural_tourism.length>=1){
-            tips +=Highlight(cultural_tourism).join('，')+" 合并为 【文旅】<br>"
+        if (cultural_count>=1){
+            tips +=cultural_tourism.join('、')+" 合并为 【文旅】<br>"
         }
-        if (CBRC.length>=1){
-            tips +=Highlight(CBRC).join('，')+" 合并为 【银保监】<br>"
+        if (CBRC_count>=1){
+            tips +=CBRC.join('、')+" 合并为 【银保监】<br>"
         }
-        if (hasMerged){
+        if (!hasMerged){
             $("#merge_content").html(tips)
             $("#merge_dialog").show()
         }
@@ -1506,7 +1522,7 @@
 
     function acceptchange() {
         var q = removeDuplicatedItem(mergedlist)
-        $.post("/subscribepay/vipsubscribe/mergeIndustry",{"industry":q.toString()},function (r) {
+        $.post("/subscribepay/vipsubscribe/mergeIndustry",{"industry":q.toString(),"isread":true},function (r) {
             if (r.success){
                 console.log("行业合并成功")
             }else{
@@ -1515,13 +1531,15 @@
         })
         $("#merge_dialog").hide()
     }
-    function Highlight(key) {
-        var t = new Array()
-        key.forEach(function (item,index) {
-            var m = "<span style='color:red'>"+item+"</span>"
-            t.push(m)
+    function Highlight(a_list,key) {
+        a_list.forEach(function (item,index) {
+            if (item == key){
+                var m = "<span style='color:red'>"+item+"</span>"
+                a_list[index] = m
+
+            }
         })
-        return t
+        return a_list
     }
     function removeDuplicatedItem(ar) {
         var ret = [];

src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -348,7 +348,7 @@ func (this *vipSubscribeStruct) OrderCheck(userId string, orderType int) (bool,
 //获取省份，城市，行业购买内容
 //[省份，城市，行业]
 func (this *vipSubscribeStruct) GetVipDetail(userId string) (*map[string]interface{}, *SubvipBuySet, bool) {
-	mData, ok := util.MQFW.FindById("user", userId, `{"o_vipjy":1,"i_vip_status":1,"l_vip_endtime":1,"l_vip_starttime":1}`)
+	mData, ok := util.MQFW.FindById("user", userId, `{"o_vipjy":1,"i_vip_status":1,"l_vip_endtime":1,"l_vip_starttime":1,"isread":1}`)
 	if !ok || len(*mData) == 0 || mData == nil {
 		return nil, nil, false
 	}

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

@@ -37,6 +37,10 @@ func (this *SubscribeChange) GetSubBuyMsg() {
 		if rData == nil || len(*rData) == 0 {
 			return &entity.FuncResult{false, errors.New("获取信息失败"), nil}
 		}
+		var isread = false
+		if (*rData)["isread"]!=nil{
+			isread = (*rData)["isread"].(bool)
+		}
 		o_vipjy := qutil.ObjToMap((*rData)["o_vipjy"])
 		vipStatus := qutil.IntAll((*rData)["i_vip_status"])
 		var renewList *[]map[string]interface{}
@@ -56,6 +60,7 @@ func (this *SubscribeChange) GetSubBuyMsg() {
 			"startTime":       (*rData)["l_vip_starttime"],
 			"endTime":         (*rData)["l_vip_endtime"],
 			"otherbuyerclass": (*o_vipjy)["i_matchbuyerclass_other"],
+			"isread":			isread,
 		}}
 	}()
 	if r.Err != nil {
@@ -587,11 +592,13 @@ func getDateSub(start, end int64) (monthNum, yearNum int) {
 func (this *SubscribeChange)MergeIndustry(){
 	industry := strings.Split(this.GetString("industry"),",")
 	userId := qutil.ObjToString(this.GetSession("userId"))
+	isread,_:=this.GetBool("isread")
 	r := func() *entity.FuncResult {
 		if userId != ""{
 			updateOk := util.MQFW.UpdateById("user", userId,
 				bson.M{"$set": bson.M{
 					"o_vipjy.a_buyerclass": industry, //设置行业
+					"isread":isread,
 				}})
 			if updateOk{
 				return &entity.FuncResult{true, nil, nil}

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

@@ -603,7 +603,7 @@ $(function () {
     var selectTime = "";
 
     function init(state) {
-        checkmerge(state.industry)
+        checkmerge(state.industry,state.isread)
         // init 已选择的区域和行业
         var selectedAreaAndInd = getBuySet(state.area, state.industry);
         setSelectedAreaAndInd(selectedAreaAndInd);
@@ -828,90 +828,108 @@ function clearSessionStorage() {
 }
 
 var mergedlist = []
-function checkmerge(state) {
+function checkmerge(state,isread) {
     var tips = "<span style='font-size:15px;font-family:PingFang SC;font-weight:bold;color:rgba(29,29,29,1);opacity:1;'>随着政府机构改革和只能转变工作深入推进,部分采购单位行业与实现不一致,为了提高订阅推送数据的准确性,剑鱼标讯需要针对采购单位行业名称进行优化。</span><br><span style='font-size:13px;font-family:PingFang SC;font-weight:400;color:rgba(104,104,104,1);opacity:1;'>采购单位名称的调整不影响所购买的采购单位数量，您仍可按需调整<br><br>您订阅的：<br></span>"
-    var hasMerged = false
+    var hasMerged = isread
+    var s_count=h_count=m_count=p_count=cultural_count=CBRC_count=t_count = 0
     var merge_industry = ["国土","林业","环保","卫生","工商","质监","食药","安监","地震","公安","文化","旅游","银监","保监"]
-    var nature_source = [];
-    var health_commission = []
-    var market_supervision = []
-    var contingency_management = []
-    var cultural_tourism = []
-    var CBRC = []
-    var ecological_environment = []
+    var nature_source = ["国土","林业"];
+    var health_commission = ["卫生"]
+    var market_supervision = ["工商","质监","食药"]
+    var contingency_management = ["地震","安监","公安"]
+    var cultural_tourism = ["文化","旅游"]
+    var CBRC = ["银监","保监"]
+    var ecological_environment = ["环保"]
+
     state.forEach(function (item,index) {
         if (merge_industry.indexOf(item)>-1){
             if (item == "国土"||item == "林业"){
                 mergedlist.push("自然资源")
-                hasMerged = true
-                nature_source.push(item)
+                // hasMerged = true
+                nature_source = Highlight(nature_source,item)
+                s_count++
             } else if (item == "环保"){
                 mergedlist.push("生态环境")
-                hasMerged = true
-                ecological_environment.push(item)
+                // hasMerged = true
+                ecological_environment = Highlight(ecological_environment,item)
+                h_count++
+
             } else if ( item == "卫生"){
                 mergedlist.push("卫健委")
-                hasMerged = true
-                health_commission.push(item)
+                // hasMerged = true
+                health_commission= Highlight(health_commission,item)
+                p_count++
             } else if (item == "工商"||item == "质监"||item == "食药"){
                 mergedlist.push("市场监管")
-                hasMerged = true
-                market_supervision.push(item)
+                // hasMerged = true
+
+                market_supervision =  Highlight(market_supervision,item)
+                m_count++
             } else if (item == "地震"||item=="安监"||item=="公安"){
-                mergedlist.push("应急管理")
-                hasMerged = true
-                contingency_management.push(item)
+
+                if (item !=="公安"){
+                    mergedlist.push("应急管理")
+                }else{
+                    mergedlist.push("公安")
+                }
+                // hasMerged = true
+                contingency_management = Highlight(contingency_management,item)
+                t_count++
             } else if (item=="文化"||item == "旅游"){
                 mergedlist.push("文旅")
-                hasMerged = true
-                cultural_tourism.push(item)
+                // hasMerged = true
+                cultural_tourism = Highlight(cultural_tourism,item)
+                cultural_count++
             } else if  (item == "银监"||item == "保监"){
                 mergedlist.push("银保监")
-                hasMerged = true
-                CBRC.push(item)
+                // hasMerged = true
+                CBRC= Highlight(CBRC,item)
+                CBRC_count++
             }
         }else{
             mergedlist.push(item)
         }
     })
-    if(nature_source.length>=1){
-        tips +=Highlight(nature_source).join('，')+" 合并为 【自然资源】<br>"
+    if(s_count>1){
+        tips +=nature_source.join('，')+" 合并为 【自然资源】<br>"
     }
-    if (ecological_environment.length>=1){
-        tips +=Highlight(ecological_environment).join('，')+" 合并为 【生态环境】<br>"
+    if (h_count>=1){
+        tips +=ecological_environment.join('、')+" 整合其他部门部分职能后更改为 【生态环境】<br>"
     }
-    if (health_commission.length>=1){
-        tips +=Highlight(health_commission).join('，')+" 合并为 【卫健委】<br>"
+    if (p_count>=1){
+        tips +=health_commission.join('、')+" 变更为 【卫健委】<br>"
     }
-    if (market_supervision.length>=1){
-        tips +=Highlight(market_supervision).join('，')+" 合并为 【市场监管】<br>"
+    if (m_count>=1){
+        tips +=market_supervision.join('、')+" 合并为 【市场监管】<br>"
     }
-    if (contingency_management.length>=1){
-        tips +=Highlight(contingency_management).join('，')+" 合并为 【应急管理】<br>"
+    if (t_count>=1){
+        tips +=contingency_management.join('、')+"中的消防 合并为 【应急管理】<br>"
     }
-    if (cultural_tourism.length>=1){
-        tips +=Highlight(cultural_tourism).join('，')+" 合并为 【文旅】<br>"
+    if (cultural_count>=1){
+        tips +=cultural_tourism.join('、')+" 合并为 【文旅】<br>"
     }
-    if (CBRC.length>=1){
-        tips +=Highlight(CBRC).join('，')+" 合并为 【银保监】<br>"
+    if (CBRC_count>=1){
+        tips +=CBRC.join('、')+" 合并为 【银保监】<br>"
     }
-    if (hasMerged){
+    if (!hasMerged){
         $("#merge_content").html(tips)
         $("#merge_dialog").show()
     }
 }
-function Highlight(key) {
-    var t = new Array()
-    key.forEach(function (item,index) {
-        var m = "<span style='color:red'>"+item+"</span>"
-        t.push(m)
+function Highlight(a_list,key) {
+    a_list.forEach(function (item,index) {
+        if (item == key){
+            var m = "<span style='color:red'>"+item+"</span>"
+            a_list[index] = m
+
+        }
     })
-    return t
+    return a_list
 }
 
 function acceptchange() {
     var q=removeDuplicatedItem(mergedlist)
-    $.post("/subscribepay/vipsubscribe/mergeIndustry",{"industry":q.toString()},function (r) {
+    $.post("/subscribepay/vipsubscribe/mergeIndustry",{"industry":q.toString(),"isread":true},function (r) {
         if (r.success){
             sessionStorage.removeItem("sub_vip_state")
             console.log("行业合并成功")

src/web/templates/weixin/historypush.html

@@ -43,6 +43,7 @@
         var a_visitedindex = new Array;
         var closeAdvert = false//是否关闭广告
         var words = ""
+        var isread = {{.T.isread}}
         initShare({{.T.signature}},{{.T.openid}}, 2, "jy_extend",{{.T.nickname}},{{.T.avatar}});
         $(function () {
             var alert_other;
@@ -1654,74 +1655,88 @@
         $("#advertscript").html(ADHtml);
         var mergedlist = []
         function checkmerge(state) {
-            console.log("state",state)
             var tips = "<span style='font-size:15px;font-family:PingFang SC;font-weight:bold;color:rgba(29,29,29,1);opacity:1;'>随着政府机构改革和只能转变工作深入推进,部分采购单位行业与实现不一致,为了提高订阅推送数据的准确性,剑鱼标讯需要针对采购单位行业名称进行优化。</span><br><span style='font-size:13px;font-family:PingFang SC;font-weight:400;color:rgba(104,104,104,1);opacity:1;'>采购单位名称的调整不影响所购买的采购单位数量，您仍可按需调整<br><br>您订阅的：<br></span>"
-            var hasMerged = false
+            var hasMerged = isread
+            var s_count=h_count=m_count=p_count=cultural_count=CBRC_count=t_count = 0
             var merge_industry = ["国土","林业","环保","卫生","工商","质监","食药","安监","地震","公安","文化","旅游","银监","保监"]
-            var nature_source = [];
-            var health_commission = []
-            var market_supervision = []
-            var contingency_management = []
-            var cultural_tourism = []
-            var CBRC = []
-            var ecological_environment = []
+            var nature_source = ["国土","林业"];
+            var health_commission = ["卫生"]
+            var market_supervision = ["工商","质监","食药"]
+            var contingency_management = ["地震","安监","公安"]
+            var cultural_tourism = ["文化","旅游"]
+            var CBRC = ["银监","保监"]
+            var ecological_environment = ["环保"]
+
             state.forEach(function (item,index) {
                 if (merge_industry.indexOf(item)>-1){
                     if (item == "国土"||item == "林业"){
                         mergedlist.push("自然资源")
-                        hasMerged = true
-                        nature_source.push(item)
+                        // hasMerged = true
+                        nature_source = Highlight(item)
+                        s_count++
                     } else if (item == "环保"){
                         mergedlist.push("生态环境")
-                        hasMerged = true
-                        ecological_environment.push(item)
+                        // hasMerged = true
+                        ecological_environment = Highlight(ecological_environment,item)
+                        h_count++
+
                     } else if ( item == "卫生"){
                         mergedlist.push("卫健委")
-                        hasMerged = true
-                        health_commission.push(item)
+                        // hasMerged = true
+                        health_commission= Highlight(health_commission,item)
+                        p_count++
                     } else if (item == "工商"||item == "质监"||item == "食药"){
                         mergedlist.push("市场监管")
-                        hasMerged = true
-                        market_supervision.push(item)
+                        // hasMerged = true
+
+                        market_supervision =  Highlight(market_supervision,item)
+                        m_count++
                     } else if (item == "地震"||item=="安监"||item=="公安"){
-                        mergedlist.push("应急管理")
-                        hasMerged = true
-                        contingency_management.push(item)
+                        if (item !=="公安"){
+                            mergedlist.push("应急管理")
+                        }else{
+                            mergedlist.push("公安")
+                        }
+                        // hasMerged = true
+                        contingency_management = Highlight(contingency_management,item)
+                        t_count++
                     } else if (item=="文化"||item == "旅游"){
                         mergedlist.push("文旅")
-                        hasMerged = true
-                        cultural_tourism.push(item)
+                        // hasMerged = true
+                        cultural_tourism = Highlight(cultural_tourism,item)
+                        cultural_count++
                     } else if  (item == "银监"||item == "保监"){
                         mergedlist.push("银保监")
-                        hasMerged = true
-                        CBRC.push(item)
+                        // hasMerged = true
+                        CBRC= Highlight(CBRC,item)
+                        CBRC_count++
                     }
                 }else{
                     mergedlist.push(item)
                 }
             })
-            if(nature_source.length>=1){
-                tips +=Highlight(nature_source).join('，')+" 合并为 【自然资源】<br>"
+            if(s_count>1){
+                tips +=nature_source.join('，')+" 合并为 【自然资源】<br>"
             }
-            if (ecological_environment.length>=1){
-                tips +=Highlight(ecological_environment).join('，')+" 合并为 【生态环境】<br>"
+            if (h_count>=1){
+                tips +=ecological_environment.join('、')+" 整合其他部门部分职能后更改为 【生态环境】<br>"
             }
-            if (health_commission.length>=1){
-                tips +=Highlight(health_commission).join('，')+" 合并为 【卫健委】<br>"
+            if (p_count>=1){
+                tips +=health_commission.join('、')+" 变更为 【卫健委】<br>"
             }
-            if (market_supervision.length>=1){
-                tips +=Highlight(market_supervision).join('，')+" 合并为 【市场监管】<br>"
+            if (m_count>=1){
+                tips +=market_supervision.join('、')+" 合并为 【市场监管】<br>"
             }
-            if (contingency_management.length>=1){
-                tips +=Highlight(contingency_management).join('，')+" 合并为 【应急管理】<br>"
+            if (t_count>=1){
+                tips +=contingency_management.join('、')+"中的安防 合并为 【应急管理】<br>"
             }
-            if (cultural_tourism.length>=1){
-                tips +=Highlight(cultural_tourism).join('，')+" 合并为 【文旅】<br>"
+            if (cultural_count>=1){
+                tips +=cultural_tourism.join('、')+" 合并为 【文旅】<br>"
             }
-            if (CBRC.length>=1){
-                tips +=Highlight(CBRC).join('，')+" 合并为 【银保监】<br>"
+            if (CBRC_count>=1){
+                tips +=CBRC.join('、')+" 合并为 【银保监】<br>"
             }
-            if (hasMerged){
+            if (!hasMerged){
                 $("#merge_content").html(tips)
                 $("#merge_dialog").show()
             }
@@ -1729,7 +1744,7 @@
 
         function acceptchange() {
             var q = removeDuplicatedItem(mergedlist)
-            $.post("/subscribepay/vipsubscribe/mergeIndustry",{"industry":q.toString()},function (r) {
+            $.post("/subscribepay/vipsubscribe/mergeIndustry",{"industry":q.toString(),"isread":true},function (r) {
                 if (r.success){
                     sessionStorage.removeItem("sub_vip_state")
                     console.log("行业合并成功")
@@ -1739,13 +1754,14 @@
             })
             $("#merge_dialog").hide()
         }
-        function Highlight(key) {
-            var t = new Array()
-            key.forEach(function (item,index) {
-                var m = "<span style='color:red'>"+item+"</span>"
-                t.push(m)
+        function Highlight(a_list,key) {
+            a_list.forEach(function (item,index) {
+                if (item == key){
+                    var m = "<span style='color:red'>"+item+"</span>"
+                    a_list[index] = m
+                }
             })
-            return t
+            return a_list
         }
         function removeDuplicatedItem(ar) {
             var ret = [];

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

@@ -39,18 +39,6 @@
                         <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">
@@ -65,7 +53,6 @@
                     <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>
@@ -80,9 +67,7 @@
                 <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>
@@ -97,7 +82,6 @@
                 <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>
@@ -120,13 +104,6 @@
                         <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">
@@ -165,7 +142,6 @@
                 <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>
@@ -173,6 +149,8 @@
                         <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">
@@ -186,8 +164,8 @@
                 <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>
+                        <button class="industry_item">文旅</button>
+                        <button class="industry_item">卫健委</button>
                     </div>
                 </li>
                 <li class="list_item" id="X">
@@ -202,14 +180,14 @@
                     <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>
                         <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>
@@ -218,6 +196,7 @@
                         <button class="industry_item">制造业</button>
                         <button class="industry_item">政务中心</button>
                         <button class="industry_item">住宿餐饮</button>
+                        <button class="industry_item">自然资源</button>
                     </div>
                 </li>
             </ul>

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

@@ -28,18 +28,6 @@
                         <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">
@@ -54,7 +42,6 @@
                     <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>
@@ -69,9 +56,7 @@
                 <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>
@@ -86,7 +71,6 @@
                 <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>
@@ -109,13 +93,6 @@
                         <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">
@@ -154,7 +131,6 @@
                 <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>
@@ -162,6 +138,8 @@
                         <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">
@@ -175,8 +153,8 @@
                 <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>
+                        <button class="industry_item">文旅</button>
+                        <button class="industry_item">卫健委</button>
                     </div>
                 </li>
                 <li class="list_item" id="X">
@@ -190,15 +168,15 @@
                 <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>
                         <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>
@@ -207,6 +185,7 @@
                         <button class="industry_item">制造业</button>
                         <button class="industry_item">政务中心</button>
                         <button class="industry_item">住宿餐饮</button>
+                        <button class="industry_item">自然资源</button>
                     </div>
                 </li>
             </ul>

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

@@ -38,18 +38,6 @@
                                 <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">
@@ -64,7 +52,6 @@
                             <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>
@@ -79,9 +66,7 @@
                         <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>
@@ -113,13 +98,6 @@
                                 <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">
@@ -158,7 +136,6 @@
                         <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>
@@ -179,8 +156,8 @@
                         <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>
+                                <button class="industry_item">文旅</button>
+                                <button class="industry_item">卫健委</button>
                             </div>
                         </li>
                         <li class="list_item" id="X">
@@ -195,7 +172,6 @@
                             <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>

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

@@ -30,18 +30,6 @@
                         <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">
@@ -56,7 +44,6 @@
                     <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>
@@ -73,7 +60,6 @@
                     <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>
@@ -82,7 +68,6 @@
                 <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>
@@ -105,13 +90,6 @@
                         <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">
@@ -150,7 +128,6 @@
                 <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>
@@ -158,6 +135,8 @@
                         <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">
@@ -171,8 +150,8 @@
                 <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>
+                        <button class="industry_item">文旅</button>
+                        <button class="industry_item">卫健委</button>
                     </div>
                 </li>
                 <li class="list_item" id="X">
@@ -187,14 +166,13 @@
                     <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>
+                        <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>
@@ -203,6 +181,7 @@
                         <button class="industry_item">制造业</button>
                         <button class="industry_item">政务中心</button>
                         <button class="industry_item">住宿餐饮</button>
+                        <button class="industry_item">自然资源</button>
                     </div>
                 </li>
             </ul>

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

@@ -59,7 +59,7 @@
                         </div>
                         <div class="item_info item_industry">
                             <span class="label">已购买行业：</span>
-                            <span class="label_for">保监、城管保监</span>
+                            <span class="label_for">银保监、城管保监</span>
                         </div>
                         <div class="item_info item_cycle">
                             <span class="label">订阅周期：</span>

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

@@ -13,7 +13,7 @@
     <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"}}">
+    <link rel="stylesheet" href="/vipsubscribe/css/vip_index_new.css?v={{Msg "seo" "version"}}1">
     <style>
         .jy-switch:before {
             background-color: #fbfbfb;
@@ -439,7 +439,7 @@
 <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=10{{Msg "seo" "version"}}11"></script>
+<script src="/vipsubscribe/js/vip_index_new.js?v=10{{Msg "seo" "version"}}1"></script>
 {{include "/common/weixin.html"}}
 </body>
 <script>