修改退款按钮

api/groupon.js

@@ -30,11 +30,16 @@ export function reasonList() {
     return request.get("/v1/after-sales/reason/list",null);
 }
 
-//获取售后原因列表
+//提交退货售后
 export function afterSalesSubmit(data) {
     return request.post("/v1/after-sales/submit",data);
 }
 
+//提交退款售后
+export function refundSubmit(data) {
+    return request.post("/v1/after-sales/refundSubmit",data);
+}
+
 
 //同意售后
 export function agreeAfterSales(data) {

pages/groupbuying_details/order_details_list/index.vue

@@ -2,17 +2,23 @@
 	<view :style="colorStyle" v-if="orderDetail.orderState">
 		<view class="wait_panel">
 			<view class="w1">
-				<view class="imageView">
+				<view v-if="orderStatus != 8" class="imageView">
 					<image v-if="orderDetail.orderState == 5" src="http://www.gzzzyd.com/groupon/home_slices/取消订单小@2x.png" mode="scaleToFill" />
 					<image v-else-if="orderDetail.orderState == 4" src="http://www.gzzzyd.com/groupon/home_slices/已完成@2x.png" mode="scaleToFill" />
-					<image v-else-if="orderDetail.orderState == 8" src="http://www.gzzzyd.com/groupon/home_slices/退款中@2x.png" mode="scaleToFill" />
 					<image v-else src="http://www.gzzzyd.com/groupon/order_details/时间.png" mode="scaleToFill" />
 				</view>
+        <view v-if="orderStatus == 8" class="imageView">
+          <image src="http://www.gzzzyd.com/groupon/home_slices/退款中@2x.png" mode="scaleToFill" />
+        </view>
+
+        <text v-if="orderStatus != 8">
+          <text v-if="orderDetail.orderState == 4" class="success_status">{{orderDetail.orderStateDesc}}</text>
+          <text v-else class="status">{{orderDetail.orderStateDesc}}</text>
+        </text>
+        <text v-if="orderStatus == 8">
+          <text class="refund_status">{{orderDetail.afterSalesDesc}}</text>
+        </text>
 
-				<text v-if="orderDetail.orderState == 4" class="success_status">{{orderDetail.orderStateDesc}}</text>
-        		<text v-else-if="orderDetail.orderState == 8 || item.orderState == 7" class="refund_status">{{orderDetail.afterSalesDesc}}</text>
-				<text v-else-if="orderDetail.orderState > 4" class="refund_status">{{orderDetail.orderStateDesc}}</text>
-				<text v-else class="status">{{orderDetail.orderStateDesc}}</text>
 			</view>
 			<view class="w2" v-if="orderDetail.orderState == 1">
 				需付款: <text class="red">¥{{orderDetail.paymentAmount}}</text>
@@ -49,6 +55,7 @@
 					<view class="all-products-item-content-b">
 						<view style="display:flex;">
 							<text class="red"> ¥{{item.goodsPrice}}</text>
+              <text v-if="item.isAfterSales == 1 && orderStatus != 8" class="count">有售后</text>
 						</view>
 
 						<view>
@@ -152,7 +159,7 @@
 							<view class="item-value">￥{{orderDetail.paymentAmount}}</view>
 						</view>
 					</view>
-          <view class="p_box" v-if="orderDetail.orderState == 8 || orderDetail.orderState == 7">
+          <view class="p_box" v-if="orderStatus == 8">
             <view class="p-t">
               售后信息
             </view>
@@ -184,10 +191,10 @@
               <view class="item-lable">物流单号</view>
               <view class="item-value2">{{orderDetail.afterSales.logisticsNo || ''}}</view>
             </view>
-			  <view class="p-b-item" v-if="orderDetail.afterSales.status == 4">
-				  <view class="item-lable">拒绝原因</view>
-				  <view class="item-value2">{{orderDetail.afterSales.refuseReason || ''}}</view>
-			  </view>
+            <view class="p-b-item" v-if="orderDetail.afterSales.status == 4">
+              <view class="item-lable">拒绝原因</view>
+              <view class="item-value2">{{orderDetail.afterSales.refuseReason || ''}}</view>
+            </view>
           </view>
 
           <view class="p_box"  v-if="orderDetail.store">
@@ -352,7 +359,8 @@ export default {
 			orderDetail: {},
 			selfTakeList: [],
 			orderId:'',
-			afterSalesId:''
+			afterSalesId:'',
+      orderStatus: 0
 		}
 	},
 	computed: mapGetters(['isLogin']),
@@ -367,6 +375,7 @@ export default {
 	onLoad (options) {
 		this.from = 'routine'
 		console.log(options);
+		this.orderStatus = options.orderStatus;
 		this.orderId = options.orderId;
 		this.afterSalesId = options.afterSalesId;
 		this.getOrderDetail(this.orderId, options.afterSalesId)

pages/order/index.vue

@@ -25,9 +25,14 @@
 							<view class="nl ">
 								{{item.mainTitle}}
 							</view>
-							<view v-if="item.orderState == 4" class="success_status">{{item.orderStateDesc}}</view>
-							<view v-else-if="item.orderState == 8 || item.orderState == 7" class="after_sales_status">{{item.afterSalesStatusDesc}}</view>
-							<view v-else class="status">{{item.orderStateDesc}}</view>
+              <view v-if="orderStatus != 8">
+                <view v-if="item.orderState == 4" class="success_status">{{item.orderStateDesc}}</view>
+                <view v-else class="status">{{item.orderStateDesc}}</view>
+              </view>
+              <view v-if="orderStatus == 8">
+                <view class="after_sales_status">{{item.afterSalesStatusDesc}}</view>
+              </view>
+
 						</view>
 <!--						<view class="grouponTitle ">-->
 <!--							<text class="subTitle ">{{ item.subTitle}} </text>-->
@@ -66,8 +71,11 @@
 								<view class="all-products-item-content-b">
 									<view style="display:flex;">
 										<text class="red"> ¥{{goods.goodsPrice}}</text>
+                    <text v-if="goods.isAfterSales == 1 && orderStatus != 8" class="count">有售后</text>
 									</view>
-
+<!--                  <view>-->
+<!--                    <view v-if="goods.isAfterSales == 1&&orderStatus != 8" class="count">有售后</view>-->
+<!--                  </view>-->
 									<view>
 										<view class="count"> x {{goods.goodsNum}}</view>
 									</view>
@@ -106,8 +114,9 @@
 					<view class="op-area">
 						<button v-if="item.orderState == 1" class="action-btn" @click="cancelOrder(item.orderId)">取消订单</button>
 						<button v-if="item.orderState == 1" class="action-btn" @click="goPay(item)">立即付款</button>
-						<button v-if="item.canReturnGoods" class="info-btn" @click="salesReturn(item)">申请退货</button>
-						<button v-if="item.canRefund" class="info-btn" @click="refundOrder(item.orderId)">申请退款</button>
+						<button v-if="item.canReturnGoods && orderStatus != 8" class="info-btn" @click="salesReturn(item, 2)">申请退货</button>
+<!--						<button v-if="item.canRefund" class="info-btn" @click="refundOrder(item.orderId)">申请退款</button>-->
+						<button v-if="item.canRefund && orderStatus != 8" class="info-btn" @click="salesReturn(item, 1)">申请退款</button>
 						<button  v-if="item.orderState == 2" class="action-btn" @click="viewPickCode(item.pickupCode)">取货码 {{item.pickupCode}}</button>
 					</view>
 				</view>
@@ -320,10 +329,12 @@ export default {
 	},
 
 	methods: {
-
-		salesReturn(item){
+    /**
+     * 售后 1-退款 2-退货
+     */
+		salesReturn(item, type){
 			uni.navigateTo({
-				url:'/pages/order/orderAfterSales/orderAfterSales?item='+encodeURIComponent(JSON.stringify(item))
+				url:'/pages/order/orderAfterSales/orderAfterSales?type='+type+'&item='+encodeURIComponent(JSON.stringify(item))
 			})
 		},
 
@@ -518,7 +529,7 @@ export default {
 		 */
 		goOrderDetails (item) {
 			uni.navigateTo({
-				url: '/pages/groupbuying_details/order_details_list/index?orderId=' + item.orderId + '&afterSalesId=' + item.afterSalesId
+				url: '/pages/groupbuying_details/order_details_list/index?orderId=' + item.orderId + '&afterSalesId=' + item.afterSalesId + '&orderStatus=' + this.orderStatus
 			});
 		},
 		/**

pages/order/orderAfterSales/orderAfterSales.vue

@@ -7,7 +7,7 @@
 					<view class="nl ">
 						{{form.mainTitle}}
 					</view>
-					<view class="success_status ">{{form.orderStateDesc}}</view>
+<!--					<view class="success_status ">{{form.orderStateDesc}}</view>-->
 				</view>
 				<view class="flex-col">
 
@@ -37,7 +37,7 @@
 					<view>
 						<view class="all-products-body flex-row" v-for="(item,i) in form.goodsList" :key="i">
 
-							<view class="flex-col  justify-center">
+							<view class="flex-col  justify-center" v-if="item.isAfterSales == 0">
 								<view v-if="item.isVGoods" class="image-view" @click="vGoods(item)">
 									<image class="image" src="/static/images/v.png"></image>
 								</view>
@@ -46,7 +46,7 @@
 								</view>
 							</view>
 
-							<view class="all-products-item flex-row  ">
+							<view class="all-products-item flex-row  " v-if="item.isAfterSales == 0">
 								<image class="goodsImage " :src="item.goodsImage" mode="scaleToFill" />
 
 								<view class="all-products-item-content flex-col">
@@ -71,7 +71,7 @@
 			</view>
 
 			<view class="bottom">
-				<view class=" button-view flex-row  ">
+				<view class=" button-view flex-row  " v-if="type == 2">
 					<text class="reason">退货原因：</text>
 					<view class="input-view flex-col justify-center" @click="openRefundShow">
 						<view>
@@ -81,7 +81,8 @@
 				</view>
 
 				<view class="button-view flex-col justify-center ">
-					<u-button color="#B42A3E " @click="afterSalesSubmit">提交</u-button>
+					<u-button color="#B42A3E " @click="refundSubmit" v-if="type == 1">提交</u-button>
+					<u-button color="#B42A3E " @click="afterSalesSubmit" v-if="type == 2">提交</u-button>
 				</view>
 			</view>
 		</view>
@@ -113,7 +114,8 @@
 <script>
 	import {
 		reasonList,
-		afterSalesSubmit
+		afterSalesSubmit,
+      refundSubmit
 	} from '@/api/groupon.js';
 	import UInput from "../../../uni_modules/uview-ui/components/u-input/u-input";
 	export default {
@@ -131,11 +133,14 @@
 				formCopy: {},
 				RefundShow: false,
 				height: '',
+        type: 0,
 			}
 		},
 
 		onLoad(e) {
 			this.form = JSON.parse(decodeURIComponent(e.item));
+      this.type = e.type;
+
 			this.formCopy = JSON.parse(decodeURIComponent(e.item));
 			console.log(this.form)
 		},
@@ -145,6 +150,40 @@
 			console.log(this.height)
 		},
 		methods: {
+      refundSubmit() {
+        if (this.goodsIds.length <= 0) {
+          uni.$u.toast('请选择商品')
+          return
+        }
+
+        let flag = false
+        let afterSalesGoods = []
+        this.form.goodsList.forEach(item => {
+          if (this.goodsIds.indexOf(item.id) !== -1) {
+            if (!item.goodsNum) {
+              uni.$u.toast('请选择商品数量')
+              flag = true
+            }
+            afterSalesGoods.push(item)
+          }
+        })
+
+        if (flag) {
+          return;
+        }
+        let params = {
+          orderId: this.form.orderId,
+          afterSalesGoodsList: afterSalesGoods
+        };
+        refundSubmit(params).then(res => {
+          console.log("refundSubmit...")
+          // uni.$u.toast(res.msg)
+          uni.navigateBack();
+        }).catch(err => {
+          uni.$u.toast(err.msg)
+        })
+
+      },
 			afterSalesSubmit() {
 
 				if (this.goodsIds.length <= 0) {