|
@@ -173,6 +173,7 @@ import {
|
|
getCloudDevice,
|
|
getCloudDevice,
|
|
deviceAdd,
|
|
deviceAdd,
|
|
cloudPrint,
|
|
cloudPrint,
|
|
|
|
+ cloudPrintTest,
|
|
shopDeviceList,
|
|
shopDeviceList,
|
|
deviceDelete,
|
|
deviceDelete,
|
|
cloudConfigList,
|
|
cloudConfigList,
|
|
@@ -567,7 +568,12 @@ export default {
|
|
}
|
|
}
|
|
|
|
|
|
.card-con {
|
|
.card-con {
|
|
- margin-top: ${this.params.paddingTop}mm;
|
|
|
|
|
|
+ margin-top: ${
|
|
|
|
+ this.params.direction === 1 &&
|
|
|
|
+ ["z1", "z4", "z7"].includes(this.params.jpAutoAlign)
|
|
|
|
+ ? this.params.paddingTop - 10
|
|
|
|
+ : this.params.paddingTop
|
|
|
|
+ }mm;
|
|
margin-right: ${this.params.paddingRight}mm;
|
|
margin-right: ${this.params.paddingRight}mm;
|
|
margin-bottom: ${this.params.paddingBottom}mm;
|
|
margin-bottom: ${this.params.paddingBottom}mm;
|
|
margin-left: ${this.params.paddingLeft}mm;
|
|
margin-left: ${this.params.paddingLeft}mm;
|
|
@@ -589,11 +595,10 @@ export default {
|
|
</html>`;
|
|
</html>`;
|
|
|
|
|
|
let params = {
|
|
let params = {
|
|
- orderId: 0,
|
|
|
|
shopId: this.params.shopIdList[0],
|
|
shopId: this.params.shopIdList[0],
|
|
jobFile: html,
|
|
jobFile: html,
|
|
};
|
|
};
|
|
- cloudPrint(params).then((res) => {
|
|
|
|
|
|
+ cloudPrintTest(params).then((res) => {
|
|
console.log("云盒打印信息", res);
|
|
console.log("云盒打印信息", res);
|
|
if (res.code === 200) {
|
|
if (res.code === 200) {
|
|
this.$message({
|
|
this.$message({
|