|
...
|
...
|
@@ -47,11 +47,7 @@ |
|
|
|
<view v-if="btnType == 1 || btnType == 3" class="red flexC" @click="btns(1)">{{ btnType == 1 ? '立即支付' : '确认收货' }}</view>
|
|
|
|
</view>
|
|
|
|
<!-- 选择支付方式 -->
|
|
|
|
<<<<<<< HEAD
|
|
|
|
<payMode @canclePop="modeShow = false" :balance="balance" :orderId="orderId" :isOrderPay="true" :totalPrice="orderList.total_price" :modeShow="modeShow"></payMode>
|
|
|
|
=======
|
|
|
|
<payMode @canclePop="modeShow = false" :balance="balance" :orderId="orderId" :isOrderPay="true" :totalPrice="orderList.total_price" :modeShow="modeShow"></payMode>
|
|
|
|
>>>>>>> e06e965776ba384e3a74bbfd6710c30bd858a6b5
|
|
|
|
|
|
|
|
<!-- 提示弹窗 -->
|
|
|
|
<tipPops @pointsBtns="pointsBtns" :integral="integral" :tipType="tipType" :tipShow="tipShow"></tipPops>
|
...
|
...
|
|
