zhangjinan
2018-04-08 915fe4d9f7d95eefaa8ce626f2bc5a72807d0de6
Merge branch 'master' of http://122.114.176.216:7070/r/CustomForm-publish
2 files modified
10 ■■■■ changed files
publish/js/customAll/customS.js 2 ●●● patch | view | raw | blame | history
publish/js/customMin/customS_min.js 8 ●●●● patch | view | raw | blame | history
publish/js/customAll/customS.js
@@ -9298,7 +9298,7 @@
    //     dataObj.tenantID = "001";
    // dataObj.flag = flag;
    //dataObj.flag = "cloud"
    //console.log(dataObj);
    console.log(dataObj);
    if (customShow.exCouldNumber != undefined && customShow.exCouldNumber != '') {//保存时 传云单标号 李伟民 12-22
        _.extend(dataObj, { 'orderCode': customShow.exCouldNumber });
    }//保存时 传云单标号 李伟民 12-22
publish/js/customMin/customS_min.js
@@ -1632,11 +1632,11 @@
                // var $list = $uploadimg,
                var $li = $(
                    '<div id="' + fileid + '" class="file-item thumbnail">' +
                    '<img alt=" " class = "fileQueuedAddItem" src = "' + fileItem.path + '"  data-original ="' + fileItem.path + '" >' +
                    '<img alt=" " class = "fileQueuedAddItem" src = "1' + fileItem.path + '"  data-original ="' + fileItem.path + '" >' +
                    '<div class="frm_item_icons">' +
                    '<div class="frm_item_icon remove" imgId="' + fileid + '">' +
                    // '<img  style="width:14px;height:14px;" src="./../../css/img/icon/delete.png"></div>' +
                    '<div  style="width:14px;height:14px;background:url(./../../formEngine/resources/css/img/icon/delete.png);"> </div></div>' +
                    '<div  style="width:14px;height:14px;background:url(../../formEngine/resources/css/img/icon/delete.png);"> </div></div>' +
                    '</div>' +
                    // '<div class="info">' + file.name + '</div>' +
@@ -1725,7 +1725,7 @@
                    '<div id="' + file.id + '" class="file-item thumbnail">' +
                    '<div class="frm_item_icons">' +
                    '<div class="frm_item_icon remove" imgId="' + file.id + '">' +
                    '<img  style="width:14px;height:14px;" src="./../../formEngine/resources/css/img/icon/delete.png"></div>' +
                    '<div  style="width:14px;height:14px;background:url(../../formEngine/resources/css/img/icon/delete.png)"></div></div>' +
                    '</div>' +
                    '<img  class = "fileQueuedAddItem">' +
                    // '<div class="info">' + file.name + '</div>' +
@@ -1771,7 +1771,7 @@
                console.log($img)
                $img.attr('data-original', src);
                // 发布页面查看大图  曲辰明 3-27
                var viewer = new Viewer(document.getElementById(file.id), {
                var viewer = new Viewer(document.getElementById(potion.id), {
                    url: 'data-original',
                    movable: false
                });