Merge branch 'test' of https://git.agilestar.cn/spfm-group/spfm-market-front into test

 Conflicts:

	public/static/views/ecClubWork.html

public/static/views/ecClubWork.html

@@ -234,8 +234,10 @@
                         if(data.result == 0){
                             getData()
                         }else if(data.result == 2){
-
-                            alert(data.desc)
+                            window.top.$vm.$message({
+                            message: data.desc,
+                            type: 'error'
+                            })
                         }
 
                     });

src/pages/main/ecClubWork/index.vue

@@ -3,7 +3,9 @@
 	<fullscreen :fullscreen.sync="fullscreen" class="container">
 		<div class="container-box">
 			<toolList @iconCli='iconCli' :tooltit='tooltit'></toolList>
-			<div style="overflow: hidden;margin: 10px 0;" v-if="exa">
+			<!-- 以前的'添加'按钮权限 -->
+			<!-- <div style="overflow: hidden;margin: 10px 0;" v-if="exa"> -->
+			<div style="overflow: hidden;margin: 10px 0;" v-if="userInfo.loginNoStr == 'zhangyuchen'">
 				<el-button class="btn-check" style="float: right;" size="medium" type="primary" @click="dialogCheck(2)">
 					添加
 				</el-button>
@@ -66,7 +68,7 @@
 				delid: '',
 				loading: false,
 				loadinged: false,
-				exa: false
+				// exa: false
 			}
 		},
 		methods: {
@@ -136,18 +138,22 @@
 					this.fullscreen = !this.fullscreen
 				}
 			},
-			ctrlbtn() {
-				let menus = JSON.parse(window.sessionStorage.childrenMenus);
-				for (let i = 0; i < menus.length; i++) {
-					if (menus[i].jspUrl === '/ecClubWorkexa' && menus[i].systemflag === '1') {
-						this.exa = true;
-						return
-					}
-				}
-			},
+			//以前的'添加'按钮权限
+			// ctrlbtn() {
+				
+			// 	let menus = JSON.parse(window.sessionStorage.childrenMenus);
+			// 	for (let i = 0; i < menus.length; i++) {
+			// 		if (menus[i].jspUrl === '/ecClubWorkexa' && menus[i].systemflag === '1') {
+			// 			this.exa = true;
+			// 			return
+			// 		}
+			// 	}
+			// },
 			getUser() {
-				let menus = JSON.parse(window.sessionStorage.menus);
-				this.ctrlbtn(menus);
+				//以前的'添加'按钮权限
+				// let menus = JSON.parse(window.sessionStorage.menus);
+				// this.ctrlbtn(menus);
+
 				this.userInfo = JSON.parse(window.sessionStorage.userInfo);
 				this.infolist = {
 					opNo: '',