Merge branch 'master' of http://git.cc-lotus.info/count/webnew-count

src/layout/index/dynamic.vue

@@ -1,98 +1,34 @@
 <template>
   <div id="dynamic">
-    <el-col :span="24" class="maintoplefttitle"> </el-col>
-    <el-col :span="24">
-      <el-col :span="12" class="leftcontext">
+    <el-row>
+      <el-col :span="24">
         统计图
       </el-col>
-    </el-col>
+    </el-row>
   </div>
 </template>
 
 <script>
+import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
   name: 'dynamic',
   props: {},
   components: {},
-  data: () => ({}),
+  data: function() {
+    return {};
+  },
   created() {},
-  computed: {},
   methods: {},
+  computed: {
+    ...mapState(['user']),
+    pageTitle() {
+      return `${this.$route.meta.title}`;
+    },
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
 };
 </script>
 
-<style lang="less" scoped>
-.main .maintopleft .maintoplefttitle {
-  padding: 20px;
-  // border-bottom: 1px dashed #ccc;
-}
-.main .maintopleft .maintoplefttitle span:first-child {
-  font-weight: 1000;
-  padding: 10px 5px 0 0px;
-  font-size: 20px;
-  color: #005293;
-}
-
-.main .maintopleft .maintoplefttitle span:nth-child(2) {
-  font-size: 20px;
-  color: #005293;
-  padding: 0 10px 0 0;
-}
-.main .maintopleft .maintoplefttitle span:nth-child(3) {
-  font-size: 20px;
-  color: #005293;
-  float: right;
-}
-
-.maintopleft .leftcontext {
-  padding: 0 20px 0 20px;
-  font-size: 16px;
-}
-
-.maintopright {
-  height: 300px;
-  background-color: #fff;
-  width: 595px;
-}
-
-.maintopright .leftcontext {
-  padding: 0 20px 0 20px;
-}
-
-.main .maintopright .maintoplefttitle {
-  padding: 20px;
-  // border-bottom: 1px dashed #ccc;
-}
-.main .maintopright .maintoplefttitle span:first-child {
-  font-weight: 1000;
-  padding: 10px 5px 0 0px;
-  font-size: 20px;
-  color: #005293;
-}
-
-.main .maintopright .maintoplefttitle span:nth-child(2) {
-  font-size: 20px;
-  color: #005293;
-  padding: 0 10px 0 0;
-}
-.main .maintopright .maintoplefttitle span:nth-child(3) {
-  font-size: 20px;
-  color: #005293;
-  float: right;
-}
-
-.maintopright .leftcontext {
-  padding: 0 20px 0 20px;
-  font-size: 16px;
-}
-
-.maintopright .leftcontext p {
-  margin: 0;
-  padding: 0;
-}
-
-.maintopright .leftcontext p span:first-child {
-  font-weight: 1000;
-  padding: 5px;
-}
-</style>
+<style lang="less" scoped></style>

src/views/communication/parts/demand.vue

@@ -12,9 +12,7 @@
           <span>{{ item.meta | getDate }}</span>
         </el-col>
       </el-col>
-      <el-col :span="24" class="anniu">
-        <el-button type="primary" v-if="user.type == 3" round @click="$router.push({ path: '/demand/demand' })"> 我要发布</el-button></el-col
-      >
+      <el-col :span="24" class="anniu"> <el-button type="primary" round @click="onclick()"> 我要发布</el-button></el-col>
     </el-col>
   </div>
 </template>
@@ -46,6 +44,19 @@ export default {
     xuqiu(item) {
       this.$router.push({ path: '/demand/index', query: { id: item.id } });
     },
+    async onclick() {
+      if (this.user) {
+        if (this.user.type == '3') {
+          this.$router.push({ path: '/demand/demand' });
+        } else {
+          this.$message.error('您的身份不够请重新登录');
+          this.$router.push({ path: '/login' });
+        }
+      } else {
+        this.$message.error('游客不能发布需求，请登录');
+        this.$router.push({ path: '/login' });
+      }
+    },
   },
   filters: {
     getDate(meta) {