fix

src/components/Mine.vue

@@ -52,8 +52,9 @@
                   style="font-size: 14px;">
             <el-col :span="6" type="flex" align="middle" justify="center">项目图片</el-col>
             <el-col :span="6" type="flex" align="middle" justify="center">项目名称</el-col>
-            <el-col :span="6" type="flex" align="middle" justify="center">应用类型</el-col>
-            <el-col :span="2" type="flex" align="middle" justify="center">项目预算</el-col>
+            <el-col :span="3" type="flex" align="middle" justify="center">应用类型</el-col>
+            <el-col :span="3" type="flex" align="middle" justify="center">项目预算</el-col>
+            <el-col :span="3" type="flex" align="middle" justify="center">参与人数</el-col>
             <el-col :span="4" type="flex" align="middle" justify="center">操作</el-col>
           </el-row>
           <project-item v-if="myProjects != null || myProjects.length > 0"
@@ -70,8 +71,9 @@
                   justify="center" style="font-size: 14px;">
             <el-col :span="6">项目图片</el-col>
             <el-col :span="6">项目名称</el-col>
-            <el-col :span="6">应用类型</el-col>
-            <el-col :span="2">项目预算</el-col>
+            <el-col :span="3">应用类型</el-col>
+            <el-col :span="3">项目预算</el-col>
+            <el-col :span="3">参与人数</el-col>
             <el-col :span="4">操作</el-col>
           </el-row>
           <span v-if="handlingProjects == null || handlingProjects.length == 0"> 暂无项目 </span>
@@ -89,8 +91,9 @@
                   justify="center" style="font-size: 14px;">
             <el-col :span="6">项目图片</el-col>
             <el-col :span="6">项目名称</el-col>
-            <el-col :span="6">应用类型</el-col>
-            <el-col :span="2">项目预算</el-col>
+            <el-col :span="3">应用类型</el-col>
+            <el-col :span="3">项目预算</el-col>
+            <el-col :span="3">参与人数</el-col>
             <el-col :span="4">操作</el-col>
           </el-row>
           <span v-if="acceptableProjects == null || acceptableProjects.length == 0"> 暂无项目 </span>

src/components/project/Project.vue

@@ -25,7 +25,6 @@
               <el-input v-if="isModifyMode" v-model="project.contactPhone" placeholder="请输入联系人电话"></el-input>
               <span v-if="!isModifyMode">{{project.contactPhone}}</span>
             </el-form-item>
-            aaaaa
             <el-form-item size="small" label="预算" prop="budget">
               <el-input v-if="isModifyMode" type="number" v-model="project.budget">
                 ¥

src/components/report/ProjectReport.vue

@@ -60,7 +60,7 @@
           <span v-if="!isModifyMode">{{report.conclusion}}</span>
         </el-form-item>
         <el-form-item v-if="!isModifyMode">
-          <div class="btn btn-medium btn-info" @click="modifyForm()">修改</div>
+          <div class="btn btn-medium btn-info" @click="modifyForm()"  v-if="operational">修改</div>
           <div class="btn btn-medium" @click="back()">返回</div>
         </el-form-item>
         <el-form-item v-if="isModifyMode">
@@ -101,6 +101,7 @@ export default {
         fileUrl: '',
         conclusion: ''
       },
+        operational:'',
       rules: {
         name: [
           {required: true, message: '任务名称不可为空', trigger: 'blur'},
@@ -233,6 +234,7 @@ export default {
         this.report.fileUrl = res.crowdReportVO.file
         this.report.conclusion = res.crowdReportVO.conclusion
         this.report.target = res.crowdReportVO.target
+          this.operational = res.operational
         this.hideLoading()
         //notify('success', '修改成功')
       }).catch((error) => {

src/components/report/TaskReport.vue

@@ -58,7 +58,7 @@
           <span v-if="!isModifyMode">{{report.conclusion}}</span>
         </el-form-item>
         <el-form-item v-if="!isModifyMode">
-          <div class="btn btn-medium btn-info" @click="modifyForm()">修改</div>
+          <div class="btn btn-medium btn-info" @click="modifyForm()"  v-if="operational">修改</div>
           <div class="btn btn-medium" @click="back()">返回</div>
         </el-form-item>
         <el-form-item v-if="isModifyMode">
@@ -88,6 +88,7 @@ export default {
       projectId: '',
       taskId: '',
       isModifyMode: false,
+        operational: '',
       reportType: [],
       report: {
         name: '',
@@ -239,6 +240,7 @@ export default {
         this.report.conclusion = res.crowdReportVO.conclusion
         this.report.target = res.crowdReportVO.target
         this.report.participantCount = res.crowdReportVO.participantCount
+          this.operational = res.operational
         this.hideLoading()
       }).catch((error) => {
         this.hideLoading()

src/components/task/Task.vue

@@ -28,7 +28,7 @@
         <el-form-item label="测试类型" prop="serviceType">
           <el-radio-group v-if="isModifyMode" v-model="task.serviceType">
             <span v-for="(item,index) in serviceType" :key="index">
-              <el-radio :label="item.code" name="type">{{item.name}}</el-radio>
+              <el-radio :label="item.code" name="serviceType">{{item.name}}</el-radio>
             </span>
           </el-radio-group>
           <span class="badge" v-if="!isModifyMode">{{task.serviceType}}</span>
@@ -314,8 +314,8 @@
             {required: true, message: '请输入任务名称', trigger: 'blur'},
             {min: 5, max: 50, message: '任务名称长度在 5 到 50 个字符', trigger: 'blur'}
           ],
-          type: [
-            {required: true, message: '测试类型不可为空'},
+            serviceType: [
+            {required: true, message: '测试类型不可为空', trigger: 'change'},
           ],
           desc: [{required: false, message: '请填写描述', trigger: 'blur'}],
           //price: [{required: true, message: '请填写价格', trigger: 'blur'}],
@@ -401,7 +401,7 @@
 
       //切换至可编辑页面
       modifyForm() {
-        this.task.serviceType = ''
+        // this.task.serviceType = ''
         this.isModifyMode = true
       },
       //切换至不可编辑页面
@@ -567,6 +567,7 @@
         this.task.requireDocUrl = res.crowdTaskVO.requirementFile,
           this.task.participantCount = res.crowdTaskVO.participantCount
         this.reportList = res.crowdReportVOList
+        this.acceptedUserList = res.acceptedUserList
         this.hideLoading()
         notify('success', '修改成功')
       },
@@ -584,8 +585,10 @@
         }
         formData.append('file', param.file)
         Http.upload(Apis.FILE.REQUIREMENT_FILE.replace('{userId}', this.user.userVO.id), formData, config).then((res) => {
+            notify('success', '上传成功')
           this.uploadRequireDocSuccess(res)
         }).catch((error) => {
+            notify('error', '上传失败:' + error.data)
           this.uploadRequireDocFail(error)
         })
       },

src/pages/Square/PopularProject.vue

@@ -10,7 +10,7 @@
       <el-row class="popular-list-item" v-for="item in hotCrowdTestProjectVOs" :key="item.id">
         <el-col :span="19">
           <img src="../../assets/img/logo-project.png" alt="logo-project" class="pull-left project-logo-img">
-          <div style="margin-left: 55px">
+          <div style="margin-left: 55px; cursor: pointer;"  @click="goToProjectDetail(item.code)">
             <div class="list-item-title">
               {{item.name}}
             </div>
@@ -46,6 +46,9 @@
                 params: {type: "project"}
             })
         },
+        goToProjectDetail (id) {
+            this.$router.push({name: 'Project', params: {projectId: id}})
+        }
     }
   }
 </script>

src/pages/Square/PopularTask.vue

@@ -9,8 +9,8 @@
       <el-row class="popular-list-item" v-for="item in hotCrowdTaskVOs" :key="item.id">
         <el-col :span="19">
           <img src="../../assets/img/logo-blue.png" alt="logo-project" class="pull-left project-logo-img">
-          <div style="margin-left: 55px">
-            <div class="list-item-title">
+          <div style="margin-left: 55px; cursor: pointer;"  @click="goToTaskDetail(item.projectId,item.code)">
+            <div class="list-item-title" >
               {{item.title}}
             </div>
             <div class="list-item-info">
@@ -43,6 +43,9 @@
                   params: {type: "task"}
               })
           },
+          goToTaskDetail (projectId, id) {
+              this.$router.push({name: 'Task', params: {projectId: projectId, taskId: id}})
+          },
       }
   }
 </script>

src/pages/UserCenter/ReBindingMobile.vue

@@ -123,49 +123,51 @@
 
       },
       getVerifyCode() {
-        if (this.active === 0) {
-          //1.验证原手机
-          let params = {
-            id: this.user.id,
-            mobile: this.phoneBindingForm.phone
-          }
-          Http.put('/api/verify/mobile', params).then((res) => {
-            this.hasVerifyCode = true;
-            let _this = this;
-            let codeTimer = setInterval(function () {
-              if (_this.codeTime > 0) {
-                _this.codeTime--;
-              } else {
-                clearInterval(codeTimer);
-                _this.hasVerifyCode = false;
-                this.codeTime = 10;
+          if (this.active === 0) {
+              //1.验证原手机
+              let params = {
+                  id: this.user.id,
+                  mobile: this.phoneBindingForm.phone
               }
-            }, 1000)
-          }).catch(err => {
-            notify('error', '获取验证码失败:' + err.data);
-          })
-        } else {
-          //2.验证新手机
-          let params = {
-            id: this.user.id,
-            mobile: this.phoneBindingForm.newPhone
-          }
-          Http.put('/api/verify/mobile', params).then((res) => {
-            this.hasVerifyCode = true;
-            let _this = this;
-            let codeTimer = setInterval(function () {
-              if (_this.codeTime > 0) {
-                _this.codeTime--;
-              } else {
-                clearInterval(codeTimer);
-                _this.hasVerifyCode = false;
-                this.codeTime = 10;
+              Http.put('/api/verify/mobile', params).then((res) => {
+                  this.hasVerifyCode = true;
+                  let _this = this;
+                  let codeTimer = setInterval(function () {
+                      if (_this.codeTime > 0) {
+                          _this.codeTime--;
+                      } else {
+                          clearInterval(codeTimer);
+                          _this.hasVerifyCode = false;
+                          this.codeTime = 10;
+                      }
+                  }, 1000)
+              }).catch(err => {
+                  notify('error', '获取验证码失败:' + err.data);
+              })
+          }else{
+              //2.验证新手机
+              let params = {
+                  id: this.user.id,
+                  mobile: this.phoneBindingForm.newPhone
               }
-            }, 1000)
-          }).catch(err => {
-            notify('error', '获取验证码失败:' + err.data);
-          })
-        }
+              console.log("手机号：" + this.phoneBindingForm.newPhone);
+              notify("手机号：" + this.phoneBindingForm.newPhone);
+              Http.put('/api/verify/mobile', params).then((res) => {
+                  this.hasVerifyCode = true;
+                  let _this = this;
+                  let codeTimer = setInterval(function () {
+                      if (_this.codeTime > 0) {
+                          _this.codeTime--;
+                      } else {
+                          clearInterval(codeTimer);
+                          _this.hasVerifyCode = false;
+                          this.codeTime = 10;
+                      }
+                  }, 1000)
+              }).catch(err => {
+                  notify('error', '获取验证码失败:' + err.data);
+              })
+          }
       }
 
     },