From f7e52fae9d14b43d63bbad043f69a0dae905c418 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Tue, 3 Dec 2024 20:17:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF-=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85-=E5=A4=84=E7=90=86=20=E8=BF=9B=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/payment/payment.vue           |  1 -
 config/production.js                     |  8 ++++----
 page_goods/detail/detail.vue             |  6 +++---
 page_goods/orderDetail/orderDetail.vue   | 16 +++++++++++++++-
 pages.json                               |  6 ++++++
 pages_tool/order/refund_goods_select.vue | 17 +++++++++++++----
 pages_tool/order/refund_type_select.vue  | 10 ++++++++++
 7 files changed, 51 insertions(+), 13 deletions(-)

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 @@
 					<view class="pay-money">
 						<text class="money">支付金额{{ payMoney | moneyFormat }}元</text>
 					</view>
-
 					<view class="payment-item" v-if="balanceDeduct > 0 && balanceUsable && balanceConfig == 1">
 						<view class="iconfont icon-yue"></view>
 						<view class="info-wrap">
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 @@
 			<template v-slot:action>
 				<!-- 商品底部导航 -->
 				<ns-goods-action :safeArea="isIphoneX">
-					<template v-if="goodsSkuDetail.goods_state == 1">
+					<!-- <template v-if="goodsSkuDetail.goods_state == 1"> -->
 						<ns-goods-action-icon text="收藏" v-if="goodsType==2 && token" @click="editCollection()" :icon="
 								whetherCollection == 1
 									? 'icon-likefill color-base-text'
@@ -669,11 +669,11 @@
 								class="goods-action-button" :backgroundColor="themeStyle.bg_color"
 								:textColor="themeStyle.btn_text_color" text="立即购买" @click="buyNow" />
 						</block>
-					</template>
+<!-- 					</template>
 					<template v-else>
 						<ns-goods-action-button class="goods-action-button active3" disabled-text="该商品已下架"
 							:disabled="true" />
-					</template>
+					</template> -->
 				</ns-goods-action>
 			</template>
 		</goods-detail-view>
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"></image>
 						</view>
 						<view class="goods-info" @click="goDetail(goodsItem)">
-							<view class="goods-name">{{ goodsItem.sku_name }}</view>
+							<view class="goods-name" style="display: flex;align-items: center;justify-content: space-between;">
+                {{ goodsItem.sku_name }}
+                <text v-if="goodsItem.refund_type == 4">仅退货-{{goodsItem.refund_status_name}}</text>
+              </view>
 							<view class="sku" v-if="goodsItem.sku_spec_format">
 								<view class="goods-spec">
 									<block v-for="(x, i) in goodsItem.sku_spec_format" :key="i">
@@ -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 @@
 					</view>
 					<text class="iconfont icon-right"></text>
 				</view>
+
 				<view class="option-item" @click="selectRefundType(2)" v-if="refund_data.order_status == 3">
 					<view>
 						<text>退货退款</text>
@@ -17,6 +18,15 @@
 					</view>
 					<text class="iconfont icon-right"></text>
 				</view>
+
+        <view class="option-item" @click="selectRefundType(4)">
+          <view>
+            <text>仅退货</text>
+            <text class="font-size-goods-tag color-tip">仅退货</text>
+          </view>
+          <text class="iconfont icon-right"></text>
+        </view>
+
 			</view>
 
 			<loading-cover ref="loadingCover"></loading-cover>