|
@@ -395,6 +395,20 @@
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</van-dialog>
|
|
</van-dialog>
|
|
|
|
+ <van-dialog
|
|
|
|
+ v-model="showOtherErrorTip"
|
|
|
|
+ class-name="j-confirm-dialog"
|
|
|
|
+ confirm-button-text="我知道了"
|
|
|
|
+ title="获取失败"
|
|
|
|
+ >
|
|
|
|
+ <div class="records-item show-result-dialog" style='padding-top: 16px'>
|
|
|
|
+ <div class="records-line" style='text-align: center'>
|
|
|
|
+ <span class="records-line-right">
|
|
|
|
+ {{ showOtherErrorTipText }}
|
|
|
|
+ </span>
|
|
|
|
+ </div>
|
|
|
|
+ </div>
|
|
|
|
+ </van-dialog>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -475,6 +489,8 @@ export default {
|
|
text: '',
|
|
text: '',
|
|
show: false
|
|
show: false
|
|
},
|
|
},
|
|
|
|
+ showOtherErrorTip: true,
|
|
|
|
+ showOtherErrorTipText: '库存不足,请联系客服',
|
|
activeType: 0
|
|
activeType: 0
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -652,14 +668,15 @@ export default {
|
|
this.showOtherSuccessTip = true
|
|
this.showOtherSuccessTip = true
|
|
this.getOtherInfo()
|
|
this.getOtherInfo()
|
|
} else {
|
|
} else {
|
|
- this.thirdErrorTip.show = true
|
|
|
|
- this.thirdErrorTip.text = res.error_msg || '兑换失败'
|
|
|
|
|
|
+ this.showOtherErrorTip = true
|
|
|
|
+ this.showOtherErrorTipText = res.error_msg || '兑换失败'
|
|
// this.$toast(res.error_msg || '兑换失败')
|
|
// this.$toast(res.error_msg || '兑换失败')
|
|
}
|
|
}
|
|
})
|
|
})
|
|
- .catch(() => {
|
|
|
|
- this.$toast('获取失败')
|
|
|
|
- })
|
|
|
|
|
|
+ .catch(() => {
|
|
|
|
+ this.showOtherErrorTip = true
|
|
|
|
+ this.showOtherErrorTipText = '兑换失败'
|
|
|
|
+ })
|
|
},
|
|
},
|
|
getOtherProductInfo({ product_id, account_id }) {
|
|
getOtherProductInfo({ product_id, account_id }) {
|
|
ajaxGetActivityEquityProductList({
|
|
ajaxGetActivityEquityProductList({
|
|
@@ -730,6 +747,10 @@ export default {
|
|
height: 100%;
|
|
height: 100%;
|
|
|
|
|
|
::v-deep {
|
|
::v-deep {
|
|
|
|
+ .van-tabs__wrap {
|
|
|
|
+ border-bottom: 1px solid rgba(0, 0, 0, 0.05);
|
|
|
|
+ padding-bottom: 4px;
|
|
|
|
+ }
|
|
.van-tabs__content {
|
|
.van-tabs__content {
|
|
flex: 1;
|
|
flex: 1;
|
|
overflow-y: scroll;
|
|
overflow-y: scroll;
|
|
@@ -823,6 +844,7 @@ export default {
|
|
.other-equity-exchange-select-group {
|
|
.other-equity-exchange-select-group {
|
|
padding: 11px 16px;
|
|
padding: 11px 16px;
|
|
background-color: #fff;
|
|
background-color: #fff;
|
|
|
|
+ box-shadow: 0px -0.5px 0px 0px rgba(0, 0, 0, 0.05) inset;
|
|
.other-equity-exchange-select-item {
|
|
.other-equity-exchange-select-item {
|
|
display: inline-block;
|
|
display: inline-block;
|
|
border: 1px solid rgba(0, 0, 0, 0.1);
|
|
border: 1px solid rgba(0, 0, 0, 0.1);
|
|
@@ -835,6 +857,7 @@ export default {
|
|
border-radius: 4px;
|
|
border-radius: 4px;
|
|
&.is-active {
|
|
&.is-active {
|
|
background-color: #2ABED1;
|
|
background-color: #2ABED1;
|
|
|
|
+ border-color: #2ABED1;
|
|
color: #fff;
|
|
color: #fff;
|
|
}
|
|
}
|
|
}
|
|
}
|