Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/create.html

@@ -284,7 +284,18 @@
             $("select").select2();
         })
         // 获取省份数据
-        var configProvinces = {
+        function provincesStr() {
+            var provincesStr = '[{"id":1,"adcode":"820000","name":"澳门特别行政区"},{"id":2,"adcode":"110000","name":"北京市"},{"id":3,"adcode":"500000","name":"重庆市"},{"id":4,"adcode":"350000","name":"福建省"},{"id":5,"adcode":"440000","name":"广东省"},{"id":6,"adcode":"450000","name":"广西壮族自治区"},{"id":7,"adcode":"460000","name":"海南省"},{"id":8,"adcode":"520000","name":"贵州省"},{"id":9,"adcode":"710000","name":"台湾省"},{"id":10,"adcode":"140000","name":"山西省"},{"id":11,"adcode":"620000","name":"甘肃省"},{"id":12,"adcode":"410000","name":"河南省"},{"id":13,"adcode":"130000","name":"河北省"},{"id":14,"adcode":"340000","name":"安徽省"},{"id":15,"adcode":"430000","name":"湖南省"},{"id":16,"adcode":"420000","name":"湖北省"},{"id":17,"adcode":"310000","name":"上海市"},{"id":18,"adcode":"230000","name":"黑龙江省"},{"id":19,"adcode":"360000","name":"江西省"},{"id":20,"adcode":"640000","name":"宁夏回族自治区"},{"id":21,"adcode":"210000","name":"辽宁省"},{"id":22,"adcode":"220000","name":"吉林省"},{"id":23,"adcode":"150000","name":"内蒙古自治区"},{"id":24,"adcode":"370000","name":"山东省"},{"id":25,"adcode":"320000","name":"江苏省"},{"id":26,"adcode":"630000","name":"青海省"},{"id":27,"adcode":"610000","name":"陕西省"},{"id":28,"adcode":"120000","name":"天津市"},{"id":29,"adcode":"650000","name":"新疆维吾尔自治区"},{"id":30,"adcode":"810000","name":"香港特别行政区"},{"id":31,"adcode":"540000","name":"西藏自治区"},{"id":32,"adcode":"510000","name":"四川省"},{"id":33,"adcode":"530000","name":"云南省"},{"id":34,"adcode":"330000","name":"浙江省"}]';
+            var dataObj = eval("(" + provincesStr + ")");  // 转换为json对象
+            var html = '<option value="">--请选择省份--</option>';
+            for (var i = 0, l = dataObj.length; i < l; i++) {
+                html += '<option value="' + dataObj[i].adcode + '">' + dataObj[i].name + '</option>';
+            }
+            $(".provincesList").html(html);
+        }
+        provincesStr();
+
+       /* var configProvinces = {
             url: provinces,
             type: "get",
             dataType: "json",
@@ -301,7 +312,7 @@
                 $(".provincesList").html(html);
             }
         };
-        $.ajax(configProvinces)
+        $.ajax(configProvinces)*/
 
         // 全国/省份的选中事件
         /*$("input[name=promotionType]").parent(".iradio-blue").click(function(){