0606push

src/Mock/index.js

@@ -171,23 +171,15 @@ let getNavListQuery = function () {
         Memo: '',
         Rs: [
             {
-                clmid: "1",
+                clmid: 1,
                 clmcode: "index",
                 clmname: "系统首页",
                 clmurl: "/",
                 prname: "",
                 show: 3,
-                icon: "el-icon-s-home",
-                Childs: [
-                    {
-                        clmid: "/",
-                        clmcode: "index",
-                        clmname: "系统首页",
-                        clmurl: "/",
-                    },
-                ]
+                icon: "el-icon-s-home"
             },{
-                clmid: "2",
+                clmid: 2,
                 clmurl: "/",
                 clmcode: "member",
                 clmname: "会员管理",
@@ -196,24 +188,24 @@ let getNavListQuery = function () {
                 icon: "el-icon-s-custom",
                 Childs: [
                     {
-                        clmid: "/memberFull",
+                        clmid: 21,
                         clmcode: "memberFull",
                         clmurl: "/memberFull",
                         clmname: "正式会员1",
                     }, {
-                        clmid: "/memberTemporary",
+                        clmid: 22,
                         clmcode: "memberTemporary",
                         clmurl: "/memberTemporary",
                         clmname: "临时会员",
                     }, {
-                        clmid: "/memberCost",
+                        clmid: 23,
                         clmcode: "memberCost",
                         clmurl: "/memberCost",
                         clmname: "会员消费",
                     }
                 ]
             },  {
-                clmid: "3",
+                clmid: 3,
                 clmurl: "/",
                 clmcode: "lesson",
                 clmname: "课程管理",
@@ -222,44 +214,44 @@ let getNavListQuery = function () {
                 icon: "el-icon-school",
                 Childs: [
                     {
-                        clmid: "/classManage",
+                        clmid: 31,
                         clmcode: "classManage",
                         clmurl: "/classManage",
                         clmname: "上课管理",
                     },  {
-                        clmid: "/lessonManage",
+                        clmid: 32,
                         clmcode: "lessonManage",
                         clmurl: "/lessonManage",
                         clmname: "课目管理",
                     }, {
-                        clmid: "/lessonTableTemplate",
+                        clmid: 33,
                         clmcode: "lessonTableTemplate",
                         clmurl: "/lessonTableTemplate",
                         clmname: "课程表模板",
                     }, {
-                        clmid: "/lessonTableManage",
+                        clmid: 34,
                         clmcode: "lessonTableManage",
                         clmurl: "/lessonTableManage",
                         clmname: "课程表管理",
                     }, {
-                        clmid: "/appointManage",
+                        clmid: 35,
                         clmcode: "appointManage",
                         clmurl: "/appointManage",
                         clmname: "预约管理",
                     }, {
-                        clmid: "/appointRecord",
+                        clmid: 36,
                         clmcode: "appointRecord",
                         clmurl: "/appointRecord",
                         clmname: "预约记录",
                     }, {
-                        clmid: "/classInVideo",
+                        clmid: 37,
                         clmcode: "classInVideo",
                         clmurl: "/classInVideo",
                         clmname: "视频上课",
                     }
                 ]
             }, {
-                clmid: "4",
+                clmid: 4,
                 clmurl: "/",
                 clmcode: "assessment",
                 clmname: "运动评估",
@@ -268,39 +260,39 @@ let getNavListQuery = function () {
                 icon: "el-icon-edit",
                 Childs: [
                     {
-                        clmid: "/movementManage",
+                        clmid: 41,
                         clmcode: "movementManage",
                         clmurl: "/movementManage",
                         clmname: "动作管理",
                     }, {
-                        clmid: "/nodeMange",
+                        clmid: 42,
                         clmcode: "nodeMange",
                         clmurl: "/nodeMange",
                         clmname: "节点管理",
                     }, {
-                        clmid: "/actionNode",
+                        clmid: 43,
                         clmcode: "actionNode",
                         clmurl: "/actionNode",
                         clmname: "动作节点",
                     }, {
-                        clmid: "/actionKeyFrame",
+                        clmid: 44,
                         clmcode: "actionKeyFrame",
                         clmurl: "/actionKeyFrame",
                         clmname: "动作关键帧",
                     }, {
-                        clmid: "/lessonAction",
+                        clmid: 45,
                         clmcode: "lessonAction",
                         clmurl: "/lessonAction",
                         clmname: "课程动作",
                     }, {
-                        clmid: "/movementScore",
+                        clmid: 46,
                         clmcode: "movementScore",
                         clmurl: "/movementScore",
                         clmname: "动作评分",
                     }
                 ]
             }, {
-                clmid: "5",
+                clmid: 5,
                 clmurl: "/",
                 clmcode: "heartRate",
                 clmname: "心率管理",
@@ -309,24 +301,24 @@ let getNavListQuery = function () {
                 icon: "el-icon-more",
                 Childs: [
                     {
-                        clmid: "/hrSensor",
+                        clmid: 51,
                         clmcode: "hrSensor",
                         clmurl: "/hrSensor",
                         clmname: "心率设备",
                     }, {
-                        clmid: "/hrSensorLog",
+                        clmid: 52,
                         clmcode: "hrSensorLog",
                         clmurl: "/hrSensorLog",
                         clmname: "心率记录",
                     }, {
-                        clmid: "/demoDevice",
+                        clmid: 53,
                         clmcode: "demoDevice",
                         clmurl: "/demoDevice",
                         clmname: "演示设备",
                     }
                 ]
             }, {
-                clmid: "6",
+                clmid: 6,
                 clmurl: "/",
                 clmcode: "report",
                 clmname: "报表统计",
@@ -335,29 +327,29 @@ let getNavListQuery = function () {
                 icon: "el-icon-s-data",
                 Childs: [
                     {
-                        clmid: "/classHourStatistics",
+                        clmid: 61,
                         clmcode: "classHourStatistics",
                         clmurl: "/classHourStatistics",
                         clmname: "课时统计",
                     }, {
-                        clmid: "/memberStatistics",
+                        clmid: 62,
                         clmcode: "memberStatistics",
                         clmurl: "/memberStatistics",
                         clmname: "会员统计",
                     }, {
-                        clmid: "/appointStatistics",
+                        clmid: 63,
                         clmcode: "appointStatistics",
                         clmurl: "/appointStatistics",
                         clmname: "预约统计",
                     }, {
-                        clmid: "/coachHourStatistics",
+                        clmid: 64,
                         clmcode: "coachHourStatistics",
                         clmurl: "/coachHourStatistics",
                         clmname: "教练课时统计",
                     }
                 ]
             }, {
-                clmid: "7",
+                clmid: 7,
                 clmurl: "/",
                 clmcode: "system",
                 clmname: "系统管理",
@@ -366,34 +358,34 @@ let getNavListQuery = function () {
                 icon: "el-icon-s-tools",
                 Childs: [
                     {
-                        clmid: "/operateLog",
+                        clmid: 71,
                         clmcode: "operateLog",
                         clmurl: "/operateLog",
                         clmname: "操作日志",
                     }, {
-                        clmid: "/personSetting",
+                        clmid: 72,
                         clmcode: "personSetting",
                         clmurl: "/personSetting",
                         clmname: "个人设置",
                     }, {
-                        clmid: "/shopSetting",
+                        clmid: 73,
                         clmcode: "shopSetting",
                         clmurl: "/shopSetting",
                         clmname: "商家设置",
                     }, {
-                        clmid: "/shopAres",
+                        clmid: 74,
                         clmcode: "shopAres",
                         clmurl: "/shopAres",
                         clmname: "商家区域",
                     }, {
-                        clmid: "/shopDevice",
+                        clmid: 75,
                         clmcode: "shopDevice",
                         clmurl: "/shopDevice",
                         clmname: "商家设备",
                     }
                 ]
             }, {
-                clmid: "8",
+                clmid: 8,
                 clmurl: "/",
                 clmcode: "admin",
                 clmname: "总店管理",
@@ -402,27 +394,27 @@ let getNavListQuery = function () {
                 icon: "el-icon-office-building",
                 Childs: [
                     {
-                        clmid: "/adminShopSetting",
+                        clmid: 81,
                         clmcode: "adminShopSetting",
                         clmurl: "/adminShopSetting",
                         clmname: "商家设置",
                     }, {
-                        clmid: "/administrator",
+                        clmid:82,
                         clmcode: "administrator",
                         clmurl: "/administrator",
                         clmname: "管理员管理",
                     }, {
-                        clmid: "/memberCross",
+                        clmid: 83,
                         clmcode: "memberCross",
                         clmurl: "/memberCross",
                         clmname: "跨店会员",
                     }, {
-                        clmid: "/adminShopArea",
+                        clmid: 84,
                         clmcode: "adminShopArea",
                         clmurl: "/adminShopArea",
                         clmname: "商家区域",
                     }, {
-                        clmid: "/groupManage",
+                        clmid:85,
                         clmcode: "groupManage",
                         clmurl: "/groupManage",
                         clmname: "分组管理",

src/components/Headside.vue

@@ -16,19 +16,14 @@
           <span class="customer_serve changeShopBtn" @click="changeShop">切换店铺</span>
         </span>
 
-        <span class="el-dropdown-link customer_serve shopinfo">{{ ShopName }}</span>
-        <span class="el-dropdown-link customer_serve">{{ user.name }}</span>
+        <span class="el-dropdown-link customer_serve shopinfo">{{ shopName }}</span>
+        <span class="el-dropdown-link customer_serve">{{ userName }}</span>
       </ul>
 
       <div class="tabs">
-        <el-tabs v-model="editableTabsValue" type="card" editable @edit="handleTabsEdit" @tab-remove="remove">
-          <el-tab-pane
-              :key="item.name"
-              v-for="(item, index) in editableTabs"
-              :label="item.title"
-              :name="item.name"
-          >
-          </el-tab-pane>
+        <el-tabs v-model="editableTabsValue" type="card" editable @tab-click="handleTabsEdit" @tab-remove="remove">
+          <el-tab-pane v-for="item in editableTabs"
+                       :key="item.name" :label="item.title" :name="item.name"/>
         </el-tabs>
       </div>
     </nav>
@@ -38,19 +33,16 @@
 import axios from "axios";
 import Global from "../Global.js";
 import {
-  DefaultRequest,
-  DefaultReply
+  DefaultRequest
 } from "@/grpc/base_pb";
 
 let qs = require("qs");
 export default {
   data() {
     return {
-      user: {
-        name: '',
-      },
+      userName: '',
+      shopName: localStorage.shopName,
       left_panel_state: true,
-      ShopName: localStorage.shopName,
       // tabs
       editableTabsValue: '',
       editableTabs: [],
@@ -62,6 +54,7 @@ export default {
   watch: {
     tableTabs: {
       handler(newName, oldName) {
+        console.log('handler');
         let that = this;
         that.editableTabs = newName;
       },
@@ -72,7 +65,7 @@ export default {
   mounted() {
     this.left_hide();//默认展开侧边栏
     this.name = localStorage.shopName;
-    this.user.name = localStorage.userName;
+    this.userName = localStorage.userName;
     this.canChange = localStorage.canChange;
     console.log(localStorage.canChange);
   },
@@ -85,43 +78,24 @@ export default {
     },
     //移除顶部菜单标签
     remove(p) {
+      console.log('remove(p)', p);
       let that = this;
-      if (p == 1) {
-        let firstPage = {
-          name: '1',
-          title: '系统首页',
-        };
-        that.editableTabs.push(firstPage);
+      if (this.editableTabs.length == 1) {
         that.$message.error('最后一页咯');
+      } else {
+        this.editableTabs.forEach((tab, index) => {
+          if (tab.clmurl == p) {
+            this.editableTabs.splice(index, 1);
+          }
+        });
       }
     },
-    //切换顶部菜单
+    //切换tab标签
     handleTabsEdit(targetName, action) {
-      if (action === 'add') {
-        let newTabName = ++this.tabIndex + '';
-        this.editableTabs.push({
-          title: 'New Tab',
-          name: newTabName,
-          content: 'New Tab content'
-        });
-        this.editableTabsValue = newTabName;
-      }
-      if (action === 'remove') {
-        let tabs = this.editableTabs;
-        let activeName = this.editableTabsValue;
-        if (activeName === targetName) {
-          tabs.forEach((tab, index) => {
-            if (tab.name === targetName) {
-              let nextTab = tabs[index + 1] || tabs[index - 1];
-              if (nextTab) {
-                activeName = nextTab.name;
-              }
-            }
-          });
-        }
-        this.editableTabsValue = activeName;
-        this.editableTabs = tabs.filter(tab => tab.name !== targetName);
-      }
+      console.log('handleTabsEdit', targetName.paneName, action);
+      this.$router.push({
+        path: targetName.paneName
+      })
     },
     //切换店铺
     changeShop() {
@@ -322,13 +296,13 @@ li {
 }
 
 .tabs {
-  width: 90%;
-  height: 35px;
+  width: 95%;
+  height: 55px;
   margin: 0 auto;
   display: block;
-  margin-top: 40px;
+  padding-top: 40px;
   cursor: pointer;
-  color: white;
+  color: #7fd2d2;
 }
 
 /deep/ .el-tabs__new-tab {
@@ -341,9 +315,9 @@ li {
 }
 
 /deep/ .el-tabs__item {
-  height: 34px;
+  height: 35px;
   color: white;
-  line-height: 34px;
+  line-height: 35px;
 }
 
 /deep/ .el-tabs--card > .el-tabs__header {
@@ -356,7 +330,7 @@ li {
 
   .el-tabs__nav {
     border-color: #0063c9;
-    background-color: #3699FF;
+    background-color: #0092e5;
     border-radius: 0;
   }
 }

src/components/Navside.vue

@@ -1,26 +1,31 @@
 <template>
-  <div :class="NavsideClass">
+  <div :class="NavsClass">
     <div class="logoContainer">
       <img class="logo" src="../assets/img/nav/logo.png"/>
     </div>
-    <el-menu default-active="1" class="el-menu-vertical-demo" @open="handleOpen"
-             @close="handleClose" router :collapse="isCollapse" @select="selectMenu">
+    <el-menu class="el-menu-vertical-demo" @open="handleOpen" @close="handleClose" @select="selectMenu" router :collapse="isCollapse">
+
+      <el-menu-item :index="singleNavi.clmurl" :value = "singleNavi.clmname" v-for="singleNavi in singleNavs" style="margin-left: -20px">
+        <template slot="title">
+          <i :class="singleNavi.icon"></i>
+          <span slot="title">{{ singleNavi.clmname }}</span>
+        </template>
+      </el-menu-item>
+
       <el-submenu :index="nav.clmid" v-for="nav in navs">
         <template slot="title">
           <i :class="nav.icon"></i>
           <span slot="title">{{ nav.clmname }}</span>
         </template>
         <el-menu-item-group v-if="nav.Childs">
-          <el-menu-item :index="c.clmid" v-for="c in nav.Childs"> {{ c.clmname }}</el-menu-item>
+          <el-menu-item :index="c.clmurl" :value = "c.clmname" v-for="c in nav.Childs"> {{ c.clmname }}</el-menu-item>
         </el-menu-item-group>
       </el-submenu>
+
     </el-menu>
   </div>
 </template>
 <script>
-import {
-  getNavListQuery
-} from '../api/getApiRes.js'
 
 import {
   GetShopNaviAllRequest
@@ -32,7 +37,8 @@ export default {
   data() {
     return {
       navs: [],
-      NavsideClass: 'NavsideShort',
+      singleNavs: [],
+      NavsClass: 'NavsShort',
     };
   },
   props: ['isCollapse'],
@@ -41,9 +47,9 @@ export default {
       handler(newName, oldName) {
         let that = this;
         if (newName) {
-          that.NavsideClass = 'NavsideShort'
+          that.NavsClass = 'NavsShort'
         } else {
-          that.NavsideClass = 'navSide'
+          that.NavsClass = 'navSide'
         }
       },
       deep: true,
@@ -63,55 +69,38 @@ export default {
       console.log('handleClose', key, keyPath);
     },
     //选中二级菜单栏项
-    selectMenu(i, t, c) {
-      console.log('selectMenuI', i);
-      console.log('selectMenuT', t);
-      console.log('selectMenuC', c);
-
-      // todo 拿不到二级的结果
-      let thatNum = parseInt(t[0]);
-      let thisNum = parseInt(t[0]) - 1;
-      if (t[0] == 1) {
-        // 重复的默认就不要加了
-        return false
-      }
+    selectMenu(i, columnId, c) {
+      //选中菜单的父菜单
+      let parentSelect = columnId[0];
+      //选中的二级菜单
+      let childSelect = columnId[1];
+
       let res = {
-        title: c.$route.meta.title,
-        clmurl: c.$route.meta.path,
-        name: thatNum.toString()
+        title: c.$attrs.value,
+        name: childSelect.toString(),
+        clmurl: i
       }
-      console.log('selectMenu', res);
+      //调用父级refreshList方法增加tab标签
       this.$emit('refreshList', res);
     },
     //查询生成菜单栏
     getTableQuery() {
       let that = this;
 
-      let param = {
-        token: localStorage.token,
-      };
-      let postdata = qs.stringify(param);
-      getNavListQuery(postdata).then(res => {
-        let json = res;
-        if (json.Code == 0) {
-          // 菜单
-          that.navs = json.Rs;
-        }
-      })
-      return;
-
       let paraRequest = new GetShopNaviAllRequest();
       paraRequest.setShopid(localStorage.shopId);
       console.log(localStorage.token);
       that.client.getShopNaviAll(paraRequest, {"Token": localStorage.token}, (err, GetShopNaviAllReply) => {
         if (err == null) {
+          console.log(GetShopNaviAllReply.getColumnrs());
           let res = JSON.parse(GetShopNaviAllReply.getColumnrs());
           console.log(res);
           let naviJson = [];
+          let topNaviJson = [];
           res.forEach((parentItem, i) => {
 
             let parentList = {};
-            parentList.clmid = parentItem.Sn;
+            parentList.clmid = parentItem.Id;
             parentList.clmurl = parentItem.Url;
             parentList.clmcode = parentItem.Code;
             parentList.clmname = parentItem.Name;
@@ -122,18 +111,23 @@ export default {
               parentList.Childs = [];
               parentItem.Second.forEach((secondItem, j) => {
                 let childList = [];
-                childList.clmid = secondItem.Url
+                childList.clmid = secondItem.Id
                 childList.clmcode = "/" + secondItem.Code
                 childList.clmurl = secondItem.Url
                 childList.clmname = secondItem.Name
 
                 parentList.Childs.push(childList);
               })
+
+              naviJson.push(parentList);
+            } else {
+              topNaviJson.push(parentList);
             }
-            naviJson.push(parentList);
           })
-          console.log(naviJson);
           that.navs = naviJson;
+          that.singleNavs = topNaviJson;
+          console.log(naviJson);
+          console.log(topNaviJson);
         } else {
           let res = err;
           that.$message.error(res.message + ',错误代码：' + res.code);
@@ -158,8 +152,11 @@ export default {
     width: 100%;
   }
 }
+.el-menu-item:focus,
+.el-menu-item:hover {}
+.el-menu-item.is-active {}
 
-.NavsideShort {
+.NavsShort {
   position: absolute;
   top: 0;
   left: 0;
@@ -192,11 +189,10 @@ export default {
 }
 
 .el-submenu__title:hover {
-  background-color: #3699FF;
-  color: #fff;
-
+  background-color: #ff36fc;
+  color: #70e322;
   i {
-    color: #fff;
+    color: #d9b015;
   }
 }
 </style>

src/components/Tabs.vue

@@ -22,11 +22,13 @@
         props: ['handleTabsList','editableTabsValue'],
         methods: {
             navOpen: function (data) {
+                console.log('navOpen');
                 let that = this;
                 that.$router.push({path: data.clmurl});
             },
             addTab(targetName) {
-                let newTabName = ++this.tabIndex + '';
+              console.log('addTab');
+              let newTabName = ++this.tabIndex + '';
                 this.editableTabs.push({
                     title: '系统首页',
                     name: newTabName,
@@ -35,7 +37,8 @@
                 this.editableTabsValue = newTabName;
             },
             removeTab(targetName) {
-                let tabs = this.editableTabs;
+              console.log('removeTab');
+              let tabs = this.editableTabs;
                 let activeName = this.editableTabsValue;
                 if (activeName === targetName) {
                     tabs.forEach((tab, index) => {

src/components/cropper.vue

@@ -163,9 +163,7 @@ export default {
     // 裁剪input 监听1
     async onChange(e) {
       let file = e.target.files[0];
-      console.log(file);
       if (!file) {
-        console.log('选择图片失败');
         return false
       }
       // 验证文件类型

src/router/index.js

@@ -17,7 +17,7 @@ const routes = [
                 name: 'Main',
                 component: () => import('@/views/Index/Main.vue'),
                 meta: {
-                    title: "首页",
+                    title: "系统首页",
                     // clmid: "1",
                 }
             },

src/views/Auth/Login.vue

@@ -103,7 +103,6 @@ export default {
       that.changeValImg();
       // 重置倒计时
       that.overtime = new Date();
-      console.log(localStorage.token);
     }
     // 如果是切换店铺
     if (that.$route.query.status == 10011) {
@@ -213,7 +212,6 @@ export default {
       console.log(localStorage.token);
       that.client.manageableShopList(paraRequest, {"Token": localStorage.token}, (err, ShopListReply) => {
             if (err == null) {
-              console.log(ShopListReply.getListList());
               let res = ShopListReply.getListList();
               if (res) {
                 //账号下只有一家店铺
@@ -223,7 +221,6 @@ export default {
                   localStorage.userName = res[0].getContacts();
                   localStorage.canChange = 0;
 
-                  console.log(localStorage.shopId);
                   if (res[0].getStatus(0) === 1) {
                     that.$router.push({path: '/'});
                   } else {
@@ -236,7 +233,6 @@ export default {
                   localStorage.canChange = 1;
                   let jsonObjList = [];
                   res.forEach((item, i) => {
-                    console.log(i, item.getShopuuid());
                     let jsonObj = {shopId: "", name: "", addr: "", contacts: "", status: 1};
                     jsonObj.shopId = item.getShopuuid();
                     jsonObj.name = item.getName();
@@ -251,7 +247,6 @@ export default {
             } else {
               let res = err;
               that.$message.error(res.message + ',错误代码：' + res.code);
-              console.log(res);
             }
           }
       )
@@ -263,7 +258,6 @@ export default {
         this.$message.error("请先选中商家");
         return false
       }
-      console.log(that.currentRow);
       localStorage.shopId = that.currentRow.shopId;
       localStorage.shopName = that.currentRow.name;
       localStorage.userName = that.currentRow.contacts;

src/views/Class/LessonManage.vue

@@ -347,10 +347,8 @@ export default {
       paraRequest.setShopid(localStorage.shopId);
       paraRequest.setJsonstr(JSON.stringify(jsonStr));
       paraRequest.setSign(getSignStr(jsonStr));
-      console.log(paraRequest);
       that.client.classAdd(paraRequest, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
           if (res.code === 0) {
             // 关闭弹窗
@@ -369,7 +367,6 @@ export default {
         } else {
           let res = err;
           that.$message.error(res.message + ',错误代码：' + res.code);
-          console.log(res);
         }
       });
     },
@@ -427,10 +424,8 @@ export default {
       paraRequest.setShopid(localStorage.shopId);
       paraRequest.setJsonstr(JSON.stringify(jsonStr));
       paraRequest.setSign(getSignStr(jsonStr));
-      console.log(paraRequest);
       that.client.classEdit(paraRequest, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
           if (res.code === 0) {
             // 关闭弹窗
@@ -448,7 +443,6 @@ export default {
         } else {
           let res = err;
           that.$message.error(res.message + ',错误代码：' + res.code);
-          console.log(res);
         }
       });
     },
@@ -470,7 +464,6 @@ export default {
       paraRequest.setShopid(localStorage.shopId);
       paraRequest.setJsonstr(JSON.stringify(jsonStr));
       paraRequest.setSign(getSignStr(jsonStr));
-      console.log(paraRequest);
       this.$confirm('此操作将永久删除该课程, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -478,7 +471,6 @@ export default {
       }).then(() => {
         that.client.classStatusEdit(paraRequest, {"Token": localStorage.token}, (err, StandardReply) => {
           if (err == null) {
-            console.log(StandardReply.getJsonrst());
             let res = JSON.parse(StandardReply);
             if (res.code === 0) {
               that.$message({
@@ -494,7 +486,6 @@ export default {
           } else {
             let res = err;
             that.$message.error(res.message + ',错误代码：' + res.code);
-            console.log(res);
           }
         });
       }).catch(() => {
@@ -516,10 +507,8 @@ export default {
       paraRequest.setShopid(localStorage.shopId);
       paraRequest.setJsonstr(JSON.stringify(jsonStr));
       paraRequest.setSign(getSignStr(jsonStr));
-      console.log(paraRequest);
       that.client.classWxVisibleEdit(paraRequest, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
           let text = parseInt(e) == 1 ? '可见' : '不可见';
           if (res.code === 0) {
@@ -536,7 +525,6 @@ export default {
         } else {
           let res = err;
           that.$message.error(res.message + ',错误代码：' + res.code);
-          console.log(res);
         }
       })
     },
@@ -552,10 +540,8 @@ export default {
       paraRequest.setShopid(localStorage.shopId);
       paraRequest.setJsonstr(JSON.stringify(jsonStr));
       paraRequest.setSign(getSignStr(jsonStr));
-      console.log(paraRequest);
       that.client.classColorEdit(paraRequest, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
           if (res.code === 0) {
             that.$message({
@@ -571,7 +557,6 @@ export default {
         } else {
           let res = err;
           that.$message.error(res.message + ',错误代码：' + res.code);
-          console.log(res);
         }
       })
     },
@@ -600,10 +585,8 @@ export default {
       paraRequest.setShopid(localStorage.shopId);
       paraRequest.setJsonstr(JSON.stringify(jsonStr));
       paraRequest.setSign(getSignStr(jsonStr));
-      console.log(paraRequest);
       that.client.vipUserSimpleQuery(paraRequest, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
           if (res.code === 0) {
             if (res.rs) {
@@ -621,7 +604,6 @@ export default {
         } else {
           let res = err;
           that.$message.error(res.message + ',错误代码：' + res.code);
-          console.log(res);
         }
       });
     },
@@ -639,10 +621,8 @@ export default {
       paraRequest.setShopid(localStorage.shopId);
       paraRequest.setJsonstr(JSON.stringify(jsonStr));
       paraRequest.setSign(getSignStr(jsonStr));
-      console.log(paraRequest);
       that.client.classVipEdit(paraRequest, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
           if (res.code === 0) {
             that.$message({
@@ -658,7 +638,6 @@ export default {
         } else {
           let res = err;
           that.$message.error(res.message + ',错误代码：' + res.code);
-          console.log(res);
         }
       });
     },
@@ -692,10 +671,8 @@ export default {
       paraRequest.setShopid(localStorage.shopId);
       paraRequest.setJsonstr(JSON.stringify(jsonStr));
       paraRequest.setSign(getSignStr(jsonStr));
-      console.log(paraRequest);
       that.client.vipUserSimpleQuery(paraRequest, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
           if (res.code === 0) {
             if (res.rs) {
@@ -709,7 +686,6 @@ export default {
         } else {
           let res = err;
           that.$message.error(res.message + ',错误代码：' + res.code);
-          console.log(res);
         }
       });
     },
@@ -742,10 +718,8 @@ export default {
       paraRequest.setShopid(localStorage.shopId);
       paraRequest.setJsonstr(JSON.stringify(jsonStr));
       paraRequest.setSign(getSignStr(jsonStr));
-      console.log(paraRequest);
       that.client.vipUserSimpleQuery(paraRequest, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err === null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
           if (res.code === 0) {
             if (res.rs) {
@@ -759,7 +733,6 @@ export default {
         } else {
           let res = err;
           that.$message.error(res.message + ',错误代码：' + res.code);
-          console.log(res);
         }
       });
     },
@@ -779,10 +752,8 @@ export default {
       paraRequest.setShopid(localStorage.shopId);
       paraRequest.setJsonstr(JSON.stringify(jsonStr));
       paraRequest.setSign(getSignStr(jsonStr));
-      console.log(paraRequest);
       that.client.classQuery(paraRequest, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
           if (res.code === 0) {
             if (res.rs) {
@@ -800,7 +771,6 @@ export default {
         } else {
           let res = err;
           that.$message.error(res.message + ',错误代码：' + res.code);
-          console.log(res);
         }
       });
     },

src/views/Index/Index.vue

@@ -1,22 +1,25 @@
 <template>
   <div class="IndexContainer">
+
     <el-container>
       <el-aside :class="[{ 'shortElaside': isCollapse }, { 'lognElaside': !isCollapse }]">
-        <Navside :isCollapse="isCollapse" @lefthide="left_hide" @refreshList="onRefresList"></Navside>
+        <Navside :isCollapse="isCollapse" @lefthide="leftHide" @refreshList="addTabs"></Navside>
       </el-aside>
+
       <el-container>
         <el-header>
-          <Headside @lefthide="left_hide" :tableTabs="tableTabs"></Headside>
+          <Headside @lefthide="leftHide" :tableTabs="tableTabs"></Headside>
         </el-header>
         <el-main :style="{'height': clientHeight+'px'}">
           <keep-alive>
             <router-view></router-view>
           </keep-alive>
-        </el-main>`
+        </el-main>
         <el-footer v-if="true">
           <p class="footer">济南佰意兴网络科技有限公司提供技术支持</p>
         </el-footer>
       </el-container>
+
     </el-container>
   </div>
 </template>
@@ -32,30 +35,42 @@ export default {
   data() {
     return {
       isCollapse: true,
-      clientHeight: document.documentElement.clientHeight - 50,
       aSideState: false,
-      thisClick: 0,
-      tabwildState: 1,
-      navs: Navs,
-      tableTabs: [{
-        title: '系统首页',
-        name: '1',
-        clmurl: '/',
-      }],
+      clientHeight: document.documentElement.clientHeight - 50,
+      tableTabs:[],
       editableTabsValue: '1',
     }
   },
   mounted() {
+    console.log();
     // checkScreen
     if (document.body.clientWidth < 768) {
       this.$message.warning('请横屏使用本系统');
     }
   },
   methods: {
-    onRefresList(v) {
-      this.tableTabs.push(v);
+    //控制添加tab标签
+    addTabs(v) {
+      let notExist = true;
+      let existIndex = -1;
+      this.tableTabs.forEach((tab, index) => {
+        if(tab.clmurl == v.clmurl){
+          notExist = false;
+          existIndex = index;
+          this.editableTabsValue = tab.title;
+          return false;
+        }
+      });
+      if(notExist){
+        this.tableTabs.push(v);
+      }else{
+        console.log(this.editableTabsValue);
+        // this.tableTabs.splice(existIndex,1);
+        // console.log(this.tableTabs[0]);
+      }
     },
-    left_hide() {
+    //控制显示左侧导航栏
+    leftHide() {
       this.aSideState = !this.aSideState;
       this.isCollapse = !this.isCollapse;
     },

src/views/Index/Main.vue

@@ -311,7 +311,7 @@ export default {
         } else {
           if (json.Code == 1010) {
             that.$message.error(json.Memo + ' 错误码：' + json.Code);
-            that.$router.push({path: '/login', query: {status: 1}});
+            // that.$router.push({path: '/login', query: {status: 1}});
             return false
           } else {
             that.$message.error(json.Memo + ' 错误码：' + json.Code);

src/views/Member/MemberFull.vue

@@ -403,12 +403,9 @@ export default {
       standardReq.setShopid(localStorage.shopId);
       standardReq.setSign(getSignStr(jsonStr));
       standardReq.setJsonstr(JSON.stringify(jsonStr));
-      console.log(standardReq.getJsonstr());
       that.client.vipMainPhoneCheck(standardReq, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply)
-          console.log(res);
           if (res.code == 20101) {//该手机号在本店已存在
             that.$message.error('用户已存在，手机号不能重复添加');
             that.addDisabled = true;
@@ -451,7 +448,6 @@ export default {
         } else {
           let res = err;
           that.$message.error(res.message + ',错误代码：' + res.code);
-          console.log(res);
         }
       })
     },
@@ -460,7 +456,6 @@ export default {
       this.$router.push({path: '/relevancePhone', query: {userId: row.uu_user_id,shopId: row.shop_id}});
     },
     cutDown(e) {
-      console.log(e);
       this.imageUrl = e.dataURL;
       this.upqiniu(e);
     },
@@ -493,13 +488,10 @@ export default {
       standardReq.setShopid(localStorage.shopId);
       standardReq.setJsonstr(JSON.stringify(jsonStr));
       standardReq.setSign(getSignStr(jsonStr));
-      console.log(standardReq.getJsonstr());
       that.client.vipUserClassQuery(standardReq, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
           if (res.code == 0) {
-            console.log(res);
             that.userClassInfo = res.rs;
           } else {
             that.$message.error(res.memo + ',错误代码：' + res.code);
@@ -507,7 +499,6 @@ export default {
         } else {
           let res = err;
           that.$message.error(res.message + ',错误码：' + res.code);
-          console.log("err:" + err);
         }
       })
 
@@ -551,10 +542,8 @@ export default {
         standardReq.setShopid(localStorage.shopId);
         standardReq.setJsonstr(JSON.stringify(jsonStr));
         standardReq.setSign(getSignStr(jsonStr));
-        console.log(standardReq.getJsonstr());
         that.client.shopVipUserStatusEdit(standardReq, {"Token": localStorage.token}, (err, StandardReply) => {
           if (err == null) {
-            console.log(StandardReply.getJsonrst());
             let res = JSON.parse(StandardReply);
 
             if (res.code == 0) {
@@ -575,7 +564,6 @@ export default {
           } else {
             let res = err;
             that.$message.error(res.message + ',错误码：' + res.code);
-            console.log("err:" + err);
           }
         })
       }).catch(() => {
@@ -602,10 +590,8 @@ export default {
         standardReq.setShopid(localStorage.shopId);
         standardReq.setJsonstr(JSON.stringify(jsonStr));
         standardReq.setSign(getSignStr(jsonStr));
-        console.log(standardReq.getJsonstr());
         that.client.shopVipUserStatusEdit(standardReq, {"Token": localStorage.token}, (err, StandardReply) => {
           if (err == null) {
-            console.log(StandardReply.getJsonrst());
             let res = JSON.parse(StandardReply);
 
             if (res.code == 0) {
@@ -626,7 +612,6 @@ export default {
           } else {
             let res = err;
             that.$message.error(res.message + ',错误码：' + res.code);
-            console.log("err:" + err);
           }
         })
 
@@ -654,7 +639,6 @@ export default {
       standardReq.setShopid(localStorage.shopId);
       standardReq.setJsonstr(JSON.stringify(jsonStr));
       standardReq.setSign(getSignStr(jsonStr));
-      console.log(standardReq.getJsonstr());
 
       this.$confirm('此操作将永久删除该会员, 是否继续?', '提示', {
         confirmButtonText: '确定',
@@ -663,7 +647,6 @@ export default {
       }).then(() => {
         that.client.shopVipUserStatusEdit(standardReq, {"Token": localStorage.token}, (err, StandardReply) => {
           if (err == null) {
-            console.log(StandardReply.getJsonrst());
             let res = JSON.parse(StandardReply);
 
             if (res.code == 0) {
@@ -684,7 +667,6 @@ export default {
           } else {
             let res = err;
             that.$message.error(res.message + ',错误码：' + res.code);
-            console.log("err:" + err);
           }
         })
       }).catch(() => {
@@ -768,14 +750,11 @@ export default {
       standardReq.setShopid(localStorage.shopId);
       standardReq.setJsonstr(JSON.stringify(jsonStr));
       standardReq.setSign(getSignStr(jsonStr));
-      console.log(standardReq.getJsonstr());
       that.client.vipUserClassQuery(standardReq, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
 
           if (res.rs) {
-            console.log(res);
             res.rs.map(function (item) {
               that.form.dialogValue.push(item.class_id)
             })
@@ -783,7 +762,6 @@ export default {
         } else {
           let res = err;
           that.$message.error(res.message + ',错误码：' + res.code);
-          console.log("err:" + JSON.parse(err));
         }
       })
 
@@ -858,10 +836,8 @@ export default {
       standardReq.setShopid(localStorage.shopId);
       standardReq.setSign(getSignStr(jsonStr));
       standardReq.setJsonstr(JSON.stringify(jsonStr));
-      console.log(standardReq.getJsonstr());
       that.client.shopVipUserAdd(standardReq, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
 
           if (res.code == 0) {
@@ -880,7 +856,6 @@ export default {
         } else {
           let res = err;
           that.$message.error(res.message + ',错误代码：' + res.code);
-          console.log(res);
         }
       })
     },
@@ -940,10 +915,8 @@ export default {
       standardReq.setShopid(localStorage.shopId);
       standardReq.setSign(getSignStr(jsonStr));
       standardReq.setJsonstr(JSON.stringify(jsonStr));
-      console.log(standardReq.getJsonstr());
       that.client.shopVipUserEdit(standardReq, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
 
           if (res.code == 0) {
@@ -961,7 +934,6 @@ export default {
           }
         } else {
           let res = err;
-          console.log(err);
           that.$message.error(res.message + ',错误码：' + res.code);
         }
       })
@@ -980,10 +952,8 @@ export default {
       standardReq.setShopid(localStorage.shopId);
       standardReq.setSign(getSignStr(jsonStr));
       standardReq.setJsonstr(JSON.stringify(jsonStr));
-      console.log(standardReq.getJsonstr());
       that.client.vipHourEdit(standardReq, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
 
           if (res.code == 0) {
@@ -1002,7 +972,6 @@ export default {
         } else {
           let res = err;
           that.$message.error(res.message + ',错误代码：' + res.code);
-          console.log(res);
         }
       })
     },
@@ -1023,14 +992,11 @@ export default {
       standardReq.setShopid(localStorage.shopId);
       standardReq.setSign(getSignStr(jsonStr));
       standardReq.setJsonstr(JSON.stringify(jsonStr));
-      console.log(standardReq.getJsonstr());
       that.client.vipClassRelationEdit(standardReq, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
 
           if (res.code == 0) {
-            console.log(res);
             // 关闭弹窗
             that.dialogVisible = false;
             // 重载列表
@@ -1046,7 +1012,6 @@ export default {
         } else {
           let res = err;
           that.$message.error(res.message + ',错误码：' + res.code);
-          console.log("err:" + err);
         }
       })
     },
@@ -1067,7 +1032,6 @@ export default {
 
       that.client.classQuery(standardReq, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
           if (res.code ==0) {
             that.form.dialogdata = turnClassResToOption(res.rs);
@@ -1075,7 +1039,6 @@ export default {
             that.$message.error(res.memo + ',错误代码：' + res.code);
           }
         } else {
-          console.log("err:" + err.toObject);
           let res = JSON.parse(err);
           that.$message.error(res.message + ',错误代码：' + res.code);
         }
@@ -1153,15 +1116,12 @@ export default {
       standardReq.setShopid(localStorage.shopId);
       standardReq.setSign(getSignStr(jsonStr));
       standardReq.setJsonstr(JSON.stringify(jsonStr));
-      console.log(standardReq.getJsonstr());
-      console.log(localStorage.token);
 
       that.allTableData = [];
       that.recordsTotal = 0;
 
       that.client.shopVipUserQuery(standardReq, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
 
           that.loading = false;
@@ -1177,7 +1137,6 @@ export default {
         } else {
           let res = err;
           that.$message.error(res.message + ',错误代码：' + res.code);
-          console.log(res);
         }
       })
     },

src/views/Member/MemberTemporary.vue

@@ -311,10 +311,8 @@ export default {
       paraRequest.setShopid(localStorage.shopId);
       paraRequest.setJsonstr(JSON.stringify(jsonStr));
       paraRequest.setSign(getSignStr(jsonStr));
-      console.log(paraRequest);
       that.client.tempVipUserAdd(paraRequest, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
           if (res.code === 0) {
             // 关闭弹窗
@@ -332,7 +330,6 @@ export default {
         } else {
           let res = err;
           that.$message.error(res.message + ',错误代码：' + res.code);
-          console.log(res);
         }
       });
     },
@@ -357,11 +354,9 @@ export default {
         paraRequest.setShopid(localStorage.shopId);
         paraRequest.setJsonstr(JSON.stringify(jsonStr));
         paraRequest.setSign(getSignStr(jsonStr));
-        console.log(paraRequest);
 
         that.client.tempVipUserStatusEdit(paraRequest, {"Token": localStorage.token}, (err, StandardReply) => {
           if (err == null) {
-            console.log(StandardReply.getJsonrst());
             let res = JSON.parse(StandardReply);
             if (res.code === 0) {
               that.$message({
@@ -377,7 +372,6 @@ export default {
           } else {
             let res = err;
             that.$message.error(res.message + ',错误代码：' + res.code);
-            console.log(res);
           }
         });
       }).catch(() => {
@@ -465,10 +459,8 @@ export default {
       paraRequest.setShopid(localStorage.shopId);
       paraRequest.setJsonstr(JSON.stringify(jsonStr));
       paraRequest.setSign(getSignStr(jsonStr));
-      console.log(paraRequest);
       that.client.tempVipUserEdit(paraRequest, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
           if (res.code === 0) {
             // 关闭弹窗
@@ -486,7 +478,6 @@ export default {
         } else {
           let res = err;
           that.$message.error(res.message + ',错误代码：' + res.code);
-          console.log(res);
         }
       });
     },
@@ -503,7 +494,6 @@ export default {
       return isJPG && isLt2M
     },
     cutDown(e) {
-      console.log(e);
       this.imageUrl = e.dataURL;
       this.upqiniu(e);
     },
@@ -572,10 +562,8 @@ export default {
       paraRequest.setShopid(localStorage.shopId);
       paraRequest.setJsonstr(JSON.stringify(jsonStr));
       paraRequest.setSign(getSignStr(jsonStr));
-      console.log(paraRequest);
       that.client.tempVipUserQuery(paraRequest, {"Token": localStorage.token}, (err, StandardReply) => {
         if (err == null) {
-          console.log(StandardReply.getJsonrst());
           let res = JSON.parse(StandardReply);
           if (res.code === 0) {
             that.loading = false;
@@ -594,7 +582,6 @@ export default {
         } else {
           let res = err;
           that.$message.error(res.message + ',错误代码：' + res.code);
-          console.log(res);
         }
       });
     },
@@ -655,8 +642,6 @@ export default {
         this.tableData = tables;
       }
       that.start = index * that.draw;
-      console.log(index);
-      console.log(that.draw);
       that.getTableQuery();
     },
     //过滤时间