jufubao-base 1.0.297-beta23 → 1.0.297-beta24
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/package.json
CHANGED
|
@@ -97,7 +97,7 @@
|
|
|
97
97
|
</view>
|
|
98
98
|
<xd-font-icon :size="28" icon="iconxiangyou_xian"></xd-font-icon>
|
|
99
99
|
</view>
|
|
100
|
-
<view v-if="item.consume_mode==='JHD' && showJHD === 'Y'" :key="item.consume_mode"
|
|
100
|
+
<view v-if="item.consume_mode==='JHD' && showJHD === 'Y' && (isPreview || (!isPreview && curConsumeType !== 'JHD'))" :key="item.consume_mode"
|
|
101
101
|
class="consume_item"
|
|
102
102
|
@click="handleConsumeType(item.consume_mode)"
|
|
103
103
|
>
|
|
@@ -112,7 +112,8 @@
|
|
|
112
112
|
</view>
|
|
113
113
|
<xd-font-icon :size="28" icon="iconxiangyou_xian"></xd-font-icon>
|
|
114
114
|
</view>
|
|
115
|
-
|
|
115
|
+
|
|
116
|
+
<view v-if="item.consume_mode==='QP' && showQP==='Y' && (isPreview || (!isPreview && curConsumeType !== 'QP')) " :key="item.consume_mode"
|
|
116
117
|
class="consume_item"
|
|
117
118
|
@click="handleConsumeType(item.consume_mode)"
|
|
118
119
|
>
|
|
@@ -559,8 +560,9 @@
|
|
|
559
560
|
|
|
560
561
|
.jfb-base-consump-code {
|
|
561
562
|
&__body {
|
|
563
|
+
padding-top: 160rpx;
|
|
562
564
|
.content-box {
|
|
563
|
-
margin:
|
|
565
|
+
margin: 0rpx 30rpx 0 30rpx;
|
|
564
566
|
background-color: #fff;
|
|
565
567
|
padding: 81rpx 32rpx 32rpx 32rpx;
|
|
566
568
|
border-radius: 24rpx;
|
|
@@ -624,7 +626,6 @@
|
|
|
624
626
|
._img{
|
|
625
627
|
width: 30rpx;
|
|
626
628
|
height: 30rpx;
|
|
627
|
-
background-color: red;
|
|
628
629
|
image{
|
|
629
630
|
width: 100%;
|
|
630
631
|
height: 100%;
|
|
@@ -640,13 +641,12 @@
|
|
|
640
641
|
padding: 30rpx 40rpx;
|
|
641
642
|
border-radius: 24rpx;
|
|
642
643
|
color: #fff;
|
|
643
|
-
font-size:
|
|
644
|
+
font-size: 28rpx;
|
|
644
645
|
display: flex;
|
|
645
646
|
justify-content: space-between;
|
|
646
647
|
align-items: center;
|
|
647
648
|
width: 520rpx;
|
|
648
649
|
background: linear-gradient(135deg, #2D2824 0%, #625344 100%);
|
|
649
|
-
;
|
|
650
650
|
}
|
|
651
651
|
|
|
652
652
|
.bar-code {
|
|
@@ -117,6 +117,7 @@ export default function (data, gValue,gColor,oldData){
|
|
|
117
117
|
ele: "xd-icon-select",
|
|
118
118
|
valueKey: "scanIcon",
|
|
119
119
|
value: data.scanIcon || '',
|
|
120
|
+
hidden: data.showScan !== 'Y',
|
|
120
121
|
list: IConList,
|
|
121
122
|
labelInline: true,
|
|
122
123
|
className: 'input80',
|
|
@@ -129,6 +130,7 @@ export default function (data, gValue,gColor,oldData){
|
|
|
129
130
|
groupKey:'content',
|
|
130
131
|
value: data.scanImg || {},
|
|
131
132
|
defaultValue: data.scanImg || null,
|
|
133
|
+
hidden: data.showScan !== 'Y',
|
|
132
134
|
slot: true,
|
|
133
135
|
oneWidth: 60,
|
|
134
136
|
oneHeight: 60,
|
|
@@ -195,6 +197,7 @@ export default function (data, gValue,gColor,oldData){
|
|
|
195
197
|
labelInline: true,
|
|
196
198
|
className: 'input80',
|
|
197
199
|
groupKey: "content",
|
|
200
|
+
hidden: data.showJHD !== 'Y',
|
|
198
201
|
},
|
|
199
202
|
data.JHDIconType === 'img' &&{
|
|
200
203
|
label: ' ',
|
|
@@ -216,6 +219,7 @@ export default function (data, gValue,gColor,oldData){
|
|
|
216
219
|
sort: true,
|
|
217
220
|
maxlen: 100,
|
|
218
221
|
labelInline: true,
|
|
222
|
+
hidden: data.showJHD !== 'Y',
|
|
219
223
|
},
|
|
220
224
|
{ ele: 'group_end' },
|
|
221
225
|
|
|
@@ -269,6 +273,7 @@ export default function (data, gValue,gColor,oldData){
|
|
|
269
273
|
labelInline: true,
|
|
270
274
|
className: 'input80',
|
|
271
275
|
groupKey: "content",
|
|
276
|
+
hidden: data.showQP !== 'Y',
|
|
272
277
|
},
|
|
273
278
|
data.QPIconType === 'img' &&{
|
|
274
279
|
label: ' ',
|
|
@@ -290,6 +295,7 @@ export default function (data, gValue,gColor,oldData){
|
|
|
290
295
|
sort: true,
|
|
291
296
|
maxlen: 100,
|
|
292
297
|
labelInline: true,
|
|
298
|
+
hidden: data.showQP !== 'Y',
|
|
293
299
|
},
|
|
294
300
|
{ ele: 'group_end' },
|
|
295
301
|
|
|
@@ -74,6 +74,7 @@ export default function (data={},gValue={},gColor={},oldData) {
|
|
|
74
74
|
groupKey:'style',
|
|
75
75
|
value: data.bodyBgImg || {},
|
|
76
76
|
defaultValue: data.bodyBgImg || null,
|
|
77
|
+
hidden: !statusShow({data, key: 'contBgcColorStatus', fields:['bodyBgImg'], gValue}),
|
|
77
78
|
slot: true,
|
|
78
79
|
oneWidth: 60,
|
|
79
80
|
oneHeight: 60,
|