Bladeren bron

提交一下

1
mo 4 jaren geleden
bovenliggende
commit
8223829534

+ 26 - 11
public/html/index.html

@@ -83,7 +83,7 @@
         // isolate scope
         (function() {
             setUpController();
-            
+
             var configuration = $axure.document.configuration;
             var _settings = {};
             _settings.projectId = configuration.prototypeId;
@@ -135,7 +135,7 @@
                 if($axure.player.settings.startCollapsed) $('#outerContainer').splitter({ sizeLeft: 0 });
                 else $('#outerContainer').splitter({ sizeLeft: lastLeftPanelWidth });
                 $('#leftPanel').width(lastLeftPanelWidth);
-                
+
                 $(window).resize(function() { resizeContent(); });
 
                 $('#maximizePanelContainer').hide();
@@ -144,7 +144,7 @@
 
                 $(window).resize();
                 resizeContent();
-                
+
                 $axure.player.collapseToBar();
 
                 if($axure.player.settings.startCollapsed) {
@@ -153,7 +153,7 @@
                 }
 
                 if(MOBILE_DEVICE) {
-                    $('#interfaceControlFrameMinimizeContainer').height('45px');
+                    $('#interfaceControlFrameMinimizeContainer').height('45px')
                     $('#interfaceControlFrameMinimizeContainer a').height('45px');
                     $('#interfaceControlFrameHeaderContainer').css('margin-top','45px');
                     $('#interfaceControlFrameCloseContainer a').css('padding','10px 0px');
@@ -215,7 +215,7 @@
                         $axure.player.resizeContent();
                     };
                     image.src = $axure.document.configuration.logoImagePath;
-                
+
                     $('#interfaceControlFrameLogoImageContainer').html('<img id="logoImage" src="" />');
                     $('#logoImage').attr('src', $axure.document.configuration.logoImagePath).load(function() { resizeContent(); });
                 } else $('#interfaceControlFrameLogoImageContainer').hide();
@@ -284,7 +284,7 @@
             else if(message == 'getCollapseFrameOnLoad' && $axure.player.settings.startCollapsed && !MOBILE_DEVICE) $axure.messageCenter.postMessage('collapseFrameOnLoad');
         }
 
-        
+
         function getInitialUrl() {
             var pageName = getHashStringVar("p");
             if(pageName.length > 0) return pageName + ".html";
@@ -388,7 +388,7 @@
             if(qstring.length < 2) return "";
             return GetParameter(qstring, query);
         }
-        
+
         function GetParameter(qstring, query) {
             var prms = qstring[1].split("&");
             var frmelements = new Array();
@@ -409,7 +409,7 @@
             }
             return querystr;
         }
-        
+
         function getHashStringVar(query) {
             var qstring = self.location.href.split("#");
             if(qstring.length < 2) return "";
@@ -487,7 +487,7 @@
             }
         }
     </script>
-    
+
     <link type="text/css" rel="Stylesheet" href="plugins/sitemap/styles/sitemap.css" />
     <link type="text/css" rel="Stylesheet" href="plugins/page_notes/styles/page_notes.css" />
     <link type="text/css" rel="Stylesheet" href="plugins/debug/styles/debug.css" />
@@ -495,7 +495,7 @@
 
     <!--<link type="text/css" rel="Stylesheet" href="plugins/recordplay/styles/recordplay.css" />
     <script type="text/javascript" src="plugins/recordplay/recordplay.js"></script>-->
-    
+
 
 </head>
 <body scroll="no" class="hashover">
@@ -534,7 +534,22 @@
             </div>
         </div>
         <!-- <iframe id="expandFrame" src="resources/expand.html" width="100%" height="100%" scrolling="no" allowtransparency="true" frameborder="0"></iframe> -->
-    </div> 
+    </div>
 
 </body>
 </html>
+<style>
+  #interfaceControlFrameMinimizeContainer{
+
+    left:204px;
+     top: 50%;
+    margin-top: -25px;
+    transform:rotate(90deg);
+  }
+  #maximizePanelContainer {
+    top: 50%;
+    margin-top: -25px;
+    left:-18px;
+    transform:rotate(90deg);
+  }
+</style>

BIN
src/assets/images/base/instruction-icon.png


+ 47 - 12
src/constant/instructionList.js

@@ -1,14 +1,49 @@
-export const instructionList ={
-  '/business/resetTeaming':{
-    1:'新建乐团',
-    2:'新建乐团',
-    9:'乐团预报名',
-    3:'新建学员缴费',
-    6:'新建学校缴费',
-    11:'乐团缴费',
-    10:'乐团筹备',
-    7:'乐团新增学员',
-    5:'乐团建班'
+
+const TeamBase = {
+  1: '新建乐团',
+  2: '新建乐团',
+  9: '乐团预报名',
+  3: '新建学员缴费',
+  6: '新建学校缴费',
+  11: '乐团缴费',
+  10: '乐团筹备',
+  7: '乐团新增学员',
+  5: '乐团建班'
+}
+export const instructionList = {
+  '/business/resetTeaming': {
+    newTeam:{...TeamBase},
+    DRAFT: { ...TeamBase },
+    AUDIT: { ...TeamBase },
+    PRE_APPLY: { ...TeamBase },
+    PRE_BUILD_FEE: { ...TeamBase },
+    FEE_AUDIT: { ...TeamBase },
+    APPLY: { ...TeamBase, 11: '乐团报名' },
+    PAY: { ...TeamBase },
+    PREPARE: { ...TeamBase },
+    PROGRESS: {
+      ...TeamBase, 3: '缴费项目创建',
+      6: '缴费项目创建'
+    },
+    CANCELED: { ...TeamBase },
+    PAUSE: { ...TeamBase },
+    AUDIT_FAILED: { ...TeamBase },
+    CLOSE: { ...TeamBase },
   },
-  '/teamList':'乐团关闭',
+  '/teamList': '乐团进行中',
+}
+
+
+
+export const keyOfValue={
+  '/business/resetTeaming':'team_status'
 }
+// export const team_status = {
+//   'APPLY':{
+//     11:'乐团报名'
+//   },
+//   'PROGRESS':{
+//     3:'缴费项目创建',
+//     6:'缴费项目创建'
+//   }
+// }

+ 3 - 5
src/layout/components/AppMain.vue

@@ -17,18 +17,16 @@
 
       </div>
     </transition>
-    <instructions />
+
   </section>
 </template>
 
 <script>
 import notKeepAliveList from "@/router/notKeepAliveList";
-import instructions from './instructions'
+
 export default {
   name: "AppMain",
-  components:{
-    instructions
-  },
+
   computed: {
     key() {
       return this.$route.path;

+ 121 - 50
src/layout/components/Navbar.vue

@@ -1,47 +1,92 @@
 <template>
   <div class="navbar">
     <!-- <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> -->
-    <router-link key="collapse" style="display: flex; align-items: center; padding-left: 30px;" to="/">
-      <img src="@/assets/images/base/logo.png"
-             class="sidebar-logo" style="width: 129px; height: 37px" />
+    <router-link
+      key="collapse"
+      style="display: flex; align-items: center; padding-left: 30px"
+      to="/"
+    >
+      <img
+        src="@/assets/images/base/logo.png"
+        class="sidebar-logo"
+        style="width: 129px; height: 37px"
+      />
     </router-link>
     <!-- <breadcrumb class="breadcrumb-container" /> -->
     <div class="indexlayout-top-menu">
       <!-- :class="{'active': getTopMenuActive === route.path}" -->
       <!-- el-scrollbar -->
-      <el-scrollbar class="horizontal-scrollbar" style="overflow: hidden; height: 100%;">
-          <template v-for="route in permission_routes">
-            <app-link v-if="!route.hidden" :to="route.path" :key="route.id" class="indexlayout-top-menu-li" :class="{'active': getTopMenuActive === route.path}">
-                <span>{{ route.meta.title }}</span>
-            </app-link>
-          </template>
+      <el-scrollbar
+        class="horizontal-scrollbar"
+        style="overflow: hidden; height: 100%"
+      >
+        <template v-for="route in permission_routes">
+          <app-link
+            v-if="!route.hidden"
+            :to="route.path"
+            :key="route.id"
+            class="indexlayout-top-menu-li"
+            :class="{ active: getTopMenuActive === route.path }"
+          >
+            <span>{{ route.meta.title }}</span>
+          </app-link>
+        </template>
       </el-scrollbar>
     </div>
-    <!-- <div class="left-menu">
-      <i class="el-icon-location-information topIcon"></i>
+    <div class="right-menu">
+      <el-popover
+        v-if="isShowIns"
+        placement="bottom"
+        trigger="hover"
+        style="display: flex; height: 89px"
+      >
+        <div class="popover-container" style="text-align: center">操作手册</div>
+        <div
+          style="
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            height: 89px;
+          "
+          class="msginfo ins"
 
-      <el-popover placement="top-start" width="300" trigger="hover">
-        <div class="popover-container">
-          <el-tag
-            class="navbar_tag"
-            type="info"
-            v-for="item in organNameList"
-            :key="item"
-            >{{ item }}</el-tag
-          >
+          @click="openIns"
+          slot="reference"
+        >
+          <img src="@/assets/images/base/instruction-icon.png" />
+          <!-- <div class="active"></div> -->
         </div>
-        <span slot="reference">{{
-          organName.length > 10 ? organName.substr(0, 10) + "..." : organName
-        }}</span>
       </el-popover>
-    </div> -->
-    <div class="right-menu">
-      <div class="msginfo" v-permission="'/journal'" @click="gotoRecode">
-        <img src="@/assets/images/base/base-bell.svg" />
-        <!-- <div class="active"></div> -->
-      </div>
+      <el-popover
+        placement="bottom"
+        trigger="hover"
+        style="display: flex; height: 89px"
+      >
+        <div class="popover-container" style="text-align: center">系统日志</div>
+        <div
+          style="
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            height: 89px;
+          "
+          class="msginfo"
+          v-permission="'/journal'"
+          @click="gotoRecode"
+          slot="reference"
+        >
+          <img src="@/assets/images/base/base-bell.svg" />
+          <!-- <div class="active"></div> -->
+        </div>
+      </el-popover>
+
       <div class="left-menu">
-        <el-popover placement="top-start" width="300" trigger="hover" style="display: flex;height: 89px;">
+        <el-popover
+          placement="top-start"
+          width="300"
+          trigger="hover"
+          style="display: flex; height: 89px"
+        >
           <div class="popover-container">
             <el-tag
               class="navbar_tag"
@@ -51,10 +96,19 @@
               >{{ item }}</el-tag
             >
           </div>
-          <span slot="reference" style="display: flex;align-items: center;justify-content: center;height: 89px;">
+          <span
+            slot="reference"
+            style="
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              height: 89px;
+              padding:0 5px;
+            "
+          >
             <!-- {{ organName.length > 10 ? organName.substr(0, 10) + "..." : organName }} -->
             <!-- <i class="el-icon-s-home" style="font-size: 23px; color: #1A1A1A;"></i> -->
-            <img src="@/assets/images/base/base-home.svg" style="width: 23px;">
+            <img src="@/assets/images/base/base-home.svg" style="width: 23px" />
           </span>
         </el-popover>
       </div>
@@ -160,18 +214,21 @@
         <el-button type="primary" @click="submitResetPassWord">确 定</el-button>
       </div>
     </el-dialog>
+    <instructions ref="instructions" @checkShow='checkShow'/>
   </div>
 </template>
 
 <script>
 import qs from "qs";
-import Logo from './Sidebar/Logo'
+import Logo from "./Sidebar/Logo";
 import { mapGetters } from "vuex";
 // import Breadcrumb from '@/components/Breadcrumb'
 // import Hamburger from '@/components/Hamburger'
 import { resetPassword } from "@/api/buildTeam";
-import AppLink from './Sidebar/Link';
-import { getBelongTopMenuPath } from '@/utils/permission';
+import AppLink from "./Sidebar/Link";
+import { getBelongTopMenuPath } from "@/utils/permission";
+import instructions from "./instructions";
+
 export default {
   data() {
     return {
@@ -188,10 +245,13 @@ export default {
       isDisable: false, // 是否允许发送验证码
       timerCount: 60,
       btnName: "获取验证码",
+      isShowIns:false
     };
   },
+
   components: {
-    AppLink
+    AppLink,
+    instructions,
     // Breadcrumb,
     // Hamburger
   },
@@ -201,13 +261,13 @@ export default {
       let route = this.$route;
       //  (route, getBelongTopMenuPath(route))
       return getBelongTopMenuPath(route);
-    }
+    },
   },
   mounted() {
     // 手动加入
     this.toggleSideBar();
     this.username = this.$store.getters.name;
-    this.organNameList = this.organName.split(",")||[];
+    this.organNameList = this.organName.split(",") || [];
   },
   methods: {
     toggleSideBar() {
@@ -215,7 +275,7 @@ export default {
     },
     async logout() {
       await this.$store.dispatch("user/logout");
-      localStorage.removeItem('firstMenuUrl')
+      localStorage.removeItem("firstMenuUrl");
       // await this.$store.dispatch("permission/removePermission")
       this.$router.push(`/login`);
       window.location.reload();
@@ -280,6 +340,12 @@ export default {
           });
       }
     },
+    openIns(){
+      this.$refs.instructions.showInstructions()
+    },
+    checkShow(val){
+      this.isShowIns = val
+    }
   },
   watch: {
     resetVisible(val) {
@@ -301,7 +367,7 @@ export default {
   margin: 0 5px 8px;
 }
 
-.indexlayout-top-menu{
+.indexlayout-top-menu {
   padding-left: 57px;
   height: 90px;
   line-height: 88px;
@@ -309,22 +375,22 @@ export default {
   display: flex;
   overflow: hidden;
   /* overflow-x: auto; */
-  .indexlayout-top-menu-li{
+  .indexlayout-top-menu-li {
     display: inline-block;
     padding: 0 5px;
     height: 90px;
     text-decoration: none;
     color: #f2f2f2;
     font-size: 16px;
-    transition: all .3s ease;
+    transition: all 0.3s ease;
     span {
       // display: block;
-      transition: all .3s ease;
+      transition: all 0.3s ease;
       padding: 10px 20px;
     }
     &:hover,
-    &.active{
-      color: #14928A;
+    &.active {
+      color: #14928a;
       span {
         background: #fff;
         border-radius: 6px;
@@ -334,10 +400,10 @@ export default {
       font-weight: bold;
     }
   }
-  .breadcrumb{
+  .breadcrumb {
     line-height: 90px;
     margin-left: 10px;
-    .el-breadcrumb__item{
+    .el-breadcrumb__item {
       display: inline-block;
       float: none;
     }
@@ -354,7 +420,7 @@ export default {
   height: 90px;
   overflow: hidden;
   position: relative;
-  background: #14928A;
+  background: #14928a;
   box-shadow: 0px 8px 20px 0px rgba(0, 0, 0, 0.1);
   h2 {
     font-size: 18px;
@@ -399,13 +465,18 @@ export default {
     &:focus {
       outline: none;
     }
+     .msginfo.ins{
+         img {
+        width: 18px;
+        height: 23px;
+      }
+     }
     .msginfo {
       display: flex;
       flex-direction: row;
       justify-content: flex-start;
       align-items: center;
-      margin-right: 20px;
-      margin-left: 30px;
+padding: 0 5px;
       position: relative;
       cursor: pointer;
       img {

+ 128 - 70
src/layout/components/instructions.vue

@@ -1,13 +1,13 @@
 <template>
   <div>
-    <el-button
+    <!-- <el-button
       v-if="isShowBtn"
       class="instructionBtn"
       @click="showInstructions"
       type="danger"
       plain
-      >说明书</el-button
-    >
+      >操作手册</el-button
+    > -->
     <!-- :w="w" -->
     <vue-drag-resize
       v-if="isShow"
@@ -28,19 +28,18 @@
     >
       <div class="wall"></div>
       <div class="showBtnList">
-        <!-- <i class="el-icon-copy-document" @click="showInstructions"></i> -->
-        <!-- <i class="el-icon-minus minus" @click="showInstructions"></i> -->
+        <a class='newPageBtn' target="_blank" :href="url">新窗口打开</a>
         <i
-          class="iconfont icon-fullscreen fullscreen"
+          class="icon iconfont icon-fullscreen fullscreen"
           @click="fullPageBook"
           v-if="!fullscreen"
         ></i>
         <i
-          class="iconfont icon-tubiao-huanyuan huanyuan"
+          class="icon iconfont icon-tubiao-huanyuan huanyuan"
           @click="resetBook"
           v-else
         ></i>
-        <i class="el-icon-close" @click="showInstructions"></i>
+        <i class="icon el-icon-close" @click="showInstructions"></i>
         <!--  -->
         <!-- <i class="iconfont icon-tubiao-huanyuan"></i> -->
       </div>
@@ -68,7 +67,8 @@
       :parentH="docY"
       :preventActiveBehavior="true"
       class="videoWrap"
-      @resizing="onResizing"
+      :AspectRatio='true'
+      @resizing="onResizingVideo"
       @dragging="onResizing"
       @resizestop="resizeVideostop"
       @dragstop="resizeVideostop"
@@ -76,17 +76,6 @@
       <!--        -->
       <div class="videowall"></div>
       <div class="showBtnList">
-        <!-- <i class="el-icon-copy-document" @click="showInstructions"></i> -->
-        <!-- <i
-          class="iconfont icon-fullscreen fullscreen"
-          @click="fullPageVideo"
-          v-if="!fullscreenVideo"
-        ></i>
-        <i
-          class="iconfont icon-tubiao-huanyuan huanyuan"
-          @click="resetVideo"
-          v-else
-        ></i> -->
         <i class="el-icon-close" @click="showVideo = false"></i>
       </div>
       <video
@@ -104,8 +93,8 @@
 <script>
 import screenfull from "screenfull";
 import VueDragResize from "vue-drag-resize";
-import { instructionList } from "@/constant/instructionList";
-import { operationLog } from "./api"
+import { instructionList, keyOfValue } from "@/constant/instructionList";
+import { operationLog } from "./api";
 const defaultSettings = require("@/settings.js");
 
 export default {
@@ -129,15 +118,26 @@ export default {
       videoW: 640,
       videoH: 390,
       isShowBtn: false,
+      str: "",
     };
   },
   mounted() {
     this.initSize();
-          this.setBtnStatus(this.$route)
+    this.setBtnStatus(this.$route);
     // document.onfullscreenchange = this.resizeI;
+    window.addEventListener("resize", this.resizeWindow);
   },
   beforeDestroy() {},
   methods: {
+    resizeWindow() {
+      if (this.isShow) {
+        this.isShow = false;
+        this.$nextTick((res) => {
+          this.initSize();
+          this.isShow = true;
+        });
+      }
+    },
     initSize() {
       let clientWidth =
         document.documentElement.clientWidth || document.body.clientWidth;
@@ -160,11 +160,14 @@ export default {
         this.isResizing = false;
       }, 500);
     },
+    onResizingVideo(e){
+      this.isResizing = true;
+           this.videoH = Math.abs(e.height);
+        this.videoW = Math.abs(e.width);
+    },
     resizeVideostop(e) {
-      if (!this.fullscreenVideo) {
         this.videoH = Math.abs(e.height);
         this.videoW = Math.abs(e.width);
-      }
       setTimeout(() => {
         this.isResizing = false;
       }, 500);
@@ -198,62 +201,96 @@ export default {
         this.isShow = true;
       });
     },
-    fullPageVideo() {
-      this.isShow = false;
-      this.$nextTick((res) => {
-        const bodyEle = document.querySelector(".app-main");
-        this.videoH = this.docY - this.y;
-        // document.querySelector('#instructions .content-container').style.width = this.w+'px'
-        this.videoW = bodyEle.clientWidth;
-        this.x = 210;
-        this.y = 130;
-        this.isShow = true;
-      });
-    },
+    // fullPageVideo() {
+    //   this.isShow = false;
+    //   this.$nextTick((res) => {
+    //     const bodyEle = document.querySelector(".app-main");
+    //     this.videoH = this.docY - this.y;
+    //     // document.querySelector('#instructions .content-container').style.width = this.w+'px'
+    //     this.videoW = bodyEle.clientWidth;
+    //     this.x = 210;
+    //     this.y = 130;
+    //     this.isShow = true;
+    //   });
+    // },
     // onDragging(e){
 
     // },
     // onDragstop(e){},
-    showInstructions() {
+    async showInstructions() {
+      this.initSize()
+      if (!this.isShow) {
+        // 埋点
+        try {
+          const res = await operationLog({
+            operateName: this.str,
+            interfaceUrl: this.$route.path,
+          });
+        } catch (e) {}
+        // console.log("埋点");
+      }
       this.isShow = !this.isShow;
     },
-        setBtnStatus(to){
-          let str = ''
+    setBtnStatus(to) {
+      this.str = "";
       if (instructionList.hasOwnProperty(to.path)) {
         this.isShowBtn = true;
+        // this.$emit('checkShow',this.isShowBtn)
         // console.log(Object.prototype.toString.call(instructionList[to.path]),instructionList[to.path])
         if (
           Object.prototype.toString.call(instructionList[to.path]) ===
           "[object Object]"
         ) {
           // 对象 肯定是详情页
+          // console.log('状态',to.query[keyOfValue[to.path]])
+          let obj = {};
+          if (instructionList[to.path][to.query[keyOfValue[to.path]]]) {
+            let parameter = to.query[keyOfValue[to.path]];
+            obj = { ...instructionList[to.path][parameter] };
+          } else {
+            obj = instructionList[to.path];
+          }
+
           if (!to.query.tabrouter) {
-           let some = Object.keys(instructionList[to.path])[0]
-            this.url = `/html/index.html#g=1&p=${
-              instructionList[to.path][some]
-            }`;
-            str =  instructionList[to.path][some]
+            let some = Object.keys(obj)[0];
+            this.url = `/html/index.html#g=1&p=${obj[some]}`;
+            this.str = obj[some];
           } else {
-            if(instructionList[to.path][to.query.tabrouter]){
-               this.url = `/html/index.html#g=1&p=${
-              instructionList[to.path][to.query.tabrouter]
-            }`;
-            str = instructionList[to.path][to.query.tabrouter]
-            }else{
+            this.str = obj[to.query.tabrouter];
+            // if (
+            //   to.path == "/business/resetTeaming" &&
+            //   to.query.tabrouter == "11"
+            // ) {
+            //   to.query.team_status == "APPLY"
+            //     ? (this.str = "乐团报名")
+            //     : (this.str = "乐团缴费");
+            // }
+            // if (
+            //   to.path == "/business/resetTeaming" &&
+            //   (to.query.tabrouter == "3" || to.query.tabrouter == "6") &&
+            //   to.query.team_status == "PROGRESS"
+            // ) {
+            //   this.str = "缴费项目创建";
+            // }
+
+            if (obj[to.query.tabrouter]) {
+              this.url = `/html/index.html#g=1&p=${this.str}`;
+
+              // 判断一下  如果是乐团详情  就判断
+            } else {
               this.isShowBtn = false;
             }
-
           }
         } else {
           // 字符串
           this.url = `/html/index.html#g=1&p=${instructionList[to.path]}`;
-          str = instructionList[to.path]
+          this.str = instructionList[to.path];
         }
-
       } else {
         this.isShowBtn = false;
       }
-      console.log(str)
+      console.log(this.isShowBtn);
+      this.$emit("checkShow", this.isShowBtn);
     },
     showFullPage() {},
     resetVideo() {},
@@ -286,25 +323,23 @@ export default {
         this.y == 130
       );
     },
-    fullscreenVideo() {
-      const bodyEle = document.querySelector(".app-main");
-      return (
-        this.videoH == this.docY - this.y &&
-        this.videoW == bodyEle.clientWidth &&
-        this.x == 210 &&
-        this.y == 130
-      );
-    },
-
+    // fullscreenVideo() {
+    //   const bodyEle = document.querySelector(".app-main");
+    //   return (
+    //     this.videoH == this.docY - this.y &&
+    //     this.videoW == bodyEle.clientWidth &&
+    //     this.x == 210 &&
+    //     this.y == 130
+    //   );
+    // },
   },
   watch: {
     $route(to, from) {
       this.isShow = false;
-      this.setBtnStatus(to)
+      this.setBtnStatus(to);
     },
     isShow(val) {
       if (val) {
-
         this.$nextTick((res) => {
           let outFrame = this.$refs.iframe;
           let outFrameWindow = this.$refs.iframe.contentWindow;
@@ -323,6 +358,12 @@ export default {
                     );
                     this.src = e.path[i].getAttribute("selectiongroup");
                     this.showVideo = true;
+                    this.$nextTick(res=>{
+                      this.isShow = false;
+                    })
+
+
+                    // this.isShow = false;
                     break;
                   }
                 }
@@ -359,11 +400,20 @@ export default {
 }
 .content-container {
   .showBtnList {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-around;
     font-size: 20px;
     position: absolute;
     right: 5px;
-    top: 5px;
+    top: 0;
     background-color: #ccc;
+    height: 30px;
+
+    .icon {
+      line-height: 30px;
+    }
   }
 }
 .wall {
@@ -376,13 +426,21 @@ export default {
   background-color: #ccc;
 }
 .fullscreen {
-  margin-left: 10px;
+  padding:0 5px;
   font-size: 20px;
 }
 .huanyuan {
-  margin-left: 10px;
+  padding:0 5px;
   font-size: 22px;
 }
+.newPageBtn {
+  font-size: 14px;
+  line-height: 30px;
+  color: #14928A;
+  height: 30px;
+  display: inline-block;
+
+}
 </style>
 <style lang="scss">
 .instructionBtn {

+ 1 - 1
src/views/teamDetail/teamList.vue

@@ -479,7 +479,7 @@ export default {
        localStorage.removeItem(`newTeambase`);
     this.$router.push({
             path: "/business/resetTeaming",
-              query: { type: "newTeam"}},
+              query: { type: "newTeam",team_status:'newTeam'}},
             (router) => {
               router.meta.title = "新建乐团";
             }