Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/pc-admin

src/views/activity/edit.vue

@@ -24,7 +24,7 @@
        <el-date-picker v-model="activityQuery.endDate" type="datetime" placeholder="选择日期"/>   
     </el-form-item>
     <el-form-item label="活动地点"  prop="address">
-      <el-input  v-model="activityQuery.address"></el-input>
+      <el-input v-model="activityQuery.address"></el-input>
     </el-form-item>
     <el-form-item label="活动人数" prop="personNum">
       <el-input v-model="activityQuery.personNum" type="number"></el-input>
@@ -90,7 +90,7 @@ export default {
       },
       rules: {
           buildingId: [
-            { required: true, message: '请选择活动区域', trigger: 'change' }
+            { required: true, message: '请选择活动区域', trigger: 'blur' }
           ],
           url: [
             { required: true, message: ' ', trigger: 'change' }
@@ -99,16 +99,16 @@ export default {
             { required: true, message: '请输入活动标题', trigger: 'blur' },
           ],
           startDate: [
-            { required: true, message: '请选择日期', trigger: 'change' }
+            { required: true, message: '请选择日期', trigger: 'blur' }
           ],
           endDate: [
             { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
           ],
           address: [
-            {  required: true, message: '请输入活动地点', trigger: 'change' }
+            {  required: true, message: '请输入活动地点', trigger: 'blur' }
           ],
           personNum: [
-            { required: true, message: '请输入活动人数', trigger: 'change' }
+            { required: true, message: '请输入活动人数', trigger: 'blur' }
           ],
           desc: [
             { required: true, message: ' ', trigger: 'blur' }

src/views/activity/list.vue

@@ -65,11 +65,10 @@
       fixed="right"
       label="操作">
       <template slot-scope="scope">
-        <!-- <el-button type="text" @click="toDetail(scope.row)" size="small">{{scope.row.status == 1?'停用':'启用'}}</el-button> -->
-         <el-button type="text" @click="getSignList(scope.row.dynamicId)" size="small" v-if="scope.row.isEnlist == '1' || scope.row.isEnlist === '2'">报名记录</el-button>
-         <el-button type="text" @click="toDetail(scope.row.dynamicId)" size="small" v-if="scope.row.isEnlist == '0'">编辑</el-button>
-        <el-button type="text" @click="finish(scope.row.dynamicId)" size="small" v-if="scope.row.isEnlist == '1'">结束活动</el-button>
-        <el-button type="text" @click="top(scope.row.dynamicId)" size="small">置顶</el-button>
+        <el-button type="text" @click="getSignList(scope.row.dynamicId)" size="small" v-if="scope.row.isEnlist == '1' || scope.row.isEnlist === '2'">报名记录</el-button>
+        <el-button type="text" @click="toDetail(scope.row.dynamicId)" size="small">编辑</el-button>
+        <el-button type="text" @click="finish(scope.row.dynamicId)" size="small">结束活动</el-button>
+        <!-- <el-button type="text" @click="top(scope.row.dynamicId)" size="small">置顶</el-button> -->
       </template>
     </el-table-column>
   </el-table>
@@ -163,14 +162,14 @@ export default {
         });
     },
     top(id){
-          this.filterData.dynamicId = id
-          this.filterData.top = 1
-          this.finishActivity(
-          JSON.stringify(this.filterData)
-        ).then((res) => {
-           this.getList();
-          this.getBuildList()   
-        })  
+        //   this.filterData.dynamicId = id
+        //   this.filterData.top = 1
+        //   this.finishActivity(
+        //   JSON.stringify(this.filterData)
+        // ).then((res) => {
+        //    this.getList();
+        //   this.getBuildList()   
+        // })
     },
     addDynamic() {
       this.$router.push({ name: "activity-add" });

src/views/index.js

@@ -39,35 +39,6 @@ const pages = [
       },
     ]
   },
-  {
-    path: 'project',
-    name: 'project',
-    component: () => import('./index.vue'),
-    meta: {
-      menuShow: true,
-      title: '项目管理',
-    },
-    children: [
-      {
-        path: 'project',
-        name: 'project.list',
-        component: () => import('./project/list.vue'),
-        meta: {
-          menuShow: true,
-          title: '项目列表',
-        },
-      },
-      {
-        path: 'project/edit',
-        name: 'projectedit',
-        component: () => import('./project/edit.vue'),
-        meta: {
-          menuShow: false,
-          title: '项目编辑',
-        },
-      },
-    ]
-  },
   {
     path: 'activity',
     name: 'activity',
@@ -124,24 +95,6 @@ const pages = [
       title: '楼盘设置',
     },
     children: [
-      {
-        path: 'dynamic',
-        name: 'dynamiclist',
-        component: () => import('./dynamic/list.vue'),
-        meta: {
-          menuShow: true,
-          title: '项目动态列表',
-        },
-      },
-      {
-        path: 'dynamic/edit',
-        name: 'dynamicedit',
-        component: () => import('./dynamic/edit.vue'),
-        meta: {
-          menuShow: false,
-          title: '项目动态编辑',
-        },
-      },
       {
         path: 'buildinglist',
         name: 'buildinglist',