Merge remote-tracking branch 'origin/seven' into d_ls

src/views/education/marketingCampaignManageMent/marketingActivitiesList/userBoxs.vue

@@ -67,6 +67,10 @@ export default {
       activityId: null, //考试ID
       tableData: [],
       tableSet: [
+        {
+          label: "用户手机号码",
+          prop: "userPhone",
+        },
         {
           label: "用户名称",
           prop: "userName",
@@ -85,13 +89,9 @@ export default {
           label: "报考专业",
           prop: "mockMajorName",
         },
-        {
-          label: "用户手机号码",
-          prop: "userPhone",
-        },
         {
           label: "报考科目",
-          prop: "userMajors",
+          prop: "mockSubjectNames",
         },
       ],
       total: 0,
@@ -117,8 +117,7 @@ export default {
     },
     exportUserList() {
       this.$api.exportsystemexamactivity(this.activityId).then((res) => {
-        let url =
-          baseUrls.baseURL + "common/download?fileName=" + res.msg;
+        let url = baseUrls.baseURL + "common/download?fileName=" + res.msg;
         let link = document.createElement("a");
         let fileName = "导入模板" + ".xlsx";
         document.body.appendChild(link);