分支合并

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/area.js

@@ -373,6 +373,7 @@ var areaList = {
     // 659009: '昆玉市',
     // 659010: '胡杨河市',
     659500: '北屯市',
+    659011: '新星市',
     659600: '铁门关市',
     659700: '双河市',
     659800: '可克达拉市',
@@ -3635,6 +3636,7 @@ var areaList = {
     659003: '图木舒克市',
     659004: '五家渠市',
     659005: '北屯市',
+    659011: '新星市',
     659006: '铁门关市',
     659007: '双河市',
     659008: '可克达拉市',

src/jfw/modules/app/src/web/templates/big-member/component_set_area.html

@@ -93,5 +93,5 @@
 <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
-<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/china-map-data.js'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/set_area.js?v={{Msg "seo" "version"}}'></script>

src/jfw/modules/app/src/web/templates/big-member/page_client_follow_list.html

@@ -181,7 +181,7 @@
 <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
-<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/china-map-data.js'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/area-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/visited.js?v={{Msg "seo" "version"}}'></script>
 {{include "/big-member/commonjs.html"}}

src/jfw/modules/app/src/web/templates/big-member/page_client_list.html

@@ -218,7 +218,7 @@
 <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
-<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/china-map-data.js'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/area-city-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/keep-tags/keep-ent-tags-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/visited.js?v={{Msg "seo" "version"}}'></script>

src/jfw/modules/app/src/web/templates/big-member/page_report_analysis.html

@@ -420,7 +420,7 @@
 <script src=//cdn-common.jianyu360.com/cdn/lib/echarts/4.8.0/echarts.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/v-charts/1.19.0/index.min.js></script>
 {{include "/big-member/commonjs.html"}}
-<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/china-map-data.js'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/keyword-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/date-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/area-city-mobile.js?v={{Msg "seo" "version"}}'></script>

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

@@ -593,7 +593,7 @@
 <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
-<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/china-map-data.js'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/root-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/date-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/area-city-mobile.js?v={{Msg "seo" "version"}}'></script>

src/jfw/modules/app/src/web/templates/weixin/search/tabSearch.html

@@ -1903,7 +1903,7 @@
 
 <!--S-脚本-->
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/utils.js'></script>
-<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/china-map-data.js'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/industry-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/area-city-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/keyword-mobile.js?v={{Msg "seo" "version"}}'></script>

src/seo.json

@@ -2758,6 +2758,42 @@
             "KEYWORDS": "铁门关市",
             "DESCRIPTION": "铁门关市"
         },
+        "XJ_BT": {
+            "NAME": "北屯市",
+            "TITLE": "北屯市",
+            "KEYWORDS": "北屯市",
+            "DESCRIPTION": "北屯市"
+        },
+        "XJ_SHH": {
+            "NAME": "双河市",
+            "TITLE": "双河市",
+            "KEYWORDS": "双河市",
+            "DESCRIPTION": "双河市"
+        },
+        "XJ_KKDL": {
+            "NAME": "可克达拉市",
+            "TITLE": "可克达拉市",
+            "KEYWORDS": "可克达拉市",
+            "DESCRIPTION": "可克达拉市"
+        },
+        "XJ_KY": {
+            "NAME": "昆玉市",
+            "TITLE": "昆玉市",
+            "KEYWORDS": "昆玉市",
+            "DESCRIPTION": "昆玉市"
+        },
+        "XJ_HYH": {
+            "NAME": "胡杨河市",
+            "TITLE": "胡杨河市",
+            "KEYWORDS": "胡杨河市",
+            "DESCRIPTION": "胡杨河市"
+        },
+        "XJ_XX": {
+            "NAME": "新星市",
+            "TITLE": "新星市",
+            "KEYWORDS": "新星市",
+            "DESCRIPTION": "新星市"
+        },
         "XG_XG": {
             "NAME": "香港",
             "TITLE": "香港",

src/web/staticres/common-module/public/js/china-map-data.js

@@ -1945,6 +1945,12 @@ var chinaMapJSON = [{
             "ProID": 24,
             "CitySort": 386,
             "area": ['其他']
+        }, {
+          "CityID": 387,
+          "name": "新星市",
+          "ProID": 24,
+          "CitySort": 387,
+          "area": ['其他']
         }]
     }, {
         "ProID": 25,

src/web/staticres/common-module/public/js/china-map-min.js

@@ -66,7 +66,7 @@ var chinaMapJSON = [{
 }, {
     "西藏": ["拉萨市", "日喀则市", "山南市", "林芝市", "昌都市", "那曲市", "阿里地区"]
 }, {
-    "新疆": ["塔城地区", "哈密市", "和田地区", "阿勒泰地区", "克孜勒苏柯尔克孜自治州", "博尔塔拉蒙古自治州", "克拉玛依市", "乌鲁木齐市", "石河子市", "昌吉回族自治州", "五家渠市", "吐鲁番市", "巴音郭楞蒙古自治州", "阿克苏地区", "阿拉尔市", "喀什地区", "图木舒克市", "伊犁哈萨克自治州", "北屯市", "铁门关市", "双河市", "可克达拉市", "昆玉市", "胡杨河市"]
+    "新疆": ["塔城地区", "哈密市", "和田地区", "阿勒泰地区", "克孜勒苏柯尔克孜自治州", "博尔塔拉蒙古自治州", "克拉玛依市", "乌鲁木齐市", "石河子市", "昌吉回族自治州", "五家渠市", "吐鲁番市", "巴音郭楞蒙古自治州", "阿克苏地区", "阿拉尔市", "喀什地区", "图木舒克市", "伊犁哈萨克自治州", "北屯市", "铁门关市", "双河市", "可克达拉市", "昆玉市", "胡杨河市", "新星市"]
 }, {
     "香港": ["香港"]
 }, {

src/web/staticres/common-module/public/js/city-picker.data.js

@@ -3897,7 +3897,8 @@
                 659007: '双河市',
                 659008: '可克达拉市',
                 659009: '昆玉市',
-                659010: '胡杨河市'
+                659010: '胡杨河市',
+                659011: '新星市'
             },
             650100: {
                 650102: '天山区',

src/web/staticres/course/js/city/city-picker.data.js

@@ -3895,6 +3895,7 @@
                 659003: '图木舒克市',
                 659004: '五家渠市',
                 659005: '北屯市',
+                659011: '新星市',
                 659006: '铁门关市',
                 659007: '双河市',
                 659008: '可克达拉市'

src/web/staticres/course/js/province.js

@@ -1509,8 +1509,12 @@ var province = [
                 districtAndCounty: ["北屯市"]
             },
             {
-                name: "铁门关市",
-                districtAndCounty: ["铁门关市"]
+                name: "新星市",
+                districtAndCounty: ["新星市"]
+            },
+            {
+              name: "铁门关市",
+              districtAndCounty: ["铁门关市"]
             },
             {
                 name: "双河市",

src/web/staticres/electronic_invoice/js/city/city-picker.data.js

@@ -3895,6 +3895,7 @@
                 659003: '图木舒克市',
                 659004: '五家渠市',
                 659005: '北屯市',
+                659011: '新星市',
                 659006: '铁门关市',
                 659007: '双河市',
                 659008: '可克达拉市'

src/web/staticres/js/ent-search-index-pc.js

@@ -406,10 +406,15 @@ var vm = new Vue({
         },
         areaCityChange: function (area) {
             var city = []
+            var area_arr = []
             for (var key in area) {
-                city = city.concat(area[key])
+            	if(area[key].length>0){
+                	city = city.concat(area[key])
+                }else{
+                	area_arr = area_arr.concat(key)
+                }
             }
-            this.filterState.entArea = Object.keys(area)
+            this.filterState.entArea = area_arr//Object.keys(area)
             this.filterState.entCity = city
             this.doSearch()
         },

src/web/templates/pc/entsearchindex.html

@@ -448,7 +448,7 @@
         }
         haslogin({{.T.logid}})
 	</script>
-    <script src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.js'></script>
+    <script src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Msg "seo" "cdn"}}/common-module/selector/js/provinceMap.js'></script>
     <script src='{{Msg "seo" "cdn"}}/js/selector/select-list-pc.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Msg "seo" "cdn"}}/js/selector/area-city-pc.js?v={{Msg "seo" "version"}}'></script>

src/web/templates/pc/purScopebusniess.html

@@ -133,7 +133,7 @@
         }
         haslogin({{.T.logid}})
 	</script>
-    <script src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.js'></script>
+    <script src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Msg "seo" "cdn"}}/common-module/selector/js/provinceMap.js'></script>
     <script src='{{Msg "seo" "cdn"}}/js/selector/select-list-pc.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Msg "seo" "cdn"}}/js/selector/bus-edit-key.js?v={{Msg "seo" "version"}}'></script>

src/web/templates/pc/pursearchindex.html

@@ -281,8 +281,8 @@
         }
         haslogin({{.T.logid}})
 	</script>
-    <script src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.js'></script>
-    <script src='{{Msg "seo" "cdn"}}/common-module/selector/js/provinceMap.js'></script>
+    <script src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
+    <script src='{{Msg "seo" "cdn"}}/common-module/selector/js/provinceMap.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Msg "seo" "cdn"}}/js/selector/select-list-pc.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Msg "seo" "cdn"}}/js/selector/area-city-pc.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Msg "seo" "cdn"}}/js/selector/price-pc.js?v={{Msg "seo" "version"}}'></script>

src/web/templates/weixin/historypush.html

@@ -954,7 +954,7 @@
 <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <script src='{{Msg "seo" "cdn"}}/big-member/js/utils.js?v={{Msg "seo" "version"}}'></script>
-<script src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.js'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/root-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/date-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/area-city-mobile.js?v={{Msg "seo" "version"}}'></script>