diff --git a/src/filters/commFilter.js b/src/filters/commFilter.js index 53ecf2b..1a1016f 100644 --- a/src/filters/commFilter.js +++ b/src/filters/commFilter.js @@ -175,7 +175,7 @@ export function orderPayType(type) { '6': '微信扫码', '7': '铸源星支付', '9': '扫码支付', - '11': '绑卡支付', + '11': '绑卡快捷支付', '12': '支付宝支付', '13': '银联支付' } diff --git a/src/views/merchant/deposit/index.vue b/src/views/merchant/deposit/index.vue index bfd6310..60bc9cd 100644 --- a/src/views/merchant/deposit/index.vue +++ b/src/views/merchant/deposit/index.vue @@ -107,6 +107,19 @@ class="selWidth" /> + + + 搜索 重置 @@ -277,6 +290,13 @@ label="申请时间" min-width="150" /> + --> - + diff --git a/src/views/order/refund/index.vue b/src/views/order/refund/index.vue index 4ee45db..6da9216 100644 --- a/src/views/order/refund/index.vue +++ b/src/views/order/refund/index.vue @@ -76,7 +76,7 @@ > - + diff --git a/src/views/order/refund/refundDetail.vue b/src/views/order/refund/refundDetail.vue index 1ee6874..0a44a3e 100644 --- a/src/views/order/refund/refundDetail.vue +++ b/src/views/order/refund/refundDetail.vue @@ -33,6 +33,9 @@
退款总金额:{{ orderDatalist.refund_price }}元
退货快递单号:{{ orderDatalist.delivery_id }}
创建时间:{{ orderDatalist.create_time }}
+
退货金额:{{ orderDatalist.refund_price-orderDatalist.refund_postage }}
+
退抵扣券:{{ orderDatalist.amount }}
+
退运费金额:{{ orderDatalist.refund_postage }}
商家备注:{{ orderDatalist.mer_mark }}
退款凭证:
diff --git a/src/views/product/productExamine/info.vue b/src/views/product/productExamine/info.vue index c6f5cfe..cec53f7 100644 --- a/src/views/product/productExamine/info.vue +++ b/src/views/product/productExamine/info.vue @@ -670,8 +670,8 @@
- 信息变更: - {{ projectData.edit_mark }} +
信息变更:
+
-
  • +
  • 平台推荐星级:
    @@ -468,7 +468,7 @@ >
  • -
  • @@ -492,7 +492,7 @@
    {{ productData.integral_price_total }}元
    -
  • + -->
  • - + diff --git a/src/views/user/list/userDetails.vue b/src/views/user/list/userDetails.vue index 669662f..41ffe2b 100644 --- a/src/views/user/list/userDetails.vue +++ b/src/views/user/list/userDetails.vue @@ -132,10 +132,10 @@
    用户状态:
    {{psInfo.status == 1 ? '开启' : '关闭'}}
  • -
  • +
  • 用户标签:
    @@ -281,7 +281,7 @@
    用户概况
    - +