liudan
/
xiaqingjiancai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
main
liudan 1 month ago
parent 70519be48d
commit 882aabd226
4 changed files with 30 additions and 19 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      pages/checkout/cashier/index.vue
  2. 4
      pages/checkout/index.vue
  3. 23
      pages/order/detail.vue
  4. 20
      pages/refund/detail.vue

2
pages/checkout/cashier/index.vue
Unescape View File

@ -31,7 +31,7 @@
<view class="item-left_text" v-if="item.method=='point'">
<text>{{ PayMethodEnum[item.method].name }}</text>
<view class="pointInfo">
当前可用积分：{{order.pointsNum}}，可抵￥{{order.pointsMoney}}
当前可用积分：{{personal.points}}，可抵￥{{order.pointsMoney}}
</view>
</view>
<view v-if="item.method === PayMethodEnum.BALANCE.value" class="user-balance">

4
pages/checkout/index.vue
Unescape View File

@ -168,9 +168,9 @@
</view>
<!-- 积分抵扣 -->
<view v-if="$checkModule('market-points') && order.isAllowPoints" class="points flow-all-list dis-flex flex-y-center">
<view class="block-left flex-five" @click="handleShowPoints()">
<view class="block-left flex-five">
<text class="title">可用{{ setting.points_name }}抵扣：</text>
<text class="iconfont icon-help"></text>
<!-- <text class="iconfont icon-help"></text> -->
</view>
<view class="flex-five dis-flex flex-x-end flex-y-center">
<text class="points-money col-m">-￥{{ order.pointsMoney }}</text>

23
pages/order/detail.vue
Unescape View File

@ -64,7 +64,7 @@
<!-- 快递配送：门店自提 -->
<view v-if="order.delivery_type == DeliveryTypeEnum.EXTRACT.value" class="delivery-extract i-card"
@click="handleTargetExtract(order.extract_shop.shop_id)">
@click="handleTargetExtract(order.address.address_id)">
<view class="extract-top">
<text class="title">自提门店</text>
<text class="subtitle">您须到该自提点取货</text>
@ -75,13 +75,13 @@
</view>
<view class="shop-content">
<view class="shop-name">
<text>{{ order.extract_shop.shop_name }}</text>
<text>{{ order.address.name }}</text>
</view>
<view class="shop-describe">
<text class="item-text">{{ order.extract_shop.region.province }}</text>
<text class="item-text">{{ order.extract_shop.region.city }}</text>
<text class="item-text">{{ order.extract_shop.region.region }}</text>
<text class="item-text">{{ order.extract_shop.address }}</text>
<text class="item-text">{{ order.address.region.province }}</text>
<text class="item-text">{{ order.address.region.city }}</text>
<text class="item-text">{{ order.address.region.region }}</text>
<text class="item-text">{{ order.address.address }}</text>
</view>
</view>
<view class="icon-arrow">
@ -266,7 +266,7 @@
</block>
<!-- 确认收货 -->
<block
v-if="order.delivery_status == DeliveryStatusEnum.DELIVERED.value && order.receipt_status == ReceiptStatusEnum.NOT_RECEIVED.value">
v-if="!isRefund&&order.delivery_status == DeliveryStatusEnum.DELIVERED.value && order.receipt_status == ReceiptStatusEnum.NOT_RECEIVED.value">
<view class="btn-item active" @click="onReceipt(order.order_id)">确认收货</view>
</block>
<!-- 订单评价 -->
@ -361,6 +361,7 @@
qrcodeImage: '',
// 控制onShow事件是否刷新订单信息
canReset: false,
isRefund:false,
}
},
@ -404,6 +405,14 @@
}
app.setting = result.data.setting
app.isLoading = false
let arr = result.data.order.goods.filter(item=>{
return item.refund
})
if(arr.length==0){
this.isRefund = false
}else{
this.isRefund = true
}
})
// 相应全局事件订阅: 刷新上级页面数据
canReset && uni.$emit('syncRefresh', true, true)

20
pages/refund/detail.vue
Unescape View File

@ -41,14 +41,15 @@
<text class="col-m">￥{{ detail.orderGoods.total_pay_price }}</text>
</view>
</view>
<!-- 已退款金额 -->
<view v-if="detail.status == RefundStatusEnum.COMPLETED.value && detail.type == 10"
class="detail-order b-f row-block dis-flex flex-x-end flex-y-center">
<text class="">已退款金额：</text>
<text class="col-m">￥{{ detail.refund_money }}</text>
</view>
</view>
<!-- 已退款金额 -->
<view v-if="detail.status == RefundStatusEnum.COMPLETED.value && detail.type == 10"
class="detail-order b-f row-block dis-flex flex-x-end flex-y-center">
<text class="">已退款金额：</text>
<text class="col-m">￥{{ detail.refund_money }}</text>
</view>
<!-- 售后信息 -->
<view v-if="detail.status == RefundStatusEnum.REJECTED.value" class="detail-refund b-f m-top20">
@ -99,7 +100,7 @@
</view>
<view class="detail-address__row address-details">
<view class="address-details__row">
<text>物流公司：{{ detail.express.express_name }}</text>
<text>物流公司：{{ detail.express?detail.express.express_name:'--' }}</text>
</view>
<view class="address-details__row">
<text>物流单号：{{ detail.express_no }}</text>
@ -148,13 +149,14 @@
<view class="typeItem" style="margin:37rpx 0;">
<text>退款运费</text>
<view class="">
{{detail.orderGoods?(Number(detail.orderGoods.total_price) - Number(detail.orderGoods.total_pay_price) - Number(detail.orderGoods.points_money)):''}}
{{detail.refund_express_price?(Number(detail.refund_express_price)):''}}
</view>
</view>
<view class="typeItem">
<text>退款积分</text>
<view class="">
{{detail.orderGoods?detail.orderGoods.points_money==detail.orderGoods.total_price?detail.orderGoods.points_money:Number(detail.orderGoods.total_price) - Number(detail.orderGoods.total_pay_price):''}}
{{detail.refund_point?(Number(detail.refund_point)):''}}
<!-- {{detail.orderGoods?detail.orderGoods.points_money==detail.orderGoods.total_price?detail.orderGoods.points_money:Number(detail.orderGoods.total_price) - Number(detail.orderGoods.total_pay_price):''}} -->
</view>
</view>
</view>

Write Preview
Loading…
Cancel
Save