Merge branch 'five-second-add' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into six

src/views/Marketing/order/offlineOrder/orderDetailsT/index.vue

@@ -30,9 +30,12 @@
         <el-button type="text" @click="adds(props.scope.row)"
           >订单收费信息</el-button
         >
-        <el-button type="text" @click="del(props.scope.row)"
+        <!-- <el-button
+          type="text"
+          :disabled="props.scope.row.goodsPayStatus !== 1"
+          @click="del(props.scope.row)"
           >删除订单</el-button
-        >
+        > -->
       </template>
     </table-list>
     <pagination
@@ -384,7 +387,7 @@ export default {
             item.refundStatus !== 1 &&
             item.refundStatus !== 2 &&
             item.goodsPayStatus !== 3 &&
-            item.goodsPayStatus !== 4 && 
+            item.goodsPayStatus !== 4 &&
             item.orderGoodsStatus !== -1
           );
         });
@@ -567,7 +570,9 @@ export default {
     init() {
       this.search(2);
     },
-    del(v) {},
+    del(v) {
+      console.log(v);
+    },
     handleSizeChange(v) {
       this.formData.pageSize = v;
       this.formData.pageNum = 1;

src/views/Marketing/order/orderList/details/refundOrder.vue

@@ -3,17 +3,17 @@
     <el-row :gutter="20" style="background-color: #eee">
       <el-form>
         <el-col :span="8">
-          <el-form-item label="付款方式">
+          <el-form-item label="退款方式">
             <el-input disabled value="微信"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="付款凭证">
+          <el-form-item label="退款凭证">
             <el-input disabled v-model="listInfos.wxpayRefundId"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="付款时间">
+          <el-form-item label="退款时间">
             <el-input
               disabled
               :value="$methodsTools.onlyForma(listInfos.refundTime)"