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

src/components/tableList.vue

@@ -713,7 +713,7 @@
             }}
           </span>
           <div v-else-if="item.scope === 'periodStatusShow'">
-            {{ scope.row[item.prop] === 2 ? "同意，待退款" : "待审核" }}
+            {{ scope.row[item.prop] === 2 ? "同意，待退款" : scope.row[item.prop] === 3 ?'同意，已退款' :"待审核" }}
           </div>
           <span v-else-if="item.scope === 'peopleNum'">{{
             scope.row[item.prop] === 0 ? "不限制" : scope.row[item.prop]

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

@@ -327,6 +327,10 @@ export default {
           label: "完全收费",
           value: 3,
         },
+        {
+          label: "免费",
+          value: 4,
+        },
       ],
       lists: [
         {

src/views/Marketing/order/pendingRefundOrder/refundDia.vue

@@ -137,7 +137,13 @@ export default {
         }
         if (int === 1) {
           item.copyperiodStatus = item.periodStatus;
-          item.periodStatusLine = "";
+          if (item.periodStatus === 2) {
+            item.periodStatusLine = 2;
+          } else if (item.periodStatus === 3) {
+            item.periodStatusLine = 3;
+          } else {
+            item.periodStatusLine = "";
+          }
         }
         return item;
       });
@@ -181,7 +187,10 @@ export default {
         if (item.applyImgs.length) {
           item.applyImgs = item.applyImgs.toString();
         } else {
-          item.applyImgs = ""
+          item.applyImgs = "";
+        }
+        if(this.int === 1 && item.periodStatus == 2){
+          item.periodStatus = item.periodStatusLine
         }
       });
       if (this.int === 0) {