Browse Source

9月19 前台提交

panhui 7 năm trước cách đây
mục cha
commit
f338a45540

+ 6 - 0
src/main/vue/src/emUI.less

@@ -436,3 +436,9 @@ a{
     display: block;
     height: auto!important;
 }
+.el-upload-list__item .el-icon-close{
+    color:#fff;
+}
+.el-upload-list__item .el-icon-close-tip{
+    color:#fff;
+}

+ 24 - 6
src/main/vue/src/pagesPre/OrderUpload.vue

@@ -5,7 +5,7 @@
             <span style="margin-left:20px;">{{orderInfo.productInfo.title}}</span>
             <span style="font-size:14px;margin-left:20px;">已上传/总张数:{{orderImage.length}} / {{orderInfo.quantity}}</span>
             <span v-if="canUploadNum<0" style="font-size:14px;color:red;margin-left:10px">超出{{0-canUploadNum}}张</span>
-            <el-button type="primary" v-if="canUploadNum>0" class="btn" @click="dialogVisible=true,upLoadImg=[],addImage=[],num=0,maxNum=orderInfo.quantity-orderImage.length">上传图片</el-button>
+            <el-button type="primary" v-if="canUploadNum>0" class="btn" @click="dialogVisible=true,upLoadImg=[],addImage=[],num=0,maxNum=orderInfo.quantity-orderImage.length,chooseName=[]">上传图片</el-button>
 
             <el-button style="float:right;margin:20px;" v-if='canSubmit&&canUploadNum==0' type="warning" class="btn" @click="submit">确定</el-button>
         </div>
@@ -32,7 +32,7 @@
                 <div class="el-upload__text">将文件拖到此处,或
                     <em>点击上传</em>
                 </div>
-                <div class="el-upload__tip" slot="tip">只能上传RGB图片类型的jpg/png文件,已上传/总张数:{{orderImage.length}} / {{orderInfo.quantity}}</div>
+                <div class="el-upload__tip" slot="tip">只能上传RGB图片类型的jpg/png文件,已上传/总张数:{{orderImage.length}} / {{orderInfo.quantity}}&nbsp;&nbsp;&nbsp;还可以选择{{maxNum-num}}张</div>
             </el-upload>
         </el-dialog>
 
@@ -112,6 +112,13 @@ export default {
             })
             return list
         },
+        orderImgName() {
+            var list = []
+            this.orderImage.forEach(item => {
+                list.push(item.imageName)
+            })
+            return list
+        },
     },
     data() {
         return {
@@ -126,7 +133,8 @@ export default {
             tip: [],
             realNum: 0,
             maxNum: 0,
-            AddImageloading: false
+            AddImageloading: false,
+            chooseName: []
         }
     },
     methods: {
@@ -205,7 +213,7 @@ export default {
 
         },
         handleError(file, fileList) {
-            this.num = list.length
+            this.num = fileList.length
         },
         handleProgress(e, file) {
             console.log(e, file)
@@ -221,10 +229,20 @@ export default {
                 // this.$message.error('上传头像图片只能是 JPG 格式!');
             }
             else {
-                this.loading = true
-                this.num++
+                if (this.chooseName.indexOf(file.name) != -1) {
+                    return false
+                }
+                else {
+                    if (this.orderImgName.indexOf(file.name) != -1) {
+                        return false
+                    }
+
+                    this.chooseName.push(file.name)
+                }
 
 
+                this.loading = true
+                this.num++
             }
 
 

+ 1 - 1
src/main/webapp/WEB-INF/html/admin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.da4f73e09f989b1618ebd295c1c6c122.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.f5fc001b5bb69f582381.js></script><script type=text/javascript src=/static/js/vendor.89cb0930756807ab3c59.js></script><script type=text/javascript src=/static/js/admin.37d06aefedc8adc9c0ca.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.da4f73e09f989b1618ebd295c1c6c122.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.650559616c3b1d044d33.js></script><script type=text/javascript src=/static/js/vendor.89cb0930756807ab3c59.js></script><script type=text/javascript src=/static/js/admin.37d06aefedc8adc9c0ca.js></script></body></html>

+ 1 - 1
src/main/webapp/WEB-INF/html/index.html

@@ -5,7 +5,7 @@
             position: absolute;
             top: 0;
             left: 0;
-        }</style><link href=/static/css/index.6d2c93cc280481c058dd146882ccf627.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.f5fc001b5bb69f582381.js></script><script type=text/javascript src=/static/js/vendor.89cb0930756807ab3c59.js></script><script type=text/javascript src=/static/js/index.4a2996224c7f6eeae1e8.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+        }</style><link href=/static/css/index.d3e9150af2f754a66dd9086b4c782dc6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.650559616c3b1d044d33.js></script><script type=text/javascript src=/static/js/vendor.89cb0930756807ab3c59.js></script><script type=text/javascript src=/static/js/index.4a2996224c7f6eeae1e8.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
     var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
     var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器
     var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
src/main/webapp/static/css/index.d3e9150af2f754a66dd9086b4c782dc6.css


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
src/main/webapp/static/js/20.5e7de93a116f5614bf5f.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
src/main/webapp/static/js/20.e8911a8e368e940abf63.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
src/main/webapp/static/js/manifest.650559616c3b1d044d33.js


Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác