yuwenjun1997 2 gadi atpakaļ
vecāks
revīzija
afad971b34

+ 4 - 4
.env.development

@@ -4,13 +4,13 @@ NODE_ENV = development
 ENV = 'development'
 
 # 测试地址 API接口
-# VUE_APP_BASE_API = 'https://zplma-b.caimei365.com'
-VUE_APP_BASE_API = 'http://192.168.2.200:8012'
+VUE_APP_BASE_API = 'https://zplma-b.caimei365.com'
+# VUE_APP_BASE_API = 'http://192.168.2.92:8012'
 # VUE_APP_BASE_API = 'http://192.168.2.67:8012'
 
 # 文件上传 API接口地址
-# VUE_APP_UPLOAD_API='https://zplma-b.caimei365.com'
-VUE_APP_UPLOAD_API='http://192.168.2.200:8012'
+VUE_APP_UPLOAD_API='https://zplma-b.caimei365.com'
+# VUE_APP_UPLOAD_API='http://192.168.2.92:8012'
 # VUE_APP_UPLOAD_API='http://192.168.2.67:8012'
 
 # 二维码生成链接location

+ 4 - 4
src/layout/components/Navbar.vue

@@ -48,7 +48,7 @@
         </el-dropdown-menu>
       </el-dropdown>
     </div>
-    <vip-tip-dialog />
+    <!-- <vip-tip-dialog /> -->
   </div>
 </template>
 
@@ -63,7 +63,7 @@ import Screenfull from '@/components/Screenfull'
 // import NoticeTodo from './NoticeTodo'
 import AvatarWrapper from './AvatarWrapper'
 import UserCard from './UserCard'
-import VipTipDialog from './VipTipDialog'
+// import VipTipDialog from './VipTipDialog'
 
 export default {
   components: {
@@ -72,8 +72,8 @@ export default {
     // ErrorLog,
     Screenfull,
     AvatarWrapper,
-    UserCard,
-    VipTipDialog
+    UserCard
+    // VipTipDialog
     // NoticeTodo
     // Search
   },

+ 4 - 0
src/layout/index.vue

@@ -12,6 +12,8 @@
         <settings />
       </right-panel>
     </div>
+    <!-- vip dialog -->
+    <vip-tip-dialog />
   </div>
 </template>
 
@@ -20,6 +22,7 @@ import RightPanel from '@/components/RightPanel'
 import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
 import { mapState } from 'vuex'
+import VipTipDialog from './components/VipTipDialog'
 
 export default {
   name: 'Layout',
@@ -28,6 +31,7 @@ export default {
     Navbar,
     RightPanel,
     Settings,
+    VipTipDialog,
     Sidebar,
     TagsView
   },

+ 5 - 1
src/views/components/AssociatedClubList/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="associated-club-list">
-    <div class="filter-container">
+    <div v-if="showFilter" class="filter-container">
       <div class="filter-control">
         <span>机构名称:</span>
         <el-input v-model="listQuery.authParty" placeholder="机构名称" size="mini" @keyup.enter.native="handleFilter" />
@@ -64,6 +64,10 @@ export default {
     height: {
       type: String,
       default: ''
+    },
+    showFilter: {
+      type: Boolean,
+      default: true
     }
   },
   data() {

+ 1 - 0
src/views/normal/club/device/index.vue

@@ -120,6 +120,7 @@
         class="associated-club-list"
         :selection="false"
         :control="true"
+        :show-filter="false"
         height="300"
         :list="assClubList"
       >