From b58b954436355d039118084a6f5ee6601e8dd07c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?=
 <9634538+git_rabbit@user.noreply.gitee.com>
Date: Tue, 12 Mar 2024 17:41:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=86=99=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E9=A6=96=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=89=AB=E7=A0=81=E5=8A=9F=E8=83=BD=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                    |  74 ++-
 api/warehouse/warehose.js                  |  11 +
 components/material-item/material-item.vue |  43 ++
 components/pda-scan-input/index.vue        |  89 +++
 main.js                                    |   8 +-
 manifest.json                              |  28 +-
 pages.json                                 | 152 ++---
 pages/common/textview/index.vue            |  43 --
 pages/common/webview/index.vue             |  34 --
 pages/inWarehouse/inWarehouse.vue          | 133 +++++
 pages/index.vue                            |  43 --
 pages/index/index.vue                      | 105 ++++
 pages/{ => login}/login.vue                |  22 +-
 pages/mine/about/index.vue                 |  75 ---
 pages/mine/avatar/index.vue                | 631 ---------------------
 pages/mine/help/index.vue                  | 112 ----
 pages/mine/index.vue                       | 198 -------
 pages/mine/info/edit.vue                   | 127 -----
 pages/mine/info/index.vue                  |  44 --
 pages/mine/pwd/index.vue                   |  85 ---
 pages/mine/setting/index.vue               |  78 ---
 pages/outWarehouse/outWarehouse.vue        |  23 +
 pages/register.vue                         | 196 -------
 pages/relocation/relocation.vue            |  23 +
 pages/stocktake/stocktake.vue              |  23 +
 pages/work/index.vue                       | 183 ------
 permission.js                              |  58 +-
 static/images/background/background.jpg    | Bin 0 -> 10974 bytes
 28 files changed, 616 insertions(+), 2025 deletions(-)
 create mode 100644 api/warehouse/warehose.js
 create mode 100644 components/material-item/material-item.vue
 create mode 100644 components/pda-scan-input/index.vue
 delete mode 100644 pages/common/textview/index.vue
 delete mode 100644 pages/common/webview/index.vue
 create mode 100644 pages/inWarehouse/inWarehouse.vue
 delete mode 100644 pages/index.vue
 create mode 100644 pages/index/index.vue
 rename pages/{ => login}/login.vue (92%)
 delete mode 100644 pages/mine/about/index.vue
 delete mode 100644 pages/mine/avatar/index.vue
 delete mode 100644 pages/mine/help/index.vue
 delete mode 100644 pages/mine/index.vue
 delete mode 100644 pages/mine/info/edit.vue
 delete mode 100644 pages/mine/info/index.vue
 delete mode 100644 pages/mine/pwd/index.vue
 delete mode 100644 pages/mine/setting/index.vue
 create mode 100644 pages/outWarehouse/outWarehouse.vue
 delete mode 100644 pages/register.vue
 create mode 100644 pages/relocation/relocation.vue
 create mode 100644 pages/stocktake/stocktake.vue
 delete mode 100644 pages/work/index.vue
 create mode 100644 static/images/background/background.jpg

diff --git a/App.vue b/App.vue
index 797f513..4a445ec 100644
--- a/App.vue
+++ b/App.vue
@@ -1,34 +1,52 @@
 <script>
-  import config from './config'
-  import store from '@/store'
-  import { getToken } from '@/utils/auth'
+import config from './config';
+import store from '@/store';
+import { getToken } from '@/utils/auth';
 
-  export default {
-    onLaunch: function() {
-      this.initApp()
-    },
-    methods: {
-      // 初始化应用
-      initApp() {
-        // 初始化应用配置
-        this.initConfig()
-        // 检查用户登录状态
-        //#ifdef H5
-        this.checkLogin()
-        //#endif
-      },
-      initConfig() {
-        this.globalData.config = config
-      },
-      checkLogin() {
-        if (!getToken()) {
-          this.$tab.reLaunch('/pages/login') 
-        }
-      }
-    }
-  }
+export default {
+	onLaunch: function () {
+		this.initApp();
+	},
+	methods: {
+		// 初始化应用
+		initApp() {
+			// 初始化应用配置
+			this.initConfig();
+			// 检查用户登录状态
+			//#ifdef H5
+			this.checkLogin();
+			//#endif
+		},
+		initConfig() {
+			const _windowsWidth = uni.getWindowInfo().windowWidth;
+			const _windowsHeight = uni.getWindowInfo().windowHeight;
+			// console.log(_windowsWidth,_windowsHeight);
+			this.globalData.config = config;
+			// 设置页面初始大小
+			
+		},
+		checkLogin() {
+			if (!getToken()) {
+				this.$tab.reLaunch('/pages/login');
+			}
+		}
+	}
+};
 </script>
 
 <style lang="scss">
-  @import '@/static/scss/index.scss'
+.content {
+	display: flex;
+	flex-direction: column;
+	background-image: url('static/images/background/background.jpg');
+	font-size: 36px;
+	font-weight: 700;
+	width: 360px;
+	height: 712px;
+}
+.main-box{
+	width:100%;
+	height: 100%;
+}
+@import '@/static/scss/index.scss';
 </style>
diff --git a/api/warehouse/warehose.js b/api/warehouse/warehose.js
new file mode 100644
index 0000000..efd1b36
--- /dev/null
+++ b/api/warehouse/warehose.js
@@ -0,0 +1,11 @@
+import upload from '@/utils/upload'
+import request from '@/utils/request'
+
+// 获取仓库信息
+export function getWareHouseProfile(data) {
+	return request({
+		url: '/wms/wareHouse/getWareHouseProfile',
+		method: 'pose',
+		data
+	})
+}
\ No newline at end of file
diff --git a/components/material-item/material-item.vue b/components/material-item/material-item.vue
new file mode 100644
index 0000000..e036dcf
--- /dev/null
+++ b/components/material-item/material-item.vue
@@ -0,0 +1,43 @@
+<template>
+	<view class="material-box">
+		<view class="title">{{materialInfo.title}}</view>
+		<view class="time">{{materialInfo.time}}</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"material-item",
+		props:{
+			materialInfo:{
+				default:{
+					title:'无数据',
+					time:'2024/3/12'
+				}
+			}
+		},
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style scoped>
+.material-box{
+	width: 100%;
+	height: 40px;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+.material-box .title{
+	font-size: 20px;
+	font-weight: 600;
+}
+.material-box .time{
+	font-size: 16px;
+	font-weight: 600;
+}
+</style>
\ No newline at end of file
diff --git a/components/pda-scan-input/index.vue b/components/pda-scan-input/index.vue
new file mode 100644
index 0000000..b884890
--- /dev/null
+++ b/components/pda-scan-input/index.vue
@@ -0,0 +1,89 @@
+<template>
+	<view class="input-box">
+		<input :adjust-position="false" :focus="isFocus" type="text" v-model="search" @confirm="getInfo" @blur="isFocus = true" />
+	</view>
+</template>
+
+<script>
+import { getWareHouseProfile } from '@/api/warehouse/warehose.js';
+export default {
+	name: 'pda-scan-input',
+	props: {
+		type: {
+			default: 1,
+			type: Number
+		}
+	},
+	data() {
+		return {
+			isFocus: true,
+			search: 'A-001',
+			// 扫码枪扫码后查询结果，获取信息
+			searchInfo: null,
+			time: null
+		};
+	},
+	watch: {
+		isFocus(n) {}
+	},
+	mounted() {
+		this.init();
+	},
+	beforeDestroy() {
+		if (this.time) {
+			clearInterval(this.time);
+			this.time = null;
+		}
+	},
+	methods: {
+		// 初始化
+		init() {
+			this.time = setInterval(() => {
+				if (!this.isFocus) {
+					this.$nextTick(function () {
+						this.isFocus = true;
+					});
+				}
+			}, 1);
+		},
+		// 传输数据
+		emitInputChange(data) {
+			this.$emit('getInfo', data, type);
+		},
+		getInfo() {
+			if (type === 1) {
+				//TODO 获取仓库信息
+				const data = {
+					warehouse_num: this.search
+				};
+				getWareHouseProfile(data).then((res) => {
+					if (res.code !== 200) {
+						uni.showToast({ title: '获取仓库信息异常', icon: 'none' });
+					}
+					this.searchInfo = res.data;
+					this.emitInputChange(res.data);
+				});
+			} else if (type === 2) {
+				//TODO 获取物料信息
+				this.emitInputChange(res.data);
+			}
+			setTimeout(() => {
+				this.search = '';
+				this.isFocus = false;
+			}, 1000);
+		}
+	}
+};
+</script>
+
+<style scoped>
+.input-box {
+	width: 100%;
+	position: absolute;
+	bottom: 0;
+	/* height: 0px; */
+	/* opacity: 0; */
+	/* visibility: hidden; */
+	/* display:none; */
+}
+</style>
diff --git a/main.js b/main.js
index 3985b1b..1f7128c 100644
--- a/main.js
+++ b/main.js
@@ -3,6 +3,10 @@ import App from './App'
 import store from './store' // store
 import plugins from './plugins' // plugins
 import './permission' // permission
+// 组件加载
+// PDA扫描获取仓库信息组件
+import PdaScanInput from '@/components/pda-scan-input/index.vue';
+Vue.component('PdaScanInput',PdaScanInput)
 Vue.use(plugins)
 
 Vue.config.productionTip = false
@@ -11,7 +15,7 @@ Vue.prototype.$store = store
 App.mpType = 'app'
 
 const app = new Vue({
-  ...App
+	...App
 })
 
-app.$mount()
+app.$mount()
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 00a9b93..18942ad 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,8 +1,8 @@
 {
-    "name" : "若依移动端",
-    "appid" : "__UNI__25A9D80",
+    "name" : "干巷仓库PDF-APP",
+    "appid" : "__UNI__A67E78B",
     "description" : "",
-    "versionName" : "1.1.0",
+    "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
     "app-plus" : {
@@ -14,7 +14,9 @@
             "autoclose" : true,
             "delay" : 0
         },
-        "modules" : {},
+        "modules" : {
+            "Barcode" : {}
+        },
         "distribute" : {
             "android" : {
                 "permissions" : [
@@ -59,15 +61,15 @@
         "devServer" : {
             "port" : 9090,
             "https" : false,
-			"disableHostCheck":true,
-			"proxy":{
-				"/api":{
-					"target":"http://localhost:8888",
-					"pathRewrite":{
-						"^/api": ""
-					}
-				}
-			}
+            "disableHostCheck" : true,
+            "proxy" : {
+                "/api" : {
+                    "target" : "http://localhost:8888",
+                    "pathRewrite" : {
+                        "^/api" : ""
+                    }
+                }
+            }
         },
         "title" : "RuoYi-App",
         "router" : {
diff --git a/pages.json b/pages.json
index 333251c..6b0ea1f 100644
--- a/pages.json
+++ b/pages.json
@@ -1,102 +1,52 @@
 {
-  "pages": [{
-    "path": "pages/login",
-    "style": {
-      "navigationBarTitleText": "登录"
-    }
-  }, {
-    "path": "pages/register",
-    "style": {
-      "navigationBarTitleText": "注册"
-    }
-  }, {
-    "path": "pages/index",
-    "style": {
-      "navigationBarTitleText": "若依移动端框架",
-      "navigationStyle": "custom"
-    }
-  }, {
-    "path": "pages/work/index",
-    "style": {
-      "navigationBarTitleText": "工作台"
-    }
-  }, {
-    "path": "pages/mine/index",
-    "style": {
-      "navigationBarTitleText": "我的"
-    }
-  }, {
-    "path": "pages/mine/avatar/index",
-    "style": {
-      "navigationBarTitleText": "修改头像"
-    }
-  }, {
-    "path": "pages/mine/info/index",
-    "style": {
-      "navigationBarTitleText": "个人信息"
-    }
-  }, {
-    "path": "pages/mine/info/edit",
-    "style": {
-      "navigationBarTitleText": "编辑资料"
-    }
-  }, {
-    "path": "pages/mine/pwd/index",
-    "style": {
-      "navigationBarTitleText": "修改密码"
-    }
-  }, {
-    "path": "pages/mine/setting/index",
-    "style": {
-      "navigationBarTitleText": "应用设置"
-    }
-  }, {
-    "path": "pages/mine/help/index",
-    "style": {
-      "navigationBarTitleText": "常见问题"
-    }
-  }, {
-    "path": "pages/mine/about/index",
-    "style": {
-      "navigationBarTitleText": "关于我们"
-    }
-  }, {
-    "path": "pages/common/webview/index",
-    "style": {
-      "navigationBarTitleText": "浏览网页"
-    }
-  }, {
-    "path": "pages/common/textview/index",
-    "style": {
-      "navigationBarTitleText": "浏览文本"
-    }
-  }],
-  "tabBar": {
-    "color": "#000000",
-    "selectedColor": "#000000",
-    "borderStyle": "white",
-    "backgroundColor": "#ffffff",
-    "list": [{
-        "pagePath": "pages/index",
-        "iconPath": "static/images/tabbar/home.png",
-        "selectedIconPath": "static/images/tabbar/home_.png",
-        "text": "首页"
-      }, {
-        "pagePath": "pages/work/index",
-        "iconPath": "static/images/tabbar/work.png",
-        "selectedIconPath": "static/images/tabbar/work_.png",
-        "text": "工作台"
-      }, {
-        "pagePath": "pages/mine/index",
-        "iconPath": "static/images/tabbar/mine.png",
-        "selectedIconPath": "static/images/tabbar/mine_.png",
-        "text": "我的"
-      }
-    ]
-  },
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "RuoYi",
-    "navigationBarBackgroundColor": "#FFFFFF"
-  }
-}
+	"pages": [{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
+		}, {
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "DOAN",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/inWarehouse/inWarehouse",
+			"style": {
+				"navigationBarTitleText": "入库",
+				// "navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/outWarehouse/outWarehouse",
+			"style": {
+				"navigationBarTitleText": "出库",
+				// "navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/stocktake/stocktake",
+			"style": {
+				"navigationBarTitleText": "盘点",
+				// "navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/relocation/relocation",
+			"style": {
+				"navigationBarTitleText": "移库",
+				// "navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "DOAN",
+		"navigationBarBackgroundColor": "#FFFFFF"
+	}
+}
\ No newline at end of file
diff --git a/pages/common/textview/index.vue b/pages/common/textview/index.vue
deleted file mode 100644
index e9b05fb..0000000
--- a/pages/common/textview/index.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<template>
-  <view>
-    <uni-card class="view-title" :title="title">
-      <text class="uni-body view-content">{{ content }}</text>
-    </uni-card>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        title: '',
-        content: ''
-      }
-    },
-    onLoad(options) {
-      this.title = options.title
-      this.content = options.content
-      uni.setNavigationBarTitle({
-        title: options.title
-      })
-    }
-  }
-</script>
-
-<style scoped>
-  page {
-    background-color: #ffffff;
-  }
-
-  .view-title {
-    font-weight: bold;
-  }
-
-  .view-content {
-    font-size: 26rpx;
-    padding: 12px 5px 0;
-    color: #333;
-    line-height: 24px;
-    font-weight: normal;
-  }
-</style>
diff --git a/pages/common/webview/index.vue b/pages/common/webview/index.vue
deleted file mode 100644
index 8388c76..0000000
--- a/pages/common/webview/index.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-  <view v-if="params.url">
-    <web-view :webview-styles="webviewStyles" :src="`${params.url}`"></web-view>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        params: {},
-        webviewStyles: {
-          progress: {
-            color: "#FF3333"
-          }
-        }
-      }
-    },
-    props: {
-      src: {
-        type: [String],
-        default: null
-      }
-    },
-    onLoad(event) {
-      this.params = event
-      if (event.title) {
-        uni.setNavigationBarTitle({
-          title: event.title
-        })
-      }
-    }
-  }
-</script>
diff --git a/pages/inWarehouse/inWarehouse.vue b/pages/inWarehouse/inWarehouse.vue
new file mode 100644
index 0000000..9cff25c
--- /dev/null
+++ b/pages/inWarehouse/inWarehouse.vue
@@ -0,0 +1,133 @@
+<template>
+	<view class="content">
+		<view class="title-box">
+			<span class="title-text">入库</span>
+			<view class="warehoseInfo-box">
+				<view>仓库名称：{{ warehouseInfo.warehouse }}</view>
+				<view>库位名称：{{ warehouseInfo.location }}</view>
+				<view>货架名称：{{ warehouseInfo.shelf }}</view>
+				<view>当前货物数：{{ warehouseInfo.number }}</view>
+			</view>
+		</view>
+		<!-- 货物列表 -->
+		<view class="">
+			<scroll-view class="scroll-view-box" :scroll-y="true">
+				<view v-for="item in materialList">
+					<materialItem :materialInfo="item"></materialItem>
+				</view>
+			</scroll-view>
+		</view>
+		<!-- 底部按钮 -->
+		<view class="button-box">
+			<button type="default" @click="handlerSubmit">入库</button>
+		</view>
+		<!-- 扫描操作 -->
+		<view>
+			<PdaScanInput @getInfo="handleGetInfo" :type="searchType"></PdaScanInput>
+		</view>
+	</view>
+</template>
+
+<script>
+import materialItem from '@/components/material-item/material-item.vue';
+// 入库
+export default {
+	components: {
+		materialItem
+	},
+	data() {
+		return {
+			loading: false,
+			clearData: {
+				warehouseInfo: {},
+				materialList: []
+			},
+			warehouseInfo: {
+				id: '',
+				warehouse: '',
+				warehouse_num: '',
+				location: '',
+				shelf: '',
+				layer: '',
+				number: 0
+			},
+			materialList: [],
+			// 1-仓库扫码 2-物料扫码
+			searchType: 1
+		};
+	},
+	watch: {
+		'warehouseInfo.id': {}
+	},
+	created() {
+		this.init();
+		for (let i = 1; i <= 20; i++) {
+			this.materialList.push({
+				title: '货物' + i,
+				time: '2024/3/12'
+			});
+		}
+		
+	},
+	methods: {
+		init() {
+			// 初始化，并且清空数据
+			this.clearData.warehouseInfo = JSON.parse(JSON.stringify(this.warehouseInfo));
+			this.clearData.materialList = JSON.parse(JSON.stringify(this.materialList));
+			this.searchType = 1;
+		},
+		clear() {
+			this.warehouseInfo = JSON.parse(JSON.stringify(this.clearData.warehouseInfo));
+			this.materialList = JSON.parse(JSON.stringify(this.clearData.materialList));
+			this.searchType = 1;
+		},
+		handleGetInfo(data, type) {
+			if(type === 1){
+				this.searchType = 2;
+			}
+			uni.showToast({
+				title: '扫描成功',
+				icon: 'success'
+			});
+			this.warehouseInfo = data;
+			console.log('仓库信息扫描出', data);
+		},
+		// 入库提交
+		handlerSubmit() {
+			//TODO提交操作
+			this.clear();
+			// uni.navigateBack();
+		}
+	}
+};
+</script>
+
+<style scoped>
+.title-box {
+	margin-top: 40px;
+	margin-bottom: 20px;
+	height: 80px;
+	font-size: 26px;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
+.warehoseInfo-box {
+	font-size: 16px;
+	padding: 20px;
+	width: 100%;
+}
+.list-box {
+	width: 100%;
+}
+.scroll-view-box {
+	width: 100%;
+	padding: 20px;
+	height: 450px;
+}
+.button-box{
+	width:80%;
+	margin:0 auto;
+}
+</style>
diff --git a/pages/index.vue b/pages/index.vue
deleted file mode 100644
index 4646807..0000000
--- a/pages/index.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<template>
-  <view class="content">
-    <image class="logo" src="@/static/logo.png"></image>
-    <view class="text-area">
-      <text class="title">Hello RuoYi</text>
-    </view>
-  </view>
-</template>
-
-<script>
-  export default {
-    onLoad: function() {
-    }
-  }
-</script>
-
-<style>
-  .content {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-  }
-
-  .logo {
-    height: 200rpx;
-    width: 200rpx;
-    margin-top: 200rpx;
-    margin-left: auto;
-    margin-right: auto;
-    margin-bottom: 50rpx;
-  }
-
-  .text-area {
-    display: flex;
-    justify-content: center;
-  }
-
-  .title {
-    font-size: 36rpx;
-    color: #8f8f94;
-  }
-</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
new file mode 100644
index 0000000..ecc0163
--- /dev/null
+++ b/pages/index/index.vue
@@ -0,0 +1,105 @@
+<template>
+	<view class="content background">
+		<view class="title-box">道安WMS-PDA扫码</view>
+		<view class="grid-box">
+			<uni-grid :column="2" @change="gridCheck">
+				<uni-grid-item v-for="(item, index) in gridItemList" :index="index + 1">
+					<view class="item">
+						<uni-icons :type="item.icon" :size="48" color="#777" />
+						<text class="text">{{ item.name }}</text>
+					</view>
+				</uni-grid-item>
+			</uni-grid>
+		</view>
+		<!-- 扫描操作 -->
+		<!-- <view>
+			<PdaScanInput @getInfo="handleWareHouseChange"></PdaScanInput>
+		</view> -->
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			gridItemList: [
+				{ name: '入库', icon: 'download-filled' },
+				{ name: '出库', icon: 'upload-filled' },
+				{ name: '盘点', icon: 'wallet-filled' },
+				{ name: '移库', icon: 'cart-filled' }
+			]
+		};
+	},
+	onLoad: function () {},
+	mounted() {
+		setInterval(function () {
+			uni.hideKeyboard(); //隐藏软键盘
+			// plus.key.hideSoftKeybord();
+		}, 60);
+	},
+
+	methods: {
+		gridCheck(item) {
+			const index = item.detail?.index;
+			switch (index) {
+				case 1:
+					uni.navigateTo({
+						url: '/pages/inWarehouse/inWarehouse'
+					});
+					break;
+				case 2:
+					uni.navigateTo({
+						url: '/pages/outWarehouse/outWarehouse'
+					});
+					break;
+				case 3:
+					uni.navigateTo({
+						url: '/pages/stocktake/stocktake'
+					});
+					break;
+				case 4:
+					uni.navigateTo({
+						url: '/pages/relocation/relocation'
+					});
+					break;
+				default:
+					break;
+			}
+		},
+		handleWareHouseChange(data) {
+			uni.showToast({
+				title: '扫描成功',
+				icon: 'success'
+			});
+			console.log('handleWareHouseChange', data);
+		}
+	}
+};
+</script>
+
+<style scoped>
+.background {
+	/* background-color: #4671d5; */
+}
+.title-box {
+	width: 100%;
+	height: 80px;
+	margin-bottom: 10px;
+	font-size: 20px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+.grid-box {
+	width: 100%;
+	height: 100%;
+}
+.grid-box .item {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
+</style>
diff --git a/pages/login.vue b/pages/login/login.vue
similarity index 92%
rename from pages/login.vue
rename to pages/login/login.vue
index f2b4b57..4467cbc 100644
--- a/pages/login.vue
+++ b/pages/login/login.vue
@@ -1,8 +1,8 @@
 <template>
-	<view class="normal-login-container">
+	<view class=" normal-login-container">
 		<view class="logo-content align-center justify-center flex">
 			<image style="width: 100rpx; height: 100rpx" :src="globalConfig.appInfo.logo" mode="widthFix"></image>
-			<text class="title">若依移动端登录</text>
+			<text class="title">DOAN PDA 登录</text>
 		</view>
 		<view class="login-form-content">
 			<view class="input-item flex align-center">
@@ -38,7 +38,11 @@
 
 <script>
 import { getCodeImg } from '@/api/login';
-
+import {
+	getToken,
+	setToken,
+	removeToken
+} from '@/utils/auth'
 export default {
 	data() {
 		return {
@@ -87,7 +91,7 @@ export default {
 				if (result.captchaOff === 'off') {
 					this.captchaEnabled = false;
 					return;
-				}else{
+				} else {
 					this.captchaEnabled = true;
 				}
 				this.codeUrl = 'data:image/gif;base64,' + result.img;
@@ -96,6 +100,12 @@ export default {
 		},
 		// 登录方法
 		async handleLogin() {
+			// debug快速登录
+			if(this.loginForm.username === 'debug'){
+				setToken('123')
+				this.$tab.reLaunch('/pages/index/index');
+				return;
+			}
 			if (this.loginForm.username === '') {
 				this.$modal.msgError('请输入您的账号');
 			} else if (this.loginForm.password === '') {
@@ -123,9 +133,9 @@ export default {
 		},
 		// 登录成功后，处理函数
 		loginSuccess(result) {
-			// 设置用户信息
+			// 获取户信息
 			this.$store.dispatch('GetInfo').then((res) => {
-				this.$tab.reLaunch('/pages/index');
+				this.$tab.reLaunch('/pages/index/index');
 			});
 		}
 	}
diff --git a/pages/mine/about/index.vue b/pages/mine/about/index.vue
deleted file mode 100644
index d3f6255..0000000
--- a/pages/mine/about/index.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-  <view class="about-container">
-    <view class="header-section text-center">
-      <image style="width: 150rpx;height: 150rpx;" src="/static/logo200.png" mode="widthFix">
-      </image>
-      <uni-title type="h2" title="若依移动端"></uni-title>
-    </view>
-
-    <view class="content-section">
-      <view class="menu-list">
-        <view class="list-cell list-cell-arrow">
-          <view class="menu-item-box">
-            <view>版本信息</view>
-            <view class="text-right">v{{version}}</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow">
-          <view class="menu-item-box">
-            <view>官方邮箱</view>
-            <view class="text-right">ruoyi@xx.com</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow">
-          <view class="menu-item-box">
-            <view>服务热线</view>
-            <view class="text-right">400-999-9999</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow">
-          <view class="menu-item-box">
-            <view>公司网站</view>
-            <view class="text-right">
-              <uni-link :href="url" :text="url" showUnderLine="false"></uni-link>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <view class="copyright">
-      <view>Copyright &copy; 2022 ruoyi.vip All Rights Reserved.</view>
-    </view>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        url: getApp().globalData.config.appInfo.site_url,
-        version: getApp().globalData.config.appInfo.version
-      }
-    }
-  }
-</script>
-
-<style lang="scss">
-  page {
-    background-color: #f8f8f8;
-  }
-
-  .copyright {
-    margin-top: 50rpx;
-    text-align: center;
-    line-height: 60rpx;
-    color: #999;
-  }
-
-  .header-section {
-    display: flex;
-    padding: 30rpx 0 0;
-    flex-direction: column;
-    align-items: center;
-  }
-</style>
diff --git a/pages/mine/avatar/index.vue b/pages/mine/avatar/index.vue
deleted file mode 100644
index 7a874bd..0000000
--- a/pages/mine/avatar/index.vue
+++ /dev/null
@@ -1,631 +0,0 @@
-<template>
-	<view class="container">
-		<view class="page-body uni-content-info">
-			<view class='cropper-content'>
-				<view v-if="isShowImg" class="uni-corpper" :style="'width:'+cropperInitW+'px;height:'+cropperInitH+'px;background:#000'">
-					<view class="uni-corpper-content" :style="'width:'+cropperW+'px;height:'+cropperH+'px;left:'+cropperL+'px;top:'+cropperT+'px'">
-						<image :src="imageSrc" :style="'width:'+cropperW+'px;height:'+cropperH+'px'"></image>
-						<view class="uni-corpper-crop-box" @touchstart.stop="contentStartMove" @touchmove.stop="contentMoveing" @touchend.stop="contentTouchEnd"
-						    :style="'left:'+cutL+'px;top:'+cutT+'px;right:'+cutR+'px;bottom:'+cutB+'px'">
-							<view class="uni-cropper-view-box">
-								<view class="uni-cropper-dashed-h"></view>
-								<view class="uni-cropper-dashed-v"></view>
-								<view class="uni-cropper-line-t" data-drag="top" @touchstart.stop="dragStart" @touchmove.stop="dragMove"></view>
-								<view class="uni-cropper-line-r" data-drag="right" @touchstart.stop="dragStart" @touchmove.stop="dragMove"></view>
-								<view class="uni-cropper-line-b" data-drag="bottom" @touchstart.stop="dragStart" @touchmove.stop="dragMove"></view>
-								<view class="uni-cropper-line-l" data-drag="left" @touchstart.stop="dragStart" @touchmove.stop="dragMove"></view>
-								<view class="uni-cropper-point point-t" data-drag="top" @touchstart.stop="dragStart" @touchmove.stop="dragMove"></view>
-								<view class="uni-cropper-point point-tr" data-drag="topTight"></view>
-								<view class="uni-cropper-point point-r" data-drag="right" @touchstart.stop="dragStart" @touchmove.stop="dragMove"></view>
-								<view class="uni-cropper-point point-rb" data-drag="rightBottom" @touchstart.stop="dragStart" @touchmove.stop="dragMove"></view>
-								<view class="uni-cropper-point point-b" data-drag="bottom" @touchstart.stop="dragStart" @touchmove.stop="dragMove" @touchend.stop="dragEnd"></view>
-								<view class="uni-cropper-point point-bl" data-drag="bottomLeft"></view>
-								<view class="uni-cropper-point point-l" data-drag="left" @touchstart.stop="dragStart" @touchmove.stop="dragMove"></view>
-								<view class="uni-cropper-point point-lt" data-drag="leftTop"></view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class='cropper-config'>
-				<button type="primary reverse" @click="getImage" style='margin-top: 30rpx;'> 选择头像 </button>
-				<button type="warn" @click="getImageInfo" style='margin-top: 30rpx;'> 提交 </button>
-			</view>
-			<canvas canvas-id="myCanvas" :style="'position:absolute;border: 1px solid red; width:'+imageW+'px;height:'+imageH+'px;top:-9999px;left:-9999px;'"></canvas>
-		</view>
-	</view>
-</template>
-
-<script>
-  import config from '@/config'
-  import store from "@/store"
-  import { uploadAvatar } from "@/api/system/user"
-  
-  const baseUrl = config.baseUrl
-	let sysInfo = uni.getSystemInfoSync()
-	let SCREEN_WIDTH = sysInfo.screenWidth
-	let PAGE_X, // 手按下的x位置
-		PAGE_Y, // 手按下y的位置 
-		PR = sysInfo.pixelRatio, // dpi
-		T_PAGE_X, // 手移动的时候x的位置
-		T_PAGE_Y, // 手移动的时候Y的位置
-		CUT_L, // 初始化拖拽元素的left值
-		CUT_T, // 初始化拖拽元素的top值
-		CUT_R, // 初始化拖拽元素的
-		CUT_B, // 初始化拖拽元素的
-		CUT_W, // 初始化拖拽元素的宽度
-		CUT_H, //  初始化拖拽元素的高度
-		IMG_RATIO, // 图片比例
-		IMG_REAL_W, // 图片实际的宽度
-		IMG_REAL_H, // 图片实际的高度
-		DRAFG_MOVE_RATIO = 1, //移动时候的比例,
-		INIT_DRAG_POSITION = 100, // 初始化屏幕宽度和裁剪区域的宽度之差，用于设置初始化裁剪的宽度
-		DRAW_IMAGE_W = sysInfo.screenWidth // 设置生成的图片宽度
-
-	export default {
-		/**
-		 * 页面的初始数据
-		 */
-		data() {
-			return {
-				imageSrc: store.getters.avatar,
-				isShowImg: false,
-				// 初始化的宽高
-				cropperInitW: SCREEN_WIDTH,
-				cropperInitH: SCREEN_WIDTH,
-				// 动态的宽高
-				cropperW: SCREEN_WIDTH,
-				cropperH: SCREEN_WIDTH,
-				// 动态的left top值
-				cropperL: 0,
-				cropperT: 0,
-
-				transL: 0,
-				transT: 0,
-
-				// 图片缩放值
-				scaleP: 0,
-				imageW: 0,
-				imageH: 0,
-
-				// 裁剪框 宽高
-				cutL: 0,
-				cutT: 0,
-				cutB: SCREEN_WIDTH,
-				cutR: '100%',
-				qualityWidth: DRAW_IMAGE_W,
-				innerAspectRadio: DRAFG_MOVE_RATIO
-			}
-		},
-		/**
-		 * 生命周期函数--监听页面初次渲染完成
-		 */
-		onReady: function () {
-			this.loadImage()
-		},
-		methods: {
-			setData: function (obj) {
-				let that = this
-				Object.keys(obj).forEach(function (key) {
-					that.$set(that.$data, key, obj[key])
-				})
-			},
-			getImage: function () {
-				var _this = this
-				uni.chooseImage({
-					success: function (res) {
-						_this.setData({
-							imageSrc: res.tempFilePaths[0],
-						})
-						_this.loadImage()
-					},
-				})
-			},
-			loadImage: function () {
-				var _this = this
-
-				uni.getImageInfo({
-					src: _this.imageSrc,
-					success: function success(res) {
-						IMG_RATIO = 1 / 1
-						if (IMG_RATIO >= 1) {
-							IMG_REAL_W = SCREEN_WIDTH
-							IMG_REAL_H = SCREEN_WIDTH / IMG_RATIO
-						} else {
-							IMG_REAL_W = SCREEN_WIDTH * IMG_RATIO
-							IMG_REAL_H = SCREEN_WIDTH
-						}
-						let minRange = IMG_REAL_W > IMG_REAL_H ? IMG_REAL_W : IMG_REAL_H
-						INIT_DRAG_POSITION = minRange > INIT_DRAG_POSITION ? INIT_DRAG_POSITION : minRange
-						// 根据图片的宽高显示不同的效果   保证图片可以正常显示
-						if (IMG_RATIO >= 1) {
-							let cutT = Math.ceil((SCREEN_WIDTH / IMG_RATIO - (SCREEN_WIDTH / IMG_RATIO - INIT_DRAG_POSITION)) / 2)
-							let cutB = cutT
-							let cutL = Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH + INIT_DRAG_POSITION) / 2)
-							let cutR = cutL
-							_this.setData({
-								cropperW: SCREEN_WIDTH,
-								cropperH: SCREEN_WIDTH / IMG_RATIO,
-								// 初始化left right
-								cropperL: Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH) / 2),
-								cropperT: Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH / IMG_RATIO) / 2),
-								cutL: cutL,
-								cutT: cutT,
-								cutR: cutR,
-								cutB: cutB,
-								// 图片缩放值
-								imageW: IMG_REAL_W,
-								imageH: IMG_REAL_H,
-								scaleP: IMG_REAL_W / SCREEN_WIDTH,
-								qualityWidth: DRAW_IMAGE_W,
-								innerAspectRadio: IMG_RATIO
-							})
-						} else {
-							let cutL = Math.ceil((SCREEN_WIDTH * IMG_RATIO - (SCREEN_WIDTH * IMG_RATIO)) / 2)
-							let cutR = cutL
-							let cutT = Math.ceil((SCREEN_WIDTH - INIT_DRAG_POSITION) / 2)
-							let cutB = cutT
-							_this.setData({
-								cropperW: SCREEN_WIDTH * IMG_RATIO,
-								cropperH: SCREEN_WIDTH,
-								// 初始化left right
-								cropperL: Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH * IMG_RATIO) / 2),
-								cropperT: Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH) / 2),
-
-								cutL: cutL,
-								cutT: cutT,
-								cutR: cutR,
-								cutB: cutB,
-								// 图片缩放值
-								imageW: IMG_REAL_W,
-								imageH: IMG_REAL_H,
-								scaleP: IMG_REAL_W / SCREEN_WIDTH,
-								qualityWidth: DRAW_IMAGE_W,
-								innerAspectRadio: IMG_RATIO
-							})
-						}
-						_this.setData({
-							isShowImg: true
-						})
-						uni.hideLoading()
-					}
-				})
-			},
-			// 拖动时候触发的touchStart事件
-			contentStartMove(e) {
-				PAGE_X = e.touches[0].pageX
-				PAGE_Y = e.touches[0].pageY
-			},
-
-			// 拖动时候触发的touchMove事件
-			contentMoveing(e) {
-				var _this = this
-				var dragLengthX = (PAGE_X - e.touches[0].pageX) * DRAFG_MOVE_RATIO
-				var dragLengthY = (PAGE_Y - e.touches[0].pageY) * DRAFG_MOVE_RATIO
-				// 左移
-				if (dragLengthX > 0) {
-					if (this.cutL - dragLengthX < 0) dragLengthX = this.cutL
-				} else {
-					if (this.cutR + dragLengthX < 0) dragLengthX = -this.cutR
-				}
-
-				if (dragLengthY > 0) {
-					if (this.cutT - dragLengthY < 0) dragLengthY = this.cutT
-				} else {
-					if (this.cutB + dragLengthY < 0) dragLengthY = -this.cutB
-				}
-				this.setData({
-					cutL: this.cutL - dragLengthX,
-					cutT: this.cutT - dragLengthY,
-					cutR: this.cutR + dragLengthX,
-					cutB: this.cutB + dragLengthY
-				})
-
-				PAGE_X = e.touches[0].pageX
-				PAGE_Y = e.touches[0].pageY
-			},
-
-			contentTouchEnd() {
-
-			},
-
-			// 获取图片
-			getImageInfo() {
-				var _this = this
-				uni.showLoading({
-					title: '图片生成中...',
-				})
-				// 将图片写入画布
-				const ctx = uni.createCanvasContext('myCanvas')
-				ctx.drawImage(_this.imageSrc, 0, 0, IMG_REAL_W, IMG_REAL_H)
-				ctx.draw(true, () => {
-					// 获取画布要裁剪的位置和宽度   均为百分比 * 画布中图片的宽度    保证了在微信小程序中裁剪的图片模糊  位置不对的问题 canvasT = (_this.cutT / _this.cropperH) * (_this.imageH / pixelRatio)
-					var canvasW = ((_this.cropperW - _this.cutL - _this.cutR) / _this.cropperW) * IMG_REAL_W
-					var canvasH = ((_this.cropperH - _this.cutT - _this.cutB) / _this.cropperH) * IMG_REAL_H
-					var canvasL = (_this.cutL / _this.cropperW) * IMG_REAL_W
-					var canvasT = (_this.cutT / _this.cropperH) * IMG_REAL_H
-					uni.canvasToTempFilePath({
-						x: canvasL,
-						y: canvasT,
-						width: canvasW,
-						height: canvasH,
-						destWidth: canvasW,
-						destHeight: canvasH,
-						quality: 0.5,
-						canvasId: 'myCanvas',
-						success: function (res) {
-							uni.hideLoading()
-							let data = {name: 'avatarfile', filePath: res.tempFilePath}
-							uploadAvatar(data).then(response => {
-								store.commit('SET_AVATAR', baseUrl + response.imgUrl)
-								uni.showToast({ title: "修改成功", icon: 'success' })
-								uni.navigateBack()
-							})
-						}
-					})
-				})
-			},
-			// 设置大小的时候触发的touchStart事件
-			dragStart(e) {
-				T_PAGE_X = e.touches[0].pageX
-				T_PAGE_Y = e.touches[0].pageY
-				CUT_L = this.cutL
-				CUT_R = this.cutR
-				CUT_B = this.cutB
-				CUT_T = this.cutT
-			},
-
-			// 设置大小的时候触发的touchMove事件
-			dragMove(e) {
-				var _this = this
-				var dragType = e.target.dataset.drag
-				switch (dragType) {
-					case 'right':
-						var dragLength = (T_PAGE_X - e.touches[0].pageX) * DRAFG_MOVE_RATIO
-						if (CUT_R + dragLength < 0) dragLength = -CUT_R
-						this.setData({
-							cutR: CUT_R + dragLength
-						})
-						break
-					case 'left':
-						var dragLength = (T_PAGE_X - e.touches[0].pageX) * DRAFG_MOVE_RATIO
-						if (CUT_L - dragLength < 0) dragLength = CUT_L
-						if ((CUT_L - dragLength) > (this.cropperW - this.cutR)) dragLength = CUT_L - (this.cropperW - this.cutR)
-						this.setData({
-							cutL: CUT_L - dragLength
-						})
-						break
-					case 'top':
-						var dragLength = (T_PAGE_Y - e.touches[0].pageY) * DRAFG_MOVE_RATIO
-						if (CUT_T - dragLength < 0) dragLength = CUT_T
-						if ((CUT_T - dragLength) > (this.cropperH - this.cutB)) dragLength = CUT_T - (this.cropperH - this.cutB)
-						this.setData({
-							cutT: CUT_T - dragLength
-						})
-						break
-					case 'bottom':
-						var dragLength = (T_PAGE_Y - e.touches[0].pageY) * DRAFG_MOVE_RATIO
-						if (CUT_B + dragLength < 0) dragLength = -CUT_B
-						this.setData({
-							cutB: CUT_B + dragLength
-						})
-						break
-					case 'rightBottom':
-						var dragLengthX = (T_PAGE_X - e.touches[0].pageX) * DRAFG_MOVE_RATIO
-						var dragLengthY = (T_PAGE_Y - e.touches[0].pageY) * DRAFG_MOVE_RATIO
-
-						if (CUT_B + dragLengthY < 0) dragLengthY = -CUT_B
-						if (CUT_R + dragLengthX < 0) dragLengthX = -CUT_R
-						let cutB = CUT_B + dragLengthY
-						let cutR = CUT_R + dragLengthX
-
-						this.setData({
-							cutB: cutB,
-							cutR: cutR
-						})
-						break
-					default:
-						break
-				}
-			}
-		}
-	}
-</script>
-
-<style>
-	/* pages/uni-cropper/index.wxss */
-
-	.uni-content-info {
-		/* position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		display: block;
-		align-items: center;
-		flex-direction: column; */
-	}
-
-	.cropper-config {
-		padding: 20rpx 40rpx;
-	}
-
-	.cropper-content {
-		min-height: 750rpx;
-		width: 100%;
-	}
-
-	.uni-corpper {
-		position: relative;
-		overflow: hidden;
-		-webkit-user-select: none;
-		-moz-user-select: none;
-		-ms-user-select: none;
-		user-select: none;
-		-webkit-tap-highlight-color: transparent;
-		-webkit-touch-callout: none;
-		box-sizing: border-box;
-	}
-
-	.uni-corpper-content {
-		position: relative;
-	}
-
-	.uni-corpper-content image {
-		display: block;
-		width: 100%;
-		min-width: 0 !important;
-		max-width: none !important;
-		height: 100%;
-		min-height: 0 !important;
-		max-height: none !important;
-		image-orientation: 0deg !important;
-		margin: 0 auto;
-	}
-	/* 移动图片效果 */
-
-	.uni-cropper-drag-box {
-		position: absolute;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		left: 0;
-		cursor: move;
-		background: rgba(0, 0, 0, 0.6);
-		z-index: 1;
-	}
-	/* 内部的信息 */
-
-	.uni-corpper-crop-box {
-		position: absolute;
-		background: rgba(255, 255, 255, 0.3);
-		z-index: 2;
-	}
-
-	.uni-corpper-crop-box .uni-cropper-view-box {
-		position: relative;
-		display: block;
-		width: 100%;
-		height: 100%;
-		overflow: visible;
-		outline: 1rpx solid #69f;
-		outline-color: rgba(102, 153, 255, .75)
-	}
-	/* 横向虚线 */
-
-	.uni-cropper-dashed-h {
-		position: absolute;
-		top: 33.33333333%;
-		left: 0;
-		width: 100%;
-		height: 33.33333333%;
-		border-top: 1rpx dashed rgba(255, 255, 255, 0.5);
-		border-bottom: 1rpx dashed rgba(255, 255, 255, 0.5);
-	}
-	/* 纵向虚线 */
-
-	.uni-cropper-dashed-v {
-		position: absolute;
-		left: 33.33333333%;
-		top: 0;
-		width: 33.33333333%;
-		height: 100%;
-		border-left: 1rpx dashed rgba(255, 255, 255, 0.5);
-		border-right: 1rpx dashed rgba(255, 255, 255, 0.5);
-	}
-	/* 四个方向的线  为了之后的拖动事件*/
-
-	.uni-cropper-line-t {
-		position: absolute;
-		display: block;
-		width: 100%;
-		background-color: #69f;
-		top: 0;
-		left: 0;
-		height: 1rpx;
-		opacity: 0.1;
-		cursor: n-resize;
-	}
-
-	.uni-cropper-line-t::before {
-		content: '';
-		position: absolute;
-		top: 50%;
-		right: 0rpx;
-		width: 100%;
-		-webkit-transform: translate3d(0, -50%, 0);
-		transform: translate3d(0, -50%, 0);
-		bottom: 0;
-		height: 41rpx;
-		background: transparent;
-		z-index: 11;
-	}
-
-	.uni-cropper-line-r {
-		position: absolute;
-		display: block;
-		background-color: #69f;
-		top: 0;
-		right: 0rpx;
-		width: 1rpx;
-		opacity: 0.1;
-		height: 100%;
-		cursor: e-resize;
-	}
-
-	.uni-cropper-line-r::before {
-		content: '';
-		position: absolute;
-		top: 0;
-		left: 50%;
-		width: 41rpx;
-		-webkit-transform: translate3d(-50%, 0, 0);
-		transform: translate3d(-50%, 0, 0);
-		bottom: 0;
-		height: 100%;
-		background: transparent;
-		z-index: 11;
-	}
-
-	.uni-cropper-line-b {
-		position: absolute;
-		display: block;
-		width: 100%;
-		background-color: #69f;
-		bottom: 0;
-		left: 0;
-		height: 1rpx;
-		opacity: 0.1;
-		cursor: s-resize;
-	}
-
-	.uni-cropper-line-b::before {
-		content: '';
-		position: absolute;
-		top: 50%;
-		right: 0rpx;
-		width: 100%;
-		-webkit-transform: translate3d(0, -50%, 0);
-		transform: translate3d(0, -50%, 0);
-		bottom: 0;
-		height: 41rpx;
-		background: transparent;
-		z-index: 11;
-	}
-
-	.uni-cropper-line-l {
-		position: absolute;
-		display: block;
-		background-color: #69f;
-		top: 0;
-		left: 0;
-		width: 1rpx;
-		opacity: 0.1;
-		height: 100%;
-		cursor: w-resize;
-	}
-
-	.uni-cropper-line-l::before {
-		content: '';
-		position: absolute;
-		top: 0;
-		left: 50%;
-		width: 41rpx;
-		-webkit-transform: translate3d(-50%, 0, 0);
-		transform: translate3d(-50%, 0, 0);
-		bottom: 0;
-		height: 100%;
-		background: transparent;
-		z-index: 11;
-	}
-
-	.uni-cropper-point {
-		width: 5rpx;
-		height: 5rpx;
-		background-color: #69f;
-		opacity: .75;
-		position: absolute;
-		z-index: 3;
-	}
-
-	.point-t {
-		top: -3rpx;
-		left: 50%;
-		margin-left: -3rpx;
-		cursor: n-resize;
-	}
-
-	.point-tr {
-		top: -3rpx;
-		left: 100%;
-		margin-left: -3rpx;
-		cursor: n-resize;
-	}
-
-	.point-r {
-		top: 50%;
-		left: 100%;
-		margin-left: -3rpx;
-		margin-top: -3rpx;
-		cursor: n-resize;
-	}
-
-	.point-rb {
-		left: 100%;
-		top: 100%;
-		-webkit-transform: translate3d(-50%, -50%, 0);
-		transform: translate3d(-50%, -50%, 0);
-		cursor: n-resize;
-		width: 36rpx;
-		height: 36rpx;
-		background-color: #69f;
-		position: absolute;
-		z-index: 1112;
-		opacity: 1;
-	}
-
-	.point-b {
-		left: 50%;
-		top: 100%;
-		margin-left: -3rpx;
-		margin-top: -3rpx;
-		cursor: n-resize;
-	}
-
-	.point-bl {
-		left: 0%;
-		top: 100%;
-		margin-left: -3rpx;
-		margin-top: -3rpx;
-		cursor: n-resize;
-	}
-
-	.point-l {
-		left: 0%;
-		top: 50%;
-		margin-left: -3rpx;
-		margin-top: -3rpx;
-		cursor: n-resize;
-	}
-
-	.point-lt {
-		left: 0%;
-		top: 0%;
-		margin-left: -3rpx;
-		margin-top: -3rpx;
-		cursor: n-resize;
-	}
-	/* 裁剪框预览内容 */
-
-	.uni-cropper-viewer {
-		position: relative;
-		width: 100%;
-		height: 100%;
-		overflow: hidden;
-	}
-
-	.uni-cropper-viewer image {
-		position: absolute;
-		z-index: 2;
-	}
-</style>
diff --git a/pages/mine/help/index.vue b/pages/mine/help/index.vue
deleted file mode 100644
index d2e4374..0000000
--- a/pages/mine/help/index.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-<template>
-  <view class="help-container">
-    <view v-for="(item, findex) in list" :key="findex" :title="item.title" class="list-title">
-      <view class="text-title">
-        <view :class="item.icon"></view>{{ item.title }}
-      </view>
-      <view class="childList">
-        <view v-for="(child, zindex) in item.childList" :key="zindex" class="question" hover-class="hover"
-          @click="handleText(child)">
-          <view class="text-item">{{ child.title }}</view>
-          <view class="line" v-if="zindex !== item.childList.length - 1"></view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        list: [{
-            icon: 'iconfont icon-github',
-            title: '若依问题',
-            childList: [{
-              title: '若依开源吗？',
-              content: '开源'
-            }, {
-              title: '若依可以商用吗？',
-              content: '可以'
-            }, {
-              title: '若依官网地址多少？',
-              content: 'http://ruoyi.vip'
-            }, {
-              title: '若依文档地址多少？',
-              content: 'http://doc.ruoyi.vip'
-            }]
-          },
-          {
-            icon: 'iconfont icon-help',
-            title: '其他问题',
-            childList: [{
-              title: '如何退出登录？',
-              content: '请点击[我的] - [应用设置] - [退出登录]即可退出登录',
-            }, {
-              title: '如何修改用户头像？',
-              content: '请点击[我的] - [选择头像] - [点击提交]即可更换用户头像',
-            }, {
-              title: '如何修改登录密码？',
-              content: '请点击[我的] - [应用设置] - [修改密码]即可修改登录密码',
-            }]
-          }
-        ]
-      }
-    },
-    methods: {
-      handleText(item) {
-        this.$tab.navigateTo(`/pages/common/textview/index?title=${item.title}&content=${item.content}`)
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  page {
-    background-color: #f8f8f8;
-  }
-
-  .help-container {
-    margin-bottom: 100rpx;
-    padding: 30rpx;
-  }
-
-  .list-title {
-    margin-bottom: 30rpx;
-  }
-
-  .childList {
-    background: #ffffff;
-    box-shadow: 0px 0px 10rpx rgba(193, 193, 193, 0.2);
-    border-radius: 16rpx;
-    margin-top: 10rpx;
-  }
-
-  .line {
-    width: 100%;
-    height: 1rpx;
-    background-color: #F5F5F5;
-  }
-
-  .text-title {
-    color: #303133;
-    font-size: 32rpx;
-    font-weight: bold;
-    margin-left: 10rpx;
-
-    .iconfont {
-      font-size: 16px;
-      margin-right: 10rpx;
-    }
-  }
-
-  .text-item {
-    font-size: 28rpx;
-    padding: 24rpx;
-  }
-
-  .question {
-    color: #606266;
-    font-size: 28rpx;
-  }
-</style>
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
deleted file mode 100644
index b79ed52..0000000
--- a/pages/mine/index.vue
+++ /dev/null
@@ -1,198 +0,0 @@
-<template>
-  <view class="mine-container" :style="{height: `${windowHeight}px`}">
-    <!--顶部个人信息栏-->
-    <view class="header-section">
-      <view class="flex padding justify-between">
-        <view class="flex align-center">
-          <view v-if="!avatar" class="cu-avatar xl round bg-white">
-            <view class="iconfont icon-people text-gray icon"></view>
-          </view>
-          <image v-if="avatar" @click="handleToAvatar" :src="avatar" class="cu-avatar xl round" mode="widthFix">
-          </image>
-          <view v-if="!name" @click="handleToLogin" class="login-tip">
-            点击登录
-          </view>
-          <view v-if="name" @click="handleToInfo" class="user-info">
-            <view class="u_title">
-              用户名：{{ name }}
-            </view>
-          </view>
-        </view>
-        <view @click="handleToInfo" class="flex align-center">
-          <text>个人信息</text>
-          <view class="iconfont icon-right"></view>
-        </view>
-      </view>
-    </view>
-
-    <view class="content-section">
-      <view class="mine-actions grid col-4 text-center">
-        <view class="action-item" @click="handleJiaoLiuQun">
-          <view class="iconfont icon-friendfill text-pink icon"></view>
-          <text class="text">交流群</text>
-        </view>
-        <view class="action-item" @click="handleBuilding">
-          <view class="iconfont icon-service text-blue icon"></view>
-          <text class="text">在线客服</text>
-        </view>
-        <view class="action-item" @click="handleBuilding">
-          <view class="iconfont icon-community text-mauve icon"></view>
-          <text class="text">反馈社区</text>
-        </view>
-        <view class="action-item" @click="handleBuilding">
-          <view class="iconfont icon-dianzan text-green icon"></view>
-          <text class="text">点赞我们</text>
-        </view>
-      </view>
-
-      <view class="menu-list">
-        <view class="list-cell list-cell-arrow" @click="handleToEditInfo">
-          <view class="menu-item-box">
-            <view class="iconfont icon-user menu-icon"></view>
-            <view>编辑资料</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow" @click="handleHelp">
-          <view class="menu-item-box">
-            <view class="iconfont icon-help menu-icon"></view>
-            <view>常见问题</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow" @click="handleAbout">
-          <view class="menu-item-box">
-            <view class="iconfont icon-aixin menu-icon"></view>
-            <view>关于我们</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow" @click="handleToSetting">
-          <view class="menu-item-box">
-            <view class="iconfont icon-setting menu-icon"></view>
-            <view>应用设置</view>
-          </view>
-        </view>
-      </view>
-
-    </view>
-  </view>
-</template>
-
-<script>
-  import storage from '@/utils/storage'
-  
-  export default {
-    data() {
-      return {
-        name: this.$store.state.user.name,
-        version: getApp().globalData.config.appInfo.version
-      }
-    },
-    computed: {
-      avatar() {
-        return this.$store.state.user.avatar
-      },
-      windowHeight() {
-        return uni.getSystemInfoSync().windowHeight - 50
-      }
-    },
-    methods: {
-      handleToInfo() {
-        this.$tab.navigateTo('/pages/mine/info/index')
-      },
-      handleToEditInfo() {
-        this.$tab.navigateTo('/pages/mine/info/edit')
-      },
-      handleToSetting() {
-        this.$tab.navigateTo('/pages/mine/setting/index')
-      },
-      handleToLogin() {
-        this.$tab.reLaunch('/pages/login')
-      },
-      handleToAvatar() {
-        this.$tab.navigateTo('/pages/mine/avatar/index')
-      },
-      handleLogout() {
-        this.$modal.confirm('确定注销并退出系统吗？').then(() => {
-          this.$store.dispatch('LogOut').then(() => {
-            this.$tab.reLaunch('/pages/index')
-          })
-        })
-      },
-      handleHelp() {
-        this.$tab.navigateTo('/pages/mine/help/index')
-      },
-      handleAbout() {
-        this.$tab.navigateTo('/pages/mine/about/index')
-      },
-      handleJiaoLiuQun() {
-        this.$modal.showToast('QQ群：①133713780、②146013835')
-      },
-      handleBuilding() {
-        this.$modal.showToast('模块建设中~')
-      }
-    }
-  }
-</script>
-
-<style lang="scss">
-  page {
-    background-color: #f5f6f7;
-  }
-
-  .mine-container {
-    width: 100%;
-    height: 100%;
-
-
-    .header-section {
-      padding: 15px 15px 45px 15px;
-      background-color: #3c96f3;
-      color: white;
-
-      .login-tip {
-        font-size: 18px;
-        margin-left: 10px;
-      }
-
-      .cu-avatar {
-        border: 2px solid #eaeaea;
-
-        .icon {
-          font-size: 40px;
-        }
-      }
-
-      .user-info {
-        margin-left: 15px;
-
-        .u_title {
-          font-size: 18px;
-          line-height: 30px;
-        }
-      }
-    }
-
-    .content-section {
-      position: relative;
-      top: -50px;
-
-      .mine-actions {
-        margin: 15px 15px;
-        padding: 20px 0px;
-        border-radius: 8px;
-        background-color: white;
-
-        .action-item {
-          .icon {
-            font-size: 28px;
-          }
-
-          .text {
-            display: block;
-            font-size: 13px;
-            margin: 8px 0px;
-          }
-        }
-      }
-    }
-  }
-</style>
diff --git a/pages/mine/info/edit.vue b/pages/mine/info/edit.vue
deleted file mode 100644
index 519540a..0000000
--- a/pages/mine/info/edit.vue
+++ /dev/null
@@ -1,127 +0,0 @@
-<template>
-  <view class="container">
-    <view class="example">
-      <uni-forms ref="form" :model="user" labelWidth="80px">
-        <uni-forms-item label="用户昵称" name="nickName">
-          <uni-easyinput v-model="user.nickName" placeholder="请输入昵称" />
-        </uni-forms-item>
-        <uni-forms-item label="手机号码" name="phonenumber">
-          <uni-easyinput v-model="user.phonenumber" placeholder="请输入手机号码" />
-        </uni-forms-item>
-        <uni-forms-item label="邮箱" name="email">
-          <uni-easyinput v-model="user.email" placeholder="请输入邮箱" />
-        </uni-forms-item>
-        <uni-forms-item label="性别" name="sex" required>
-          <uni-data-checkbox v-model="user.sex" :localdata="sexs" />
-        </uni-forms-item>
-      </uni-forms>
-      <button type="primary" @click="submit">提交</button>
-    </view>
-  </view>
-</template>
-
-<script>
-  import { getUserProfile } from "@/api/system/user"
-  import { updateUserProfile } from "@/api/system/user"
-
-  export default {
-    data() {
-      return {
-        user: {
-          nickName: "",
-          phonenumber: "",
-          email: "",
-          sex: ""
-        },
-        sexs: [{
-          text: '男',
-          value: "0"
-        }, {
-          text: '女',
-          value: "1"
-        }],
-        rules: {
-          nickName: {
-            rules: [{
-              required: true,
-              errorMessage: '用户昵称不能为空'
-            }]
-          },
-          phonenumber: {
-            rules: [{
-              required: true,
-              errorMessage: '手机号码不能为空'
-            }, {
-              pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-              errorMessage: '请输入正确的手机号码'
-            }]
-          },
-          email: {
-            rules: [{
-              required: true,
-              errorMessage: '邮箱地址不能为空'
-            }, {
-              format: 'email',
-              errorMessage: '请输入正确的邮箱地址'
-            }]
-          }
-        }
-      }
-    },
-    onLoad() {
-      this.getUser()
-    },
-    onReady() {
-      this.$refs.form.setRules(this.rules)
-    },
-    methods: {
-      getUser() {
-        getUserProfile().then(response => {
-          this.user = response.data
-        })
-      },
-      submit(ref) {
-        this.$refs.form.validate().then(res => {
-          updateUserProfile(this.user).then(response => {
-            this.$modal.msgSuccess("修改成功")
-          })
-        })
-      }
-    }
-  }
-</script>
-
-<style lang="scss">
-  page {
-    background-color: #ffffff;
-  }
-
-  .example {
-    padding: 15px;
-    background-color: #fff;
-  }
-
-  .segmented-control {
-    margin-bottom: 15px;
-  }
-
-  .button-group {
-    margin-top: 15px;
-    display: flex;
-    justify-content: space-around;
-  }
-
-  .form-item {
-    display: flex;
-    align-items: center;
-    flex: 1;
-  }
-
-  .button {
-    display: flex;
-    align-items: center;
-    height: 35px;
-    line-height: 35px;
-    margin-left: 10px;
-  }
-</style>
diff --git a/pages/mine/info/index.vue b/pages/mine/info/index.vue
deleted file mode 100644
index 65c861a..0000000
--- a/pages/mine/info/index.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <view class="container">
-    <uni-list>
-      <uni-list-item showExtraIcon="true" :extraIcon="{type: 'person-filled'}" title="昵称" :rightText="user.nickName" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{type: 'phone-filled'}" title="手机号码" :rightText="user.phonenumber" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{type: 'email-filled'}" title="邮箱" :rightText="user.email" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{type: 'auth-filled'}" title="岗位" :rightText="postGroup" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{type: 'staff-filled'}" title="角色" :rightText="roleGroup" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{type: 'calendar-filled'}" title="创建日期" :rightText="user.createTime" />
-    </uni-list>
-  </view>
-</template>
-
-<script>
-  import { getUserProfile } from "@/api/system/user"
-
-  export default {
-    data() {
-      return {
-        user: {},
-        roleGroup: "",
-        postGroup: ""
-      }
-    },
-    onLoad() {
-      this.getUser()
-    },
-    methods: {
-      getUser() {
-        getUserProfile().then(response => {
-          this.user = response.data
-          this.roleGroup = response.roleGroup
-          this.postGroup = response.postGroup
-        })
-      }
-    }
-  }
-</script>
-
-<style lang="scss">
-  page {
-    background-color: #ffffff;
-  }
-</style>
diff --git a/pages/mine/pwd/index.vue b/pages/mine/pwd/index.vue
deleted file mode 100644
index da9567f..0000000
--- a/pages/mine/pwd/index.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <view class="pwd-retrieve-container">
-    <uni-forms ref="form" :value="user" labelWidth="80px">
-      <uni-forms-item name="oldPassword" label="旧密码">
-        <uni-easyinput type="password" v-model="user.oldPassword" placeholder="请输入旧密码" />
-      </uni-forms-item>
-      <uni-forms-item name="newPassword" label="新密码">
-        <uni-easyinput type="password" v-model="user.newPassword" placeholder="请输入新密码" />
-      </uni-forms-item>
-      <uni-forms-item name="confirmPassword" label="确认密码">
-        <uni-easyinput type="password" v-model="user.confirmPassword" placeholder="请确认新密码" />
-      </uni-forms-item>
-      <button type="primary" @click="submit">提交</button>
-    </uni-forms>
-  </view>
-</template>
-
-<script>
-  import { updateUserPwd } from "@/api/system/user"
-
-  export default {
-    data() {
-      return {
-        user: {
-          oldPassword: undefined,
-          newPassword: undefined,
-          confirmPassword: undefined
-        },
-        rules: {
-          oldPassword: {
-            rules: [{
-              required: true,
-              errorMessage: '旧密码不能为空'
-            }]
-          },
-          newPassword: {
-            rules: [{
-                required: true,
-                errorMessage: '新密码不能为空',
-              },
-              {
-                minLength: 6,
-                maxLength: 20,
-                errorMessage: '长度在 6 到 20 个字符'
-              }
-            ]
-          },
-          confirmPassword: {
-            rules: [{
-                required: true,
-                errorMessage: '确认密码不能为空'
-              }, {
-                validateFunction: (rule, value, data) => data.newPassword === value,
-                errorMessage: '两次输入的密码不一致'
-              }
-            ]
-          }
-        }
-      }
-    },
-    onReady() {
-      this.$refs.form.setRules(this.rules)
-    },
-    methods: {
-      submit() {
-        this.$refs.form.validate().then(res => {
-          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
-            this.$modal.msgSuccess("修改成功")
-          })
-        })
-      }
-    }
-  }
-</script>
-
-<style lang="scss">
-  page {
-    background-color: #ffffff;
-  }
-
-  .pwd-retrieve-container {
-    padding-top: 36rpx;
-    padding: 15px;
-  }
-</style>
diff --git a/pages/mine/setting/index.vue b/pages/mine/setting/index.vue
deleted file mode 100644
index 0f9f058..0000000
--- a/pages/mine/setting/index.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <view class="setting-container" :style="{height: `${windowHeight}px`}">
-    <view class="menu-list">
-      <view class="list-cell list-cell-arrow" @click="handleToPwd">
-        <view class="menu-item-box">
-          <view class="iconfont icon-password menu-icon"></view>
-          <view>修改密码</view>
-        </view>
-      </view>
-      <view class="list-cell list-cell-arrow" @click="handleToUpgrade">
-        <view class="menu-item-box">
-          <view class="iconfont icon-refresh menu-icon"></view>
-          <view>检查更新</view>
-        </view>
-      </view>
-      <view class="list-cell list-cell-arrow" @click="handleCleanTmp">
-        <view class="menu-item-box">
-          <view class="iconfont icon-clean menu-icon"></view>
-          <view>清理缓存</view>
-        </view>
-      </view>
-    </view>
-    <view class="cu-list menu">
-      <view class="cu-item item-box">
-        <view class="content text-center" @click="handleLogout">
-          <text class="text-black">退出登录</text>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        windowHeight: uni.getSystemInfoSync().windowHeight
-      }
-    },
-    methods: {
-      handleToPwd() {
-        this.$tab.navigateTo('/pages/mine/pwd/index')
-      },
-      handleToUpgrade() {
-        this.$modal.showToast('模块建设中~')
-      },
-      handleCleanTmp() {
-        this.$modal.showToast('模块建设中~')
-      },
-      handleLogout() {
-        this.$modal.confirm('确定注销并退出系统吗？').then(() => {
-          this.$store.dispatch('LogOut').then(() => {
-            this.$tab.reLaunch('/pages/index')
-          })
-        })
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .page {
-    background-color: #f8f8f8;
-  }
-
-  .item-box {
-    background-color: #FFFFFF;
-    margin: 30rpx;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-    padding: 10rpx;
-    border-radius: 8rpx;
-    color: #303133;
-    font-size: 32rpx;
-  }
-</style>
diff --git a/pages/outWarehouse/outWarehouse.vue b/pages/outWarehouse/outWarehouse.vue
new file mode 100644
index 0000000..213db50
--- /dev/null
+++ b/pages/outWarehouse/outWarehouse.vue
@@ -0,0 +1,23 @@
+<template>
+	<view class="content">
+		出库
+	</view>
+</template>
+
+<script>
+	// 出库
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/register.vue b/pages/register.vue
deleted file mode 100644
index 61e6d5c..0000000
--- a/pages/register.vue
+++ /dev/null
@@ -1,196 +0,0 @@
-<template>
-  <view class="normal-login-container">
-    <view class="logo-content align-center justify-center flex">
-      <image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
-      </image>
-      <text class="title">若依移动端注册</text>
-    </view>
-    <view class="login-form-content">
-      <view class="input-item flex align-center">
-        <view class="iconfont icon-user icon"></view>
-        <input v-model="registerForm.username" class="input" type="text" placeholder="请输入账号" maxlength="30" />
-      </view>
-      <view class="input-item flex align-center">
-        <view class="iconfont icon-password icon"></view>
-        <input v-model="registerForm.password" type="password" class="input" placeholder="请输入密码" maxlength="20" />
-      </view>
-      <view class="input-item flex align-center">
-        <view class="iconfont icon-password icon"></view>
-        <input v-model="registerForm.confirmPassword" type="password" class="input" placeholder="请输入重复密码" maxlength="20" />
-      </view>
-      <view class="input-item flex align-center" style="width: 60%;margin: 0px;" v-if="captchaEnabled">
-        <view class="iconfont icon-code icon"></view>
-        <input v-model="registerForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
-        <view class="login-code"> 
-          <image :src="codeUrl" @click="getCode" class="login-code-img"></image>
-        </view>
-      </view>
-      <view class="action-btn">
-        <button @click="handleRegister()" class="register-btn cu-btn block bg-blue lg round">注册</button>
-      </view>
-    </view>
-    <view class="xieyi text-center">
-      <text @click="handleUserLogin" class="text-blue">使用已有账号登录</text>
-    </view>
-  </view>
-</template>
-
-<script>
-  import { getCodeImg, register } from '@/api/login'
-
-  export default {
-    data() {
-      return {
-        codeUrl: "",
-        captchaEnabled: true,
-        globalConfig: getApp().globalData.config,
-        registerForm: {
-          username: "",
-          password: "",
-          confirmPassword: "",
-          code: "",
-          uuid: ''
-        }
-      }
-    },
-    created() {
-      this.getCode()
-    },
-    methods: {
-      // 用户登录
-      handleUserLogin() {
-        this.$tab.navigateTo(`/pages/login`)
-      },
-      // 获取图形验证码
-      getCode() {
-        getCodeImg().then(res => {
-          this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
-          if (this.captchaEnabled) {
-            this.codeUrl = 'data:image/gif;base64,' + res.img
-            this.registerForm.uuid = res.uuid
-          }
-        })
-      },
-      // 注册方法
-      async handleRegister() {
-        if (this.registerForm.username === "") {
-          this.$modal.msgError("请输入您的账号")
-        } else if (this.registerForm.password === "") {
-          this.$modal.msgError("请输入您的密码")
-        } else if (this.registerForm.confirmPassword === "") {
-          this.$modal.msgError("请再次输入您的密码")
-        } else if (this.registerForm.password !== this.registerForm.confirmPassword) {
-          this.$modal.msgError("两次输入的密码不一致")
-        } else if (this.registerForm.code === "" && this.captchaEnabled) {
-          this.$modal.msgError("请输入验证码")
-        } else {
-          this.$modal.loading("注册中，请耐心等待...")
-          this.register()
-        }
-      },
-      // 用户注册
-      async register() {
-        register(this.registerForm).then(res => {
-          this.$modal.closeLoading()
-          uni.showModal({
-          	title: "系统提示",
-          	content: "恭喜你，您的账号 " + this.registerForm.username + " 注册成功！",
-          	success: function (res) {
-          		if (res.confirm) {
-                uni.redirectTo({ url: `/pages/login` });
-          		}
-          	}
-          })
-        }).catch(() => {
-          if (this.captchaEnabled) {
-            this.getCode()
-          }
-        })
-      },
-      // 注册成功后，处理函数
-      registerSuccess(result) {
-        // 设置用户信息
-        this.$store.dispatch('GetInfo').then(res => {
-          this.$tab.reLaunch('/pages/index')
-        })
-      }
-    }
-  }
-</script>
-
-<style lang="scss">
-  page {
-    background-color: #ffffff;
-  }
-
-  .normal-login-container {
-    width: 100%;
-
-    .logo-content {
-      width: 100%;
-      font-size: 21px;
-      text-align: center;
-      padding-top: 15%;
-
-      image {
-        border-radius: 4px;
-      }
-
-      .title {
-        margin-left: 10px;
-      }
-    }
-
-    .login-form-content {
-      text-align: center;
-      margin: 20px auto;
-      margin-top: 15%;
-      width: 80%;
-
-      .input-item {
-        margin: 20px auto;
-        background-color: #f5f6f7;
-        height: 45px;
-        border-radius: 20px;
-
-        .icon {
-          font-size: 38rpx;
-          margin-left: 10px;
-          color: #999;
-        }
-
-        .input {
-          width: 100%;
-          font-size: 14px;
-          line-height: 20px;
-          text-align: left;
-          padding-left: 15px;
-        }
-
-      }
-
-      .register-btn {
-        margin-top: 40px;
-        height: 45px;
-      }
-
-      .xieyi {
-        color: #333;
-        margin-top: 20px;
-      }
-      
-      .login-code {
-        height: 38px;
-        float: right;
-      
-        .login-code-img {
-          height: 38px;
-          position: absolute;
-          margin-left: 10px;
-          width: 200rpx;
-        }
-      }
-    }
-  }
-
-</style>
diff --git a/pages/relocation/relocation.vue b/pages/relocation/relocation.vue
new file mode 100644
index 0000000..2b10917
--- /dev/null
+++ b/pages/relocation/relocation.vue
@@ -0,0 +1,23 @@
+<template>
+	<view class="content">
+		移库
+	</view>
+</template>
+
+<script>
+	// 移库
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/stocktake/stocktake.vue b/pages/stocktake/stocktake.vue
new file mode 100644
index 0000000..db320f8
--- /dev/null
+++ b/pages/stocktake/stocktake.vue
@@ -0,0 +1,23 @@
+<template>
+	<view class="content">
+		盘点
+	</view>
+</template>
+
+<script>
+	// 盘点
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/work/index.vue b/pages/work/index.vue
deleted file mode 100644
index 1afefc9..0000000
--- a/pages/work/index.vue
+++ /dev/null
@@ -1,183 +0,0 @@
-<template>
-  <view class="work-container">
-    <!-- 轮播图 -->
-    <uni-swiper-dot class="uni-swiper-dot-box" :info="data" :current="current" field="content">
-      <swiper class="swiper-box" :current="swiperDotIndex" @change="changeSwiper">
-        <swiper-item v-for="(item, index) in data" :key="index">
-          <view class="swiper-item" @click="clickBannerItem(item)">
-            <image :src="item.image" mode="aspectFill" :draggable="false" />
-          </view>
-        </swiper-item>
-      </swiper>
-    </uni-swiper-dot>
-
-    <!-- 宫格组件 -->
-    <uni-section title="系统管理" type="line"></uni-section>
-    <view class="grid-body">
-      <uni-grid :column="4" :showBorder="false" @change="changeGrid">
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="person-filled" size="30"></uni-icons>
-            <text class="text">用户管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="staff-filled" size="30"></uni-icons>
-            <text class="text">角色管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="color" size="30"></uni-icons>
-            <text class="text">菜单管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="settings-filled" size="30"></uni-icons>
-            <text class="text">部门管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="heart-filled" size="30"></uni-icons>
-            <text class="text">岗位管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="bars" size="30"></uni-icons>
-            <text class="text">字典管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="gear-filled" size="30"></uni-icons>
-            <text class="text">参数设置</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="chat-filled" size="30"></uni-icons>
-            <text class="text">通知公告</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="wallet-filled" size="30"></uni-icons>
-            <text class="text">日志管理</text>
-          </view>
-        </uni-grid-item>
-      </uni-grid>
-    </view>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        current: 0,
-        swiperDotIndex: 0,
-        data: [{
-            image: '/static/images/banner/banner01.jpg'
-          },
-          {
-            image: '/static/images/banner/banner02.jpg'
-          },
-          {
-            image: '/static/images/banner/banner03.jpg'
-          }
-        ]
-      }
-    },
-    methods: {
-      clickBannerItem(item) {
-        console.info(item)
-      },
-      changeSwiper(e) {
-        this.current = e.detail.current
-      },
-      changeGrid(e) {
-        this.$modal.showToast('模块建设中~')
-      }
-    }
-  }
-</script>
-
-<style lang="scss">
-  /* #ifndef APP-NVUE */
-  page {
-    display: flex;
-    flex-direction: column;
-    box-sizing: border-box;
-    background-color: #fff;
-    min-height: 100%;
-    height: auto;
-  }
-
-  view {
-    font-size: 14px;
-    line-height: inherit;
-  }
-
-  /* #endif */
-
-  .text {
-    text-align: center;
-    font-size: 26rpx;
-    margin-top: 10rpx;
-  }
-
-  .grid-item-box {
-    flex: 1;
-    /* #ifndef APP-NVUE */
-    display: flex;
-    /* #endif */
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    padding: 15px 0;
-  }
-
-  .uni-margin-wrap {
-    width: 690rpx;
-    width: 100%;
-    ;
-  }
-
-  .swiper {
-    height: 300rpx;
-  }
-
-  .swiper-box {
-    height: 150px;
-  }
-
-  .swiper-item {
-    /* #ifndef APP-NVUE */
-    display: flex;
-    /* #endif */
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    color: #fff;
-    height: 300rpx;
-    line-height: 300rpx;
-  }
-
-  @media screen and (min-width: 500px) {
-    .uni-swiper-dot-box {
-      width: 400px;
-      /* #ifndef APP-NVUE */
-      margin: 0 auto;
-      /* #endif */
-      margin-top: 8px;
-    }
-
-    .image {
-      width: 100%;
-    }
-  }
-</style>
diff --git a/permission.js b/permission.js
index cbaec53..ab18ee4 100644
--- a/permission.js
+++ b/permission.js
@@ -1,39 +1,45 @@
-import { getToken } from '@/utils/auth'
+import {
+	getToken
+} from '@/utils/auth'
 
 // 登录页面
-const loginPage = "/pages/login"
-  
+const loginPage = "/pages/login/login"
+
 // 页面白名单
 const whiteList = [
-  '/pages/login', '/pages/register', '/pages/common/webview/index'
+	'/pages/login/login','pages/index/index'
 ]
 
 // 检查地址白名单
 function checkWhite(url) {
-  const path = url.split('?')[0]
-  return whiteList.indexOf(path) !== -1
+	const path = url.split('?')[0]
+	return whiteList.indexOf(path) !== -1
 }
 
 // 页面跳转验证拦截器
 let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"]
 list.forEach(item => {
-  uni.addInterceptor(item, {
-    invoke(to) {
-      if (getToken()) {
-        if (to.url === loginPage) {
-          uni.reLaunch({ url: "/" })
-        }
-        return true
-      } else {
-        if (checkWhite(to.url)) {
-          return true
-        }
-        uni.reLaunch({ url: loginPage })
-        return false
-      }
-    },
-    fail(err) {
-      console.log(err)
-    }
-  })
-})
+	uni.addInterceptor(item, {
+		invoke(to) {
+			if (getToken()) {
+				// if (to.url === loginPage) {
+				// 	uni.reLaunch({
+				// 		url: "/"
+				// 	})
+				// }
+				return true
+			} else {
+				if (checkWhite(to.url)) {
+					return true
+				}
+				uni.reLaunch({
+					url: loginPage
+				})
+				return false
+			}
+		},
+		fail(err) {
+			console.log(err)
+		}
+	})
+})
\ No newline at end of file
diff --git a/static/images/background/background.jpg b/static/images/background/background.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..12b3b73ed28a97d97b912689cacb052eb3200952
GIT binary patch
literal 10974
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
A=>Px#

literal 0
HcmV?d00001