jufubao-base 1.0.192-beta1 → 1.0.192
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/commands.js +1 -1
- package/package.json +1 -1
- package/src/components/JfbBaseAddress/Attr.js +1 -109
- package/src/components/JfbBaseAddress/JfbBaseAddress.vue +77 -153
- package/src/components/JfbBaseFastLink/Attr.js +6 -22
- package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue +20 -35
- package/src/components/JfbBaseFooter/Attr.js +75 -141
- package/src/components/JfbBaseFooter/JfbBaseFooter.vue +15 -50
- package/src/components/JfbBaseOrderDetail/Attr.js +65 -147
- package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue +46 -96
- package/src/components/JfbBaseOrderList/Attr.js +2 -59
- package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue +92 -139
- package/src/components/JfbBaseOrderList/Mock.js +0 -3
- package/src/components/JfbBaseUserCenter/Attr.js +48 -240
- package/src/components/JfbBaseUserCenter/JfbBaseUserCenter.vue +30 -101
- package/src/components/JfbBaseUserInfo/Attr.js +30 -179
- package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue +44 -80
- package/src/components/JfbBaseUserOrder/Attr.js +25 -291
- package/src/components/JfbBaseUserOrder/JfbBaseUserOrder.vue +54 -172
- package/src/components/JfbBaseWallet/Attr.js +2 -340
- package/src/components/JfbBaseWallet/JfbBaseWallet.vue +49 -173
- package/src/ICONS.js +0 -1128
- package/src/components/JfbBaseAddress/XdTfkItem.vue +0 -117
- package/src/components/JfbBaseOrderList/XdTfkOrderItem.vue +0 -267
|
@@ -129,9 +129,6 @@
|
|
|
129
129
|
v-for="(Ditem, Dindex) in info.film_show.detail.items"
|
|
130
130
|
:key="Dindex"
|
|
131
131
|
class="jfb-base-order-detail__body-delivery-bottom-item"
|
|
132
|
-
:style="{
|
|
133
|
-
marginBottom: lineHeight + 'rpx'
|
|
134
|
-
}"
|
|
135
132
|
>
|
|
136
133
|
<view style="width: 130rpx"
|
|
137
134
|
>{{ Ditem.label }} <span v-if="Ditem.label">:</span>
|
|
@@ -217,9 +214,6 @@
|
|
|
217
214
|
v-for="(Ditem, Dindex) in item.info"
|
|
218
215
|
:key="Dindex"
|
|
219
216
|
class="jfb-base-order-detail__body-delivery-bottom-item"
|
|
220
|
-
:style="{
|
|
221
|
-
marginBottom: lineHeight + 'rpx'
|
|
222
|
-
}"
|
|
223
217
|
>
|
|
224
218
|
<view style="width: 130rpx;display: flex;">
|
|
225
219
|
<view v-html="Ditem.label"></view>
|
|
@@ -516,9 +510,6 @@
|
|
|
516
510
|
v-for="(item, index) in info.detail"
|
|
517
511
|
:key="index"
|
|
518
512
|
class="jfb-base-order-detail__body-order"
|
|
519
|
-
:style="{
|
|
520
|
-
marginBottom: lineHeight + 'rpx'
|
|
521
|
-
}"
|
|
522
513
|
>
|
|
523
514
|
<view :style="{ fontWeight: item.style }">
|
|
524
515
|
<view style="display: flex;">
|
|
@@ -550,9 +541,6 @@
|
|
|
550
541
|
<view
|
|
551
542
|
v-if="item.type !== 'line'"
|
|
552
543
|
class="jfb-base-order-detail__body-price"
|
|
553
|
-
:style="{
|
|
554
|
-
marginBottom: lineHeight + 'rpx'
|
|
555
|
-
}"
|
|
556
544
|
>
|
|
557
545
|
<view :style="{ fontWeight: item.style }">{{ item.label }}</view>
|
|
558
546
|
<xd-unit
|
|
@@ -711,51 +699,41 @@
|
|
|
711
699
|
:style="prod_bottom"
|
|
712
700
|
v-if="info.buttons && info.buttons.length > 0"
|
|
713
701
|
>
|
|
714
|
-
<view
|
|
715
|
-
<view
|
|
702
|
+
<view v-for="(item, index) in info.buttons" :key="index">
|
|
703
|
+
<view
|
|
704
|
+
style="display: flex; align-items: center"
|
|
705
|
+
v-if="item.action === 'pay'"
|
|
706
|
+
>
|
|
716
707
|
<view
|
|
717
|
-
style="display: flex; align-items: center"
|
|
718
|
-
v-if="
|
|
708
|
+
style="display: flex; align-items: center; margin-right: 30rpx"
|
|
709
|
+
v-if="biz_code !== 'gift' || info.is_show_gift_price"
|
|
719
710
|
>
|
|
720
|
-
<
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
725
|
-
|
|
726
|
-
:price="info.pay_info.real_pay_amount"
|
|
727
|
-
:font-size="36"
|
|
728
|
-
:iocn-size="0.45"
|
|
729
|
-
></xd-unit>
|
|
730
|
-
</view>
|
|
731
|
-
<view>
|
|
732
|
-
<xd-button
|
|
733
|
-
@click="handleToPay"
|
|
734
|
-
size="small"
|
|
735
|
-
type="primary"
|
|
736
|
-
:style="{
|
|
737
|
-
height: bottomBtnHeight + 'rpx',
|
|
738
|
-
lineHeight: bottomBtnHeight + 'rpx',
|
|
739
|
-
}"
|
|
740
|
-
:radius="bottomBtnRadius + 'rpx'"
|
|
741
|
-
:bg-color="mainColor"
|
|
742
|
-
>{{ item.text }}
|
|
743
|
-
</xd-button>
|
|
744
|
-
</view>
|
|
711
|
+
<text>应付:</text>
|
|
712
|
+
<xd-unit
|
|
713
|
+
:price="info.pay_info.real_pay_amount"
|
|
714
|
+
:font-size="36"
|
|
715
|
+
:iocn-size="0.45"
|
|
716
|
+
></xd-unit>
|
|
745
717
|
</view>
|
|
746
|
-
<view
|
|
718
|
+
<view>
|
|
747
719
|
<xd-button
|
|
720
|
+
@click="handleToPay"
|
|
748
721
|
size="small"
|
|
749
|
-
|
|
750
|
-
|
|
751
|
-
:
|
|
752
|
-
|
|
753
|
-
|
|
754
|
-
}"
|
|
755
|
-
@click="handleAction(item)"
|
|
756
|
-
>{{ item.text }}</xd-button>
|
|
722
|
+
type="primary"
|
|
723
|
+
radius="40rpx"
|
|
724
|
+
:bg-color="mainColor"
|
|
725
|
+
>{{ item.text }}
|
|
726
|
+
</xd-button>
|
|
757
727
|
</view>
|
|
758
728
|
</view>
|
|
729
|
+
<view v-else>
|
|
730
|
+
<xd-button
|
|
731
|
+
size="small"
|
|
732
|
+
:type="item.type !== undefined ? item.type: 'primary'"
|
|
733
|
+
radius="40rpx"
|
|
734
|
+
@click="handleAction(item)"
|
|
735
|
+
>{{ item.text }}</xd-button>
|
|
736
|
+
</view>
|
|
759
737
|
</view>
|
|
760
738
|
</view>
|
|
761
739
|
</view>
|
|
@@ -862,20 +840,17 @@ export default {
|
|
|
862
840
|
is_border_w: 0,
|
|
863
841
|
is_border_c: "",
|
|
864
842
|
|
|
865
|
-
|
|
866
843
|
//其他
|
|
867
|
-
margin: {
|
|
844
|
+
margin: {
|
|
845
|
+
top: 0,
|
|
846
|
+
left: 0,
|
|
847
|
+
right: 0,
|
|
848
|
+
bottom: 0,
|
|
849
|
+
},
|
|
868
850
|
is_hot: "Y",
|
|
869
851
|
logo: "",
|
|
870
|
-
lineHeight: 20,
|
|
871
852
|
|
|
872
853
|
noticeBgc:'',
|
|
873
|
-
sectionShadow: "",
|
|
874
|
-
sectionBorder: "",
|
|
875
|
-
bottomBtnRadius: 0,
|
|
876
|
-
bottomPadding: "",
|
|
877
|
-
bottomBgColor: "",
|
|
878
|
-
bottomBtnHeight: "",
|
|
879
854
|
is_open: '',
|
|
880
855
|
is_show: '',
|
|
881
856
|
showAllProductDetail: false,
|
|
@@ -920,21 +895,15 @@ export default {
|
|
|
920
895
|
return str
|
|
921
896
|
},
|
|
922
897
|
shadowBox() {
|
|
923
|
-
|
|
898
|
+
if (this.is_shadow === "Y")
|
|
899
|
+
return `0 0 ${this.is_shadow_w}rpx ${this.is_shadow_bg}`;
|
|
900
|
+
else return "0 0 0 rgba(0,0,0,0)";
|
|
924
901
|
},
|
|
925
902
|
borderBox() {
|
|
926
|
-
|
|
903
|
+
if (this.is_border === "Y")
|
|
904
|
+
return `${this.is_border_w}rpx solid ${this.is_border_c}`;
|
|
905
|
+
else return "0";
|
|
927
906
|
},
|
|
928
|
-
bottomBoxStyle(){
|
|
929
|
-
let padding = `${this.checkValue(this.bottomPadding.top, 20)}rpx`;
|
|
930
|
-
padding = `${padding} ${this.checkValue(this.bottomPadding.right, 20)}rpx`;
|
|
931
|
-
padding = `${padding} ${this.checkValue(this.bottomPadding.bottom, 20)}rpx`;
|
|
932
|
-
padding = `${padding} ${this.checkValue(this.bottomPadding.left, 20)}rpx`;
|
|
933
|
-
return {
|
|
934
|
-
padding: padding,
|
|
935
|
-
backgroundColor: this.bottomBgColor,
|
|
936
|
-
}
|
|
937
|
-
}
|
|
938
907
|
},
|
|
939
908
|
created() {
|
|
940
909
|
this.noticeBgc = Color(this.warningColor).alpha(0.2).toString();
|
|
@@ -1174,30 +1143,12 @@ export default {
|
|
|
1174
1143
|
this.is_shadow_w = getContainerPropsValue(container, "content.is_shadow_w", "10");
|
|
1175
1144
|
|
|
1176
1145
|
this.is_border = getContainerPropsValue(container, "content.is_border", "N");
|
|
1146
|
+
this.is_hot = getContainerPropsValue(container, "content.is_hot", "Y");
|
|
1177
1147
|
this.is_border_c = getContainerPropsValue(container, "content.is_border_c", "#fff");
|
|
1178
1148
|
this.is_border_w = getContainerPropsValue(container, "content.is_border_w", 2);
|
|
1179
|
-
|
|
1180
|
-
this.is_hot = getContainerPropsValue(container, "content.is_hot", "Y");
|
|
1181
1149
|
this.viewStatus = getContainerPropsValue(container, "content.viewStatus", "mall");
|
|
1182
1150
|
this.is_show_support_shop = getContainerPropsValue(container, "content.is_show_support_shop", "N");
|
|
1183
1151
|
this.is_show_delete_order = getContainerPropsValue(container, "content.is_show_delete_order", "N");
|
|
1184
|
-
this.lineHeight = getContainerPropsValue(container, "content.lineHeight", 20);
|
|
1185
|
-
let sectionShadow = getContainerPropsValue(container, "content.sectionShadow", "");
|
|
1186
|
-
this.sectionShadow = this.getShadowCompatibleOldStyle(sectionShadow, {
|
|
1187
|
-
type: this.is_shadow,
|
|
1188
|
-
width: this.is_shadow_w,
|
|
1189
|
-
color: this.is_shadow_bg,
|
|
1190
|
-
})
|
|
1191
|
-
let sectionBorder = getContainerPropsValue(container, "content.sectionBorder", "");
|
|
1192
|
-
this.sectionBorder = this.getBorderCompatibleOldStyle(sectionBorder, {
|
|
1193
|
-
type: this.is_border,
|
|
1194
|
-
width: this.is_border_w,
|
|
1195
|
-
color: this.is_border_c,
|
|
1196
|
-
})
|
|
1197
|
-
this.bottomBtnRadius = getContainerPropsValue(container, "content.bottomBtnRadius", 0);
|
|
1198
|
-
this.bottomPadding = getContainerPropsValue(container, "content.bottomPadding", {});
|
|
1199
|
-
this.bottomBgColor = getContainerPropsValue(container, "content.bottomBgColor", "#ffffff");
|
|
1200
|
-
this.bottomBtnHeight = getContainerPropsValue(container, "content.bottomBtnHeight", 60);
|
|
1201
1152
|
this.is_open = getContainerPropsValue(container, "content.is_open", "N");
|
|
1202
1153
|
this.is_show = getContainerPropsValue(container, "content.is_show", '1');
|
|
1203
1154
|
this.showPayCard = this.is_open==='Y'
|
|
@@ -1850,6 +1801,8 @@ export default {
|
|
|
1850
1801
|
position: fixed;
|
|
1851
1802
|
left: 0;
|
|
1852
1803
|
right: 0;
|
|
1804
|
+
height: unit(100, rpx);
|
|
1805
|
+
padding: 0 unit(30, rpx);
|
|
1853
1806
|
box-shadow: 0 0 unit(10, rpx) rgba(0, 0, 0, 0.15);
|
|
1854
1807
|
background: #fff;
|
|
1855
1808
|
z-index: 3000;
|
|
@@ -1857,12 +1810,9 @@ export default {
|
|
|
1857
1810
|
justify-content: flex-end;
|
|
1858
1811
|
align-items: center;
|
|
1859
1812
|
|
|
1860
|
-
|
|
1861
|
-
|
|
1862
|
-
|
|
1863
|
-
margin-left: unit(20, rpx);
|
|
1864
|
-
font-size: @xd-font-size-lg;
|
|
1865
|
-
}
|
|
1813
|
+
& > view {
|
|
1814
|
+
margin-left: unit(20, rpx);
|
|
1815
|
+
font-size: @xd-font-size-lg;
|
|
1866
1816
|
}
|
|
1867
1817
|
}
|
|
1868
1818
|
|
|
@@ -4,17 +4,6 @@ export default {
|
|
|
4
4
|
style: [],
|
|
5
5
|
content: (data)=>{
|
|
6
6
|
return [
|
|
7
|
-
{
|
|
8
|
-
label: "布局样式配置",
|
|
9
|
-
ele: "xd-radio",
|
|
10
|
-
valueKey: "layout_style",
|
|
11
|
-
value: data.layout_style || 'old',
|
|
12
|
-
list: [
|
|
13
|
-
{label: '布局1', value: 'old'},
|
|
14
|
-
{label: '布局2', value: 'tfk'},
|
|
15
|
-
],
|
|
16
|
-
groupKey: "style",
|
|
17
|
-
},
|
|
18
7
|
{
|
|
19
8
|
label: '设置订单状态:',
|
|
20
9
|
ele: 'xd-order-setting',
|
|
@@ -41,18 +30,6 @@ export default {
|
|
|
41
30
|
{required: true, message: '设置订单配置错误!请检查配置', trigger: 'change'},
|
|
42
31
|
],
|
|
43
32
|
},
|
|
44
|
-
{
|
|
45
|
-
label: "是否展示订单号:",
|
|
46
|
-
ele: 'xd-radio',
|
|
47
|
-
valueKey: 'isShowOrderNo',
|
|
48
|
-
value: data['isShowOrderNo'] || 'Y',
|
|
49
|
-
groupKey:'style',
|
|
50
|
-
list: [
|
|
51
|
-
{label: '是', value: 'Y'},
|
|
52
|
-
{label: '否', value: 'N'},
|
|
53
|
-
],
|
|
54
|
-
hidden: data.layout_style !== 'tfk'
|
|
55
|
-
},
|
|
56
33
|
{
|
|
57
34
|
label: '外填充:',
|
|
58
35
|
ele: 'xd-margin-padding',
|
|
@@ -96,38 +73,11 @@ export default {
|
|
|
96
73
|
inline: false,
|
|
97
74
|
notice: '间距设置,<span style="color: red">单位:像素</span>。默认值:<span style="color: red">20</span>像素',
|
|
98
75
|
},
|
|
99
|
-
{
|
|
100
|
-
label: "投影设置:",
|
|
101
|
-
ele: "xd-shadow",
|
|
102
|
-
valueKey: "sectionShadow",
|
|
103
|
-
value: data.sectionShadow || {},
|
|
104
|
-
groupKey:'style',
|
|
105
|
-
handleCustom({action, data}) {
|
|
106
|
-
XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
|
|
107
|
-
.then(res => {
|
|
108
|
-
data.cb(res.list)
|
|
109
|
-
})
|
|
110
|
-
.catch(error => {
|
|
111
|
-
console.error(error);
|
|
112
|
-
data.cb([])
|
|
113
|
-
});
|
|
114
|
-
},
|
|
115
|
-
},
|
|
116
|
-
{
|
|
117
|
-
label: '边框设置:',
|
|
118
|
-
ele: 'xd-border',
|
|
119
|
-
valueKey: 'sectionBorder',
|
|
120
|
-
groupKey:'style',
|
|
121
|
-
value: data.sectionBorder || {},
|
|
122
|
-
placeholder: '请选择边框设置',
|
|
123
|
-
inline: false,
|
|
124
|
-
},
|
|
125
76
|
{
|
|
126
77
|
ele: 'title',
|
|
127
78
|
label: '投影设置',
|
|
128
79
|
size: 'small',
|
|
129
80
|
groupKey:'style',
|
|
130
|
-
hidden: true,
|
|
131
81
|
},
|
|
132
82
|
{
|
|
133
83
|
label: '是否有投影:',
|
|
@@ -141,8 +91,7 @@ export default {
|
|
|
141
91
|
list: [
|
|
142
92
|
{label: '是', value: 'Y'},
|
|
143
93
|
{label: '否', value: 'N'},
|
|
144
|
-
]
|
|
145
|
-
hidden: true,
|
|
94
|
+
]
|
|
146
95
|
},
|
|
147
96
|
data['is_shadow'] === 'Y' && {
|
|
148
97
|
label: '投影颜色:',
|
|
@@ -152,7 +101,6 @@ export default {
|
|
|
152
101
|
value: data['is_shadow_bg'] || '',
|
|
153
102
|
placeholder: '请选择投影颜色',
|
|
154
103
|
classNmae: 'input80',
|
|
155
|
-
hidden: true,
|
|
156
104
|
},
|
|
157
105
|
data['is_shadow'] === 'Y' && {
|
|
158
106
|
label: '投影范围:',
|
|
@@ -175,14 +123,12 @@ export default {
|
|
|
175
123
|
console.error(error);
|
|
176
124
|
});
|
|
177
125
|
},
|
|
178
|
-
hidden: true,
|
|
179
126
|
},
|
|
180
127
|
{
|
|
181
128
|
ele: 'title',
|
|
182
129
|
label: '边框设置',
|
|
183
130
|
size: 'small',
|
|
184
131
|
groupKey:'style',
|
|
185
|
-
hidden: true,
|
|
186
132
|
},
|
|
187
133
|
{
|
|
188
134
|
label: '是否有边框:',
|
|
@@ -196,8 +142,7 @@ export default {
|
|
|
196
142
|
list: [
|
|
197
143
|
{label: '是', value: 'Y'},
|
|
198
144
|
{label: '否', value: 'N'},
|
|
199
|
-
]
|
|
200
|
-
hidden: true,
|
|
145
|
+
]
|
|
201
146
|
},
|
|
202
147
|
data['is_border'] === 'Y' && {
|
|
203
148
|
label: '边框颜色:',
|
|
@@ -207,7 +152,6 @@ export default {
|
|
|
207
152
|
value: data['is_border_c'] || '',
|
|
208
153
|
placeholder: '请选择边框颜色',
|
|
209
154
|
classNmae: 'input80',
|
|
210
|
-
hidden: true,
|
|
211
155
|
},
|
|
212
156
|
data['is_border'] === 'Y' && {
|
|
213
157
|
label: '边框大小:',
|
|
@@ -218,7 +162,6 @@ export default {
|
|
|
218
162
|
value: data['is_border_w'] || '',
|
|
219
163
|
placeholder: '请输入边框大小',
|
|
220
164
|
className: 'input80',
|
|
221
|
-
hidden: true,
|
|
222
165
|
},
|
|
223
166
|
{
|
|
224
167
|
label: '内容圆角设置:',
|
|
@@ -64,129 +64,104 @@
|
|
|
64
64
|
class="jfb-base-order-list__body-order"
|
|
65
65
|
:style="{ padding: outMargin }"
|
|
66
66
|
>
|
|
67
|
-
<
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
:
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
>
|
|
81
|
-
<
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
<view
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
<view
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
>
|
|
100
|
-
|
|
101
|
-
<view class="jfb-base-order-list__body-order-item-content-info">
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
<view
|
|
106
|
-
|
|
107
|
-
<
|
|
108
|
-
|
|
109
|
-
<text>{{ Sitem.product_num }}</text>
|
|
110
|
-
</view>
|
|
67
|
+
<view
|
|
68
|
+
@click="handleToLink(detailPath, item)"
|
|
69
|
+
class="jfb-base-order-list__body-order-item"
|
|
70
|
+
v-for="item in orderList"
|
|
71
|
+
:key="item.main_order_id"
|
|
72
|
+
:style="{
|
|
73
|
+
background: backgroundColor,
|
|
74
|
+
border: borderBox,
|
|
75
|
+
borderRadius: radius + 'rpx',
|
|
76
|
+
boxShadow: shadowBox,
|
|
77
|
+
marginBottom: padding + 'rpx',
|
|
78
|
+
}"
|
|
79
|
+
>
|
|
80
|
+
<view class="jfb-base-order-list__body-order-item-biz">
|
|
81
|
+
<xd-font-icon
|
|
82
|
+
v-if="item.biz_code_icon"
|
|
83
|
+
:icon="item.biz_code_icon"
|
|
84
|
+
:size="item['biz_code_icon_size']"
|
|
85
|
+
></xd-font-icon>
|
|
86
|
+
<view :class="{ marginLeft: item.biz_code_icon }">{{item.biz_code_name }}</view>
|
|
87
|
+
</view>
|
|
88
|
+
<view class="jfb-base-order-list__body-order-item-title">
|
|
89
|
+
<view>订单编号:{{ item.main_order_id }}</view>
|
|
90
|
+
<view :style="{color:item.status.status_type !== 'error' ? mainColor : '#999999',}">{{ item.status.status_name }}</view>
|
|
91
|
+
</view>
|
|
92
|
+
<view class="order-list">
|
|
93
|
+
<view
|
|
94
|
+
class="jfb-base-order-list__body-order-item-content"
|
|
95
|
+
v-for="(Sitem, Sindex) in item.products"
|
|
96
|
+
:key="Sitem.key"
|
|
97
|
+
v-if="(item['isOpen'] === false && Sindex < showLen) || item['isOpen']"
|
|
98
|
+
>
|
|
99
|
+
<image :src="Sitem.product_thumb" style="background: #ffffff" mode="aspectFit"></image>
|
|
100
|
+
<view class="jfb-base-order-list__body-order-item-content-info">
|
|
101
|
+
<view class="jfb-base-order-list__body-order-item-content-info-name">{{ Sitem.product_name }}</view>
|
|
102
|
+
<view class="brand-name" v-if="Sitem.brand_name" :style="{color:brandTextColor}">{{ Sitem.brand_name }}</view>
|
|
103
|
+
<view v-if="Sitem.product_sku_name" class="jfb-base-order-list__body-order-item-content-info-skuname">规格:{{ Sitem.product_sku_name }}</view>
|
|
104
|
+
<view class="jfb-base-order-list__body-order-item-content-info-price">
|
|
105
|
+
<view></view>
|
|
106
|
+
<view class="info-price">
|
|
107
|
+
<text>X</text>
|
|
108
|
+
<text>{{ Sitem.product_num }}</text>
|
|
111
109
|
</view>
|
|
112
110
|
</view>
|
|
113
111
|
</view>
|
|
114
|
-
<view
|
|
115
|
-
class="order-list-icon"
|
|
116
|
-
:style="{ bottom: item['isOpen'] ? '-30rpx' : '-54rpx' }"
|
|
117
|
-
v-if="item.products.length > showLen"
|
|
118
|
-
@click.stop="switchOpen(item)"
|
|
119
|
-
>
|
|
120
|
-
<view :style="{ background: backgroundColor }">
|
|
121
|
-
<xd-font-icon
|
|
122
|
-
color="#666"
|
|
123
|
-
:icon="item['isOpen'] ? 'iconshang_up' : 'iconxia_down'"
|
|
124
|
-
size="24"
|
|
125
|
-
></xd-font-icon>
|
|
126
|
-
</view>
|
|
127
|
-
</view>
|
|
128
|
-
</view>
|
|
129
|
-
<view class="jfb-base-order-list__body-order-item-bottom">
|
|
130
|
-
<view>下单时间:{{ item.created_time_text }}</view>
|
|
131
|
-
<view v-if="item.biz_code !== 'gift' && item.is_not_show_price !== 'Y'">
|
|
132
|
-
<text>合计:</text>
|
|
133
|
-
<xd-unit
|
|
134
|
-
:isOld="false"
|
|
135
|
-
:price="item.total_amount"
|
|
136
|
-
:color="mainColor"
|
|
137
|
-
:fontSize="28"
|
|
138
|
-
></xd-unit>
|
|
139
|
-
</view>
|
|
140
|
-
<view style="color:#999" v-if="item['main_user_server_amount'] !== undefined && item['main_user_server_amount'] > 0">
|
|
141
|
-
<text>(平台服务费:</text>
|
|
142
|
-
<xd-unit
|
|
143
|
-
:isOld="false"
|
|
144
|
-
:price="item['main_user_server_amount']"
|
|
145
|
-
:fontSize="24"
|
|
146
|
-
:is-gray="true"
|
|
147
|
-
color="#999"
|
|
148
|
-
:icon-size=".25"
|
|
149
|
-
></xd-unit>
|
|
150
|
-
<text>)</text>
|
|
151
|
-
</view>
|
|
152
112
|
</view>
|
|
153
113
|
<view
|
|
154
|
-
class="
|
|
155
|
-
|
|
114
|
+
class="order-list-icon"
|
|
115
|
+
:style="{ bottom: item['isOpen'] ? '-30rpx' : '-54rpx' }"
|
|
116
|
+
v-if="item.products.length > showLen"
|
|
117
|
+
@click.stop="switchOpen(item)"
|
|
156
118
|
>
|
|
157
|
-
<view
|
|
158
|
-
<xd-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
119
|
+
<view :style="{ background: backgroundColor }">
|
|
120
|
+
<xd-font-icon
|
|
121
|
+
color="#666"
|
|
122
|
+
:icon="item['isOpen'] ? 'iconshang_up' : 'iconxia_down'"
|
|
123
|
+
size="24"
|
|
124
|
+
></xd-font-icon>
|
|
163
125
|
</view>
|
|
164
126
|
</view>
|
|
165
127
|
</view>
|
|
166
|
-
|
|
167
|
-
|
|
128
|
+
<view class="jfb-base-order-list__body-order-item-bottom">
|
|
129
|
+
<view>下单时间:{{ item.created_time_text }}</view>
|
|
130
|
+
<view v-if="item.biz_code !== 'gift' && item.is_not_show_price !== 'Y'">
|
|
131
|
+
<text>合计:</text>
|
|
132
|
+
<xd-unit
|
|
133
|
+
:isOld="false"
|
|
134
|
+
:price="item.total_amount"
|
|
135
|
+
:color="mainColor"
|
|
136
|
+
:fontSize="28"
|
|
137
|
+
></xd-unit>
|
|
138
|
+
</view>
|
|
139
|
+
<view style="color:#999" v-if="item['main_user_server_amount'] !== undefined && item['main_user_server_amount'] > 0">
|
|
140
|
+
<text>(平台服务费:</text>
|
|
141
|
+
<xd-unit
|
|
142
|
+
:isOld="false"
|
|
143
|
+
:price="item['main_user_server_amount']"
|
|
144
|
+
:fontSize="24"
|
|
145
|
+
:is-gray="true"
|
|
146
|
+
color="#999"
|
|
147
|
+
:icon-size=".25"
|
|
148
|
+
></xd-unit>
|
|
149
|
+
<text>)</text>
|
|
150
|
+
</view>
|
|
151
|
+
</view>
|
|
168
152
|
<view
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
v-for="item in orderList"
|
|
172
|
-
:key="item.main_order_id"
|
|
173
|
-
:style="{
|
|
174
|
-
background: backgroundColor,
|
|
175
|
-
border: borderBox,
|
|
176
|
-
borderRadius: radius + 'rpx',
|
|
177
|
-
boxShadow: shadowBox,
|
|
178
|
-
marginBottom: padding + 'rpx',
|
|
179
|
-
}"
|
|
153
|
+
class="jfb-base-order-list__body-order-item-pay"
|
|
154
|
+
v-if="item.buttons.length"
|
|
180
155
|
>
|
|
181
|
-
<
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
156
|
+
<view v-for="(btn,index) in item.buttons" :key="btn.key">
|
|
157
|
+
<xd-button
|
|
158
|
+
:type="getBtnType(btn.action)"
|
|
159
|
+
size="mini"
|
|
160
|
+
@click="handleBtnEvent(btn.action, item)"
|
|
161
|
+
>{{ btn.text }}</xd-button>
|
|
162
|
+
</view>
|
|
188
163
|
</view>
|
|
189
|
-
</
|
|
164
|
+
</view>
|
|
190
165
|
</view>
|
|
191
166
|
<view v-else class="jfb-base-order-list__body-no">
|
|
192
167
|
<xd-font-icon
|
|
@@ -214,7 +189,6 @@ import extsMixins from "@/mixins/extsMixins";
|
|
|
214
189
|
import { getContainerPropsValue } from "@/utils/xd.base";
|
|
215
190
|
import getServiceUrl from "@/common/getServiceUrl";
|
|
216
191
|
import Color from "color";
|
|
217
|
-
import XdTfkOrderItem from "./XdTfkOrderItem"
|
|
218
192
|
|
|
219
193
|
export default {
|
|
220
194
|
name: "JfbBaseOrderList",
|
|
@@ -223,7 +197,6 @@ export default {
|
|
|
223
197
|
XdTab,
|
|
224
198
|
XdUnit,
|
|
225
199
|
XdButton,
|
|
226
|
-
XdTfkOrderItem,
|
|
227
200
|
},
|
|
228
201
|
mixins: [componentsMixins, extsMixins, JfbBaseOrderListMixin],
|
|
229
202
|
data() {
|
|
@@ -253,13 +226,11 @@ export default {
|
|
|
253
226
|
is_shadow: "Y",
|
|
254
227
|
is_shadow_bg: 0,
|
|
255
228
|
is_shadow_w: 0,
|
|
256
|
-
sectionShadow: "",
|
|
257
229
|
|
|
258
230
|
//边框
|
|
259
231
|
is_border: "Y",
|
|
260
232
|
is_border_w: 0,
|
|
261
233
|
is_border_c: "",
|
|
262
|
-
sectionBorder: "",
|
|
263
234
|
|
|
264
235
|
//其他
|
|
265
236
|
margin: {
|
|
@@ -268,8 +239,6 @@ export default {
|
|
|
268
239
|
right: 0,
|
|
269
240
|
bottom: 0,
|
|
270
241
|
},
|
|
271
|
-
layout_style: "old",
|
|
272
|
-
isShowOrderNo: "Y",
|
|
273
242
|
|
|
274
243
|
noticeBgc:'',
|
|
275
244
|
};
|
|
@@ -284,16 +253,14 @@ export default {
|
|
|
284
253
|
return str
|
|
285
254
|
},
|
|
286
255
|
shadowBox() {
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
return this.sectionShadow;
|
|
256
|
+
if (this.is_shadow === "Y")
|
|
257
|
+
return `0 0 ${this.is_shadow_w}rpx ${this.is_shadow_bg}`;
|
|
258
|
+
else return "0 0 0 rgba(0,0,0,0)";
|
|
291
259
|
},
|
|
292
260
|
borderBox() {
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
return this.sectionBorder;
|
|
261
|
+
if (this.is_border === "Y")
|
|
262
|
+
return `${this.is_border_w}rpx solid ${this.is_border_c}`;
|
|
263
|
+
else return "0";
|
|
297
264
|
},
|
|
298
265
|
},
|
|
299
266
|
watch: {
|
|
@@ -341,27 +308,13 @@ export default {
|
|
|
341
308
|
this.is_shadow = getContainerPropsValue(container, "content.is_shadow", "N");
|
|
342
309
|
this.is_shadow_bg = getContainerPropsValue(container, "content.is_shadow_bg", "#fff");
|
|
343
310
|
this.is_shadow_w = getContainerPropsValue(container, "content.is_shadow_w", "10");
|
|
344
|
-
let sectionShadow = getContainerPropsValue(container, "content.sectionShadow", "");
|
|
345
|
-
this.sectionShadow = this.getShadowCompatibleOldStyle(sectionShadow, {
|
|
346
|
-
type: this.is_shadow,
|
|
347
|
-
width: this.is_shadow_w,
|
|
348
|
-
color: this.is_shadow_bg,
|
|
349
|
-
})
|
|
350
311
|
|
|
351
312
|
this.is_border = getContainerPropsValue(container, "content.is_border", "N");
|
|
352
313
|
this.is_border_c = getContainerPropsValue(container, "content.is_border_c", "#fff");
|
|
353
314
|
this.is_border_w = getContainerPropsValue(container, "content.is_border_w", 2);
|
|
354
|
-
let sectionBorder = getContainerPropsValue(container, "content.sectionBorder", "");
|
|
355
|
-
this.sectionBorder = this.getBorderCompatibleOldStyle(sectionBorder, {
|
|
356
|
-
type: this.is_border,
|
|
357
|
-
width: this.is_border_w,
|
|
358
|
-
color: this.is_border_c,
|
|
359
|
-
})
|
|
360
315
|
|
|
361
316
|
this.detailPath = getContainerPropsValue(container, "content.detailPath", { value: "" }).value;
|
|
362
317
|
this.payPath = getContainerPropsValue(container, "content.payPath", {value: "",}).value;
|
|
363
|
-
this.layout_style = getContainerPropsValue(container, "content.layout_style", "old");
|
|
364
|
-
this.isShowOrderNo = getContainerPropsValue(container, "content.isShowOrderNo", "Y");
|
|
365
318
|
this.tabList = getContainerPropsValue(container, "content.orderTypeList", []).map((item) => {
|
|
366
319
|
return {
|
|
367
320
|
name: item.customName || item.label,
|