|
@@ -26,8 +26,10 @@
|
|
<span class='label-text'>已选规格</span>
|
|
<span class='label-text'>已选规格</span>
|
|
<div class='select-spec-info flex flex-(1 row items-center justify-right)' @click='popupSelect = true'>
|
|
<div class='select-spec-info flex flex-(1 row items-center justify-right)' @click='popupSelect = true'>
|
|
<div class='spec-c-label flex flex-(row items-center)' v-if='specActiveInfo'>
|
|
<div class='spec-c-label flex flex-(row items-center)' v-if='specActiveInfo'>
|
|
- <div class="activity-badge" v-if="specActiveInfo.badge">
|
|
|
|
- <span class="j-icon icon-huo-badge" /> {{specActiveInfo.badge}}
|
|
|
|
|
|
+ <div class="activity-badge" :class='{"is-huo": specActiveInfo?.badge !== "权益特价"}' v-if="specActiveInfo.badge">
|
|
|
|
+ <span v-if='specActiveInfo?.badge === "权益特价"' class="j-icon icon-crown"></span>
|
|
|
|
+ <span v-else class="j-icon icon-huo-badge"></span>
|
|
|
|
+ {{specActiveInfo.badge}}
|
|
</div>
|
|
</div>
|
|
<span class='spec-name'>{{specActiveInfo.label}}</span>
|
|
<span class='spec-name'>{{specActiveInfo.label}}</span>
|
|
<span class='vip-label' :class='{ [specActiveInfo.packLevel]: true }' v-if='specActiveInfo.pack'>
|
|
<span class='vip-label' :class='{ [specActiveInfo.packLevel]: true }' v-if='specActiveInfo.pack'>
|
|
@@ -93,7 +95,14 @@ export default {
|
|
},
|
|
},
|
|
mixins: [orderActivityHelper],
|
|
mixins: [orderActivityHelper],
|
|
setup() {
|
|
setup() {
|
|
- const { zhimaReportAccountInfo } = useAccountInfoModel()
|
|
|
|
|
|
+ const { zhimaReportAccountInfo } = useAccountInfoModel(() => {
|
|
|
|
+ // 非首购、非会员时选中年卡
|
|
|
|
+ if (!this.isFirstBuy && !this.useNowState.inPack) {
|
|
|
|
+ this.updateProductSpecId(1514)
|
|
|
|
+ } else {
|
|
|
|
+ this.updateProductSpecId(1511)
|
|
|
|
+ }
|
|
|
|
+ })
|
|
return {
|
|
return {
|
|
zhimaReportAccountInfo
|
|
zhimaReportAccountInfo
|
|
}
|
|
}
|
|
@@ -210,13 +219,9 @@ export default {
|
|
footerNotice: true
|
|
footerNotice: true
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- mounted() {
|
|
|
|
- this.updatePayAmount()
|
|
|
|
- this.getUserInfoFun()
|
|
|
|
- // 非首购、非会员时选中年卡
|
|
|
|
- if (!this.isFirstBuy && !this.useNowState.inPack) {
|
|
|
|
- this.updateProductSpecId(1514)
|
|
|
|
- }
|
|
|
|
|
|
+ mounted() {
|
|
|
|
+ this.updatePayAmount()
|
|
|
|
+ this.getUserInfoFun()
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
...mapMutations('createOrder', ['updateProductSpecId', 'updateLayout']),
|
|
...mapMutations('createOrder', ['updateProductSpecId', 'updateLayout']),
|
|
@@ -460,18 +465,25 @@ export default {
|
|
height: 54px;
|
|
height: 54px;
|
|
padding: 0 16px;
|
|
padding: 0 16px;
|
|
.label-text {}
|
|
.label-text {}
|
|
|
|
+
|
|
.activity-badge {
|
|
.activity-badge {
|
|
display: flex;
|
|
display: flex;
|
|
align-items: center;
|
|
align-items: center;
|
|
margin-right: 8px;
|
|
margin-right: 8px;
|
|
- padding: 2px 4px;
|
|
|
|
- background: rgba(255, 243, 239, 1);
|
|
|
|
- border: 1px solid rgba(255, 98, 107, 1);
|
|
|
|
- border-radius: 4px;
|
|
|
|
- text-align: center;
|
|
|
|
- color: #FB483D;
|
|
|
|
|
|
+ padding: 2px 8px;
|
|
font-size: 11px;
|
|
font-size: 11px;
|
|
line-height: 14px;
|
|
line-height: 14px;
|
|
|
|
+ background: linear-gradient(98deg, #ff7c32 0%, #f33838 100%);
|
|
|
|
+ border-radius: 9px 0px;
|
|
|
|
+ text-align: center;
|
|
|
|
+ color: #fff;
|
|
|
|
+ &.is-huo {
|
|
|
|
+ padding: 2px 4px;
|
|
|
|
+ background: rgba(255, 243, 239, 1);
|
|
|
|
+ border: 1px solid rgba(255, 98, 107, 1);
|
|
|
|
+ border-radius: 4px;
|
|
|
|
+ color: #FB483D;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
.vip-label {
|
|
.vip-label {
|
|
display: inline-flex;
|
|
display: inline-flex;
|