Merge branch 'master' of ssh://193.112.35.168:29418/flqAdmin

admin

2020-03-24 5873f9036dbae3a9c5056a02c9c85f60d9945ead

 childPath/editor/dongTai/evaluate_edit.html

@@ -1021,6 +1021,7 @@
                           if (res.code != 0) {

                              doui.showToast(res.msg);

                           } else {

                              $("#goodsUrl").val("");

                              vm.goods.goodsId = res.data.goodsId;

                              vm.goods.goodsType = res.data.goodsType;

                              vm.picUrls=[];

@@ -1273,6 +1274,7 @@
                           if (res.code != 0) {

                              doui.showToast(res.msg);

                           } else {

                              $("#goodsUrl2").val("");

                              vm2.goods.goodsId = res.data.goodsId;

                              vm2.goods.goodsType = res.data.goodsType;

                              // 添加图片

@@ -1310,12 +1312,9 @@
                        return; //是否是图片

                     }

                     reader.onload = function(e) {

                        var oldlength = vm.goods.imglist.length - 1;

                        var oldlength = vm2.goods.imglist.length - 1;

                        //表示从indexC这个下标的元素开始, 删除1个元素，并在这个位置增加新元素e.target.result

                        vm.goods.imglist.splice(indexC, 1, e.target.result);

                        if (oldlength === indexC) {

                           vm2.goods.imglist.push(defaultImg);

                        }

                        vm2.goods.imglist.splice(indexC, 1, e.target.result);

                     };

                     reader.readAsDataURL(file);

                  }