9月19 前台提交

src/main/vue/src/emUI.less

@@ -423,9 +423,24 @@ a{
         width: 18%;
         margin-right:2%
     }
+
+    &.uploadSmall{
+        .el-upload-list>li{
+            display: block;
+            width: 100%;
+            margin-right:0
+        }
+    }
+
+    .el-dialog__headerbtn .el-dialog__close{
+        font-size: 20px;
+        color:#0B9EC0;
+    }
 }
 
 
+
+
 .el-message-box__message{
     word-break: break-all;
 }

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,chooseName=[]">上传图片</el-button>
+            <el-button type="primary" v-if="canUploadNum>0" class="btn" @click="tip=[],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>
@@ -18,7 +18,7 @@
             <div class="el-upload__tip" slot="tip">只能上传RGB图片类型的jpg/png文件，当前已上传{{addImage.length}}张图片，还可以上传{{canUploadNum-addImage.length}}张</div>
         </el-upload> -->
 
-        <el-dialog title="上传图片" class="uploadDialog" :visible.sync="dialogVisible" width="80%" top="50px" :close-on-click-modal='false'>
+        <el-dialog title="上传图片" class="uploadDialog" :class="{uploadSmall:(maxNum<15)}" :visible.sync="dialogVisible" :show-close='(orderInfo.quantity-maxNum+num)==orderImage.length' :width="maxNum>50?'80%':'50%'" :top="maxNum>50?'50px':'15vh'" :close-on-click-modal='false'>
             <div v-if="tip.length>0" class="tip" style="margin-bottom:10px;">
                 <template v-if="tip[0].indexOf('正在压缩')!=-1">
                     <i class="el-icon-loading"></i>{{tip[0]}}请不要关闭窗口耐心等待
@@ -158,21 +158,14 @@ export default {
                     })
                     this.orderImage = res.data
                     this.realNum = res.data.length
-                    if (this.realNum) {
-                        setTimeout(() => {
-                            loading.close();
-                        }, 1500);
-                    }
-                    else {
-                        loading.close();
-                    }
+                    loading.close();
 
 
                 }
             })
         },
         chooseImg(index) {
-            console.log(index)
+            // console.log(index)
         },
         changeRemark(json) {
             if (this.orderImgId.indexOf(json.id) != -1) {
@@ -183,7 +176,7 @@ export default {
 
         },
         handleSuccess(res) {
-            console.log(res)
+            // console.log(res)
             var tips = [...this.tip]
             tips.forEach((item, index) => {
                 var list = item.split('文件正在压缩')
@@ -216,14 +209,14 @@ export default {
             this.num = fileList.length
         },
         handleProgress(e, file) {
-            console.log(e, file)
+            // console.log(e, file)
             if (e.percent == 100) {
                 this.tip.splice(0, 0, file.name + '文件正在压缩')
             }
 
         },
         handleOn(file, fileList) {
-            console.log(fileList)
+            // console.log(fileList)
             const isJPG = (file.type === 'image/jpeg' || file.type === 'image/png');
             if (!isJPG) {
                 // this.$message.error('上传头像图片只能是 JPG 格式!');
@@ -291,25 +284,45 @@ export default {
         },
         submit() {
 
-            this.$http.post({
-                url: '/userOrder/update',
+
+            this.$http.get({
+                url: '/orderImage/getTotalNum',
                 data: {
-                    id: this.orderInfo.id,
-                    statusFlag: this.orderInfo.statusFlag + 1
+                    orderId: this.orderInfo.id,
                 }
             }).then(res => {
-                if (res.success) {
+                if (res.data.totalNum != res.data.orderNum) {
+                    this.$alert('图片数量有问题，不能上传哦！', '提示', {
+                        confirmButtonText: '确定',
+                        callback: action => {
+                            this.getImage()
+                        }
+                    });
+                }
+                else {
                     this.$http.post({
-                        url: '/orderImage/delOssImage',
+                        url: '/userOrder/update',
                         data: {
-                            orderId: this.orderInfo.id
+                            id: this.orderInfo.id,
+                            statusFlag: this.orderInfo.statusFlag + 1
                         }
-                    })
-                    this.$message.success('上传图片成功');
-                    history.back()
+                    }).then(res => {
+                        if (res.success) {
+                            this.$http.post({
+                                url: '/orderImage/delOssImage',
+                                data: {
+                                    orderId: this.orderInfo.id
+                                }
+                            })
+                            this.$message.success('上传图片成功');
+                            history.back()
 
+                        }
+                    })
                 }
             })
+
+
         }
     },
     components: {

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.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>
+<!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.9eb6c3aa962e4d9ae7fe.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>

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

@@ -5,7 +5,7 @@
             position: absolute;
             top: 0;
             left: 0;
-        }</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字符串
+        }</style><link href=/static/css/index.e7376316a3defb166804065e2deaa1a6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.9eb6c3aa962e4d9ae7fe.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;