zouling преди 11 месеца
родител
ревизия
8d5b650a40
променени са 5 файла, в които са добавени 39 реда и са изтрити 33 реда
  1. 3 2
      components/footer/footer.vue
  2. 3 3
      pages.json
  3. 31 26
      pages/video/index.vue
  4. 1 1
      work/pages/yyorder/eatlist.vue
  5. 1 1
      work/pages/yyorder/meetlist.vue

+ 3 - 2
components/footer/footer.vue

@@ -26,9 +26,9 @@
             return{
 				active :'',
 				footlist:[
-					// limit:'idcard:idcard:list',
+					// limit:'system:camera:video',
 					{module:'home',title:'首页',img:"imga",icon_checked:require('@/static/images/tabbar/home_.png'),icon_nochecked:require('@/static/images/tabbar/home.png')},
-					{module:'video',title:'门禁',img:"imgb",icon_checked:require('@/static/images/tabbar/video_.png'),icon_nochecked:require('@/static/images/tabbar/video.png'),},
+					{module:'video',title:'门禁',img:"imgb",icon_checked:require('@/static/images/tabbar/video_.png'),icon_nochecked:require('@/static/images/tabbar/video.png'),limit:'system:camera:video'},
 					{module:'mine',title:'我的',img:"imga",icon_checked:require('@/static/images/tabbar/mine_.png'),icon_nochecked:require('@/static/images/tabbar/mine.png')},
 					],
 				color_checked :'161616',
@@ -40,6 +40,7 @@
 			this.active = this.footerindex;
 		},
         methods:{
+			checkPermi, checkRole,
             // 跳转底部导航页面
 			gotopage(e){
 				var that = this;

+ 3 - 3
pages.json

@@ -225,14 +225,14 @@
 			{
 				"path": "pages/yyorder/eatlist",
 				"style": {
-					"navigationBarTitleText": "我的就餐预订",
+					"navigationBarTitleText": "就餐预订",
 					"navigationStyle": "custom"
 				}
 			},
 			{
 				"path": "pages/yyorder/eatlistday",
 				"style": {
-					"navigationBarTitleText": "我的就餐预订",
+					"navigationBarTitleText": "就餐预订",
 					"navigationStyle": "custom"
 				}
 			},
@@ -253,7 +253,7 @@
 			{
 				"path": "pages/yyorder/meetlist",
 				"style": {
-					"navigationBarTitleText": "我的会议预订",
+					"navigationBarTitleText": "会议预订",
 					"navigationStyle": "custom"
 				}
 			},

+ 31 - 26
pages/video/index.vue

@@ -46,31 +46,34 @@
 				</view>
 			</view>
 			<!-- 列表 -->
-			<view class="vlisttop flexcj">
-				<view class="vlleft flexc" @click="getResetFn">
-					<image :src="mjimg"></image>门禁记录
-				</view>
-				<picker mode="date" @change='bindDateChangeb'>
-					<view class="rlleft flexc">
-						<view>{{daytime||"请选择日期"}}</view>
-						<image :src="hupimg"></image>
+			<block v-if="checkPermi(['system:door:list'])">
+				<view class="vlisttop flexcj">
+					<view class="vlleft flexc" @click="getResetFn">
+						<image :src="mjimg"></image>门禁记录
 					</view>
-				</picker>
-			</view>
-			<!-- 表格 -->
-			<view class="table" :style="tabflag?'height:calc(100vh - '+tabscheight+'rpx)':''">
-				<zb-table
-				  :show-header="true"
-				  :columns="column1"
-				  :stripe="true"
-				  :fit="true"
-				  :isShowLoadMore="reachflag"
-				  :parameter="parameter"
-				  :data="list"></zb-table>
-				  <!-- @rowClick="rowClick"
-				  @toggleRowSelection="toggleRowSelection"
-				  @toggleAllSelection="toggleAllSelection"   -->
-			</view>
+					<picker mode="date" @change='bindDateChangeb'>
+						<view class="rlleft flexc">
+							<view>{{daytime||"请选择日期"}}</view>
+							<image :src="hupimg"></image>
+						</view>
+					</picker>
+				</view>
+				<!-- 表格 -->
+				<view class="table" :style="tabflag?'height:calc(100vh - '+tabscheight+'rpx)':''">
+					<zb-table
+					  :show-header="true"
+					  :columns="column1"
+					  :stripe="true"
+					  :fit="true"
+					  :isShowLoadMore="reachflag"
+					  :parameter="parameter"
+					  :data="list"></zb-table>
+					  <!-- @rowClick="rowClick"
+					  @toggleRowSelection="toggleRowSelection"
+					  @toggleAllSelection="toggleAllSelection"   -->
+				</view>
+			</block>
+			
 		</view>
 		
 		<!-- 第一道;手机号,发送验证码,门就开,记录车牌号,直接进
@@ -254,7 +257,9 @@
 			this.daytime = y + '-' + (m < 10 ? ('0' + m) : m) + '-' + (d < 10 ? ('0' + d) : d)
 			// var timeStr = (h < 10 ? ('0' + h) : h) + ':' + (min < 10 ? ('0' + min) : min) + ':' + (s < 10 ? (
 			// 	'0' + s) : s);
-			this.getDataFn()
+			if(checkPermi(['system:door:list'])){
+				this.getDataFn()
+			}
 		},
 		getLivePlayer() {
 		    uni.showLoading({
@@ -357,7 +362,7 @@
 			this.getrefreshData()
 		},
 		bindDateChangeb(e){
-			this.daytime=e.detail.value
+			this.daytime=e.detail.value;
 			this.getrefreshData()
 		},
 		getrefreshData(){

+ 1 - 1
work/pages/yyorder/eatlist.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="navbox">
-			<uni-nav-bar color="#ffffff" left-icon="left" title="我的就餐预订" :background-color="backgroundColor"
+			<uni-nav-bar color="#ffffff" left-icon="left" title="就餐预订" :background-color="backgroundColor"
 				:border="false" statusBar='true' fixed="true" @clickLeft='getBack'>
 			</uni-nav-bar>
 			<view class="plr16" :style="'background:'+backgroundColor">

+ 1 - 1
work/pages/yyorder/meetlist.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="navbox">
-			<uni-nav-bar color="#ffffff" left-icon="left" title="我的会议预订" :background-color="backgroundColor"
+			<uni-nav-bar color="#ffffff" left-icon="left" title="会议预订" :background-color="backgroundColor"
 				:border="false" statusBar='true' fixed="true" @clickLeft='getBack'>
 			</uni-nav-bar>
 			<view class="plr16" :style="'background:'+backgroundColor">