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

peng

9 天以前 30dbe5b15902d90a5ca41e77ccd7d399d6c9578d

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

 seller/src/views/goods/goods-seller/goodsOperationSec.vue

@@ -2435,8 +2435,8 @@
    // todo 文件上传
    async upLoadImg(file) {
      console.log(file, this.count++);
      if (this.listImages.length >= 5) {
        this.$Message.error("图片上传不能超过5个");
      if (this.listImages.length >= 10) {
        this.$Message.error("图片上传不能超过10个");
        return;
      }
      try {