Merge branch 'feature/福利中心-礼品管理' into dev

dist/css/chunk-41c262a4.acccbaa4.css

+.empty_block[data-v-7c805932]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-7c805932]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-7c805932]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-7c805932]{display:inline-block}.logistics-info span+span[data-v-7c805932]{margin-left:10px}.logistics-step[data-v-7c805932]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-7c805932]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-7c805932]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-7c805932]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-7c805932]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-7c805932]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-7c805932]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}
\ No newline at end of file

dist/css/chunk-9a1779ca.8b9c1b60.css

-.empty_block[data-v-58c7edcd]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-58c7edcd]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-58c7edcd]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-58c7edcd]{display:inline-block}.logistics-info span+span[data-v-58c7edcd]{margin-left:10px}.logistics-step[data-v-58c7edcd]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-58c7edcd]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-58c7edcd]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-58c7edcd]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-58c7edcd]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-58c7edcd]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-58c7edcd]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}
\ No newline at end of file

src/api/performance.js

@@ -38,7 +38,8 @@ let performance = {
   },
   handleRefundOrder: {
     url: '/refund-order/process-refund-order',
-    method: 'post'
+    method: 'post',
+    useFormData: true
   },
   getDeliveryDetail: {
     url: '/delivery-order/get-delivery-detail',

src/views/performance-manage/refund.vue

@@ -121,7 +121,6 @@
       <el-table-column label="操作" width="200">
         <template slot-scope="{ row }">
           <template v-if="row.refundFlag == 0 && row.refundLogisticsNo">
-            <span class="state-point state-point-success">已寄回</span>
             <div>
               <dm-delete @confirm="handleReceive(row, 1)" tips="确认同意收货？">
                 <el-button type="text">同意收货</el-button>
@@ -380,6 +379,7 @@ export default {
       let params = {
         refundId: row.refundId,
         processFlag: isAgree,
+        refuseReason: ''
       };
       if(!isAgree) {
         params.refuseReason = this.refuseDialog.form.reason;