clunt
/
dingdong-mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单列表付款判断修改，显示付款概况修改

This commit is contained in:
donqi 2022-10-19 00:51:26 +08:00
parent 9ad704af91
commit f4197ec3b0
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pages/my/my-order.vue
View File

@ -39,19 +39,19 @@
</view> </view>
<view class="margin-right-sm"><text>优惠</text><text class="text-price text-red">{{shopOrder.discountMoney}}</text> <view class="margin-right-sm"><text>优惠</text><text class="text-price text-red">{{shopOrder.discountMoney}}</text>
</view> </view>
<view class="margin-right-sm" v-if="shopOrder.payStatus == 4"><text>已付款</text><text class="text-price text-red">{{shopOrder.paidMoney}}</text> <view class="margin-right-sm" v-if="shopOrder.payStatus == 1 && shopOrder.changeMoney"><text>已付款</text><text class="text-price text-red">{{shopOrder.payMoney}}</text>
</view> </view>
<view class="text-lg" v-if="shopOrder.payStatus == 1"><text>实付款</text><text <view class="text-lg" v-if="shopOrder.payStatus == 1 && shopOrder.changeMoney"><text>需付款</text><text
class="text-price text-red text-lg text-bold">{{shopOrder.changeMoney}}</text></view>
<view class="text-lg" v-else-if="shopOrder.payStatus == 1"><text>实付款</text><text
class="text-price text-red text-lg text-bold">{{shopOrder.payMoney}}</text></view> class="text-price text-red text-lg text-bold">{{shopOrder.payMoney}}</text></view>
<view class="text-lg" v-else-if="shopOrder.payStatus == 0"><text>需付款</text><text <view class="text-lg" v-else-if="shopOrder.payStatus == 0"><text>需付款</text><text
class="text-price text-red text-lg text-bold">{{shopOrder.payMoney}}</text></view> class="text-price text-red text-lg text-bold">{{shopOrder.payMoney + shopOrder.changeMoney}}</text></view>
<view class="text-lg" v-else-if="shopOrder.payStatus == 4"><text>需付款</text><text
class="text-price text-red text-lg text-bold">{{shopOrder.changeMoney}}</text></view>
</view> </view>
<view v-if="orderType === 0" class="padding-tb-sm"> <view v-if="orderType === 0" class="padding-tb-sm">
<view class="flex justify-end"> <view class="flex justify-end">
<button v-if="[0,1].indexOf(shopOrder.orderStatus) >= 0" class="cu-btn bg-gray margin-right-sm shadow-blur" @click="showModalByRef('confirmModal', shopOrder)">取消订单</button> <button v-if="[0,1].indexOf(shopOrder.orderStatus) >= 0" class="cu-btn bg-gray margin-right-sm shadow-blur" @click="showModalByRef('confirmModal', shopOrder)">取消订单</button>
<button v-if="shopOrder.payStatus != 1" class="cu-btn bg-main-color shadow-blur margin-right-sm" @click="wxpay(shopOrder)">付款</button> <button v-if="shopOrder.payStatus != 1 || shopOrder.changeMoney" class="cu-btn bg-main-color shadow-blur margin-right-sm" @click="wxpay(shopOrder)">付款</button>
<button class="cu-btn bg-main-color shadow-blur" @click="showServDetail(shopOrder)">查看</button> <button class="cu-btn bg-main-color shadow-blur" @click="showServDetail(shopOrder)">查看</button>
</view> </view>
</view> </view>

9
pages/my/serv-detail.vue
View File

@ -272,9 +272,12 @@
<view class="text-red" v-if="afterServiceRecord.customerFinalCheck === 0">订单已申请平台介入</view> <view class="text-red" v-if="afterServiceRecord.customerFinalCheck === 0">订单已申请平台介入</view>
<view v-else-if="afterServiceRecord.customerFinalCheck === 1"> <view v-else-if="afterServiceRecord.customerFinalCheck === 1">
<view v-if="afterServiceRecord.originalRefund > 0"> <view v-if="afterServiceRecord.originalRefund > 0">
<text>本单退款，系统已发起原路退回</text> <view>
<text class="text-red">{{afterServiceRecord.originalRefund}}</text> <text>本单退款，系统已发起原路退回</text>
<text>元，发起时间：{{afterServiceRecord.refundApplyTime}}，有其余部分的以双方沟通操作为准（注：银行按工作日到帐，节假日顺延到账）。</text> <text class="text-red">{{afterServiceRecord.originalRefund}}</text>
<text>元，有其余部分的以双方沟通操作为准（注：银行按工作日到帐，节假日顺延到账）。</text>
</view>
<view>支付时间：{{afterServiceRecord.refundApplyTime}}</view>
</view> </view>
<view v-else-if="afterServiceRecord.originalRefund == 0 && servDetail.payStatus == 0"> <view v-else-if="afterServiceRecord.originalRefund == 0 && servDetail.payStatus == 0">
<text>本单未支付，实际退回0.00元</text> <text>本单未支付，实际退回0.00元</text>