Merge branch 'dev' of http://git.2weisou.com/liumin/NewZkgj into dev

pages/index/customer.vue

@@ -46,7 +46,9 @@
 			<view class="footer-button" v-if="item.status!=0">
 				<view class="footer1" @click.stop="addTime(item)">接待延时</view>
 				<view class="footer1" @click.stop="assign(item)">重新指派</view>
-				<view class="footer3" @click.stop="changeEnd(item.id)">结束接待</view>
+				<template v-if="endReception">
+					<view class="footer3" @click.stop="changeEnd(item.id)">结束接待</view>
+				</template>
 			</view>
 
 			<view class="centerbox" v-if="item.status==0">
@@ -81,6 +83,13 @@
 				addAccount: '',
 			};
 		},
+		computed: {
+			// 是否有结束接待的权限
+			endReception() {
+				let menulist = uni.getStorageSync('weapp_session_Menu_data')
+				return menulist.findIndex(item => { return item.name == '结束接待' }) != -1 
+			}
+		},
 		components: {},
 		onLoad() {},
 		onShow() {
@@ -91,6 +100,7 @@
 			} = uni.getStorageSync("weapp_session_userInfo_data");
 			this.addAccount = addAccount;
 			this.dataCode = dataCode;
+			console.log(this.menulist)
 			this.init()
 			this.queryHaveDept()
 			this.updateInit()

pages/index/index.vue

@@ -441,10 +441,10 @@
 			
 			//获取权限
 			getMenu(){
-				console.log("11111")
 				this.$u.get("/user/getMenu").then(data => {
 					uni.setStorageSync("weapp_session_Menu_data", data)
 					this.Menulist = uni.getStorageSync('weapp_session_Menu_data');
+					console.log(this.Menulist, 'adasdasds123')
 				})	
 			},
 			//自定义时间