Commit 3a84d329b939a04c9c7a00f92b9d0bd7634a7ba7
1 parent
7387fbf7
Exists in
master
and in
1 other branch
fix: 货源管理
Showing
1 changed file
with
19 additions
and
18 deletions
Show diff stats
pages/goodSource/qr-painter.js
| @@ -86,13 +86,14 @@ export default { | @@ -86,13 +86,14 @@ export default { | ||
| 86 | width: '580rpx', | 86 | width: '580rpx', |
| 87 | height: '40rpx', | 87 | height: '40rpx', |
| 88 | padding: '20rpx 30rpx 15rpx 30rpx', | 88 | padding: '20rpx 30rpx 15rpx 30rpx', |
| 89 | + display: 'inline-block', | ||
| 89 | }, | 90 | }, |
| 90 | views: [ | 91 | views: [ |
| 91 | { | 92 | { |
| 92 | type: 'view', | 93 | type: 'view', |
| 93 | css: { | 94 | css: { |
| 94 | display: 'inline-block', | 95 | display: 'inline-block', |
| 95 | - width: '410rpx', | 96 | + width: '400rpx', |
| 96 | fontSize: '22rpx', | 97 | fontSize: '22rpx', |
| 97 | lineHeight: '1em', | 98 | lineHeight: '1em', |
| 98 | verticalAlign: 'bottom', | 99 | verticalAlign: 'bottom', |
| @@ -300,28 +301,28 @@ export default { | @@ -300,28 +301,28 @@ export default { | ||
| 300 | }, | 301 | }, |
| 301 | { | 302 | { |
| 302 | type: 'text', | 303 | type: 'text', |
| 303 | - text: detail.priceType !== 'TON' ? `共${detail.vehicleNumber}车（` : `共${detail.goodsWeight}吨（`, | ||
| 304 | - css: { | ||
| 305 | - paddingLeft: '15rpx', | ||
| 306 | - color: '#2b2b2b', | ||
| 307 | - }, | ||
| 308 | - }, | ||
| 309 | - { | ||
| 310 | - type: 'text', | ||
| 311 | - text: detail.priceType !== 'TON' ? `还需${detail.remainVehicleNumber}车` : `剩余${detail.remainGoodsWeight}吨`, | ||
| 312 | - css: { | ||
| 313 | - paddingLeft: '15rpx', | ||
| 314 | - color: '#ed3f3f', | ||
| 315 | - }, | ||
| 316 | - }, | ||
| 317 | - { | ||
| 318 | - type: 'text', | ||
| 319 | - text: '）', | 304 | + text: detail.priceType !== 'TON' ? `共${detail.vehicleNumber}车` : `共${detail.goodsWeight}吨`, |
| 320 | css: { | 305 | css: { |
| 321 | paddingLeft: '15rpx', | 306 | paddingLeft: '15rpx', |
| 322 | color: '#2b2b2b', | 307 | color: '#2b2b2b', |
| 323 | }, | 308 | }, |
| 324 | }, | 309 | }, |
| 310 | + // { | ||
| 311 | + // type: 'text', | ||
| 312 | + // text: detail.priceType !== 'TON' ? `还需${detail.remainVehicleNumber}车` : `剩余${detail.remainGoodsWeight}吨`, | ||
| 313 | + // css: { | ||
| 314 | + // paddingLeft: '15rpx', | ||
| 315 | + // color: '#ed3f3f', | ||
| 316 | + // }, | ||
| 317 | + // }, | ||
| 318 | + // { | ||
| 319 | + // type: 'text', | ||
| 320 | + // text: '）', | ||
| 321 | + // css: { | ||
| 322 | + // paddingLeft: '15rpx', | ||
| 323 | + // color: '#2b2b2b', | ||
| 324 | + // }, | ||
| 325 | + // }, | ||
| 325 | ], | 326 | ], |
| 326 | }, | 327 | }, |
| 327 | { | 328 | { |