..

src/components/Mine.vue

@@ -76,149 +76,24 @@ export default {
   components: {TaskItem, ProjectItem},
   data () {
     return {
-      unFinishedTaskList: [
-        {
-          id: 0,
-          coverImgUrl: 'http://www.mooctest.net/assets/img/mooctest.png',
-          projectId: 1123,
-          title: '发送群文件测试',
-          platform: [0, 1],
-          description: '任务描述文字xxxx',
-          price: '30',
-          serviceType: 1,
-          participantNum: 30,
-          status: 0
-        },
-        {
-          id: 1,
-          coverImgUrl: 'http://www.mooctest.net/assets/img/mooctest.png',
-          projectId: 1123,
-          title: '多人聊天发送文件测试',
-          platform: [0],
-          description: '任务描述文字xxxx',
-          price: '10',
-          serviceType: 0,
-          participantNum: 0,
-          status: 1
-        },
-        {
-          id: 2,
-          coverImgUrl: 'http://www.mooctest.net/assets/img/mooctest.png',
-          projectId: 1123,
-          title: '浏览器波洞星球',
-          platform: [1],
-          description: '任务描述文字xxxx',
-          price: '10',
-          serviceType: 2,
-          participantNum: 21,
-          status: 0
-        },
-        {
-          id: 3,
-          coverImgUrl: 'http://www.mooctest.net/assets/img/mooctest.png',
-          projectId: 1123,
-          title: '举报支持选择聊天记录（安全）',
-          platform: [0, 1, 2],
-          description: '任务描述文字xxxx',
-          price: '0',
-          serviceType: 1,
-          participantNum: 1,
-          status: 1
-        },
-      ],
-      finishedTaskList: [
-        {
-          id: 0,
-          coverImgUrl: 'http://www.mooctest.net/assets/img/mooctest.png',
-          projectId: 1123,
-          title: '发送群文件测试',
-          platform: [0, 1],
-          description: '任务描述文字xxxx',
-          price: '30',
-          serviceType: 1,
-          participantNum: 30,
-          status: 0
-        },
-        {
-          id: 1,
-          coverImgUrl: 'http://www.mooctest.net/assets/img/mooctest.png',
-          projectId: 1123,
-          title: '多人聊天发送文件测试',
-          platform: [0],
-          description: '任务描述文字xxxx',
-          price: '10',
-          serviceType: 0,
-          participantNum: 0,
-          status: 1
-        },
-        {
-          id: 2,
-          coverImgUrl: 'http://www.mooctest.net/assets/img/mooctest.png',
-          projectId: 1123,
-          title: '浏览器波洞星球',
-          platform: [1],
-          description: '任务描述文字xxxx',
-          price: '10',
-          serviceType: 2,
-          participantNum: 21,
-          status: 0
-        },
-        {
-          id: 3,
-          coverImgUrl: 'http://www.mooctest.net/assets/img/mooctest.png',
-          projectId: 1123,
-          title: '举报支持选择聊天记录（安全）',
-          platform: [0, 1, 2],
-          description: '任务描述文字xxxx',
-          price: '0',
-          serviceType: 1,
-          participantNum: 1,
-          status: 1
-        },
-      ],
-      appliedProjectList: [
-        {
-          id: 1,
-          code: '27382hdsjkfdskfK',
-          name: '多人聊天发送文件测试',
-          platform: [0],
-          description: '任务描述文字xxxx',
-          price: '10'
-        },
-        {
-          id: 2,
-          code: 'jzlk9dfsndfsmd ',
-          name: '多人聊天发送文件测试',
-          platform: [0, 1],
-          description: '任务描述文字xxxx',
-          price: '90'
-        },
-        {
-          id: 3,
-          code: '437849sdbsjbsf',
-          name: '多人聊天发送文件测试',
-          platform: [1, 2],
-          description: '任务描述文字xxxx',
-          price: '50'
-        }
-      ],
-      user: {
-        id: 123,
-        name: '李三',
-        score: 100,
-        prestige: 100,
-      }
+      unFinishedTaskList: [],
+      finishedTaskList: [],
+      appliedProjectList: [],
+      user: {}
     }
   },
   methods: {
     loadData () {
-      Http.get(Apis.PAGE.MY_CROWD_TEST_PAGE).then((res)=>{
+      Http.get(Apis.PAGE.MY_CROWD_TEST_PAGE,{}).then((res)=>{
         this.finishedTaskList = res.finishedTaskList
         this.unFinishedTaskList = res.unFinishedTaskList
         this.appliedProjectList = res.appliedProjectList
-        this.user = res.userInfo
+        this.user = res.user
       })
     }
+  },
+  created: function () {
+    this.loadData()
   }
 }
 </script>

src/components/commons/TaskItem.vue

@@ -32,26 +32,29 @@ export default {
       serviceType: ServiceType[this.task.serviceType],
       platformType: []
     }
-},
-mounted()
-{
-  this.taskStatus = TaskStatus[this.taskTable.status]
-  this.serviceType = ServiceType[this.taskTable.serviceType]
-  let plats = []
-  for (let i in this.taskTable.platform) {
-    plats.push(PlatformType[i])
+  },
+  mounted () {
+    this.taskStatus = TaskStatus[this.taskTable.status]
+    this.serviceType = ServiceType[this.taskTable.serviceType]
+    let plats = []
+    for (let i in this.taskTable.platform) {
+      plats.push(PlatformType[i])
+    }
+    this.platformType = plats
+    //console.log(this.platformType)
   }
-  this.platformType = plats
-  //console.log(this.platformType)
-}
-,
-methods:{
-  goToTaskDetail(projectId, id)
-  {
-    this.$router.push({name: 'Task', params: {projectId: projectId, taskId: id}})
+  ,
+  methods: {
+    goToTaskDetail (projectId, id) {
+      this.$router.push({name: 'Task', params: {projectId: projectId, taskId: id}})
+    }
+  },
+  watch: {
+    task () {
+      this.taskTable = this.task
+    }
   }
 }
-}
 
 </script>
 

src/js/api.js

@@ -1,25 +1,24 @@
 export default {
-  API: '/api/',
   PROJECT: {
-    CREATE_PROJECT_SUBMIT: this.API + 'project/',
-    UPDATE_PROJECT_SUBMIT: this.API + 'project/',
-    CREATE_ANALYSE_DEMAND_SUBMIT: this.API + 'project/analyseDemand/',
+    CREATE_PROJECT_SUBMIT: '/api/project/',
+    UPDATE_PROJECT_SUBMIT: '/api/project/',
+    CREATE_ANALYSE_DEMAND_SUBMIT: '/api/project/analyseDemand/',
   },
   TASK: {
-    CREATE_TASK_SUBMIT: this.API + 'task/',
-    UPDATE_TASK_SUBMIT: this.API + 'task/'
+    CREATE_TASK_SUBMIT: '/api/task/',
+    UPDATE_TASK_SUBMIT: '/api/task/'
   },
   REPORT: {
-    CREATE_REPORT_SUBMIT: this.API + 'report/',
-    UPDATE_REPORT_SUBMIT: this.API + 'report/',
+    CREATE_REPORT_SUBMIT: '/api/report/',
+    UPDATE_REPORT_SUBMIT: '/api/report/',
   },
   USER: {},
   PAGE: {
     HOME_PAGE: '/api/page/home/',
-    SQUARE_PAGE: this.API + 'page/square/',
-    MY_CROWD_TEST_PAGE: this.API + 'page/myCrowdTest/',
-    TASK_DETAIL_PAGE: this.API + 'page/taskDetail/{taskId}/',
-    PROJECT_DETAIL_PAGE: this.API + 'page/projectDetail/{projectId}/',
-    REPORT_DETAIL_PAGE: this.API + 'page/reportDetail/{reportId}/',
+    SQUARE_PAGE: '/api/page/square/',
+    MY_CROWD_TEST_PAGE: '/api/page/myCrowdTest/',
+    TASK_DETAIL_PAGE: '/api/page/taskDetail/{taskId}/',
+    PROJECT_DETAIL_PAGE: '/api/page/projectDetail/{projectId}/',
+    REPORT_DETAIL_PAGE: '/api/page/reportDetail/{reportId}/',
   }
 }

src/mock.js

@@ -1,6 +1,7 @@
 // 引入mockjs
 const Mock = require('mockjs')
-const Apis = require('./js/api')
+import Apis from './js/api.js'
+//const Apis = require('./js/api')
 const createAnalyseDemandMock = require('./mock/createAnalyseDemandMock')
 const createProjectMock = require('./mock/createProjectMock')
 const createReportMock = require('./mock/createReportMock')
@@ -14,17 +15,18 @@ const getSquarePageMock = require('./mock/getSquarePageMock')
 const updateProjectMock = require('./mock/updateProjectMock')
 const updateTaskMock = require('./mock/updateTaskMock')
 const updateReportMock = require('./mock/updateReportMock')
-// Mock.mock( url, post/get , 返回的数据)；
-// Mock.mock(Apis.PROJECT.CREATE_ANALYSE_DEMAND_SUBMIT, 'post', createAnalyseDemandMock.data)
-// Mock.mock(Apis.PROJECT.CREATE_PROJECT_SUBMIT, 'post', createProjectMock.data)
-// Mock.mock(Apis.REPORT.CREATE_REPORT_SUBMIT, 'post', createReportMock.data)
-// Mock.mock(Apis.TASK.CREATE_TASK_SUBMIT, 'post', createTaskMock.data)
-Mock.mock('/api/page/home/', 'get', getHomePageMock.data)
-// Mock.mock(Apis.PAGE.SQUARE_PAGE, 'get', getSquarePageMock.data)
-// Mock.mock(Apis.PAGE.PROJECT_DETAIL_PAGE, 'get', getProjectDetailMock.data)
-// Mock.mock(Apis.PAGE.REPORT_DETAIL_PAGE, 'get', getReportDetailMock.data)
-// Mock.mock(Apis.PAGE.TASK_DETAIL_PAGE, 'get', getTaskDetailMock.data)
-// Mock.mock(Apis.PAGE.MY_CROWD_TEST_PAGE, 'get', getMyCrowdTestMock.data)
-// Mock.mock(Apis.PROJECT.UPDATE_PROJECT_SUBMIT, 'put', updateProjectMock.data)
-// Mock.mock(Apis.REPORT.UPDATE_REPORT_SUBMIT, 'put', updateReportMock.data)
-// Mock.mock(Apis.TASK.UPDATE_TASK_SUBMIT, 'put', updateTaskMock.data)
+
+//Mock.mock( url, post/get , 返回的数据)；
+Mock.mock(Apis.PROJECT.CREATE_ANALYSE_DEMAND_SUBMIT, 'post', createAnalyseDemandMock.data)
+Mock.mock(Apis.PROJECT.CREATE_PROJECT_SUBMIT, 'post', createProjectMock.data)
+Mock.mock(Apis.REPORT.CREATE_REPORT_SUBMIT, 'post', createReportMock.data)
+Mock.mock(Apis.TASK.CREATE_TASK_SUBMIT, 'post', createTaskMock.data)
+Mock.mock(Apis.PAGE.HOME_PAGE, 'get', getHomePageMock.data)
+Mock.mock(Apis.PAGE.SQUARE_PAGE, 'get', getSquarePageMock.data)
+Mock.mock(Apis.PAGE.PROJECT_DETAIL_PAGE, 'get', getProjectDetailMock.data)
+Mock.mock(Apis.PAGE.REPORT_DETAIL_PAGE, 'get', getReportDetailMock.data)
+Mock.mock(Apis.PAGE.TASK_DETAIL_PAGE, 'get', getTaskDetailMock.data)
+Mock.mock(Apis.PAGE.MY_CROWD_TEST_PAGE, 'get', getMyCrowdTestMock.data)
+Mock.mock(Apis.PROJECT.UPDATE_PROJECT_SUBMIT, 'put', updateProjectMock.data)
+Mock.mock(Apis.REPORT.UPDATE_REPORT_SUBMIT, 'put', updateReportMock.data)
+Mock.mock(Apis.TASK.UPDATE_TASK_SUBMIT, 'put', updateTaskMock.data)

src/mock/getMyCrowdTestMock.js

@@ -1,100 +1,136 @@
 var Mock = require('mockjs')
 var data = Mock.mock({
-  //未完成任务列表
-  'unFinishedTaskList': [
+  unFinishedTaskList: [
     {
-      //任务id
-      'id': 0,
-      //任务封面图片
-      'coverImgUrl': 'http://www.mooctest.net/assets/img/mooctest.png',
-      //任务所属项目id
-      'projectId': 1123,
-      //任务标题
-      'title': '发送群文件测试',
-      //任务平台
-      //任务所属项目平台
-      // 0: "IOS", //ios
-      // 1: "ANDROID",  //android
-      // 2: "WEB"      //web
-      'platform': [0, 1],
-      //任务描述
-      'description': '任务描述文字xxxx',
-      //任务定价
-      'price': '30',
-      //任务服务类型
-      // 0: "接口测试",
-      // 1: "安全漏洞扫描",
-      // 2: "风险评估服务",
-      // 3: "源代码安全审计服务",
-      // 4: "功能测试服务",
-      // 5: "性能测试",
-      // 6: "功能和易用性测试",
-      'serviceType': 1,
-      'participantNum': 30,
-      'status': 0
+      id: 0,
+      coverImgUrl: 'http://www.mooctest.net/assets/img/mooctest.png',
+      projectId: 1123,
+      title: '发送群文件测试',
+      platform: [0, 1],
+      description: '任务描述文字xxxx',
+      price: '30',
+      serviceType: 1,
+      participantNum: 30,
+      status: 0
     },
     {
-      'id': 1,
-      'coverImgUrl': 'http://www.mooctest.net/assets/img/mooctest.png',
-      'projectId': 1123,
-      'title': '多人聊天发送文件测试',
-      'platform': [0],
-      'description': '任务描述文字xxxx',
-      'price': '10',
-      'serviceType': 0,
-      'participantNum': 0,
-      'status': 1
-    }
+      id: 1,
+      coverImgUrl: 'http://www.mooctest.net/assets/img/mooctest.png',
+      projectId: 1123,
+      title: '多人聊天发送文件测试',
+      platform: [0],
+      description: '任务描述文字xxxx',
+      price: '10',
+      serviceType: 0,
+      participantNum: 0,
+      status: 1
+    },
+    {
+      id: 2,
+      coverImgUrl: 'http://www.mooctest.net/assets/img/mooctest.png',
+      projectId: 1123,
+      title: '浏览器波洞星球',
+      platform: [1],
+      description: '任务描述文字xxxx',
+      price: '10',
+      serviceType: 2,
+      participantNum: 21,
+      status: 0
+    },
+    {
+      id: 3,
+      coverImgUrl: 'http://www.mooctest.net/assets/img/mooctest.png',
+      projectId: 1123,
+      title: '举报支持选择聊天记录（安全）',
+      platform: [0, 1, 2],
+      description: '任务描述文字xxxx',
+      price: '0',
+      serviceType: 1,
+      participantNum: 1,
+      status: 1
+    },
   ],
-  'finishedTaskList': [
+  finishedTaskList: [
     {
-      'id': 0,
-      'coverImgUrl': 'http://www.mooctest.net/assets/img/mooctest.png',
-      'projectId': 1123,
-      'title': '发送群文件测试',
-      'platform': [0, 1],
-      'description': '任务描述文字xxxx',
-      'price': '30',
-      'serviceType': 1,
-      'participantNum': 30,
-      'status': 0
+      id: 0,
+      coverImgUrl: 'http://www.mooctest.net/assets/img/mooctest.png',
+      projectId: 1123,
+      title: '发送群文件测试',
+      platform: [0, 1],
+      description: '任务描述文字xxxx',
+      price: '30',
+      serviceType: 1,
+      participantNum: 30,
+      status: 0
     },
     {
-      'id': 1,
-      'coverImgUrl': 'http://www.mooctest.net/assets/img/mooctest.png',
-      'projectId': 1123,
-      'title': '多人聊天发送文件测试',
-      'platform': [0],
-      'description': '任务描述文字xxxx',
-      'price': '10',
-      'serviceType': 0,
-      'participantNum': 0,
-      'status': 1
-    }
+      id: 1,
+      coverImgUrl: 'http://www.mooctest.net/assets/img/mooctest.png',
+      projectId: 1123,
+      title: '多人聊天发送文件测试',
+      platform: [0],
+      description: '任务描述文字xxxx',
+      price: '10',
+      serviceType: 0,
+      participantNum: 0,
+      status: 1
+    },
+    {
+      id: 2,
+      coverImgUrl: 'http://www.mooctest.net/assets/img/mooctest.png',
+      projectId: 1123,
+      title: '浏览器波洞星球',
+      platform: [1],
+      description: '任务描述文字xxxx',
+      price: '10',
+      serviceType: 2,
+      participantNum: 21,
+      status: 0
+    },
+    {
+      id: 3,
+      coverImgUrl: 'http://www.mooctest.net/assets/img/mooctest.png',
+      projectId: 1123,
+      title: '举报支持选择聊天记录（安全）',
+      platform: [0, 1, 2],
+      description: '任务描述文字xxxx',
+      price: '0',
+      serviceType: 1,
+      participantNum: 1,
+      status: 1
+    },
   ],
-  'appliedProjectList': [
+  appliedProjectList: [
+    {
+      id: 1,
+      code: '27382hdsjkfdskfK',
+      name: '多人聊天发送文件测试',
+      platform: [0],
+      description: '任务描述文字xxxx',
+      price: '10'
+    },
     {
-      'id': 1,
-      'code': '27382hdsjkfdskfK',
-      'name': '多人聊天发送文件测试',
-      'platform': [0],
-      'description': '任务描述文字xxxx',
-      'price': '10'
+      id: 2,
+      code: 'jzlk9dfsndfsmd ',
+      name: '多人聊天发送文件测试',
+      platform: [0, 1],
+      description: '任务描述文字xxxx',
+      price: '90'
     },
     {
-      'id': 2,
-      'code': 'jzlk9dfsndfsmd ',
-      'name': '多人聊天发送文件测试',
-      'platform': [0, 1],
-      'description': '任务描述文字xxxx',
-      'price': '90'
+      id: 3,
+      code: '437849sdbsjbsf',
+      name: '多人聊天发送文件测试',
+      platform: [1, 2],
+      description: '任务描述文字xxxx',
+      price: '50'
     }
   ],
-  'userInfo': {
-    'id': 123,
-    'name': '李三',
-    'score': 100,
-    'prestige': 100
+  user: {
+    id: 123,
+    name: '李三',
+    score: 100,
+    prestige: 100,
   }
 })