Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into dev

src/components/tableList.vue

@@ -198,14 +198,7 @@
                 ? "已删除"
                 : "未知"
             }}</span
-          >
-          <span v-else-if="item.scope === 'hasTime'">{{
-            Number(scope.row[item.prop]) === 1
-              ? "有效"
-              : Number(scope.row[item.prop]) === 0
-              ? "无效"
-              : "未知"
-          }}</span>
+          > 
           <div v-else-if="item.scope === 'slot'">
             <slot :name="item.slotName" :scope="scope"></slot>
           </div>
@@ -216,15 +209,6 @@
               ? "未发布"
               : "未知"
           }}</span>
-          <span v-else-if="item.scope === 'sectionTypes'">{{
-            Number(scope.row[item.prop]) === 2
-              ? "录播"
-              : Number(scope.row[item.prop]) === 1
-              ? "直播"
-              : Number(scope.row[item.prop]) === 3
-              ? "回放"
-              : "未知"
-          }}</span>
           <span v-else-if="item.scope === 'getShops'">
             {{
               scope.row["goodsCode"] +
@@ -316,15 +300,6 @@
           >
             {{ `${scope.row[item.prop]} / ${scope.row[item.prop1]}` }}
           </span>
-          <span v-else-if="item.scope === 'sectionTypesTTT'">{{
-            Number(scope.row[item.prop]) === 1
-              ? "录播"
-              : Number(scope.row[item.prop]) === 2
-              ? "直播"
-              : Number(scope.row[item.prop]) === 3
-              ? "回放"
-              : ""
-          }}</span>
           <span v-else-if="item.scope === 'liveAndUrl'">{{
             scope.row[item.prop] == 2
               ? scope.row[item.prop2]

src/utils/request.js

@@ -9,7 +9,7 @@ import { paramMate } from "@/utils/common";
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 export const baseURL = process.env.VUE_APP_BASE_API
-// export const baseURL = 'https://cloud.xyyxt.net/'
+// export const baseURL = 'http://192.168.1.7:5030/'
 export const BASE_IMG_URL = process.env.VUE_APP_IMG_API
 // export const BASE_IMG_URL = 'https://file.xyyxt.net'
 const service = axios.create({

src/views/Marketing/activitySystem/components/goodsCheck.vue

@@ -199,7 +199,17 @@ export default {
           label: "商品状态",
           prop: "status",
           hidden: true,
-          scope: "hasTime",
+          scope: "isOptions",
+          options: [
+            {
+              label: "有效",
+              value: 1,
+            },
+            {
+              label: "无效",
+              value: 0,
+            },
+          ],
         },
         {
           label: "可售状态",

src/views/Marketing/goods/commodityManageMent/index.vue

@@ -366,8 +366,17 @@ export default {
         {
           label: "商品状态",
           prop: "status",
-          hidden: false,
-          scope: "hasTime",
+          scope: "isOptions",
+          options: [
+            {
+              label: "有效",
+              value: 1,
+            },
+            {
+              label: "无效",
+              value: 0,
+            },
+          ],
         },
         {
           label: "商品有效期",

src/views/Marketing/goods/courseInquiryList/index.vue

@@ -259,7 +259,17 @@ export default {
           label: "商品状态",
           prop: "status",
           hidden: false,
-          scope: "hasTime",
+          scope: "isOptions",
+          options: [
+            {
+              label: "有效",
+              value: 1,
+            },
+            {
+              label: "无效",
+              value: 0,
+            },
+          ],
         },
         {
           label: "学时",

src/views/education/classManageMent/classList/index.vue

@@ -124,7 +124,6 @@ export default {
           prop: "userName",
           placeholder: "请输入学员姓名",
         },
-        
       ],
       formData: {
         status: "0,1",
@@ -224,7 +223,17 @@ export default {
           label: "班级状态",
           prop: "status",
           hidden: false,
-          scope: "hasTime",
+          scope: "isOptions",
+          options: [
+            {
+              label: "有效",
+              value: 1,
+            },
+            {
+              label: "无效",
+              value: 0,
+            },
+          ],
         },
         {
           label: "班级有效期",
@@ -543,4 +552,3 @@ export default {
   }
 }
 </style>
-

src/views/education/classManageMent/otherPlatforms/index.vue

@@ -214,7 +214,17 @@ export default {
           label: "班级状态",
           prop: "status",
           hidden: false,
-          scope: "hasTime",
+          scope: "isOptions",
+          options: [
+            {
+              label: "有效",
+              value: 1,
+            },
+            {
+              label: "无效",
+              value: 0,
+            },
+          ],
         },
         {
           label: "班级有效期",

src/views/resource/videoManagement/festival/index.vue

@@ -59,7 +59,7 @@ import pagination from "@/components/pagination";
 import { sectionBatchDel } from "@/api/resource/videoManagement";
 export default {
   name: "Festival",
-  components: { searchBoxNew, tableList, pagination,batchImportDialoga },
+  components: { searchBoxNew, tableList, pagination, batchImportDialoga },
   data() {
     return {
       dialogDR: false, //导入窗口
@@ -191,7 +191,21 @@ export default {
           label: "节类型",
           prop: "sectionType",
           hidden: true,
-          scope: "sectionTypesTTT",
+          scope: "isOptions",
+          options: [
+            {
+              label: "录播",
+              value: 1,
+            },
+            {
+              label: "直播",
+              value: 2,
+            },
+            {
+              label: "回放",
+              value: 3,
+            },
+          ],
           width: "120px",
         },
         {
@@ -303,7 +317,7 @@ export default {
           pageSize: 10,
           pageNum: 1,
         };
-        this.$refs.tableList.clearMoreActive()
+        this.$refs.tableList.clearMoreActive();
       }
       this.$api
         .inquireCourseSection(this.formData)
@@ -500,4 +514,3 @@ export default {
   }
 }
 </style>
-

src/views/secondBuild/courseList/index.vue

@@ -209,7 +209,17 @@ export default {
           label: "商品状态",
           prop: "status",
           hidden: false,
-          scope: "hasTime",
+          scope: "isOptions",
+          options: [
+            {
+              label: "有效",
+              value: 1,
+            },
+            {
+              label: "无效",
+              value: 0,
+            },
+          ],
         },
         {
           label: "学时",

src/views/secondJian/courseList/index.vue

@@ -211,7 +211,17 @@ export default {
           label: "商品状态",
           prop: "status",
           hidden: false,
-          scope: "hasTime",
+          scope: "isOptions",
+          options: [
+            {
+              label: "有效",
+              value: 1,
+            },
+            {
+              label: "无效",
+              value: 0,
+            },
+          ],
         },
         {
           label: "学时",

src/views/secondSeven/courseList/index.vue

@@ -211,7 +211,17 @@ export default {
           label: "商品状态",
           prop: "status",
           hidden: false,
-          scope: "hasTime",
+          scope: "isOptions",
+          options: [
+            {
+              label: "有效",
+              value: 1,
+            },
+            {
+              label: "无效",
+              value: 0,
+            },
+          ],
         },
         {
           label: "学时",

src/views/secondZao/courseList/index.vue

@@ -211,7 +211,17 @@ export default {
           label: "商品状态",
           prop: "status",
           hidden: false,
-          scope: "hasTime",
+          scope: "isOptions",
+          options: [
+            {
+              label: "有效",
+              value: 1,
+            },
+            {
+              label: "无效",
+              value: 0,
+            },
+          ],
         },
         {
           label: "学时",