diff --git a/components/payment/payment.vue b/components/payment/payment.vue
index 9440329..022f893 100644
--- a/components/payment/payment.vue
+++ b/components/payment/payment.vue
@@ -11,7 +11,6 @@
支付金额{{ payMoney | moneyFormat }}元
-
diff --git a/config/production.js b/config/production.js
index 1826f0c..855f49b 100644
--- a/config/production.js
+++ b/config/production.js
@@ -4,13 +4,13 @@
// api请求地址
// export const baseUrl = 'https://cbtadmin.jtyqt.com'
-// export const baseUrl = 'https://cbtadmin.jtyqt.com'//测试地址1
-export const baseUrl = 'http://devzhiyao.zeyan.wang'//测试地址2
+// export const baseUrl = 'https://yaochangtest.first.xinzhidi.cn'//测试地址1
+export const baseUrl = 'http://devzhiyao.zeyan.wang'//测试地址1
// 图片域名
// export const imgDomain='https://cbtadmin.jtyqt.com'
-// export const imgDomain = 'https://cbtadmin.jtyqt.com'//测试地址1
-export const imgDomain = 'http://devzhiyao.zeyan.wang'//测试地址2
+// export const imgDomain = 'https://yaochangtest.first.xinzhidi.cn'//测试地址1
+export const imgDomain = 'http://devzhiyao.zeyan.wang'//测试地址1
// 极光推送
export const PUSHCONFIG = {
diff --git a/page_goods/detail/detail.vue b/page_goods/detail/detail.vue
index 5d7157d..4aa09ff 100644
--- a/page_goods/detail/detail.vue
+++ b/page_goods/detail/detail.vue
@@ -619,7 +619,7 @@
-
+
-
+
diff --git a/page_goods/orderDetail/orderDetail.vue b/page_goods/orderDetail/orderDetail.vue
index 3e77fa6..81bbb88 100644
--- a/page_goods/orderDetail/orderDetail.vue
+++ b/page_goods/orderDetail/orderDetail.vue
@@ -139,7 +139,10 @@
@error="imageError(goodsIndex)" mode="aspectFill">
- {{ goodsItem.sku_name }}
+
+ {{ goodsItem.sku_name }}
+ 仅退货-{{goodsItem.refund_status_name}}
+
@@ -711,6 +714,11 @@
//判断"orderPay"在不在_actionArr中
if (!_actionArr.includes('orderPay') && res.data.pay.pay_status == 0) {
this.isOrderPayShow = true
+ if (res.data.is_lock == 1){
+ this.isOrderPayShow = false
+ }else if(res.data.order_status == -1){
+ this.isOrderPayShow = false
+ }
}
@@ -816,6 +824,12 @@
.order_id
});
break;
+ //仅退回
+ case 'memberSalesReturn':
+ this.$util.redirectTo('/pages_tool/order/refund_type_select', {
+ order_id: this.orderData.order_id
+ });
+ break;
//申请退款
case 'memberRefund':
diff --git a/pages.json b/pages.json
index 8406d22..a8b0f3e 100644
--- a/pages.json
+++ b/pages.json
@@ -583,6 +583,12 @@
"navigationBarTitleText": "退款申请"
}
},
+ {
+ "path": "order/sales_return",
+ "style": {
+ "navigationBarTitleText": "退货申请"
+ }
+ },
{
"path": "order/refund_select",
"style": {
diff --git a/pages_tool/order/refund_goods_select.vue b/pages_tool/order/refund_goods_select.vue
index 86915c0..1d0f96e 100644
--- a/pages_tool/order/refund_goods_select.vue
+++ b/pages_tool/order/refund_goods_select.vue
@@ -144,10 +144,19 @@
this.getOrderIdInfo();
}
- this.$util.redirectTo('/pages_tool/order/refund_batch', {
- order_goods_id: this.order_goods_id.join(),
- refund_type: this.refund_type
- });
+ if (this.refund_type == '4') {
+ //仅退货=4
+ alert(this.refund_type)
+ this.$util.redirectTo('/pages_tool/order/sales_return', {
+ order_goods_id: this.order_goods_id.join(),
+ refund_type: this.refund_type
+ });
+ }else{
+ this.$util.redirectTo('/pages_tool/order/refund_batch', {
+ order_goods_id: this.order_goods_id.join(),
+ refund_type: this.refund_type
+ });
+ }
},
/**
* 默认图片处理
diff --git a/pages_tool/order/refund_type_select.vue b/pages_tool/order/refund_type_select.vue
index 279c94f..98fe541 100644
--- a/pages_tool/order/refund_type_select.vue
+++ b/pages_tool/order/refund_type_select.vue
@@ -10,6 +10,7 @@
+
退货退款
@@ -17,6 +18,15 @@
+
+
+
+ 仅退货
+ 仅退货
+
+
+
+