diff --git a/fe/PDA/pages.json b/fe/PDA/pages.json
index 6b1bbe431..022b99358 100644
--- a/fe/PDA/pages.json
+++ b/fe/PDA/pages.json
@@ -1,7 +1,7 @@
 {
 	
 	"pages": [{
-			"path": "views/index/index",
+			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "WMS仓库管理系统-移动端",
 				"titleNView": {
@@ -11,7 +11,7 @@
 			}
 		},
 		{
-			"path": "views/login/index",
+			"path": "pages/login/index",
 			"style": {
 				"navigationBarTitleText": "登录",
 				"titleNView": {
@@ -21,7 +21,7 @@
 			}
 		},
 		{
-			"path": "views/setter/index",
+			"path": "pages/setter/index",
 			"style": {
 				"navigationBarTitleText": "个人资料",
 				"enablePullDownRefresh": true
@@ -29,14 +29,14 @@
 			}
 
 		}, {
-			"path": "views/setter/passwordpage",
+			"path": "pages/setter/passwordpage",
 			"style": {
 				"navigationBarTitleText": "修改密码",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "views/setter/setterDetail",
+			"path": "pages/setter/setterDetail",
 			"style": {
 				"navigationBarTitleText": "参数设置详情",
 				"enablePullDownRefresh": true
@@ -44,7 +44,7 @@
 		
 		},
 		{
-			"path": "views/message/index",
+			"path": "pages/message/index",
 			"style": {
 				"navigationBarTitleText": "消息",
 				"enablePullDownRefresh": true
@@ -52,7 +52,7 @@
 
 		},
 		{
-			"path": "views/message/details",
+			"path": "pages/message/details",
 			"style": {
 				"navigationBarTitleText": "消息详情",
 				"enablePullDownRefresh": true
@@ -60,21 +60,21 @@
 		
 		},
 		{
-			"path": "views/demo/demo",
+			"path": "pages/demo/demo",
 			"style": {
 				"navigationBarTitleText": "组件",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "views/putaway/purchasePutaway",
+			"path": "pages/putaway/purchasePutaway",
 			"style": {
 				"navigationBarTitleText": "采购上架",
 				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path": "views/task/receipt",
+			"path": "pages/task/receipt",
 			"style": {
 				"navigationBarTitleText": "采购收货",
 				"enablePullDownRefresh": true,
@@ -98,70 +98,70 @@
 			}
 		},
 		{
-			"path": "views/task/receipt_detail",
+			"path": "pages/task/receipt_detail",
 			"style": {
 				"navigationBarTitleText": "收货任务详情",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "views/return/returnBeforPutaway",
+			"path": "pages/return/returnBeforPutaway",
 			"style": {
 				"navigationBarTitleText": "上架前退货",
 				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path": "views/return/purchaseReturn",
+			"path": "pages/return/purchaseReturn",
 			"style": {
 				"navigationBarTitleText": "上架后退货",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "views/return/purchaseReturn_detail",
+			"path": "pages/return/purchaseReturn_detail",
 			"style": {
 				"navigationBarTitleText": "退货任务详情",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "views/inventory/scrap",
+			"path": "pages/inventory/scrap",
 			"style": {
 				"navigationBarTitleText": "原料报废",
 				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path": "views/store/deliverRaw",
+			"path": "pages/store/deliverRaw",
 			"style": {
 				"navigationBarTitleText": "原料直发",
 				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path": "views/task/issueByFIFO",
+			"path": "pages/task/issueByFIFO",
 			"style": {
 				"navigationBarTitleText": "发料",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "views/task/issue_detail",
+			"path": "pages/task/issue_detail",
 			"style": {
 				"navigationBarTitleText": "发料任务详情",
 				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path": "views/store/issueDirect",
+			"path": "pages/store/issueDirect",
 			"style": {
 				"navigationBarTitleText": "直接发料",
 				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path": "views/query/item",
+			"path": "pages/query/item",
 			"style": {
 				"enablePullDownRefresh": true, // 是否配置下拉刷新的功能
 				"navigationBarTitleText": "按零件查询库存",
@@ -172,7 +172,7 @@
 			}
 		},
 		{
-			"path": "views/query/location",
+			"path": "pages/query/location",
 			"style": {
 				"navigationBarTitleText": "按库位查询库存",
 				"enablePullDownRefresh": true,
@@ -183,77 +183,77 @@
 			}
 		},
 		{
-			"path": "views/inventory/transferByLocation",
+			"path": "pages/inventory/transferByLocation",
 			"style": {
 				"navigationBarTitleText": "储位内移库",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "views/inventory/transferDiffLocation",
+			"path": "pages/inventory/transferDiffLocation",
 			"style": {
 				"navigationBarTitleText": "储位调拨",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "views/task/count",
+			"path": "pages/task/count",
 			"style": {
 				"navigationBarTitleText": "盘点任务",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "views/task/count_detail",
+			"path": "pages/task/count_detail",
 			"style": {
 				"navigationBarTitleText": "盘点任务详情",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "views/return/returnToWarehouse",
+			"path": "pages/return/returnToWarehouse",
 			"style": {
 				"navigationBarTitleText": "直接退库",
 				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path": "views/return/productionReturn",
+			"path": "pages/return/productionReturn",
 			"style": {
 				"navigationBarTitleText": "生产退库",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "views/return/productionReturn_detail",
+			"path": "pages/return/productionReturn_detail",
 			"style": {
 				"navigationBarTitleText": "生产退库详情",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "views/putaway/rapReceipt",
+			"path": "pages/putaway/rapReceipt",
 			"style": {
 				"navigationBarTitleText": "回收料收货",
 				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path": "views/putaway/semiPutaway",
+			"path": "pages/putaway/semiPutaway",
 			"style": {
 				"navigationBarTitleText": "半成品上架",
 				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path": "views/task/deliver",
+			"path": "pages/task/deliver",
 			"style": {
 				"navigationBarTitleText": "发货任务",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "views/task/deliver_detail",
+			"path": "pages/task/deliver_detail",
 			"style": {
 				"navigationBarTitleText": "发货任务详情",
 				"enablePullDownRefresh": true
@@ -291,18 +291,18 @@
 		"backgroundColor": "#ffffff",
 		"list": [
 			{
-				"pagePath": "views/index/index",
+				"pagePath": "pages/index/index",
 				"iconPath": "static/bar/sy.png",
 				"selectedIconPath": "static/bar/sya.png",
 				"text": "首页"
 			},
 			{
-				"pagePath": "views/message/index",
+				"pagePath": "pages/message/index",
 				"iconPath": "static/bar/xx.png",
 				"selectedIconPath": "static/bar/xxa.png",
 				"text": "消息"
 			}, {
-				"pagePath": "views/setter/index",
+				"pagePath": "pages/setter/index",
 				"iconPath": "static/bar/sz.png",
 				"selectedIconPath": "static/bar/sza.png",
 				"text": "设置"
diff --git a/fe/PDA/views/demo/demo.vue b/fe/PDA/pages/demo/demo.vue
similarity index 100%
rename from fe/PDA/views/demo/demo.vue
rename to fe/PDA/pages/demo/demo.vue
diff --git a/fe/PDA/views/index/index.vue b/fe/PDA/pages/index/index.vue
similarity index 100%
rename from fe/PDA/views/index/index.vue
rename to fe/PDA/pages/index/index.vue
diff --git a/fe/PDA/views/inventory/comTransfer.vue b/fe/PDA/pages/inventory/comTransfer.vue
similarity index 100%
rename from fe/PDA/views/inventory/comTransfer.vue
rename to fe/PDA/pages/inventory/comTransfer.vue
diff --git a/fe/PDA/views/inventory/scrap.vue b/fe/PDA/pages/inventory/scrap.vue
similarity index 100%
rename from fe/PDA/views/inventory/scrap.vue
rename to fe/PDA/pages/inventory/scrap.vue
diff --git a/fe/PDA/views/inventory/transferByLocation.vue b/fe/PDA/pages/inventory/transferByLocation.vue
similarity index 93%
rename from fe/PDA/views/inventory/transferByLocation.vue
rename to fe/PDA/pages/inventory/transferByLocation.vue
index 1c2da3715..c9b90c78a 100644
--- a/fe/PDA/views/inventory/transferByLocation.vue
+++ b/fe/PDA/pages/inventory/transferByLocation.vue
@@ -11,7 +11,7 @@
 		goHome
 	} from '@/common/basic.js';
 
-	import comTransfer from '/views/inventory/comTransfer.vue'
+	import comTransfer from '/pages/inventory/comTransfer.vue'
 	export default {
 		name: 'transfer',
 		components: {
diff --git a/fe/PDA/views/inventory/transferDiffLocation.vue b/fe/PDA/pages/inventory/transferDiffLocation.vue
similarity index 93%
rename from fe/PDA/views/inventory/transferDiffLocation.vue
rename to fe/PDA/pages/inventory/transferDiffLocation.vue
index be5718a15..93dfcb029 100644
--- a/fe/PDA/views/inventory/transferDiffLocation.vue
+++ b/fe/PDA/pages/inventory/transferDiffLocation.vue
@@ -11,7 +11,7 @@
 		goHome
 	} from '@/common/basic.js';
 
-	import comTransfer from '/views/inventory/comTransfer.vue'
+	import comTransfer from '/pages/inventory/comTransfer.vue'
 	export default {
 		name: 'transferNoLoacation',
 		components: {
diff --git a/fe/PDA/pages/login/index.vue b/fe/PDA/pages/login/index.vue
new file mode 100644
index 000000000..5fbc2325b
--- /dev/null
+++ b/fe/PDA/pages/login/index.vue
@@ -0,0 +1,410 @@
+<template>
+	<view class="content">
+		<!-- <image mode="widthFix" class="loginimg" src="../../static/login.png"></image> -->
+		<image mode="widthFix" class="loginimg" src="../../static/icons_ui/login_bg.png"></image>
+		<view class="login_title">
+			<text>您好，欢迎使用</text><br>
+			WMS仓库管理系统
+		</view>
+		<view class="bgf login_wrap">
+			<view class="loginbox">
+				<form >
+					<view class="mytab">
+						<!-- <view class="mytabline" :class="tapstyle == 1?'active':''" @click="tapchenge(1)">扫码登录</view> -->
+						<view class="mytabline" :class="tapstyle == 2?'active_in':''" @click="tapchenge(2)">密码登录</view>
+					</view>
+
+					<!-- <view class="mybox" v-if="tapstyle == 1">
+						<view class="conone">
+							<uni-easyinput prefixIcon="scan" class="uni-input" type="password" v-model="smloginmsg"
+								name="nickname" placeholder="扫码登录"></uni-easyinput>
+						</view>
+					</view> -->
+					<view class="mybox" v-if="tapstyle == 2">
+						<view class="conone">
+							<view class="title uni-flex">
+								<image class="icon_normal" src="../../static/icons_ui/icon_login_user.svg"></image>
+								用户名
+							</view>
+							<view>
+								<input class="uni-input" placeholder="请输入用户名" v-model="username" />
+							</view>
+						</view>
+						<view class="conone">
+							<view class="title uni-flex">
+								<image class="icon_normal" src="../../static/icons_ui/icon_login_password.svg"></image>
+								密码
+							</view>
+							<view class="uni-input-wrapper">
+								<input class="uni-input" placeholder="请输入密码" :password="showPassword"
+									v-model="password" />
+								<text class="uni-icon" :class="[!showPassword ? 'uni-eye-active' : '']"
+									@click="changePassword">&#xe568;</text>
+							</view>
+							<!-- 	<view class="uni-input-wrapper">
+							  <input class="uni-input"  type="password" name="password"
+							  :password="showPassword"
+							  	placeholder="请输入密码" v-model="password"></input>
+							    <text class="uni-icon" :class="[!showPassword ? 'uni-eye-active' : '']" @click="changePassword">&#xe568;</text>
+							</view> -->
+
+						</view>
+
+					</view>
+					<view class="loginbtnbox">
+						<button @click="handelerlogin()" class="loginbtn">登录</button>
+					</view>
+				</form>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getlogin
+	} from '@/api/index.js';
+	import jwtDecode from 'jwt-decode'
+	// import qs from 'qs'
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex'
+	// import VUE from 'vue'
+	// import Base64 from 'base-64';
+	// import vue from vue
+	export default {
+		data() {
+			return {
+				smloginmsg: "",
+				username: "",
+				password: "",
+				tapstyle: 2,
+				loading: false,
+				showPassword: true
+			}
+		},
+		computed: mapState(['forcedLogin', 'hasLogin']),
+		mounted() {
+			uni.clearStorage(); //清除缓存
+			if (process.env.NODE_ENV === 'development') {
+				this.username = "admin"
+				this.password = "1234qwer!@#$QWER";
+			}
+			uni.setNavigationBarColor({
+				frontColor: '#ffffff',
+				backgroundColor: "#476DF5 !important"
+			})
+		},
+		onLoad() {},
+		methods: {
+			...mapMutations(['login']),
+			handelerlogin() {
+				if (this.username === '') {
+					uni.showToast({
+						title: '用户名不能为空',
+						icon: 'none',
+						mask: true
+					})
+				} else if (this.password === '') {
+					uni.showToast({
+						title: '密码不能为空',
+						icon: 'none',
+						mask: true
+					})
+				} else {
+					// console.log("用户名：", this.username, "密码：", this.password, this.tapstyle, this.smloginmsg)
+					let logininfo = {
+						grant_type: 'password',
+						client_id: 'Auth_App',
+						client_secret: '1q2w3E*',
+						username: "",
+						password: ""
+					}
+					if (this.tapstyle == 2) //密码登录
+					{
+						logininfo.username = this.username;
+						logininfo.password = this.password
+					} else if (this.tapstyle == 1) {
+						// let arr = Base64.decode(this.smloginmsg).split(':')
+						// logininfo.username = arr[0];
+						// logininfo.password = arr[1]
+					}
+					let params = JSON.stringify(logininfo);
+					console.log('params', params);
+					// let params = qs.stringify(logininfo)
+					this.toLogin(params);
+				}
+			},
+			toLogin(params) {
+				uni.showLoading({
+					title: '登录中...'
+				})
+				localStorage.setItem("token_type", 'application/json')
+				getlogin(params).then((res) => {
+					console.log("res", res)
+					this.setStorage(res);
+					if (res) {
+						this.toMain(res);
+					} else {
+						uni.showToast({
+							title: '请求失败',
+							icon: 'none',
+							mask: true
+						})
+					}
+					uni.hideLoading();
+				}).catch((err) => {
+					this.loading = false;
+					if (err.message.includes('token返回的res为空')) {
+						uni.showToast({
+							title: '无法连接到认证服务器!',
+							icon: 'none',
+							duration: 2000
+						});
+					} else {
+						uni.showToast({
+							title: err.message,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				
+					uni.hideLoading();
+				})
+						// this.loading = false;
+						// uni.showToast({
+						// 	title: eror.message,
+						// 	icon: 'none',
+						// 	duration: 2000
+						// });
+						// if (eror=='token返回的res为空') {
+						// 	uni.showToast({
+						// 		title: '无法连接到认证服务器!',
+						// 		icon: 'none',
+						// 		duration: 2000
+						// 	});
+						// } else {
+						// 	uni.showToast({
+						// 		title: err.message,
+						// 		icon: 'none',
+						// 		duration: 2000
+						// 	});
+						// }
+						// getlogin(params).then(res => {
+						// 	console.log("请求getlogin", res)
+						// 	console.log("res", res)
+						// 	this.setStorage(res);
+						// 	if (res) {
+						// 		this.toMain(res);
+						// 	} else {
+						// 		uni.showToast({
+						// 			title: '请求失败',
+						// 			icon: 'none',
+						// 			mask: true
+						// 		})
+						// 	}
+						// 	uni.hideLoading();
+						// }).catch((err) => {
+						// 	this.loading = false;
+						// 	// if (err.message.includes('token返回的res为空')) {
+						// 	// 	uni.showToast({
+						// 	// 		title: '无法连接到认证服务器!',
+						// 	// 		icon: 'none',
+						// 	// 		duration: 2000
+						// 	// 	});
+						// 	// } else {
+						// 	// 	uni.showToast({
+						// 	// 		title: err.message,
+						// 	// 		icon: 'none',
+						// 	// 		duration: 2000
+						// 	// 	});
+						// 	// }
+
+						// 	uni.hideLoading();
+						// })
+					},
+
+					setStorage(res) {
+						sessionStorage.setItem('isLogin', 1); //登录判断
+						sessionStorage.setItem('hasLogin', true);
+						localStorage.setItem("token_type", res.token_type + ' ' + res.access_token)
+						localStorage.setItem('userName', this.username);
+						localStorage.setItem('company', this.$companyCode);
+						localStorage.setItem('warehouseCode', this.$warehouseCode);
+						var decode = jwtDecode(localStorage.getItem('token_type'))
+						localStorage.setItem('userId', decode.sub);
+					},
+					clearStorage(res) {
+						sessionStorage.setItem('isLogin', 0); //登录判断
+						sessionStorage.setItem('hasLogin', false);
+						localStorage.setItem("token_type", "")
+					},
+
+					toMain(user) {
+						console.log("user", user)
+						this.login(user);
+						uni.switchTab({
+							url: '/pages/index/index'
+						});
+
+						/**
+						 * 强制登录时使用reLaunch方式跳
+						 * 返回首页也是使用reLaunch方式
+						 */
+						// if (this.forcedLogin) //强制登录
+						// {
+						// 	uni.reLaunch({
+						// 		url: '../index/index'
+						// 	})
+						// } else {
+						// 	uni.navigateBack()
+						// }
+					},
+					tapchenge(e) {
+						this.tapstyle = e
+					},
+					onchange(e) {
+						const value = e.detail.value
+					},
+					onCompanyChange(company) {
+						if (company === 'IACHZ') {} else {
+
+						}
+					},
+					// onBackPress(e) {
+					// 	console.log("监听返回按钮事件", e);
+					// 	// 此处一定要return为true，否则页面不会返回到指定路径
+					// 	return true;
+					// }
+					changePassword: function() {
+						this.showPassword = !this.showPassword;
+					},
+			}
+		}
+</script>
+
+<style>
+	page {
+		background-color: #fff;
+	}
+
+	.content {
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		background-color: #FFFFFF;
+	}
+
+	.cs {
+		margin-bottom: 20upx;
+	}
+
+	.mytab {
+		display: flex;
+	}
+
+	.mytabline {
+		flex: 1;
+		text-align: center;
+		padding: 20rpx 0;
+		color: #666;
+		position: relative;
+		font-size: 0.875rem;
+	}
+
+	.active_in {
+		color: #101010;
+		font-weight: bold;
+	}
+
+	.active_in::after {
+		content: "";
+		position: absolute;
+		bottom: 0;
+		left: 50%;
+		transform: translateX(-50%);
+		height: 8rpx;
+		background-color: #007AFF;
+		width: 40rpx;
+		border-radius: 8rpx;
+	}
+
+	.loginbox {
+		box-sizing: border-box;
+		padding: 30rpx;
+
+	}
+
+	.loginimg {
+		width: 100%;
+	}
+
+	.logo {
+		height: 200rpx;
+		width: 200rpx;
+		margin-left: auto;
+		margin-right: auto;
+		margin-bottom: 50rpx;
+	}
+
+	.conone {
+		margin: 30rpx 0;
+		align-items: center;
+	}
+
+	.conone .uni-input-wrapper {
+		position: relative;
+	}
+
+	.conone .uni-input {
+		background-color: #F7F9FF;
+		height: 90rpx;
+		line-height: 90rpx;
+		padding: 0 0 0 20rpx;
+	}
+
+	.conone .title {
+		font-size: .875rem;
+		align-items: center;
+		margin-bottom: 20rpx;
+		letter-spacing: 1rpx;
+	}
+
+	.conone .title image {
+		margin-right: 6rpx;
+	}
+
+	.uni-easyinput .is-input-border {
+		border-color: transparent !important;
+	}
+
+	.loginbtnbox {
+		margin-top: 40rpx;
+	}
+
+	.loginbtn {
+		color: #fff;
+		font-size: 0.875rem;
+		height: 100rpx;
+		line-height: 100rpx;
+		background: #5d66de;
+		border-radius: 8rpx;
+		border: none;
+		outline: none;
+	}
+
+	.conone .uni-icon {
+		float: right;
+		position: absolute;
+		right: 20rpx;
+		color: #ccc;
+		font-size: 1.25rem;
+	}
+
+	.conone .uni-eye-active {
+		color: #5a7cf3;
+	}
+</style>
diff --git a/fe/PDA/views/message/details.vue b/fe/PDA/pages/message/details.vue
similarity index 100%
rename from fe/PDA/views/message/details.vue
rename to fe/PDA/pages/message/details.vue
diff --git a/fe/PDA/views/message/index.vue b/fe/PDA/pages/message/index.vue
similarity index 100%
rename from fe/PDA/views/message/index.vue
rename to fe/PDA/pages/message/index.vue
diff --git a/fe/PDA/views/putaway/purchasePutaway.vue b/fe/PDA/pages/putaway/purchasePutaway.vue
similarity index 100%
rename from fe/PDA/views/putaway/purchasePutaway.vue
rename to fe/PDA/pages/putaway/purchasePutaway.vue
diff --git a/fe/PDA/views/putaway/rapReceipt.vue b/fe/PDA/pages/putaway/rapReceipt.vue
similarity index 100%
rename from fe/PDA/views/putaway/rapReceipt.vue
rename to fe/PDA/pages/putaway/rapReceipt.vue
diff --git a/fe/PDA/views/putaway/semiPutaway.vue b/fe/PDA/pages/putaway/semiPutaway.vue
similarity index 100%
rename from fe/PDA/views/putaway/semiPutaway.vue
rename to fe/PDA/pages/putaway/semiPutaway.vue
diff --git a/fe/PDA/views/query/item.vue b/fe/PDA/pages/query/item.vue
similarity index 100%
rename from fe/PDA/views/query/item.vue
rename to fe/PDA/pages/query/item.vue
diff --git a/fe/PDA/views/query/location.vue b/fe/PDA/pages/query/location.vue
similarity index 100%
rename from fe/PDA/views/query/location.vue
rename to fe/PDA/pages/query/location.vue
diff --git a/fe/PDA/views/return/productionReturn.vue b/fe/PDA/pages/return/productionReturn.vue
similarity index 100%
rename from fe/PDA/views/return/productionReturn.vue
rename to fe/PDA/pages/return/productionReturn.vue
diff --git a/fe/PDA/views/return/productionReturn_detail.vue b/fe/PDA/pages/return/productionReturn_detail.vue
similarity index 100%
rename from fe/PDA/views/return/productionReturn_detail.vue
rename to fe/PDA/pages/return/productionReturn_detail.vue
diff --git a/fe/PDA/views/return/purchaseReturn.vue b/fe/PDA/pages/return/purchaseReturn.vue
similarity index 100%
rename from fe/PDA/views/return/purchaseReturn.vue
rename to fe/PDA/pages/return/purchaseReturn.vue
diff --git a/fe/PDA/views/return/purchaseReturn_detail.vue b/fe/PDA/pages/return/purchaseReturn_detail.vue
similarity index 100%
rename from fe/PDA/views/return/purchaseReturn_detail.vue
rename to fe/PDA/pages/return/purchaseReturn_detail.vue
diff --git a/fe/PDA/views/return/returnBeforPutaway.vue b/fe/PDA/pages/return/returnBeforPutaway.vue
similarity index 100%
rename from fe/PDA/views/return/returnBeforPutaway.vue
rename to fe/PDA/pages/return/returnBeforPutaway.vue
diff --git a/fe/PDA/views/return/returnToWarehouse.vue b/fe/PDA/pages/return/returnToWarehouse.vue
similarity index 100%
rename from fe/PDA/views/return/returnToWarehouse.vue
rename to fe/PDA/pages/return/returnToWarehouse.vue
diff --git a/fe/PDA/views/setter/index.vue b/fe/PDA/pages/setter/index.vue
similarity index 95%
rename from fe/PDA/views/setter/index.vue
rename to fe/PDA/pages/setter/index.vue
index 267dc1a47..06cb9e088 100644
--- a/fe/PDA/views/setter/index.vue
+++ b/fe/PDA/pages/setter/index.vue
@@ -9,9 +9,9 @@
 				<!-- <uni-list-item title="工号" clickable @click="onClick" :rightText="usermsg.phoneNumber"></uni-list-item> -->
 				<uni-list-item title="姓名" clickable  :rightText="userName"
 					thumb="../../static/icon_personal_name.png"></uni-list-item>
-				<uni-list-item title="修改密码" link to="/views/setter/passwordpage"
+				<uni-list-item title="修改密码" link to="/pages/setter/passwordpage"
 					thumb="../../static/icon_personal_password.png"></uni-list-item>
-				<uni-list-item title="参数设置" link to="/views/setter/setterDetail"
+				<uni-list-item title="参数设置" link to="/pages/setter/setterDetail"
 					thumb="../../static/icon_personal_setting.png"></uni-list-item>
 			</uni-list>
 
diff --git a/fe/PDA/views/setter/passwordpage.vue b/fe/PDA/pages/setter/passwordpage.vue
similarity index 100%
rename from fe/PDA/views/setter/passwordpage.vue
rename to fe/PDA/pages/setter/passwordpage.vue
diff --git a/fe/PDA/views/setter/setterDetail.vue b/fe/PDA/pages/setter/setterDetail.vue
similarity index 100%
rename from fe/PDA/views/setter/setterDetail.vue
rename to fe/PDA/pages/setter/setterDetail.vue
diff --git a/fe/PDA/views/store/deliverRaw.vue b/fe/PDA/pages/store/deliverRaw.vue
similarity index 100%
rename from fe/PDA/views/store/deliverRaw.vue
rename to fe/PDA/pages/store/deliverRaw.vue
diff --git a/fe/PDA/views/store/issueDirect.vue b/fe/PDA/pages/store/issueDirect.vue
similarity index 100%
rename from fe/PDA/views/store/issueDirect.vue
rename to fe/PDA/pages/store/issueDirect.vue
diff --git a/fe/PDA/views/task/count.vue b/fe/PDA/pages/task/count.vue
similarity index 100%
rename from fe/PDA/views/task/count.vue
rename to fe/PDA/pages/task/count.vue
diff --git a/fe/PDA/views/task/count_detail.vue b/fe/PDA/pages/task/count_detail.vue
similarity index 100%
rename from fe/PDA/views/task/count_detail.vue
rename to fe/PDA/pages/task/count_detail.vue
diff --git a/fe/PDA/views/task/deliver.vue b/fe/PDA/pages/task/deliver.vue
similarity index 100%
rename from fe/PDA/views/task/deliver.vue
rename to fe/PDA/pages/task/deliver.vue
diff --git a/fe/PDA/views/task/deliver_detail.vue b/fe/PDA/pages/task/deliver_detail.vue
similarity index 100%
rename from fe/PDA/views/task/deliver_detail.vue
rename to fe/PDA/pages/task/deliver_detail.vue
diff --git a/fe/PDA/views/task/deliver_items.vue b/fe/PDA/pages/task/deliver_items.vue
similarity index 100%
rename from fe/PDA/views/task/deliver_items.vue
rename to fe/PDA/pages/task/deliver_items.vue
diff --git a/fe/PDA/views/task/issue.vue b/fe/PDA/pages/task/issue.vue
similarity index 100%
rename from fe/PDA/views/task/issue.vue
rename to fe/PDA/pages/task/issue.vue
diff --git a/fe/PDA/views/task/issueByFIFO.vue b/fe/PDA/pages/task/issueByFIFO.vue
similarity index 100%
rename from fe/PDA/views/task/issueByFIFO.vue
rename to fe/PDA/pages/task/issueByFIFO.vue
diff --git a/fe/PDA/views/task/issue_detail.vue b/fe/PDA/pages/task/issue_detail.vue
similarity index 100%
rename from fe/PDA/views/task/issue_detail.vue
rename to fe/PDA/pages/task/issue_detail.vue
diff --git a/fe/PDA/views/task/receipt.vue b/fe/PDA/pages/task/receipt.vue
similarity index 99%
rename from fe/PDA/views/task/receipt.vue
rename to fe/PDA/pages/task/receipt.vue
index 10fa4ccce..f6a621961 100644
--- a/fe/PDA/views/task/receipt.vue
+++ b/fe/PDA/pages/task/receipt.vue
@@ -78,6 +78,7 @@
 		},
 
 		onShow() {
+			console.log(uni.$u.config.v);
 			if (this.$isReceiptToday) {
 				this.isToday = this.$isReceiptToday;
 			}
diff --git a/fe/PDA/views/task/receipt_check.vue b/fe/PDA/pages/task/receipt_check.vue
similarity index 100%
rename from fe/PDA/views/task/receipt_check.vue
rename to fe/PDA/pages/task/receipt_check.vue
diff --git a/fe/PDA/views/task/receipt_detail.vue b/fe/PDA/pages/task/receipt_detail.vue
similarity index 99%
rename from fe/PDA/views/task/receipt_detail.vue
rename to fe/PDA/pages/task/receipt_detail.vue
index c48606c39..d722e7b28 100644
--- a/fe/PDA/views/task/receipt_detail.vue
+++ b/fe/PDA/pages/task/receipt_detail.vue
@@ -19,7 +19,7 @@
 				---------------------------------
 			</view>
 		</view> -->
-
+<u-line color="red" />
 
 
 		<scroll-view scroll-y="true" class="scroll-detail" style="margin-top: 20rpx;">
@@ -70,7 +70,7 @@
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import winScanButton from '@/mycomponents/wincom/scanCom/winScanButton.vue'
 	import winScanPack from '@/mycomponents/wincom/scanCom/winScanPack.vue'
-	import receiptCheck from '/views/task/receipt_check.vue'
+	import receiptCheck from '/pages/task/receipt_check.vue'
 	import comJobScanDetail from '@/mycomponents/comjob/comJobScanDetail.vue'
 	import winRecommendSimple from '@/mycomponents/wincom/unitCom/winRecommendSimple.vue'
 	import winJobScanCount from '@/mycomponents/wincom/basicCom/winJobScanCount.vue'
diff --git a/fe/PDA/router/my_router.js b/fe/PDA/router/my_router.js
index aa4727dd0..f53143d4c 100644
--- a/fe/PDA/router/my_router.js
+++ b/fe/PDA/router/my_router.js
@@ -17,7 +17,7 @@ uni.addInterceptor('navigateTo', {
     invoke (e) {
         if(!hasPermission(e.url)){
             uni.reLaunch({
-                url: '/views/login/index'
+                url: '/pages/login/index'
             })
             return false
         }
diff --git a/fe/PDA/views/login/index.vue b/fe/PDA/views/login/index.vue
index a8c5bb56d..0115c7a62 100644
--- a/fe/PDA/views/login/index.vue
+++ b/fe/PDA/views/login/index.vue
@@ -8,7 +8,7 @@
 		</view>
 		<view class="bgf login_wrap">
 			<view class="loginbox">
-				<form >
+				<form @submit="formSubmit">
 					<view class="mytab">
 						<!-- <view class="mytabline" :class="tapstyle == 1?'active':''" @click="tapchenge(1)">扫码登录</view> -->
 						<view class="mytabline" :class="tapstyle == 2?'active_in':''" @click="tapchenge(2)">密码登录</view>
@@ -17,7 +17,7 @@
 					<!-- <view class="mybox" v-if="tapstyle == 1">
 						<view class="conone">
 							<uni-easyinput prefixIcon="scan" class="uni-input" type="password" v-model="smloginmsg"
-								name="nickname" placeholder="扫码登录"></uni-easyinput>
+								name="nickname" placeholder="扫码登录"></uni-easyinput> 
 						</view>
 					</view> -->
 					<view class="mybox" v-if="tapstyle == 2">
@@ -27,7 +27,7 @@
 								用户名
 							</view>
 							<view>
-								<input class="uni-input" placeholder="请输入用户名" v-model="username" />
+								<input class="uni-input" placeholder="请输入用户名" v-model="username"></input>
 							</view>
 						</view>
 						<view class="conone">
@@ -62,16 +62,17 @@
 
 <script>
 	import {
-		getlogin
+		getlogin,
+		profile
 	} from '@/api/index.js';
 	import jwtDecode from 'jwt-decode'
-	// import qs from 'qs'
+	import qs from 'qs'
 	import {
 		mapState,
 		mapMutations
 	} from 'vuex'
-	// import VUE from 'vue'
-	// import Base64 from 'base-64';
+	import VUE from 'vue'
+	import Base64 from 'base-64';
 	// import vue from vue
 	export default {
 		data() {
@@ -126,9 +127,9 @@
 						logininfo.username = this.username;
 						logininfo.password = this.password
 					} else if (this.tapstyle == 1) {
-						// let arr = Base64.decode(this.smloginmsg).split(':')
-						// logininfo.username = arr[0];
-						// logininfo.password = arr[1]
+						let arr = Base64.decode(this.smloginmsg).split(':')
+						logininfo.username = arr[0];
+						logininfo.password = arr[1]
 					}
 					let params = JSON.stringify(logininfo);
 					console.log('params', params);
@@ -169,119 +170,68 @@
 							duration: 2000
 						});
 					}
-				
+
 					uni.hideLoading();
 				})
-						// this.loading = false;
-						// uni.showToast({
-						// 	title: eror.message,
-						// 	icon: 'none',
-						// 	duration: 2000
-						// });
-						// if (eror=='token返回的res为空') {
-						// 	uni.showToast({
-						// 		title: '无法连接到认证服务器!',
-						// 		icon: 'none',
-						// 		duration: 2000
-						// 	});
-						// } else {
-						// 	uni.showToast({
-						// 		title: err.message,
-						// 		icon: 'none',
-						// 		duration: 2000
-						// 	});
-						// }
-						// getlogin(params).then(res => {
-						// 	console.log("请求getlogin", res)
-						// 	console.log("res", res)
-						// 	this.setStorage(res);
-						// 	if (res) {
-						// 		this.toMain(res);
-						// 	} else {
-						// 		uni.showToast({
-						// 			title: '请求失败',
-						// 			icon: 'none',
-						// 			mask: true
-						// 		})
-						// 	}
-						// 	uni.hideLoading();
-						// }).catch((err) => {
-						// 	this.loading = false;
-						// 	// if (err.message.includes('token返回的res为空')) {
-						// 	// 	uni.showToast({
-						// 	// 		title: '无法连接到认证服务器!',
-						// 	// 		icon: 'none',
-						// 	// 		duration: 2000
-						// 	// 	});
-						// 	// } else {
-						// 	// 	uni.showToast({
-						// 	// 		title: err.message,
-						// 	// 		icon: 'none',
-						// 	// 		duration: 2000
-						// 	// 	});
-						// 	// }
-
-						// 	uni.hideLoading();
-						// })
-					},
+			},
 
-					setStorage(res) {
-						sessionStorage.setItem('isLogin', 1); //登录判断
-						sessionStorage.setItem('hasLogin', true);
-						localStorage.setItem("token_type", res.token_type + ' ' + res.access_token)
-						localStorage.setItem('userName', this.username);
-						localStorage.setItem('company', this.$companyCode);
-						localStorage.setItem('warehouseCode', this.$warehouseCode);
-						var decode = jwtDecode(localStorage.getItem('token_type'))
-						localStorage.setItem('userId', decode.sub);
-					},
-					clearStorage(res) {
-						sessionStorage.setItem('isLogin', 0); //登录判断
-						sessionStorage.setItem('hasLogin', false);
-						localStorage.setItem("token_type", "")
-					},
+			setStorage(res) {
+				sessionStorage.setItem('isLogin', 1); //登录判断
+				sessionStorage.setItem('hasLogin', true);
+				localStorage.setItem("token_type", res.token_type + ' ' + res.access_token)
+				localStorage.setItem('userName', this.username);
+				localStorage.setItem('company', this.$companyCode);
+				localStorage.setItem('warehouseCode', this.$warehouseCode);
+				var decode = jwtDecode(localStorage.getItem('token_type'))
+				localStorage.setItem('userId', decode.sub);
+			},
+			clearStorage(res) {
+				sessionStorage.setItem('isLogin', 0); //登录判断
+				sessionStorage.setItem('hasLogin', false);
+				localStorage.setItem("token_type", "")
+			},
 
-					toMain(user) {
-						console.log("user", user)
-						this.login(user);
-						uni.switchTab({
-							url: '/views/index/index'
-						});
+			toMain(user) {
+				console.log("user", user)
+				this.login(user);
+				uni.switchTab({
+					url: '/pages/index/index'
+				});
 
-						/**
-						 * 强制登录时使用reLaunch方式跳
-						 * 返回首页也是使用reLaunch方式
-						 */
-						// if (this.forcedLogin) //强制登录
-						// {
-						// 	uni.reLaunch({
-						// 		url: '../index/index'
-						// 	})
-						// } else {
-						// 	uni.navigateBack()
-						// }
-					},
-					tapchenge(e) {
-						this.tapstyle = e
-					},
-					onchange(e) {
-						const value = e.detail.value
-					},
-					onCompanyChange(company) {
-						if (company === 'IACHZ') {} else {
+				/**
+				 * 强制登录时使用reLaunch方式跳
+				 * 返回首页也是使用reLaunch方式
+				 */
+				// if (this.forcedLogin) //强制登录
+				// {
+				// 	uni.reLaunch({
+				// 		url: '../index/index'
+				// 	})
+				// } else {
+				// 	uni.navigateBack()
+				// }
+			},
+			tapchenge(e) {
+				this.tapstyle = e
+			},
+			onchange(e) {
+				const value = e.detail.value
+			},
+			onCompanyChange(company) {
+				if (company === 'IACHZ') {} else {
 
-						}
-					},
-					// onBackPress(e) {
-					// 	console.log("监听返回按钮事件", e);
-					// 	// 此处一定要return为true，否则页面不会返回到指定路径
-					// 	return true;
-					// }
-					changePassword: function() {
-						this.showPassword = !this.showPassword;
-					},
-			}
+				}
+			},
+			// onBackPress(e) {
+			// 	console.log("监听返回按钮事件", e);
+			// 	// 此处一定要return为true，否则页面不会返回到指定路径
+			// 	return true;
+			// }
+			changePassword: function() {
+				this.showPassword = !this.showPassword;
+			},
 		}
+	}
 </script>
 
 <style>