Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/components/ActivityCenter/ActivityCenter.vue

+<style scoped>
+
+</style>
+
+<template>
+  <el-row class="page_ActivityCenter">
+    <el-col :span="20" :offset="2">
+      <p @click="goUrl('TurnaroundDraw')">抽奖</p>
+    </el-col>
+  </el-row>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      
+    }
+  },
+  mounted () {
+
+  },
+  methods: {
+    goUrl: function (path) {
+      this.$router.push({name: path});
+    }
+  }
+}
+</script>

src/components/global/head.vue

@@ -142,6 +142,7 @@ color:rgba(51,51,51,1);
                                 <el-menu-item index="4" @click="goUrl('PsSystem',false)"><a href="javascript:void(0);">系统管理</a></el-menu-item>
                                 <el-menu-item index="5" @click="goUrl('PsAccBalance',false)"><a href="javascript:void(0);">账户余额</a></el-menu-item>
                                 <el-menu-item index="7" @click="goUrl('PsMyCoupon',false)"><a href="javascript:void(0);">我的优惠券</a></el-menu-item>
+                                <el-menu-item index="8" @click="goUrl('ActivityCenter',false)"><a href="javascript:void(0);">活动中心</a></el-menu-item>
                             </el-menu>
                         </el-col>
                     </el-row>

src/router.js

@@ -195,7 +195,24 @@ export default new Router({
                 title: "机票订单"
               }
             },
-         
+            {
+              path: "/TurnaroundDraw",
+              name: "TurnaroundDraw",
+              component: resolve =>
+                require(["@/components/ActivityCenter/TurnaroundDraw"], resolve),
+              meta: {
+                title: "转盘抽奖"
+              }
+            },
+            {
+              path: "/ActivityCenter",
+              name: "ActivityCenter",
+              component: resolve =>
+                require(["@/components/ActivityCenter/ActivityCenter"], resolve),
+              meta: {
+                title: "活动中心"
+              }
+            },
           ]
         },
         {