LG88888888 3 years ago
parent
commit
c588813728

+ 5 - 3
common/router/index.js

@@ -2,20 +2,22 @@ import modules from './modules'
 import Vue from 'vue'
 import Router from '@/plugin/uni-simple-router/index.js'
 import {ACCESS_TOKEN} from '@/common/util/constants.js'
+import store from '@/store/index.js';
 
 Vue.use(Router)
 //初始化
  const router = new Router({
 	encodeURI:true,  
-    routes: [...modules]//路由表
+    routes: [...modules],//路由表
 }); 
 
    const whiteList = ['/pages/login/login'] 
 //全局路由前置守卫
   router.beforeEach((to, from, next) => {
 	  
-	let token=uni.getStorageSync(ACCESS_TOKEN);
-	if(token){
+	let token=store.getters.token
+	console.log(token)
+	 if(token!=null &&token!=""){
 		 next()
 	}else{
 		if (whiteList.indexOf(to.path) !== -1) {

+ 3 - 16
common/router/modules/routes.js

@@ -232,22 +232,9 @@ const routes = [
 		    meta: {
 		        title: '组织',
 		    },
-	},
-	{
-		    path: '/pages/user/appzf',
-		    name: 'appzf',
-		    meta: {
-		        title: '支付',
-		    },
-	},
-	{
-		    path: '/pages/user/userchat',
-		    name: 'userchat',
-		    meta: {
-		        title: '聊天',
-		    },
-	},
+	}
+	
 	
 	
 ]
-export default routes
+export default routes

+ 8 - 8
common/service/config.service.js

@@ -1,17 +1,17 @@
 let BASE_URL = ''
 
 
-/* if (process.env.NODE_ENV == 'development') {
-    BASE_URL = 'http://zdd.g.dr1997.com:8101/jeecg-boot' // 开发环境
-} else {
-	BASE_URL = 'http://zdd.g.dr1997.com:8101/jeecg-boot' // 生产环境
-} */
-
-if (process.env.NODE_ENV == 'development') {
+//  if (process.env.NODE_ENV == 'development') {
+//     BASE_URL = 'https://api.g.dr1997.com/jeecg-boot/' // 开发环境
+// } else {
+// 	BASE_URL = 'https://api.g.dr1997.com/jeecg-boot/' // 生产环境
+// } 
+ 
+ if (process.env.NODE_ENV == 'development') {
     BASE_URL = 'http://10.0.0.94:8080/jeecg-boot' // 开发环境
 } else {
 	BASE_URL = 'http://10.0.0.94:8080/jeecg-boot' // 生产环境
-}
+} 
 let staticDomainURL = BASE_URL+ '/sys/common/static';
 
 const configService = {

+ 6 - 3
common/service/service.js

@@ -78,13 +78,16 @@ http.interceptor.response(async (response) => { /* 请求之后拦截器 */
         case 500:
           if(!token || data.message=="Token失效,请重新登录"){
             let timeout=setTimeout(tip.alert('登录已过期'), 1000);
-            store.dispatch('Logout').then(() => {
+			uni.navigateTo({
+				url:'/pages/login/login'
+			}) 
+           /* store.dispatch('Logout').then(() => {
 				clearTimeout(timeout)
-                /* window.location.reload() */
+               
 				uni.navigateTo({
 					url:'/pages/login/login'
 				}) 
-            }) 
+            }) */
           }if(data.message=="该账号已在其它地方登录!"){
 			  store.dispatch('Logout').then(() => {
 			  	clearTimeout(timeout)

+ 0 - 9
pages.json

@@ -219,18 +219,9 @@
 		{
 			"path": "pages/user/userdt",
 			"style": {}
-		},
-		{
-			"path": "pages/user/appzf",
-			"style": {}
-		},
-		{
-			"path": "pages/user/userchat",
-			"style": {}
 		}
 		
 		
-		
 
 	],
 	"globalStyle": {

+ 21 - 37
pages/home/home.vue

@@ -1,11 +1,5 @@
 <template name="home">
 	<div>
-		<!-- <div class="top">
-			<div style="width: 100%;height: 10px;"></div>
-			<div style="text-align: center;">
-			<span style="color: #FFFFFF;">首页</span>
-			</div>
-		</div> -->
 			<cu-custom bgColor="bg-gradual-pink">
 				<block slot="content">首页</block>
 			</cu-custom>
@@ -30,29 +24,6 @@
 				</div>
 			</div>
 			<br>
-			
-			<!-- <swiper class="screen-swiper square-dot"  :indicator-dots="true" :circular="true"
-			 :autoplay="true" interval="5000" duration="500" :style="[{animation: 'show 0.2s 1'}]">
-				<swiper-item v-for="(item,index) in swiperList" :key="index">
-					<image :src="item.url" mode="aspectFill" v-if="item.type=='image'"></image>
-					<video :src="item.url" autoplay loop muted :show-play-btn="false" :controls="false" objectFit="cover" v-if="item.type=='video'"></video>
-				</swiper-item>
-			</swiper> -->
-			
-			<!-- 中部应用宫格 -->
-			<!-- <view class="bg-white"  :style="[{animation: 'show 0.4s 1'}]">
-				<view class="grid margin-bottom col-2 ">
-				  <navigator  v-for="(item,index) in middleApps" :key="index" :url="'/pages/home/' + item.name" class="nav-li" navigateTo
-					 :style="[{animation: 'show ' + ((index+1)*0.2+1) + 's 1'}]" hover-class="none">
-						<view class="flex align-center">
-							<image :src="'/static/home/'+item.icon"  mode="aspectFill" class="line2-icon"></image>
-							<view class="text-df">{{item.title}} <br/> <span class="text-light">{{item.text}}</span></view>
-						</view>
-					</navigator>	
-				</view>
-			</view> -->
-			<!-- 常用服务 -->
-			
 			<div class="itemt">
 			<view class="cu-bar bg-white solid-bottom"   :style="[{animation: 'show 0.6s 1'}]">
 				<view class="action">
@@ -105,7 +76,7 @@
 				immediate: true,
 				handler() {
 					console.log('watch',this.cur)
-				   /* this.initMenu() */
+				    this.initMenu()
 				},
 			},
 		},
@@ -158,20 +129,20 @@
 				  this.msgCount = 0
 				}
 				this.dot[page]=false
-				 if(page=="usersign" && org=="A01C294"){
+				/* if(page=="usersign" && org=="A01C294"){
 					this.$router.push({name:'empsign'})
 				}else if(page=="wages" && org=="A01C294"){
 					this.$router.push({name:'wagesuser'})
-				}else{ 
+				}else{ */
 					this.$router.push({name: page})
-				 }
+				// }
 				
 			},
 			initWebSocket: function () {
 				// WebSocket与普通的请求所用协议有所不同,ws等同于http,wss等同于https
 				var userId = this.$store.getters.userid;
-				var sessionId=this.$store.getters.sessionId;
-				var url = this.$config.apiUrl.replace("https://","wss://").replace("http://","ws://")+"/websocket/"+userId+"/"+sessionId;
+				var token=this.$store.getters.token;
+				var url = this.$config.apiUrl.replace("https://","wss://").replace("http://","ws://")+"/websocket/"+userId+"/"+token;
 				console.log('websocket url>>'+url);
 				this.websock = new WebSocket(url);
 				this.websock.onopen = this.websocketOnopen;
@@ -191,7 +162,20 @@
 			},
 			websocketOnmessage: function (e) {
 				console.log("-----接收消息-------",e.data);
-				var data = eval("(" + e.data + ")"); //解析对象
+				uni.showModal({
+					title: '⚡',//⚡❕
+					showCancel:false,
+					content: e.data,
+					confirmText: '确定',
+					success: res => {
+						this.$store.commit('SET_TOKEN',"");
+					 uni.navigateTo({
+						url:'/pages/login/login'
+					}) 
+					
+					}
+				})
+				/* var data = eval("(" + e.data + ")"); //解析对象
 				if(data.cmd == "topic"){
 				  //系统通知
 				  this.loadCount('1')
@@ -200,7 +184,7 @@
 				  this.loadCount('2')
 				} else if(data.cmd == 'email'){
 				  this.loadEmailCount()
-				}
+				} */
 		
 				//心跳检测重置
 				//this.heartCheck.reset().start();

+ 328 - 203
pages/login/login.vue

@@ -1,205 +1,330 @@
- <template>
-	 <div style="background-color: #F6F6F6;">
-    <view class="zai-box" >
-        <scroll-view scroll-y class="page">
-            <view style="text-align: center;">
-				<image src="/static/icon/gklog.jpeg" mode='aspectFit' class="zai-logo"></image>
-			</view>
-			<view class="zai-title"></view>
-            <view class="box padding-lr-xl login-paddingtop" :style="[{animation: 'show ' + 0.6+ 's 1'}]">
-
-                <view class="cu-form-group margin-top round shadow-blur">
-                    <view class="title">账号:</view>
-                    <input placeholder="请输入账号" name="input" v-model="userName"></input>
-                </view>
-                <view class="cu-form-group margin-top round">
-                    <view class="title">密码:</view>
-                    <input placeholder="请输入密码" name="input" type="password" v-model="password"></input>
-                </view>
-                <view class="padding  flex  flex-direction">
-                    <button class="cu-btn bg-green shadow-blur round lg" :loading="loading"
-                            @tap="onLogin"> {{loading ? "登录中...":"登 录"}}
-                    </button>
-                </view>
+<template>
+ 	<div style="background-color: #F6F6F6;">
+ 		<view class="zai-box">
+ 			<scroll-view scroll-y class="page">
+ 				<view style="text-align: center;">
+ 					<image src="/static/icon/gklog.jpeg" mode='aspectFit' class="zai-logo"></image>
+ 				</view>
+ 				<view class="zai-title"></view>
+ 				<view class="box padding-lr-xl login-paddingtop" :style="[{animation: 'show ' + 0.6+ 's 1'}]">
+
+ 					<view class="cu-form-group margin-top round shadow-blur">
+ 						<view class="title">账号:</view>
+ 						<input placeholder="请输入账号" name="input" v-model="userName"></input>
+ 					</view>
+ 					<view class="cu-form-group margin-top round">
+ 						<view class="title">密码:</view>
+ 						<input placeholder="请输入密码" name="input" type="password" v-model="password"></input>
+ 					</view>
+ 					<div style="height: 10px;"></div>
+ 					<view>
+ 						<checkbox-group @change="checkboxChange">
+ 							<ul>
+ 								<li>
+ 									<label>
+ 										<checkbox :value="checkbox[0].value" :class="checkbox[0].checked=='true'?'checked':''"
+ 											:checked="checkbox[0].checked=='true'?true:false" style="transform:scale(0.7)" />
+ 										记住密码
+ 									</label>
+ 								</li>
+ 								
+ 							</ul>
+ 						</checkbox-group>
+
+ 					</view>
+ 					<view class="padding  flex  flex-direction">
+ 						<button class="cu-btn bg-green shadow-blur round lg" :loading="loading" @tap="onLogin">
+ 							{{loading ? "登录中...":"登 录"}}
+ 						</button>
+ 					</view>
+
+ 				</view>
+
+ 			</scroll-view>
+
+ 			<!-- 登录加载弹窗 -->
+ 			<view class="cu-load load-modal" v-if="loading">
+ 				<image src="/static/login3.png" mode="aspectFit" style="top: 35px;"></image>
+ 				<view class="gray-text" style="margin-top: 35px;">登录中...</view>
+
+ 			</view>
+
+
+
+ 		</view>
+ 	</div>
+ </template>
+
+
+ <script>
+ 	import {
+ 		ACCESS_TOKEN,
+ 		USER_NAME,
+ 		USER_INFO
+ 	} from "@/common/util/constants"
+ 	import {
+ 		mapActions
+ 	} from "vuex"
+ 	import myImageUpload from "@/components/my-componets/my-image-upload.vue"
+ 	import mypage from "@/components/my-componets/my-page.vue"
+ 	import myselect from "@/components/my-componets/my-select.vue"
+ 	export default {
+ 		components: {
+ 			'my-image-upload': myImageUpload,
+ 			'my-select': myselect
+ 		},
+ 		data() {
+ 			return {
+ 				loading: false,
+				exitloading:false,
+ 				userName: '',
+ 				value: 1,
+ 				password: '',
+ 				phoneNo: '',
+ 				smsCode: '',
+ 				showPassword: false, //是否显示明文
+ 				loginWay: 1, //1: 账密,2:验证码
+ 				smsCountDown: 0,
+ 				smsCountInterval: null,
+ 				toggleDelay: false,
+ 				version: '',
+				timeoutid:null,
+ 				checkbox: [{
+ 					value: '1',
+ 					checked: 'false'
+ 				} ],
+ 			};
+ 		},
+ 		onLoad: function() {
+ 			// #ifdef APP-PLUS
+ 			var that = this
+ 			plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo) {
+ 				that.version = wgtinfo.version
+ 			});
+ 			// #endif
+
+ 			this.getCookie();
+			this.loadingLogin();
+			uni.getSystemInfo({
+			    success: function (res) {
+			        console.log(res.model);
+			        console.log(res.pixelRatio);
+			        console.log(res.windowWidth);
+			        console.log(res.windowHeight);
+			        console.log(res.language);
+			        console.log(res.version);
+			        console.log(res.system);
+			    }
+			});
+			
+ 		},
+ 		methods: {
+			loadingLogin(){
+				if(this.checkbox[1].checked=='true'){
+					this.onLogin();
+				}
+			},
+ 			//读取cookie
+ 			getCookie: function() {
+ 				if (document.cookie.length > 0) {
+ 					var arr = document.cookie.split('; '); //这里显示的格式需要切割一下自己可输出看下
+ 					for (var i = 0; i < arr.length; i++) {
+ 						var arr2 = arr[i].split('='); //再次切割
+ 						//判断查找相对应的值
+ 						if (arr2[0] == 'userName') {
+ 							this.userName = arr2[1]; //保存到保存数据的地方
+ 						} else if (arr2[0] == 'userPwd') {
+ 							this.password = arr2[1];
+ 						} else if (arr2[0] == 'pwdchecked') {
+ 							this.checkbox[0].checked = arr2[1];
+ 						}
+ 					}
+					console.log(this.checkbox)
+ 				}
+ 			},
+ 			//清除cookie
+ 			
+ 			setCookie(c_name, c_pwd, exdays, pwdche) {
+ 				var exdate = new Date(); //获取时间
+ 				exdate.setTime(exdate.getTime() + 24 * 60 * 60 * 1000 * exdays); //保存的天数
+ 				//字符串拼接cookie
+ 				window.document.cookie = "userName" + "=" + c_name + ";path=/;expires=" + exdate.toGMTString();
+ 				window.document.cookie = "userPwd" + "=" + c_pwd + ";path=/;expires=" + exdate.toGMTString();
+ 				window.document.cookie = "pwdchecked" + "=" + pwdche + ";path=/;expires=" + exdate.toGMTString();
 				
+ 			},
+ 			checkboxChange: function(e) {
+ 				var items = this.checkbox,
+ 					values = e.detail.value;
+					
+ 				for (var i = 0, lenI = items.length; i < lenI; ++i) {
+ 					items[i].checked = 'false';
+ 					for (var j = 0, lenJ = values.length; j < lenJ; ++j) {
+ 						if (items[i].value == values[j]) {
+								items[i].checked = 'true';
+ 							break
+ 						}
+ 					}
+ 				}
+ 			},
+ 			...mapActions(["mLogin", "PhoneLogin"]),
+
+ 			onLogin: function() {
+ 				if (!this.userName || this.userName.length == 0) {
+ 					this.$tip.toast('请填写用户名');
+ 					return;
+ 				}
+ 				if (!this.password || this.password.length == 0) {
+ 					this.$tip.toast('请填写密码');
+ 					return;
+ 				}
+ 				let loginParams = {
+ 					username: this.userName,
+ 					password: this.password
+ 				}
+ 				var pwd = this.checkbox;
+				var uname="";
+				var upwd="";
+				var pwdCheked=false;
+ 					if (this.checkbox[0].checked == 'true') {
+ 						uname=this.userName;
+						upwd=this.password;
+						pwdCheked=true;
+ 					}
+ 				
+				this.setCookie(uname,upwd,7,pwdCheked);
+ 				this.loading = true;
+				this.timeoutid=setTimeout(() => {
+ 					if (this.loading == true) {
+						this.exitloading = true;
+ 						this.mLogin(loginParams).then((res) => {
+ 							console.log("mLogin", res)
+ 							if (res.data.success) {
+ 								this.$tip.success('登录成功!')
+ 								this.$Router.replaceAll({
+ 									name: 'index'
+ 								})
+ 							} else {
+ 								this.$tip.alert(res.data.message);
+ 							}
+ 						}).catch((err) => {
+ 							let msg = err.data.message || "请求出现错误,请稍后再试"
+ 							this.$tip.alert(msg);
+ 						}).finally(() => {
+							this.loading=false;
+ 						})
+ 					}
+					
+ 				}, 3000);
 				
-            </view>
-        </scroll-view> 
-		<!-- 登录加载弹窗 -->
-		<view class="cu-load load-modal" v-if="loading">
-			<image src="/static/login3.png" mode="aspectFit"></image>
-			<view class="gray-text">登录中...</view>
-		</view>
-		
-    </view>
-</div>
-</template> 
-
-
-<script>
- import { ACCESS_TOKEN,USER_NAME,USER_INFO } from "@/common/util/constants"
-	import { mapActions } from "vuex"
-	import myImageUpload from "@/components/my-componets/my-image-upload.vue"
-	import mypage from "@/components/my-componets/my-page.vue"
-	import myselect from "@/components/my-componets/my-select.vue"
-    export default {
-		components:{
-			'my-image-upload':myImageUpload,
-			'my-select':myselect
-		},
-        data() {
-            return {
-				loading: false,
-				userName: '',
-				password: '',
-				phoneNo: '',
-				smsCode: '',
-				showPassword: false, //是否显示明文
-				loginWay: 1, //1: 账密,2:验证码
-				smsCountDown: 0,
-				smsCountInterval: null,
-				toggleDelay: false,
-				version:'',
-			
-            };
-        },
-		onLoad:function(){
-			// #ifdef APP-PLUS
-			var that=this
-			plus.runtime.getProperty( plus.runtime.appid, function ( wgtinfo ) {
-					that.version=wgtinfo.version
-				} );
-			// #endif
-			
-			console.log(this.$store.getters.indexId)
-		}, 
-        methods: {
-			 ...mapActions([ "mLogin","PhoneLogin" ]),
-			
-			onLogin: function (){
-			        if(!this.userName || this.userName.length==0){
-			          this.$tip.toast('请填写用户名');
-			          return;
-			        }
-			        if(!this.password || this.password.length==0){
-			           this.$tip.toast('请填写密码');
-			          return;
-			        }
-			        let loginParams = {
-			          username:this.userName,
-			          password:this.password
-			        }
-					this.loading=true; 
-					 /* this.$Router.push({name:'index'}) */
-			      this.mLogin(loginParams).then((res) => {
-					  
-					  console.log("mLogin",res)
-					  this.loading=false;
-			          if(res.data.success){
-						  this.$tip.success('登录成功!')
-						  this.$Router.replaceAll({name:'index'}) 
-						  
-			          }else{
-			              this.$tip.alert(res.data.message);
-			          }
-			        }).catch((err) => {
-			          let msg = err.data.message || "请求出现错误,请稍后再试"
-			          this.$tip.alert(msg);
-			        }).finally(()=>{
-					  this.loading=false;
-					}) 
-			      }
-        }
-    } 
-</script>
-
-
-
-<style>
-	.map_container{ 
-	    height: 300px; 
-	    width: 100%; 
-	} 
-	
-	.map { 
-	    height: 100%; 
-	    width: 100%; 
-	}
-    .login-paddingtop {
-        padding-top: 200 upx;
-    }
-
-    .zai-box {
-        padding: 0 20 upx;
-        padding-top: 100 upx;
-        position: relative;
-    }
-
-    .zai-logo {
-        width: 30%;
-      
-    }
-
-    .zai-title {
-       font-size: 58upx;
-       color: #000000;
-       text-align: center;
-	  
-    }
-
-    .input-placeholder, .zai-input {
-        color: #94afce;
-    }
-
-    .zai-label {
-        padding: 60 upx 0;
-        text-align: center;
-        font-size: 30 upx;
-        color: #a7b6d0;
-    }
-
-    .zai-btn {
-        background: #ff65a3;
-        color: #fff;
-        border: 0;
-        border-radius: 100 upx;
-        font-size: 36 upx;
-    }
-
-    .zai-btn:after {
-        border: 0;
-    }
-
-    /*按钮点击效果*/
-    .zai-btn.button-hover {
-        transform: translate(1 upx, 1 upx);
-    }
-
-.divimg{
-	background-image:url(../../static/home/beij3.jpeg) ;
-	position:fixed;
-	 
-	  top:0;
-	 
-	  left:0;
-	 
-	  width:100%;
-	 
-	  height:100%;
-	 
-	  min-width:1000px;
-	 
-	  z-index:-10;
-	 
-	  zoom:1;
-	background-repeat:no-repeat;
-	 
-	  background-size:cover;
-	 
-	  -webkit-background-size:cover;
-	 
-	  -o-background-size:cover;
-	 
-	  background-position:center0;
-}
-</style>
+				
+ 				/* this.$Router.push({name:'index'}) */
+
+ 			}
+ 		}
+ 	}
+ </script>
+
+
+
+ <style>
+ 	ul {
+ 		margin-left: -60px;
+ 	}
+
+ 	ul li {
+ 		list-style-type: none;
+ 		display: inline;
+ 		margin: 53px;
+
+ 	}
+
+ 	.map_container {
+ 		height: 300px;
+ 		width: 100%;
+ 	}
+
+ 	.map {
+ 		height: 100%;
+ 		width: 100%;
+ 	}
+
+ 	.login-paddingtop {
+ 		padding-top: 200 upx;
+ 	}
+
+ 	.zai-box {
+ 		padding: 0 20 upx;
+ 		padding-top: 100 upx;
+ 		position: relative;
+ 	}
+
+ 	.zai-logo {
+ 		width: 30%;
+
+ 	}
+
+ 	.zai-title {
+ 		font-size: 58upx;
+ 		color: #000000;
+ 		text-align: center;
+
+ 	}
+
+ 	.input-placeholder,
+ 	.zai-input {
+ 		color: #94afce;
+ 	}
+
+ 	.zai-label {
+ 		padding: 60 upx 0;
+ 		text-align: center;
+ 		font-size: 30 upx;
+ 		color: #a7b6d0;
+ 	}
+
+ 	.zai-btn {
+ 		background: #ff65a3;
+ 		color: #fff;
+ 		border: 0;
+ 		border-radius: 100 upx;
+ 		font-size: 36 upx;
+ 	}
+
+ 	.zai-btn:after {
+ 		border: 0;
+ 	}
+
+ 	/*按钮点击效果*/
+ 	.zai-btn.button-hover {
+ 		transform: translate(1 upx, 1 upx);
+ 	}
+
+ 	.divimg {
+ 		background-image: url(../../static/home/beij3.jpeg);
+ 		position: fixed;
+
+ 		top: 0;
+
+ 		left: 0;
+
+ 		width: 100%;
+
+ 		height: 100%;
+
+ 		min-width: 1000px;
+
+ 		z-index: -10;
+
+ 		zoom: 1;
+ 		background-repeat: no-repeat;
+
+ 		background-size: cover;
+
+ 		-webkit-background-size: cover;
+
+ 		-o-background-size: cover;
+
+ 		background-position: center0;
+ 	}
+ </style>

+ 1 - 41
pages/sign/empsign.vue

@@ -1,19 +1,5 @@
 <template>
 	<div style="background-color: #FFFFFF;">
-		<!-- <div class="top" @click="ret()">
-			<div style="width: 10%;height: 5px;"></div>
-			<div style="margin-left: 10px;">
-			<span style="float: left;width: 20px;height: 20px;">
-				<image src="../../static/icon/fanhui3.png" style="width: 18px;height: 18px;"></image>
-			</span>	
-			<div style="margin-top: 5px;">
-			<span style="color: #FFFFFF;">返回</span>
-			</div>
-			</div>
-			<div style="text-align: center;margin-top: -22px;">
-			<span style="color: #FFFFFF;">考勤情况</span>
-			</div>
-		</div> -->
 		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">考勤情况</block>
@@ -60,33 +46,7 @@
 		   </navigator>
 		  </view> 
 					</view>
-		<!-- <div style="background-color: #FFFFFF;">
-			<div style="margin-left: 10px;">
-			<ul>
-				<li class="s" v-for='(item,index) in data' >
-				<br>
-				<span class="imgs">
-					<image :src="item.avatar" class="imgs"></image>
-				</span>	
-				<div style="margin-left: 50px;margin-top: -40px;">
-					<div>
-						<h3>{{item.realname}}</h3>
-					</div>
-					<div style="margin-top: -27px;margin-left: 80px;">
-					<span style="margin-left: 15%;color: #0081FF;font-size: 15px;" >{{item.orgCodeTxt}}</span>
-					<span style="float: right;width: 20px;height: 10px;"></span>
-					<span style="float: right;color: #0081FF;font-size: 15px;" v-if='item.del=="2" ||item.del==2'@click="details(item.id)">当月考勤正常</span>
-					<span style="float: right;color: red;font-size: 15px;" v-if='item.del=="1" ||item.del==1'@click="details(item.id)">当月考勤异常</span>
-					</div>
-				</div>
-				<br>
-				<div style="width: 100%; height: 1px; border-top: solid #ACC0D8 1px;margin-top: 10px;"></div>
-				
-				</li>
-				
-			</ul>
-			</div>
-		</div> -->
+
 		
 		
 		

+ 2 - 15
pages/sign/empusersign.vue

@@ -1,19 +1,6 @@
 <template>
 	<div>
-		<!-- <div class="top" @click="ret()">
-			<div style="width: 10%;height: 5px;"></div>
-			<div style="margin-left: 10px;">
-			<span style="float: left;width: 20px;height: 20px;">
-				<image src="../../static/icon/fanhui3.png" style="width: 18px;height: 18px;"></image>
-			</span>	
-			<div style="margin-top: 5px;">
-			<span style="color: #FFFFFF;">返回</span>
-			</div>
-			</div>
-			<div style="text-align: center;margin-top: -22px;">
-			<span style="color: #FFFFFF;">考勤查询</span>
-			</div>
-		</div> -->
+	
 		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">考勤查询</block>
@@ -209,7 +196,7 @@
 					this.days.push(dayobjectSelf) // 将日期放入data 中的days数组 供页面渲染使用
 				}
 				// 其他周
-				for (var j = 1; j <= 35 - this.currentWeek; j++) {
+				for (var j = 1; j <= 37 - this.currentWeek; j++) {
 					var d3 = new Date(str)
 					d3.setDate(d3.getDate() + j)
 					var dayobjectOther = {}

+ 1 - 14
pages/sign/leave.vue

@@ -1,19 +1,6 @@
 <template>
 	<div>
-		<!-- <div class="top" @click="ret()">
-			<div style="width: 10%;height: 5px;"></div>
-			<div style="margin-left: 10px;">
-			<span style="float: left;width: 20px;height: 20px;">
-				<image src="../../static/icon/fanhui3.png" style="width: 18px;height: 18px;"></image>
-			</span>	
-			<div style="margin-top: 5px;">
-			<span style="color: #FFFFFF;">返回</span>
-			</div>
-			</div>
-			<div style="text-align: center;margin-top: -22px;">
-			<span style="color: #FFFFFF;">我的假期</span>
-			</div>
-		</div> -->
+	
 		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">我的假期</block>

+ 5 - 18
pages/sign/usersign.vue

@@ -1,20 +1,5 @@
 <template>
-	<div>
-		<!-- <div class="top" @click="ret()">
-			<div style="width: 10%;height: 5px;"></div>
-			<div style="margin-left: 10px;">
-			<span style="float: left;width: 20px;height: 20px;">
-				<image src="../../static/icon/fanhui3.png" style="width: 18px;height: 18px;"></image>
-			</span>	
-			<div style="margin-top: 5px;">
-			<span style="color: #FFFFFF;">返回</span>
-			</div>
-			</div>
-			<div style="text-align: center;margin-top: -22px;">
-			<span style="color: #FFFFFF;">考勤查询</span>
-			</div>
-		</div> -->
-		
+	<div>	
 		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">考勤查询</block>
@@ -50,7 +35,7 @@
 				<li v-for='(dayobject,i) in days' :key='i'>
 					<!--本月-->
 					<!--如果不是本月  改变类名加灰色-->
-					<span v-if='dayobject.day.getMonth()+1 != currentMonth' class='other-month' >{{ dayobject.day.getDate() }}</span>
+					<span v-if='dayobject.day.getMonth()+1 != currentMonth' class='other-month'>{{ dayobject.day.getDate() }}</span>
 					<!--如果是本月  还需要判断是不是这一天-->
 					<span v-else>
 						<!--今天  同年同月同日-->
@@ -208,13 +193,15 @@
 					this.days.push(dayobjectSelf) // 将日期放入data 中的days数组 供页面渲染使用
 				}
 				// 其他周
-				for (var j = 1; j <= 35 - this.currentWeek; j++) {
+				for (var j = 1; j <= 37 - this.currentWeek; j++) {
 					var d3 = new Date(str)
 					d3.setDate(d3.getDate() + j)
 					var dayobjectOther = {}
 					dayobjectOther.day = d3
 					this.days.push(dayobjectOther)
 				}
+				var s=this.days
+				console.log(s)
 			},
 			getDayTime(el) {
 			

+ 4 - 3
pages/team/teams.vue

@@ -103,7 +103,7 @@
 			methods:{
 				tmuser(item){
 					/* this.$store.commit('SET_TEMUSERID',item); */
-					this.$http.get(this.userUrls,{params:{id:item}}).then(res=>{
+					/* this.$http.get(this.userUrls,{params:{id:item}}).then(res=>{
 						console.log("res",res)
 						 if (res.statusCode==200) {
 							let perArr = res.data.data
@@ -114,9 +114,10 @@
 						}
 					}).catch(err => {
 						console.log(err);
-					});
+					}); */
 					//this.$store.commit('SET_CHAT',{chatname:item.realname,chatid:item.id,chatimg:item.avatar});
-					//this.$Router.push({name:'teamuser2'})
+					this.$store.commit('SET_TEMUSERID',item);
+					this.$Router.push({name:'teamuser2'})
 					//this.$Router.push({name:'userchat'})
 				},
 				jump(item){

+ 10 - 54
pages/wages/wages.vue

@@ -50,55 +50,8 @@
 		<view class="cu-item animation-slide-bottom" :style="[{animationDelay: '0.5s'}]">
 		<button style="background-color: #3C7AD8;color: #FFFFFF; width: 90%;" @click="save()">确定</button>
 		<br>
-		
 		</view>
-		
-		<!-- <div style="background-color: #FFFFFF;">
-		
-			<ul style="margin-left: -40px;">
-				<li>
-					<view class="cu-form-group">
-						<view class="title">
-							<image src="../../static/eml.png" class="img"></image>
-						</view>
-						<input placeholder="请输入邮箱" v-model="name" style="margin-top: -10px;"></input>
-					</view>
-					<div style="width: 100%; height: 1px; border-top: solid #ACC0D8 1px;"></div>
-				</li>
-				<li>
-					<view class="cu-form-group">
-						<view class="title">
-							<image src="../../static/yzm.png" class="img"></image>
-						</view>
-						<input placeholder="邮箱验证码" v-model="code" style="margin-top: -10px;"></input>
-						<span style="float: right;color: #0081FF;font-size: 15px;" @click="getCode" v-if="show">获取验证码</span>
-						<span v-if="!show" style="color: #D7D9E0;float: right;font-size: 15px;">已发送({{ times }})</span>
-					</view>
-					<div style="width: 100%; height: 1px; border-top: solid #ACC0D8 1px;"></div>
-				</li>
-
-			</ul> -->
-			<!-- <div style="margin-left: 10px;">
-			<strong style="font-size: 15px;">公司邮箱</strong>
-			
-			<br>
-			<input type="text"  style="color: #A8A9AF;" v-model="name"/>
-			<div style="width: 100%; height: 1px; border-top: solid #ACC0D8 1px;margin-top: 10px;"></div>
-		</div> -->
-			<!-- <br> -->
-			<!-- <div style="margin-left: 10px;">
-			<strong style="font-size: 15px;">验证码</strong>
-			
-			<br>
-			<span style="float: right;color: #0081FF;font-size: 15px;" @click="getCode" v-if="show">获取验证码</span>
-			<span v-if="!show" style="color: #D7D9E0;float: right;font-size: 15px;">已发送({{ times }})</span>
-			<input type="text"  style="color: #A8A9AF;" v-model="code"/>
-			<div style="width: 100%; height: 1px; border-top: solid #ACC0D8 1px;margin-top: 10px;"></div>
-		</div> -->
-	<!-- 	</div>
-		<br>
-		<button style="background-color: #3C7AD8;color: #FFFFFF;" @click="save()">确定</button> -->
-	</div>
+		</div>
 </template>
 
 <script>
@@ -117,14 +70,14 @@
 			getCode() {
 
 				let checkEmail = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/;
-				if (this.name == "" || this.name == null) {
+				/* if (this.name == "" || this.name == null) {
 					this.$tip.alert("邮箱不能为空");
 					return false;
 				}
 				if (!checkEmail.test(this.name)) {
 					this.$tip.alert('请输入正确的邮箱地址');
 					return false
-				}
+				} */
 
 				this.$http.get(this.userUrl, {
 					params: {
@@ -154,16 +107,19 @@
 
 			},
 			save() {
-				if (this.name == "" || this.name == null) {
+				this.$router.push({
+					name: 'wagesdetail'
+				});
+				/* if (this.name == "" || this.name == null) {
 					this.$tip.alert("邮箱不能为空");
 					return false;
 				}
 				if (this.code == null || this.code == "") {
 					this.$tip.alert("验证码不能为空");
 					return false;
-				}
+				} */
 
-				this.$http.get(this.emlCode, {
+			/* 	this.$http.get(this.emlCode, {
 					params: {
 						email: this.name,
 						code: this.code
@@ -184,7 +140,7 @@
 				}).catch(err => {
 					console.log(err);
 				});
-
+ */
 
 
 				/* if (this.code == this.$store.getters.emilCode) {