diff --git a/template/admin/src/components/linkaddress/index.vue b/template/admin/src/components/linkaddress/index.vue index 879699692..713765282 100644 --- a/template/admin/src/components/linkaddress/index.vue +++ b/template/admin/src/components/linkaddress/index.vue @@ -269,19 +269,19 @@ - - + diff --git a/template/admin/src/components/uploadImg/index.vue b/template/admin/src/components/uploadImg/index.vue index a6882a8c1..363592230 100644 --- a/template/admin/src/components/uploadImg/index.vue +++ b/template/admin/src/components/uploadImg/index.vue @@ -7,7 +7,7 @@ :visible.sync="uploadModal" width="1024px" :fullscreen="!isPage" - @closed="closed" + @close="closed" >
@@ -61,7 +61,7 @@
-
建议上传图片最大宽度750px,不超过3MB;仅支持jpeg、png格式
+
建议上传图片最大宽度750px,不超过3MB;仅支持jpeg、png格式,拖拽调整上传顺序
@@ -82,39 +82,44 @@ - -
-
-
- -
扫描二维码,快速上传手机图片
-
-
- 刷新图库 -
刷新图库按钮,可显示移动端上传成功的图片
-
-
- - +
+
+ + + + +
+
扫描二维码,快速上传手机图片
+
建议使用手机浏览器
+
+
+
+ 刷新图库 +
刷新图库按钮,可显示移动端上传成功的图片
+
+
+ + +
-
+
@@ -178,24 +183,37 @@ export default { scanToken: '', limit: 20, loading: false, + time: undefined, }; }, created() {}, mounted() {}, + beforeDestroy() { + clearInterval(this.time); + this.time = undefined; + }, methods: { closed() { + console.log('1'); this.ruleForm.type = 0; this.ruleForm.region = 0; this.scanToken = ''; this.webImgUrl = ''; this.ruleForm.imgList = []; + clearInterval(this.time); + this.time = undefined; scanUploadCode().then((res) => {}); }, radioChange(type) { this.ruleForm.type = type; this.ruleForm.imgList = []; + clearInterval(this.time); + this.time = undefined; if (type == 2) { this.scanUploadQrcode(); + this.time = setInterval((e) => { + this.scanUploadGet(); + }, 2000); } }, scanUploadQrcode() { @@ -442,7 +460,6 @@ export default { } .code-image{ display flex - padding-left 100px margin-top 12px .left{ display flex @@ -464,19 +481,32 @@ export default { } .form-width{ width 200px - margin-bottom 18px } .code{ margin-bottom 14px } + .trip{ + color #333333 + text-align: center + line-height: 18px; + } + .trip-small{ + font-size: 12px; + font-weight: 400; + color: #BBBBBB; + text-align: center + line-height: 16px; + } } .right{ + margin-top: 62px; .tip{ font-size: 12px; font-weight: 400; color: #BBBBBB; margin 10px 0 } + } } diff --git a/template/admin/src/pages/app/upload/index.vue b/template/admin/src/pages/app/upload/index.vue index 16892f275..21c700fd2 100644 --- a/template/admin/src/pages/app/upload/index.vue +++ b/template/admin/src/pages/app/upload/index.vue @@ -68,7 +68,6 @@ export default { created() { this.token = this.$route.query.token; this.pid = this.$route.query.pid; - this.pid = this.$route.query.pid; document.title = '手机端扫码上传'; }, methods: { diff --git a/template/admin/src/pages/order/orderList/handle/orderSend.vue b/template/admin/src/pages/order/orderList/handle/orderSend.vue index a0cea8d25..45356857f 100644 --- a/template/admin/src/pages/order/orderList/handle/orderSend.vue +++ b/template/admin/src/pages/order/orderList/handle/orderSend.vue @@ -38,7 +38,7 @@ - +
@@ -62,7 +62,7 @@
-