gm-printer-label 3.0.10-beta.0 → 3.0.11-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/.eslintcache
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
[{"/Users/xurora/Desktop/gm-printer-label/src/util.js":"1","/Users/xurora/Desktop/gm-printer-label/src/printer/block.js":"2","/Users/xurora/Desktop/gm-printer-label/src/common/editor_compoents/store.js":"3"},{"size":
|
|
1
|
+
[{"/Users/xurora/Desktop/gm-printer-label/src/util.js":"1","/Users/xurora/Desktop/gm-printer-label/src/printer/block.js":"2","/Users/xurora/Desktop/gm-printer-label/src/common/editor_compoents/store.js":"3","/Users/xurora/Desktop/gm-printer-label/src/common/editor_compoents/edit_modify_filed.js":"4"},{"size":1937,"mtime":1656502524283,"results":"5","hashOfConfig":"6"},{"size":10183,"mtime":1656502805870,"results":"7","hashOfConfig":"6"},{"size":7158,"mtime":1659080004106,"results":"8","hashOfConfig":"6"},{"size":4595,"mtime":1659079578151,"results":"9","hashOfConfig":"6"},{"filePath":"10","messages":"11","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"10llghp",{"filePath":"12","messages":"13","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"14","messages":"15","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"16","messages":"17","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/xurora/Desktop/gm-printer-label/src/util.js",[],"/Users/xurora/Desktop/gm-printer-label/src/printer/block.js",[],"/Users/xurora/Desktop/gm-printer-label/src/common/editor_compoents/store.js",[],"/Users/xurora/Desktop/gm-printer-label/src/common/editor_compoents/edit_modify_filed.js",[]]
|
package/package.json
CHANGED
|
@@ -69,7 +69,7 @@ class EditModifyFiled extends React.Component {
|
|
|
69
69
|
onChange={this.handleChangeBlock.bind(this,
|
|
70
70
|
'style')}/>}
|
|
71
71
|
{(type === 'qrcode' || type === 'order_qrcode' || type ===
|
|
72
|
-
'package_id_qrcode' || type === 'image') && (
|
|
72
|
+
'package_id_qrcode' || type === 'image' || type === 'merchandise_trace_qrcode') && (
|
|
73
73
|
<div>
|
|
74
74
|
<Size style={style}
|
|
75
75
|
onChange={this.handleChangeBlock.bind(this, 'style')}/>
|
package/src/printer/block.js
CHANGED
|
@@ -108,7 +108,6 @@ class Block extends React.Component {
|
|
|
108
108
|
isStation,
|
|
109
109
|
...rest
|
|
110
110
|
} = this.props
|
|
111
|
-
console.log('test', merchandise_trace_qrcode)
|
|
112
111
|
const { isEdit } = this.state
|
|
113
112
|
let content = null
|
|
114
113
|
if (!type || type === 'text') {
|
|
@@ -159,7 +158,6 @@ class Block extends React.Component {
|
|
|
159
158
|
/>
|
|
160
159
|
)
|
|
161
160
|
} else if (type === 'merchandise_trace_qrcode') {
|
|
162
|
-
console.log('template(merchandise_trace_qrcode, data)', merchandise_trace_qrcode, data, template(merchandise_trace_qrcode, data))
|
|
163
161
|
content = isStation ? (
|
|
164
162
|
<QrCode
|
|
165
163
|
value={miniAppLink + template(merchandise_trace_qrcode, data)}
|
|
@@ -167,7 +165,7 @@ class Block extends React.Component {
|
|
|
167
165
|
/>
|
|
168
166
|
) : (
|
|
169
167
|
<div
|
|
170
|
-
data-
|
|
168
|
+
data-traceqrcode={template(merchandise_trace_qrcode, data)}
|
|
171
169
|
data-width={style.width}
|
|
172
170
|
data-height={style.height}
|
|
173
171
|
data-name={index}
|
package/src/util.js
CHANGED
|
@@ -75,7 +75,7 @@ function afterImgAndSvgLoaded (callback, $printer) {
|
|
|
75
75
|
timer = setTimeout(afterImgAndSvgLoaded.bind(this, callback, $printer), 300)
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
|
-
const miniAppLink = 'https://
|
|
78
|
+
const miniAppLink = 'https://miniapp.guanmai.cn/traceability/?id='
|
|
79
79
|
export {
|
|
80
80
|
pxAdd,
|
|
81
81
|
getStyleWithDiff,
|