flx:学时冲突列表

src/utils/request.js

@@ -15,7 +15,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 /**
  * @remard 测试地址
  */
-export const baseURL = 'http://192.168.1.24:5030/'
+export const baseURL = 'http://192.168.1.222:5030/'
 export const BASE_IMG_URL = 'https://file-dev.xyyxt.net'
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分

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

@@ -81,7 +81,7 @@ export default {
           edu: "educationTypeId",
         },
         {
-          prop: "payStatus",
+          prop: "goodsPayStatus",
           placeholder: "支付状态",
           scope: "select",
           options: [
@@ -97,6 +97,10 @@ export default {
               label: "完全收费",
               value: 3,
             },
+            {
+              label: "免费",
+              value: 4,
+            },
           ],
         },
         {