Merge branch 'feature-2.0' into 'Dev'

add:finish 1.2

See merge request crowd-2019/crowd-test-service-front!55

package.json

@@ -18,6 +18,7 @@
     "element-ui": "^2.11.0",
     "font-awesome": "^4.7.0",
     "mockjs": "^1.0.1-beta3",
+    "moment": "^2.27.0",
     "querystring": "^0.2.0",
     "vue": "^2.5.2",
     "vue-router": "^3.0.1",

src/main.js

@@ -8,6 +8,7 @@ import './style/main.scss'
 import {getAuthUrls, getCurrentUser, getRolesPermissions, storageGet, storageSave} from '@/js/index'
 import {notify} from '@/constants/index'
 import store from './store'
+import moment from 'moment'
 import {
   Avatar,
   Badge,
@@ -61,6 +62,7 @@ import {
   Upload,
   Progress
 } from 'element-ui'
+Vue.prototype.$moment = moment
 function getCurrentUserSuccess(res){
 
 }

src/pages/Homepage/HotContest.vue

@@ -7,14 +7,14 @@
     </div>
     <div class="popular-list">
       <el-row class="popular-list-item" v-for="item in competitionList" :key="item.id">
-        <el-col :span="23">
+        <el-col :span="23" @click.native="gotoDetail(item)">
           <img src="../../assets/img/logo-project.png" alt="logo-project" class="pull-left project-logo-img">
           <div style="margin-left: 55px">
             <div class="list-item-title">
               {{item.name}}
             </div>
             <div class="list-item-info">
-              {{item.startTime}}
+              {{$moment(item.startTime).format("YYYY-MM-DD HH:mm:ss")}}
             </div>
           </div>
         </el-col>
@@ -29,9 +29,15 @@
 </template>
 
 <script>
+  import moment from 'moment';
   export default {
     name: 'HotContest',
-    props:['competitionList']
+    props:['competitionList'],
+    methods:{
+      gotoDetail(item){
+        window.open(item.linkUrl)
+      }
+    }
   }
 </script>
 

src/pages/Homepage/HotCrowd.vue

@@ -20,7 +20,7 @@
         </el-col>
         <el-col :span="5">
           <div class="project-people-number">
-            {{item.count}}人
+            {{item.count}}次
           </div>
         </el-col>
       </el-row>

src/pages/Homepage/HotUser.vue

@@ -20,7 +20,7 @@
         </el-col>
         <el-col :span="5">
           <div class="project-people-number">
-            {{item.taskCount}}人
+            {{item.taskCount}}次
           </div>
         </el-col>
       </el-row>

src/pages/Square/SquareCard.vue

@@ -12,7 +12,7 @@
           <span class="card-detail-money">￥{{card.quotedPrice ? card.quotedPrice : card.quotePrice}}</span>
         </el-col>
         <el-col :span="18">
-          <span class="card-detail-info pull-right">14分钟前发布/5人参与</span>
+          <span class="card-detail-info pull-right">{{card.time_interval}}/{{card.joinCount}}人参与</span>
         </el-col>
       </el-row>
     </div>