From a4846939ddd4fcf805629c9fca88a3ae78881f59 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 18 Aug 2023 19:14:39 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=80=80=E6=AC=BE=E3=80=91=201?=
 =?UTF-8?q?=E3=80=81=E9=80=80=E6=AC=BE=E8=AF=A6=E6=83=85=202=E3=80=81?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/trade/afterSale.js                      |  14 ++
 api/trade/delivery.js                       |   5 +
 pages.json                                  |   6 +
 pages/order_details/index.vue               |   3 +-
 pages/users/goods_return/index.vue          |   5 +-
 pages/users/goods_return_delivery/index.vue | 135 +++++++++++
 pages/users/user_return_detail/index.vue    | 240 ++++++++++----------
 pages/users/user_return_list/index.vue      |  18 +-
 8 files changed, 288 insertions(+), 138 deletions(-)
 create mode 100644 pages/users/goods_return_delivery/index.vue

diff --git a/api/trade/afterSale.js b/api/trade/afterSale.js
index f0d4a799..3b056c2f 100644
--- a/api/trade/afterSale.js
+++ b/api/trade/afterSale.js
@@ -1,5 +1,11 @@
 import request from "@/utils/request.js";
 
+export function getAfterSale(id) {
+  return request.get("app-api/trade/after-sale/get", {
+    id
+  });
+}
+
 export function getAfterSalePage(data) {
   return request.get("app-api/trade/after-sale/page", data);
 }
@@ -13,3 +19,11 @@ export function getAfterSaleReasonList(way) {
 export function createAfterSale(data) {
   return request.post("app-api/trade/after-sale/create", data);
 }
+
+export function cancelAfterSale(id) {
+  return request.delete("app-api/trade/after-sale/cancel?id=" + id);
+}
+
+export function deliveryAfterSale(data) {
+  return request.put("app-api/trade/after-sale/delivery", data);
+}
diff --git a/api/trade/delivery.js b/api/trade/delivery.js
index a8d86997..97daad3a 100644
--- a/api/trade/delivery.js
+++ b/api/trade/delivery.js
@@ -16,3 +16,8 @@ export function getDeliveryPickUpStore(id) {
     id
   });
 }
+
+// 获得快递公司列表
+export function getDeliveryExpressList() {
+  return request.get("app-api/trade/delivery/express/list");
+}
diff --git a/pages.json b/pages.json
index 0b423f94..2d31ffed 100644
--- a/pages.json
+++ b/pages.json
@@ -361,6 +361,12 @@
 						"navigationBarTitleText": "申请退货"
 					}
 				},
+                {
+                  "path": "goods_return_delivery/index",
+                  "style": {
+                    "navigationBarTitleText": "填写退货物流"
+                  }
+                },
 				{
 					"path": "login/index",
 					"style": {
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index e277e821..5bc4d76d 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -1,7 +1,8 @@
 <template>
 	<view>
 		<view class='order-details'>
-			<view class='header bg-color'>
+      <!-- 当前状态 -->
+      <view class='header bg-color'>
 				<view class='picTxt acea-row row-middle'>
           <!-- 状态图 -->
           <view class='pictrue'>
diff --git a/pages/users/goods_return/index.vue b/pages/users/goods_return/index.vue
index 3143b1df..fcfd16cc 100644
--- a/pages/users/goods_return/index.vue
+++ b/pages/users/goods_return/index.vue
@@ -18,7 +18,7 @@
           <view class='item acea-row row-between-wrapper'>
             <view>售后方式</view>
             <!-- 如果未发货，则只能退款 -->
-            <view class="" v-if="order.status === 20">仅退款</view>
+            <view class="" v-if="order.status === 10">仅退款</view>
             <picker v-else class='num' @change="wayChange"
                     :value="wayIndex" :range="ways">
               <view class="picker acea-row row-between-wrapper">
@@ -205,13 +205,12 @@
           applyDescription: formData.applyDescription,
           applyPicUrls: this.applyPicUrls,
         }).then(res => {
-          // TODO 芋艿：这里要改成跳转到售后详情页
           this.$util.Tips({
             title: '申请成功',
             icon: 'success'
           }, {
             tab: 5,
-            url: '/pages/users/user_return_list/index?isT=1'
+            url: '/pages/users/user_return_detail/index?id=' + res.data
           });
         }).catch(err=>{
           return this.$util.Tips({
diff --git a/pages/users/goods_return_delivery/index.vue b/pages/users/goods_return_delivery/index.vue
new file mode 100644
index 00000000..f9b48e4e
--- /dev/null
+++ b/pages/users/goods_return_delivery/index.vue
@@ -0,0 +1,135 @@
+<template>
+	<view>
+    <!-- TODO 芋艿：退货地址，后续写在这里，还是写在退款详情界面 -->
+		<form @submit="subRefund" report-submit='true'>
+		  <view class='apply-return'>
+		    <view class='list borRadius14'>
+          <view class='item acea-row row-between-wrapper'>
+            <view>物流公司</view>
+            <picker class='num' @change="bindPickerChange" :value="expressIndex"
+                    :range="expresses" range-key="name">
+              <view class="picker acea-row row-between-wrapper">
+                <view class='reason'>{{ expresses[expressIndex].name }}</view>
+                <text class='iconfont icon-jiantou'></text>
+              </view>
+            </picker>
+          </view>
+          <view class='item textarea acea-row row-between'>
+            <view>物流单号</view>
+            <input placeholder='请填写物流单号' class='num' name="logisticsNo" placeholder-class='placeholder' />
+          </view>
+				  <button class='returnBnt bg-color' form-type="submit">提交</button>
+		    </view>
+		  </view>
+		</form>
+	</view>
+</template>
+<script>
+	import { toLogin } from '@/libs/login.js';
+	import { mapGetters } from "vuex";
+  import * as AfterSaleApi from '@/api/trade/afterSale.js';
+  import * as DeliveryApi from '@/api/trade/delivery.js';
+  export default {
+		data() {
+			return {
+        id: 0, // 售后编号
+
+        expresses: [], // 快递公司数组
+        expressIndex: 0, // 选中 expresses 的位置
+			};
+		},
+		computed: mapGetters(['isLogin']),
+		watch:{
+			isLogin:{
+				handler: function(newV, oldV) {
+					if (newV) {
+						this.getExpressList();
+					}
+				},
+				deep:true
+			}
+		},
+		 onLoad: function (options) {
+      if (!this.isLogin) {
+        toLogin();
+        return;
+      }
+      if (!options.id) {
+         return this.$util.Tips({
+           title: '缺少退款编号，无法查看'
+         },{
+           tab: 3,
+           url:1
+         });
+      }
+      this.id = parseInt(options.id);
+      this.getExpressList();
+    },
+		methods: {
+			onLoadFun:function() {
+        this.getExpressList();
+      },
+      /**
+       * 获得快递公司
+       */
+      getExpressList: function() {
+        DeliveryApi.getDeliveryExpressList().then(res => {
+          this.expresses = res.data;
+        })
+      },
+      /**
+       * 选择快递公司
+       */
+      bindPickerChange: function(e) {
+        this.$set(this, 'expressIndex', e.detail.value);
+      },
+
+      /**
+       * 申请退货
+      */
+      subRefund:function(e) {
+        const formData = e.detail.value;
+        AfterSaleApi.deliveryAfterSale({
+          id: this.id,
+          logisticsId: this.expresses[this.expressIndex].id,
+          logisticsNo: formData.logisticsNo,
+        }).then(res => {
+          this.$util.Tips({
+            title: '填写退货成功',
+            icon: 'success'
+          }, {
+            tab: 5,
+            url: '/pages/users/user_return_detail/index?id=' + this.id
+          });
+        }).catch(err=>{
+          return this.$util.Tips({
+            title: err
+          });
+        })
+      }
+		}
+	}
+</script>
+<style scoped lang="scss">
+	.apply-return{
+		padding: 20rpx 30rpx 70rpx 30rpx;
+	}
+	.apply-return .list{background-color:#fff;margin-top:18rpx;padding:0 24rpx 70rpx 24rpx;}
+	.apply-return .list .item{min-height:90rpx;border-bottom:1rpx solid #eee;font-size:30rpx;color:#333;}
+	.apply-return .list .item .num{color:#282828;width:427rpx;text-align:right;}
+	.apply-return .list .item .num .picker .reason{width:385rpx;}
+	.apply-return .list .item .num .picker .iconfont{color:#666;font-size:30rpx;margin-top:2rpx;}
+	.apply-return .list .item.textarea{padding:24rpx 0;}
+	.apply-return .list .item textarea{height:100rpx;font-size:30rpx;}
+	.apply-return .list .item .placeholder{color:#bbb;}
+	.apply-return .list .item .title{height:95rpx;width:100%;}
+	.apply-return .list .item .title .tip{font-size:30rpx;color:#bbb;}
+	.apply-return .list .item .upload{padding-bottom:36rpx;}
+	.apply-return .list .item .upload .pictrue{border-radius: 14rpx; margin:22rpx 23rpx 0 0;width:156rpx;height:156rpx;position:relative;font-size:24rpx;color:#bbb;}
+	.apply-return .list .item .upload .pictrue:nth-of-type(4n){margin-right:0;}
+	.apply-return .list .item .upload .pictrue image{width:100%;height:100%;border-radius:14rpx;}
+	.apply-return .list .item .upload .pictrue .icon-guanbi1{position:absolute;font-size:45rpx;top:-10rpx;right:-10rpx;}
+	.apply-return .list .item .upload .pictrue .icon-icon25201{color:#bfbfbf;font-size:50rpx;}
+	.apply-return .list .item .upload .pictrue:nth-last-child(1){border:1rpx solid #ddd;box-sizing:border-box;}
+	.apply-return .returnBnt{font-size:32rpx;color:#fff;width:100%;height:86rpx;border-radius:50rpx;text-align:center;line-height:86rpx;margin:43rpx auto;}
+</style>
diff --git a/pages/users/user_return_detail/index.vue b/pages/users/user_return_detail/index.vue
index b58ff03c..c466e55f 100644
--- a/pages/users/user_return_detail/index.vue
+++ b/pages/users/user_return_detail/index.vue
@@ -1,34 +1,86 @@
 <template>
 	<view>
     <view class='order-details'>
-      <view class="pad30">
-        <!-- TODO 芋艿：退款各种 -->
-        <view class='nav refund'>
-          <view class="title">
-            <image src="/static/images/shuoming.png" mode="" />
-            {{order.refundStatus==1?'商家审核中':order.refundStatus==2?'商家已退款':'商家拒绝退款'}}
+      <!-- 当前状态 -->
+      <view class='header bg-color'>
+        <view class='picTxt acea-row row-middle'>
+          <!-- 状态图 -->
+          <view class='pictrue'>
+            <image v-if="afterSale.status === 10" src="@/static/images/order/status_0.gif" />
+            <image v-if="afterSale.status === 20" src="@/static/images/order/status_10.gif" />
+            <image v-if="afterSale.status === 30" src="@/static/images/order/status_20.gif" />
+            <image v-if="afterSale.status === 40" src="@/static/images/order/status_30a.gif" />
+            <image v-if="afterSale.status === 50" src="@/static/images/order/status_30b.gif" />
+            <image v-if="afterSale.status === 61" src="@/static/images/order/status_40.gif" />
+            <image v-if="afterSale.status === 62" src="@/static/images/order/status_40.gif" />
+            <image v-if="afterSale.status === 63" src="@/static/images/order/status_40.gif" />
           </view>
-          <view class="con pad30">
-            {{
-               order.refundStatus==1 ? "您已成功发起退款申请，请耐心等待商家处理；退款前请与商家协商一致，有助于更好的处理售后问题":
-               order.refundStatus==2 ? "退款已成功受理，如商家已寄出商品请尽快退回；感谢您的支持" : "拒绝原因：" + order.refundReason
-            }}
+          <view class='data'>
+            <!-- 状态提示 -->
+            <view class='state' v-if="afterSale.status === 10">退款申请待商家处理</view>
+            <view class='state' v-if="afterSale.status === 20">请退货并填写物流信息</view>
+            <view class='state' v-if="afterSale.status === 30">退货退款申请待商家处理</view>
+            <view class='state' v-if="afterSale.status === 40">等待退款</view>
+            <view class='state' v-if="afterSale.status === 50">退款成功</view>
+            <view class='state' v-if="afterSale.status === 61">退款关闭</view>
+            <view class='state' v-if="afterSale.status === 62">商家不同意退款申请，拒绝原因：{{ afterSale.auditReason }}</view>
+            <view class='state' v-if="afterSale.status === 63">商家拒绝收货，不同意退款，拒绝原因：{{ afterSale.auditReason }}</view> <!-- TODO -->
+          </view>
+        </view>
+      </view>
+
+      <view>
+        <view class='goodsStyle acea-row row-between borRadius14'>
+          <view class='pictrue'>
+            <image :src='afterSale.picUrl' />
+          </view>
+          <view class='text acea-row row-between'>
+            <view class='line2'>{{ afterSale.spuName }}</view>
+            <view class='attr line1' v-if="afterSale.properties">
+              <text v-for="property in afterSale.properties" style="padding-right: 2px">{{property.valueName}}</text>
+            </view>
           </view>
         </view>
 
-        <!-- TODO 芋艿：退款订单详情 -->
         <view class='wrapper borRadius14' >
           <view class='item acea-row row-between'>
-            <view>收货人：</view>
-            <view class='conter'>{{order.realName}}</view>
+            <view>退款金额：</view>
+            <view class='conter'>￥ {{ fen2yuan(afterSale.refundPrice) }}</view>
           </view>
           <view class='item acea-row row-between'>
-            <view>联系电话：</view>
-            <view class='conter'>{{order.userPhone}}</view>
+            <view>售后方式：</view>
+            <view class='conter'>{{ afterSale.way === 10 ? '仅退款' : '退款退货' }}</view>
           </view>
           <view class='item acea-row row-between'>
-            <view>收货地址：</view>
-            <view class='conter'>{{order.userAddress}}</view>
+            <view>退款原因：</view>
+            <view class='conter'>{{ afterSale.applyReason }}</view>
+          </view>
+        </view>
+
+        <view class='wrapper borRadius14' >
+          <view class='item acea-row row-between'>
+            <view>售后单号：</view>
+            <view class='conter'>{{ afterSale.no }}</view>
+          </view>
+          <view class='item acea-row row-between'>
+            <view>申请时间：</view>
+            <view class='conter'>{{ formatDate(afterSale.createTime) }}</view>
+          </view>
+          <view class='item acea-row row-between'>
+            <view>数量：</view>
+            <view class='conter'>{{ afterSale.count }}</view>
+          </view>
+        </view>
+      </view>
+
+      <view>
+        <!-- 操作区域 -->
+        <view class='footer acea-row row-right row-middle'>
+          <view class="qs-btn" v-if="[20].includes(afterSale.status)" @click.stop="cancelAfterSale">
+            填写退货信息
+          </view>
+          <view class="qs-btn" v-if="[10, 20, 30].includes(afterSale.status)" @click.stop="cancelAfterSale">
+            撤销申请
           </view>
         </view>
       </view>
@@ -38,23 +90,14 @@
 <script>
 	import { toLogin } from '@/libs/login.js';
 	import { mapGetters } from "vuex";
-  import * as TradeOrderApi from '@/api/trade/order.js';
   import * as AfterSaleApi from '@/api/trade/afterSale.js';
+  import dayjs from '@/plugin/dayjs/dayjs.min.js';
+  import * as Util from '@/utils/util.js';
   export default {
 		data() {
 			return {
-        orderId: 0,
-        orderItemId: 0,
-        order: {}, // 订单
-        orderItem: {}, // 订单项
-
-        wayIndex: 0, // 选中 ways 的位置
-        ways: ['仅退款', '退款退货'], // 可选的售后方式
-
-        reasons: [], // 售后原因
-        reasonIndex: 0, // 选中 reasons 的位置
-
-        applyPicUrls: [], // 补充凭证图片
+        id: 0, // 售后编号
+        afterSale: {}, // 售后信息
 			};
 		},
 		computed: mapGetters(['isLogin']),
@@ -62,8 +105,7 @@
 			isLogin:{
 				handler: function(newV, oldV) {
 					if (newV) {
-						this.getOrderInfo();
-						this.getRefundReason();
+						this.getAfterSale();
 					}
 				},
 				deep:true
@@ -74,110 +116,62 @@
         toLogin();
         return;
       }
-      // if (!options.orderId || !options.orderItemId) {
-      //   return this.$util.Tips({
-      //     title:'缺少订单id,无法退款'
-      //   },{
-      //     tab: 3,
-      //     url:1
-      //   });
-      // }
-			// this.orderId = parseInt(options.orderId);
-      // this.orderItemId = parseInt(options.orderItemId);
-      // this.getOrderInfo();
-      // this.getRefundReason();
+      if (!options.id) {
+        return this.$util.Tips({
+          title: '缺少退款编号，无法查看'
+        },{
+          tab: 3,
+          url:1
+        });
+      }
+			this.id = parseInt(options.id);
+      this.getAfterSale();
     },
 		methods: {
-			onLoadFun:function() {
-        this.getOrderInfo();
-        this.getRefundReason();
-      },
       /**
-       * 获取订单详情
+       * 获取售后订单
       */
-      getOrderInfo:function(){
-        TradeOrderApi.getOrderDetail(this.orderId).then(res => {
-          // 设置订单信息
-          const order = res.data;
-          this.order = order;
-          // 查询订单项信息
-          this.orderItem = order.items.find(item => item.id === this.orderItemId) || {};
+      getAfterSale: function() {
+        AfterSaleApi.getAfterSale(this.id).then(res => {
+          this.afterSale = res.data || {}
         }).catch(err => {
           return this.$util.Tips({
             title: err
           });
         })
       },
+
       /**
-       * 更改售后方式
+       * 取消售后
        */
-      wayChange: function(e) {
-        this.$set(this, 'wayIndex', e.detail.value);
-        this.getRefundReason();
-      },
-      /**
-       * 获得售后方式
-       */
-      getWay: function () {
-        return this.wayIndex === 0 ? 10 : 20
-      },
-      /**
-       * 获取退款理由
-       */
-      getRefundReason: function() {
-        const way = this.getWay();
-        AfterSaleApi.getAfterSaleReasonList(way).then(res => {
-          this.reasons = res.data;
-        })
-      },
-      /**
-       * 选择售后原因
-       */
-      bindPickerChange: function(e) {
-        this.$set(this, 'reasonIndex', e.detail.value);
-      },
-      /**
-       * 删除图片
-       */
-      DelPic:function(index) {
-        this.applyPicUrls.splice(index, 1);
-      },
-      /**
-       * 上传文件
-       */
-      uploadpic:function(){
-        this.$util.uploadImageOne({}, res => {
-          this.applyPicUrls.push(res.data);
-          this.$set(this, 'applyPicUrls', this.applyPicUrls);
+      cancelAfterSale: function() {
+        uni.showModal({
+          title: '提示',
+          content: '确认取消该售后?',
+          success: res => {
+            if (!res.confirm) {
+              return;
+            }
+            AfterSaleApi.cancelAfterSale(this.id).then(() => {
+              this.$util.Tips({
+                title: '取消成功'
+              })
+              this.getAfterSale();
+            }).catch((err) => {
+              this.$util.Tips({
+                title: err
+              })
+              this.getAfterSale();
+            });
+          }
         });
       },
 
-      /**
-       * 申请退货
-      */
-      subRefund:function(e) {
-        const formData = e.detail.value;
-        AfterSaleApi.createAfterSale({
-          orderItemId: this.orderItemId,
-          way: this.getWay(),
-          refundPrice: this.orderItem.payPrice,
-          applyReason: this.reasons[this.reasonIndex],
-          applyDescription: formData.applyDescription,
-          applyPicUrls: this.applyPicUrls,
-        }).then(res => {
-          // TODO 芋艿：这里要改成跳转到售后详情页
-          this.$util.Tips({
-            title: '申请成功',
-            icon: 'success'
-          }, {
-            tab: 5,
-            url: '/pages/users/user_return_list/index?isT=1'
-          });
-        }).catch(err=>{
-          return this.$util.Tips({
-            title: err
-          });
-        })
+      fen2yuan(price) {
+        return Util.fen2yuan(price)
+      },
+      formatDate: function(date) {
+        return dayjs(date).format("YYYY-MM-DD HH:mm:ss");
       }
 		}
 	}
@@ -218,7 +212,7 @@
 }
 
 .order-details .header {
-  height: 250rpx;
+  height: 150rpx;
   padding: 0 30rpx;
 }
 
diff --git a/pages/users/user_return_list/index.vue b/pages/users/user_return_list/index.vue
index 554a7c52..ae27d64a 100644
--- a/pages/users/user_return_list/index.vue
+++ b/pages/users/user_return_list/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class='return-list pad30' v-if="orderList.length">
-			<view class='goodWrapper borRadius14' v-for="(item,index) in orderList" :key="index" @click='goOrderDetails(item.orderId)'>
+			<view class='goodWrapper borRadius14' v-for="(item,index) in orderList" :key="index" @click='goOrderDetails(item.id)'>
         <!-- 根据状态，展示 icon -->
         <!-- TODO 芋艿：需要优化下 icon，目前没展示出来 -->
         <view class='iconfont icon-shenqingzhong powder' v-if="[10].includes(item.status)" />
@@ -89,23 +89,19 @@
 			this.getOrderList();
 		},
 		methods: {
-			onLoadFun() {
-				this.getOrderList();
-			},
 			/**
 			 * 去订单详情
 			 */
-			goOrderDetails: function(order_id) {
-				if (!order_id) {
-          return that.$util.Tips({
+			goOrderDetails: function(id) {
+				if (!id) {
+          return this.$util.Tips({
             title: '缺少订单号无法查看订单详情'
           });
         }
-        // TODO 芋艿：跳转到详情
-				uni.navigateTo({
-					url: '/pages/order_details/index?order_id=' + order_id + '&isReturen=1'
+        uni.navigateTo({
+					url: '/pages/users/user_return_detail/index?id=' + id
 				})
-			},
+      },
 
 			/**
 			 * 获取订单列表