解决冲突

src/components/task/Task.vue

@@ -82,8 +82,11 @@
                 <el-tab-pane :label="resourceType[2]" name="2"></el-tab-pane>
               </el-tabs>
             </el-form-item>
-            <el-form-item label="领取人数" prop="contactPhone"
-                          v-if="isModifyMode&&task.resource !== '0' && currType.type===0">
+
+            <el-form-item v-if="!isModifyMode && task.resource==0 && showBD" label="接包人员/机构" prop="agencyName" style="width: 700px;">
+              <span>{{task.agencyName}}</span>
+            </el-form-item>
+            <el-form-item label="领取人数" prop="contactPhone" v-if="isModifyMode&&task.resource !== '0' && currType.type===0">
               <el-input-number v-model="task.participantCount" :min="1" :max="1000" label="领取人数"></el-input-number>
             </el-form-item>
             <el-form-item label="领取人数" prop="contactPhone"
@@ -372,6 +375,7 @@ export default {
       wordCloud: [],
       task: {
         agencyId: '',
+        agencyName: '',
         status: '',
         name: '',
         desc: '',
@@ -539,8 +543,6 @@ export default {
       }
     },
     init() {
-      console.log("this.featureTaskRecommend " + this.featureTaskRecommend);
-      console.log("this.taskRecommendUrl " + this.taskRecommendUrl);
       this.taskId = this.$route.params.taskId
       this.projectId = this.$route.params.projectId
       this.setUserInfo()
@@ -654,6 +656,7 @@ export default {
       this.task.institution = res.crowdTaskVO.institution
       this.task.datetime = new Date(res.crowdTaskVO.datetime)
       this.task.quotePrice = res.crowdTaskVO.quotePrice
+      this.task.agencyName = res.crowdTaskVO.agencyName
       this.task.acceptedCount = res.crowdTaskVO.acceptedCount
       this.task.participantCount = res.crowdTaskVO.participantCount
       this.task.fixedPrice = res.crowdTaskVO.fixedPrice

src/pages/Square/PopularProject.vue

@@ -55,7 +55,7 @@
         }
       },
       goToMore() {
-        if (!this.isLogin) {
+        if (storageGet('user') == null) {
           notify('warning', '请登录后访问');
           return;
         }
@@ -65,7 +65,7 @@
         })
       },
       goToProjectDetail(id) {
-        if (!this.isLogin) {
+        if (storageGet('user') == null) {
           notify('warning', '请登录后访问');
           return;
         }

src/pages/Square/PopularTask.vue

@@ -49,7 +49,7 @@
         }
       },
       goToMore() {
-        if (!this.isLogin) {
+        if (storageGet('user') == null) {
           notify('warning', '请登录后访问');
           return;
         }
@@ -59,7 +59,7 @@
         })
       },
       goToTaskDetail(projectId, id) {
-        if (!this.isLogin) {
+        if (storageGet('user') == null) {
           notify('warning', '请登录后访问');
           return;
         }