Commit d5c6e8b5 by linjinhong

Merge branch 'test' into ljh

parents 0d4d8e09 814bb5c4
{ {
"apiApiHost":"http://10.168.31.142:8060/api", "apiApiHost":"http://10.168.31.142:8060/api",
"fileApiUrl":"http://10.168.31.142:80/upload/factory", "fileApiUrl":"http://10.168.31.142:80/upload/factory",
"visionUrl":"https://console.jomalls.com" "visionUrl":"https://console.jomalls.com"
......
...@@ -763,6 +763,11 @@ export default { ...@@ -763,6 +763,11 @@ export default {
}); });
break; break;
case "sendFile": case "sendFile":
if (size.width && size.height) {
this.hasSize = true;
} else {
this.hasSize = false;
}
this.imgList = []; this.imgList = [];
this.selectIndex = -1; this.selectIndex = -1;
if (value.length > 0) { if (value.length > 0) {
...@@ -1223,6 +1228,12 @@ export default { ...@@ -1223,6 +1228,12 @@ export default {
</template> </template>
<style lang="less" scoped> <style lang="less" scoped>
.print-tip {
position: absolute;
bottom: 130px;
font-size: 24px;
left: 35%;
}
.page-main { .page-main {
display: flex; display: flex;
flex: 1; flex: 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment