jufubao-third 1.0.10-beta6 → 1.0.10-beta7
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
|
@@ -78,11 +78,11 @@
|
|
|
78
78
|
<xd-list-item label="PLUS专项立减" size="small" paddingLR="40rpx" >
|
|
79
79
|
<view slot="label" style="color: #86541E;">PLUS专享立减</view>
|
|
80
80
|
<!-- <view style="color: #FF7070;">-5.00</view> -->
|
|
81
|
-
<xd-unit :isShowIcon="isShowIcon" :price="plus_saving_money" :largeZero="false" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
|
|
81
|
+
<xd-unit :isShowIcon="isShowIcon" :price="-plus_saving_money" :largeZero="false" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
|
|
82
82
|
</xd-list-item>
|
|
83
83
|
</view>
|
|
84
84
|
|
|
85
|
-
<view class="pay_section">
|
|
85
|
+
<view v-if="!isPlusSite" class="pay_section">
|
|
86
86
|
<view class="column-item">
|
|
87
87
|
<view class="column_label">
|
|
88
88
|
仍需支付
|
|
@@ -137,6 +137,7 @@
|
|
|
137
137
|
<view
|
|
138
138
|
class="ticket_list"
|
|
139
139
|
:key="renderChecked"
|
|
140
|
+
v-if="!isPlusSite"
|
|
140
141
|
>
|
|
141
142
|
<view
|
|
142
143
|
class="ticket_item"
|
|
@@ -188,7 +189,21 @@
|
|
|
188
189
|
</view>
|
|
189
190
|
</view>
|
|
190
191
|
</view>
|
|
192
|
+
<view v-if="isPlusSite" class="bottom_btn plus_btm" :style="{bottom: layoutInfo.bottom+'rpx'}">
|
|
193
|
+
<view class="flex_l">实付:
|
|
194
|
+
<xd-unit
|
|
195
|
+
:isShowIcon="isShowIcon"
|
|
196
|
+
:price="showOldPay ? needPayPrice :orderNeedPayPrice"
|
|
197
|
+
:isOld="false"
|
|
198
|
+
:font-size="40"
|
|
199
|
+
:icon-size="0.3"
|
|
200
|
+
></xd-unit></view>
|
|
201
|
+
<view>
|
|
202
|
+
<xd-button type="primary" @click="doAllPay">支付</xd-button>
|
|
203
|
+
</view>
|
|
204
|
+
</view>
|
|
191
205
|
<view
|
|
206
|
+
v-else
|
|
192
207
|
class="bottom_btn"
|
|
193
208
|
:style="{bottom: layoutInfo.bottom+'rpx'}"
|
|
194
209
|
>
|
|
@@ -405,6 +420,9 @@
|
|
|
405
420
|
if(this.$configProject['isPreview']) return true;
|
|
406
421
|
return this.siteInfo.mapping.is_show_coin_icon==='Y'
|
|
407
422
|
},
|
|
423
|
+
isPlusSite(){
|
|
424
|
+
return this.projectAttr.headers['X-Site-Group']==="vip";
|
|
425
|
+
},
|
|
408
426
|
//是否展示vip减免
|
|
409
427
|
isShowPlusSaveMoney(){
|
|
410
428
|
if(this.show_vip_card === 'Y') return this.vip_card_id;
|
|
@@ -582,7 +600,9 @@
|
|
|
582
600
|
if(!submitCardList.length){
|
|
583
601
|
//支持补差, 提示是否使用补差
|
|
584
602
|
if(this.payThird){
|
|
585
|
-
|
|
603
|
+
if(!this.isPlusSite){
|
|
604
|
+
await this.handleConfirmAllWxPay();
|
|
605
|
+
}
|
|
586
606
|
}else{
|
|
587
607
|
//不支持补差,仅提示
|
|
588
608
|
return this.$xdAlert({content: "请选择兑换方式"})
|
|
@@ -1012,6 +1032,19 @@
|
|
|
1012
1032
|
padding: 24rpx 0;
|
|
1013
1033
|
background: #FFFFFF;
|
|
1014
1034
|
box-shadow: 0 0 0px 1px rgba(0, 0, 0, 0.1);
|
|
1035
|
+
box-sizing: border-box;
|
|
1036
|
+
&.plus_btm{
|
|
1037
|
+
display: flex;
|
|
1038
|
+
align-items: center;
|
|
1039
|
+
justify-content: space-between;
|
|
1040
|
+
padding-left:40rpx;
|
|
1041
|
+
padding-right: 40rpx;
|
|
1042
|
+
.flex_l{
|
|
1043
|
+
color: #FF5A39;
|
|
1044
|
+
display: flex;
|
|
1045
|
+
align-items: center;
|
|
1046
|
+
}
|
|
1047
|
+
}
|
|
1015
1048
|
}
|
|
1016
1049
|
}
|
|
1017
1050
|
}
|