Merge remote-tracking branch 'origin/master'

src/views/order/manage/index.vue

@@ -35,34 +35,40 @@ const listPageData = reactive({
             width: '180px'
         },
         {
-            label: '姓名',
+            label: '志愿者姓名',
             prop: 'name',
             type: 'input',
             isSearch: true,
         },
         {
-            label: '手机号',
+            label: '志愿者手机号',
             prop: 'phonenumber',
             type: 'input',
             isSearch: true
         },
         {
-            label: '服务项目',
-            prop: 'businessManagementId',
-            type: 'cascader',
-            isSearch: true,
-            tableProp: 'projectName',
-            options: options,
-            props: { label: 'businessName', value: 'id', checkStrictly:true },
+            label: '用户手机号',
+            prop: 'clientTelephone',
+            type: 'input',
+            isSearch: true
         },
+        // {
+        //     label: '服务项目',
+        //     prop: 'businessManagementId',
+        //     type: 'cascader',
+        //     isSearch: true,
+        //     tableProp: 'projectName',
+        //     options: options,
+        //     props: { label: 'businessName', value: 'id', checkStrictly:true },
+        // },
         {
             label: '项目类别',
-            prop: 'projectTypeName',
-        },
-        {
-            label: '科目',
-            prop: 'projectTypeName',
+            prop: 'businessTierName',
         },
+        // {
+        //     label: '科目',
+        //     prop: 'projectTypeName',
+        // },
         {
             label: '评分',
             prop: 'address',
@@ -84,7 +90,7 @@ const listPageData = reactive({
         {
             label: '平台提成',
             prop: 'skillDescribe',
-        }
+        },
     ],
     searchBtns: [],
     tableApi: list,//接口地址