Home Explore Help
Sign In
sunlupeng
/
pointsMall
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

修改

sunny 2 years ago
parent
63d800909f
commit
982698f586
9 changed files with 25 additions and 22 deletions
Split View Show Diff Stats
  1. BIN
      public/favicon.ico
  2. BIN
      public/favicon.png
  3. 2 1
      public/index.html
  4. 14 14
      src/components/AppSidebar.vue
  5. 2 0
      src/main.js
  6. 1 1
      src/router/index.js
  7. 1 1
      src/views/HomeView/EmployeeDynamics.vue
  8. 3 3
      src/views/HomeView/MyCenter.vue
  9. 2 2
      src/views/HomeView/PointsMall.vue

BIN
public/favicon.ico
View File


BIN
public/favicon.png
View File


+ 2 - 1
public/index.html
View File 

@@ -5,7 +5,8 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
 
-    <title><%= htmlWebpackPlugin.options.title %></title>
 
+    <!-- <title><%= htmlWebpackPlugin.options.title %></title> -->
 
+    <title>积分商城</title>
 
   </head>
 
   <body>
 
     <noscript>

+ 14 - 14
src/components/AppSidebar.vue
View File 

@@ -19,13 +19,13 @@ export default {
 
   data() {
 
     return {
 
         sideBarList:[
 
-            {
 
-                value:'employeeDynamics',
 
-                name:'首页',
 
-                path:'/home/employeeDynamics',
 
-                icon:'icon-mall-shouye',
 
-                checked:false,
 
-            },
 
+            // {
 
+            //     value:'employeeDynamics',
 
+            //     name:'首页',
 
+            //     path:'/home/employeeDynamics',
 
+            //     icon:'icon-mall-shouye',
 
+            //     checked:false,
 
+            // },
 
             // {
 
             //     value:'',
 
             //     name:'每日签到',
 
@@ -40,13 +40,13 @@ export default {
 
                 icon:'icon-mall-jifenshangcheng',
 
                 checked:false,
 
             },
 
-            {
 
-                value:'festiveEvents',
 
-                name:'节日活动',
 
-                path:'/home/festiveEvents',
 
-                icon:'icon-mall-huodong',
 
-                checked:false,
 
-            },
 
+            // {
 
+            //     value:'festiveEvents',
 
+            //     name:'节日活动',
 
+            //     path:'/home/festiveEvents',
 
+            //     icon:'icon-mall-huodong',
 
+            //     checked:false,
 
+            // },
 
             {
 
                 value:'welfareList',
 
                 name:'福利领取',

+ 2 - 0
src/main.js
View File 

@@ -6,6 +6,8 @@ import 'element-ui/lib/theme-chalk/index.css';
 
 import './assets/css/global.css';
 
 import './assets/icon/iconfont.css';
 
 import './permission' // permission control
 
+const baseUrl = '';
 
+Vue.prototype.baseUrl = baseUrl;
 
 Vue.config.productionTip = false
 
 Vue.use(ElementUI);
 
 new Vue({

+ 1 - 1
src/router/index.js
View File 

@@ -12,7 +12,7 @@ const routes = [
 
   {
 
     path: '/home',
 
     component: HomeView,
 
-    redirect:'home/employeeDynamics',
 
+    redirect:'home/pointsMall',
 
     children: [
 
       {
 
         path: '/home/employeeDynamics',

+ 1 - 1
src/views/HomeView/EmployeeDynamics.vue
View File 

@@ -1,5 +1,5 @@
 
 <template>
 
     <div class="EmployeeDynamics">
 
-        员工动态
 
+        首页
 
     </div>
 
 </template>

+ 3 - 3
src/views/HomeView/MyCenter.vue
View File 

@@ -2,7 +2,7 @@
 
     <div class="right-wrap">
 
         <div class="myTabs" style="background: #fff;">
 
             <el-tabs style="padding: 0 20px 40px 20px;" v-model="activeName" @tab-click="handleClick">
 
-                <el-tab-pane label="我的积分" name="first">
 
+                <!-- <el-tab-pane label="我的积分" name="first">
 
                     <el-radio-group v-model="firstTabPosition" style="margin-bottom: 30px;">
 
                         <el-radio-button v-for="(item, index) in firstTabsList" :key="index" :label="item.value"
 
                             @click="handleClickFirstTabs(item.value)">
 
@@ -34,7 +34,7 @@
 
 
                     </div>
 
                     <div v-else class="integralRules" v-html="integralRules"></div>
 
-                </el-tab-pane>
 
+                </el-tab-pane> -->
 
                 <el-tab-pane label="我的兑换" name="second">
 
                     <el-radio-group v-model="secondTabPosition" @change="handleClickSecondTabs">
 
                         <el-radio-button v-for="(item, index) in secondTabsList" :key="index" :label="item.value">
 
@@ -186,7 +186,7 @@ export default {
 
             tableData: [],
 
             currentPage: 4,
 
             integralRules: '<p>1. 掘金小铺【公益进展】最新公益活动进展在这里，感谢掘友们的大力支持</p> <p>2. 小铺商品春夏限定4月上新啦</p>',
 
-            activeName: 'first',
 
+            activeName: 'second',
 
         };
 
     },
 
     created() {

+ 2 - 2
src/views/HomeView/PointsMall.vue
View File 

@@ -27,7 +27,7 @@
 
             <el-tabs style="padding: 0 20px 40px 20px;" v-model="activeName" @tab-click="handleClick">
 
                 <el-tab-pane label="积分兑换" name="goodsNotice">
 
                     <div class="list-container">
 
-                        <el-empty v-if="goodsList==null" :image-size="200"></el-empty>
 
+                        <el-empty v-if="goodsList.length==0" :image-size="200"></el-empty>
 
                         <div v-else class="prize-list">
 
                             <div v-for="(item, index) in goodsList" :key="index" class="prize-card prize-item">
 
                                 <div class="img-container">
 
@@ -53,7 +53,7 @@
 
                     </div>
 
                 </el-tab-pane>
 
                 <el-tab-pane label="礼品兑换" name="giftNotice">
 
-                    <el-empty v-if="goodsList==null" :image-size="200"></el-empty>
 
+                    <el-empty v-if="goodsList.length==0" :image-size="200"></el-empty>
 
                     <div v-else>
 
                         <div class="tab-list">
 
                             <div :class="{ 'tab': true, 'checked': item.checked }" v-for="(item) in choseList" :key="item.index"