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

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

@@ -142,7 +142,8 @@
         <div class="form-group">
             <label class="font-noraml">请上传封面图</label>
             <div class="file-loading">
-                <input id="fileinput-demo-1" type="file" name="file" th:value="${KylinBannersVo.coverImg}" data-browse-on-zone-click="true"
+                <input id="fileinput-demo-1" type="file" name="file" th:value="${KylinBannersVo.coverImg}"
+                       data-browse-on-zone-click="true"
                        data-msg-placeholder="Select {files} for upload...">
             </div>
         </div>
@@ -159,6 +160,7 @@
     var platformUrl = "[[${platformUrl}]]";
     var url6 = "[[${url6}]]";
     var url7 = "[[${url7}]]";
+    var url9 = "[[${url9}]]";
     var url14 = "[[${url14}]]";
     var targetObj = "[[${KylinBannersVo.targetObj}]]";
     var targetObjName = "[[${KylinBannersVo.targetObjName}]]";
@@ -302,6 +304,7 @@
             $(this).parents('.provincesAll').after(html)
             $("select").select2();
         })
+
         // 获取省份数据
         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":"浙江省"}]';
@@ -316,6 +319,7 @@
                 $(".provincesList").eq(i).val(provincesListOld[i])
             }
         }
+
         provincesStr();
         /*var configProvinces = {
             url: provinces,
@@ -352,7 +356,7 @@
                 indexId: 0,                 // data.value 每组数据的第几个数据，作为input输入框的 data-id，设为 -1 且 idField 为空则不设置此值
                 indexKey: 1,                // data.value 的第几个数据，作为input输入框的内容
                 showBtn: false, //是否显示下拉按钮
-                hideOnSelect:true, //鼠标从列表单击选择了值时，是否隐藏选择列表
+                hideOnSelect: true, //鼠标从列表单击选择了值时，是否隐藏选择列表
                 searchingTip: "获取中...",
                 clearable: true, //是否可清除已输入的内容
                 allowNoKeyword: false,      // 是否允许无关键字时请求数据
@@ -379,11 +383,11 @@
 
                     if (6 == targetType) {
                         dataList = json.value;
-                    } else if(8 == targetType) {
+                    } else if (8 == targetType) {
                         dataList = json.rows;
-                    } else if(24 == targetType) {
+                    } else if (24 == targetType) {
                         dataList = json.data;
-                    } else if(26 == targetType) {
+                    } else if (26 == targetType) {
                         dataList = json.data;
                     } else {
                         dataList = json.data
@@ -398,15 +402,18 @@
                         if (6 == targetType) {
                             Id = dataList[i].performancesId;
                             Title = dataList[i].title;
-                        } else if(8 == targetType) {
+                        } else if (8 == targetType) {
                             Id = dataList[i].roadShowId;
                             Title = dataList[i].title;
-                        } else if(24 == targetType) {
+                        } else if (24 == targetType) {
                             Id = dataList[i].id;
                             Title = dataList[i].collect_name;
-                        } else if(26 == targetType) {
+                        } else if (26 == targetType) {
                             Id = dataList[i].id;
                             Title = dataList[i].name;
+                        } else if (7 == targetType || 9 == targetType) {
+                            Id = dataList[i].spuId;
+                            Title = dataList[i].spuName;
                         } else {
                             Id = dataList[i].id;
                             Title = dataList[i].title;
@@ -513,8 +520,8 @@
             // 'uploadUrl': "http://127.0.0.1:9003" + "/platform/basicServices/alOss/upload",
             'uploadUrl': platformUrl + "/platform/basicServices/alOss/upload",
             "uploadExtraData": {
-                "pathName" : "banner",
-                "buckType" : 1
+                "pathName": "banner",
+                "buckType": 1
             },
             overwriteInitial: false,
             initialPreviewAsData: true,