9月20 前台提交

src/main/vue/src/components/OrderItem.vue

@@ -141,10 +141,10 @@
 
             <span>{{'第'+(index+1)+'次返修'}}</span>
 
-            <div class="preview" v-if="item.statusFlag==1" @click="goNextquery('orderExamine',{repairId:item.id,isChange:1,type:type})">
+            <div class="preview" v-if="item.statusFlag==1" @click="goNextquery('orderExamine',{repairId:item.id,isChange:1,type:'shop'})">
                 <template v-if="type=='user'">
                     <img src="../assetsPre/excel.png" style="margin-left:50px;width:30px;height:29px;" alt="">
-                    <span>修改备注</span>
+                    <span>查看备注</span>
                 </template>
 
             </div>
@@ -409,11 +409,11 @@ export default {
                             }
                         }).then(res => {
                             if (res.success) {
-                                if ( res.data.productComment.starLevel) {
-                                     res.data.productComment.starLevel = Number( res.data.productComment.starLevel)
+                                if (res.data.productComment.starLevel) {
+                                    res.data.productComment.starLevel = Number(res.data.productComment.starLevel)
                                 }
                                 else {
-                                     res.data.productComment.starLevel = 0
+                                    res.data.productComment.starLevel = 0
                                 }
                                 this.$emit('changeData', res.data)
                             }

src/main/vue/src/pagesPre/OrderExamine.vue

@@ -48,7 +48,7 @@
             </el-pagination>
 
             <div class="bottom">
-                <el-button type="warning" plain @click="goShare">他人审片</el-button>
+                <el-button type="warning" v-if="!isChange" plain @click="goShare">他人审片</el-button>
             </div>
         </template>
 

src/main/vue/src/pagesPre/OrderUploadChange.vue

@@ -11,7 +11,7 @@
                 <el-option key="0" label="已上传" value="0">
                 </el-option>
             </el-select>
-            <el-button type="primary" size="mini"  style="float:right;margin-top:25px;margin-right:20px" class="btn" plain @click="dialogVisible=true,upLoadImg=[],addImage=[],num=0">批量上传</el-button>
+            <el-button type="primary" size="mini" style="float:right;margin-top:25px;margin-right:20px" class="btn" plain @click="dialogVisible=true,upLoadImg=[],addImage=[],num=0">批量上传</el-button>
         </div>
 
         <div class="content">
@@ -169,7 +169,7 @@ export default {
             allNumber: 0,
             num: 0,
             isLoading: false,
-            loading: false
+            loading: false,
         }
     },
     methods: {
@@ -190,9 +190,11 @@ export default {
                 }).then(res => {
                     if (res.data) {
                         if (res.data.statusFlag == 1) {
+
                             reject()
                         }
                         else {
+                            this.num++
                             resolve()
                         }
 
@@ -303,17 +305,17 @@ export default {
         },
         handleRemove(file, fileList) {
             console.log(file, fileList);
-            var list = []
-            fileList.forEach(item => {
-                item.response.data.forEach(todo => {
-                    var jsop = {
-                        originalImage: todo,
-                        remark: ''
-                    }
-                    list.push(jsop)
-                })
-            })
-            this.addImage = list
+            // var list = []
+            // fileList.forEach(item => {
+            //     item.response.data.forEach(todo => {
+            //         var jsop = {
+            //             originalImage: todo,
+            //             remark: ''
+            //         }
+            //         list.push(jsop)
+            //     })
+            // })
+            // this.addImage = list
             this.num = this.addImage.length
         },
         handleProgress(e, file) {

src/main/vue/src/pagesPre/Register.vue

@@ -145,6 +145,9 @@ export default {
                         validator: (rule, value, callback) => {
                             if (!value) {
                                 callback(new Error('请输入用户名'));
+                            }
+                            else if (/^[0-9]*$/.test(value)) {
+                                callback(new Error('用户名必须包含字母或中文字符'));
                             } else {
                                 this.checkHas({ username: this.formData.username }).then((result) => {
                                     if (result) {
@@ -221,7 +224,11 @@ export default {
                         validator: (rule, value, callback) => {
                             if (!value) {
                                 callback(new Error('请输入用户名'));
-                            } else {
+                            }
+                            else if (/^[0-9]*$/.test(value)) {
+                                callback(new Error('用户名必须包含字母或中文字符'));
+                            }
+                            else {
                                 this.checkHas({ username: this.formData1.username }).then((result) => {
                                     if (result) {
                                         callback(new Error('已存在该用户名'));

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.05829a965d0124187fe7cddf115e75c4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.cb52b8fa49e1c90c1e61.js></script><script type=text/javascript src=/static/js/vendor.f9fb9e119f6383c2d254.js></script><script type=text/javascript src=/static/js/admin.223777ad2210cfa62129.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.05829a965d0124187fe7cddf115e75c4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.64d0694f05f194cd43a5.js></script><script type=text/javascript src=/static/js/vendor.f9fb9e119f6383c2d254.js></script><script type=text/javascript src=/static/js/admin.223777ad2210cfa62129.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.9cf3a0770079b1465db0a635a125585c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.cb52b8fa49e1c90c1e61.js></script><script type=text/javascript src=/static/js/vendor.f9fb9e119f6383c2d254.js></script><script type=text/javascript src=/static/js/index.1e1aa6254693f06a22a4.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+        }</style><link href=/static/css/index.e522ca08399bc7d4343dacb419ae39ee.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.64d0694f05f194cd43a5.js></script><script type=text/javascript src=/static/js/vendor.f9fb9e119f6383c2d254.js></script><script type=text/javascript src=/static/js/index.c367bac2c7ac07e68375.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;

src/main/webapp/WEB-INF/html/loginAdmin.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><link href=/static/css/loginAdmin.bc5c78a02358f02b38783ad4d43c1d0d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.cb52b8fa49e1c90c1e61.js></script><script type=text/javascript src=/static/js/vendor.f9fb9e119f6383c2d254.js></script><script type=text/javascript src=/static/js/loginAdmin.5a0656572772d4c1eb47.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><link href=/static/css/loginAdmin.bc5c78a02358f02b38783ad4d43c1d0d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.64d0694f05f194cd43a5.js></script><script type=text/javascript src=/static/js/vendor.f9fb9e119f6383c2d254.js></script><script type=text/javascript src=/static/js/loginAdmin.5a0656572772d4c1eb47.js></script></body></html>