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

src/views/Marketing/order/offlineOrder/goodsMatch/matchInfoData.vue

@@ -327,7 +327,7 @@ export default {
           });
       }
       this.$api
-        .inquireCourseSubject({ businessId: Number(this.queryData.businessId) })
+        .inquireCourseSubject({ businessId: Number(this.queryData.businessId),status:1 })
         .then((res) => {
           this.$api
             .inquireorderconfiggoodsList({

src/views/Marketing/order/orderList/index.vue

@@ -85,7 +85,15 @@ export default {
           edu: "educationTypeId",
         },
         {
-          prop: "payStatus",
+          prop1: "startTime",
+          prop2: "endTime",
+          placeholder1: "订单开始时间",
+          placeholder2: "订单结束时间",
+          scope: "moreDataPicker",
+          Diszing: true,
+        },
+        {
+          prop: "goodsPayStatus",
           placeholder: "支付状态",
           scope: "select",
           options: [
@@ -101,40 +109,52 @@ export default {
               label: "完全收费",
               value: 3,
             },
+            {
+              label: "免费",
+              value: 4,
+            },
           ],
         },
         {
-          prop: "status",
+          prop: "orderGoodsStatus",
           placeholder: "订单状态",
           scope: "select",
           options: [
             {
-              label: "有效",
+              label: "待支付",
+              value: 0,
+            },
+            {
+              label: "已支付",
               value: 1,
             },
             {
-              label: "无效",
-              value: 0,
+              label: "已退款",
+              value: 2,
+            },
+            {
+              label: "已取消",
+              value: -1,
             },
           ],
         },
         {
-          prop: "refundStatus",
-          placeholder: "退款状态",
+          placeholder: "订单来源",
+          prop: "orderFroms",
           scope: "select",
           options: [
             {
-              label: "退款中",
-              value: 1,
-            },
-            {
-              label: "已退款",
+              label: "祥粤云学堂小程序",
               value: 2,
             },
             {
-              label: "拒绝退款",
+              label: "祥粤云学堂网站",
               value: 3,
             },
+            {
+              label: "祥粤e管证小程序",
+              value: 4,
+            },
           ],
         },
         {
@@ -143,7 +163,6 @@ export default {
         },
       ],
       formData: {
-        orderFroms: "2,3,4",
         goodsType: "",
         pageSize: 10,
         pageNum: 1,
@@ -251,7 +270,7 @@ export default {
           scope: "isOptions",
           options: [
             {
-              label: "关闭",
+              label: "已取消",
               value: -1,
             },
             {
@@ -405,7 +424,7 @@ export default {
       }
       if (int === 2) {
         this.formData = {
-          orderFroms: "2,3,4",
+          orderFroms: "",
           goodsType: "",
           pageSize: 10,
           pageNum: 1,
@@ -414,8 +433,16 @@ export default {
       if (int === 3) {
         this.formData.pageNum = 1;
       }
+      let data = JSON.parse(JSON.stringify(this.formData));
+      if (this.formData.startTime) {
+        data.startTime = data.startTime / 1000;
+      }
+      if (this.formData.endTime) {
+        data.endTime = data.endTime / 1000;
+      }
+      data.orderFroms = data.orderFroms || "2,3,4";
       this.$api
-        .inquireOrderList(this.formData)
+        .inquireOrderList(data)
         .then((res) => {
           this.tableData = res.rows;
           this.total = res.total;