diff --git a/fuintAdmin/src/layout/components/Navbar.vue b/fuintAdmin/src/layout/components/Navbar.vue
index ec4a48cfc..0b6f19644 100644
--- a/fuintAdmin/src/layout/components/Navbar.vue
+++ b/fuintAdmin/src/layout/components/Navbar.vue
@@ -21,19 +21,19 @@
 <!--        </div>-->
         <search id="header-search" class="right-menu-item" />
         <span style="margin-right: 10px; ">搜索</span>
-      <div class="d-s">
+      <div class="d-s"  @click="click" >
         <div class="icon-img">
           <img src="../../../src/assets/new/t-fangda.png" alt="">
         </div>
         放大
       </div>
-      <div class="d-s">
+      <div class="d-s" @click="goToWebsite()" >
         <div class="icon-img">
           <img src="../../../src/assets/new/t-sjdp.png" alt="">
         </div>
         收银台
       </div>
-      <div class="d-s">
+      <div class="d-s" @click="prompt()" >
         <div class="icon-img">
           <img src="../../../src/assets/new/t-syt.png" alt="">
         </div>
@@ -105,6 +105,7 @@ import FuintDoc from '@/components/Fuint/Doc'
 import ScreenData from '@/components/ScreenData'
 import {getCountdownApi} from "@/api/store";
 import {ljStoreInfo} from "@/api/staff/store";
+import screenfull from "screenfull";
 
 export default {
   data() {
@@ -112,6 +113,7 @@ export default {
       // 遮罩层
       day: -1,
       storeName:"",
+      isFullscreen: false
     }
   },
   components: {
@@ -153,6 +155,24 @@ export default {
     this.getStore()
   },
   methods: {
+    prompt(){
+      this.$message({ message: '此功能暂未开放，敬请期待', type: 'warning' })
+    },
+    goToWebsite() {
+      window.open('https://cashier.youkerr.com/')
+      this.toggleFullscreen()
+    },
+    toggleFullscreen() {
+      if (document.documentElement.requestFullscreen) {
+        document.documentElement.requestFullscreen();
+      } else if (document.documentElement.mozRequestFullScreen) { // Firefox
+        document.documentElement.mozRequestFullScreen();
+      } else if (document.documentElement.webkitRequestFullscreen) { // Chrome, Safari and Opera
+        document.documentElement.webkitRequestFullscreen();
+      } else if (document.documentElement.msRequestFullscreen) { // IE/Edge
+        document.documentElement.msRequestFullscreen();
+      }
+    },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
       console.log(this.sidebar.opened)
@@ -184,6 +204,26 @@ export default {
           this.day = res.data
         }
       })
+    },
+    click() {
+      if (!screenfull.isEnabled) {
+        this.$message({ message: '你的浏览器不支持全屏', type: 'warning' })
+        return false
+      }
+      screenfull.toggle()
+    },
+    change() {
+      this.isFullscreen = screenfull.isFullscreen
+    },
+    init() {
+      if (screenfull.isEnabled) {
+        screenfull.on('change', this.change)
+      }
+    },
+    destroy() {
+      if (screenfull.isEnabled) {
+        screenfull.off('change', this.change)
+      }
     }
   }
 }
diff --git a/fuintAdmin_zt/src/assets/images/loin-back.png b/fuintAdmin_zt/src/assets/images/loin-back.png
new file mode 100644
index 000000000..833c575d4
Binary files /dev/null and b/fuintAdmin_zt/src/assets/images/loin-back.png differ
diff --git a/fuintAdmin_zt/src/assets/images/ztlogin.png b/fuintAdmin_zt/src/assets/images/ztlogin.png
new file mode 100644
index 000000000..bfbbab091
Binary files /dev/null and b/fuintAdmin_zt/src/assets/images/ztlogin.png differ
diff --git a/fuintAdmin_zt/src/views/Site/add.vue b/fuintAdmin_zt/src/views/Site/add.vue
index 040eef8fb..987aceab7 100644
--- a/fuintAdmin_zt/src/views/Site/add.vue
+++ b/fuintAdmin_zt/src/views/Site/add.vue
@@ -28,7 +28,7 @@ export default {
       tableData: [{
         id: 1,
         label: '系统首页',
-
+        list:[{show:true,name:'选中'},]
       }, {
         id: 2,
         label: '机构管理',
@@ -38,21 +38,18 @@ export default {
             label: '组织架构',
             name: '王小虎',
             address: '上海市普陀区金沙江路 1519 弄',
-
             childrens: [{
               id: 31,
               label: '用户信息',
-
               list:[{show:true,name:'新增'},{show:true,name:'修改'},{show:true,name:'重置密码'},]
             }, {
               id: 32,
               label: '机构信息',
-
               list:[{show:true,name:'保存'},]
             }]
           },
         ]
-        // list:[{show:true,name:'选项一'},{show:true,name:'选项二'},{show:true,name:'选项三'},]
+
 
       },  {
         id: 4,
@@ -156,7 +153,6 @@ export default {
           <el-input  v-model="ruleForm.description"></el-input>
         </el-form-item>
       </div>
-
     </el-form>
   </div>
   <div class="center-box">
@@ -167,15 +163,11 @@ export default {
       border
       default-expand-all
       :tree-props="{children: 'childrens', hasChildren: 'hasChildren'}">
-
       <el-table-column
         prop="label"
         label="菜单"
-
         width="180">
-
       </el-table-column>
-
       <el-table-column
         prop="address"
         label="功能">
@@ -183,14 +175,12 @@ export default {
           <div style="display: flex;align-items: center">
             <div class="f-box" v-for="(item,index) in scope.row.list" :key="index"> <img v-if="item.show == true" style="width: 15px;height: 15px;margin-right: 5px" src="../../assets/images/xz.png">  <div v-else class="k_"  ></div>  {{item.name}} </div>
           </div>
-
         </template>
       </el-table-column>
     </el-table>
     <div style="display: flex">
       <el-button @click="resetForm('ruleForm')">取消</el-button>
       <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
-
     </div>
   </div>
 </div>
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index 69c081ca2..9cecacdf4 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -33,6 +33,7 @@
       <el-col :span="18">
         <el-card style="margin-bottom: 20px;">
           <el-tabs v-model="activeName" @tab-click="handleClick">
+<!--        用户信息    -->
             <el-tab-pane label="用户信息" name="list">
 
             <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
@@ -70,10 +71,6 @@
                   ></el-option>
                 </el-select>
               </el-form-item>
-
-
-
-
               <el-form-item label="" prop="accountStatus">
                 <el-select
                   v-model="queryParams.accountStatus"
@@ -193,6 +190,7 @@
             />
   <!--          tab第一张-->
               </el-tab-pane>
+<!--       机构信息     -->
             <el-tab-pane  label="机构信息" name="info">
 
                 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="demo-ruleForm">
@@ -297,10 +295,10 @@
                           <span v-if="isTopDept">
                             <el-radio-group  :disabled="isTopDept" v-model="ruleForm.turnoverType" @input="changeTheBillingRule">
                               <el-radio v-if="ruleForm.turnoverType=='1'" label=1>无限制</el-radio>
+                              <el-radio v-if="ruleForm.turnoverType=='5'" label=5>年付费</el-radio>
                               <el-radio v-if="ruleForm.turnoverType=='2'" label=2>时间限制</el-radio>
                               <el-radio v-if="ruleForm.turnoverType=='3'" label=3>预付费</el-radio>
                               <el-radio v-if="ruleForm.turnoverType=='4'" label=4>后付费</el-radio>
-                              <el-radio v-if="ruleForm.turnoverType=='5'" label=5>年付费</el-radio>
                             </el-radio-group>
                           </span>
                           <span v-else>
@@ -313,6 +311,38 @@
                             </el-radio-group>
                           </span>
                         </el-form-item>
+                        <div>
+
+                        </div>
+                        <el-table
+                          :data="tableData"
+                          border
+                          style="width: 100%;margin-left: 55px ">
+                          <el-table-column
+                            prop="price"
+                            label="价格（元）">
+                          </el-table-column>
+                          <el-table-column
+                            prop="yprice"
+                            label="已付金额（元）">
+                          </el-table-column>
+                          <el-table-column
+                            prop="address"
+                            label="系统生效时间">
+                          </el-table-column>
+                          <el-table-column
+                            prop="status"
+                            label="状态">
+                          </el-table-column>
+                          <el-table-column
+                            prop="upadate"
+                            label="创建时间">
+                          </el-table-column>
+                          <el-table-column
+                            prop="name"
+                            label="创建人">
+                          </el-table-column>
+                        </el-table>
                       </el-col>
                     </el-row>
                     <el-row>
@@ -444,8 +474,6 @@
                       </template>
                     </el-row>
                   </template>
-
-
                   <template v-if="ruleForm.deptType == '3'">
                     <el-row >
                       <el-col :span="20">
@@ -464,10 +492,8 @@
                           </span>
                         </el-form-item>
                       </el-col>
-
                     </el-row>
                     <el-row>
-
                       <template v-if="ruleForm.turnoverType === '2'">
                         <el-col :span="12">
                           <el-row>
@@ -602,6 +628,7 @@
 
 
               </el-tab-pane>
+<!--       角色信息     -->
             <el-tab-pane label="角色信息" name="duty">
               <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" label-width="100px">
                 <el-form-item label="" prop="dutyName">
@@ -937,7 +964,15 @@ export default {
         isTopDept:true,
         parentDeptType:"",
         isAdd:false,
-
+        tableData: [{
+          price:2000,
+          yprice:2500,
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄',
+          status:'进行中',
+          upadate: '2016-05-02',
+        }, ],
 
         timeFrame:[],
         value10:true,
@@ -2177,7 +2212,7 @@ export default {
   }
   .left-box{
     box-sizing: border-box;
-    height: 80vh;
+    height: 85vh;
     padding: 15px;
     overflow-y: auto; /* 只显示垂直滚动条 */
   }
diff --git a/fuintAdmin_zt/src/views/login.vue b/fuintAdmin_zt/src/views/login.vue
index efcca23bd..8c121ab14 100644
--- a/fuintAdmin_zt/src/views/login.vue
+++ b/fuintAdmin_zt/src/views/login.vue
@@ -2,12 +2,12 @@
   <div class="login">
     <div class="box-center">
       <div class="box-left">
-        <div class="bai-size">百业兴智慧加油站-中台</div>
-        <div class="bact-box">
-          <div class="sanhh">活动营销</div>
-          <div class="sanhh">节省人力</div>
-          <div class="sanhh">精准定位</div>
-        </div>
+<!--        <div class="bai-size">百业兴智慧加油站-中台</div>-->
+<!--        <div class="bact-box">-->
+<!--          <div class="sanhh">活动营销</div>-->
+<!--          <div class="sanhh">节省人力</div>-->
+<!--          <div class="sanhh">精准定位</div>-->
+<!--        </div>-->
       </div>
       <div class="box-right">
         <div class="box-title">
@@ -310,7 +310,7 @@ export default {
   height: 100vh;
   width: 100%;
   position: relative;
-  background-image: url("../assets/images/backbbj.png");
+  background-image: url("../assets/images/loin-back.png");
   overflow: hidden;
   background-size: cover;
   background-repeat: no-repeat;
@@ -338,7 +338,7 @@ export default {
     width: 50%;
     height: 100%;
     background: #00aaff;
-    background-image: url("../assets/images/box-left.png");
+    background-image: url("../assets/images/ztlogin.png");
     background-size: cover;
     background-repeat: no-repeat;
     background-position: center;